Merge branch '202411' of https://github.com/sonic-net/sonic-swss into 202412

Author: mssonicbld

orchagent/notifier.h

@@ -14,8 +14,18 @@ class Notifier : public Executor {
         return static_cast<swss::NotificationConsumer *>(getSelectable());
     }
 
-    void execute()
+    void execute() override
     {
-        m_orch->doTask(*getNotificationConsumer());
+        auto notificationConsumer = getNotificationConsumer();
+        /* Check before triggering doTask because pop() can throw an exception if there is no data */
+        if (notificationConsumer->hasData())
+        {
+            m_orch->doTask(*notificationConsumer);
+        }
     }
-};
+
+    void drain() override
+    {
+        this->execute();
+    }
+};

orchagent/portsorch.cpp

@@ -8382,17 +8382,26 @@ void PortsOrch::doTask(NotificationConsumer &consumer)
         return;
     }
 
-    std::string op;
-    std::string data;
-    std::vector<swss::FieldValueTuple> values;
-
-    consumer.pop(op, data, values);
-
     if (&consumer != m_portStatusNotificationConsumer && &consumer != m_portHostTxReadyNotificationConsumer)
     {
         return;
     }
 
+    std::deque<KeyOpFieldsValuesTuple> entries;
+    consumer.pops(entries);
+
+    for (auto& entry : entries)
+    {
+        handleNotification(consumer, entry);
+    }
+}
+
+void PortsOrch::handleNotification(NotificationConsumer &consumer, KeyOpFieldsValuesTuple& entry)
+{
+    auto op = kfvOp(entry);
+    auto data = kfvKey(entry);
+    auto values = kfvFieldsValues(entry);
+
     if (&consumer == m_portStatusNotificationConsumer && op == "port_state_change")
     {
         uint32_t count;
@@ -8437,7 +8446,7 @@ void PortsOrch::doTask(NotificationConsumer &consumer)
                     if (!m_portHlpr.fecToStr(fec_str, fec_mode))
                     {
                         SWSS_LOG_ERROR("Error unknown fec mode %d while querying port %s fec mode",
-                                       static_cast<std::int32_t>(fec_mode), port.m_alias.c_str());
+                                    static_cast<std::int32_t>(fec_mode), port.m_alias.c_str());
                         fec_str = "N/A";
                     }
                     updateDbPortOperFec(port,fec_str);
@@ -8476,7 +8485,6 @@ void PortsOrch::doTask(NotificationConsumer &consumer)
         }
         setHostTxReady(p, host_tx_ready_status == SAI_PORT_HOST_TX_READY_STATUS_READY ? "true" : "false");
     }
-
 }
 
 void PortsOrch::updatePortErrorStatus(Port &port, sai_port_error_status_t errstatus)

orchagent/portsorch.h

@@ -379,6 +379,7 @@ class PortsOrch : public Orch, public Subject
     void doTransceiverPresenceCheck(Consumer &consumer);
 
     void doTask(NotificationConsumer &consumer);
+    void handleNotification(NotificationConsumer &consumer, KeyOpFieldsValuesTuple& entry);
     void doTask(swss::SelectableTimer &timer);
 
     void removePortFromLanesMap(string alias);