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

Vlanmgrd handling of portchannel does not exist more gracefully. #3367

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

Vlanmgrd handling of portchannel does not exist more gracefully. #3367

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f21f91a
Update values_store.cpp
abdosi Oct 18, 2024
553363b
Merge branch 'master' into master
abdosi Oct 23, 2024
26a6212
Merge branch 'master' into master
abdosi Oct 24, 2024
f609c8d
Update values_store.cpp
abdosi Oct 29, 2024
a608553
Merge branch 'sonic-net:master' into master
abdosi Oct 29, 2024
adff6c4
Update values_store.cpp
abdosi Oct 29, 2024
4ef4277
Merge branch 'sonic-net:master' into master
abdosi Nov 5, 2024
1e247e9
Fix the issue race condition where portchannel might get deleted
abdosi Nov 7, 2024
4deb44c
Merge branch 'sonic-net:master' into vlanmgrd
abdosi Nov 14, 2024
a9c3248
Update vlanmgr.cpp
abdosi Nov 15, 2024
d75a2d8
Merge branch 'master' into vlanmgrd
abdosi Nov 15, 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
18 changes: 17 additions & 1 deletion cfgmgr/vlanmgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,17 @@ bool VlanMgr::addHostVlanMember(int vlan_id, const string &port_alias, const str
cmds << BASH_CMD " -c " << shellquote(inner.str());

std::string res;
EXEC_WITH_ERROR_THROW(cmds.str(), res);
try
{
EXEC_WITH_ERROR_THROW(cmds.str(), res);
}
catch (const std::runtime_error& e)
{
if (!isMemberStateOk(port_alias))
return false;
else
EXEC_WITH_ERROR_THROW(cmds.str(), res);
}

return true;
}
Expand Down Expand Up @@ -632,6 +642,12 @@ void VlanMgr::doVlanMemberTask(Consumer &consumer)

m_vlanMemberReplay.erase(kfvKey(t));
}
else
{
SWSS_LOG_INFO("Netdevice for %s not ready, delaying", kfvKey(t).c_str());
it++;
continue;
}
}
else if (op == DEL_COMMAND)
{
Expand Down
Loading