proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-18 06:54:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10297 from ton31337/fix/gr_can_be_0

Browse Source 
bgpd: Graceful Restart restart-time can be 0
This commit is contained in:
Donald Sharp 2022-01-06 07:26:03 -05:00 committed by GitHub
commit dca7ea2e02
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bgpd/bgp_vty.c
View File

@ -2704,7 +2704,7 @@ DEFUN (bgp_graceful_restart_stalepath_time,
DEFUN (bgp_graceful_restart_restart_time, DEFUN (bgp_graceful_restart_restart_time,
bgp_graceful_restart_restart_time_cmd, bgp_graceful_restart_restart_time_cmd,
"bgp graceful-restart restart-time (1-4095)", "bgp graceful-restart restart-time (0-4095)",
BGP_STR BGP_STR
"Graceful restart capability parameters\n" "Graceful restart capability parameters\n"
"Set the time to wait to delete stale routes before a BGP open message is received\n" "Set the time to wait to delete stale routes before a BGP open message is received\n"
@ -2758,7 +2758,7 @@ DEFUN (no_bgp_graceful_restart_stalepath_time,
DEFUN (no_bgp_graceful_restart_restart_time, DEFUN (no_bgp_graceful_restart_restart_time,
no_bgp_graceful_restart_restart_time_cmd, no_bgp_graceful_restart_restart_time_cmd,
"no bgp graceful-restart restart-time [(1-4095)]", "no bgp graceful-restart restart-time [(0-4095)]",
NO_STR NO_STR
BGP_STR BGP_STR
"Graceful restart capability parameters\n" "Graceful restart capability parameters\n"

11
doc/user/bgp.rst
View File

@ -924,6 +924,17 @@ However, it MUST defer route selection for an address family until it either.
This is command, will set the time for which stale routes are kept in RIB. This is command, will set the time for which stale routes are kept in RIB.
.. clicmd:: bgp graceful-restart restart-time (0-4095)
Set the time to wait to delete stale routes before a BGP open message
is received.
Using with Long-lived Graceful Restart capability, this is recommended
setting this timer to 0 and control stale routes with
``bgp long-lived-graceful-restart stale-time``.
Default value is 120.
.. clicmd:: bgp graceful-restart stalepath-time (1-4095) .. clicmd:: bgp graceful-restart stalepath-time (1-4095)
This is command, will set the max time (in seconds) to hold onto This is command, will set the max time (in seconds) to hold onto

2
tests/topotests/bgp_llgr/r0/bgpd.conf
View File

@ -1,7 +1,7 @@
router bgp 65000 router bgp 65000
no bgp ebgp-requires-policy no bgp ebgp-requires-policy
bgp graceful-restart bgp graceful-restart
bgp graceful-restart restart-time 1 bgp graceful-restart restart-time 0
bgp long-lived-graceful-restart stale-time 20 bgp long-lived-graceful-restart stale-time 20
neighbor 192.168.0.2 remote-as external neighbor 192.168.0.2 remote-as external
address-family ipv4 unicast address-family ipv4 unicast

2
tests/topotests/bgp_llgr/r1/bgpd.conf
View File

@ -1,7 +1,7 @@
router bgp 65001 router bgp 65001
no bgp ebgp-requires-policy no bgp ebgp-requires-policy
bgp graceful-restart bgp graceful-restart
bgp graceful-restart restart-time 1 bgp graceful-restart restart-time 0
bgp long-lived-graceful-restart stale-time 20 bgp long-lived-graceful-restart stale-time 20
neighbor 192.168.1.2 remote-as external neighbor 192.168.1.2 remote-as external
address-family ipv4 unicast address-family ipv4 unicast