Reduce route selection deferral timer for bgp graceful restart (#7533)

shi-su · web-flow · commit 8a48be9b74d4 · 2021-07-26T10:16:19.000-07:00
Why I did it There are scenarios that End-of-RIB comes from a part of the peers arrives after reconciliation. In such scenarios, if the route selection deferral timer has the default value of 360 seconds, FRR would not set up routes and all routes would be removed after reconciliation. This PR reduces the route selection deferral timer so that at least routes to parts of the peers get restored at the point of reconciliation. Fix #7488 How I did it Reduce route selection deferral timer for bgp graceful restart to 15 seconds.
diff --git a/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2 b/dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
@@ -57,6 +57,7 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}
   bgp graceful-restart restart-time {{ constants.bgp.graceful_restart.restart_time | default(240) }}
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time {{ constants.bgp.graceful_restart.select_defer_time | default(45) }}
 {% endif %}
 !
 {# set router-id #}
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
@@ -51,6 +51,7 @@ router bgp 55555
   bgp graceful-restart restart-time 480
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 55.55.55.55
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
@@ -30,6 +30,7 @@ router bgp 55555
   bgp graceful-restart restart-time 480
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 55.55.55.55
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
@@ -30,6 +30,7 @@ router bgp 55555
   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 55.55.55.55
 !
diff --git a/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf b/src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
@@ -70,6 +70,7 @@ router bgp 55555
   bgp graceful-restart restart-time 480
   bgp graceful-restart
   bgp graceful-restart preserve-fw-state
+  bgp graceful-restart select-defer-time 45
 !
   bgp router-id 55.55.55.55
 !
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
@@ -50,6 +50,7 @@ router bgp 65100
   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_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
@@ -49,6 +49,7 @@ router bgp 65100
   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 8.0.0.5
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
@@ -49,6 +49,7 @@ router bgp 65100
   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/frr.conf b/src/sonic-config-engine/tests/sample_output/py2/frr.conf
@@ -73,6 +73,7 @@ router bgp 65100
   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
@@ -66,6 +66,7 @@ router bgp 4000
   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 4.0.0.0
 !
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
@@ -50,6 +50,7 @@ router bgp 65100
   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_backend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
@@ -49,6 +49,7 @@ router bgp 65100
   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 8.0.0.5
 !
diff --git a/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf b/src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
@@ -49,6 +49,7 @@ router bgp 65100
   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/frr.conf b/src/sonic-config-engine/tests/sample_output/py3/frr.conf
@@ -73,6 +73,7 @@ router bgp 65100
   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/t2-chassis-fe-bgpd.conf b/src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf
@@ -66,6 +66,7 @@ router bgp 4000
   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 4.0.0.0
 !

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ router bgp {{ DEVICE_METADATA['localhost']['bgp_asn'] }}`
`57`	`57`	`bgp graceful-restart restart-time {{ constants.bgp.graceful_restart.restart_time \| default(240) }}`
`58`	`58`	`bgp graceful-restart`
`59`	`59`	`bgp graceful-restart preserve-fw-state`
	`60`	`+ bgp graceful-restart select-defer-time {{ constants.bgp.graceful_restart.select_defer_time \| default(45) }}`
`60`	`61`	`{% endif %}`
`61`	`62`	`!`
`62`	`63`	`{# set router-id #}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ router bgp 55555`
`51`	`51`	`bgp graceful-restart restart-time 480`
`52`	`52`	`bgp graceful-restart`
`53`	`53`	`bgp graceful-restart preserve-fw-state`
	`54`	`+ bgp graceful-restart select-defer-time 45`
`54`	`55`	`!`
`55`	`56`	`bgp router-id 55.55.55.55`
`56`	`57`	`!`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ router bgp 55555`
`30`	`30`	`bgp graceful-restart restart-time 480`
`31`	`31`	`bgp graceful-restart`
`32`	`32`	`bgp graceful-restart preserve-fw-state`
	`33`	`+ bgp graceful-restart select-defer-time 45`
`33`	`34`	`!`
`34`	`35`	`bgp router-id 55.55.55.55`
`35`	`36`	`!`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ router bgp 55555`
`70`	`70`	`bgp graceful-restart restart-time 480`
`71`	`71`	`bgp graceful-restart`
`72`	`72`	`bgp graceful-restart preserve-fw-state`
	`73`	`+ bgp graceful-restart select-defer-time 45`
`73`	`74`	`!`
`74`	`75`	`bgp router-id 55.55.55.55`
`75`	`76`	`!`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ router bgp 65100`
`50`	`50`	`bgp graceful-restart restart-time 240`
`51`	`51`	`bgp graceful-restart`
`52`	`52`	`bgp graceful-restart preserve-fw-state`
	`53`	`+ bgp graceful-restart select-defer-time 45`
`53`	`54`	`!`
`54`	`55`	`bgp router-id 10.1.0.32`
`55`	`56`	`!`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ router bgp 65100`
`49`	`49`	`bgp graceful-restart restart-time 240`
`50`	`50`	`bgp graceful-restart`
`51`	`51`	`bgp graceful-restart preserve-fw-state`
	`52`	`+ bgp graceful-restart select-defer-time 45`
`52`	`53`	`!`
`53`	`54`	`bgp router-id 8.0.0.5`
`54`	`55`	`!`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ router bgp 65100`
`73`	`73`	`bgp graceful-restart restart-time 240`
`74`	`74`	`bgp graceful-restart`
`75`	`75`	`bgp graceful-restart preserve-fw-state`
	`76`	`+ bgp graceful-restart select-defer-time 45`
`76`	`77`	`!`
`77`	`78`	`bgp router-id 10.1.0.32`
`78`	`79`	`!`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ router bgp 4000`
`66`	`66`	`bgp graceful-restart restart-time 240`
`67`	`67`	`bgp graceful-restart`
`68`	`68`	`bgp graceful-restart preserve-fw-state`
	`69`	`+ bgp graceful-restart select-defer-time 45`
`69`	`70`	`!`
`70`	`71`	`bgp router-id 4.0.0.0`
`71`	`72`	`!`