From b19c5491cd744b059534534daa6ba902c48e3468 Mon Sep 17 00:00:00 2001 From: Ben Ye Date: Sun, 17 Nov 2024 09:59:51 -0800 Subject: [PATCH 1/2] always close block series client at the end Signed-off-by: Ben Ye --- pkg/store/bucket.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/store/bucket.go b/pkg/store/bucket.go index 963de83fbe5..280683774fc 100644 --- a/pkg/store/bucket.go +++ b/pkg/store/bucket.go @@ -1572,6 +1572,8 @@ func (s *BucketStore) Series(req *storepb.SeriesRequest, seriesSrv storepb.Store tenant, ) + defer blockClient.Close() + g.Go(func() error { span, _ := tracing.StartSpan(gctx, "bucket_store_block_series", tracing.Tags{ @@ -1687,7 +1689,6 @@ func (s *BucketStore) Series(req *storepb.SeriesRequest, seriesSrv storepb.Store } lt := NewProxyResponseLoserTree(respSets...) - defer lt.Close() // Merge the sub-results from each selected block. tracing.DoInSpan(ctx, "bucket_store_merge_all", func(ctx context.Context) { begin := time.Now() @@ -3379,7 +3380,6 @@ func (r *bucketIndexReader) Close() error { } func (b *blockSeriesClient) CloseSend() error { - b.Close() return nil } From 0b88496b0ccc1f7c3162f36ff7eb76f8d5cdbdc0 Mon Sep 17 00:00:00 2001 From: Ben Ye Date: Sun, 17 Nov 2024 10:19:18 -0800 Subject: [PATCH 2/2] add back close for loser tree Signed-off-by: Ben Ye --- pkg/store/bucket.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/store/bucket.go b/pkg/store/bucket.go index 280683774fc..d9940221ffd 100644 --- a/pkg/store/bucket.go +++ b/pkg/store/bucket.go @@ -1689,6 +1689,7 @@ func (s *BucketStore) Series(req *storepb.SeriesRequest, seriesSrv storepb.Store } lt := NewProxyResponseLoserTree(respSets...) + defer lt.Close() // Merge the sub-results from each selected block. tracing.DoInSpan(ctx, "bucket_store_merge_all", func(ctx context.Context) { begin := time.Now()