fixup! Bloom Gateway: Partition requests into multiple tasks

Signed-off-by: Christian Haudum <[email protected]>
grafana · Jan 24, 2024 · 5168b07 · 5168b07
1 parent 42ec9ca
commit 5168b07
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/pkg/bloomgateway/bloomgateway.go b/pkg/bloomgateway/bloomgateway.go
@@ -340,8 +340,7 @@ func (g *Gateway) FilterChunkRefs(ctx context.Context, req *logproto.FilterChunk
 		expectedResponses += len(seriesWithBounds.series)
 	}
 
-	// no chunks in bounds => empty response
-	if req.From.Equal(req.Through) {
+	if len(tasks) == 0 {
 		return &logproto.FilterChunkRefResponse{
 			ChunkRefs: []*logproto.GroupedChunkRefs{},
 		}, nil

diff --git a/pkg/bloomgateway/worker.go b/pkg/bloomgateway/worker.go
@@ -180,13 +180,13 @@ func (w *worker) running(ctx context.Context) error {
 					continue
 				}
 
-				boundedRefs := partitionFingerprintRange(tasks, blockRefs)
+				tasksForBlocks := partitionFingerprintRange(tasks, blockRefs)
 				blockRefs = blockRefs[:0]
-				for _, b := range boundedRefs {
+				for _, b := range tasksForBlocks {
 					blockRefs = append(blockRefs, b.blockRef)
 				}
 
-				err = w.processBlocksWithCallback(taskCtx, tasks[0].Tenant, day, blockRefs, boundedRefs)
+				err = w.processBlocksWithCallback(taskCtx, tasks[0].Tenant, day, blockRefs, tasksForBlocks)
 				if err != nil {
 					for _, t := range tasks {
 						t.ErrCh <- err