Added Change for given Route ECMP to fallback on Default Route ECMP #3389
+981
−10
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Abhishek Dosi <[email protected]>
Signed-off-by: Abhishek Dosi <[email protected]>
Signed-off-by: Abhishek Dosi <[email protected]>
abdosi
changed the title
arlakshm
reviewed
Nov 25, 2024
orchagent/routeorch.cpp
Outdated
|
|
||
| if (default_nhg_key.getSize() == 1) | ||
| { | ||
| current_default_route_nhops.insert(*default_nhg_key.getNextHops().begin()); |
There was a problem hiding this comment.
nit: indentation #Closed
|
|
||
| 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()) |
There was a problem hiding this comment.
if at this time the default route from bgp is not present. will the v4_active_default_route_nhops have the drop port?
There was a problem hiding this comment.
@arlakshm : if no default route than existing behavior will happen where nexthop group will not have any members which will cause drop as expected.
Comment on lines
+1132
to
+1133
| { | ||
| if (ip_prefix.isV4()) |
There was a problem hiding this comment.
nit: indentation #Resolved
orchagent/routeorch.cpp
Outdated
| @@ -673,6 +761,10 @@ void RouteOrch::doTask(Consumer& consumer) | |||
| { | |||
| ctx.protocol = fvValue(i); | |||
| } | |||
| if (fvField(i) == "fallback_to_default_route") | |||
| { | |||
There was a problem hiding this comment.
fix indentation. mix of tabs and spaces #Closed
orchagent/routeorch.cpp
Outdated
| if (fvField(i) == "fallback_to_default_route") | ||
| { | ||
| fallback_to_default_route = fvValue(i) == "true"; | ||
| } |
There was a problem hiding this comment.
fix indentation. mix of tabs and spaces #Closed
orchagent/routeorch.cpp
Outdated
| @@ -1067,9 +1174,19 @@ void RouteOrch::doTask(Consumer& consumer) | |||
| } | |||
| else if (m_syncdNextHopGroups[it_nhg.first].ref_count == 0) | |||
| { | |||
| 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); | |||
There was a problem hiding this comment.
fix indentation #Resolved
orchagent/routeorch.cpp
Outdated
| 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); |
There was a problem hiding this comment.
fix indentation #Resolved
orchagent/routeorch.h
Outdated
|
|
||
| std::string key; // Key in database table | ||
| std::string protocol; // Protocol string | ||
| bool is_set; // True if set operation | ||
|
|
||
| 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) |
There was a problem hiding this comment.
mix of tabs and spaces #Closed
orchagent/routeorch.h
Outdated
| @@ -146,6 +152,7 @@ struct RouteBulkContext | |||
| using_temp_nhg = false; | |||
| key.clear(); | |||
| protocol.clear(); | |||
| fallback_to_default_route = false; | |||
Signed-off-by: Abhishek Dosi <[email protected]>
Signed-off-by: Abhishek Dosi <[email protected]>
Signed-off-by: Abhishek Dosi <[email protected]>
Signed-off-by: Abhishek Dosi <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.