From 4bc503b1fc4f374638c7ca64f5a81573bd449cce Mon Sep 17 00:00:00 2001 From: dgsudharsan Date: Thu, 16 Jan 2025 00:58:54 +0000 Subject: [PATCH 1/2] [BGP]Disable graceful restart to support scale scenario --- files/image_config/constants/constants.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/image_config/constants/constants.yml b/files/image_config/constants/constants.yml index 781055ba49b2..8e32052a2c1d 100644 --- a/files/image_config/constants/constants.yml +++ b/files/image_config/constants/constants.yml @@ -16,7 +16,7 @@ constants: use_deployment_id: false use_neighbors_meta: false graceful_restart: - enabled: true + enabled: false restart_time: 240 multipath_relax: enabled: true From d8b46276692a45b8808fb1ca6d43ab4fae69fa1b Mon Sep 17 00:00:00 2001 From: dgsudharsan Date: Fri, 17 Jan 2025 06:00:05 +0000 Subject: [PATCH 2/2] Fixing UT failures --- src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf | 4 ---- .../tests/sample_output/py2/bgpd_frr_bmp.conf | 4 ---- .../tests/sample_output/py2/bgpd_frr_dualtor.conf | 4 ---- .../tests/sample_output/py2/bgpd_quagga.conf | 2 -- src/sonic-config-engine/tests/sample_output/py2/frr.conf | 4 ---- .../tests/sample_output/py2/t2-chassis-fe-bgpd.conf | 2 -- src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf | 4 ---- .../tests/sample_output/py3/bgpd_frr_bmp.conf | 4 ---- .../tests/sample_output/py3/bgpd_frr_dualtor.conf | 4 ---- .../tests/sample_output/py3/bgpd_quagga.conf | 2 -- src/sonic-config-engine/tests/sample_output/py3/frr.conf | 4 ---- 11 files changed, 38 deletions(-) diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf index 11272757855b..66af8984755a 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf +++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf @@ -48,10 +48,6 @@ router bgp 65100 ! bgp bestpath as-path multipath-relax ! - bgp graceful-restart restart-time 240 - bgp graceful-restart - bgp graceful-restart preserve-fw-state - bgp graceful-restart select-defer-time 45 ! bgp router-id 10.1.0.32 ! diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_bmp.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_bmp.conf index 827b287e57f1..c7d9c560aacb 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_bmp.conf +++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_bmp.conf @@ -48,10 +48,6 @@ router bgp 65100 ! bgp bestpath as-path multipath-relax ! - bgp graceful-restart restart-time 240 - bgp graceful-restart - bgp graceful-restart preserve-fw-state - bgp graceful-restart select-defer-time 45 ! ! bmp mirror buffer-limit 4294967214 diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_dualtor.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_dualtor.conf index fb1af604c40e..00a4717d1c15 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_dualtor.conf +++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_dualtor.conf @@ -49,10 +49,6 @@ router bgp 65100 ! bgp bestpath as-path multipath-relax ! - bgp graceful-restart restart-time 240 - bgp graceful-restart - bgp graceful-restart preserve-fw-state - bgp graceful-restart select-defer-time 45 ! bgp router-id 10.1.0.32 ! diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_quagga.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_quagga.conf index fb8bd1d9d9d9..9a8f4d9e20f0 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/bgpd_quagga.conf +++ b/src/sonic-config-engine/tests/sample_output/py2/bgpd_quagga.conf @@ -20,8 +20,6 @@ router bgp 65100 bgp log-neighbor-changes bgp bestpath as-path multipath-relax no bgp default ipv4-unicast - bgp graceful-restart restart-time 240 - bgp graceful-restart bgp router-id 10.1.0.32 network 10.1.0.32/32 address-family ipv6 diff --git a/src/sonic-config-engine/tests/sample_output/py2/frr.conf b/src/sonic-config-engine/tests/sample_output/py2/frr.conf index 679871f68a2a..2f281dc4e6f0 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/frr.conf +++ b/src/sonic-config-engine/tests/sample_output/py2/frr.conf @@ -68,10 +68,6 @@ router bgp 65100 ! bgp bestpath as-path multipath-relax ! - bgp graceful-restart restart-time 240 - bgp graceful-restart - bgp graceful-restart preserve-fw-state - bgp graceful-restart select-defer-time 45 ! bgp router-id 10.1.0.32 ! diff --git a/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf b/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf index 0b0446aad9e2..2f5070f26d4c 100644 --- a/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf +++ b/src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf @@ -26,8 +26,6 @@ router bgp 4000 vrf VnetFE bgp log-neighbor-changes bgp bestpath as-path multipath-relax no bgp default ipv4-unicast - bgp graceful-restart restart-time 240 - bgp graceful-restart bgp router-id 4.0.0.0 neighbor 192.168.0.1 remote-as 3000 neighbor 192.168.0.1 description Leaf01 diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf index 5db248ab8521..f49e453146bf 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf +++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf @@ -48,10 +48,6 @@ router bgp 65100 ! bgp bestpath as-path multipath-relax ! - bgp graceful-restart restart-time 240 - bgp graceful-restart - bgp graceful-restart preserve-fw-state - bgp graceful-restart select-defer-time 45 ! bgp router-id 10.1.0.32 ! diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_bmp.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_bmp.conf index 827b287e57f1..c7d9c560aacb 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_bmp.conf +++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_bmp.conf @@ -48,10 +48,6 @@ router bgp 65100 ! bgp bestpath as-path multipath-relax ! - bgp graceful-restart restart-time 240 - bgp graceful-restart - bgp graceful-restart preserve-fw-state - bgp graceful-restart select-defer-time 45 ! ! bmp mirror buffer-limit 4294967214 diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_dualtor.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_dualtor.conf index 2d769fc05dd1..f84ee9000229 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_dualtor.conf +++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_dualtor.conf @@ -49,10 +49,6 @@ router bgp 65100 ! bgp bestpath as-path multipath-relax ! - bgp graceful-restart restart-time 240 - bgp graceful-restart - bgp graceful-restart preserve-fw-state - bgp graceful-restart select-defer-time 45 ! bgp router-id 10.1.0.32 ! diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_quagga.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_quagga.conf index 6c2734473939..84102f239fdc 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/bgpd_quagga.conf +++ b/src/sonic-config-engine/tests/sample_output/py3/bgpd_quagga.conf @@ -20,8 +20,6 @@ router bgp 65100 bgp log-neighbor-changes bgp bestpath as-path multipath-relax no bgp default ipv4-unicast - bgp graceful-restart restart-time 240 - bgp graceful-restart bgp router-id 10.1.0.32 network 10.1.0.32/32 address-family ipv6 diff --git a/src/sonic-config-engine/tests/sample_output/py3/frr.conf b/src/sonic-config-engine/tests/sample_output/py3/frr.conf index 17d7f561db03..58d48dc01343 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/frr.conf +++ b/src/sonic-config-engine/tests/sample_output/py3/frr.conf @@ -68,10 +68,6 @@ router bgp 65100 ! bgp bestpath as-path multipath-relax ! - bgp graceful-restart restart-time 240 - bgp graceful-restart - bgp graceful-restart preserve-fw-state - bgp graceful-restart select-defer-time 45 ! bgp router-id 10.1.0.32 !