[portsorch] optimize to 3 iterations instead of 4

Signed-off-by: Stepan Blyschak <[email protected]>

orchagent/orchdaemon.cpp

@@ -475,22 +475,20 @@ bool OrchDaemon::warmRestoreAndSyncUp()
     }
 
     /*
-     * Four iterations are needed.
+     * Three iterations are needed.
      *
-     * First iteration: switchorch, Port init/hostif create part of portorch.
+     * First iteration: switchorch, Port init/hostif create part of portorch, buffers configuration
      *
-     * Second iteratoin: gBufferOrch which requires port created,
-     *   then port speed/mtu/fec_mode/pfc_asym/admin_status config.
+     * Second iteratoin: port speed/mtu/fec_mode/pfc_asym/admin_status config,
+     * other orch(s) which wait for port to become ready.
      *
-     * Third iteration: other orch(s) which wait for port init done.
-     *
-     * Fourth iteration: Drain remaining data that are out of order like LAG_MEMBER_TABLE and
+     * Third iteration: Drain remaining data that are out of order like LAG_MEMBER_TABLE and
      * VLAN_MEMBER_TABLE since they were checked before LAG_TABLE and VLAN_TABLE within gPortsOrch.
      */
 
-    for (auto it = 0; it < 4; it++)
+    for (auto it = 0; it < 3; it++)
     {
-        SWSS_LOG_DEBUG("The current iteration is %d", it);
+        SWSS_LOG_NOTICE("The current iteration is %d", it);
 
         for (Orch *o : m_orchList)
         {

orchagent/portsorch.cpp

@@ -2361,6 +2361,22 @@ void PortsOrch::doLagMemberTask(Consumer &consumer)
     }
 }
 
+void PortsOrch::doTask()
+{
+    auto portConsumer = getExecutor(APP_PORT_TABLE_NAME);
+    portConsumer->drain();
+
+    for (auto& it: m_consumerMap)
+    {
+        auto consumer = it.second.get();
+        if (consumer == portConsumer)
+        {
+            continue;
+        }
+        consumer->drain();
+    }
+}
+
 void PortsOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();

orchagent/portsorch.h

@@ -126,6 +126,7 @@ class PortsOrch : public Orch, public Subject
 
     NotificationConsumer* m_portStatusNotificationConsumer;
 
+    void doTask() override;
     void doTask(Consumer &consumer);
     void doPortTask(Consumer &consumer);
     void doVlanTask(Consumer &consumer);