Check series limit after combining all series from ingesters

bboreham · bboreham · commit 0a08d5a9b822 · 2021-02-25T09:15:46.000Z
Signed-off-by: Bryan Boreham &lt;bjboreham@gmail.com&gt;
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)),

Original file line number	Diff line number	Diff line change
`@@ -249,6 +249,10 @@ func (d *Distributor) queryIngesterStream(ctx context.Context, userID string, re`
`249`	`249`	`}`
`250`	`250`	`}`
`251`	`251`
	`252`	`+ if len(hashToChunkseries) > maxSeries \|\| len(hashToTimeSeries) > maxSeries {`
	`253`	`+ return nil, fmt.Errorf("exceeded maximum number of series in a query (limit %d)", maxSeries)`
	`254`	`+ }`
	`255`	`+`
`252`	`256`	`resp := &ingester_client.QueryStreamResponse{`
`253`	`257`	`Chunkseries: make([]ingester_client.TimeSeriesChunk, 0, len(hashToChunkseries)),`
`254`	`258`	`Timeseries: make([]ingester_client.TimeSeries, 0, len(hashToTimeSeries)),`