From 4da933c7e65bc0766a053162c6ce9f49c5154a05 Mon Sep 17 00:00:00 2001 From: kcudnik Date: Thu, 17 Dec 2020 19:11:55 +0100 Subject: [PATCH 1/2] [vs] Add workaround for clean up macsec ports --- vslib/src/MACsecManager.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vslib/src/MACsecManager.cpp b/vslib/src/MACsecManager.cpp index 71561fb03..64b695ebd 100644 --- a/vslib/src/MACsecManager.cpp +++ b/vslib/src/MACsecManager.cpp @@ -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"); + return; } // Here is an example of MACsec device informations From 2391930aa4fb7b36bfa01ed6d1691103b48d7163 Mon Sep 17 00:00:00 2001 From: kcudnik Date: Fri, 18 Dec 2020 11:31:33 +0100 Subject: [PATCH 2/2] [vs] Reduce error log to warning --- vslib/src/MACsecManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vslib/src/MACsecManager.cpp b/vslib/src/MACsecManager.cpp index 64b695ebd..825360feb 100644 --- a/vslib/src/MACsecManager.cpp +++ b/vslib/src/MACsecManager.cpp @@ -847,7 +847,7 @@ void MACsecManager::cleanup_macsec_device() const { // 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"); + SWSS_LOG_WARN("Cannot show MACsec ports"); return; }