Skip to content

Fix flaky TestMultitenantAlertmanager_zoneAwareSharding by waiting for ring convergence #7854

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
CharlieTLe merged 2 commits into from
Sep 22, 2026
+9 −0
Merged

Fix flaky TestMultitenantAlertmanager_zoneAwareSharding by waiting for ring convergence #7854

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4300e0d
Initial plan
Copilot Sep 21, 2026
4aed45f
Wait for ring convergence in zoneAwareSharding test to fix flakiness
Copilot Sep 21, 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
9 changes: 9 additions & 0 deletions pkg/alertmanager/multitenant_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,6 +860,15 @@ func TestMultitenantAlertmanager_zoneAwareSharding(t *testing.T) {
am2ZoneA := createInstance(2, "zoneA", registriesZoneA)
am1ZoneB := createInstance(3, "zoneB", registriesZoneB)

// Wait until every instance's ring client sees all the instances, otherwise
// ownership is computed against a partial ring view and tenants may get
// double-counted.
for _, am := range []*MultitenantAlertmanager{am1ZoneA, am2ZoneA, am1ZoneB} {
test.Poll(t, 5*time.Second, 3, func() any {
return am.ring.InstancesCount()
})
}

{
require.NoError(t, alertStore.SetAlertConfig(ctx, alertspb.AlertConfigDesc{
User: user1,
Expand Down