only skip bloom pages when there is no error

Signed-off-by: Owen Diehl <[email protected]>

Author: owen-d

pkg/storage/bloom/v1/block.go

@@ -144,7 +144,7 @@ func (bq *BlockQuerier) Seek(fp model.Fingerprint) error {
 func (bq *BlockQuerier) Next() bool {
 	for bq.series.Next() {
 		series := bq.series.At()
-		if ok := bq.blooms.LoadOffset(series.Offset); !ok {
+		if skip := bq.blooms.LoadOffset(series.Offset); skip {
 			// can't seek to the desired bloom, likely because the page was too large to load
 			// so we skip this series and move on to the next
 			continue

pkg/storage/bloom/v1/bloom.go

@@ -17,7 +17,6 @@ import (
 // gateways to OOM.
 // Figure out a decent default maximum page size that we can process.
 var DefaultMaxPageSize = 64 << 20 // 64MB
-var ErrPageTooLarge = errors.Errorf("bloom page too large")
 
 type Bloom struct {
 	filter.ScalableBloomFilter
@@ -290,7 +289,7 @@ func (b *BloomBlock) BloomPageDecoder(r io.ReadSeeker, pageIdx int, maxPageSize
 	if page.Len > maxPageSize {
 		metrics.pagesSkipped.WithLabelValues(pageTypeBloom, skipReasonTooLarge).Inc()
 		metrics.bytesSkipped.WithLabelValues(pageTypeBloom, skipReasonTooLarge).Add(float64(page.DecompressedLen))
-		return nil, true, ErrPageTooLarge
+		return nil, true, nil
 	}
 
 	if _, err = r.Seek(int64(page.Offset), io.SeekStart); err != nil {

pkg/storage/bloom/v1/bloom_querier.go

@@ -42,7 +42,9 @@ func (it *LazyBloomIter) ensureInit() {
 	}
 }
 
-func (it *LazyBloomIter) LoadOffset(offset BloomOffset) (ok bool) {
+// LoadOffset returns whether the bloom page at the given offset should
+// be skipped (due to being too large) _and_ there's no error
+func (it *LazyBloomIter) LoadOffset(offset BloomOffset) (skip bool) {
 	it.ensureInit()
 
 	// if we need a different page or the current page hasn't been loaded,
@@ -61,21 +63,22 @@ func (it *LazyBloomIter) LoadOffset(offset BloomOffset) (ok bool) {
 			return false
 		}
 		decoder, skip, err := it.b.blooms.BloomPageDecoder(r, offset.Page, it.m, it.b.metrics)
-		if skip {
-			return false
-		}
 		if err != nil {
 			it.err = errors.Wrap(err, "loading bloom page")
 			return false
 		}
 
+		if skip {
+			return true
+		}
+
 		it.curPageIndex = offset.Page
 		it.curPage = decoder
 
 	}
 
 	it.curPage.Seek(offset.ByteOffset)
-	return true
+	return false
 }
 
 func (it *LazyBloomIter) Next() bool {
@@ -107,16 +110,16 @@ func (it *LazyBloomIter) next() bool {
 				it.m,
 				it.b.metrics,
 			)
-			if skip {
-				// this page was skipped; check the next
-				it.curPageIndex++
-				continue
-			}
 			// this page wasn't skipped & produced an error, return
 			if err != nil {
 				it.err = err
 				return false
 			}
+			if skip {
+				// this page was skipped; check the next
+				it.curPageIndex++
+				continue
+			}
 		}
 
 		if !it.curPage.Next() {

pkg/storage/bloom/v1/fuse.go

@@ -99,11 +99,12 @@ func (fq *FusedQuerier) Run() error {
 		}
 
 		// Now that we've found the series, we need to find the unpack the bloom
-		ok := fq.bq.blooms.LoadOffset(series.Offset)
-		if !ok {
+		skip := fq.bq.blooms.LoadOffset(series.Offset)
+		if skip {
 			// could not seek to the desired bloom,
 			// likely because the page was too large to load
 			fq.noRemovals(nextBatch, fp)
+			continue
 		}
 
 		if !fq.bq.blooms.Next() {

pkg/storage/bloom/v1/fuse_test.go

@@ -229,10 +229,10 @@ func TestLazyBloomIter_Seek_ResetError(t *testing.T) {
 			seekable = false
 		}
 		if !seekable {
-			require.False(t, querier.blooms.LoadOffset(series.Offset))
+			require.True(t, querier.blooms.LoadOffset(series.Offset))
 			continue
 		}
-		require.True(t, querier.blooms.LoadOffset(series.Offset))
+		require.False(t, querier.blooms.LoadOffset(series.Offset))
 		require.True(t, querier.blooms.Next())
 		require.NoError(t, querier.blooms.Err())
 	}