summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-11-27 10:32:02 +0100
committerChristian Poessinger <christian@poessinger.com>2021-11-27 10:47:48 +0100
commit3800ea910a72a4d1a78b63f235980d9414747816 (patch)
treeb9e88cda0119ae7161d3f510debdd64f3c17a8d9 /src/conf_mode
parentfe0038c21b170f1b54a5a4461ca3aaade1ef93b7 (diff)
downloadvyos-1x-3800ea910a72a4d1a78b63f235980d9414747816.tar.gz
vyos-1x-3800ea910a72a4d1a78b63f235980d9414747816.zip
isis: T3753: reload config five (5) times - workaround for FRR issue #10133
Re-applying the same configuration after it failed the first times makes it load. See https://github.com/FRRouting/frr/issues/10133 for more details
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/protocols_isis.py10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/conf_mode/protocols_isis.py b/src/conf_mode/protocols_isis.py
index 3a0c40dc6..5d02de869 100755
--- a/src/conf_mode/protocols_isis.py
+++ b/src/conf_mode/protocols_isis.py
@@ -234,7 +234,15 @@ def apply(isis):
if 'frr_isisd_config' in isis:
frr_cfg.add_before(frr.default_add_before, isis['frr_isisd_config'])
- frr_cfg.commit_configuration(isis_daemon)
+
+ # https://github.com/FRRouting/frr/issues/XXXX
+ count = 0
+ while count <= 5:
+ count += 1
+ try:
+ frr_cfg.commit_configuration(isis_daemon)
+ except:
+ pass
# Save configuration to /run/frr/config/frr.conf
frr.save_configuration()