summaryrefslogtreecommitdiff
path: root/src/system/keepalived-fifo.py
diff options
context:
space:
mode:
authorViacheslav Hletenko <v.gletenko@vyos.io>2022-11-01 07:54:44 +0200
committerGitHub <noreply@github.com>2022-11-01 07:54:44 +0200
commitd7bc1326583408b0931d374ea6a538feba3880a9 (patch)
treec551ef16a06d5bd525f4226a0b91d27b30438a79 /src/system/keepalived-fifo.py
parent22c3dcbb01d731f0dab0ffefa2e5a0be7009baf1 (diff)
parent61bc664137d73c6b73e9db5157e1a7a79ab5cebd (diff)
downloadvyos-1x-d7bc1326583408b0931d374ea6a538feba3880a9.tar.gz
vyos-1x-d7bc1326583408b0931d374ea6a538feba3880a9.zip
Merge pull request #1632 from dmbaturin/vrrp-commit-in-progress
T4526: use informative error messages for keepalived-fifo with commit in progress
Diffstat (limited to 'src/system/keepalived-fifo.py')
-rwxr-xr-xsrc/system/keepalived-fifo.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/system/keepalived-fifo.py b/src/system/keepalived-fifo.py
index a0fccd1d0..864ee8419 100755
--- a/src/system/keepalived-fifo.py
+++ b/src/system/keepalived-fifo.py
@@ -67,13 +67,13 @@ class KeepalivedFifo:
# For VRRP configuration to be read, the commit must be finished
count = 1
while commit_in_progress():
- if ( count <= 40 ):
- logger.debug(f'commit in progress try: {count}')
+ if ( count <= 20 ):
+ logger.debug(f'Attempt to load keepalived configuration aborted due to a commit in progress (attempt {count}/20)')
else:
- logger.error(f'commit still in progress after {count} continuing anyway')
+ logger.error(f'Forced keepalived configuration loading despite a commit in progress ({count} wait time expired, not waiting further)')
break
count += 1
- time.sleep(0.5)
+ time.sleep(1)
try:
base = ['high-availability', 'vrrp']