From 8e5d5559220a4e15c1e48d22c13e438e483be83b Mon Sep 17 00:00:00 2001
From: Ben Ye <benye@amazon.com>
Date: Tue, 12 Sep 2023 16:08:48 -0700
Subject: [PATCH] remove retry on chunk pool exhaustion error for now

Signed-off-by: Ben Ye <benye@amazon.com>
---
 pkg/querier/blocks_store_queryable.go      |  2 --
 pkg/querier/blocks_store_queryable_test.go | 29 ----------------------
 2 files changed, 31 deletions(-)

diff --git a/pkg/querier/blocks_store_queryable.go b/pkg/querier/blocks_store_queryable.go
index d51438728f..49e8a31759 100644
--- a/pkg/querier/blocks_store_queryable.go
+++ b/pkg/querier/blocks_store_queryable.go
@@ -1121,8 +1121,6 @@ func isRetryableError(err error) bool {
 	case codes.Canceled:
 		return strings.Contains(err.Error(), "grpc: the client connection is closing")
 	// TODO(yeya24): change Thanos to use ResourceExhausted for chunk pool error.
-	case codes.Unknown:
-		return strings.Contains(err.Error(), "allocate chunk bytes")
 	default:
 		return false
 	}
diff --git a/pkg/querier/blocks_store_queryable_test.go b/pkg/querier/blocks_store_queryable_test.go
index fde2ca8b89..6ca1ea871c 100644
--- a/pkg/querier/blocks_store_queryable_test.go
+++ b/pkg/querier/blocks_store_queryable_test.go
@@ -667,35 +667,6 @@ func TestBlocksStoreQuerier_Select(t *testing.T) {
 				},
 			},
 		},
-		"multiple store-gateways has the block, but one of them fails to return due to chunk pool exhaustion": {
-			finderResult: bucketindex.Blocks{
-				{ID: block1},
-			},
-			storeSetResponses: []interface{}{
-				map[BlocksStoreClient][]ulid.ULID{
-					&storeGatewayClientMock{
-						remoteAddr:      "1.1.1.1",
-						mockedSeriesErr: status.Error(codes.Unknown, "load chunks: populate chunk: allocate chunk bytes: pool exhausted"),
-					}: {block1},
-				},
-				map[BlocksStoreClient][]ulid.ULID{
-					&storeGatewayClientMock{remoteAddr: "2.2.2.2", mockedSeriesResponses: []*storepb.SeriesResponse{
-						mockSeriesResponse(labels.Labels{metricNameLabel, series1Label}, minT, 2),
-						mockHintsResponse(block1),
-					}}: {block1},
-				},
-			},
-			limits:       &blocksStoreLimitsMock{},
-			queryLimiter: noOpQueryLimiter,
-			expectedSeries: []seriesResult{
-				{
-					lbls: labels.New(metricNameLabel, series1Label),
-					values: []valueResult{
-						{t: minT, v: 2},
-					},
-				},
-			},
-		},
 		"all store-gateways return PermissionDenied": {
 			finderResult: bucketindex.Blocks{
 				{ID: block1},