Skip to content
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

Jump to bottom

Remove RIF from m_rifsToAdd before deleting it #3336

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Remove RIF from m_rifsToAdd before deleting it #3336

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fb4b224
Remove RIF from m_rifsToAdd before deleting RIF
tshalvi Sep 10, 2024
be6f915
Add newline at end of file
tshalvi Sep 10, 2024
4a339b8
Invoke removeRifFromFlexCounter only if router interface is not found…
tshalvi Sep 11, 2024
1ddaeb4
missing semicolon
tshalvi Sep 24, 2024
945f908
Merge branch 'master' into master_remove_rif_from_rif_queue_before_po…
prsunny Oct 21, 2024
f1f985b
Merge branch 'master' into master_remove_rif_from_rif_queue_before_po…
dgsudharsan Nov 5, 2024
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
20 changes: 17 additions & 3 deletions orchagent/intfsorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1316,8 +1316,21 @@ bool IntfsOrch::removeRouterIntfs(Port &port)
return false;
}

const auto id = sai_serialize_object_id(port.m_rif_id);
removeRifFromFlexCounter(id, port.m_alias);
bool port_found = false;
for (auto it = m_rifsToAdd.begin(); it != m_rifsToAdd.end(); ++it)
{
if (it->m_rif_id == port.m_rif_id)
{
m_rifsToAdd.erase(it);
port_found = true;
break;
}
}
if (!port_found)
{
const auto id = sai_serialize_object_id(port.m_rif_id);
removeRifFromFlexCounter(id, port.m_alias);
}

sai_status_t status = sai_router_intfs_api->remove_router_interface(port.m_rif_id);
if (status != SAI_STATUS_SUCCESS)
Expand Down Expand Up @@ -1746,4 +1759,5 @@ void IntfsOrch::voqSyncIntfState(string &alias, bool isUp)
m_tableVoqSystemInterfaceTable->hset(port_alias, "oper_status", isUp ? "up" : "down");
}

}
}

Loading