delay counters by 60 sec

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

Author: stepanblyschak

orchagent/flexcounterorch.cpp

@@ -27,6 +27,8 @@ extern CoppOrch *gCoppOrch;
 extern FlowCounterRouteOrch *gFlowCounterRouteOrch;
 extern sai_object_id_t gSwitchId;
 
+#define FLEX_COUNTER_DELAY_SEC 60
+
 #define BUFFER_POOL_WATERMARK_KEY   "BUFFER_POOL_WATERMARK"
 #define PORT_KEY                    "PORT"
 #define PORT_BUFFER_DROP_KEY        "PORT_BUFFER_DROP"
@@ -71,6 +73,10 @@ FlexCounterOrch::FlexCounterOrch(DBConnector *db, vector<string> &tableNames):
     m_deviceMetadataConfigTable(db, CFG_DEVICE_METADATA_TABLE_NAME)
 {
     SWSS_LOG_ENTER();
+    m_delayTimer = new SelectableTimer(timespec{.tv_sec = FLEX_COUNTER_DELAY_SEC, .tv_nsec = 0});
+    auto executor = new ExecutableTimer(m_delayTimer, this, "FLEX_COUNTER_DELAY");
+    Orch::addExecutor(executor);
+    m_delayTimer->start();
 }
 
 FlexCounterOrch::~FlexCounterOrch(void)
@@ -82,6 +88,11 @@ void FlexCounterOrch::doTask(Consumer &consumer)
 {
     SWSS_LOG_ENTER();
 
+    if (!m_delayTimerExpired)
+    {
+        return;
+    }
+
     VxlanTunnelOrch* vxlan_tunnel_orch = gDirectory.get<VxlanTunnelOrch*>();
     if (gPortsOrch && !gPortsOrch->allPortsReady())
     {
@@ -239,6 +250,15 @@ void FlexCounterOrch::doTask(Consumer &consumer)
     }
 }
 
+void FlexCounterOrch::doTask(SelectableTimer &timer)
+{
+    SWSS_LOG_ENTER();
+
+    SWSS_LOG_NOTICE("Processing counters");
+    m_delayTimer->stop();
+    m_delayTimerExpired = true;
+}
+
 bool FlexCounterOrch::getPortCountersState() const
 {
     return m_port_counter_enabled;

orchagent/flexcounterorch.h

@@ -4,6 +4,7 @@
 #include "orch.h"
 #include "port.h"
 #include "producertable.h"
+#include "selectabletimer.h"
 #include "table.h"
 
 extern "C" {
@@ -40,6 +41,7 @@ class FlexCounterOrch: public Orch
 {
 public:
     void doTask(Consumer &consumer);
+    void doTask(SelectableTimer &timer);
     FlexCounterOrch(swss::DBConnector *db, std::vector<std::string> &tableNames);
     virtual ~FlexCounterOrch(void);
     bool getPortCountersState() const;
@@ -63,9 +65,11 @@ class FlexCounterOrch: public Orch
     bool m_pg_watermark_enabled = false;
     bool m_hostif_trap_counter_enabled = false;
     bool m_route_flow_counter_enabled = false;
+    bool m_delayTimerExpired = false;
     Table m_bufferQueueConfigTable;
     Table m_bufferPgConfigTable;
     Table m_deviceMetadataConfigTable;
+    SelectableTimer* m_delayTimer;
 };
 
 #endif

orchagent/p4orch/tests/fake_flexcounterorch.cpp

@@ -16,6 +16,10 @@ void FlexCounterOrch::doTask(Consumer &consumer)
 {
 }
 
+void FlexCounterOrch::doTask(SelectableTimer &timer)
+{
+}
+
 bool FlexCounterOrch::getPortCountersState() const
 {
     return true;

tests/mock_tests/flexcounter_ut.cpp

@@ -295,6 +295,7 @@ namespace flexcounter_test
                 CFG_FLEX_COUNTER_TABLE_NAME
             };
             auto* flexCounterOrch = new FlexCounterOrch(m_config_db.get(), flex_counter_tables);
+            flexCounterOrch->m_delayTimerExpired = true;
             gDirectory.set(flexCounterOrch);
 
             vector<string> buffer_tables = { APP_BUFFER_POOL_TABLE_NAME,

tests/mock_tests/flowcounterrouteorch_ut.cpp

@@ -131,6 +131,7 @@ namespace flowcounterrouteorch_test
                 CFG_FLEX_COUNTER_TABLE_NAME
             };
             auto* flexCounterOrch = new FlexCounterOrch(m_config_db.get(), flex_counter_tables);
+            flexCounterOrch->m_delayTimerExpired = true;
             gDirectory.set(flexCounterOrch);
 
             ASSERT_EQ(gPortsOrch, nullptr);