Skip to content

Ignore LAG member port enable message for down ports #3969

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

Draft
wants to merge 1 commit into
base: 202405
Choose a base branch
from
+26 −11
Draft

Ignore LAG member port enable message for down ports #3969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 24 additions & 10 deletions teamsyncd/teamsync.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ TeamSync::TeamSync(DBConnector *db, DBConnector *stateDb, Select *select) :
m_select(select),
m_lagTable(db, APP_LAG_TABLE_NAME),
m_lagMemberTable(db, APP_LAG_MEMBER_TABLE_NAME),
m_portTable(db, APP_PORT_TABLE_NAME),
m_stateLagTable(stateDb, STATE_LAG_TABLE_NAME)
{
WarmStart::initialize(TEAMSYNCD_APP_NAME, "teamd");
Expand Down Expand Up @@ -183,7 +184,7 @@ void TeamSync::addLag(const string &lagName, int ifindex, bool admin_state,
if (lag_update)
{
/* Create the team instance */
auto sync = make_shared<TeamPortSync>(lagName, ifindex, &m_lagMemberTable);
auto sync = make_shared<TeamPortSync>(lagName, ifindex, &m_lagMemberTable, &m_portTable);
m_teamSelectables[lagName] = sync;
m_selectablesToAdd.insert(lagName);
}
Expand Down Expand Up @@ -241,8 +242,9 @@ const struct team_change_handler TeamSync::TeamPortSync::gPortChangeHandler = {
};

TeamSync::TeamPortSync::TeamPortSync(const string &lagName, int ifindex,
ProducerStateTable *lagMemberTable) :
ProducerStateTable *lagMemberTable, Table *portMemberTable) :
m_lagMemberTable(lagMemberTable),
m_portMemberTable(portMemberTable),
m_lagName(lagName),
m_ifindex(ifindex)
{
Expand Down Expand Up @@ -345,14 +347,26 @@ int TeamSync::TeamPortSync::onChange()
{
if (m_lagMembers.find(it.first) == m_lagMembers.end() || it.second != m_lagMembers[it.first])
{
string key = m_lagName + ":" + it.first;
vector<FieldValueTuple> v;
FieldValueTuple l("status", it.second ? "enabled" : "disabled");
v.push_back(l);
m_lagMemberTable->set(key, v);

SWSS_LOG_INFO("Set LAG %s member %s with status %s",
m_lagName.c_str(), it.first.c_str(), it.second ? "enabled" : "disabled");
string admin_state, oper_state;
m_portMemberTable->hget(it.first, "admin_status", admin_state);
m_portMemberTable->hget(it.first, "oper_status", oper_state);
SWSS_LOG_INFO("Oper and Admin status of LAG %s member %s: %s, %s",
m_lagName.c_str(), it.first.c_str(), oper_state.c_str(), admin_state.c_str());
if (admin_state == "up" || !it.second)
{
string key = m_lagName + ":" + it.first;
vector<FieldValueTuple> v;
FieldValueTuple l("status", it.second ? "enabled" : "disabled");
v.push_back(l);
m_lagMemberTable->set(key, v);

SWSS_LOG_INFO("Set LAG %s member %s with status %s",
m_lagName.c_str(), it.first.c_str(), it.second ? "enabled" : "disabled");
}
else
{
SWSS_LOG_WARN("Refuse to receive the teamd state of port member when port is down");
}
}
}

Expand Down
3 changes: 2 additions & 1 deletion teamsyncd/teamsync.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class TeamSync : public NetMsg
public:
enum { MAX_IFNAME = 64 };
TeamPortSync(const std::string &lagName, int ifindex,
ProducerStateTable *lagMemberTable);
ProducerStateTable *lagMemberTable, Table *portMemberTable);
~TeamPortSync();

int getFd() override;
Expand All @@ -52,6 +52,7 @@ class TeamSync : public NetMsg
static const struct team_change_handler gPortChangeHandler;
private:
ProducerStateTable *m_lagMemberTable;
Table *m_portMemberTable;
struct team_handle *m_team;
std::string m_lagName;
int m_ifindex;
Expand Down