making query ingesters config per tenant#7323
Open
Shvejan wants to merge 3 commits intocortexproject:masterfrom
Open
making query ingesters config per tenant#7323Shvejan wants to merge 3 commits intocortexproject:masterfrom
Shvejan wants to merge 3 commits intocortexproject:masterfrom
Conversation
dosubot
bot
added
component/distributor
component/ingester
component/querier
type/feature
labels
yeya24
reviewed
Mar 23, 2026
| queryStoreAfter := time.Duration(l.QueryStoreAfter) | ||
| shuffleShardingLookback := time.Duration(l.ShuffleShardingIngestersLookbackPeriod) | ||
|
|
||
| if queryIngestersWithin > 0 && closeIdleTSDBTimeout > 0 && queryIngestersWithin >= closeIdleTSDBTimeout { |
Contributor
There was a problem hiding this comment.
So does it mean we need to make closeIdleTSDBTimeout per tenant as well?
Contributor
There was a problem hiding this comment.
I think we can leave it for now and expose it if needed later.
yeya24
reviewed
Mar 23, 2026
| queryStoreAfter := time.Duration(l.QueryStoreAfter) | ||
| shuffleShardingLookback := time.Duration(l.ShuffleShardingIngestersLookbackPeriod) | ||
|
|
||
| if queryIngestersWithin > 0 && closeIdleTSDBTimeout > 0 && queryIngestersWithin >= closeIdleTSDBTimeout { |
Contributor
There was a problem hiding this comment.
I think we can leave it for now and expose it if needed later.
CHANGELOG.md
Outdated
| * [ENHANCEMENT] Compactor: Add partition group creation time to visit marker. #7217 | ||
| * [ENHANCEMENT] Compactor: Add concurrency for partition cleanup and mark block for deletion #7246 | ||
| * [ENHANCEMENT] Distributor: Validate metric name before removing empty labels. #7253 | ||
| * [ENHANCEMENT] Make query ingester within a per tenant configuration. #7160 |
Contributor
There was a problem hiding this comment.
We made more configurations to be per tenant. Let's mention all of them. It is also a change I think. Even though it is backward compatible
yeya24
reviewed
Mar 23, 2026
pkg/distributor/query.go
Outdated
| if d.cfg.ShardingStrategy == util.ShardingStrategyShuffle { | ||
| shardSize := d.limits.IngestionTenantShardSize(userID) | ||
| lookbackPeriod := d.cfg.ShuffleShardingLookbackPeriod | ||
| lookbackPeriod := d.limits.ShuffleShardingIngestersLookbackPeriod |
Contributor
There was a problem hiding this comment.
Is this correct? We need to get it per tenant
Shvejan
force-pushed
the
per-tenant-query-limits
branch
4 times, most recently
from
976cee4 to
10517b0
Compare
Signed-off-by: Shvejan Mutheboyina <shvejan@amazon.com>
Signed-off-by: Shvejan Mutheboyina <shvejan@amazon.com>
Signed-off-by: Shvejan Mutheboyina <shvejan@amazon.com>
Shvejan
force-pushed
the
per-tenant-query-limits
branch
from
10517b0 to
062c66b
Compare
Contributor
|
@Shvejan This test failure is related I believe. This is because we changed the type from |
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
2 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.
What this PR does:
This pr makes the following 3 configurations per tenant
Which issue(s) this PR fixes:
Fixes #7160
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]