Merge branch 'master' into buffermgd_admin_status_fix

Author: rminnikanti

orchagent/dash/dashmeterorch.cpp

@@ -4,10 +4,13 @@
 #include <swss/ipaddress.h>
 #include <swssnet.h>
 
+#include "directory.h"
 #include "dashmeterorch.h"
 #include "taskworker.h"
 #include "pbutils.h"
 #include "crmorch.h"
+#include "sai.h"
+#include "saiextensions.h"
 #include "saihelper.h"
 
 using namespace std;
@@ -19,14 +22,40 @@ extern sai_dash_meter_api_t* sai_dash_meter_api;
 extern sai_object_id_t gSwitchId;
 extern size_t gMaxBulkSize;
 extern CrmOrch *gCrmOrch;
+extern Directory<Orch*> gDirectory;
+extern bool gTraditionalFlexCounter;
 
+#define METER_FLEX_COUNTER_UPD_INTERVAL 1
 
 DashMeterOrch::DashMeterOrch(DBConnector *db, const vector<string> &tables, DashOrch *dash_orch, DBConnector *app_state_db, ZmqServer *zmqServer) :
+    m_meter_stat_manager(METER_STAT_COUNTER_FLEX_COUNTER_GROUP, StatsMode::READ, METER_STAT_FLEX_COUNTER_POLLING_INTERVAL_MS, false),
     meter_rule_bulker_(sai_dash_meter_api, gSwitchId, gMaxBulkSize),
     ZmqOrch(db, tables, zmqServer),
     m_dash_orch(dash_orch)
 {
     SWSS_LOG_ENTER();
+
+    m_counter_db = std::shared_ptr<DBConnector>(new DBConnector("COUNTERS_DB", 0));
+    m_asic_db = std::shared_ptr<DBConnector>(new DBConnector("ASIC_DB", 0));
+
+    if (gTraditionalFlexCounter)
+    {
+        m_vid_to_rid_table = std::make_unique<Table>(m_asic_db.get(), "VIDTORID");
+    }
+
+    auto intervT = timespec { .tv_sec = METER_FLEX_COUNTER_UPD_INTERVAL , .tv_nsec = 0 };
+    m_meter_fc_update_timer = new SelectableTimer(intervT);
+    auto executorT = new ExecutableTimer(m_meter_fc_update_timer, this, "METER_FLEX_COUNTER_UPD_TIMER");
+    Orch::addExecutor(executorT);
+
+    /* Fetch the meter bucket counter Ids */
+    m_meter_counter_stats.clear();
+    auto stat_enum_list = queryAvailableCounterStats((sai_object_type_t)SAI_OBJECT_TYPE_METER_BUCKET_ENTRY);
+    for (auto &stat_enum: stat_enum_list)
+    {
+        auto counter_id = static_cast<sai_meter_bucket_entry_stat_t>(stat_enum);
+        m_meter_counter_stats.emplace(sai_serialize_meter_bucket_entry_stat(counter_id));
+    }
 }
 
 sai_object_id_t DashMeterOrch::getMeterPolicyOid(const string& meter_policy) const
@@ -590,3 +619,88 @@ void DashMeterOrch::doTask(ConsumerBase& consumer)
         SWSS_LOG_ERROR("Unknown table: %s", tn.c_str());
     }
 }
+
+void DashMeterOrch::addEniToMeterFC(sai_object_id_t oid, const string &name)
+{
+    if (!m_meter_fc_status) 
+    {
+        return;
+    }
+    auto was_empty = m_meter_stat_work_queue.empty();
+    m_meter_stat_work_queue[oid] = name;
+    if (was_empty)
+    {
+        m_meter_fc_update_timer->start();
+    }
+}
+
+void DashMeterOrch::removeEniFromMeterFC(sai_object_id_t oid, const string &name)
+{
+    SWSS_LOG_ENTER();
+
+    if (oid == SAI_NULL_OBJECT_ID)
+    {
+        SWSS_LOG_WARN("Cannot remove meter counter on NULL OID for eni %s", name.c_str());
+        return;
+    }
+    if (m_meter_stat_work_queue.find(oid) != m_meter_stat_work_queue.end())
+    {
+        m_meter_stat_work_queue.erase(oid);
+        return;
+    }
+
+    m_meter_stat_manager.clearCounterIdList(oid);
+    SWSS_LOG_INFO("Unregistering FC for ENI %s, oid %s", name.c_str(), sai_serialize_object_id(oid).c_str());
+}
+
+void DashMeterOrch::handleMeterFCStatusUpdate(bool enabled)
+{
+    DashOrch *dash_orch = gDirectory.get<DashOrch*>();
+    bool prev_enabled = m_meter_fc_status;
+    m_meter_fc_status = enabled; /* Update the status */
+    if (!enabled && prev_enabled)
+    {
+        m_meter_fc_update_timer->stop();
+        dash_orch->refreshMeterFCStats(false); /* Clear any existing FC entries */
+    }
+    else if (enabled && !prev_enabled)
+    {
+        dash_orch->refreshMeterFCStats(true);
+        m_meter_fc_update_timer->start();
+    }
+}
+
+void DashMeterOrch::doTask(SelectableTimer &timer)
+{
+    SWSS_LOG_ENTER();
+
+    if (!m_meter_fc_status)
+    {
+        m_meter_fc_update_timer->stop();
+        return ;
+    }
+
+    for (auto it = m_meter_stat_work_queue.begin(); it != m_meter_stat_work_queue.end(); )
+    {
+        string value;
+        const auto id = sai_serialize_object_id(it->first);
+        if (!gTraditionalFlexCounter || m_vid_to_rid_table->hget("", id, value))
+        {
+            SWSS_LOG_INFO("Registering FC for ENI %s, oid %s", it->second.c_str(), id.c_str());
+            std::vector<FieldValueTuple> eniNameFvs;
+            eniNameFvs.emplace_back(it->second, id);
+
+            m_meter_stat_manager.setCounterIdList(it->first, CounterType::DASH_METER, m_meter_counter_stats);
+            it = m_meter_stat_work_queue.erase(it);
+        }
+        else
+        {
+            ++it;
+        }
+    }
+
+    if (m_meter_stat_work_queue.empty())
+    {
+        m_meter_fc_update_timer->stop();
+    }
+}

orchagent/dash/dashmeterorch.h

@@ -20,6 +20,9 @@
 #include "dash_api/meter_policy.pb.h"
 #include "dash_api/meter_rule.pb.h"
 
+#define METER_STAT_COUNTER_FLEX_COUNTER_GROUP "METER_STAT_COUNTER"
+#define METER_STAT_FLEX_COUNTER_POLLING_INTERVAL_MS 10000
+
 struct MeterPolicyContext
 {
     std::string meter_policy;
@@ -71,8 +74,13 @@ class DashMeterOrch : public ZmqOrch
     int32_t getMeterPolicyEniBindCount(const std::string& meter_policy) const;
     void incrMeterPolicyEniBindCount(const std::string& meter_policy);
     void decrMeterPolicyEniBindCount(const std::string& meter_policy);
+    void addEniToMeterFC(sai_object_id_t oid, const std::string& name);
+    void removeEniFromMeterFC(sai_object_id_t oid, const std::string& name);
+    void handleMeterFCStatusUpdate(bool is_enabled);
 
 private:
+
+    void doTask(swss::SelectableTimer&);
     void doTask(ConsumerBase &consumer);
     void doTaskMeterPolicyTable(ConsumerBase &consumer);
     void doTaskMeterRuleTable(ConsumerBase &consumer);
@@ -97,4 +105,12 @@ class DashMeterOrch : public ZmqOrch
     MeterPolicyTable meter_policy_entries_;
     MeterRuleTable meter_rule_entries_;
     ObjectBulker<sai_dash_meter_api_t> meter_rule_bulker_;
+    bool m_meter_fc_status = false;
+    FlexCounterManager m_meter_stat_manager;
+    std::unordered_set<std::string> m_meter_counter_stats;
+    std::map<sai_object_id_t, std::string> m_meter_stat_work_queue;
+    std::unique_ptr<swss::Table> m_vid_to_rid_table;
+    std::shared_ptr<swss::DBConnector> m_counter_db;
+    std::shared_ptr<swss::DBConnector> m_asic_db;
+    swss::SelectableTimer* m_meter_fc_update_timer = nullptr;
 };

orchagent/dash/dashorch.cpp

@@ -685,7 +685,9 @@ bool DashOrch::addEniObject(const string& eni, EniEntry& entry)
         }
     }
 
+    addEniMapEntry(eni_id, eni);
     addEniToFC(eni_id, eni);
+    dash_meter_orch->addEniToMeterFC(eni_id,  eni);
 
     gCrmOrch->incCrmResUsedCounter(CrmResourceType::CRM_DASH_ENI);
 
@@ -823,8 +825,11 @@ bool DashOrch::removeEniObject(const string& eni)
     SWSS_LOG_ENTER();
 
     EniEntry entry = eni_entries_[eni];
+    DashMeterOrch *dash_meter_orch = gDirectory.get<DashMeterOrch*>();
 
+    dash_meter_orch->removeEniFromMeterFC(entry.eni_id, eni);
     removeEniFromFC(entry.eni_id, eni);
+    removeEniMapEntry(entry.eni_id, eni);
 
     sai_status_t status = sai_dash_eni_api->remove_eni(entry.eni_id);
     if (status != SAI_STATUS_SUCCESS)
@@ -842,7 +847,6 @@ bool DashOrch::removeEniObject(const string& eni)
         }
     }
 
-    DashMeterOrch *dash_meter_orch = gDirectory.get<DashMeterOrch*>();
     const string &v4_meter_policy  = entry.metadata.has_v4_meter_policy_id() ? 
                                      entry.metadata.v4_meter_policy_id() : "";
     const string &v6_meter_policy  = entry.metadata.has_v6_meter_policy_id() ? 
@@ -1290,7 +1294,6 @@ void DashOrch::removeEniFromFC(sai_object_id_t oid, const string &name)
         return;
     }
 
-    m_eni_name_table->hdel("", name);
     m_eni_stat_manager.clearCounterIdList(oid);
     SWSS_LOG_INFO("Unregistering FC for %s, id: %s", name.c_str(), sai_serialize_object_id(oid).c_str());
 }
@@ -1310,6 +1313,22 @@ void DashOrch::refreshEniFCStats(bool install)
     }
 }
 
+void DashOrch::refreshMeterFCStats(bool install)
+{
+    DashMeterOrch *dash_meter_orch = gDirectory.get<DashMeterOrch*>();
+    for (auto it = eni_entries_.begin(); it != eni_entries_.end(); it++)
+    {
+        if (install)
+        {
+            dash_meter_orch->addEniToMeterFC(it->second.eni_id, it->first);
+        }
+        else
+        {
+            dash_meter_orch->removeEniFromMeterFC(it->second.eni_id, it->first);
+        }
+    }
+}
+
 void DashOrch::handleFCStatusUpdate(bool enabled)
 {
     bool prev_enabled = m_eni_fc_status;
@@ -1326,6 +1345,35 @@ void DashOrch::handleFCStatusUpdate(bool enabled)
     }
 }
 
+void DashOrch::addEniMapEntry(sai_object_id_t oid, const string &name) {
+    SWSS_LOG_ENTER();
+
+    if (oid == SAI_NULL_OBJECT_ID)
+    {
+        SWSS_LOG_WARN("Cannot add ENI map entry with NULL OID for eni %s", name.c_str());
+        return;
+    }
+
+    const auto id = sai_serialize_object_id(oid);
+    SWSS_LOG_INFO("Adding ENI map entry for %s, id: %s", name.c_str(), id.c_str());
+    std::vector<FieldValueTuple> eniNameFvs;
+    eniNameFvs.emplace_back(name, id);
+    m_eni_name_table->set("", eniNameFvs);
+}
+
+void DashOrch::removeEniMapEntry(sai_object_id_t oid, const string &name) {
+    SWSS_LOG_ENTER();
+
+    if (oid == SAI_NULL_OBJECT_ID)
+    {
+        SWSS_LOG_WARN("Cannot remove ENI map entry on NULL OID for eni %s", name.c_str());
+        return;
+    }
+
+    m_eni_name_table->hdel("", name);
+    SWSS_LOG_INFO("Removing ENI map entry for %s, id: %s", name.c_str(), sai_serialize_object_id(oid).c_str());
+}
+
 void DashOrch::addEniToFC(sai_object_id_t oid, const string &name)
 {
     if (!m_eni_fc_status) 
@@ -1358,9 +1406,6 @@ void DashOrch::doTask(SelectableTimer &timer)
         if (!gTraditionalFlexCounter || m_vid_to_rid_table->hget("", id, value))
         {
             SWSS_LOG_INFO("Registering FC for ENI: %s, id %s", it->second.c_str(), id.c_str());
-            std::vector<FieldValueTuple> eniNameFvs;
-            eniNameFvs.emplace_back(it->second, id);
-            m_eni_name_table->set("", eniNameFvs);
 
             m_eni_stat_manager.setCounterIdList(it->first, CounterType::ENI, m_counter_stats);
             it = m_eni_stat_work_queue.erase(it);

orchagent/dash/dashorch.h

@@ -59,6 +59,8 @@ class DashOrch : public ZmqOrch
     void handleFCStatusUpdate(bool is_enabled);
     dash::types::IpAddress getApplianceVip();
     bool hasApplianceEntry();
+    void clearMeterFCStats();
+    void refreshMeterFCStats(bool);
 
 private:
     ApplianceTable appliance_entries_;
@@ -110,6 +112,8 @@ class DashOrch : public ZmqOrch
     swss::SelectableTimer* m_fc_update_timer = nullptr;
 
     void doTask(swss::SelectableTimer&);
+    void addEniMapEntry(sai_object_id_t oid, const std::string& name);
+    void removeEniMapEntry(sai_object_id_t oid, const std::string& name);
     void addEniToFC(sai_object_id_t oid, const std::string& name);
     void removeEniFromFC(sai_object_id_t oid, const std::string& name);
     void refreshEniFCStats(bool);

orchagent/flex_counter/flex_counter_manager.cpp

@@ -50,6 +50,7 @@ const unordered_map<CounterType, string> FlexCounterManager::counter_id_field_lo
     { CounterType::HOSTIF_TRAP,     FLOW_COUNTER_ID_LIST },
     { CounterType::ROUTE,           FLOW_COUNTER_ID_LIST },
     { CounterType::ENI,             ENI_COUNTER_ID_LIST },
+    { CounterType::DASH_METER,      DASH_METER_COUNTER_ID_LIST },
     { CounterType::SRV6,            SRV6_COUNTER_ID_LIST },
 };
 

orchagent/flex_counter/flex_counter_manager.h

@@ -39,6 +39,7 @@ enum class CounterType
     HOSTIF_TRAP,
     ROUTE,
     ENI,
+    DASH_METER,
     SRV6
 };
 

orchagent/flexcounterorch.cpp

@@ -14,6 +14,7 @@
 #include "routeorch.h"
 #include "macsecorch.h"
 #include "dash/dashorch.h"
+#include "dash/dashmeterorch.h"
 #include "flowcounterrouteorch.h"
 #include "warm_restart.h"
 
@@ -45,6 +46,7 @@ extern sai_object_id_t gSwitchId;
 #define FLOW_CNT_TRAP_KEY           "FLOW_CNT_TRAP"
 #define FLOW_CNT_ROUTE_KEY          "FLOW_CNT_ROUTE"
 #define ENI_KEY                     "ENI"
+#define DASH_METER_KEY              "DASH_METER"
 #define WRED_QUEUE_KEY              "WRED_ECN_QUEUE"
 #define WRED_PORT_KEY               "WRED_ECN_PORT"
 #define SRV6_KEY                    "SRV6"
@@ -71,6 +73,7 @@ unordered_map<string, string> flexCounterGroupMap =
     {"MACSEC_SA_ATTR", COUNTERS_MACSEC_SA_ATTR_GROUP},
     {"MACSEC_FLOW", COUNTERS_MACSEC_FLOW_GROUP},
     {"ENI", ENI_STAT_COUNTER_FLEX_COUNTER_GROUP},
+    {"DASH_METER", METER_STAT_COUNTER_FLEX_COUNTER_GROUP},
     {"WRED_ECN_PORT", WRED_PORT_STAT_COUNTER_FLEX_COUNTER_GROUP},
     {"WRED_ECN_QUEUE", WRED_QUEUE_STAT_COUNTER_FLEX_COUNTER_GROUP},
     {SRV6_KEY, SRV6_STAT_COUNTER_FLEX_COUNTER_GROUP},
@@ -113,6 +116,7 @@ void FlexCounterOrch::doTask(Consumer &consumer)
 
     VxlanTunnelOrch* vxlan_tunnel_orch = gDirectory.get<VxlanTunnelOrch*>();
     DashOrch* dash_orch = gDirectory.get<DashOrch*>();
+    DashMeterOrch* dash_meter_orch = gDirectory.get<DashMeterOrch*>();
     if (gPortsOrch && !gPortsOrch->allPortsReady())
     {
         return;
@@ -247,6 +251,10 @@ void FlexCounterOrch::doTask(Consumer &consumer)
                     {
                         dash_orch->handleFCStatusUpdate((value == "enable"));
                     }
+                    if (dash_meter_orch && (key == DASH_METER_KEY))
+                    {
+                        dash_meter_orch->handleMeterFCStatusUpdate((value == "enable"));
+                    }
                     if (gCoppOrch && (key == FLOW_CNT_TRAP_KEY))
                     {
                         if (value == "enable")