Add route-map delay timer

When the default value of 5 seconds is being used, Graceful-Restart can break momentarily on reconnect of BGP peering. The restarter FRR when that timeout expires and the route-maps have not been processed, denies the routes, and therefore are removed. ``` DEBUG #bgpd[45]: Route-map: null, prefix: 99.0.0.0/24, result: deny DEBUG #bgpd[45]: 10.0.64.1 [Update:SEND] 99.0.0.0/24 is filtered by route-map ``` FRRouting/frr#10757 FRRouting/frr#10756 Signed-off-by: karampok <karampok@gmail.com>
karampok · Oct 28, 2024 · 414a455 · 414a455
1 parent bfeacb8
commit 414a455
Show file tree

Hide file tree

Showing 20 changed files with 21 additions and 0 deletions.
diff --git a/internal/frr/templates/frr.tmpl b/internal/frr/templates/frr.tmpl
@@ -19,6 +19,8 @@ debug route-map detail
 hostname {{.Hostname}}
 ip nht resolve-via-default
 ipv6 nht resolve-via-default
+bgp route-map delay-timer 20
+
 
 {{- range $r := .Routers }}
 {{- range .Neighbors }}

diff --git a/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6.golden b/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6.golden
@@ -3,6 +3,7 @@ log timestamp precision 3
 hostname dummyhostname
 ip nht resolve-via-default
 ipv6 nht resolve-via-default
+bgp route-map delay-timer 20
 
 
 

diff --git a/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6DisableMP.golden b/internal/frr/testdata/TestMultipleNeighborsOneV4AndOneV6DisableMP.golden
@@ -3,6 +3,7 @@ log timestamp precision 3
 hostname dummyhostname
 ip nht resolve-via-default
 ipv6 nht resolve-via-default
+bgp route-map delay-timer 20
 
 
 

diff --git a/internal/frr/testdata/TestMultipleRoutersImportVRFs.golden b/internal/frr/testdata/TestMultipleRoutersImportVRFs.golden
@@ -3,6 +3,7 @@ log timestamp precision 3
 hostname dummyhostname
 ip nht resolve-via-default
 ipv6 nht resolve-via-default
+bgp route-map delay-timer 20
 
 
 route-map 192.168.1.2-out permit 1

diff --git a/internal/frr/testdata/TestMultipleRoutersMultipleNeighs.golden b/internal/frr/testdata/TestMultipleRoutersMultipleNeighs.golden
@@ -3,6 +3,7 @@ log timestamp precision 3
 hostname dummyhostname
 ip nht resolve-via-default
 ipv6 nht resolve-via-default
+bgp route-map delay-timer 20
 
 
 

diff --git a/internal/frr/testdata/TestSingleSession b/internal/frr/testdata/TestSingleSession
@@ -3,6 +3,7 @@ log timestamp precision 3
 hostname dummyhostname
 ip nht resolve-via-default
 ipv6 nht resolve-via-default
+bgp route-map delay-timer 20
 
 
 

diff --git a/internal/frr/testdata/TestSingleSession.golden b/internal/frr/testdata/TestSingleSession.golden
@@ -3,6 +3,7 @@ log timestamp precision 3
 hostname dummyhostname
 ip nht resolve-via-default
 ipv6 nht resolve-via-default
+bgp route-map delay-timer 20
 
 
 

diff --git a/internal/frr/testdata/TestSingleSessionBFD.golden b/internal/frr/testdata/TestSingleSessionBFD.golden
@@ -3,6 +3,7 @@ log timestamp precision 3
 hostname dummyhostname
 ip nht resolve-via-default
 ipv6 nht resolve-via-default
+bgp route-map delay-timer 20
 
 
 route-map 192.168.1.2-out permit 1

diff --git a/internal/frr/testdata/TestSingleSessionWithAlwaysBlock.golden b/internal/frr/testdata/TestSingleSessionWithAlwaysBlock.golden
@@ -3,6 +3,7 @@ log timestamp precision 3
 hostname dummyhostname
 ip nht resolve-via-default
 ipv6 nht resolve-via-default
+bgp route-map delay-timer 20
 
 
 route-map 192.168.1.2-out permit 1

diff --git a/internal/frr/testdata/TestSingleSessionWithEBGPMultihop.golden b/internal/frr/testdata/TestSingleSessionWithEBGPMultihop.golden
@@ -3,6 +3,7 @@ log timestamp precision 3
 hostname dummyhostname
 ip nht resolve-via-default
 ipv6 nht resolve-via-default
+bgp route-map delay-timer 20
 
 
 

diff --git a/internal/frr/testdata/TestSingleSessionWithEBGPMultihopAndExtras.golden b/internal/frr/testdata/TestSingleSessionWithEBGPMultihopAndExtras.golden
@@ -3,6 +3,7 @@ log timestamp precision 3
 hostname dummyhostname
 ip nht resolve-via-default
 ipv6 nht resolve-via-default
+bgp route-map delay-timer 20
 
 
 

diff --git a/internal/frr/testdata/TestSingleSessionWithExternalASN.golden b/internal/frr/testdata/TestSingleSessionWithExternalASN.golden
@@ -3,6 +3,7 @@ log timestamp precision 3
 hostname dummyhostname
 ip nht resolve-via-default
 ipv6 nht resolve-via-default
+bgp route-map delay-timer 20
 
 
 

diff --git a/internal/frr/testdata/TestSingleSessionWithGracefulRestart.golden b/internal/frr/testdata/TestSingleSessionWithGracefulRestart.golden
@@ -3,6 +3,7 @@ log timestamp precision 3
 hostname dummyhostname
 ip nht resolve-via-default
 ipv6 nht resolve-via-default
+bgp route-map delay-timer 20
 
 
 route-map 192.168.1.2-out permit 1

diff --git a/internal/frr/testdata/TestSingleSessionWithIPv6SingleHop.golden b/internal/frr/testdata/TestSingleSessionWithIPv6SingleHop.golden
@@ -3,6 +3,7 @@ log timestamp precision 3
 hostname dummyhostname
 ip nht resolve-via-default
 ipv6 nht resolve-via-default
+bgp route-map delay-timer 20
 
 
 

diff --git a/internal/frr/testdata/TestSingleSessionWithInternalASN.golden b/internal/frr/testdata/TestSingleSessionWithInternalASN.golden
@@ -3,6 +3,7 @@ log timestamp precision 3
 hostname dummyhostname
 ip nht resolve-via-default
 ipv6 nht resolve-via-default
+bgp route-map delay-timer 20
 
 
 

diff --git a/internal/frr/testdata/TestTwoRoutersTwoNeighbors.golden b/internal/frr/testdata/TestTwoRoutersTwoNeighbors.golden
@@ -3,6 +3,7 @@ log timestamp precision 3
 hostname dummyhostname
 ip nht resolve-via-default
 ipv6 nht resolve-via-default
+bgp route-map delay-timer 20
 
 
 

diff --git a/internal/frr/testdata/TestTwoRoutersTwoNeighborsBFD.golden b/internal/frr/testdata/TestTwoRoutersTwoNeighborsBFD.golden
@@ -3,6 +3,7 @@ log timestamp precision 3
 hostname dummyhostname
 ip nht resolve-via-default
 ipv6 nht resolve-via-default
+bgp route-map delay-timer 20
 
 
 route-map 192.168.1.2-out permit 1

diff --git a/internal/frr/testdata/TestTwoSessionsAcceptAll.golden b/internal/frr/testdata/TestTwoSessionsAcceptAll.golden
@@ -3,6 +3,7 @@ log timestamp precision 3
 hostname dummyhostname
 ip nht resolve-via-default
 ipv6 nht resolve-via-default
+bgp route-map delay-timer 20
 
 
 route-map 192.168.1.2-out permit 1

diff --git a/internal/frr/testdata/TestTwoSessionsAcceptSomeV4.golden b/internal/frr/testdata/TestTwoSessionsAcceptSomeV4.golden
@@ -3,6 +3,7 @@ log timestamp precision 3
 hostname dummyhostname
 ip nht resolve-via-default
 ipv6 nht resolve-via-default
+bgp route-map delay-timer 20
 
 
 route-map 192.168.1.2-out permit 1

diff --git a/internal/frr/testdata/TestTwoSessionsAcceptV4AndV6.golden b/internal/frr/testdata/TestTwoSessionsAcceptV4AndV6.golden
@@ -3,6 +3,7 @@ log timestamp precision 3
 hostname dummyhostname
 ip nht resolve-via-default
 ipv6 nht resolve-via-default
+bgp route-map delay-timer 20
 
 
 route-map 192.168.1.2-out permit 1