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.

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

Deactivate mirror session only when status is true in updateLagMember #1666

Merged
merged 1 commit into from
Mar 22, 2021
Merged
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion orchagent/mirrororch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1342,7 +1342,10 @@ void MirrorOrch::updateLagMember(const LagMemberUpdate& update)
// If LAG is empty, deactivate session
if (update.lag.m_members.empty())
{
deactivateSession(name, session);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it requested by end user? If yes, the error message is expected.

Copy link
Contributor Author

@shi-su shi-su Mar 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems that the session got deactivated twice, and we should avoid deactivating the same session once it is already deactivated. I think checking the session status should be a valid way to do the job. The function deactivateSession() even has an assertion that session status is true at the beginning of the function.

if (session.status)
{
deactivateSession(name, session);
}
session.neighborInfo.portId = SAI_OBJECT_TYPE_NULL;
}
// Switch to a new member of the LAG
Expand Down