summaryrefslogtreecommitdiff
path: root/src/op_mode/conntrack_sync.py
diff options
context:
space:
mode:
authorViacheslav Hletenko <v.gletenko@vyos.io>2022-07-06 15:32:42 +0000
committerViacheslav Hletenko <v.gletenko@vyos.io>2022-07-07 16:28:59 +0000
commit28ba0ef32425ee458293a37a4a5ba664dfe577b2 (patch)
tree9e6847a82ca668e874a3ad3cd763370be1f8dab9 /src/op_mode/conntrack_sync.py
parentc548d1c7bac049c2a309bb3afac3694009a25b5f (diff)
downloadvyos-1x-28ba0ef32425ee458293a37a4a5ba664dfe577b2.tar.gz
vyos-1x-28ba0ef32425ee458293a37a4a5ba664dfe577b2.zip
op-mode: T4503: Prevent restart service if commit in progress
Prevent op-mode scripts from restarting services if commit in progress
Diffstat (limited to 'src/op_mode/conntrack_sync.py')
-rwxr-xr-xsrc/op_mode/conntrack_sync.py4
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')