Skip to content

Commit 5df8f37

Browse files
committed
remove retry on chunk pool exhaustion error for now
Signed-off-by: Ben Ye <[email protected]>
1 parent 9b79028 commit 5df8f37

File tree

2 files changed

+0
-31
lines changed

2 files changed

+0
-31
lines changed

pkg/querier/blocks_store_queryable.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,8 +1123,6 @@ func isRetryableError(err error) bool {
11231123
case codes.Canceled:
11241124
return strings.Contains(err.Error(), "grpc: the client connection is closing")
11251125
// TODO(yeya24): change Thanos to use ResourceExhausted for chunk pool error.
1126-
case codes.Unknown:
1127-
return strings.Contains(err.Error(), "allocate chunk bytes")
11281126
default:
11291127
return false
11301128
}

pkg/querier/blocks_store_queryable_test.go

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -668,35 +668,6 @@ func TestBlocksStoreQuerier_Select(t *testing.T) {
668668
},
669669
},
670670
},
671-
"multiple store-gateways has the block, but one of them fails to return due to chunk pool exhaustion": {
672-
finderResult: bucketindex.Blocks{
673-
{ID: block1},
674-
},
675-
storeSetResponses: []interface{}{
676-
map[BlocksStoreClient][]ulid.ULID{
677-
&storeGatewayClientMock{
678-
remoteAddr: "1.1.1.1",
679-
mockedSeriesErr: status.Error(codes.Unknown, "load chunks: populate chunk: allocate chunk bytes: pool exhausted"),
680-
}: {block1},
681-
},
682-
map[BlocksStoreClient][]ulid.ULID{
683-
&storeGatewayClientMock{remoteAddr: "2.2.2.2", mockedSeriesResponses: []*storepb.SeriesResponse{
684-
mockSeriesResponse(labels.Labels{metricNameLabel, series1Label}, minT, 2),
685-
mockHintsResponse(block1),
686-
}}: {block1},
687-
},
688-
},
689-
limits: &blocksStoreLimitsMock{},
690-
queryLimiter: noOpQueryLimiter,
691-
expectedSeries: []seriesResult{
692-
{
693-
lbls: labels.New(metricNameLabel, series1Label),
694-
values: []valueResult{
695-
{t: minT, v: 2},
696-
},
697-
},
698-
},
699-
},
700671
"all store-gateways return PermissionDenied": {
701672
finderResult: bucketindex.Blocks{
702673
{ID: block1},

0 commit comments

Comments
 (0)