Fixes unaligned shards between ingesters and storage. #4087
Conversation
This file contains 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
Currently shards computation are not correctly aligned between ingester and storage causing bad metric results. - Fixed the hash caculation which was missing the metric name `logs`. - Revert some changes from grafana@5f0e245 which was not keeping the alignement of shards. For example if the shard is 9 of 16 total, then it should also be 9 and 25 of 32. The previous commit was trying to use 10 and 11 of 32. Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
sandeepsukhani
approved these changes
Aug 3, 2021
Comment on lines
-28
to
-47
| {32, &astmapper.ShardAnnotation{Shard: 0, Of: 16}, []uint32{0, 1}}, | ||
| {32, &astmapper.ShardAnnotation{Shard: 4, Of: 16}, []uint32{8, 9}}, | ||
| {32, &astmapper.ShardAnnotation{Shard: 15, Of: 16}, []uint32{30, 31}}, | ||
| {64, &astmapper.ShardAnnotation{Shard: 15, Of: 16}, []uint32{60, 61, 62, 63}}, | ||
|
|
||
| // schema factor is a larger multiple of idx factor | ||
| {16, &astmapper.ShardAnnotation{Shard: 0, Of: 32}, []uint32{0}}, | ||
| {16, &astmapper.ShardAnnotation{Shard: 4, Of: 32}, []uint32{2}}, | ||
| {16, &astmapper.ShardAnnotation{Shard: 15, Of: 32}, []uint32{7}}, | ||
|
|
||
| // idx factor smaller but not a multiple of schema factor | ||
| {4, &astmapper.ShardAnnotation{Shard: 0, Of: 5}, []uint32{0}}, | ||
| {4, &astmapper.ShardAnnotation{Shard: 1, Of: 5}, []uint32{0, 1}}, | ||
| {4, &astmapper.ShardAnnotation{Shard: 4, Of: 5}, []uint32{3}}, | ||
|
|
||
| // schema factor smaller but not a multiple of idx factor | ||
| {8, &astmapper.ShardAnnotation{Shard: 0, Of: 5}, []uint32{0, 1}}, | ||
| {8, &astmapper.ShardAnnotation{Shard: 2, Of: 5}, []uint32{3, 4}}, | ||
| {8, &astmapper.ShardAnnotation{Shard: 3, Of: 5}, []uint32{4, 5, 6}}, | ||
| {8, &astmapper.ShardAnnotation{Shard: 4, Of: 5}, []uint32{6, 7}}, |
There was a problem hiding this comment.
We don't have a check for Of to be a multiple of totalShards. Do we want to keep these tests or add a check for it?
There was a problem hiding this comment.
I don't think we need those. Ingester and storage uses respectively always 16 and 32. I don't think the storage will change soon enough.
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
cyriltovena
added a commit
that referenced
this pull request
Aug 3, 2021
* Fixes unaligned shards between ingesters and storage. Currently shards computation are not correctly aligned between ingester and storage causing bad metric results. - Fixed the hash caculation which was missing the metric name `logs`. - Revert some changes from 5f0e245 which was not keeping the alignement of shards. For example if the shard is 9 of 16 total, then it should also be 9 and 25 of 32. The previous commit was trying to use 10 and 11 of 32. Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com> * better tests. Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
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.
Currently shards computation are not correctly aligned between ingester and storage causing bad metric results.
logs.For example if the shard is 9 of 16 total, then it should also be 9 and 25 of 32. The previous commit was trying to use 10 and 11 of 32.
/cc @owen-d @sandeepsukhani
Signed-off-by: Cyril Tovena cyril.tovena@gmail.com