Init OrchDaemon with optional warm starting (sonic-net#587)

madhanmellanox · Aug 21, 2018 · d7bd94f · d7bd94f
1 parent 9f645e5
commit d7bd94f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/orchagent/main.cpp b/orchagent/main.cpp
@@ -281,10 +281,7 @@ int main(int argc, char **argv)
             exit(EXIT_FAILURE);
         }
 
-        if (!WarmStart::isWarmStart())
-        {
-            syncd_apply_view();
-        }
+        syncd_apply_view();
 
         orchDaemon->start();
     }

diff --git a/orchagent/orchdaemon.cpp b/orchagent/orchdaemon.cpp
@@ -17,7 +17,6 @@ using namespace swss;
 
 extern sai_switch_api_t*           sai_switch_api;
 extern sai_object_id_t             gSwitchId;
-extern void syncd_apply_view();
 /*
  * Global orch daemon variables
  */
@@ -263,6 +262,11 @@ bool OrchDaemon::init()
 
     m_orchList.push_back(&CounterCheckOrch::getInstance(m_configDb));
 
+    if (WarmStart::isWarmStart())
+    {
+        warmRestoreAndSyncUp();
+    }
+
     return true;
 }
 
@@ -285,8 +289,6 @@ void OrchDaemon::start()
 {
     SWSS_LOG_ENTER();
 
-    warmRestoreAndSyncUp();
-
     for (Orch *o : m_orchList)
     {
         m_select->addSelectables(o->getSelectables());
@@ -336,11 +338,6 @@ void OrchDaemon::start()
  */
 void OrchDaemon::warmRestoreAndSyncUp()
 {
-    if (!WarmStart::isWarmStart())
-    {
-        return;
-    }
-
     WarmStart::setWarmStartState("orchagent", WarmStart::INIT);
 
     for (Orch *o : m_orchList)
@@ -372,7 +369,6 @@ void OrchDaemon::warmRestoreAndSyncUp()
     warmRestoreValidation();
 
     SWSS_LOG_NOTICE("Orchagent state restore done");
-    syncd_apply_view();
 
     /* TODO: perform port and fdb state sync up*/