Backport bug fixes to release-1.21#7428
Merged
Merged
Conversation
* use errors.As in getCasErrorCode to unwrap memberlist errors Signed-off-by: SungJin1212 <[email protected]> * fix test Signed-off-by: SungJin1212 <[email protected]> --------- Signed-off-by: SungJin1212 <[email protected]> Signed-off-by: Friedrich Gonzalez <[email protected]>
* Trigger nil with test Signed-off-by: Friedrich Gonzalez <[email protected]> * Fix nil results Signed-off-by: Friedrich Gonzalez <[email protected]> * fix changelog Signed-off-by: Friedrich Gonzalez <[email protected]> --------- Signed-off-by: Friedrich Gonzalez <[email protected]>
…7372) * Fix multitenant alertmanager user config disappearing when ring is unreachable Signed-off-by: Kishore K G <[email protected]> * Add change log Signed-off-by: Kishore K G <[email protected]> * format multitenant Signed-off-by: Kishore K G <[email protected]> * fix pr number Signed-off-by: Kishore K G <[email protected]> * use ErrNotFound for error validation in unit test Signed-off-by: kishorekg1999 <[email protected]> --------- Signed-off-by: Kishore K G <[email protected]> Signed-off-by: kishorekg1999 <[email protected]> Signed-off-by: kishorekg1999 <[email protected]> Signed-off-by: Friedrich Gonzalez <[email protected]>
Signed-off-by: SungJin1212 <[email protected]> Signed-off-by: Friedrich Gonzalez <[email protected]>
…7375) Signed-off-by: Friedrich Gonzalez <[email protected]>
Member
|
@friedrichg |
* fix regex resolver match 0 or 1 tenant bug Signed-off-by: SungJin1212 <[email protected]> * fix test Signed-off-by: SungJin1212 <[email protected]> --------- Signed-off-by: SungJin1212 <[email protected]> Signed-off-by: Friedrich Gonzalez <[email protected]>
* skip nil values in Memberlist WatchPrefix Signed-off-by: SungJin1212 <[email protected]> * fix lint Signed-off-by: SungJin1212 <[email protected]> --------- Signed-off-by: SungJin1212 <[email protected]> Signed-off-by: Friedrich Gonzalez <[email protected]>
SungJin1212
reviewed
Apr 17, 2026
Signed-off-by: Friedrich Gonzalez <[email protected]>
friedrichg
force-pushed
the
backport-bugfixes-1.21
branch
from
April 17, 2026 05:01
3fbb6d1 to
619e08b
Compare
SungJin1212
approved these changes
Apr 17, 2026
The cherry-pick of #7424 brought the master flag name -limits.query-ingesters-within, but release-1.21 still uses -querier.query-ingesters-within (renamed in #7160, master-only). Signed-off-by: Friedrich Gonzalez <[email protected]>
friedrichg
force-pushed
the
backport-bugfixes-1.21
branch
from
April 17, 2026 06:11
3a41750 to
0a67fd2
Compare
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
3 participants
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.
Summary
Backport of 7 bug fixes from master to
release-1.21:status_code="500"metrics for HA tracker CAS operations when using memberlistingester_query_max_attempts > 1ReuseWriteRequestV2by explicitly clearing theSymbolsbacking array string pointers before returning the object tosync.PoolqueryWithRetryandlabelsWithRetryreturning(nil, nil)on cancelled context by propagatingctx.Err()unsupported charactererror whentenant-federation.regex-matcher-enabledis enabled and the input regex matches 0 or 1 existing tenantWatchPrefixwhen a key is deleted, preventing a panic in the HA trackerTest plan