Skip to content

Commit 05c7c05

Browse files
authored
[Mux orch] set default as standby, change mux orch priority (#2010)
*Set default status for each mux port to standby state during init. *Change mux orch priority to process entries before neighbor orch
1 parent fe5b2a9 commit 05c7c05

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

orchagent/muxorch.cpp

+3
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,9 @@ MuxCable::MuxCable(string name, IpPrefix& srv_ip4, IpPrefix& srv_ip6, IpAddress
326326
state_machine_handlers_.insert(handler_pair(MUX_STATE_STANDBY_ACTIVE, &MuxCable::stateActive));
327327
state_machine_handlers_.insert(handler_pair(MUX_STATE_INIT_STANDBY, &MuxCable::stateStandby));
328328
state_machine_handlers_.insert(handler_pair(MUX_STATE_ACTIVE_STANDBY, &MuxCable::stateStandby));
329+
330+
/* Set initial state to "standby" */
331+
stateStandby();
329332
}
330333

331334
bool MuxCable::stateInitActive()

orchagent/orchdaemon.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ bool OrchDaemon::init()
298298
* when iterating ConsumerMap. This is ensured implicitly by the order of keys in ordered map.
299299
* For cases when Orch has to process tables in specific order, like PortsOrch during warm start, it has to override Orch::doTask()
300300
*/
301-
m_orchList = { gSwitchOrch, gCrmOrch, gPortsOrch, gBufferOrch, gIntfsOrch, gNeighOrch, gNhgOrch, gRouteOrch, copp_orch, qos_orch, wm_orch, policer_orch, tunnel_decap_orch, sflow_orch, debug_counter_orch, gMacsecOrch};
301+
m_orchList = { gSwitchOrch, gCrmOrch, gPortsOrch, gBufferOrch, mux_orch, mux_cb_orch, gIntfsOrch, gNeighOrch, gNhgOrch, gRouteOrch, copp_orch, qos_orch, wm_orch, policer_orch, tunnel_decap_orch, sflow_orch, debug_counter_orch, gMacsecOrch};
302302

303303
bool initialize_dtel = false;
304304
if (platform == BFN_PLATFORM_SUBSTRING || platform == VS_PLATFORM_SUBSTRING)
@@ -394,8 +394,6 @@ bool OrchDaemon::init()
394394
m_orchList.push_back(gMlagOrch);
395395
m_orchList.push_back(gIsoGrpOrch);
396396
m_orchList.push_back(gFgNhgOrch);
397-
m_orchList.push_back(mux_orch);
398-
m_orchList.push_back(mux_cb_orch);
399397
m_orchList.push_back(mux_st_orch);
400398

401399
if (m_fabricEnabled)

0 commit comments

Comments
 (0)