Add a query result limit to regex matcher #6845
Open
+37
−16
Conversation
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
SungJin1212
force-pushed
the
Add-result-limit-on-regex-matcher
branch
from
a3ab0e4 to
fd3d145
Compare
yeya24
requested changes
Jun 30, 2025
| @@ -160,6 +162,11 @@ func (r *RegexResolver) getRegexMatchedOrgIds(orgID string) ([]string, error) { | |||
| return []string{"fake"}, nil | |||
| } | |||
|
|
|||
| if r.maxTenant > 0 && len(matched) > r.maxTenant { | |||
| // adjust matched tenants to maxTenant | |||
| matched = matched[:r.maxTenant] | |||
There was a problem hiding this comment.
The current behavior of too many tenant IDs in Query Frontend is to reject the query with too many tenants error. Should we align with the same behavior?
Capping the number of tenants and resuming the query seems a new behavior. I would say we should go with rejecting the query and ask people to explicitly match fewer tenants.
If we cap, we need to document how we reject tenants, and details like if we sort or not, etc. And also we need to return a warning to let users know that the tenants are truncated.
There was a problem hiding this comment.
ok, let's go with your suggestion for retaining existing behavior.
SungJin1212
force-pushed
the
Add-result-limit-on-regex-matcher
branch
2 times, most recently
from
9f90f5d to
0d74844
Compare
Signed-off-by: SungJin1212 <[email protected]>
SungJin1212
force-pushed
the
Add-result-limit-on-regex-matcher
branch
from
0d74844 to
7e0ca92
Compare
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.
This PR implements a
tenant-federation.max-tenantflag logic when thetenant-federation.regex-matcher-enabledflag is enabled.Since the QFE uses a
regex validator, which validates input regex and passes it to the Query scheduler or Querier, the QFE handler cannot validate the max tenant limit.Instead of emitting an error when # of matched tenants over the
tenant-federation.max-tenant, I adjusted # of tenants to query because # of matched tenants is unexpected if the user uses a regex likeuser-+.Which issue(s) this PR fixes:
Fixes #
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]