From 792a4bd26a322485b75f60ee7bc2916e64d9db08 Mon Sep 17 00:00:00 2001 From: Tom cappleman Date: Tue, 12 Oct 2021 09:23:00 +0100 Subject: [PATCH] Fixes --- orchagent/mplsrouteorch.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/orchagent/mplsrouteorch.cpp b/orchagent/mplsrouteorch.cpp index 276c7e243e..97ea75dfd8 100644 --- a/orchagent/mplsrouteorch.cpp +++ b/orchagent/mplsrouteorch.cpp @@ -537,6 +537,17 @@ bool RouteOrch::addLabelRoute(LabelRouteBulkContext& ctx, const NextHopGroupKey /* Try to create a new next hop group */ if (!addNextHopGroup(nextHops)) { + for (auto it = nextHops.getNextHops().begin(); it != nextHops.getNextHops().end(); ++it) + { + const NextHopKey& nextHop = *it; + if (!m_neighOrch->hasNextHop(nextHop)) + { + SWSS_LOG_INFO("Failed to get next hop %s in %s, resolving neighbor", + nextHop.to_string().c_str(), nextHops.to_string().c_str()); + m_neighOrch->resolveNeighbor(nextHop); + } + } + /* Failed to create the next hop group and check if a temporary route is needed */ /* If the current next hop is part of the next hop group to sync,