From 3474760556446de0afc4ff5d954a7937d8a6e966 Mon Sep 17 00:00:00 2001 From: Sudharsan Dhamal Gopalarathnam Date: Sat, 23 Oct 2021 01:19:11 +0000 Subject: [PATCH 1/2] [vlanmgr]Fix for STATE_DB port check logic Signed-off-by: Sudharsan Dhamal Gopalarathnam --- cfgmgr/vlanmgr.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cfgmgr/vlanmgr.cpp b/cfgmgr/vlanmgr.cpp index e439420933..48e25c3095 100644 --- a/cfgmgr/vlanmgr.cpp +++ b/cfgmgr/vlanmgr.cpp @@ -452,6 +452,11 @@ bool VlanMgr::isMemberStateOk(const string &alias) } else if (m_statePortTable.get(alias, temp)) { + auto state_opt = swss::fvsGetValue(temp, "state", true); + if (!state_opt) + { + return false; + } SWSS_LOG_DEBUG("%s is ready", alias.c_str()); return true; } From 5734bfb1fcd197910e67c3003e7968f4750368cf Mon Sep 17 00:00:00 2001 From: Sudharsan Dhamal Gopalarathnam Date: Sat, 23 Oct 2021 05:31:52 +0000 Subject: [PATCH 2/2] Adding required headers Signed-off-by: Sudharsan Dhamal Gopalarathnam --- cfgmgr/vlanmgr.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/cfgmgr/vlanmgr.cpp b/cfgmgr/vlanmgr.cpp index 48e25c3095..2f19fdff1a 100644 --- a/cfgmgr/vlanmgr.cpp +++ b/cfgmgr/vlanmgr.cpp @@ -7,6 +7,7 @@ #include "tokenize.h" #include "shellcmd.h" #include "warm_restart.h" +#include using namespace std; using namespace swss;