fix: query plan optimisation #3100
Merged
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
kolesnikovae
force-pushed
the
fix/overlap
branch
from
d871874 to
0e57889
Compare
kolesnikovae
commented
Mar 14, 2024
Comment on lines
+293
to
297
| // TODO(kolesnikovae): | ||
| // Expiry defaults to -querier.query-store-after which should be deprecated, | ||
| // blocks-storage.bucket-store.ignore-blocks-within can be used instead. | ||
| expiryTs := time.Now().Add(-dc.policy.Expiry) | ||
| return block.Uploaded && ulid.Time(block.ID.Time()).Before(expiryTs) |
There was a problem hiding this comment.
However, we also need to take into account that a new block does not become available to the store gateway immediately. I'd say that it probably makes sense to delay till the block max time is covered by blocks-storage.bucket-store.ignore-blocks-within + (2 * block-sync-interval)
aleks-p
approved these changes
Mar 14, 2024
kolesnikovae
commented
Mar 15, 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.
Fixes #3088.
The problem manifests when compactor does not keep up with the ingestion rate, and store-gateways load sharded L2 blocks (with duplicates).
Normally, L3 blocks supersede all the parent blocks in the query plan, and presence of L2 blocks does not pose any issues. However, when an L3 shard is incomplete, all its blocks are removed from the plan before this step, preserving L2 shards in the query plan (partial shards are ignored in the plan). This happens, when L3 compaction delay exceeds
blocks-storage.bucket-store.ignore-blocks-within. The way query plan is built expects that L2 blocks do not contain duplicate series, which is not true if blocks are shared. As a result, query returns duplicated data.