From 3249cdb1124c1c4297b8b85bab991b196c5c84e1 Mon Sep 17 00:00:00 2001 From: tomer-israel <76040066+tomer-israel@users.noreply.github.com> Date: Wed, 29 Sep 2021 21:07:44 +0300 Subject: [PATCH] [PORTSYNCD] when no ports on config db on init, continue and set PortConfigDone (#1861) *continue the execution of handlePortConfigFromConfigDB when no ports on config db -> continue and set PortConfigDone *function handlePortConfigFromConfigDB is no longer boolean - change it to void Signed-off-by: tomeri --- portsyncd/portsyncd.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/portsyncd/portsyncd.cpp b/portsyncd/portsyncd.cpp index beaa008449..c55c1685af 100644 --- a/portsyncd/portsyncd.cpp +++ b/portsyncd/portsyncd.cpp @@ -43,7 +43,7 @@ void usage() } void handlePortConfigFile(ProducerStateTable &p, string file, bool warm); -bool handlePortConfigFromConfigDB(ProducerStateTable &p, DBConnector &cfgDb, bool warm); +void handlePortConfigFromConfigDB(ProducerStateTable &p, DBConnector &cfgDb, bool warm); void handleVlanIntfFile(string file); void handlePortConfig(ProducerStateTable &p, map &port_cfg_map); void checkPortInitDone(DBConnector *appl_db); @@ -86,11 +86,7 @@ int main(int argc, char **argv) netlink.dumpRequest(RTM_GETLINK); cout << "Listen to link messages..." << endl; - if (!handlePortConfigFromConfigDB(p, cfgDb, warm)) - { - SWSS_LOG_NOTICE("ConfigDB does not have port information, " - "however ports can be added later on, continuing..."); - } + handlePortConfigFromConfigDB(p, cfgDb, warm); LinkSync sync(&appl_db, &state_db); NetDispatcher::getInstance().registerMessageHandler(RTM_NEWLINK, &sync); @@ -191,7 +187,7 @@ static void notifyPortConfigDone(ProducerStateTable &p) p.set("PortConfigDone", attrs); } -bool handlePortConfigFromConfigDB(ProducerStateTable &p, DBConnector &cfgDb, bool warm) +void handlePortConfigFromConfigDB(ProducerStateTable &p, DBConnector &cfgDb, bool warm) { SWSS_LOG_ENTER(); @@ -204,8 +200,8 @@ bool handlePortConfigFromConfigDB(ProducerStateTable &p, DBConnector &cfgDb, boo if (keys.empty()) { - cout << "No port configuration in ConfigDB" << endl; - return false; + SWSS_LOG_NOTICE("ConfigDB does not have port information, " + "however ports can be added later on, continuing..."); } for ( auto &k : keys ) @@ -228,7 +224,6 @@ bool handlePortConfigFromConfigDB(ProducerStateTable &p, DBConnector &cfgDb, boo notifyPortConfigDone(p); } - return true; } void handlePortConfig(ProducerStateTable &p, map &port_cfg_map)