From 48c3bfbcce6cd7e0c5e4ee9f1891db242918fb39 Mon Sep 17 00:00:00 2001 From: pavel-shirshov Date: Tue, 13 Nov 2018 17:00:57 -0800 Subject: [PATCH] [WarmStart]: Use right docker name for the teammgrd checkWarmStart (#685) * Pospone QueueMap initialization until activation of counters * Generate queue maps only for front panel ports * Use right docker name for the teammgrd checkWarmStart * Use -o flag for WE mode --- cfgmgr/teammgr.cpp | 4 ++-- cfgmgr/teammgrd.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cfgmgr/teammgr.cpp b/cfgmgr/teammgr.cpp index 8d02dbd785d2..84e739cc6f1b 100644 --- a/cfgmgr/teammgr.cpp +++ b/cfgmgr/teammgr.cpp @@ -392,12 +392,12 @@ bool TeamMgr::addLag(const string &alias, int min_links, bool fallback) SWSS_LOG_INFO("Port channel %s teamd configuration: %s", alias.c_str(), conf.str().c_str()); - string warmstart_flag = WarmStart::isWarmStart() ? " -w " : ""; + string warmstart_flag = WarmStart::isWarmStart() ? " -w -o " : " -r "; const string dump_path = "/var/warmboot/teamd/"; cmd << TEAMD_CMD << warmstart_flag - << " -r -t " << alias + << " -t " << alias << " -c " << conf.str() << " -L " << dump_path << " -d"; diff --git a/cfgmgr/teammgrd.cpp b/cfgmgr/teammgrd.cpp index cb9590e92a7c..bac429e0a335 100644 --- a/cfgmgr/teammgrd.cpp +++ b/cfgmgr/teammgrd.cpp @@ -30,8 +30,8 @@ int main(int argc, char **argv) DBConnector app_db(APPL_DB, DBConnector::DEFAULT_UNIXSOCKET, 0); DBConnector state_db(STATE_DB, DBConnector::DEFAULT_UNIXSOCKET, 0); - WarmStart::initialize("teammgrd"); - WarmStart::checkWarmStart("teammgrd"); + WarmStart::initialize("teammgrd", "teamd"); + WarmStart::checkWarmStart("teammgrd", "teamd"); TableConnector conf_lag_table(&conf_db, CFG_LAG_TABLE_NAME); TableConnector conf_lag_member_table(&conf_db, CFG_LAG_MEMBER_TABLE_NAME);