Skip to content

[code sync] Merge code from sonic-net/sonic-swss:202605 to 202606 #246

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 2 commits into from
Jun 25, 2026
Merged

[code sync] Merge code from sonic-net/sonic-swss:202605 to 202606 #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7d733d
[dashhaorch]: Update in-memory ha_role on HA scope set (#4659)
mssonicbld Jun 24, 2026
feeb3e6
Merge branch '202605' of https://github.com/sonic-net/sonic-swss into…
mssonicbld Jun 25, 2026
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
8 changes: 6 additions & 2 deletions orchagent/dash/dashhaorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,8 +733,12 @@ void DashHaOrch::updateHaScopeStateForSwitchOwner(const std::string &key, const

std::string ha_set_id = entry.ha_set_id().empty() ? key : entry.ha_set_id();
auto ha_set_it = m_ha_set_entries.find(ha_set_id);
if (ha_set_it == m_ha_set_entries.end() ||
ha_set_it->second.metadata.owner() != dash::types::HA_OWNER_SWITCH)
if (ha_set_it == m_ha_set_entries.end())
{
SWSS_LOG_WARN("HA Set entry %s does not exist, still updating HA Scope state for %s",
ha_set_id.c_str(), key.c_str());
}
else if (ha_set_it->second.metadata.owner() != dash::types::HA_OWNER_SWITCH)
{
return;
}
Expand Down
35 changes: 35 additions & 0 deletions tests/mock_tests/dashhaorch_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1229,4 +1229,39 @@ namespace dashhaorch_ut
RemoveHaScope();
RemoveHaSet();
}

TEST_F(DashHaOrchTestSwitchOwner, SwitchOwnerSetRoleUpdatesStateWhenHaSetMissing)
{
// Create switch-owner HA Set, then HA Scope.
EXPECT_CALL(*mock_sai_dash_ha_api, create_ha_set)
.Times(1).WillOnce(Return(SAI_STATUS_SUCCESS));
CreateSwitchOwnerDpuScopeHaSet();

EXPECT_CALL(*mock_sai_dash_ha_api, create_ha_scope)
.Times(1).WillOnce(Return(SAI_STATUS_SUCCESS));
CreateHaScope();

// Remove the HA Set while HA Scope still exists. This makes the HA Set
// lookup inside updateHaScopeStateForSwitchOwner fail.
EXPECT_CALL(*mock_sai_dash_ha_api, remove_ha_set)
.Times(1).WillOnce(Return(SAI_STATUS_SUCCESS));
RemoveHaSet();
ASSERT_TRUE(m_dashHaOrch->getHaSetEntries().find("HA_SET_1") == m_dashHaOrch->getHaSetEntries().end());

// Trigger a role change. The new code path should emit a warning that
// the HA Set is missing but still update the in-memory ha_state for the
// HA Scope entry (previously this path would silently early-return).
EXPECT_CALL(*mock_sai_dash_ha_api, set_ha_scope_attribute)
.WillRepeatedly(Return(SAI_STATUS_SUCCESS));
SetHaScopeHaRole("active");

auto scope_it = m_dashHaOrch->getHaScopeEntries().find("HA_SET_1");
ASSERT_NE(scope_it, m_dashHaOrch->getHaScopeEntries().end());
EXPECT_EQ(scope_it->second.ha_state, SAI_DASH_HA_STATE_ACTIVE);
EXPECT_EQ(to_sai(scope_it->second.metadata.ha_role()), SAI_DASH_HA_ROLE_ACTIVE);

EXPECT_CALL(*mock_sai_dash_ha_api, remove_ha_scope)
.Times(1).WillOnce(Return(SAI_STATUS_SUCCESS));
RemoveHaScope();
}
}
Loading