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

Fixed set admin_status for deleted subintf due to late notification #2659

Merged
merged 3 commits into from
Mar 14, 2023
Merged

Fixed set admin_status for deleted subintf due to late notification #2659

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2554455
Fixed set admin_status for deleted subintf due to late notification
EdenGri Feb 7, 2023
e8e0f67
add unit tests
EdenGri Mar 9, 2023
79335fb
Add unit tests, change the file name from add_ipv6_prefix_ut.cpp to i…
EdenGri Mar 13, 2023
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
15 changes: 13 additions & 2 deletions cfgmgr/intfmgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,13 +491,24 @@ void IntfMgr::updateSubIntfAdminStatus(const string &alias, const string &admin)
std::string IntfMgr::setHostSubIntfAdminStatus(const string &alias, const string &admin_status, const string &parent_admin_status)
{
stringstream cmd;
string res;
string res, cmd_str;

if (parent_admin_status == "up" || admin_status == "down")
{
SWSS_LOG_INFO("subintf %s admin_status: %s", alias.c_str(), admin_status.c_str());
cmd << IP_CMD " link set " << shellquote(alias) << " " << shellquote(admin_status);
EXEC_WITH_ERROR_THROW(cmd.str(), res);
cmd_str = cmd.str();
int ret = swss::exec(cmd_str, res);
if (ret && !isIntfStateOk(alias))
{
// Can happen when a DEL notification is sent by portmgrd immediately followed by a new SET notification
SWSS_LOG_WARN("Setting admin_status to %s netdev failed with cmd:%s, rc:%d, error:%s",
alias.c_str(), cmd_str.c_str(), ret, res.c_str());
}
else if (ret)
{
throw runtime_error(cmd_str + " : " + res);
}
return admin_status;
}
else
Expand Down