fix(blooms): Reset error on LazyBloomIter.Seek #12806
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
chaudum
reviewed
Apr 26, 2024
| @@ -45,6 +45,9 @@ func (it *LazyBloomIter) ensureInit() { | |||
| func (it *LazyBloomIter) Seek(offset BloomOffset) { | |||
| it.ensureInit() | |||
|
|
|||
| // reset error from any previous seek/next | |||
| it.err = nil | |||
There was a problem hiding this comment.
I don't think we should reset the error unconditionally, e.g we should not continue seeking after IO error.
Instead, we probably want to check the error type, similar to what the do here https://github.com/grafana/loki/pull/12297/files#diff-ad299f9ea738f6f6d8e1a3b9fcc651506b3a241dbfbd95a60ab9d96b5b8b4d4aR156
There was a problem hiding this comment.
Yes, I agree. Thank you!
chaudum
approved these changes
Apr 26, 2024
|
|
||
| if fp == 0 || fp == 2 { | ||
| require.False(t, querier.blooms.Next()) | ||
| require.Error(t, querier.blooms.Err()) |
There was a problem hiding this comment.
Should we also check the error type here?
chaudum
pushed a commit
that referenced
this pull request
Apr 30, 2024
Followup to #12806 which exposes skipped pages more explicitly than as an error. * refactors skip logic for bloom pages that are too large * s/Seek/LoadOffset/ for LazyBloomIter * removes unused code
grafanabot
pushed a commit
that referenced
this pull request
Apr 30, 2024
shantanualsi
pushed a commit
that referenced
this pull request
May 6, 2024
Followup to #12806 which exposes skipped pages more explicitly than as an error. * refactors skip logic for bloom pages that are too large * s/Seek/LoadOffset/ for LazyBloomIter * removes unused code
This was referenced May 6, 2024
This was referenced May 27, 2024
This was referenced Jun 10, 2024
This was referenced Jul 3, 2024
Closed
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.
What this PR does / why we need it:
We are skipping all pages after any of the pages on a given block have failed due to being too big:
Seeka page that is too big.it.erris set hereloki/pkg/storage/bloom/v1/bloom_querier.go
Lines 66 to 68 in feb210b
then
it.Nextreturnfalsein this checkloki/pkg/storage/bloom/v1/bloom_querier.go
Lines 87 to 89 in feb210b
Seekanother page that should be valid. Decoding of the new page succeeds butSeekwon’t resetit.err. Therefore, the call toit.Nextreturnfalseagain.This PR fixes this by resetting
it.erron everySeek.Special notes for your reviewer:
Checklist
CONTRIBUTING.mdguide (required)docs/sources/setup/upgrade/_index.mdproduction/helm/loki/Chart.yamland updateproduction/helm/loki/CHANGELOG.mdandproduction/helm/loki/README.md. Example PRdeprecated-config.yamlanddeleted-config.yamlfiles respectively in thetools/deprecated-config-checkerdirectory. Example PR