store gateway: fix merge fetched postings with lazy postings #7979
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
Signed-off-by: Ben Ye <[email protected]>
yeya24
commented
Dec 10, 2024
| @@ -313,7 +325,7 @@ func fetchAndExpandPostingGroups(ctx context.Context, r *bucketIndexReader, post | |||
| var groupAdds, groupRemovals []index.Postings | |||
| for _, g := range postingGroups { | |||
| if g.lazy { | |||
| break | |||
| continue | |||
There was a problem hiding this comment.
This is the crux...
We break the for loop before when group is lazy but now we continue
yeya24
commented
Dec 10, 2024
| }, | ||
| expectedSeriesRefs: []storage.SeriesRef{1, 2, 3, 4, 5}, | ||
| }, | ||
| { |
There was a problem hiding this comment.
This test case will fail on main
harry671003
approved these changes
Dec 10, 2024
|
Good catch! thanks |
alanprot
approved these changes
Dec 10, 2024
|
Given the approvals from @harry671003 and @alanprot, I will go ahead and merge this fix |
3 tasks
MichaHoffmann
pushed a commit
that referenced
this pull request
Dec 16, 2024
Signed-off-by: Ben Ye <[email protected]>
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.
Changes
When fetching postings at Store Gateway, we sort posting groups by their cardinality and then fetch postings for each groups. And when a posting group is marked as lazy, then all posting groups have higher cardinality are also marked as lazy.
But since #7961, we start to mark posting groups to lazy if they fetch a lot of keys, which means we can have non consecutive lazy posting groups.
This introduces a bug in
fetchAndExpandPostingGroupswhere we stop expanding postings when encoutering the first lazy posting group. We lack testing for this code so I extract that part of logic tomergeFetchedPostingsand create a testTestMergeFetchedPostingsto cover it.Verification