fix regex resolver match 0 or 1 tenant bug#7424
Merged
friedrichg merged 2 commits intoApr 17, 2026
Merged
Conversation
CharlieTLe
approved these changes
Apr 15, 2026
friedrichg
requested changes
Apr 16, 2026
| require.NoError(t, ingester.WaitSumMetricsWithOptions(e2e.Greater(0), []string{"cortex_ingester_shipper_uploads_total"}, e2e.WaitMissingMetrics)) | ||
|
|
||
| // wait to update knownUsers | ||
| require.NoError(t, querier.WaitSumMetricsWithOptions(e2e.Greater(0), []string{"cortex_regex_resolver_last_update_run_timestamp_seconds"}), e2e.WaitMissingMetrics) |
Member
There was a problem hiding this comment.
Suggested change
| require.NoError(t, querier.WaitSumMetricsWithOptions(e2e.Greater(0), []string{"cortex_regex_resolver_last_update_run_timestamp_seconds"}), e2e.WaitMissingMetrics) | |
| require.NoError(t, querier.WaitSumMetricsWithOptions(e2e.Greater(0), []string{"cortex_regex_resolver_last_update_run_timestamp_seconds"}, e2e.WaitMissingMetrics)) |
2 tasks
Signed-off-by: SungJin1212 <[email protected]>
Signed-off-by: SungJin1212 <[email protected]>
SungJin1212
force-pushed
the
bugfix-regex-resolver-single-tenant
branch
from
April 17, 2026 01:45
55e0fad to
687eb31
Compare
friedrichg
approved these changes
Apr 17, 2026
friedrichg
pushed a commit
that referenced
this pull request
Apr 17, 2026
* 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]>
friedrichg
added a commit
that referenced
this pull request
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). Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]> Signed-off-by: Friedrich Gonzalez <[email protected]>
friedrichg
added a commit
that referenced
this pull request
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
added a commit
that referenced
this pull request
Apr 17, 2026
* Memberlist cas error code false positive (#7408) * 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]> * Fix nil when ingesterQueryMaxAttempts > 1 (#7369) * 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]> * fix: alertmanager user config disappearing when ring is unreachable (#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]> * Clean Symbol Tables (#7373) Signed-off-by: SungJin1212 <[email protected]> Signed-off-by: Friedrich Gonzalez <[email protected]> * Fix root cause of nil return in queryWithRetry and labelsWithRetry (#7375) Signed-off-by: Friedrich Gonzalez <[email protected]> * fix regex resolver match 0 or 1 tenant bug (#7424) * 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 (#7429) * 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]> * Remove duplicate CHANGELOG entry for #7373 Signed-off-by: Friedrich Gonzalez <[email protected]> * Fix integration test flag name for release-1.21 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]> --------- Signed-off-by: SungJin1212 <[email protected]> Signed-off-by: Friedrich Gonzalez <[email protected]> Signed-off-by: Kishore K G <[email protected]> Signed-off-by: kishorekg1999 <[email protected]> Signed-off-by: kishorekg1999 <[email protected]> Co-authored-by: SungJin1212 <[email protected]> Co-authored-by: kishorekg1999 <[email protected]>
CharlieTLe
added a commit
to CharlieTLe/cortex
that referenced
this pull request
Apr 17, 2026
CI run 24576043912: all jobs passed after merging upstream/master (cortexproject#7424 regex resolver fix, cortexproject#7429 memberlist WatchPrefix fix). Signed-off-by: Charlie Le <[email protected]> Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]> Signed-off-by: Charlie Le <[email protected]>
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.
Fix
unsupported charactererror whentenant-federation.regex-matcher-enabledis enabled and the input regex matches 0 or 1 existing tenant.Ingester Side (Use Single Resolver): The raw regex was propagated to ingesters via context instead of the resolved tenant ID, causing validation errors for patterns containing characters unsupported in tenant IDs (e.g.
+).Store Gateway Side: The tenantID is passed by the querier (Use Resolve Resolver), so the query results are partially returned only by the Store Gateway side in #7413(Issue 2).
Which issue(s) this PR fixes:
Fixes #7413
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]