diff --git a/CHANGELOG.md b/CHANGELOG.md index 6079be9c880..e5283e4d9b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ * [ENHANCEMENT] Query-frontend: track query HTTP requests in the Activity Tracker. #3561 * [BUGFIX] Log the names of services that are not yet running rather than `unsupported value type` when calling `/ready` and some services are not running. #3625 * [BUGFIX] Alertmanager: Fix template spurious deletion with relative data dir. #3604 +* [BUGFIX] Querier: Remove assertion that the `-querier.max-concurrent` flag must also be set for the query-frontend. #3678 ### Mixin diff --git a/cmd/mimir/config-descriptor.json b/cmd/mimir/config-descriptor.json index 712ae88337a..af2d5e92d79 100644 --- a/cmd/mimir/config-descriptor.json +++ b/cmd/mimir/config-descriptor.json @@ -1863,7 +1863,7 @@ "kind": "field", "name": "max_concurrent", "required": false, - "desc": "The maximum number of concurrent queries. This config option should be set on query-frontend too when query sharding is enabled.", + "desc": "The maximum number of concurrent queries.", "fieldValue": null, "fieldDefaultValue": 20, "fieldFlag": "querier.max-concurrent", diff --git a/cmd/mimir/help-all.txt.tmpl b/cmd/mimir/help-all.txt.tmpl index 550cc906fac..62d8d324637 100644 --- a/cmd/mimir/help-all.txt.tmpl +++ b/cmd/mimir/help-all.txt.tmpl @@ -1248,7 +1248,7 @@ Usage of ./cmd/mimir/mimir: -querier.lookback-delta duration Time since the last sample after which a time series is considered stale and ignored by expression evaluations. This config option should be set on query-frontend too when query sharding is enabled. (default 5m0s) -querier.max-concurrent int - The maximum number of concurrent queries. This config option should be set on query-frontend too when query sharding is enabled. (default 20) + The maximum number of concurrent queries. (default 20) -querier.max-fetched-chunk-bytes-per-query int The maximum size of all chunks in bytes that a query can fetch from each ingester and storage. This limit is enforced in the querier and ruler. 0 to disable. -querier.max-fetched-chunks-per-query int diff --git a/cmd/mimir/help.txt.tmpl b/cmd/mimir/help.txt.tmpl index f754a69aae1..41cbfa0d429 100644 --- a/cmd/mimir/help.txt.tmpl +++ b/cmd/mimir/help.txt.tmpl @@ -382,7 +382,7 @@ Usage of ./cmd/mimir/mimir: -querier.label-values-max-cardinality-label-names-per-request int Maximum number of label names allowed to be queried in a single /api/v1/cardinality/label_values API call. (default 100) -querier.max-concurrent int - The maximum number of concurrent queries. This config option should be set on query-frontend too when query sharding is enabled. (default 20) + The maximum number of concurrent queries. (default 20) -querier.max-fetched-chunk-bytes-per-query int The maximum size of all chunks in bytes that a query can fetch from each ingester and storage. This limit is enforced in the querier and ruler. 0 to disable. -querier.max-fetched-chunks-per-query int diff --git a/docs/sources/mimir/operators-guide/configure/reference-configuration-parameters/index.md b/docs/sources/mimir/operators-guide/configure/reference-configuration-parameters/index.md index 82acd24d844..c0d30c5314f 100644 --- a/docs/sources/mimir/operators-guide/configure/reference-configuration-parameters/index.md +++ b/docs/sources/mimir/operators-guide/configure/reference-configuration-parameters/index.md @@ -960,8 +960,7 @@ store_gateway_client: # CLI flag: -querier.shuffle-sharding-ingesters-enabled [shuffle_sharding_ingesters_enabled: | default = true] -# The maximum number of concurrent queries. This config option should be set on -# query-frontend too when query sharding is enabled. +# The maximum number of concurrent queries. # CLI flag: -querier.max-concurrent [max_concurrent: | default = 20] diff --git a/pkg/querier/engine/config.go b/pkg/querier/engine/config.go index 399a047c84a..1bee63afb58 100644 --- a/pkg/querier/engine/config.go +++ b/pkg/querier/engine/config.go @@ -39,7 +39,7 @@ func (cfg *Config) RegisterFlags(f *flag.FlagSet) { return help + "This config option should be set on query-frontend too when query sharding is enabled." } - f.IntVar(&cfg.MaxConcurrent, "querier.max-concurrent", 20, sharedWithQueryFrontend("The maximum number of concurrent queries.")) + f.IntVar(&cfg.MaxConcurrent, "querier.max-concurrent", 20, "The maximum number of concurrent queries.") f.DurationVar(&cfg.Timeout, "querier.timeout", 2*time.Minute, sharedWithQueryFrontend("The timeout for a query.")+" This also applies to queries evaluated by the ruler (internally or remotely).") f.IntVar(&cfg.MaxSamples, "querier.max-samples", 50e6, sharedWithQueryFrontend("Maximum number of samples a single query can load into memory.")) f.DurationVar(&cfg.DefaultEvaluationInterval, "querier.default-evaluation-interval", time.Minute, sharedWithQueryFrontend("The default evaluation interval or step size for subqueries."))