Skip to content

[action] [PR:203] [NPU-driven HA] Ack standalone before peer activates dead role #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mssonicbld merged 1 commit into from
Jul 6, 2026
Merged

[action] [PR:203] [NPU-driven HA] Ack standalone before peer activates dead role #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions crates/hamgrd/src/actors/ha_scope/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1050,6 +1050,10 @@ mod test {
// Mock the peer's ShutdownReply with "accepted"
send! { key: ShutdownReply::msg_key(&peer_scope_id), data: { "response": "accepted" } },

// The standby node must NOT activate its dead role yet. It waits until the active
// peer acks the standalone role. Mock the active peer acking the standalone role.
send! { key: HaScopeActorState::msg_key(&peer_scope_id), data: { "timestamp": 0, "owner": 0, "new_state": HaState::Standalone.as_str_name(), "term": "1", "vdpu_id": "", "peer_vdpu_id": "", "acked_asic_ha_state": "standalone" } },

// Expect a DPU DASH_HA_SCOPE_TABLE update (Destroying side effect)
recv! { key: &ha_set_id, data: {
"key": &ha_set_id,
Expand Down Expand Up @@ -1241,10 +1245,9 @@ mod test {
recv! { key: HaScopeActorState::msg_key(&scope_id), data: { "owner": HaOwner::Switch as i32, "new_state": HaState::SwitchingToStandalone.as_str_name(), "term": "1", "vdpu_id": &vdpu0_id, "peer_vdpu_id": &vdpu1_id }, addr: runtime.sp(HaScopeActor::name(), &peer_scope_id), exclude: "timestamp" },
recv! { key: HaScopeActorState::msg_key(&scope_id), data: { "owner": HaOwner::Switch as i32, "new_state": HaState::SwitchingToStandalone.as_str_name(), "term": "1", "vdpu_id": &vdpu0_id, "peer_vdpu_id": &vdpu1_id }, addr: runtime.sp(HaSetActor::name(), &ha_set_id), exclude: "timestamp" },

// The active node waits in SwitchingToStandalone until the peer's ASIC acks the dead role.
// Mock the peer completing its shutdown by broadcasting Dead with acked_asic_ha_state="dead".
send! { key: HaScopeActorState::msg_key(&peer_scope_id), data: { "timestamp": 0, "owner": 0, "new_state": HaState::Dead.as_str_name(), "term": "1", "vdpu_id": "", "peer_vdpu_id": "", "acked_asic_ha_state": "dead" } },

// The active node acks the standalone role first, without waiting for the peer to
// become Dead. The peer (standby) will only activate its dead role after observing
// this standalone ack.
// EnterStandalone self-notification is then processed:
// Expect DPU DASH_HA_SCOPE_TABLE update with standalone role and incremented term
recv! { key: &ha_set_id, data: {
Expand Down Expand Up @@ -3245,6 +3248,10 @@ mod test {
// Mock the peer's ShutdownReply with "accepted"
send! { key: ShutdownReply::msg_key(&peer_scope_id), data: { "response": "accepted" } },

// The standby node must NOT activate its dead role yet. It waits until the active
// peer acks the standalone role. Mock the active peer acking the standalone role.
send! { key: HaScopeActorState::msg_key(&peer_scope_id), data: { "timestamp": 0, "owner": 0, "new_state": HaState::Standalone.as_str_name(), "term": "1", "vdpu_id": "", "peer_vdpu_id": "", "acked_asic_ha_state": "standalone" } },

// Expect a DPU DASH_HA_SCOPE_TABLE update (Destroying side effect)
recv! { key: &ha_set_id, data: {
"key": &ha_set_id,
Expand Down
42 changes: 31 additions & 11 deletions crates/hamgrd/src/actors/ha_scope/npu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1403,17 +1403,13 @@ impl NpuHaScopeActor {
// Peer DPU lost
self.send_self_notification(state, "EnterStandalone", 0)?;
} else if *event == HaEvent::PeerShutdownRequested {
if self.current_npu_peer_acked_asic_ha_state(state.internal())
== ha_role_to_string(HaRole::Dead.as_str_name())
&& self.current_npu_peer_ha_state(state.internal()) == HaState::Dead
{
// Peer DPU planned shutdown and already dead — enter standalone
self.send_self_notification(state, "EnterStandalone", 0)?;
}
// Else wait for peer to become Dead
} else if *event == HaEvent::PeerStateChanged
&& self.current_npu_peer_acked_asic_ha_state(state.internal())
== ha_role_to_string(HaRole::Dead.as_str_name())
// Peer requested a planned shutdown. Enter standalone immediately so that
// we ack the standalone role first. The peer (standby) will only activate
// its dead role after observing our standalone ack, avoiding a window where
// inline sync is unacked
self.send_self_notification(state, "EnterStandalone", 0)?;
} else if self.current_npu_peer_acked_asic_ha_state(state.internal())
== ha_role_to_string(HaRole::Dead.as_str_name())
&& self.current_npu_peer_ha_state(state.internal()) == HaState::Dead
{
// Peer DPU forced shutdown — enter standalone
Expand Down Expand Up @@ -1616,6 +1612,18 @@ impl NpuHaScopeActor {
None
}
}
HaState::Standby => {
// Planned shutdown was accepted by the active peer. We must not activate the
// dead role until the active peer has acked the standalone role and thus owns
// all traffic. If it already has, proceed; otherwise wait for its state update.
if self.current_npu_peer_acked_asic_ha_state(state.internal())
== ha_role_to_string(HaRole::Standalone.as_str_name())
{
Some((HaState::Destroying, "planned shutdown, peer acked standalone"))
} else {
None
}
}
_ => Some((HaState::Destroying, "planned shutdown")),
};
} else if *event == HaEvent::EnterStandalone {
Expand Down Expand Up @@ -1742,6 +1750,18 @@ impl NpuHaScopeActor {
Some((HaState::SwitchingToStandalone, "local DPU failure"))
} else if *event == HaEvent::PeerLost {
Some((HaState::SwitchingToStandalone, "peer failure while standby"))
} else if self
.base
.dash_ha_scope_config
.as_ref()
.map(|c| c.desired_ha_state == DesiredHaState::Dead as i32)
.unwrap_or(false)
&& self.current_npu_peer_acked_asic_ha_state(state.internal())
== ha_role_to_string(HaRole::Standalone.as_str_name())
{
// Planned shutdown: the active peer has acked the standalone role and now
// owns all traffic, so it is safe to activate our dead role.
Some((HaState::Destroying, "planned shutdown, peer acked standalone"))
} else if self.current_npu_peer_ha_state(state.internal()) == HaState::Dead {
Some((HaState::SwitchingToStandalone, "peer went down"))
} else {
Expand Down
Loading