diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-07-07 19:49:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-07 19:49:07 +0200 |
| commit | ff2665175fe58bff6f76f5ee57ebee6de838dbc5 (patch) | |
| tree | 14ca1fe630f3ba4f7a0afdfd5c000037f1224dc5 /src/op_mode/conntrack_sync.py | |
| parent | 9403fda1e0a3bc0284a97b852f6501080523ffe5 (diff) | |
| parent | 28ba0ef32425ee458293a37a4a5ba664dfe577b2 (diff) | |
| download | vyos-1x-ff2665175fe58bff6f76f5ee57ebee6de838dbc5.tar.gz vyos-1x-ff2665175fe58bff6f76f5ee57ebee6de838dbc5.zip | |
Merge pull request #1397 from sever-sever/T4503
op-mode: T4503: Prevent restart service if commit in progress
Diffstat (limited to 'src/op_mode/conntrack_sync.py')
| -rwxr-xr-x | src/op_mode/conntrack_sync.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/op_mode/conntrack_sync.py b/src/op_mode/conntrack_sync.py index e45c38f07..54ecd6d0e 100755 --- a/src/op_mode/conntrack_sync.py +++ b/src/op_mode/conntrack_sync.py @@ -22,6 +22,7 @@ from argparse import ArgumentParser from vyos.configquery import CliShellApiConfigQuery from vyos.configquery import ConfigTreeQuery from vyos.util import call +from vyos.util import commit_in_progress from vyos.util import cmd from vyos.util import run from vyos.template import render_to_string @@ -86,6 +87,9 @@ if __name__ == '__main__': if args.restart: is_configured() + if commit_in_progress(): + print('Cannot restart conntrackd while a commit is in progress') + exit(1) syslog.syslog('Restarting conntrack sync service...') cmd('systemctl restart conntrackd.service') |