Added Change for given Route ECMP to fallback on Default Route ECMP by abdosi · Pull Request #3389 · sonic-net/sonic-swss

abdosi · 2024-11-24T06:06:00Z

What I did:
Added Change for given Route ECMP to fallback on Default Route ECMP. When all the Members of Route are Link Down and if route is eligible for fallback to default route the ECMP Member in SAI Nexthop Goup are updated to the Default Route Nexthop/Nexthop's Members.

This change does not take care of this scenarios:

When the Route which is fallback on Default Route Nexthops if the original nexthop become active [link comes up] it does not move back to original path. Reason is we except this should transient case as the Route which is fallback should get deleted once all the links are down
If Default Routes gets updated [BGP Updates] or if default Route nexthops become link down we do not update ECMP members of Routes that are already fallback to default. Again Reason being Route which is fallback should get deleted once all the links are down and is during this short window getting default routes update is very corner case. We can optimize if needed.

Why I did:
For Faster of Traffic Convergence for Routes where it is ok to send traffic over default route when most specific prefix/route do not have any valid nexthops for transient time before more specific route gets deleted.

How I verified:
UT updated
Ixia based Traffic Convergance.

Reference to full context of this changes
Swss_route_enhancemnts.docx

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

arlakshm · 2024-11-25T16:09:48Z

orchagent/routeorch.cpp

+
+    if (default_nhg_key.getSize() == 1)
+    {
+       current_default_route_nhops.insert(*default_nhg_key.getNextHops().begin());


nit: indentation #Closed

arlakshm · 2024-11-25T16:20:46Z

orchagent/routeorch.cpp

+
+        if (nhopgroup->second.nh_member_install_count == 0 && nhopgroup->second.eligible_for_default_route_nh_swap && !nhopgroup->second.is_default_route_nh_swap)
+        {
+            if(nexthop.ip_address.isV4())


if at this time the default route from bgp is not present. will the v4_active_default_route_nhops have the drop port?

@arlakshm : if no default route than existing behavior will happen where nexthop group will not have any members which will cause drop as expected.

arlakshm · 2024-11-25T16:24:16Z

orchagent/routeorch.cpp

+                    {
+                       if (ip_prefix.isV4())


nit: indentation #Resolved

arlakshm · 2024-11-25T16:29:55Z

orchagent/routeorch.cpp

                        ctx.protocol = fvValue(i);
                    }
+                    if (fvField(i) == "fallback_to_default_route")
+		    {


fix indentation. mix of tabs and spaces #Closed

arlakshm · 2024-11-25T16:29:58Z

orchagent/routeorch.cpp

+                    if (fvField(i) == "fallback_to_default_route")
+		    {
+                        fallback_to_default_route = fvValue(i) == "true";
+		    }


fix indentation. mix of tabs and spaces #Closed

arlakshm · 2024-11-25T16:30:34Z

orchagent/routeorch.cpp

            {
-                removeNextHopGroup(it_nhg.first);
+               // Pass the flag to indicate if the NextHop Group as Default Route NH Members as swapped.
+               removeNextHopGroup(it_nhg.first, m_syncdNextHopGroups[it_nhg.first].is_default_route_nh_swap);


fix indentation #Resolved

arlakshm · 2024-11-25T16:30:54Z

orchagent/routeorch.cpp

+            updateDefaultRouteSwapSet(v4_default_nhg_key, v4_active_default_route_nhops);
+
+        if (v6_default_nhg_key.getSize())
+           updateDefaultRouteSwapSet(v6_default_nhg_key, v6_active_default_route_nhops);


fix indentation #Resolved

arlakshm · 2024-11-25T16:32:24Z

orchagent/routeorch.h

    RouteBulkContext(const std::string& key, bool is_set)
-        : key(key), excp_intfs_flag(false), using_temp_nhg(false), is_set(is_set)
+        : key(key), excp_intfs_flag(false), using_temp_nhg(false), is_set(is_set),
+	  fallback_to_default_route(false)


mix of tabs and spaces #Closed

arlakshm · 2024-11-25T16:32:39Z

orchagent/routeorch.h

        using_temp_nhg = false;
        key.clear();
        protocol.clear();
+	fallback_to_default_route = false;


remove tabs #Closed

arlakshm

/Azp run Azure.sonic-swss

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

arlakshm · 2024-11-28T23:02:03Z

/Azp run Azure.sonic-swss

azure-pipelines · 2024-11-28T23:02:13Z

Azure Pipelines successfully started running 1 pipeline(s).

arlakshm

lgtm

This reverts commit 8d2d008.

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

…into default-route

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

mssonicbld · 2025-01-23T20:52:18Z

/azp run

azure-pipelines · 2025-01-23T20:52:29Z

Azure Pipelines successfully started running 1 pipeline(s).

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

mssonicbld · 2025-01-24T22:20:08Z

/azp run

azure-pipelines · 2025-01-24T22:20:18Z

Azure Pipelines successfully started running 1 pipeline(s).

tests/test_nhg.py

mssonicbld · 2025-02-21T19:42:33Z

/azp run

azure-pipelines · 2025-02-21T19:42:44Z

Azure Pipelines successfully started running 1 pipeline(s).

*What I did: Added Change to Skip Route Programming if NH is link/oper down. With Scale Route testing of 60K+ routes when we toggle all the interfaces[14+ interface back to back] as done here: https://github.com/sonic-net/sonic-mgmt/blob/master/tests/snappi_tests/multidut/bgp/test_bgp_outbound_uplink_multi_po_flap.py we see because of slowness of FRR Route APP_DB processing compare to Link Notification Handling where we have updated the Nexthop Group as part of Link Notification handling to point to default route via #3389 [if eligible] FRR slowness can reprogram the Route back to Nexthop which is link down. This change is similar to #3394 which was done for Nexthop Group.

prsunny

As offline discussed, please add code comments on critical path.

prsunny · 2025-03-04T23:18:45Z

tests/conftest.py


        # Let's give fpmsyncd a chance to connect to Zebra.
-        time.sleep(5)
+        time.sleep(10)


Can you remove this sleep?

@prsunny : updated

prsunny · 2025-03-04T23:19:12Z

orchagent/routeorch.cpp


    vector<sai_object_id_t> next_hop_ids;
-    auto& nhgm = next_hop_group_entry->second.nhopgroup_members;
+    auto& nhgm = is_default_route_nh_swap ? next_hop_group_entry->second.default_route_nhopgroup_members : next_hop_group_entry->second.nhopgroup_members;


Please add comment on where the second.nhopgroup_members gets cleaned up

@prsunny comments added to major code points.

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

mssonicbld · 2025-03-22T02:36:56Z

/azp run

azure-pipelines · 2025-03-22T02:37:05Z

Azure Pipelines successfully started running 1 pipeline(s).

…-net#3520) *What I did: Added Change to Skip Route Programming if NH is link/oper down. With Scale Route testing of 60K+ routes when we toggle all the interfaces[14+ interface back to back] as done here: https://github.com/sonic-net/sonic-mgmt/blob/master/tests/snappi_tests/multidut/bgp/test_bgp_outbound_uplink_multi_po_flap.py we see because of slowness of FRR Route APP_DB processing compare to Link Notification Handling where we have updated the Nexthop Group as part of Link Notification handling to point to default route via sonic-net#3389 [if eligible] FRR slowness can reprogram the Route back to Nexthop which is link down. This change is similar to sonic-net#3394 which was done for Nexthop Group.

…onic-net#3389) * Added Change for given Route ECMP to fallback on Default Route ECMP (sonic-net#3389) What I did: Added Change for given Route ECMP to fallback on Default Route ECMP. When all the Members of Route are Link Down and if route is eligible for fallback to default route the ECMP Member in SAI Nexthop Goup are updated to the Default Route Nexthop/Nexthop's Members. This change does not take care of this scenarios: When the Route which is fallback on Default Route Nexthops if the original nexthop become active [link comes up] it does not move back to original path. Reason is we except this should transient case as the Route which is fallback should get deleted once all the links are down If Default Routes gets updated [BGP Updates] or if default Route nexthops become link down we do not update ECMP members of Routes that are already fallback to default. Again Reason being Route which is fallback should get deleted once all the links are down and is during this short window getting default routes update is very corner case. We can optimize if needed.

…-net#3520) *What I did: Added Change to Skip Route Programming if NH is link/oper down. With Scale Route testing of 60K+ routes when we toggle all the interfaces[14+ interface back to back] as done here: https://github.com/sonic-net/sonic-mgmt/blob/master/tests/snappi_tests/multidut/bgp/test_bgp_outbound_uplink_multi_po_flap.py we see because of slowness of FRR Route APP_DB processing compare to Link Notification Handling where we have updated the Nexthop Group as part of Link Notification handling to point to default route via sonic-net#3389 [if eligible] FRR slowness can reprogram the Route back to Nexthop which is link down. This change is similar to sonic-net#3394 which was done for Nexthop Group. Signed-off-by: Baorong Liu <96146196+baorliu@users.noreply.github.com>

…onic-net#3389) * Added Change for given Route ECMP to fallback on Default Route ECMP (sonic-net#3389) What I did: Added Change for given Route ECMP to fallback on Default Route ECMP. When all the Members of Route are Link Down and if route is eligible for fallback to default route the ECMP Member in SAI Nexthop Goup are updated to the Default Route Nexthop/Nexthop's Members. This change does not take care of this scenarios: When the Route which is fallback on Default Route Nexthops if the original nexthop become active [link comes up] it does not move back to original path. Reason is we except this should transient case as the Route which is fallback should get deleted once all the links are down If Default Routes gets updated [BGP Updates] or if default Route nexthops become link down we do not update ECMP members of Routes that are already fallback to default. Again Reason being Route which is fallback should get deleted once all the links are down and is during this short window getting default routes update is very corner case. We can optimize if needed. Signed-off-by: Baorong Liu <96146196+baorliu@users.noreply.github.com>

abdosi added 3 commits November 24, 2024 06:05

Changes

72b5825

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

More changes

e3b48ae

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

Added UT

9c5c2e7

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

abdosi marked this pull request as ready for review November 25, 2024 03:45

abdosi requested a review from prsunny as a code owner November 25, 2024 03:45

abdosi changed the title ~~Changes for fallback to default route~~ Added Change for given Route ECMP to fallback on Default Route ECMP Nov 25, 2024

abdosi requested a review from arlakshm November 25, 2024 03:56

abdosi added the Request for 202405 Branch label Nov 25, 2024

arlakshm reviewed Nov 25, 2024

View reviewed changes

abdosi mentioned this pull request Nov 25, 2024

Changes to read route tag value from Netlink Message and take appropriate action #3353

Open

abdosi and others added 6 commits November 25, 2024 21:08

Fix indenation and missed file changes

126c201

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

Fix indenation

4751f41

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

Fix

1fef1c2

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

Fixed flaky test case

de8e979

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

Merge remote-tracking branch 'upstream/master' into default-route

b374597

Merge branch 'master' into default-route

540dd52

rlhui assigned abdosi Nov 27, 2024

Merge branch 'master' into default-route

de037d5

arlakshm previously approved these changes Nov 28, 2024

View reviewed changes

Update test_nhg.py

8d2d008

abdosi dismissed arlakshm’s stale review via 8d2d008 November 29, 2024 01:56

abdosi and others added 6 commits November 29, 2024 21:50

Revert "Update test_nhg.py"

a90ba41

This reverts commit 8d2d008.

More changes

d9272ee

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

Merge branch 'master' into default-route

0c6ec8b

Fix

5985e34

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

Merge branch 'default-route' of https://github.com/abdosi/sonic-swss …

780d69d

…into default-route

Merge branch 'master' into default-route

d65732d

abdosi added 2 commits January 23, 2025 20:46

Merge remote-tracking branch 'upstream/master' into default-route

33cdc81

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

Fix the nexthop delete SAI error after default swap.

ca0f0b9

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

abdosi dismissed arlakshm’s stale review via ca0f0b9 January 23, 2025 20:52

Ehnahnce UT to handle port toggle case

32f19a9

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

github-advanced-security bot found potential problems Jan 24, 2025

View reviewed changes

tests/test_nhg.py Dismissed Show dismissed Hide dismissed

tests/test_nhg.py Dismissed Show dismissed Hide dismissed

abdosi mentioned this pull request Jan 24, 2025

Fix the issue of SAI next-hop member removal error when ports that accept routes that are eligible for default route swap are toggle multiple times Azure/sonic-swss.msft#23

Merged

abdosi mentioned this pull request Feb 18, 2025

Added Change to Skip Route Programming if NH is link/oper down #3520

Merged

Merge remote-tracking branch 'upstream/master' into default-route

40759b9

mssonicbld added the Cherry Pick Conflict_202411 label Feb 21, 2025

arlakshm previously approved these changes Feb 26, 2025

View reviewed changes

prsunny reviewed Mar 4, 2025

View reviewed changes

abdosi added 2 commits March 22, 2025 02:17

Merge remote-tracking branch 'upstream/master' into default-route

a9ccf72

Address Review Comments

b5fdeda

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>

abdosi dismissed arlakshm’s stale review via b5fdeda March 22, 2025 02:36

prsunny approved these changes Mar 25, 2025

View reviewed changes

prsunny merged commit 596d88c into sonic-net:master Mar 25, 2025
15 checks passed

github-project-automation bot moved this to Done in SONiC Chassis Mar 25, 2025

Conversation

abdosi commented Nov 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

arlakshm Nov 25, 2024 • edited by abdosi Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

arlakshm Nov 25, 2024

Choose a reason for hiding this comment

Uh oh!

abdosi Nov 25, 2024

Choose a reason for hiding this comment

Uh oh!

arlakshm Nov 25, 2024 • edited by abdosi Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

arlakshm Nov 25, 2024 • edited by abdosi Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

arlakshm Nov 25, 2024 • edited by abdosi Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

arlakshm Nov 25, 2024 • edited by abdosi Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

arlakshm Nov 25, 2024 • edited by abdosi Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

arlakshm Nov 25, 2024 • edited by abdosi Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

arlakshm Nov 25, 2024 • edited by abdosi Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

arlakshm left a comment

Choose a reason for hiding this comment

Uh oh!

arlakshm commented Nov 28, 2024

Uh oh!

azure-pipelines bot commented Nov 28, 2024

Uh oh!

arlakshm left a comment

Choose a reason for hiding this comment

Uh oh!

mssonicbld commented Jan 23, 2025

Uh oh!

azure-pipelines bot commented Jan 23, 2025

Uh oh!

mssonicbld commented Jan 24, 2025

Uh oh!

azure-pipelines bot commented Jan 24, 2025

Uh oh!

Uh oh!

Uh oh!

mssonicbld commented Feb 21, 2025

Uh oh!

azure-pipelines bot commented Feb 21, 2025

Uh oh!

prsunny left a comment

Choose a reason for hiding this comment

Uh oh!

prsunny Mar 4, 2025

Choose a reason for hiding this comment

Uh oh!

abdosi Mar 22, 2025

Choose a reason for hiding this comment

Uh oh!

prsunny Mar 4, 2025

Choose a reason for hiding this comment

Uh oh!

abdosi Mar 22, 2025

Choose a reason for hiding this comment

abdosi commented Nov 24, 2024 •

edited

Loading

arlakshm Nov 25, 2024 •

edited by abdosi

Loading

arlakshm Nov 25, 2024 •

edited by abdosi

Loading

arlakshm Nov 25, 2024 •

edited by abdosi

Loading

arlakshm Nov 25, 2024 •

edited by abdosi

Loading

arlakshm Nov 25, 2024 •

edited by abdosi

Loading

arlakshm Nov 25, 2024 •

edited by abdosi

Loading

arlakshm Nov 25, 2024 •

edited by abdosi

Loading

arlakshm Nov 25, 2024 •

edited by abdosi

Loading