Skip to content

Avoid updating the NHGroup when mux state changes. #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yxieca merged 2 commits into from
Aug 13, 2025
Merged

Avoid updating the NHGroup when mux state changes. #126

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
248546f
Avoid updating the NHGroup when mux state changes.
manamand2020 Aug 11, 2025
76e0fca
Merge branch '202501' into mux_avoid_nhgroup_update
manamand2020 Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 0 additions & 39 deletions orchagent/muxorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,27 +818,6 @@ bool MuxNbrHandler::enable(bool update_rt)
/* Increment ref count for new NHs */
gNeighOrch->increaseNextHopRefCount(nh_key, num_routes);

/*
* Invalidate current nexthop group and update with new NH
* Ref count update is not required for tunnel NH IDs (nh_removed)
*/
uint32_t nh_removed, nh_added;
if (!gRouteOrch->invalidnexthopinNextHopGroup(nh_key, nh_removed))
{
SWSS_LOG_ERROR("Removing existing NH failed for %s", nh_key.ip_address.to_string().c_str());
return false;
}

if (!gRouteOrch->validnexthopinNextHopGroup(nh_key, nh_added))
{
SWSS_LOG_ERROR("Adding NH failed for %s", nh_key.ip_address.to_string().c_str());
return false;
}
SWSS_LOG_INFO("Adding NH for %s, nh_added: %u", nh_key.ip_address.to_string().c_str(), nh_added);

/* Increment ref count for ECMP NH members */
gNeighOrch->increaseNextHopRefCount(nh_key, nh_added);

if (update_rt)
{
updateTunnelRoute(nh_key, false);
Expand Down Expand Up @@ -892,24 +871,6 @@ bool MuxNbrHandler::disable(sai_object_id_t tnh)
/* Decrement ref count for old NHs */
gNeighOrch->decreaseNextHopRefCount(nh_key, num_routes);

/* Invalidate current nexthop group and update with new NH */
uint32_t nh_removed, nh_added;
if (!gRouteOrch->invalidnexthopinNextHopGroup(nh_key, nh_removed))
{
SWSS_LOG_ERROR("Removing existing NH failed for %s", nh_key.ip_address.to_string().c_str());
return false;
}
SWSS_LOG_INFO("Removing existing NH for %s, nh_removed: %u", nh_key.ip_address.to_string().c_str(), nh_removed);

/* Decrement ref count for ECMP NH members */
gNeighOrch->decreaseNextHopRefCount(nh_key, nh_removed);

if (!gRouteOrch->validnexthopinNextHopGroup(nh_key, nh_added))
{
SWSS_LOG_ERROR("Adding NH failed for %s", nh_key.ip_address.to_string().c_str());
return false;
}

updateTunnelRoute(nh_key, true);

it++;
Expand Down
Loading