store-gateway: use streaming for skipchunks requests #12818
Merged
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
56quarters
force-pushed
the
56quarters/stream-only-2
branch
4 times, most recently
from
3fd5299 to
f31cf68
Compare
This changes store-gateways to use the streaming code path for requests where chunks are not sent. This provides the same results to queriers since they already know how to parse the streaming response and allows us to remove the non-streaming code path in the store-gateway. Notably however, this change does not remove any of the non-streaming code from queriers. This is required to avoid failing requests during a rollout. When queriers make requests without chunks to new store- gateways, the streaming code path will be used and queriers will be able to parse the result. When requests without chunks are made to older store-gateways the non-streaming code path will be used which queriers are still able to parse the result of. Part of #12673 Signed-off-by: Nick Pillitteri <nick.pillitteri@grafana.com>
56quarters
force-pushed
the
56quarters/stream-only-2
branch
from
f31cf68 to
5d5dc90
Compare
charleskorn
reviewed
Oct 1, 2025
| } | ||
|
|
||
| if req.StreamingChunksBatchSize > 0 && !req.SkipChunks { | ||
| if !req.SkipChunks { |
There was a problem hiding this comment.
[nit] Rather than having if !req.SkipChunks { A } else { B }, what if we flipped this around to avoid the negation (ie. if req.SkipChunks { B } else { A })?
pkg/storegateway/bucket.go
Outdated
Comment on lines
608
to
609
| }() | ||
| defer func() { |
There was a problem hiding this comment.
[nit] Any reason to have these as separate defers?
pkg/storegateway/bucket.go
Outdated
| // and hit the limit prematurely. | ||
| chunksLimiter := s.chunksLimiterFactory(s.metrics.queriesDropped.WithLabelValues("chunks")) | ||
| seriesLimiter := s.seriesLimiterFactory(s.metrics.queriesDropped.WithLabelValues("series")) | ||
| if !req.SkipChunks { |
There was a problem hiding this comment.
Given we don't do anything other than return after this if block, what if we invert the condition and return early if req.SkipChunks is true?
tacole02
approved these changes
Oct 2, 2025
Co-authored-by: Taylor C <41653732+tacole02@users.noreply.github.com>
Signed-off-by: Nick Pillitteri <nick.pillitteri@grafana.com>
charleskorn
approved these changes
Oct 3, 2025
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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
This changes store-gateways to use the streaming code path for requests where chunks are not sent. This provides the same results to queriers since they already know how to parse the streaming response and allows us to remove the non-streaming code path in the store-gateway.
Notably however, this change does not remove any of the non-streaming code from queriers. This is required to avoid failing requests during a rollout. When queriers make requests without chunks to new store-gateways, the streaming code path will be used and queriers will be able to parse the result. When requests without chunks are made to older store-gateways the non-streaming code path will be used which queriers are still able to parse the result of.
Which issue(s) this PR fixes or relates to
Part of #12673
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]. If changelog entry is not needed, please add thechangelog-not-neededlabel to the PR.about-versioning.mdupdated with experimental features.