Skip to content

Fixed set mtu for deleted subintf due to late notification #4

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

Closed
EdenGri wants to merge 2 commits into from
Closed

Fixed set mtu for deleted subintf due to late notification #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1db37b3
Fixed set mtu for deleted subintf due to late notification
EdenGri Dec 7, 2022
8ae91e4
change comment and log message after CR
EdenGri Dec 12, 2022
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
17 changes: 14 additions & 3 deletions cfgmgr/intfmgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,9 +447,20 @@ std::string IntfMgr::setHostSubIntfMtu(const string &alias, const string &mtu, c
}
SWSS_LOG_INFO("subintf %s active mtu: %s", alias.c_str(), subifMtu.c_str());
cmd << IP_CMD " link set " << shellquote(alias) << " mtu " << shellquote(subifMtu);
EXEC_WITH_ERROR_THROW(cmd.str(), res);
std::string cmd_str = cmd.str();
int ret = swss::exec(cmd_str, res);

return subifMtu;
if (ret && !isIntfStateOk(alias))
{
// Can happen when a SET notification on the PORT_TABLE in the State DB
// followed by a new DEL notification that send by portmgrd
SWSS_LOG_WARN("Setting mtu 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 subifMtu;
}

void IntfMgr::updateSubIntfAdminStatus(const string &alias, const string &admin)
Expand All @@ -468,7 +479,7 @@ void IntfMgr::updateSubIntfAdminStatus(const string &alias, const string &admin)
continue;
}
std::vector<FieldValueTuple> fvVector;
string subintf_admin = setHostSubIntfAdminStatus(intf, m_subIntfList[intf].adminStatus, admin);
string subintf_admin = setHostSubIntfAdminStatus(intf, m_subIntfList[intf].adminStatus, admin);
m_subIntfList[intf].currAdminStatus = subintf_admin;
FieldValueTuple fvTuple("admin_status", subintf_admin);
fvVector.push_back(fvTuple);
Expand Down