Skip to content

making query ingesters config per tenant#7323

Open
Shvejan wants to merge 2 commits intocortexproject:masterfrom
Shvejan:per-tenant-query-limits
Open

making query ingesters config per tenant#7323
Shvejan wants to merge 2 commits intocortexproject:masterfrom
Shvejan:per-tenant-query-limits

Conversation

@Shvejan
Copy link
Contributor

@Shvejan Shvejan commented Mar 4, 2026

What this PR does:
This pr makes the following 3 configurations per tenant

  • QueryIngestersWithin
  • QueryStoreAfter
  • ShuffleShardingIngestersLookbackPeriod

Which issue(s) this PR fixes:
Fixes #7160

Checklist

  • Tests updated
  • Documentation added
  • CHANGELOG.md updated - the order of entries should be [CHANGE], [FEATURE], [ENHANCEMENT], [BUGFIX]

Signed-off-by: Shvejan Mutheboyina <shvejan@amazon.com>
Signed-off-by: Shvejan <49836470+Shvejan@users.noreply.github.com>
queryStoreAfter := time.Duration(l.QueryStoreAfter)
shuffleShardingLookback := time.Duration(l.ShuffleShardingIngestersLookbackPeriod)

if queryIngestersWithin > 0 && closeIdleTSDBTimeout > 0 && queryIngestersWithin >= closeIdleTSDBTimeout {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So does it mean we need to make closeIdleTSDBTimeout per tenant as well?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can leave it for now and expose it if needed later.

queryStoreAfter := time.Duration(l.QueryStoreAfter)
shuffleShardingLookback := time.Duration(l.ShuffleShardingIngestersLookbackPeriod)

if queryIngestersWithin > 0 && closeIdleTSDBTimeout > 0 && queryIngestersWithin >= closeIdleTSDBTimeout {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can leave it for now and expose it if needed later.

* [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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

if d.cfg.ShardingStrategy == util.ShardingStrategyShuffle {
shardSize := d.limits.IngestionTenantShardSize(userID)
lookbackPeriod := d.cfg.ShuffleShardingLookbackPeriod
lookbackPeriod := d.limits.ShuffleShardingIngestersLookbackPeriod
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this correct? We need to get it per tenant

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Make query ingester within a per tenant configuration

2 participants