Distributor default sharding should support default 0 value. #5759
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
Signed-off-by: Ryan West <[email protected]>
Signed-off-by: Ryan West <[email protected]>
yeya24
reviewed
Feb 1, 2024
pkg/distributor/distributor.go
Outdated
| @@ -178,10 +178,14 @@ func (cfg *Config) Validate(limits validation.Limits) error { | |||
| return errInvalidShardingStrategy | |||
| } | |||
|
|
|||
| if cfg.ShardingStrategy == util.ShardingStrategyShuffle && limits.IngestionTenantShardSize <= 0 { | |||
| if limits.IngestionTenantShardSize < 0 { | |||
There was a problem hiding this comment.
if cfg.ShardingStrategy == util.ShardingStrategyShuffle && limits.IngestionTenantShardSize < 0 {
}
I think it is fine to have IngestionTenantShardSize < 0 when strategy is not shuffle sharding as it is a noop.
…g code back to L680 Signed-off-by: Ryan West <[email protected]>
danielblando
reviewed
Feb 2, 2024
| @@ -178,7 +178,7 @@ func (cfg *Config) Validate(limits validation.Limits) error { | |||
| return errInvalidShardingStrategy | |||
| } | |||
|
|
|||
| if cfg.ShardingStrategy == util.ShardingStrategyShuffle && limits.IngestionTenantShardSize <= 0 { | |||
| if cfg.ShardingStrategy == util.ShardingStrategyShuffle && limits.IngestionTenantShardSize < 0 { | |||
| return errInvalidTenantShardSize | |||
There was a problem hiding this comment.
nit: can you update the error message invalid tenant shard size, the value must be greater than 0
Signed-off-by: Ryan West <[email protected]>
yeya24
approved these changes
Feb 2, 2024
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.
There is a discrepancy between the current behavior of the system and the documented functionality regarding the setting of the ingestion_tenant_shard_size parameter.
Current Behavior
When attempting to set the -distributor.ingestion-tenant-shard-size flag to 0, the system throws an error.
Expected Behavior (As Per Documentation)
The documentation states the following:
According to this, setting the value to 0 should be supported and is intended to disable shuffle sharding for the tenant.
Rationale for Setting the Value to 0
The intention behind setting the ingestion_tenant_shard_size to 0 by default is to enable shuffle-sharding, while also allowing a tenant to utilize the entire ring as the shard size. This setup is crucial for overwriting settings for specific tenants who might require shuffle sharding. The issue was identified during an attempt to configure our ingesters with the zero value.
What this PR does:
This PR addresses the exception that is thrown, warns a customer when the combination of shuffle sharding enabled and ingestion_tenant_shard_size == 0. Also addressing the
Push()function to check and update the ring topology accordingly.Which issue(s) this PR fixes:
Fixes #5189
Related: #5250
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]