Skip to content

[FRR] send EOR during GR only when fib install complete#25269

Merged
eddieruan-alibaba merged 6 commits intosonic-net:masterfrom
vivekrnv:frr-gr-fix
Feb 18, 2026
Merged

[FRR] send EOR during GR only when fib install complete#25269
eddieruan-alibaba merged 6 commits intosonic-net:masterfrom
vivekrnv:frr-gr-fix

Conversation

@vivekrnv
Copy link
Contributor

Why I did it

EOR was sent before all routes are advertised when suppress-fib-pending is enabled, this leads to packet loss, due to peer doing route reconciliation for incomplete RIB.

BACKPORT of upstream FRR fix - FRRouting/frr#19522

Work item tracking
  • Microsoft ADO (number only):

How I did it

Backport FRR fix.

How to verify it

Setup topogy like this, setup a regular router interaface between DUT and AUX and setup BGP session between them as well as between switches and IXIA. Run bidirectional traffic towards the prefix advertised by IXIA1. Observe no packet loss during warm-reboot.

IXIA1 <-> DUT <-> AUX <-> IXIA2

Relevant Logs:

2025/09/30 12:19:05 BGP: [M67YY-FW795] VRF default: GR route FIB install count incremented to 1 for IPv6 Unicast (prefix: 2000:2:3::/64)
2025/09/30 12:19:05 BGP: [M67YY-FW795] VRF default: GR route FIB install count incremented to 2 for IPv6 Unicast (prefix: 3000:2:3::/64)
2025/09/30 12:19:05 BGP: [M67YY-FW795] VRF default: GR route FIB install count incremented to 3 for IPv6 Unicast (prefix: 3000:2:4::/64)
2025/09/30 12:19:05 BGP: [M67YY-FW795] VRF default: GR route FIB install count incremented to 4 for IPv6 Unicast (prefix: 3000:2:5::/64)
2025/09/30 12:19:05 BGP: [M67YY-FW795] VRF default: GR route FIB install count incremented to 5 for IPv6 Unicast (prefix: 3000:2:6::/64)
2025/09/30 12:19:05 BGP: [M59KS-A3ZXZ] bgp_update_receive: rcvd End-of-RIB for IPv6 Unicast from 2000:1::2 in vrf default


2025/09/30 12:19:05 BGP: [M67YY-FW795] VRF default: GR route FIB install count incremented to 1 for IPv4 Unicast (prefix: 23.23.23.0/24)
2025/09/30 12:19:05 BGP: [M67YY-FW795] VRF default: GR route FIB install count incremented to 2 for IPv4 Unicast (prefix: 24.24.24.0/24)
2025/09/30 12:19:05 BGP: [M67YY-FW795] VRF default: GR route FIB install count incremented to 3 for IPv4 Unicast (prefix: 25.25.25.0/24)
2025/09/30 12:19:05 BGP: [M67YY-FW795] VRF default: GR route FIB install count incremented to 4 for IPv4 Unicast (prefix: 26.26.26.0/24)
2025/09/30 12:19:05 BGP: [M67YY-FW795] VRF default: GR route FIB install count incremented to 5 for IPv4 Unicast (prefix: 100.2.3.0/24)
2025/09/30 12:19:05 BGP: [M59KS-A3ZXZ] bgp_update_receive: rcvd End-of-RIB for IPv4 Unicast from 10.0.2.2 in vrf default


2025/09/30 12:20:10 BGP: [P6D1N-F7T05] VRF default: GR route FIB install count decremented to 4 for IPv4 Unicast (prefix: 100.2.3.0/24)
2025/09/30 12:20:10 BGP: [P6D1N-F7T05] VRF default: GR route FIB install count decremented to 4 for IPv6 Unicast (prefix: 2000:2:3::/64)
2025/09/30 12:20:10 BGP: [P6D1N-F7T05] VRF default: GR route FIB install count decremented to 3 for IPv4 Unicast (prefix: 23.23.23.0/24)
2025/09/30 12:20:10 BGP: [P6D1N-F7T05] VRF default: GR route FIB install count decremented to 2 for IPv4 Unicast (prefix: 24.24.24.0/24)
2025/09/30 12:20:10 BGP: [P6D1N-F7T05] VRF default: GR route FIB install count decremented to 1 for IPv4 Unicast (prefix: 25.25.25.0/24)
2025/09/30 12:20:10 BGP: [P6D1N-F7T05] VRF default: GR route FIB install count decremented to 0 for IPv4 Unicast (prefix: 26.26.26.0/24)
2025/09/30 12:20:10 BGP: [KWWZB-VM9GP] VRF default: Triggering GR deferral completion from FIB notification for IPv4 Unicast
2025/09/30 12:20:10 BGP: [ZP3RE-J4Q8C] send End-of-RIB for IPv4 Unicast to 100.2.6.2
2025/09/30 12:20:10 BGP: [ZP3RE-J4Q8C] send End-of-RIB for IPv4 Unicast to 100.2.5.2
2025/09/30 12:20:10 BGP: [ZP3RE-J4Q8C] send End-of-RIB for IPv4 Unicast to 10.0.2.2
2025/09/30 12:20:10 BGP: [ZP3RE-J4Q8C] send End-of-RIB for IPv4 Unicast to 10.0.1.2


2025/09/30 12:20:10 BGP: [P6D1N-F7T05] VRF default: GR route FIB install count decremented to 3 for IPv6 Unicast (prefix: 3000:2:3::/64)
2025/09/30 12:20:10 BGP: [P6D1N-F7T05] VRF default: GR route FIB install count decremented to 2 for IPv6 Unicast (prefix: 3000:2:4::/64)
2025/09/30 12:20:10 BGP: [P6D1N-F7T05] VRF default: GR route FIB install count decremented to 1 for IPv6 Unicast (prefix: 3000:2:5::/64)
2025/09/30 12:20:10 BGP: [P6D1N-F7T05] VRF default: GR route FIB install count decremented to 0 for IPv6 Unicast (prefix: 3000:2:6::/64)
2025/09/30 12:20:10 BGP: [KWWZB-VM9GP] VRF default: Triggering GR deferral completion from FIB notification for IPv6 Unicast
2025/09/30 12:20:10 BGP: [ZP3RE-J4Q8C] send End-of-RIB for IPv6 Unicast to 2000:2:5::2
2025/09/30 12:20:10 BGP: [ZP3RE-J4Q8C] send End-of-RIB for IPv6 Unicast to 2000:2::2
2025/09/30 12:20:10 BGP: [ZP3RE-J4Q8C] send End-of-RIB for IPv6 Unicast to 2000:1::2
2025/09/30 12:20:10 BGP: [ZP3RE-J4Q8C] send End-of-RIB for IPv6 Unicast to 2000:2:6::2

Which release branch to backport (provide reason below if selected)

  • 202305
  • 202311
  • 202405
  • 202411
  • 202505
  • 202511

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

@vivekrnv vivekrnv requested a review from lguohan as a code owner January 29, 2026 22:18
@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@vivekrnv
Copy link
Contributor Author

Same as #24174

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@dgsudharsan
Copy link
Collaborator

@eddieruan-alibaba This is now merged to 10.4 FRRouting/frr#20396
Can you please help to approve and merge this?

@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command.

@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@dgsudharsan
Copy link
Collaborator

@eddieruan-alibaba Can you please sign off?

@mssonicbld
Copy link
Collaborator

/azp run Azure.sonic-buildimage

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@eddieruan-alibaba eddieruan-alibaba merged commit 28bed6c into sonic-net:master Feb 18, 2026
26 checks passed
FengPan-Frank pushed a commit to FengPan-Frank/sonic-buildimage that referenced this pull request Mar 6, 2026
)

Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
Co-authored-by: Stepan Blyschak <stepanb@nvidia.com>
Co-authored-by: Sudharsan Dhamal Gopalarathnam <sudharsand@nvidia.com>
Signed-off-by: Feng Pan <fenpan@microsoft.com>
dprital pushed a commit that referenced this pull request Mar 19, 2026
Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
Co-authored-by: Stepan Blyschak <stepanb@nvidia.com>
Co-authored-by: Sudharsan Dhamal Gopalarathnam <sudharsand@nvidia.com>
Signed-off-by: dprital <drorp@nvidia.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants