Skip to content

Commit

Permalink
Remove vxlanmgrd dependency on orchagent (sonic-net#1647)
Browse files Browse the repository at this point in the history
Removed the dependency of vxlanmgr to wait for the swss to reconcile during the warmboot process.
  • Loading branch information
RajeshPukhrajJain authored Mar 8, 2021
1 parent 9031867 commit 85ff67c
Showing 1 changed file with 0 additions and 18 deletions.
18 changes: 0 additions & 18 deletions cfgmgr/vxlanmgrd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -94,27 +94,9 @@ int main(int argc, char **argv)

if (WarmStart::isWarmStart())
{
WarmStart::WarmStartState state;

vxlanmgr.waitTillReadyToReconcile();
vxlanmgr.restoreVxlanNetDevices();
WarmStart::setWarmStartState("vxlanmgrd", WarmStart::REPLAYED);
uint16_t wait_secs = 0;
string val = "";
Table wb_tbl = Table(&stateDb, STATE_WARM_RESTART_TABLE_NAME);
wb_tbl.hget("orchagent", "restore_count", val);
if ((val != "") or (val != "0"))
{
WarmStart::getWarmStartState("orchagent",state);
while (state != WarmStart::RECONCILED)
{
SWSS_LOG_NOTICE("Waiting Until Orchagent is reconciled. Current %s. Waited %u secs",
val.c_str(), wait_secs);
sleep(1);
wait_secs++;
WarmStart::getWarmStartState("orchagent",state);
}
}
}

SWSS_LOG_NOTICE("starting main loop");
Expand Down

0 comments on commit 85ff67c

Please sign in to comment.