Skip to content

[vs] Add workaround for clean up macsec ports #752

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

Merged
kcudnik merged 2 commits into from
Dec 18, 2020
Merged

[vs] Add workaround for clean up macsec ports #752

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4da933c
[vs] Add workaround for clean up macsec ports
kcudnik Dec 17, 2020
2391930
[vs] Reduce error log to warning
kcudnik Dec 18, 2020
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 vslib/src/MACsecManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,10 @@ void MACsecManager::cleanup_macsec_device() const

if (!exec("/sbin/ip macsec show", macsecInfos))
{
SWSS_LOG_THROW("Cannot show MACsec ports");
// this is workaround, there was exception thrown here, and it probably
// suggest that, ip command is in place, but don't support "macsec"
SWSS_LOG_ERROR("Cannot show MACsec ports");
Copy link
Copy Markdown
Contributor

@lguohan lguohan Dec 18, 2020

Choose a reason for hiding this comment

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

i think this will block log analyzer, better to change to notice level.

Copy link
Copy Markdown
Collaborator Author

@kcudnik kcudnik Dec 18, 2020

Choose a reason for hiding this comment

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

what log analyzer ? out internal ? do you propose warning ?

Copy link
Copy Markdown
Contributor

@lguohan lguohan Dec 18, 2020

Choose a reason for hiding this comment

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

the log analyzer in sonic-mgmt repo, it will report error when it does the vsimage check, warning should be fine.

return;
}

// Here is an example of MACsec device informations
Expand Down