Skip to content

Commit 48c3bfb

Browse files
pavel-shirshovlguohan
authored andcommitted
[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
1 parent 6292786 commit 48c3bfb

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

cfgmgr/teammgr.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -392,12 +392,12 @@ bool TeamMgr::addLag(const string &alias, int min_links, bool fallback)
392392
SWSS_LOG_INFO("Port channel %s teamd configuration: %s",
393393
alias.c_str(), conf.str().c_str());
394394

395-
string warmstart_flag = WarmStart::isWarmStart() ? " -w " : "";
395+
string warmstart_flag = WarmStart::isWarmStart() ? " -w -o " : " -r ";
396396
const string dump_path = "/var/warmboot/teamd/";
397397

398398
cmd << TEAMD_CMD
399399
<< warmstart_flag
400-
<< " -r -t " << alias
400+
<< " -t " << alias
401401
<< " -c " << conf.str()
402402
<< " -L " << dump_path
403403
<< " -d";

cfgmgr/teammgrd.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ int main(int argc, char **argv)
3030
DBConnector app_db(APPL_DB, DBConnector::DEFAULT_UNIXSOCKET, 0);
3131
DBConnector state_db(STATE_DB, DBConnector::DEFAULT_UNIXSOCKET, 0);
3232

33-
WarmStart::initialize("teammgrd");
34-
WarmStart::checkWarmStart("teammgrd");
33+
WarmStart::initialize("teammgrd", "teamd");
34+
WarmStart::checkWarmStart("teammgrd", "teamd");
3535

3636
TableConnector conf_lag_table(&conf_db, CFG_LAG_TABLE_NAME);
3737
TableConnector conf_lag_member_table(&conf_db, CFG_LAG_MEMBER_TABLE_NAME);

0 commit comments

Comments
 (0)