[WR]: Add reconciliation logic for teamsyncd

teamsyncd/teamsync.cpp

@@ -8,6 +8,7 @@
 #include "netmsg.h"
 #include "dbconnector.h"
 #include "producerstatetable.h"
+#include "warm_restart.h"
 #include "teamsync.h"
 
 using namespace std;
@@ -20,8 +21,15 @@ TeamSync::TeamSync(DBConnector *db, DBConnector *stateDb, Select *select) :
     m_select(select),
     m_lagTable(db, APP_LAG_TABLE_NAME),
     m_lagMemberTable(db, APP_LAG_MEMBER_TABLE_NAME),
-    m_stateLagTable(stateDb, STATE_LAG_TABLE_NAME)
+    m_stateLagTable(stateDb, STATE_LAG_TABLE_NAME),
+    m_warmstart(WarmStart::isWarmStart())
 {
+    if (m_warmstart)
+    {
+        m_lagTable.create_temp_view();
+        m_lagMemberTable.create_temp_view();
+        SWSS_LOG_NOTICE("Starting in warmstart mode");
+    }
 }
 
 void TeamSync::doSelectableTask()
@@ -44,6 +52,29 @@ void TeamSync::doSelectableTask()
     m_selectablesToRemove.clear();
 }
 
+void TeamSync::applyState()
+{
+    if (!m_warmstart)
+    {
+        return;
+    }
+
+    SWSS_LOG_NOTICE("Applying state");
+
+    m_lagTable.apply_temp_view();
+    m_lagMemberTable.apply_temp_view();
+
+    for(auto &it: m_stateLagTablePreserved)
+    {
+        const auto &lagName  = it.first;
+        const auto &fvVector = it.second;
+        m_stateLagTable.set(lagName, fvVector);
+    }
+    m_stateLagTablePreserved.clear();
+
+    m_warmstart = false;
+}
+
 void TeamSync::onMsg(int nlmsg_type, struct nl_object *obj)
 {
     struct rtnl_link *link = (struct rtnl_link *)obj;
@@ -90,7 +121,14 @@ void TeamSync::addLag(const string &lagName, int ifindex, bool admin_state,
     fvVector.clear();
     FieldValueTuple s("state", "ok");
     fvVector.push_back(s);
-    m_stateLagTable.set(lagName, fvVector);
+    if(m_warmstart)
+    {
+        m_stateLagTablePreserved[lagName] = fvVector;
+    }
+    else
+    {
+        m_stateLagTable.set(lagName, fvVector);
+    }
 
     /* Create the team instance */
     auto sync = make_shared<TeamPortSync>(lagName, ifindex, &m_lagMemberTable);
@@ -116,7 +154,15 @@ void TeamSync::removeLag(const string &lagName)
     if (m_teamSelectables.find(lagName) == m_teamSelectables.end())
         return;
 
-    m_stateLagTable.del(lagName);
+    if(m_warmstart)
+    {
+        m_stateLagTablePreserved.erase(lagName);
+    }
+    else
+    {
+        m_stateLagTable.del(lagName);
+    }
+
     m_selectablesToRemove.insert(lagName);
 }
 

teamsyncd/teamsync.h

@@ -11,13 +11,19 @@
 #include "netmsg.h"
 #include <team.h>
 
+// seconds
+#define WR_PENDING_TIME 70
+
 namespace swss {
 
 class TeamSync : public NetMsg
 {
 public:
     TeamSync(DBConnector *db, DBConnector *stateDb, Select *select);
 
+    /* valid only in WR mode */
+    void applyState();
+
     /* Listen to RTM_NEWLINK, RTM_DELLINK to track team devices */
     virtual void onMsg(int nlmsg_type, struct nl_object *obj);
 
@@ -60,6 +66,9 @@ class TeamSync : public NetMsg
     ProducerStateTable m_lagMemberTable;
     Table m_stateLagTable;
 
+    bool m_warmstart;
+    std::unordered_map<std::string, std::vector<FieldValueTuple>> m_stateLagTablePreserved;
+
     /* Store selectables needed to be updated in doSelectableTask function */
     std::set<std::string> m_selectablesToAdd;
     std::set<std::string> m_selectablesToRemove;

teamsyncd/teamsyncd.cpp

@@ -1,17 +1,23 @@
 #include <iostream>
+#include <chrono>
 #include <team.h>
 #include "logger.h"
 #include "select.h"
 #include "netdispatcher.h"
 #include "netlink.h"
+#include "warm_restart.h"
 #include "teamsync.h"
 
+
 using namespace std;
 using namespace swss;
+using namespace std::chrono;
 
 int main(int argc, char **argv)
 {
     swss::Logger::linkToDbNative("teamsyncd");
+    WarmStart::initialize("teamsyncd", "teamd");
+    WarmStart::checkWarmStart("teamsyncd", "teamd");
     DBConnector db(APPL_DB, DBConnector::DEFAULT_UNIXSOCKET, 0);
     DBConnector stateDb(STATE_DB, DBConnector::DEFAULT_UNIXSOCKET, 0);
     Select s;
@@ -20,6 +26,8 @@ int main(int argc, char **argv)
     NetDispatcher::getInstance().registerMessageHandler(RTM_NEWLINK, &sync);
     NetDispatcher::getInstance().registerMessageHandler(RTM_DELLINK, &sync);
 
+    steady_clock::time_point start_time = steady_clock::now();
+
     while (1)
     {
         try
@@ -34,7 +42,13 @@ int main(int argc, char **argv)
             while (true)
             {
                 Selectable *temps;
-                s.select(&temps);
+                s.select(&temps, 1000); // check every second
+
+                auto diff = duration_cast<seconds>(steady_clock::now() - start_time);
+                if(diff.count() > WR_PENDING_TIME)
+                {
+                    sync.applyState();
+                }
 
                 sync.doSelectableTask();
             }