Skip to content

Commit

Permalink
querier: Remove max concurrency reference to query-frontend
Browse files Browse the repository at this point in the history
Remove reference to query-frontend for flag -querier.max-concurrent,
since it's not used by the query-frontend any longer.

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
  • Loading branch information
aknuds1 committed Dec 8, 2022
1 parent 6298ca6 commit cf9db11
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion cmd/mimir/config-descriptor.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion cmd/mimir/help-all.txt.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/mimir/help.txt.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -960,8 +960,7 @@ store_gateway_client:
# CLI flag: -querier.shuffle-sharding-ingesters-enabled
[shuffle_sharding_ingesters_enabled: <boolean> | 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: <int> | default = 20]
Expand Down
2 changes: 1 addition & 1 deletion pkg/querier/engine/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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."))
Expand Down

0 comments on commit cf9db11

Please sign in to comment.