Skip to content

[Dash] Deprecate traditional Flex Counter support #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vivekrnv wants to merge 2 commits into from
Closed

[Dash] Deprecate traditional Flex Counter support #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de62c9f
Deprecate traditional FC support for DASH counters
vivekrnv Aug 5, 2025
895fec9
Merge branch 'master' into refactor_dash_fc
vivekrnv Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 2 additions & 114 deletions orchagent/dash/dashmeterorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,39 +23,12 @@ 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),
DashMeterOrch::DashMeterOrch(DBConnector *db, const vector<string> &tables, DBConnector *app_state_db, ZmqServer *zmqServer) :
meter_rule_bulker_(sai_dash_meter_api, gSwitchId, gMaxBulkSize),
ZmqOrch(db, tables, zmqServer),
m_dash_orch(dash_orch)
ZmqOrch(db, tables, zmqServer)
{
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
Expand Down Expand Up @@ -619,88 +592,3 @@ 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();
}
}
18 changes: 1 addition & 17 deletions orchagent/dash/dashmeterorch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
#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;
Expand Down Expand Up @@ -69,18 +66,14 @@ class DashMeterOrch : public ZmqOrch
public:
using TaskArgs = std::vector<swss::FieldValueTuple>;

DashMeterOrch(swss::DBConnector *db, const std::vector<std::string> &tables, DashOrch *dash_orch, swss::DBConnector *app_state_db, swss::ZmqServer *zmqServer);
DashMeterOrch(swss::DBConnector *db, const std::vector<std::string> &tables, swss::DBConnector *app_state_db, swss::ZmqServer *zmqServer);
sai_object_id_t getMeterPolicyOid(const std::string& meter_policy) const;
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);
Expand All @@ -101,16 +94,7 @@ class DashMeterOrch : public ZmqOrch
void incrMeterPolicyRuleCount(const std::string& meter_policy);
void decrMeterPolicyRuleCount(const std::string& meter_policy);

DashOrch *m_dash_orch;
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;
};
108 changes: 24 additions & 84 deletions orchagent/dash/dashorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ extern sai_dash_trusted_vni_api_t* sai_dash_trusted_vni_api;
extern sai_object_id_t gSwitchId;
extern size_t gMaxBulkSize;
extern CrmOrch *gCrmOrch;
extern bool gTraditionalFlexCounter;

#define FLEX_COUNTER_UPD_INTERVAL 1
#define METER_FLEX_COUNTER_UPD_INTERVAL 1

static const std::unordered_map<dash::eni::EniMode, sai_dash_eni_mode_t> eniModeMap =
{
Expand All @@ -59,37 +59,18 @@ static const std::unordered_map<string, sai_direction_lookup_entry_action_t> dir

DashOrch::DashOrch(DBConnector *db, vector<string> &tableName, DBConnector *app_state_db, ZmqServer *zmqServer) :
ZmqOrch(db, tableName, zmqServer),
m_eni_stat_manager(ENI_STAT_COUNTER_FLEX_COUNTER_GROUP, StatsMode::READ, ENI_STAT_FLEX_COUNTER_POLLING_INTERVAL_MS, false)
EniCounter(ENI_STAT_COUNTER_FLEX_COUNTER_GROUP, StatsMode::READ, ENI_STAT_FLEX_COUNTER_POLLING_INTERVAL_MS, false),
MeterCounter(METER_STAT_COUNTER_FLEX_COUNTER_GROUP, StatsMode::READ, METER_STAT_FLEX_COUNTER_POLLING_INTERVAL_MS, false)
{
SWSS_LOG_ENTER();

m_asic_db = std::shared_ptr<DBConnector>(new DBConnector("ASIC_DB", 0));
m_counter_db = std::shared_ptr<DBConnector>(new DBConnector("COUNTERS_DB", 0));
m_eni_name_table = make_unique<Table>(m_counter_db.get(), COUNTERS_ENI_NAME_MAP);
dash_eni_result_table_ = make_unique<Table>(app_state_db, APP_DASH_ENI_TABLE_NAME);
dash_eni_route_result_table_ = make_unique<Table>(app_state_db, APP_DASH_ENI_ROUTE_TABLE_NAME);
dash_qos_result_table_ = make_unique<Table>(app_state_db, APP_DASH_QOS_TABLE_NAME);
dash_appliance_result_table_ = make_unique<Table>(app_state_db, APP_DASH_APPLIANCE_TABLE_NAME);
dash_routing_type_result_table_ = make_unique<Table>(app_state_db, APP_DASH_ROUTING_TYPE_TABLE_NAME);

if (gTraditionalFlexCounter)
{
m_vid_to_rid_table = std::make_unique<Table>(m_asic_db.get(), "VIDTORID");
}

auto intervT = timespec { .tv_sec = FLEX_COUNTER_UPD_INTERVAL , .tv_nsec = 0 };
m_fc_update_timer = new SelectableTimer(intervT);
auto executorT = new ExecutableTimer(m_fc_update_timer, this, "FLEX_COUNTER_UPD_TIMER");
Orch::addExecutor(executorT);

/* Fetch the available counter Ids */
m_counter_stats.clear();
auto stat_enum_list = queryAvailableCounterStats((sai_object_type_t)SAI_OBJECT_TYPE_ENI);
for (auto &stat_enum: stat_enum_list)
{
auto counter_id = static_cast<sai_eni_stat_t>(stat_enum);
m_counter_stats.insert(sai_serialize_eni_stat(counter_id));
}
}

void DashOrch::setDashHaOrch(DashHaOrch *dash_ha_orch)
Expand Down Expand Up @@ -721,8 +702,8 @@ bool DashOrch::addEniObject(const string& eni, EniEntry& entry)
}

addEniMapEntry(eni_id, eni);
addEniToFC(eni_id, eni);
dash_meter_orch->addEniToMeterFC(eni_id, eni);
EniCounter.addToFC(eni_id, eni);
MeterCounter.addToFC(eni_id, eni);

gCrmOrch->incCrmResUsedCounter(CrmResourceType::CRM_DASH_ENI);

Expand Down Expand Up @@ -862,8 +843,8 @@ bool DashOrch::removeEniObject(const string& eni)
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);
MeterCounter.removeFromFC(entry.eni_id, eni);
EniCounter.removeFromFC(entry.eni_id, eni);
removeEniMapEntry(entry.eni_id, eni);

sai_status_t status = sai_dash_eni_api->remove_eni(entry.eni_id);
Expand Down Expand Up @@ -1313,74 +1294,32 @@ void DashOrch::doTask(ConsumerBase& consumer)
}
}

void DashOrch::removeEniFromFC(sai_object_id_t oid, const string &name)
{
SWSS_LOG_ENTER();

if (oid == SAI_NULL_OBJECT_ID)
{
SWSS_LOG_WARN("Cannot remove counter on NULL OID for eni %s", name.c_str());
return;
}

if (m_eni_stat_work_queue.find(oid) != m_eni_stat_work_queue.end())
{
m_eni_stat_work_queue.erase(oid);
return;
}

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());
}

void DashOrch::refreshEniFCStats(bool install)
template<>
void DashOrch::DashCounter<CounterType::ENI>::fetchStats()
{
for (auto it = eni_entries_.begin(); it != eni_entries_.end(); it++)
counter_stats.clear();
auto stat_enum_list = queryAvailableCounterStats((sai_object_type_t)SAI_OBJECT_TYPE_ENI);
for (auto &stat_enum: stat_enum_list)
{
if (install)
{
addEniToFC(it->second.eni_id, it->first);
}
else
{
removeEniFromFC(it->second.eni_id, it->first);
}
auto counter_id = static_cast<sai_eni_stat_t>(stat_enum);
counter_stats.insert(sai_serialize_eni_stat(counter_id));
}
}

void DashOrch::refreshMeterFCStats(bool install)
template<>
void DashOrch::DashCounter<CounterType::DASH_METER>::fetchStats()
{
DashMeterOrch *dash_meter_orch = gDirectory.get<DashMeterOrch*>();
for (auto it = eni_entries_.begin(); it != eni_entries_.end(); it++)
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)
{
if (install)
{
dash_meter_orch->addEniToMeterFC(it->second.eni_id, it->first);
}
else
{
dash_meter_orch->removeEniFromMeterFC(it->second.eni_id, it->first);
}
auto counter_id = static_cast<sai_meter_bucket_entry_stat_t>(stat_enum);
counter_stats.insert(sai_serialize_meter_bucket_entry_stat(counter_id));
}
}

void DashOrch::handleFCStatusUpdate(bool enabled)
void DashOrch::addEniMapEntry(sai_object_id_t oid, const string &name)
{
bool prev_enabled = m_eni_fc_status;
m_eni_fc_status = enabled; /* Update the status */
if (!enabled && prev_enabled)
{
m_fc_update_timer->stop();
refreshEniFCStats(false); /* Clear any existing FC entries */
}
else if (enabled && !prev_enabled)
{
refreshEniFCStats(true);
m_fc_update_timer->start();
}
}

void DashOrch::addEniMapEntry(sai_object_id_t oid, const string &name) {
SWSS_LOG_ENTER();

if (oid == SAI_NULL_OBJECT_ID)
Expand All @@ -1396,7 +1335,8 @@ void DashOrch::addEniMapEntry(sai_object_id_t oid, const string &name) {
m_eni_name_table->set("", eniNameFvs);
}

void DashOrch::removeEniMapEntry(sai_object_id_t oid, const string &name) {
void DashOrch::removeEniMapEntry(sai_object_id_t oid, const string &name)
{
SWSS_LOG_ENTER();

if (oid == SAI_NULL_OBJECT_ID)
Expand Down
Loading
Loading