resource based throttling: reject only adhoc queries #6947
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
dosubot
bot
added
the
component/rules
erlan-z
force-pushed
the
resource-based-throttling-reject-only-addhoc-queries
branch
from
5e39a8b to
53cedc7
Compare
erlan-z
changed the title
erlan-z
force-pushed
the
resource-based-throttling-reject-only-addhoc-queries
branch
from
53cedc7 to
47da956
Compare
justinjung04
reviewed
Aug 8, 2025
pkg/ingester/ingester.go
Outdated
| @@ -2262,7 +2263,7 @@ func (i *Ingester) trackInflightQueryRequest() (func(), error) { | |||
|
|
|||
| i.maxInflightQueryRequests.Track(i.inflightQueryRequests.Inc()) | |||
|
|
|||
| if i.resourceBasedLimiter != nil { | |||
| if i.resourceBasedLimiter != nil && requestmeta.RequestSourceFromContext(ctx) == requestmeta.SourceApi { | |||
There was a problem hiding this comment.
nit: what do you think of adding helper functions in requestmeta itself? ie. requestmeta.RequestFromApi(ctx) and requestmeta.RequestFromRuler(ctx)
Signed-off-by: Erlan Zholdubai uulu <[email protected]>
erlan-z
force-pushed
the
resource-based-throttling-reject-only-addhoc-queries
branch
from
47da956 to
8bb3d4f
Compare
SungJin1212
reviewed
Aug 11, 2025
Comment on lines
+7
to
+10
| const ( | ||
| SourceApi = "api" | ||
| SourceRuler = "ruler" | ||
| ) |
There was a problem hiding this comment.
How about reusing tripperware.SourceAPI and tripperware.SourceRuler?
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.
What this PR does:
Exclude rules queries from resource-based query rejection
Description:
This change improves the resource-based query rejection mechanism by ensuring that only ad-hoc API queries are rejected when resource thresholds are breached. Queries originating from rule evaluations are now excluded from rejection.
Introduced RequestSource metadata to distinguish between API and ruler queries.
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]