max_global_traces_per_user: take into account ingestion.tenant_shard_size when converting to local limit #3618
+6
−3
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:
Fixes an oversight when adding ingester shuffle sharding support (#3506).
max_global_traces_per_user
is a global limit enforced in the ingester. It is converted to a local limit by dividing the global limit by the amount of (healthy) ingesters in the ring. Wheningestion.tenant_shard_size
is set the tenant will have a smaller ring than the total count of ingesters. As a result the actual local limit would be higher in those cases.Before:
After:
Which issue(s) this PR fixes:
Fixes #Checklist
Tests updatedDocumentation addedCHANGELOG.md
updated - the order of entries should be[CHANGE]
,[FEATURE]
,[ENHANCEMENT]
,[BUGFIX]