[teammgrd]: Check if port is enslaved on all conditions (#687)

Shuotian Cheng · lguohan · commit b42710a11ef4 · 2018-11-15T17:29:07.000-08:00
During the warm restart, port is already enslaved in the kernel.
This change is to avoid teammgrd to re-configure those member
ports which causes link flap.

Signed-off-by: Shu0T1an ChenG &lt;shuche@microsoft.com&gt;
diff --git a/cfgmgr/teammgr.cpp b/cfgmgr/teammgr.cpp
@@ -291,7 +291,7 @@ void TeamMgr::doPortUpdateTask(Consumer &consumer)
             SWSS_LOG_INFO("Received port %s state update", alias.c_str());
 
             string lag;
-            if (!isPortEnslaved(alias) && findPortMaster(lag, alias))
+            if (findPortMaster(lag, alias))
             {
                 if (addLagMember(lag, alias) == task_need_retry)
                 {
@@ -430,6 +430,13 @@ task_process_status TeamMgr::addLagMember(const string &lag, const string &membe
 {
     SWSS_LOG_ENTER();
 
+    // If port is already enslaved, ignore this operation
+    // TODO: check the current master if it is the same as to be configured
+    if (isPortEnslaved(member))
+    {
+        return task_ignore;
+    }
+
     stringstream cmd;
     string res;
 

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,7 @@ void TeamMgr::doPortUpdateTask(Consumer &consumer)`
`291`	`291`	`SWSS_LOG_INFO("Received port %s state update", alias.c_str());`
`292`	`292`
`293`	`293`	`string lag;`
`294`		`- if (!isPortEnslaved(alias) && findPortMaster(lag, alias))`
	`294`	`+ if (findPortMaster(lag, alias))`
`295`	`295`	`{`
`296`	`296`	`if (addLagMember(lag, alias) == task_need_retry)`
`297`	`297`	`{`
`@@ -430,6 +430,13 @@ task_process_status TeamMgr::addLagMember(const string &lag, const string &membe`
`430`	`430`	`{`
`431`	`431`	`SWSS_LOG_ENTER();`
`432`	`432`
	`433`	`+ // If port is already enslaved, ignore this operation`
	`434`	`+ // TODO: check the current master if it is the same as to be configured`
	`435`	`+ if (isPortEnslaved(member))`
	`436`	`+ {`
	`437`	`+ return task_ignore;`
	`438`	`+ }`
	`439`	`+`
`433`	`440`	`stringstream cmd;`
`434`	`441`	`string res;`
`435`	`442`