Skip to content

Commit

Permalink
[WarmStart]: Use right docker name for the teammgrd checkWarmStart (#685
Browse files Browse the repository at this point in the history
)

* 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
  • Loading branch information
pavel-shirshov authored and lguohan committed Nov 14, 2018
1 parent 6292786 commit 48c3bfb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions cfgmgr/teammgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 2 additions & 2 deletions cfgmgr/teammgrd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 48c3bfb

Please sign in to comment.