[bgp] Enable BGP Graceful Restart based on device role by abdosi · Pull Request #9486 · sonic-net/sonic-buildimage

abdosi · 2021-12-09T21:06:10Z

What I did:
Updated Jinja Template to enable BGP Graceful Restart based on device role. By default it will be enable only if the device role type is TorRouter.

Why I did:-
By default FRR is configured in Graceful Helper mode. Graceful Restart is needed on T0/TorRouter only since the device can go for warm-reboot. For T1/LeafRouter it need to be in Helper mode only. For T2 and above we can disable Graceful Restart feature completely support by FRR 7.4 onwards (FRRouting/frr#5210). However As per FRR current code it send BGP EOR packet only if Peer has advertised Graceful Restart or Helper capability. And as mention in BGP RFC https://datatracker.ietf.org/doc/html/rfc4724 sending of BGP EOR is better for overall network convergance so we are having BGP Helper mode on for all role other than T0/TorRouter

Trigger for this change was eg:
a) if we cold-reboot the T1 router T0 will not withdraw T1 routes till Graceful Timer is not expired and this causes traffic blackhole for that duration.
b) For Chassis iBGP session to detect BGP peer down and withdraw routes immediately

How I verify:

Updated Unit Test case.
Manual Verification.
We will create test for this in sonic-mgmt

On Instance0 GR commands configured with Restart Timer as 240 sec and Instance1 has no GR configuration 

1.	We can see Instance1 by default goes into helper mode

•	Instance 0 : show ip bgp neighbor O/P
                                                                                                                                                                               
  Graceful restart information:
    End-of-RIB send: IPv4 Unicast
    End-of-RIB received: IPv4 Unicast
    Local GR Mode: Restart*
    Remote GR Mode: Helper
    R bit: False
    Timers:
      Configured Restart Time(sec): 240
      Received Restart Time(sec): 120
    IPv4 Unicast:
      F bit: False
      End-of-RIB sent: Yes
      End-of-RIB sent after update: No
      End-of-RIB received: Yes
      Timers:
        Configured Stale Path Time(sec): 360
        Configured Selection Deferral Time(sec): 45

•	Instance 1 : show ip bgp neighbor O/P

  Graceful restart information:
    End-of-RIB send: IPv4 Unicast
    End-of-RIB received: IPv4 Unicast
    Local GR Mode: Helper*
    Remote GR Mode: Restart
    R bit: True
    Timers:
      Configured Restart Time(sec): 120
      Received Restart Time(sec): 240
    IPv4 Unicast:
      F bit: True
      End-of-RIB sent: Yes
      End-of-RIB sent after update: Yes
      End-of-RIB received: Yes
      Timers:
        Configured Stale Path Time(sec): 360

2.	When the Helper BGP instance goes down (Instance 1) Restart BGP Instance (Instance0) remove the route immediately.

3.	When the Restart BGP instance goes down (Instance 0) Helper BGP Instance (Instance1) remove the route after 4 min (240 sec as configured).

df46ed418e661a9bccdb2639d8873def356f8ba0 (HEAD -> master, origin/master, origin/HEAD) Fix the LLDP_LOC_CHASSIS not getting populated if no remote neighbors are present (sonic-net#39) e487532e11cc0e97cfce573b6b997fdd0beeb660 [CI] Set up CI&PR with Azure Pipelines (sonic-net#38) 3c9f488490a1dbded20dbf2d8a88a5ab4dbda8df Replace swsssdk's SonicV2Connector with swsscommon's implementation (sonic-net#35) Signed-off-by: Abhishek Dosi <[email protected]>

• Internal BGP Peering between LCx-ASICy is done using Loopback4096 • Internal BGP Peer will be classified as BGP_INTERNAL_NEIGHBOR with source updated as Loopback4096 • DEVICE_METADATA will have “switch_type” define as “chassis-packet”. We already have “voq” define. This will be used in BGP template. • Static Routes are define using SONiC schema. * Fixed Vlan Sub Interface Parsing in Graph when configured on Port-Channel. * Added Unit test cases of graph and BGP template changes. Signed-off-by: Abhishek Dosi <[email protected]>

Signed-off-by: Abhishek Dosi <[email protected]>

Also address review comments for PR:sonic-net#8966 Signed-off-by: Abhishek Dosi <[email protected]>

Signed-off-by: Abhishek Dosi <[email protected]>

1. For Packet Chassis do not advertise Loopback4096 address into BGP as there is Static Route for same. 2. Advertise only P2P Connected IP's into BGP Signed-off-by: Abhishek Dosi <[email protected]>

This reverts commit 9a2b3d0.

By default FRR will be in Graceful Helper mode Signed-off-by: Abhishek Dosi <[email protected]>

arlakshm

For T2 role, should we add bgp graceful-restart-disable config to disable helper mode as well?

abdosi · 2021-12-09T21:47:03Z

For T2 role, should we add bgp graceful-restart-disable config to disable helper mode as well?

@arlakshm PR description has reason of not doing that as per current understanding. In future we can reference this change again.

abdosi · 2021-12-10T20:13:22Z

/azp run

azure-pipelines · 2021-12-10T20:13:27Z

You have several pipelines (over 10) configured to build pull requests in this repository. Specify which pipelines you would like to run by using /azp run [pipelines] command. You can specify multiple pipelines using a comma separated list.

abdosi · 2021-12-12T22:31:59Z

/azp run Azure.sonic-buildimage

azure-pipelines · 2021-12-12T22:32:12Z

Azure Pipelines successfully started running 1 pipeline(s).

What I did: Updated Jinja Template to enable BGP Graceful Restart based on device role. By default it will be enable only if the device role type is TorRouter. Why I did:- By default FRR is configured in Graceful Helper mode. Graceful Restart is needed on T0/TorRouter only since the device can go for warm-reboot. For T1/LeafRouter it need to be in Helper mode only

[bgp] Enable BGP Graceful Restart based on device role (#9486) Signed-off-by: Abhishek Dosi <[email protected]>

abdosi · 2022-09-01T22:11:32Z

@yxieca @qiluo-msft can we take this for 202012.

What I did: Updated Jinja Template to enable BGP Graceful Restart based on device role. By default it will be enable only if the device role type is TorRouter. Why I did:- By default FRR is configured in Graceful Helper mode. Graceful Restart is needed on T0/TorRouter only since the device can go for warm-reboot. For T1/LeafRouter it need to be in Helper mode only

abdosi · 2022-12-08T00:04:15Z

@qiluo-msft created 202012 PR: #12990

What I did: Updated Jinja Template to enable BGP Graceful Restart based on device role. By default it will be enable only if the device role type is TorRouter. Why I did:- By default FRR is configured in Graceful Helper mode. Graceful Restart is needed on T0/TorRouter only since the device can go for warm-reboot. For T1/LeafRouter it need to be in Helper mode only

sonic-net#9486 Signed-off-by: Abhishek Dosi <[email protected]>

…rnal-202012 branch Related work items: sonic-net#2108, sonic-net#2560, sonic-net#9486, sonic-net#12325, sonic-net#12626, sonic-net#12739, sonic-net#12835, sonic-net#12836, sonic-net#12865, sonic-net#12880, sonic-net#12903, sonic-net#12914, sonic-net#12922, sonic-net#12925, sonic-net#12930, sonic-net#12989, sonic-net#12990, sonic-net#13006, sonic-net#13014, sonic-net#13040, sonic-net#13092, sonic-net#13124, sonic-net#13132, sonic-net#13146, sonic-net#13157, sonic-net#13168, sonic-net#13175, sonic-net#13177, sonic-net#13182, sonic-net#13188, sonic-net#13226, sonic-net#13233, sonic-net#13244, sonic-net#13249

abdosi added 24 commits April 3, 2021 01:41

Merge remote-tracking branch 'upsteam/master'

9746bb3

Merge remote-tracking branch 'upsteam/master'

061821d

Merge remote-tracking branch 'upsteam/master'

9e61e53

Merge remote-tracking branch 'upsteam/master'

5c3a87f

Merge remote-tracking branch 'upsteam/master'

5775c20

Merge remote-tracking branch 'upsteam/master'

3c20361

Merge remote-tracking branch 'upsteam/master'

cc1210d

Merge remote-tracking branch 'upsteam/master'

7bae398

Merge remote-tracking branch 'upsteam/master'

7126f88

Some Fixes

6e2fecf

Signed-off-by: Abhishek Dosi <[email protected]>

Merge remote-tracking branch 'upsteam/master' into chassis-packet

7e1d4ef

Fixed Chassis Packet Internal Template Typo for update-source.

e33a1e5

Also address review comments for PR:sonic-net#8966 Signed-off-by: Abhishek Dosi <[email protected]>

Fix Syslog for multi-asic platforms.

47a82f1

Signed-off-by: Abhishek Dosi <[email protected]>

Merge remote-tracking branch 'upsteam/master' into chassis-packet

b6350c1

Added 40G {300/40/5m} profile for 7260 100G SKU

c3d62dc

Signed-off-by: Abhishek Dosi <[email protected]>

Merge remote-tracking branch 'upsteam/master' into chassis-packet

bffdbff

Merge remote-tracking branch 'upsteam/master'

63c037c

Merge branch 'master' into chassis-packet

a1aebbc

Updated BGP Template for the case:

9a2b3d0

1. For Packet Chassis do not advertise Loopback4096 address into BGP as there is Static Route for same. 2. Advertise only P2P Connected IP's into BGP Signed-off-by: Abhishek Dosi <[email protected]>

Revert "Updated BGP Template for the case:"

b0c375a

This reverts commit 9a2b3d0.

Merge remote-tracking branch 'upsteam/master' into chassis-packet

4ae5a85

Enable BGP Graceful Restart only if device Type is TorRouter.

cae358f

By default FRR will be in Graceful Helper mode Signed-off-by: Abhishek Dosi <[email protected]>

abdosi requested a review from lguohan as a code owner December 9, 2021 21:06

abdosi requested review from arlakshm, rlhui and yxieca December 9, 2021 21:06

arlakshm reviewed Dec 9, 2021

View reviewed changes

yxieca approved these changes Dec 9, 2021

View reviewed changes

vaibhavhd added the warmboot 👢 label Dec 13, 2021

abdosi merged commit 6c0da4b into sonic-net:master Dec 13, 2021

abdosi deleted the chassis-packet branch December 13, 2021 18:14

abdosi added Chassis 🤖 Modular chassis support Request for 202111 Branch For PRs being requested for 202111 branch Request for 202106 Branch labels Dec 13, 2021

judyjoseph added the Included in 202111 Branch label Dec 27, 2021

abdosi added Request for 201911 Branch Included in 201911 Branch labels Apr 1, 2022

abdosi added a commit that referenced this pull request Apr 2, 2022

Fix the build error created by cherry-pick of PR:

b8689d7

[bgp] Enable BGP Graceful Restart based on device role (#9486) Signed-off-by: Abhishek Dosi <[email protected]>

abdosi added the Request for 202012 Branch label Sep 1, 2022

qiluo-msft removed the Request for 202012 Branch label Sep 1, 2022

abdosi added the Request for 202012 Branch label Sep 29, 2022

qiluo-msft added the Cherry Pick Conflict_202012 label Sep 30, 2022

abdosi mentioned this pull request Dec 8, 2022

[202012] [bgp] Enable BGP Graceful Restart based on device role #12990

Merged

qiluo-msft added the Included in 202012 Branch label Jan 18, 2023

github-actions bot pushed a commit to liushilongbuaa/sonic-buildimage that referenced this pull request Aug 29, 2023

Fixed UT based on merged public PR:

7ae9552

sonic-net#9486 Signed-off-by: Abhishek Dosi <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[bgp] Enable BGP Graceful Restart based on device role#9486

[bgp] Enable BGP Graceful Restart based on device role#9486
abdosi merged 24 commits intosonic-net:masterfrom
abdosi:chassis-packet

abdosi commented Dec 9, 2021 •

edited

Loading

Uh oh!

arlakshm left a comment

Uh oh!

abdosi commented Dec 9, 2021

Uh oh!

abdosi commented Dec 10, 2021

Uh oh!

azure-pipelines bot commented Dec 10, 2021

Uh oh!

abdosi commented Dec 12, 2021

Uh oh!

azure-pipelines bot commented Dec 12, 2021

Uh oh!

abdosi commented Sep 1, 2022

Uh oh!

abdosi commented Dec 8, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

abdosi commented Dec 9, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

arlakshm left a comment

Choose a reason for hiding this comment

Uh oh!

abdosi commented Dec 9, 2021

Uh oh!

abdosi commented Dec 10, 2021

Uh oh!

azure-pipelines bot commented Dec 10, 2021

Uh oh!

abdosi commented Dec 12, 2021

Uh oh!

azure-pipelines bot commented Dec 12, 2021

Uh oh!

abdosi commented Sep 1, 2022

Uh oh!

abdosi commented Dec 8, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

abdosi commented Dec 9, 2021 •

edited

Loading