Skip to content

Commit

Permalink
Revert "Ops: Also set server.grpc-max-send-msg-size-bytes on ruler-qu…
Browse files Browse the repository at this point in the history
…eriers (grafana#10208)"

This reverts commit d84dccb.
  • Loading branch information
jhesketh committed Dec 11, 2024
1 parent d598978 commit 243fe2e
Show file tree
Hide file tree
Showing 23 changed files with 0 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1155,7 +1155,6 @@ spec:
- -query-frontend.results-cache.memcached.timeout=500ms
- -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
1 change: 0 additions & 1 deletion operations/mimir-tests/test-autoscaling-generated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1155,7 +1155,6 @@ spec:
- -query-frontend.results-cache.memcached.timeout=500ms
- -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1509,7 +1509,6 @@ spec:
- -query-frontend.results-cache.memcached.timeout=500ms
- -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1509,7 +1509,6 @@ spec:
- -query-frontend.results-cache.memcached.timeout=500ms
- -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1509,7 +1509,6 @@ spec:
- -query-frontend.results-cache.memcached.timeout=500ms
- -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1409,7 +1409,6 @@ spec:
- -query-frontend.results-cache.memcached.timeout=500ms
- -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1482,7 +1482,6 @@ spec:
- -query-frontend.results-cache.memcached.timeout=500ms
- -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1486,7 +1486,6 @@ spec:
- -query-frontend.results-cache.memcached.timeout=500ms
- -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1486,7 +1486,6 @@ spec:
- -query-frontend.results-cache.memcached.timeout=500ms
- -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1495,7 +1495,6 @@ spec:
- -query-frontend.results-cache.memcached.timeout=500ms
- -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1517,7 +1517,6 @@ spec:
- -query-frontend.results-cache.memcached.timeout=500ms
- -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1515,7 +1515,6 @@ spec:
- -query-frontend.results-cache.memcached.timeout=500ms
- -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1515,7 +1515,6 @@ spec:
- -query-frontend.results-cache.memcached.timeout=500ms
- -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1515,7 +1515,6 @@ spec:
- -query-frontend.results-cache.memcached.timeout=500ms
- -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1446,7 +1446,6 @@ spec:
- -query-frontend.results-cache.memcached.timeout=500ms
- -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1450,7 +1450,6 @@ spec:
- -query-frontend.results-cache.memcached.timeout=500ms
- -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1450,7 +1450,6 @@ spec:
- -query-frontend.results-cache.memcached.timeout=500ms
- -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1427,7 +1427,6 @@ spec:
- -query-frontend.results-cache.memcached.timeout=500ms
- -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1509,7 +1509,6 @@ spec:
- -query-frontend.results-cache.memcached.timeout=500ms
- -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1206,7 +1206,6 @@ spec:
- -query-scheduler.ring.store=memberlist
- -query-scheduler.service-discovery-mode=ring
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1161,7 +1161,6 @@ spec:
- -query-frontend.results-cache.memcached.timeout=500ms
- -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1159,7 +1159,6 @@ spec:
- -query-frontend.results-cache.memcached.timeout=500ms
- -query-frontend.scheduler-address=ruler-query-scheduler-discovery.default.svc.cluster.local.:9095
- -runtime-config.file=/etc/mimir/overrides.yaml
- -server.grpc-max-recv-msg-size-bytes=104857600
- -server.grpc-max-send-msg-size-bytes=104857600
- -server.grpc.keepalive.max-connection-age=30s
- -server.grpc.keepalive.max-connection-age-grace=5m
Expand Down
6 changes: 0 additions & 6 deletions operations/mimir/ruler-remote-evaluation.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,8 @@
$.querier_args +
$.querierUseQuerySchedulerArgs(rulerQuerySchedulerName) + {
'querier.max-concurrent': $._config.ruler_querier_max_concurrency,
} + if !useRulerQueryFrontend then {} else {
// The ruler-querier sends a query response back to the ruler-query-frontend
'querier.frontend-client.grpc-max-send-msg-size': $._config.ruler_remote_evaluation_max_query_response_size_bytes,
},


ruler_querier_env_map:: $.querier_env_map {
// Do not dynamically set GOMAXPROCS for ruler-querier. We don't expect ruler-querier resources
// utilization to be spiky, and we want to reduce the risk rule evaluations are getting delayed.
Expand Down Expand Up @@ -72,8 +68,6 @@
// Result caching is of no benefit to rule evaluation, but the cache can be used for storing cardinality estimates.
'query-frontend.cache-results': false,

// The ruler-query-frontend receives the query response back from the ruler-querier.
'server.grpc-max-recv-msg-size-bytes': $._config.ruler_remote_evaluation_max_query_response_size_bytes,
// The ruler-query-frontend sends the query response back to the ruler.
'server.grpc-max-send-msg-size-bytes': $._config.ruler_remote_evaluation_max_query_response_size_bytes,
},
Expand Down

0 comments on commit 243fe2e

Please sign in to comment.