Addressed review comments

Signed-off-by: Akhilesh Samineni <akhilesh.samineni@broadcom.com>
sonic-net · Dec 10, 2019 · 3ca530c · 3ca530c
1 parent e4b7724
commit 3ca530c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/natsyncd/natsync.cpp b/natsyncd/natsync.cpp
@@ -61,6 +61,27 @@ NatSync::NatSync(RedisPipeline *pipelineAppDB, DBConnector *appDb, DBConnector *
     }
 }
 
+/* To check the port init is done or not */
+bool NatSync::isPortInitDone(DBConnector *app_db)
+{
+    bool portInit = 0;
+    long cnt = 0;
+
+    while(!portInit) {
+        Table portTable(app_db, APP_PORT_TABLE_NAME);
+        std::vector<FieldValueTuple> tuples;
+        portInit = portTable.get("PortInitDone", tuples);
+
+        if(portInit)
+            break;
+        sleep(1);
+        cnt++;
+    }
+    sleep(5);
+    SWSS_LOG_NOTICE("PORT_INIT_DONE : %d %ld", portInit, cnt);
+    return portInit;
+}
+
 // Check if nat conntrack entries are restored in kernel
 bool NatSync::isNatRestoreDone()
 {

diff --git a/natsyncd/natsync.h b/natsyncd/natsync.h
@@ -25,6 +25,7 @@
 #include "nfnetlink.h"
 #include <linux/netfilter/nfnetlink_conntrack.h>
 #include <linux/netfilter/nf_conntrack_common.h>
+#include <unistd.h>
 
 // The timeout value (in seconds) for natsyncd reconcilation logic
 #define DEFAULT_NATSYNC_WARMSTART_TIMER 30
@@ -46,6 +47,7 @@ class NatSync : public NetMsg
     virtual void onMsg(int nlmsg_type, struct nl_object *obj);
 
     bool isNatRestoreDone();
+    bool isPortInitDone(DBConnector *app_db);
 
     AppRestartAssist *getRestartAssist()
     {

diff --git a/natsyncd/natsyncd.cpp b/natsyncd/natsyncd.cpp
@@ -23,6 +23,8 @@ int main(int argc, char **argv)
     nfnl.registerRecvCallbacks();
     NatSync sync(&pipelineAppDB, &appDb, &stateDb, &nfnl);
 
+    sync.isPortInitDone(&appDb);
+
     NetDispatcher::getInstance().registerMessageHandler(NFNLMSG_TYPE(NFNL_SUBSYS_CTNETLINK, IPCTNL_MSG_CT_NEW), &sync);
     NetDispatcher::getInstance().registerMessageHandler(NFNLMSG_TYPE(NFNL_SUBSYS_CTNETLINK, IPCTNL_MSG_CT_DELETE), &sync);
 
@@ -65,7 +67,7 @@ int main(int argc, char **argv)
             nfnl.registerGroup(NFNLGRP_CONNTRACK_UPDATE);
             nfnl.registerGroup(NFNLGRP_CONNTRACK_DESTROY);
 
-            cout << "Listens to conntrack messages..." << endl;
+            SWSS_LOG_INFO("Listens to conntrack messages...");
             nfnl.dumpRequest(IPCTNL_MSG_CT_GET);
 
             s.addSelectable(&nfnl);
@@ -89,7 +91,7 @@ int main(int argc, char **argv)
         }
         catch (const std::exception& e)
         {
-            cout << "Exception \"" << e.what() << "\" had been thrown in daemon" << endl;
+            SWSS_LOG_ERROR("Runtime error: %s", e.what());
             return 0;
         }
     }