diff --git a/cfgmgr/teammgr.cpp b/cfgmgr/teammgr.cpp index 5d526e79df13..8d02dbd785d2 100644 --- a/cfgmgr/teammgr.cpp +++ b/cfgmgr/teammgr.cpp @@ -11,8 +11,9 @@ #include #include -#include #include +#include +#include using namespace std; using namespace swss; @@ -237,6 +238,16 @@ bool TeamMgr::checkPortIffUp(const string &port) return ifr.ifr_flags & IFF_UP; } +bool TeamMgr::isPortEnslaved(const string &port) +{ + SWSS_LOG_ENTER(); + + struct stat buf; + string path = "/sys/class/net/" + port + "/master"; + + return lstat(path.c_str(), &buf) == 0; +} + bool TeamMgr::findPortMaster(string &master, const string &port) { SWSS_LOG_ENTER(); @@ -280,7 +291,7 @@ void TeamMgr::doPortUpdateTask(Consumer &consumer) SWSS_LOG_INFO("Received port %s state update", alias.c_str()); string lag; - if (findPortMaster(lag, alias)) + if (!isPortEnslaved(alias) && findPortMaster(lag, alias)) { if (addLagMember(lag, alias) == task_need_retry) { diff --git a/cfgmgr/teammgr.h b/cfgmgr/teammgr.h index 8ffb6de0e0db..73c0010f8728 100644 --- a/cfgmgr/teammgr.h +++ b/cfgmgr/teammgr.h @@ -46,6 +46,7 @@ class TeamMgr : public Orch bool setLagAdminStatus(const string &alias, const string &admin_status); bool setLagMtu(const string &alias, const string &mtu); + bool isPortEnslaved(const string &); bool findPortMaster(string &, const string &); bool checkPortIffUp(const string &); bool isPortStateOk(const string&);