[orchagent] Support for aggregrate VOQ Counters.

orchagent/portsorch.cpp

@@ -75,6 +75,7 @@ extern event_handle_t g_events_handle;
 #define PG_WATERMARK_FLEX_STAT_COUNTER_POLL_MSECS    "60000"
 #define PG_DROP_FLEX_STAT_COUNTER_POLL_MSECS         "10000"
 #define PORT_RATE_FLEX_COUNTER_POLLING_INTERVAL_MS   "1000"
+#define AGG_VOQ_POLL_SEC                                 10
 
 // types --------------------------------------------------------------------------------------------------------------
 
@@ -670,6 +671,12 @@ PortsOrch::PortsOrch(DBConnector *db, DBConnector *stateDb, vector<table_name_wi
         m_tableVoqSystemLagMemberTable = unique_ptr<Table>(new Table(chassisAppDb, CHASSIS_APP_LAG_MEMBER_TABLE_NAME));
 
         m_lagIdAllocator = unique_ptr<LagIdAllocator> (new LagIdAllocator(chassisAppDb));
+        m_tableVoqQueueCounter = unique_ptr<Table>(new Table(chassisAppDb, CHASSIS_APP_COUNTERS_TABLE_NAME));
+        m_agg_voq_poller = new SelectableTimer(timespec { .tv_sec = AGG_VOQ_POLL_SEC, .tv_nsec = 0 });
+
+        auto agg_voq_executor = new ExecutableTimer(m_agg_voq_poller, this, "AGG_VOQ_POLLER");
+        Orch::addExecutor(agg_voq_executor);
+        m_agg_voq_poller->start();
     }
 
     auto executor = new ExecutableTimer(m_port_state_poller, this, "PORT_STATE_POLLER");
@@ -8995,7 +9002,19 @@ void PortsOrch::updatePortStatePoll(const Port &port, port_state_poll_t type, bo
 void PortsOrch::doTask(swss::SelectableTimer &timer)
 {
     Port port;
+    if (timer.getFd() == m_port_state_poller->getFd())
+    {
+        updatePortState();
+    }
+    else if(m_agg_voq_poller && timer.getFd() == m_agg_voq_poller->getFd())
+    {
+        updateVoqStatsChassisDb();
+    }
+}
 
+void PortsOrch::updatePortState()
+{
+    Port port;
     for (auto it = m_port_state_poll.begin(); it != m_port_state_poll.end(); )
     {
         if ((it->second == PORT_STATE_POLL_NONE) || !getPort(it->first, port))
@@ -9024,3 +9043,55 @@ void PortsOrch::doTask(swss::SelectableTimer &timer)
     }
 }
 
+void PortsOrch::updateVoqStatsPerPortChassisDb(const Port& port)
+{
+    std::vector<sai_object_id_t> queue_ids;
+    static const vector<sai_stat_id_t> queueStatIds =
+    {
+        SAI_QUEUE_STAT_PACKETS,
+        SAI_QUEUE_STAT_BYTES,
+        SAI_QUEUE_STAT_DROPPED_PACKETS,
+        SAI_QUEUE_STAT_DROPPED_BYTES,
+    };
+    vector<uint64_t> queueStats(queueStatIds.size());
+
+    queue_ids = m_port_voq_ids[port.m_alias];
+    SWSS_LOG_ENTER();
+
+    for (size_t queueIndex = 0; queueIndex < queue_ids.size(); ++queueIndex)
+    {
+        std::ostringstream key;
+        key << port.m_system_port_info.alias << "@" << gMyHostName << "|" << gMyAsicName << ":" << queueIndex;
+
+        sai_status_t status = sai_queue_api->get_queue_stats(
+           queue_ids[queueIndex],
+           static_cast<uint32_t>(queueStatIds.size()),
+           queueStatIds.data(),
+           queueStats.data());
+
+        if (status != SAI_STATUS_SUCCESS)
+        {
+           SWSS_LOG_ERROR("Failed to fetch queue 0x%" PRIx64 " status: %d", queue_ids[queueIndex], status);
+           continue;
+        }
+
+        //Add to CHASSIS_APP_DB
+        int index = 0;
+        for (const auto& it: queue_stat_ids)
+        {
+            SWSS_LOG_DEBUG("%s %s %s",key.str().c_str(), sai_serialize_queue_stat(it).c_str(),
+                           to_string(queueStats[index]).c_str());
+            m_tableVoqQueueCounter->hset(key.str(), sai_serialize_queue_stat(it), to_string(queueStats[index++]));
+        }
+    }
+}
+
+void PortsOrch::updateVoqStatsChassisDb(){
+   for (const auto& it: m_portList)
+   {
+       if (it.second.m_type != Port::PHY && it.second.m_type != Port::SYSTEM)
+          continue;
+       updateVoqStatsPerPortChassisDb( it.second );
+   }
+}
+

orchagent/portsorch.h

@@ -334,6 +334,7 @@ class PortsOrch : public Orch, public Subject
     bool oper_fec_sup = false;
 
     swss::SelectableTimer *m_port_state_poller = nullptr;
+    swss::SelectableTimer *m_agg_voq_poller = nullptr;
 
     bool m_cmisModuleAsicSyncSupported = false;
 
@@ -469,6 +470,7 @@ class PortsOrch : public Orch, public Subject
     void updatePortStatePoll(const Port &port, port_state_poll_t type, bool active);
     void refreshPortStateAutoNeg(const Port &port);
     void refreshPortStateLinkTraining(const Port &port);
+    void updatePortState();
 
     void getPortSerdesVal(const std::string& s, std::vector<uint32_t> &lane_values, int base = 16);
     bool setPortSerdesAttribute(sai_object_id_t port_id, sai_object_id_t switch_id,
@@ -506,6 +508,10 @@ class PortsOrch : public Orch, public Subject
     std::unordered_set<std::string> generateCounterStats(const string& type, bool gearbox = false);
     map<sai_object_id_t, struct queueInfo> m_queueInfo;
 
+    void updateVoqStatsChassisDb();
+    void updateVoqStatsPerPortChassisDb(const Port& port);
+    unique_ptr<Table> m_tableVoqQueueCounter;
+
 private:
     void initializeCpuPort();
     void initializePorts();