[cfgmgr] Fix for STATE_DB Port check (#1936)

qbdwlr · web-flow · commit b592ad79c9bf · 2021-10-11T08:00:39.000-07:00
*Updated checks for PORT entry in STATE_DB in portmgrd, teammgrd, and intfmgrd to additionally check for presence of "state" attribute.
diff --git a/cfgmgr/intfmgr.cpp b/cfgmgr/intfmgr.cpp
@@ -9,6 +9,7 @@
 #include "shellcmd.h"
 #include "macaddress.h"
 #include "warm_restart.h"
+#include <swss/redisutility.h>
 
 using namespace std;
 using namespace swss;
@@ -438,6 +439,11 @@ bool IntfMgr::isIntfStateOk(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("Port %s is ready", alias.c_str());
         return true;
     }
diff --git a/cfgmgr/portmgr.cpp b/cfgmgr/portmgr.cpp
@@ -6,6 +6,7 @@
 #include "portmgr.h"
 #include "exec.h"
 #include "shellcmd.h"
+#include <swss/redisutility.h>
 
 using namespace std;
 using namespace swss;
@@ -87,6 +88,12 @@ bool PortMgr::isPortStateOk(const string &alias)
 
     if (m_statePortTable.get(alias, temp))
     {
+        auto state_opt = swss::fvsGetValue(temp, "state", true);
+        if (!state_opt)
+        {
+            return false;
+        }
+
         SWSS_LOG_INFO("Port %s is ready", alias.c_str());
         return true;
     }
diff --git a/cfgmgr/teammgr.cpp b/cfgmgr/teammgr.cpp
@@ -5,6 +5,7 @@
 #include "tokenize.h"
 #include "warm_restart.h"
 #include "portmgr.h"
+#include <swss/redisutility.h>
 
 #include <algorithm>
 #include <iostream>
@@ -72,6 +73,13 @@ bool TeamMgr::isPortStateOk(const string &alias)
         return false;
     }
 
+    auto state_opt = swss::fvsGetValue(temp, "state", true);
+    if (!state_opt)
+    {
+        SWSS_LOG_INFO("Port %s is not ready", alias.c_str());
+        return false;
+    }
+
     return true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`#include "shellcmd.h"`
`10`	`10`	`#include "macaddress.h"`
`11`	`11`	`#include "warm_restart.h"`
	`12`	`+#include <swss/redisutility.h>`
`12`	`13`
`13`	`14`	`using namespace std;`
`14`	`15`	`using namespace swss;`
`@@ -438,6 +439,11 @@ bool IntfMgr::isIntfStateOk(const string &alias)`
`438`	`439`	`}`
`439`	`440`	`else if (m_statePortTable.get(alias, temp))`
`440`	`441`	`{`
	`442`	`+ auto state_opt = swss::fvsGetValue(temp, "state", true);`
	`443`	`+ if (!state_opt)`
	`444`	`+ {`
	`445`	`+ return false;`
	`446`	`+ }`
`441`	`447`	`SWSS_LOG_DEBUG("Port %s is ready", alias.c_str());`
`442`	`448`	`return true;`
`443`	`449`	`}`