Backport #7854 to release-1.22 - #7868
Merged
CharlieTLe merged 1 commit intoSep 28, 2026
Merged
Conversation
…r ring convergence (cortexproject#7854) * Initial plan * Wait for ring convergence in zoneAwareSharding test to fix flakiness Co-authored-by: CharlieTLe <3375195+CharlieTLe@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: CharlieTLe <3375195+CharlieTLe@users.noreply.github.com> (cherry picked from commit 17a8f98) Signed-off-by: Charlie Le <charlie_le@apple.com>
CharlieTLe
requested review from
danielblando
and removed request for
a team
September 28, 2026 22:55
CharlieTLe
merged commit Sep 28, 2026
3cf6fee
into
cortexproject:release-1.22
74 of 75 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backports #7854 (test-only) to
release-1.22.TestMultitenantAlertmanager_zoneAwareSharding(#7853) failedtest (arm64)on thev1.22.0-rc.2tag build (run 36199766900), which skippeddeployuntil the job was re-run. #7854 fixed it on master by waiting for ring convergence before computing tenant ownership. Backporting it keeps the flake off the remaining release-1.22 tag builds.Test-only change to
pkg/alertmanager/multitenant_test.go; no effect on release artifacts, no CHANGELOG entry. Cherry-picked cleanly with-x.Verification
go test -race -count=30 -run '^TestMultitenantAlertmanager_zoneAwareSharding$' ./pkg/alertmanager/: ok