matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Shi Su 2021-07-26 10:16:19 -07:00 committed by Qi Luo
parent 006582b3e2
commit 60ac485f96
15 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dockers/docker-fpm-frr/frr/bgpd/bgpd.main.conf.j2
View File

@ -52,6 +52,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 #}

1
src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.conf.j2/all.conf
View File

@ -47,6 +47,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
!

1
src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/all.conf
View File

@ -29,6 +29,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
!

1
src/sonic-bgpcfgd/tests/data/sonic-cfggen/bgpd.main.conf.j2/defaults.conf
View File

@ -29,6 +29,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
!

1
src/sonic-bgpcfgd/tests/data/sonic-cfggen/frr.conf.j2/all.conf
View File

@ -66,6 +66,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
!

1
src/sonic-config-engine/tests/sample_output/py2/bgpd_frr.conf
View File

@ -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
!

1
src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_backend_asic.conf
View File

@ -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
!

1
src/sonic-config-engine/tests/sample_output/py2/bgpd_frr_frontend_asic.conf
View File

@ -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
!

1
src/sonic-config-engine/tests/sample_output/py2/frr.conf
View File

@ -69,6 +69,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
!

1
src/sonic-config-engine/tests/sample_output/py2/t2-chassis-fe-bgpd.conf
View File

@ -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
!

1
src/sonic-config-engine/tests/sample_output/py3/bgpd_frr.conf
View File

@ -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
!

1
src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_backend_asic.conf
View File

@ -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
!

1
src/sonic-config-engine/tests/sample_output/py3/bgpd_frr_frontend_asic.conf
View File

@ -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
!

1
src/sonic-config-engine/tests/sample_output/py3/frr.conf
View File

@ -69,6 +69,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
!

1
src/sonic-config-engine/tests/sample_output/py3/t2-chassis-fe-bgpd.conf
View File

@ -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
!