[pfcwd]: only init counter when handler is created and change lua to …

…support infinite restoration time (sonic-net#458) Signed-off-by: Sihui Han <sihan@microsoft.com>
madhanmellanox · Mar 28, 2018 · d4ab3ee · d4ab3ee
1 parent 8995b30
commit d4ab3ee
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/orchagent/pfc_restore.lua b/orchagent/pfc_restore.lua
@@ -20,7 +20,7 @@ for i = n, 1, -1 do
     local pfc_wd_status = redis.call('HGET', counters_table_name .. ':' .. KEYS[i], 'PFC_WD_STATUS')
     local restoration_time = redis.call('HGET', counters_table_name .. ':' .. KEYS[i], 'PFC_WD_RESTORATION_TIME')
     local pfc_wd_action = redis.call('HGET', counters_table_name .. ':' .. KEYS[i], 'PFC_WD_ACTION')
-    if pfc_wd_status ~= 'operational'  and pfc_wd_action ~= 'alert' and restoration_time then
+    if pfc_wd_status ~= 'operational'  and pfc_wd_action ~= 'alert' and restoration_time and restoration_time ~= '' then
         restoration_time = tonumber(restoration_time)
         local time_left = redis.call('HGET', counters_table_name .. ':' .. KEYS[i], 'PFC_WD_RESTORATION_TIME_LEFT')
         if time_left == nil then

diff --git a/orchagent/pfcwdorch.cpp b/orchagent/pfcwdorch.cpp
@@ -20,7 +20,6 @@
 #define PFC_WD_RESTORATION_TIME_MAX     (60 * 1000)
 #define PFC_WD_RESTORATION_TIME_MIN     100
 #define PFC_WD_POLL_TIMEOUT             5000
-#define PFC_WD_LOSSY_POLL_TIMEOUT_SEC   (5 * 60)
 #define SAI_PORT_STAT_PFC_PREFIX        "SAI_PORT_STAT_PFC_"
 #define PFC_WD_TC_MAX 8
 
@@ -36,12 +35,6 @@ PfcWdOrch<DropHandler, ForwardHandler>::PfcWdOrch(DBConnector *db, vector<string
     m_countersTable(new Table(m_countersDb.get(), COUNTERS_TABLE))
 {
     SWSS_LOG_ENTER();
-
-    auto interv = timespec { .tv_sec = PFC_WD_LOSSY_POLL_TIMEOUT_SEC, .tv_nsec = 0 };
-    auto timer = new SelectableTimer(interv);
-    auto executor = new ExecutableTimer(timer, this);
-    Orch::addExecutor("COUNTERS_POLL", executor);
-    timer->start();
 }
 
 
@@ -442,6 +435,7 @@ void PfcWdSwOrch<DropHandler, ForwardHandler>::unregisterFromWdDb(const Port& po
         redisClient.hdel(countersKey, "PFC_WD_ACTION");
         redisClient.hdel(countersKey, "PFC_WD_STATUS");
     }
+
 }
 
 template <typename DropHandler, typename ForwardHandler>
@@ -574,6 +568,7 @@ void PfcWdSwOrch<DropHandler, ForwardHandler>::doTask(swss::NotificationConsumer
                         entry->first,
                         entry->second.index,
                         PfcWdOrch<DropHandler, ForwardHandler>::getCountersTable());
+                entry->second.handler->initCounters();
             }
         }
         else if (entry->second.action == PfcWdAction::PFC_WD_ACTION_DROP)
@@ -585,6 +580,7 @@ void PfcWdSwOrch<DropHandler, ForwardHandler>::doTask(swss::NotificationConsumer
                         entry->first,
                         entry->second.index,
                         PfcWdOrch<DropHandler, ForwardHandler>::getCountersTable());
+                entry->second.handler->initCounters();
             }
         }
         else if (entry->second.action == PfcWdAction::PFC_WD_ACTION_FORWARD)
@@ -596,13 +592,13 @@ void PfcWdSwOrch<DropHandler, ForwardHandler>::doTask(swss::NotificationConsumer
                         entry->first,
                         entry->second.index,
                         PfcWdOrch<DropHandler, ForwardHandler>::getCountersTable());
+                entry->second.handler->initCounters();
             }
         }
         else
         {
             throw runtime_error("Unknown PFC WD action");
         }
-        entry->second.handler->initCounters();
     }
     else if (event == "restore")
     {

diff --git a/orchagent/pfcwdorch.h b/orchagent/pfcwdorch.h
@@ -105,9 +105,6 @@ class PfcWdSwOrch: public PfcWdOrch<DropHandler, ForwardHandler>
     shared_ptr<ProducerTable> m_flexCounterTable = nullptr;
     shared_ptr<ProducerTable> m_flexCounterGroupTable = nullptr;
 
-    atomic_bool m_runPfcWdSwOrchThread = { false };
-    shared_ptr<thread> m_pfcWatchdogThread = nullptr;
-
     int m_pollInterval;
 };