Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

helm: align grpc server connection lifetime settings with jsonnet #7269

Merged
merged 2 commits into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,6 @@ patches:
name: 'alertmanager|compactor|ingester|overrides-exporter|querier|query-frontend|query-scheduler|ruler|store-gateway'
patch: |-
# Only applied to distributors in jsonnet, remove from the rest
- op: remove
path: /config/server/grpc_server_max_connection_age
- op: remove
path: /config/server/grpc_server_max_connection_age_grace
- op: remove
path: /config/server/grpc_server_max_connection_idle

Expand Down
1 change: 1 addition & 0 deletions operations/helm/charts/mimir-distributed/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Entries should include a reference to the Pull Request that introduced the chang
* `-compactor.ring.heartbeat-period` set to `1m`
* `-compactor.ring.heartbeat-timeout` set to `4m`
* [CHANGE] Ruler: Set `-distributor.remote-timeout` to 10s in order to accommodate writing large rule results to the ingester. #7143
* [CHANGE] Remove `-server.grpc.keepalive.max-connection-age` and `-server.grpc.keepalive.max-connection-age-grace` from default config. The configuration now applied directly to distributor, fixing parity with jsonnet. #7269
* [ENHANCEMENT] Add `jaegerReporterMaxQueueSize` Helm value for all components where configuring `JAEGER_REPORTER_MAX_QUEUE_SIZE` makes sense, and override the Jaeger client's default value of 100 for components expected to generate many trace spans. #7068 #7086 #7259
* [ENHANCEMENT] Rollout-operator: upgraded to v0.10.1. #7125
* [ENHANCEMENT] Query-frontend: configured `-shutdown-delay`, `-server.grpc.keepalive.max-connection-age` and termination grace period to reduce the likelihood of queries hitting terminated query-frontends. #7129
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ spec:
- "-target=distributor"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
# Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
- "-server.grpc.keepalive.max-connection-age=2m"
- "-server.grpc.keepalive.max-connection-age-grace=5m"
{{- if .Values.ingester.zoneAwareReplication.migration.enabled }}
{{- if not .Values.ingester.zoneAwareReplication.migration.writePath }}
- "-ingester.ring.zone-awareness-enabled=false"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ spec:
- "-target=query-scheduler"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
- "-server.grpc.keepalive.max-connection-age=2562047h" # 100000 days, effectively infinity
krajorama marked this conversation as resolved.
Show resolved Hide resolved
- "-server.grpc.keepalive.max-connection-age-grace=2562047h" # 100000 days, effectively infinity
{{- range $key, $value := .Values.query_scheduler.extraArgs }}
- "-{{ $key }}={{ $value }}"
{{- end }}
Expand Down
2 changes: 0 additions & 2 deletions operations/helm/charts/mimir-distributed/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -375,8 +375,6 @@ mimir:
file: /var/{{ include "mimir.name" . }}/runtime.yaml

server:
grpc_server_max_connection_age: 2m
grpc_server_max_connection_age_grace: 5m
grpc_server_max_connection_idle: 1m

store_gateway:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ spec:
- "-target=distributor"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
# Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
- "-server.grpc.keepalive.max-connection-age=2m"
- "-server.grpc.keepalive.max-connection-age-grace=5m"
volumeMounts:

- mountPath: /certs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,6 @@ data:
runtime_config:
file: /var/mimir/runtime.yaml
server:
grpc_server_max_connection_age: 2m
grpc_server_max_connection_age_grace: 5m
grpc_server_max_connection_idle: 1m
grpc_tls_config:
cert_file: /certs/tls.crt
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ spec:
- "-target=query-scheduler"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
- "-server.grpc.keepalive.max-connection-age=2562047h" # 100000 days, effectively infinity
- "-server.grpc.keepalive.max-connection-age-grace=2562047h" # 100000 days, effectively infinity
volumeMounts:

- mountPath: /certs
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ spec:
- "-target=distributor"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
# Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
- "-server.grpc.keepalive.max-connection-age=2m"
- "-server.grpc.keepalive.max-connection-age-grace=5m"
volumeMounts:
- name: config
mountPath: /etc/mimir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,6 @@ data:
runtime_config:
file: /var/mimir/runtime.yaml
server:
grpc_server_max_connection_age: 2m
grpc_server_max_connection_age_grace: 5m
grpc_server_max_connection_idle: 1m
store_gateway:
sharding_ring:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ spec:
- "-target=query-scheduler"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
- "-server.grpc.keepalive.max-connection-age=2562047h" # 100000 days, effectively infinity
- "-server.grpc.keepalive.max-connection-age-grace=2562047h" # 100000 days, effectively infinity
volumeMounts:
- name: runtime-config
mountPath: /var/mimir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ spec:
- "-target=distributor"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
# Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
- "-server.grpc.keepalive.max-connection-age=2m"
- "-server.grpc.keepalive.max-connection-age-grace=5m"
volumeMounts:
- name: config
mountPath: /etc/mimir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,6 @@ data:
runtime_config:
file: /var/mimir/runtime.yaml
server:
grpc_server_max_connection_age: 2m
grpc_server_max_connection_age_grace: 5m
grpc_server_max_connection_idle: 1m
store_gateway:
sharding_ring:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ spec:
- "-target=query-scheduler"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
- "-server.grpc.keepalive.max-connection-age=2562047h" # 100000 days, effectively infinity
- "-server.grpc.keepalive.max-connection-age-grace=2562047h" # 100000 days, effectively infinity
volumeMounts:
- name: runtime-config
mountPath: /var/mimir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ spec:
- "-target=distributor"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
# Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
- "-server.grpc.keepalive.max-connection-age=2m"
- "-server.grpc.keepalive.max-connection-age-grace=5m"
volumeMounts:
- name: config
mountPath: /etc/mimir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,6 @@ data:
runtime_config:
file: /var/mimir/runtime.yaml
server:
grpc_server_max_connection_age: 2m
grpc_server_max_connection_age_grace: 5m
grpc_server_max_connection_idle: 1m
store_gateway:
sharding_ring:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ spec:
- "-target=query-scheduler"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
- "-server.grpc.keepalive.max-connection-age=2562047h" # 100000 days, effectively infinity
- "-server.grpc.keepalive.max-connection-age-grace=2562047h" # 100000 days, effectively infinity
volumeMounts:
- name: runtime-config
mountPath: /var/mimir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ spec:
- "-target=distributor"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
# Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
- "-server.grpc.keepalive.max-connection-age=2m"
- "-server.grpc.keepalive.max-connection-age-grace=5m"
volumeMounts:
- name: config
mountPath: /etc/mimir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@ data:
runtime_config:
file: /var/mimir/runtime.yaml
server:
grpc_server_max_connection_age: 2m
grpc_server_max_connection_age_grace: 5m
grpc_server_max_connection_idle: 1m
store_gateway:
sharding_ring:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ spec:
- "-target=query-scheduler"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
- "-server.grpc.keepalive.max-connection-age=2562047h" # 100000 days, effectively infinity
- "-server.grpc.keepalive.max-connection-age-grace=2562047h" # 100000 days, effectively infinity
volumeMounts:
- name: runtime-config
mountPath: /var/mimir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ spec:
- "-target=distributor"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
# Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
- "-server.grpc.keepalive.max-connection-age=2m"
- "-server.grpc.keepalive.max-connection-age-grace=5m"
volumeMounts:
- name: config
mountPath: /etc/mimir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,6 @@ data:
runtime_config:
file: /var/mimir/runtime.yaml
server:
grpc_server_max_connection_age: 2m
grpc_server_max_connection_age_grace: 5m
grpc_server_max_connection_idle: 1m
store_gateway:
sharding_ring:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ spec:
- "-target=query-scheduler"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
- "-server.grpc.keepalive.max-connection-age=2562047h" # 100000 days, effectively infinity
- "-server.grpc.keepalive.max-connection-age-grace=2562047h" # 100000 days, effectively infinity
volumeMounts:
- name: runtime-config
mountPath: /var/mimir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ spec:
- "-target=distributor"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
# Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
- "-server.grpc.keepalive.max-connection-age=2m"
- "-server.grpc.keepalive.max-connection-age-grace=5m"
volumeMounts:
- name: config
mountPath: /etc/mimir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,6 @@ data:
runtime_config:
file: /var/mimir/runtime.yaml
server:
grpc_server_max_connection_age: 2m
grpc_server_max_connection_age_grace: 5m
grpc_server_max_connection_idle: 1m
store_gateway:
sharding_ring:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ spec:
- "-target=query-scheduler"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
- "-server.grpc.keepalive.max-connection-age=2562047h" # 100000 days, effectively infinity
- "-server.grpc.keepalive.max-connection-age-grace=2562047h" # 100000 days, effectively infinity
volumeMounts:
- name: runtime-config
mountPath: /var/mimir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ spec:
- "-target=distributor"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
# Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
- "-server.grpc.keepalive.max-connection-age=2m"
- "-server.grpc.keepalive.max-connection-age-grace=5m"
volumeMounts:
- name: config
mountPath: /etc/mimir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ data:
runtime_config:
file: /var/mimir/runtime.yaml
server:
grpc_server_max_connection_age: 2m
grpc_server_max_connection_age_grace: 5m
grpc_server_max_connection_idle: 1m
store_gateway:
sharding_ring:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ spec:
- "-target=query-scheduler"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
- "-server.grpc.keepalive.max-connection-age=2562047h" # 100000 days, effectively infinity
- "-server.grpc.keepalive.max-connection-age-grace=2562047h" # 100000 days, effectively infinity
volumeMounts:
- name: runtime-config
mountPath: /var/mimir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ spec:
- "-target=distributor"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
# Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
- "-server.grpc.keepalive.max-connection-age=2m"
- "-server.grpc.keepalive.max-connection-age-grace=5m"
volumeMounts:
- name: config
mountPath: /etc/mimir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@ data:
runtime_config:
file: /var/mimir/runtime.yaml
server:
grpc_server_max_connection_age: 2m
grpc_server_max_connection_age_grace: 5m
grpc_server_max_connection_idle: 1m
store_gateway:
sharding_ring:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ spec:
- "-target=query-scheduler"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
- "-server.grpc.keepalive.max-connection-age=2562047h" # 100000 days, effectively infinity
- "-server.grpc.keepalive.max-connection-age-grace=2562047h" # 100000 days, effectively infinity
volumeMounts:
- name: runtime-config
mountPath: /var/mimir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ spec:
- "-target=distributor"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
# Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
- "-server.grpc.keepalive.max-connection-age=2m"
- "-server.grpc.keepalive.max-connection-age-grace=5m"
volumeMounts:
- name: config
mountPath: /etc/mimir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,6 @@ data:
runtime_config:
file: /var/mimir/runtime.yaml
server:
grpc_server_max_connection_age: 2m
grpc_server_max_connection_age_grace: 5m
grpc_server_max_connection_idle: 1m
store_gateway:
sharding_ring:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ spec:
- "-target=query-scheduler"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
- "-server.grpc.keepalive.max-connection-age=2562047h" # 100000 days, effectively infinity
- "-server.grpc.keepalive.max-connection-age-grace=2562047h" # 100000 days, effectively infinity
volumeMounts:
- name: runtime-config
mountPath: /var/mimir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ spec:
- "-target=distributor"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
# Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
- "-server.grpc.keepalive.max-connection-age=2m"
- "-server.grpc.keepalive.max-connection-age-grace=5m"
volumeMounts:
- name: config
mountPath: /etc/mimir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,6 @@ data:
runtime_config:
file: /var/mimir/runtime.yaml
server:
grpc_server_max_connection_age: 2m
grpc_server_max_connection_age_grace: 5m
grpc_server_max_connection_idle: 1m
store_gateway:
sharding_ring:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ spec:
- "-target=query-scheduler"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
- "-server.grpc.keepalive.max-connection-age=2562047h" # 100000 days, effectively infinity
- "-server.grpc.keepalive.max-connection-age-grace=2562047h" # 100000 days, effectively infinity
volumeMounts:
- name: runtime-config
mountPath: /var/mimir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ spec:
- "-target=distributor"
- "-config.expand-env=true"
- "-config.file=/etc/mimir/mimir.yaml"
# Force gRPC clients connecting to distributor to reconnect periodically in order to have them re-resolve endpoints and discover new replicas.
- "-server.grpc.keepalive.max-connection-age=2m"
- "-server.grpc.keepalive.max-connection-age-grace=5m"
volumeMounts:
- name: config
mountPath: /etc/mimir
Expand Down
Loading
Loading