bgpd:send EOR during GR only when fib install comeplete for wfi enabled by vijayalaxmi-basavaraj · Pull Request #19522 · FRRouting/frr

vijayalaxmi-basavaraj · 2025-09-02T22:07:24Z

Currently during GR, EOR is sent to neighbor prematurely for wfi enabled case. below fix has be implemented.
keep a counter to track the routes installed in FIB.Increamnet
counter when bgp send route install to zebra, decreamnet counter when
fib install ack to received from zebra in bgp.when this count reaches
zero and route deferred count is 0 ad gr route syn pending is set, then
do further processing of sending EOR and zebra gr update complete.
This will send EOR as soon as last route fib install ack is received.

Testing:
before:
2020:2025/08/19 21:23:53.786402 BGP: [ZP3RE-J4Q8C] send End-of-RIB for IPv4 Unicast to swp1s1.3 2021:2025/08/19 21:23:53.786412 BGP: [ZP3RE-J4Q8C] send End-of-RIB for IPv6 Unicast to swp1s0.3 2022:2025/08/19 21:23:53.786415 BGP: [ZP3RE-J4Q8C] send End-of-RIB for IPv4 Unicast to swp1s0.3 2511:2025/08/19 21:23:54.162310 BGP: [TN0HX-6G1RR] u1:s5 send UPDATE w/ attr: , origin ?, mp_nexthop ::(::), path 64900 56000 2512:2025/08/19 21:23:54.162314 BGP: [H06SA-0JAPR] u1:s5 send MP_REACH for afi/safi IPv4/unicast 2513:2025/08/19 21:23:54.162316 BGP: [HVRWP-5R9NQ] u1:s5 send UPDATE 91.0.0.49/32 IPv4 unicast

after:
4270:2025/08/22 17:41:41.631993 BGP: [HVRWP-5R9NQ] u2:s2 send UPDATE 2003:1::/125 IPv6 unicast 4271:2025/08/22 17:41:41.631998 BGP: [HVRWP-5R9NQ] u2:s2 send UPDATE 2003:7:2::/125 IPv6 unicast 4272:2025/08/22 17:41:41.632003 BGP: [WEV7K-2GAQ5] u2:s2 send UPDATE len 116 (max message len: 65535) numpfx 2 4273:2025/08/22 17:41:41.632008 BGP: [JJ5V1-EZ0XX] u2:s2 swp1s1 send UPDATE w/ mp_nexthops 2003:0:1::1, fe80::1e34:daff:febe:4169 4274:2025/08/22 17:41:41.632041 BGP: [ZP3RE-J4Q8C] send End-of-RIB for IPv4 Unicast to swp1s1 4275:2025/08/22 17:41:41.632054 BGP: [ZP3RE-J4Q8C] send End-of-RIB for IPv6 Unicast to swp1s1

ton31337

Please use something like a "normal" variable name instead of the wfi abbreviation, which is "not friendly". And, can we have a topotest to verify this behavior?

UPDATE1 => Styling MUST be fixed too.

github-actions · 2025-09-08T07:13:47Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

ton31337

Please don't use public IP ranges in topotests and don't use topojson (it's horrible to debug it).

vijayalaxmi-basavaraj · 2025-09-16T19:02:08Z

Please use something like a "normal" variable name instead of the wfi abbreviation, which is "not friendly". And, can we have a topotest to verify this behavior?

UPDATE1 => Styling MUST be fixed too.

Done

vijayalaxmi-basavaraj · 2025-09-16T19:03:28Z

Please don't use public IP ranges in topotests and don't use topojson (it's horrible to debug it).
Done

vijayalaxmi-basavaraj · 2025-09-17T00:37:49Z

ci: rerun

soumyar-roy · 2025-09-17T01:23:51Z

ci:rerun

vijayalaxmi-basavaraj · 2025-09-17T03:26:20Z

ci:rerun

ton31337

Please use frr.conf (a single config for loading all configurations, without bgpd/zebra/etc.);
Drop all debug, log from configs;
No sleep() in topotests, replace all using topotest.run_and_expect();
No public IPs in topotests.

bgpd/bgp_route.c

tests/topotests/bgp_gr_fib_suppress/r1/bgpd.conf

tests/topotests/bgp_gr_fib_suppress/r2/bgpd.conf

tests/topotests/bgp_gr_fib_suppress/test_bgp_gr_fib_suppress.py

bgpd/bgpd.h

tests/topotests/bgp_gr_fib_suppress/r1/frr.conf

tests/topotests/bgp_gr_fib_suppress/test_bgp_gr_fib_suppress.py

vijayalaxmi-basavaraj · 2025-09-18T22:59:19Z

ci: rerun

vijayalaxmi-basavaraj · 2025-09-19T01:20:49Z

ci: rerun

vijayalaxmi-basavaraj · 2025-09-19T01:45:32Z

ci:rerun

tests/topotests/bgp_gr_fib_suppress/test_bgp_gr_fib_suppress.py

tests/topotests/bgp_gr_fib_suppress/r1/frr.conf

…fib enabled Currently during GR, EOR is sent to neighbor prematurely for suppress fib enabled case. below fix has be implemented. keep a counter to track the routes installed in FIB.Increamnet counter when bgp send route install to zebra, decreamnet counter when fib install ack to received from zebra in bgp.when this count reaches zero and route deferred count is 0 ad gr route syn pending is set, then do further processing of sending EOR and zebra gr update complete. This will send EOR as soon as last route fib install ack is received. Testing: before: 2020:2025/08/19 21:23:53.786402 BGP: [ZP3RE-J4Q8C] send End-of-RIB for IPv4 Unicast to swp1s1.3 2021:2025/08/19 21:23:53.786412 BGP: [ZP3RE-J4Q8C] send End-of-RIB for IPv6 Unicast to swp1s0.3 2022:2025/08/19 21:23:53.786415 BGP: [ZP3RE-J4Q8C] send End-of-RIB for IPv4 Unicast to swp1s0.3 2511:2025/08/19 21:23:54.162310 BGP: [TN0HX-6G1RR] u1:s5 send UPDATE w/ attr: , origin ?, mp_nexthop ::(::), path 64900 56000 2512:2025/08/19 21:23:54.162314 BGP: [H06SA-0JAPR] u1:s5 send MP_REACH for afi/safi IPv4/unicast 2513:2025/08/19 21:23:54.162316 BGP: [HVRWP-5R9NQ] u1:s5 send UPDATE 91.0.0.49/32 IPv4 unicast after: 4270:2025/08/22 17:41:41.631993 BGP: [HVRWP-5R9NQ] u2:s2 send UPDATE 2003:1::/125 IPv6 unicast 4271:2025/08/22 17:41:41.631998 BGP: [HVRWP-5R9NQ] u2:s2 send UPDATE 2003:7:2::/125 IPv6 unicast 4272:2025/08/22 17:41:41.632003 BGP: [WEV7K-2GAQ5] u2:s2 send UPDATE len 116 (max message len: 65535) numpfx 2 4273:2025/08/22 17:41:41.632008 BGP: [JJ5V1-EZ0XX] u2:s2 swp1s1 send UPDATE w/ mp_nexthops 2003:0:1::1, fe80::1e34:daff:febe:4169 4274:2025/08/22 17:41:41.632041 BGP: [ZP3RE-J4Q8C] send End-of-RIB for IPv4 Unicast to swp1s1 4275:2025/08/22 17:41:41.632054 BGP: [ZP3RE-J4Q8C] send End-of-RIB for IPv6 Unicast to swp1s1 Signed-off-by: Vijayalaxmi Basavaraj <vbasavaraj@nvidia.com>

ton31337

LGTM

vijayalaxmi-basavaraj · 2025-09-23T18:20:40Z

ci:rerun

vijayalaxmi-basavaraj · 2025-09-26T18:35:25Z

ci:rerun

vijayalaxmi-basavaraj · 2025-09-26T21:04:20Z

ci:rerun

frrbot bot added the bgp label Sep 2, 2025

github-actions bot added master size/L labels Sep 2, 2025

vijayalaxmi-basavaraj marked this pull request as draft September 2, 2025 22:07

ton31337 requested changes Sep 3, 2025

View reviewed changes

github-actions bot added the conflicts label Sep 8, 2025

vijayalaxmi-basavaraj force-pushed the bgp_gr_wait_forfib_install branch from 2a8b2ca to 6525259 Compare September 9, 2025 01:07

github-actions bot removed the conflicts label Sep 9, 2025

riw777 self-requested a review September 9, 2025 14:59

vijayalaxmi-basavaraj force-pushed the bgp_gr_wait_forfib_install branch from 6525259 to a2379a5 Compare September 10, 2025 23:35

github-actions bot added size/XXL and removed size/L labels Sep 10, 2025

ton31337 requested changes Sep 11, 2025

View reviewed changes

vijayalaxmi-basavaraj force-pushed the bgp_gr_wait_forfib_install branch 2 times, most recently from 76f6706 to 4b68712 Compare September 16, 2025 19:01

vijayalaxmi-basavaraj marked this pull request as ready for review September 16, 2025 19:05

vijayalaxmi-basavaraj force-pushed the bgp_gr_wait_forfib_install branch 3 times, most recently from d18ebbc to a993c53 Compare September 16, 2025 20:36

ton31337 requested changes Sep 17, 2025

View reviewed changes

vijayalaxmi-basavaraj force-pushed the bgp_gr_wait_forfib_install branch 2 times, most recently from e88c7a9 to 0359408 Compare September 18, 2025 05:48

ton31337 reviewed Sep 18, 2025

View reviewed changes

vijayalaxmi-basavaraj force-pushed the bgp_gr_wait_forfib_install branch from 0359408 to 28b1106 Compare September 18, 2025 19:21

ton31337 reviewed Sep 19, 2025

View reviewed changes

vijayalaxmi-basavaraj force-pushed the bgp_gr_wait_forfib_install branch from 28b1106 to 5de5a26 Compare September 19, 2025 19:16

github-actions bot added the rebase PR needs rebase label Sep 19, 2025

vijayalaxmi-basavaraj force-pushed the bgp_gr_wait_forfib_install branch from 5de5a26 to 95f0a2b Compare September 20, 2025 03:14

ton31337 approved these changes Sep 22, 2025

View reviewed changes

ton31337 merged commit 53aeb10 into FRRouting:master Sep 27, 2025
13 checks passed

This was referenced Oct 1, 2025

[FRR] send EOR during GR only when fib install complete sonic-net/sonic-buildimage#24174

Closed

[202505][FRR] send EOR during GR only when fib install complete sonic-net/sonic-buildimage#24176

Closed

stepanblyschak mentioned this pull request Nov 10, 2025

Test Gap: Missing GR/EOR test cases with suppress FIB enabled sonic-net/sonic-mgmt#21249

Open

vivekrnv mentioned this pull request Jan 29, 2026

[FRR] send EOR during GR only when fib install complete sonic-net/sonic-buildimage#25269

Merged

8 tasks

Conversation

vijayalaxmi-basavaraj commented Sep 2, 2025

Uh oh!

ton31337 left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Sep 8, 2025

Uh oh!

ton31337 left a comment

Choose a reason for hiding this comment

Uh oh!

vijayalaxmi-basavaraj commented Sep 16, 2025

Uh oh!

vijayalaxmi-basavaraj commented Sep 16, 2025

Uh oh!

vijayalaxmi-basavaraj commented Sep 17, 2025

Uh oh!

soumyar-roy commented Sep 17, 2025

Uh oh!

vijayalaxmi-basavaraj commented Sep 17, 2025

Uh oh!

ton31337 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

vijayalaxmi-basavaraj commented Sep 18, 2025

Uh oh!

vijayalaxmi-basavaraj commented Sep 19, 2025

Uh oh!

vijayalaxmi-basavaraj commented Sep 19, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ton31337 left a comment

Choose a reason for hiding this comment

Uh oh!

vijayalaxmi-basavaraj commented Sep 23, 2025

Uh oh!

vijayalaxmi-basavaraj commented Sep 26, 2025

Uh oh!

vijayalaxmi-basavaraj commented Sep 26, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ton31337 left a comment •

edited

Loading