[Teamdmgrd]Fix "teamd cannot start when port channel was down before …

…warm reboot" issue (sonic-net#1171) * during warm-reboot teamd need to use same system-id before warm-reboot Signed-off-by: shine.chen <[email protected]> * refine per review comment Signed-off-by: shine.chen <[email protected]> * skip saved pdu on negotiation stage Signed-off-by: shine.chen <[email protected]> * reformat teammgr file
madhanmellanox · Jan 30, 2020 · da89cf2 · da89cf2
1 parent eceb423
commit da89cf2
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/cfgmgr/teammgr.cpp b/cfgmgr/teammgr.cpp
@@ -492,13 +492,19 @@ task_process_status TeamMgr::addLag(const string &alias, int min_links, bool fal
         while (getline(aliasfile, line))
         {
             ifstream memberfile(dump_path + line, ios::binary);
-            uint8_t mac_temp[ETHER_ADDR_LEN];
+            uint8_t mac_temp[ETHER_ADDR_LEN] = {0};
+            uint8_t null_mac[ETHER_ADDR_LEN] = {0};
 
             if (!memberfile.is_open())
                 continue;
 
             memberfile.seekg(partner_system_id_offset, std::ios::beg);
             memberfile.read(reinterpret_cast<char*>(mac_temp), ETHER_ADDR_LEN);
+
+            /* During negotiation stage partner info of pdu is empty , skip it */
+            if (memcmp(mac_temp, null_mac, ETHER_ADDR_LEN) == 0)
+                continue;
+
             mac_boot = MacAddress(mac_temp);
             break;
         }