Check series limit after combining all series from ingesters

Signed-off-by: Bryan Boreham <[email protected]>
cortexproject · Feb 25, 2021 · 0a08d5a · 0a08d5a
1 parent 052d265
commit 0a08d5a
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pkg/distributor/query.go b/pkg/distributor/query.go
@@ -249,6 +249,10 @@ func (d *Distributor) queryIngesterStream(ctx context.Context, userID string, re
 		}
 	}
 
+	if len(hashToChunkseries) > maxSeries || len(hashToTimeSeries) > maxSeries {
+		return nil, fmt.Errorf("exceeded maximum number of series in a query (limit %d)", maxSeries)
+	}
+
 	resp := &ingester_client.QueryStreamResponse{
 		Chunkseries: make([]ingester_client.TimeSeriesChunk, 0, len(hashToChunkseries)),
 		Timeseries:  make([]ingester_client.TimeSeries, 0, len(hashToTimeSeries)),