From 0a08d5a9b822f11ca7570e273201f407d7d50154 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 24 Feb 2021 18:22:02 +0000 Subject: [PATCH] Check series limit after combining all series from ingesters Signed-off-by: Bryan Boreham --- pkg/distributor/query.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/distributor/query.go b/pkg/distributor/query.go index d0d59e2f40..bc3f117b1d 100644 --- 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)),