[vnetorch] ECMP for vnet tunnel routes with endpoint health monitor #1955

shi-su · 2021-10-12T16:28:26Z

What I did
Add functions to create/remove next hop groups for vnet tunnel routes.
Count the reference count of next hop groups to create and remove as needed.
Share the counter of next hop groups with routeorch.
Adapt route endpoint according to the BFD state of endpoints.

Why I did it
To add support for overlay ECMP.

How I verified it
Verify ECMP groups are properly created and removed with the functions.
Details if related

prsunny · 2021-11-23T04:51:08Z

orchagent/vnetorch.cpp

            }
            else
            {
-                route_status = update_route(vr_id, pfx, nh_id);
+                if (it_route == syncd_tunnel_routes_[vnet].end() || temp_change)


What is the temp_change for?

The aim of this is for route adaptation according to BFD state. For these routes, we only want to change the routes in hardware, while the original configuration needs to be saved.

Made the health monitoring related changes a new function.

prsunny · 2021-11-23T04:52:44Z

orchagent/vnetorch.cpp

+
+        removeRouteState(vnet, ipPrefix);
+    }
+    else


Please remove the else section. We don't expect to get this case

prsunny · 2021-11-23T05:16:41Z

orchagent/vnetorch.h

 typedef std::map<NextHopGroupKey, NextHopGroupInfo> VNetNextHopGroupInfoTable;
 typedef std::map<IpPrefix, NextHopGroupKey> VNetTunnelRouteTable;
+typedef std::map<IpAddress, BfdSessionInfo> BfdSessionTable;
+typedef std::map<IpAddress, VNetNextHopInfo> VNetEndpointInfoTable;


Lets discuss this map? I'm not fully understanding the purpose

The purpose of this map is to track the BFD state and nexthop groups of each endpoint so that the nexthop group can be updated accordingly. I believe we do need some discussion about the implementation. Will get it scheduled.

Removed the cache of the nexthop group for the table. However, I still keep the data structure to track the monitor address, BFD state, and reference count (to remove BFD session when all related nexthop groups are removed).

shi-su · 2021-11-29T17:03:39Z

/azp run

azure-pipelines · 2021-11-29T17:03:50Z

Azure Pipelines successfully started running 1 pipeline(s).

prsunny · 2021-11-30T17:19:03Z

/azp run

azure-pipelines · 2021-11-30T17:19:14Z

Azure Pipelines successfully started running 1 pipeline(s).

prsunny · 2021-11-30T18:24:48Z

orchagent/vnetorch.h

@@ -326,6 +357,11 @@ class VNetRouteOrch : public Orch2, public Subject
    VNetNextHopObserverTable next_hop_observers_;
    std::map<std::string, VNetNextHopGroupInfoTable> syncd_nexthop_groups_;
    std::map<std::string, VNetTunnelRouteTable> syncd_tunnel_routes_;
+    BfdSessionTable bfd_sessions_;
+    std::map<std::string, VNetEndpointInfoTable> nexthop_info_;
+    ProducerStateTable m_bfdSessionProducer;


could you please use the same naming convention as in the rest of class

Updated naming to match naming convention.

691c37b [Route bulk] Fix bugs in case a SET operation follows a DEL operation in the same bulk (sonic-net/sonic-swss#2086) a4c80c3 patch for issue sonic-net/sonic-swss#1971 - enable Rx Drop handling for cisco-8000 (sonic-net/sonic-swss#2041) 71751d1 [macsec] Support setting IPG by gearbox_config.json (sonic-net/sonic-swss#2051) 5d5c169 [bulk mode] Fix bulk conflict when in case there are both remove and set operations (sonic-net/sonic-swss#2071) 8bbdbd2 Fix SRV6 NHOP CRM object type (sonic-net/sonic-swss#2072) ef5b35f [vstest] VS test failure fix after fabric port orch PR merge (sonic-net/sonic-swss#1811) 89ea538 Supply the missing ingress/egress port profile list in document (sonic-net/sonic-swss#2064) 8123437 [pfc_detect] fix RedisReply errors (sonic-net/sonic-swss#2040) b38f527 [swss][CRM][MPLS] MPLS CRM Nexthop - switch back to using SAI OBJECT rather than SWITCH OBJECT ae061e5 create debug_shell_enable config to enable debug shell (sonic-net/sonic-swss#2060) 45e446d [cbf] Fix max FC value (sonic-net/sonic-swss#2049) b1b5b29 Initial p4orch pytest code. (sonic-net/sonic-swss#2054) d352d5a Update default route status to state DB (sonic-net/sonic-swss#2009) 24a64d6 Orchagent: Integrate P4Orch (sonic-net/sonic-swss#2029) 15a3b6c Delete the IPv6 link-local Neighbor when ipv6 link-local mode is disabled (sonic-net/sonic-swss#1897) ed783e1 [orchagent] Add trap flow counter support (sonic-net/sonic-swss#1951) e9b05a3 [vnetorch] ECMP for vnet tunnel routes with endpoint health monitor (sonic-net/sonic-swss#1955) bcb7d61 P4Orch: inital add of source (sonic-net/sonic-swss#1997) f6f6f86 [mclaglink] fix acl out ports (sonic-net/sonic-swss#2026) fd887bf [Reclaim buffer] Reclaim unused buffer for dynamic buffer model (sonic-net/sonic-swss#1910) 9258978 [orchagent, cfgmgr] Add response publisher and state recording (sonic-net/sonic-swss#1992) 3d862a7 Fixing subport vs test script for subport under VNET (sonic-net/sonic-swss#2048) fb0a5fd Don't handle buffer pool watermark during warm reboot reconciling (sonic-net/sonic-swss#1987) 16d4bcd Routed subinterface enhancements (sonic-net/sonic-swss#1907) 9639db7 [vstest/subintf] Add vs test to validate sub interface ingress to a vnet (sonic-net/sonic-swss#1642) Signed-off-by: Stephen Sun stephens@nvidia.com

…onic-net#1955) What I did Add functions to create/remove next hop groups for vnet tunnel routes. Count the reference count of next hop groups to create and remove as needed. Share the counter of next hop groups with routeorch. Adapt route endpoint according to the BFD state of endpoints. Why I did it To add support for overlay ECMP. How I verified it Verify ECMP groups are properly created and removed with the functions.

…onitor (sonic-net#1955)" This reverts commit 874614d.

…onic-net#1955) What I did Add functions to create/remove next hop groups for vnet tunnel routes. Count the reference count of next hop groups to create and remove as needed. Share the counter of next hop groups with routeorch. Adapt route endpoint according to the BFD state of endpoints. Why I did it To add support for overlay ECMP. How I verified it Verify ECMP groups are properly created and removed with the functions.

…oint health monitoring (#2104) What I did Cherry-pick changes in #1960, #1883, #1955, #2058 Changes in #1960: Add functions to create/remove next hop groups for vnet tunnel routes. Count the reference count of next hop groups to create and remove as needed. Share the counter of next hop groups with routeorch. Add vs test Changes in #1883: Implement bfdorch to program hardware BFD sessions via bfd SAI. Add vs test for bfd sessions. Changes in #1955: Add functions to create/remove next hop groups for vnet tunnel routes. Count the reference count of next hop groups to create and remove as needed. Share the counter of next hop groups with routeorch. Adapt route endpoint according to the BFD state of endpoints. Changes in #2058: Advertise active vnet tunnel routes. Why I did it To add support for overlay ECMP with endpoint health monitoring.

…onic-net#1955) What I did Add functions to create/remove next hop groups for vnet tunnel routes. Count the reference count of next hop groups to create and remove as needed. Share the counter of next hop groups with routeorch. Adapt route endpoint according to the BFD state of endpoints. Why I did it To add support for overlay ECMP. How I verified it Verify ECMP groups are properly created and removed with the functions.

shi-su requested a review from prsunny October 12, 2021 16:28

shi-su force-pushed the bfd_ol_ecmp branch from f6d3b5a to 5cdc73d Compare November 15, 2021 22:37

shi-su mentioned this pull request Nov 17, 2021

Overlay ECMP with BFD support sonic-net/SONiC#861

Merged

shi-su marked this pull request as ready for review November 22, 2021 17:42

prsunny reviewed Nov 23, 2021

View reviewed changes

Shi Su added 6 commits November 25, 2021 05:33

health monitoring

49bbbef

Remove unnecessary else condition

0b66cd1

Review comment

d959d3c

Reorder bfdorch to avoid crashing

ed51923

Update vnet test

3eaa173

Avoid unnecessary route removals

2e5aafc

shi-su force-pushed the bfd_ol_ecmp branch from 17de3bd to 2e5aafc Compare November 26, 2021 00:11

prsunny reviewed Nov 30, 2021

View reviewed changes

Using same naming convention

86c5467

prsunny approved these changes Nov 30, 2021

View reviewed changes

shi-su merged commit e9b05a3 into sonic-net:master Dec 1, 2021

stephenxs mentioned this pull request Dec 1, 2021

[sonic-swss] Submodule update sonic-net/sonic-buildimage#9397

Merged

5 tasks

stephenxs mentioned this pull request Jan 6, 2022

[sonic-swss][202111] Submodule update (#9397) sonic-net/sonic-buildimage#9685

Merged

5 tasks

dgsudharsan added a commit to dgsudharsan/sonic-swss that referenced this pull request Jan 11, 2022

Revert "[vnetorch] ECMP for vnet tunnel routes with endpoint health m…

a305085

…onitor (sonic-net#1955)" This reverts commit 874614d.

shi-su mentioned this pull request Jan 21, 2022

[202012] [vnetorch] Add ECMP support for vnet tunnel routes with endpoint health monitoring #2104

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[vnetorch] ECMP for vnet tunnel routes with endpoint health monitor #1955

[vnetorch] ECMP for vnet tunnel routes with endpoint health monitor #1955

shi-su commented Oct 12, 2021

prsunny Nov 23, 2021

shi-su Nov 23, 2021

shi-su Nov 29, 2021

prsunny Nov 23, 2021

shi-su Nov 29, 2021

prsunny Nov 23, 2021

shi-su Nov 23, 2021

shi-su Nov 29, 2021

shi-su commented Nov 29, 2021

azure-pipelines bot commented Nov 29, 2021

prsunny commented Nov 30, 2021

azure-pipelines bot commented Nov 30, 2021

prsunny Nov 30, 2021

shi-su Nov 30, 2021

[vnetorch] ECMP for vnet tunnel routes with endpoint health monitor #1955

[vnetorch] ECMP for vnet tunnel routes with endpoint health monitor #1955

Conversation

shi-su commented Oct 12, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shi-su commented Nov 29, 2021

azure-pipelines bot commented Nov 29, 2021

prsunny commented Nov 30, 2021

azure-pipelines bot commented Nov 30, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment