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

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 <[email protected]>
sonic-net · Nov 16, 2018 · b42710a · b42710a
1 parent 75972e7
commit b42710a
Showing 1 changed file with 8 additions and 1 deletion.
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;