diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2022-01-06 07:26:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-06 07:26:03 -0500 |
| commit | dca7ea2e02e761390e343b43d1b13d0ac485414c (patch) | |
| tree | 4ea9d143c5874b3910be682485b1d22170fae8d3 | |
| parent | 4f5b13b504380dad84d67a212fac5a8b70c83687 (diff) | |
| parent | dcbebfd3ff0e0c7ac867847eb3f2daa6dd644f0c (diff) | |
Merge pull request #10297 from ton31337/fix/gr_can_be_0
bgpd: Graceful Restart restart-time can be 0
| -rw-r--r-- | bgpd/bgp_vty.c | 4 | ||||
| -rw-r--r-- | doc/user/bgp.rst | 11 | ||||
| -rw-r--r-- | tests/topotests/bgp_llgr/r0/bgpd.conf | 2 | ||||
| -rw-r--r-- | tests/topotests/bgp_llgr/r1/bgpd.conf | 2 |
4 files changed, 15 insertions, 4 deletions
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c index 2581714f31..e3340985c4 100644 --- a/bgpd/bgp_vty.c +++ b/bgpd/bgp_vty.c @@ -2704,7 +2704,7 @@ DEFUN (bgp_graceful_restart_stalepath_time, DEFUN (bgp_graceful_restart_restart_time, bgp_graceful_restart_restart_time_cmd, - "bgp graceful-restart restart-time (1-4095)", + "bgp graceful-restart restart-time (0-4095)", BGP_STR "Graceful restart capability parameters\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, 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 BGP_STR "Graceful restart capability parameters\n" diff --git a/doc/user/bgp.rst b/doc/user/bgp.rst index dfd865bf33..c647d69999 100644 --- a/doc/user/bgp.rst +++ b/doc/user/bgp.rst @@ -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. +.. 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) This is command, will set the max time (in seconds) to hold onto diff --git a/tests/topotests/bgp_llgr/r0/bgpd.conf b/tests/topotests/bgp_llgr/r0/bgpd.conf index 8ca5f5575b..d93ee193bc 100644 --- a/tests/topotests/bgp_llgr/r0/bgpd.conf +++ b/tests/topotests/bgp_llgr/r0/bgpd.conf @@ -1,7 +1,7 @@ router bgp 65000 no bgp ebgp-requires-policy bgp graceful-restart - bgp graceful-restart restart-time 1 + bgp graceful-restart restart-time 0 bgp long-lived-graceful-restart stale-time 20 neighbor 192.168.0.2 remote-as external address-family ipv4 unicast diff --git a/tests/topotests/bgp_llgr/r1/bgpd.conf b/tests/topotests/bgp_llgr/r1/bgpd.conf index 9b19cc62ad..f8c9877730 100644 --- a/tests/topotests/bgp_llgr/r1/bgpd.conf +++ b/tests/topotests/bgp_llgr/r1/bgpd.conf @@ -1,7 +1,7 @@ router bgp 65001 no bgp ebgp-requires-policy bgp graceful-restart - bgp graceful-restart restart-time 1 + bgp graceful-restart restart-time 0 bgp long-lived-graceful-restart stale-time 20 neighbor 192.168.1.2 remote-as external address-family ipv4 unicast |