Revert "[flex-counters] Delay flex counters stats init for faster boot time (sonic-net#1646)" (sonic-net#1743)

This reverts commit ee7a735.

Author: qiluo-msft

orchagent/flexcounterorch.cpp

@@ -16,11 +16,6 @@ extern IntfsOrch *gIntfsOrch;
 extern BufferOrch *gBufferOrch;
 
 #define BUFFER_POOL_WATERMARK_KEY   "BUFFER_POOL_WATERMARK"
-#define PORT_KEY                    "PORT"
-#define PORT_BUFFER_DROP_KEY        "PORT_BUFFER_DROP"
-#define QUEUE_KEY                   "QUEUE"
-#define PG_WATERMARK_KEY            "PG_WATERMARK"
-#define RIF_KEY                     "RIF"
 
 unordered_map<string, string> flexCounterGroupMap =
 {
@@ -92,16 +87,6 @@ void FlexCounterOrch::doTask(Consumer &consumer)
                 }
                 else if(field == FLEX_COUNTER_STATUS_FIELD)
                 {
-                    if((key == PORT_KEY) && (value == "enable"))
-                    {
-                        gPortsOrch->generatePortCounterMap();
-                        m_port_counter_enabled = true;
-                    }
-                    if((key == PORT_BUFFER_DROP_KEY) && (value == "enable"))
-                    {
-                        gPortsOrch->generatePortBufferDropCounterMap();
-                        m_port_buffer_drop_counter_enabled = true;
-                    }
                     // Currently, the counters are disabled for polling by default
                     // The queue maps will be generated as soon as counters are enabled for polling
                     // Counter polling is enabled by pushing the COUNTER_ID_LIST/ATTR_ID_LIST, which contains
@@ -116,18 +101,9 @@ void FlexCounterOrch::doTask(Consumer &consumer)
                     // This can be because generateQueueMap() installs a fundamental list of queue stats
                     // that need to be polled. So my doubt here is if queue watermark stats shall be piggybacked
                     // into the same function as they may not be counted as fundamental
-                    if((key == QUEUE_KEY) && (value == "enable"))
-                    {
-                        gPortsOrch->generateQueueMap();
-                    }
-                    if((key == PG_WATERMARK_KEY) && (value == "enable"))
-                    {
-                        gPortsOrch->generatePriorityGroupMap();
-                    }
-                    if((key == RIF_KEY) && (value == "enable"))
-                    {
-                        gIntfsOrch->generateInterfaceMap();
-                    }
+                    gPortsOrch->generateQueueMap();
+                    gPortsOrch->generatePriorityGroupMap();
+                    gIntfsOrch->generateInterfaceMap();
                     // Install COUNTER_ID_LIST/ATTR_ID_LIST only when hearing buffer pool watermark enable event
                     if ((key == BUFFER_POOL_WATERMARK_KEY) && (value == "enable"))
                     {
@@ -148,13 +124,3 @@ void FlexCounterOrch::doTask(Consumer &consumer)
         consumer.m_toSync.erase(it++);
     }
 }
-
-bool FlexCounterOrch::getPortCountersState()
-    {
-        return m_port_counter_enabled;
-    }
-
-bool FlexCounterOrch::getPortBufferDropCountersState()
-    {
-        return m_port_buffer_drop_counter_enabled;
-    }

orchagent/flexcounterorch.h

@@ -15,14 +15,10 @@ class FlexCounterOrch: public Orch
     void doTask(Consumer &consumer);
     FlexCounterOrch(swss::DBConnector *db, std::vector<std::string> &tableNames);
     virtual ~FlexCounterOrch(void);
-    bool getPortCountersState();
-    bool getPortBufferDropCountersState();
 
 private:
     std::shared_ptr<swss::DBConnector> m_flexCounterDb = nullptr;
     std::shared_ptr<swss::ProducerTable> m_flexCounterGroupTable = nullptr;
-    bool m_port_counter_enabled = false;
-    bool m_port_buffer_drop_counter_enabled = false;
 };
 
 #endif

orchagent/orchdaemon.cpp

@@ -339,11 +339,7 @@ bool OrchDaemon::init()
         CFG_FLEX_COUNTER_TABLE_NAME
     };
 
-    auto* flexCounterOrch = new FlexCounterOrch(m_configDb, flex_counter_tables);
-    m_orchList.push_back(flexCounterOrch);
-
-    gDirectory.set(flexCounterOrch);
-    gDirectory.set(gPortsOrch);
+    m_orchList.push_back(new FlexCounterOrch(m_configDb, flex_counter_tables));
 
     vector<string> pfc_wd_tables = {
         CFG_PFC_WD_TABLE_NAME

orchagent/portsorch.cpp

@@ -233,9 +233,9 @@ static char* hostif_vlan_tag[] = {
  */
 PortsOrch::PortsOrch(DBConnector *db, vector<table_name_with_pri_t> &tableNames, DBConnector *chassisAppDb) :
         Orch(db, tableNames),
-        port_stat_manager(PORT_STAT_COUNTER_FLEX_COUNTER_GROUP, StatsMode::READ, PORT_STAT_FLEX_COUNTER_POLLING_INTERVAL_MS, false),
-        port_buffer_drop_stat_manager(PORT_BUFFER_DROP_STAT_FLEX_COUNTER_GROUP, StatsMode::READ, PORT_BUFFER_DROP_STAT_POLLING_INTERVAL_MS, false),
-        queue_stat_manager(QUEUE_STAT_COUNTER_FLEX_COUNTER_GROUP, StatsMode::READ, QUEUE_STAT_FLEX_COUNTER_POLLING_INTERVAL_MS, false)
+        port_stat_manager(PORT_STAT_COUNTER_FLEX_COUNTER_GROUP, StatsMode::READ, PORT_STAT_FLEX_COUNTER_POLLING_INTERVAL_MS, true),
+        port_buffer_drop_stat_manager(PORT_BUFFER_DROP_STAT_FLEX_COUNTER_GROUP, StatsMode::READ, PORT_BUFFER_DROP_STAT_POLLING_INTERVAL_MS, true),
+        queue_stat_manager(QUEUE_STAT_COUNTER_FLEX_COUNTER_GROUP, StatsMode::READ, QUEUE_STAT_FLEX_COUNTER_POLLING_INTERVAL_MS, true)
 {
     SWSS_LOG_ENTER();
 
@@ -2131,21 +2131,19 @@ bool PortsOrch::initPort(const string &alias, const int index, const set<int> &l
                 vector<FieldValueTuple> fields;
                 fields.push_back(tuple);
                 m_counterTable->set("", fields);
-
                 // Install a flex counter for this port to track stats
-                auto flex_counters_orch = gDirectory.get<FlexCounterOrch*>();
-                /* Delay installing the counters if they are yet enabled
-                If they are enabled, install the counters immediately */
-                if (flex_counters_orch->getPortCountersState())
+                std::unordered_set<std::string> counter_stats;
+                for (const auto& it: port_stat_ids)
                 {
-                    auto port_counter_stats = generateCounterStats(PORT_STAT_COUNTER_FLEX_COUNTER_GROUP);
-                    port_stat_manager.setCounterIdList(p.m_port_id, CounterType::PORT, port_counter_stats);
+                    counter_stats.emplace(sai_serialize_port_stat(it));
                 }
-                if (flex_counters_orch->getPortBufferDropCountersState())
+                port_stat_manager.setCounterIdList(p.m_port_id, CounterType::PORT, counter_stats);
+                std::unordered_set<std::string> port_buffer_drop_stats;
+                for (const auto& it: port_buffer_drop_stat_ids)
                 {
-                    auto port_buffer_drop_stats = generateCounterStats(PORT_BUFFER_DROP_STAT_FLEX_COUNTER_GROUP);
-                    port_buffer_drop_stat_manager.setCounterIdList(p.m_port_id, CounterType::PORT, port_buffer_drop_stats);
+                    port_buffer_drop_stats.emplace(sai_serialize_port_stat(it));
                 }
+                port_buffer_drop_stat_manager.setCounterIdList(p.m_port_id, CounterType::PORT, port_buffer_drop_stats);
 
                 PortUpdate update = { p, true };
                 notify(SUBJECT_TYPE_PORT_CHANGE, static_cast<void *>(&update));
@@ -2178,11 +2176,8 @@ void PortsOrch::deInitPort(string alias, sai_object_id_t port_id)
     p.m_port_id = port_id;
 
     /* remove port from flex_counter_table for updating counters  */
-    auto flex_counters_orch = gDirectory.get<FlexCounterOrch*>();
-    if ((flex_counters_orch->getPortCountersState()))
-    {
-        port_stat_manager.clearCounterIdList(p.m_port_id);
-    }
+    port_stat_manager.clearCounterIdList(p.m_port_id);
+
     /* remove port name map from counter table */
     m_counter_db->hdel(COUNTERS_PORT_NAME_MAP, alias);
 
@@ -4704,38 +4699,6 @@ void PortsOrch::generatePriorityGroupMapPerPort(const Port& port)
     CounterCheckOrch::getInstance().addPort(port);
 }
 
-void PortsOrch::generatePortCounterMap()
-{
-    if (m_isPortCounterMapGenerated)
-    {
-        return;
-    }
-
-    auto port_counter_stats = generateCounterStats(PORT_STAT_COUNTER_FLEX_COUNTER_GROUP);
-    for (const auto& it: m_portList)
-    {
-        port_stat_manager.setCounterIdList(it.second.m_port_id, CounterType::PORT, port_counter_stats);
-    }
-
-    m_isPortCounterMapGenerated = true;
-}
-
-void PortsOrch::generatePortBufferDropCounterMap()
-{
-    if (m_isPortBufferDropCounterMapGenerated)
-    {
-        return;
-    }
-
-    auto port_buffer_drop_stats = generateCounterStats(PORT_BUFFER_DROP_STAT_FLEX_COUNTER_GROUP);
-    for (const auto& it: m_portList)
-    {
-        port_buffer_drop_stat_manager.setCounterIdList(it.second.m_port_id, CounterType::PORT, port_buffer_drop_stats);
-    }
-
-    m_isPortBufferDropCounterMapGenerated = true;
-}
-
 void PortsOrch::doTask(NotificationConsumer &consumer)
 {
     SWSS_LOG_ENTER();
@@ -5602,26 +5565,6 @@ bool PortsOrch::setVoqInbandIntf(string &alias, string &type)
     return true;
 }
 
-std::unordered_set<std::string> PortsOrch::generateCounterStats(const string& type)
-{
-    std::unordered_set<std::string> counter_stats;
-    if (type == PORT_STAT_COUNTER_FLEX_COUNTER_GROUP)
-    {
-        for (const auto& it: port_stat_ids)
-        {
-            counter_stats.emplace(sai_serialize_port_stat(it));
-        }
-    }
-    else if (type == PORT_BUFFER_DROP_STAT_FLEX_COUNTER_GROUP)
-    {
-        for (const auto& it: port_buffer_drop_stat_ids)
-        {
-            counter_stats.emplace(sai_serialize_port_stat(it));
-        }
-    }
-    return counter_stats;
-}
-
 void PortsOrch::voqSyncAddLag (Port &lag)
 {
     int32_t switch_id = lag.m_system_lag_info.switch_id;

orchagent/portsorch.h

@@ -12,7 +12,6 @@
 #include "flex_counter_manager.h"
 #include "gearboxutils.h"
 #include "saihelper.h"
-#include "flexcounterorch.h"
 #include "lagid.h"
 
 
@@ -126,8 +125,6 @@ class PortsOrch : public Orch, public Subject
 
     void generateQueueMap();
     void generatePriorityGroupMap();
-    void generatePortCounterMap();
-    void generatePortBufferDropCounterMap();
 
     void refreshPortStatus();
     bool removeAclTableGroup(const Port &p);
@@ -286,9 +283,6 @@ class PortsOrch : public Orch, public Subject
     bool m_isPriorityGroupMapGenerated = false;
     void generatePriorityGroupMapPerPort(const Port& port);
 
-    bool m_isPortCounterMapGenerated = false;
-    bool m_isPortBufferDropCounterMapGenerated = false;
-
     bool setPortAutoNeg(sai_object_id_t id, int an);
     bool setPortFecMode(sai_object_id_t id, int fec);
 
@@ -313,9 +307,6 @@ class PortsOrch : public Orch, public Subject
     sai_uint32_t m_systemPortCount;
     bool getSystemPorts();
     bool addSystemPorts();
-
-    std::unordered_set<std::string> generateCounterStats(const string& type);
-    
     unique_ptr<Table> m_tableVoqSystemLagTable;
     unique_ptr<Table> m_tableVoqSystemLagMemberTable;
     void voqSyncAddLag(Port &lag);

tests/mock_tests/mock_orchagent_main.h

@@ -15,8 +15,6 @@
 #include "vxlanorch.h"
 #include "policerorch.h"
 #include "fgnhgorch.h"
-#include "flexcounterorch.h"
-#include "directory.h"
 
 extern int gBatchSize;
 extern bool gSwssRecord;
@@ -44,7 +42,6 @@ extern FdbOrch *gFdbOrch;
 extern MirrorOrch *gMirrorOrch;
 extern BufferOrch *gBufferOrch;
 extern VRFOrch *gVrfOrch;
-extern Directory<Orch*> gDirectory;
 
 extern sai_acl_api_t *sai_acl_api;
 extern sai_switch_api_t *sai_switch_api;

tests/mock_tests/portsorch_ut.cpp

@@ -145,16 +145,7 @@ namespace portsorch_test
         };
 
         ASSERT_EQ(gPortsOrch, nullptr);
-
-        vector<string> flex_counter_tables = {
-            CFG_FLEX_COUNTER_TABLE_NAME
-        };
-      
-        auto* flexCounterOrch = new FlexCounterOrch(m_config_db.get(), flex_counter_tables);
-        gDirectory.set(flexCounterOrch);
-      
         gPortsOrch = new PortsOrch(m_app_db.get(), ports_tables, m_chassis_app_db.get());
-
         vector<string> buffer_tables = { APP_BUFFER_POOL_TABLE_NAME,
                                          APP_BUFFER_PROFILE_TABLE_NAME,
                                          APP_BUFFER_QUEUE_TABLE_NAME,