[MultiDB] Use database name instead of database ID (sonic-net#1303)

Remove references to hardcoded DB ID in swss as in a MultiDB, the DB Name should always be used to accurately identify the connector's database role.
theasianpianist · Jun 9, 2020 · 2deb6e0 · 2deb6e0
1 parent 4cc1d1f
commit 2deb6e0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/orchagent/orch.cpp b/orchagent/orch.cpp
@@ -557,7 +557,7 @@ bool Orch::parseIndexRange(const string &input, sai_uint32_t &range_low, sai_uin
 
 void Orch::addConsumer(DBConnector *db, string tableName, int pri)
 {
-    if (db->getDbId() == CONFIG_DB || db->getDbId() == STATE_DB)
+    if (db->getDbName() == "CONFIG_DB" || db->getDbName() == "STATE_DB")
     {
         addExecutor(new Consumer(new SubscriberStateTable(db, tableName, TableConsumable::DEFAULT_POP_BATCH_SIZE, pri), this, tableName));
     }

diff --git a/orchagent/orch.h b/orchagent/orch.h
@@ -136,6 +136,11 @@ class Consumer : public Executor {
         return getConsumerTable()->getDbConnector()->getDbId();
     }
 
+    std::string getDbName() const
+    {
+        return getConsumerTable()->getDbConnector()->getDbName();
+    }
+
     std::string dumpTuple(const swss::KeyOpFieldsValuesTuple &tuple);
     void dumpPendingTasks(std::vector<std::string> &ts);
 

diff --git a/orchagent/pfcwdorch.cpp b/orchagent/pfcwdorch.cpp
@@ -59,7 +59,7 @@ void PfcWdOrch<DropHandler, ForwardHandler>::doTask(Consumer& consumer)
         return;
     }
 
-    if ((consumer.getDbId() == CONFIG_DB) && (consumer.getTableName() == CFG_PFC_WD_TABLE_NAME))
+    if ((consumer.getDbName() == "CONFIG_DB") && (consumer.getTableName() == CFG_PFC_WD_TABLE_NAME))
     {
         auto it = consumer.m_toSync.begin();
         while (it != consumer.m_toSync.end())
@@ -761,7 +761,7 @@ void PfcWdSwOrch<DropHandler, ForwardHandler>::doTask(Consumer& consumer)
         return;
     }
 
-    if ((consumer.getDbId() == APPL_DB) && (consumer.getTableName() == APP_PFC_WD_TABLE_NAME))
+    if ((consumer.getDbName() == "APPL_DB") && (consumer.getTableName() == APP_PFC_WD_TABLE_NAME))
     {
         auto it = consumer.m_toSync.begin();
         while (it != consumer.m_toSync.end())