summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2022-10-31 08:14:05 -0400
committerDaniil Baturin <daniil@vyos.io>2022-10-31 08:14:05 -0400
commit61bc664137d73c6b73e9db5157e1a7a79ab5cebd (patch)
tree4f420daf9020ea04d9507108d9a945e2b9ca29aa /src
parent2291f4c7a967bdc81fb19e89f27fb378b2ecd09b (diff)
downloadvyos-1x-61bc664137d73c6b73e9db5157e1a7a79ab5cebd.tar.gz
vyos-1x-61bc664137d73c6b73e9db5157e1a7a79ab5cebd.zip
T4526: use informative error messages for keepalived-fifo with commit in progress
Diffstat (limited to 'src')
-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']