[routeorch] Wait for the VRF to be created (#3652)

manoharan-nexthop · web-flow · commit eebaf97e89d9 · 2025-06-30T15:03:20.000-07:00
Why I did it
With VRF configuration and route getting added in the startup, the orchangent crashes.

How I did it
addRoutePost() assumes the VRF is already added and attempts to get the VRF ID for the same and used it to lookup the route entry. Since the VRF is not yet created, exception gets thrown.

When the VRF is not yet created, the route add can be postponed for the VRF to be created first.

How to verify it
Running the tests/vrf/test_vrf.py, the orchagent doesnt crash anymore and the route gets created in the ASIC
diff --git a/orchagent/routeorch.cpp b/orchagent/routeorch.cpp
@@ -2323,6 +2323,15 @@ bool RouteOrch::addRoutePost(const RouteBulkContext& ctx, const NextHopGroupKey
         return false;
     }
 
+    // Ensure VRF exists in m_syncdRoutes
+    auto routeTableIter = m_syncdRoutes.find(vrf_id);
+    if (routeTableIter == m_syncdRoutes.end())
+    {
+        SWSS_LOG_INFO("VRF 0x%" PRIx64 " doesn't exist in syncd routes for route %s, will retry later",
+                      vrf_id, ipPrefix.to_string().c_str());
+        return false;
+    }
+
     if (m_fgNhgOrch->isRouteFineGrained(vrf_id, ipPrefix, nextHops))
     {
         /* Route is pointing to Fine Grained ECMP nexthop group */
@@ -2383,11 +2392,11 @@ bool RouteOrch::addRoutePost(const RouteBulkContext& ctx, const NextHopGroupKey
     }
 
     auto it_status = object_statuses.begin();
-    auto it_route = m_syncdRoutes.at(vrf_id).find(ipPrefix);
+    auto it_route = routeTableIter->second.find(ipPrefix);
     MuxOrch* mux_orch = gDirectory.get<MuxOrch*>();
     if (isFineGrained)
     {
-        if (it_route == m_syncdRoutes.at(vrf_id).end())
+        if (it_route == routeTableIter->second.end())
         {
             /* First time route addition pointing to FG nhg */
             if (*it_status++ != SAI_STATUS_SUCCESS)
@@ -2429,7 +2438,7 @@ bool RouteOrch::addRoutePost(const RouteBulkContext& ctx, const NextHopGroupKey
                     ipPrefix.to_string().c_str(), nextHops.to_string().c_str());
         }
     }
-    else if (it_route == m_syncdRoutes.at(vrf_id).end())
+    else if (it_route == routeTableIter->second.end())
     {
         sai_status_t status = *it_status++;
         if (status != SAI_STATUS_SUCCESS)
@@ -2626,7 +2635,7 @@ bool RouteOrch::addRoutePost(const RouteBulkContext& ctx, const NextHopGroupKey
         updateDefRouteState(ipPrefix.to_string(), true);
     }
 
-    if (it_route == m_syncdRoutes.at(vrf_id).end())
+    if (it_route == routeTableIter->second.end())
     {
         gFlowCounterRouteOrch->handleRouteAdd(vrf_id, ipPrefix);
     }

Original file line number	Diff line number	Diff line change
`@@ -2323,6 +2323,15 @@ bool RouteOrch::addRoutePost(const RouteBulkContext& ctx, const NextHopGroupKey`
`2323`	`2323`	`return false;`
`2324`	`2324`	`}`
`2325`	`2325`
	`2326`	`+ // Ensure VRF exists in m_syncdRoutes`
	`2327`	`+ auto routeTableIter = m_syncdRoutes.find(vrf_id);`
	`2328`	`+ if (routeTableIter == m_syncdRoutes.end())`
	`2329`	`+ {`
	`2330`	`+ SWSS_LOG_INFO("VRF 0x%" PRIx64 " doesn't exist in syncd routes for route %s, will retry later",`
	`2331`	`+ vrf_id, ipPrefix.to_string().c_str());`
	`2332`	`+ return false;`
	`2333`	`+ }`
	`2334`	`+`
`2326`	`2335`	`if (m_fgNhgOrch->isRouteFineGrained(vrf_id, ipPrefix, nextHops))`
`2327`	`2336`	`{`
`2328`	`2337`	`/* Route is pointing to Fine Grained ECMP nexthop group */`
`@@ -2383,11 +2392,11 @@ bool RouteOrch::addRoutePost(const RouteBulkContext& ctx, const NextHopGroupKey`
`2383`	`2392`	`}`
`2384`	`2393`
`2385`	`2394`	`auto it_status = object_statuses.begin();`
`2386`		`- auto it_route = m_syncdRoutes.at(vrf_id).find(ipPrefix);`
	`2395`	`+ auto it_route = routeTableIter->second.find(ipPrefix);`
`2387`	`2396`	`MuxOrch* mux_orch = gDirectory.get<MuxOrch*>();`
`2388`	`2397`	`if (isFineGrained)`
`2389`	`2398`	`{`
`2390`		`- if (it_route == m_syncdRoutes.at(vrf_id).end())`
	`2399`	`+ if (it_route == routeTableIter->second.end())`
`2391`	`2400`	`{`
`2392`	`2401`	`/* First time route addition pointing to FG nhg */`
`2393`	`2402`	`if (*it_status++ != SAI_STATUS_SUCCESS)`
`@@ -2429,7 +2438,7 @@ bool RouteOrch::addRoutePost(const RouteBulkContext& ctx, const NextHopGroupKey`
`2429`	`2438`	`ipPrefix.to_string().c_str(), nextHops.to_string().c_str());`
`2430`	`2439`	`}`
`2431`	`2440`	`}`
`2432`		`- else if (it_route == m_syncdRoutes.at(vrf_id).end())`
	`2441`	`+ else if (it_route == routeTableIter->second.end())`
`2433`	`2442`	`{`
`2434`	`2443`	`sai_status_t status = *it_status++;`
`2435`	`2444`	`if (status != SAI_STATUS_SUCCESS)`
`@@ -2626,7 +2635,7 @@ bool RouteOrch::addRoutePost(const RouteBulkContext& ctx, const NextHopGroupKey`
`2626`	`2635`	`updateDefRouteState(ipPrefix.to_string(), true);`
`2627`	`2636`	`}`
`2628`	`2637`
`2629`		`- if (it_route == m_syncdRoutes.at(vrf_id).end())`
	`2638`	`+ if (it_route == routeTableIter->second.end())`
`2630`	`2639`	`{`
`2631`	`2640`	`gFlowCounterRouteOrch->handleRouteAdd(vrf_id, ipPrefix);`
`2632`	`2641`	`}`