Skip to content

[SmartSwitch-HA] Set pending flags back to false. #3997

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
merged 5 commits into from
Nov 25, 2025
Merged

[SmartSwitch-HA] Set pending flags back to false. #3997

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0b8ad9
Set pending flags back to false.
dypet Nov 14, 2025
6ff8022
Update brainsplit flag.
dypet Nov 17, 2025
c8efc99
Merge branch 'master' into set_pending_false
dypet Nov 17, 2025
dd5465a
Merge branch 'master' into set_pending_false
dypet Nov 19, 2025
8efe613
Merge branch 'master' into set_pending_false
dypet Nov 24, 2025
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
11 changes: 11 additions & 0 deletions orchagent/dash/dashhaorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,9 @@ bool DashHaOrch::setHaScopeFlowReconcileRequest(const std::string &key)
}
SWSS_LOG_NOTICE("Set HA Scope flow reconcile request for %s", key.c_str());

std::vector<FieldValueTuple> fvs = {{"flow_reconcile_pending", "false"}};
m_dpuStateDbHaScopeTable->set(key, fvs);

return true;
}

Expand Down Expand Up @@ -678,6 +681,9 @@ bool DashHaOrch::setHaScopeActivateRoleRequest(const std::string &key)
}
SWSS_LOG_NOTICE("Set HA Scope activate role request for %s", key.c_str());

std::vector<FieldValueTuple> fvs = {{"activate_role_pending", "false"}};
m_dpuStateDbHaScopeTable->set(key, fvs);

return true;
}

Expand Down Expand Up @@ -1026,6 +1032,11 @@ void DashHaOrch::doTask(NotificationConsumer &consumer)
fvs.push_back({"activate_role_pending", "true"});
SWSS_LOG_NOTICE("DPU is pending on role activation for %s", key.c_str());
}
else if (in(ha_scope_event[i].ha_state, {SAI_DASH_HA_STATE_ACTIVE,
SAI_DASH_HA_STATE_STANDBY}))
{
fvs.push_back({"brainsplit_recover_pending", "false"});
Copy link

@yue-fred-gao yue-fred-gao Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure what the ha_state is when it reports brain split. Have you tested brain split?

Copy link
Contributor Author

@dypet dypet Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Brainsplit is reported when DPU-DPU connection recovers and both DPU are in standalone

Copy link

@yue-fred-gao yue-fred-gao Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. So if they transition to active or standby, it means they have recovered from brain-split state.

}

fvs.push_back({"ha_state", sai_ha_state_name.at(ha_scope_event[i].ha_state)});
fvs.push_back({"ha_state_start_time", to_string(now_time)});
Expand Down
Loading