From 356e6bea329635b8ef7380dea015a3c9fa367edd Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 10 Aug 2022 09:14:36 +0100 Subject: [PATCH] update docs & help: two memberlist default changes --- cmd/mimir/config-descriptor.json | 4 ++-- cmd/mimir/help-all.txt.tmpl | 4 ++-- .../configure/reference-configuration-parameters/index.md | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/mimir/config-descriptor.json b/cmd/mimir/config-descriptor.json index 5993620f649..fdcd948c714 100644 --- a/cmd/mimir/config-descriptor.json +++ b/cmd/mimir/config-descriptor.json @@ -9900,7 +9900,7 @@ "required": false, "desc": "Timeout for leaving memberlist cluster.", "fieldValue": null, - "fieldDefaultValue": 5000000000, + "fieldDefaultValue": 20000000000, "fieldFlag": "memberlist.leave-timeout", "fieldType": "duration", "fieldCategory": "advanced" @@ -9942,7 +9942,7 @@ "required": false, "desc": "Timeout used when connecting to other nodes to send packet.", "fieldValue": null, - "fieldDefaultValue": 5000000000, + "fieldDefaultValue": 2000000000, "fieldFlag": "memberlist.packet-dial-timeout", "fieldType": "duration", "fieldCategory": "advanced" diff --git a/cmd/mimir/help-all.txt.tmpl b/cmd/mimir/help-all.txt.tmpl index b8916868e09..78fcd470898 100644 --- a/cmd/mimir/help-all.txt.tmpl +++ b/cmd/mimir/help-all.txt.tmpl @@ -1099,7 +1099,7 @@ Usage of ./cmd/mimir/mimir: -memberlist.join string Other cluster members to join. Can be specified multiple times. It can be an IP, hostname or an entry specified in the DNS Service Discovery format. -memberlist.leave-timeout duration - Timeout for leaving memberlist cluster. (default 5s) + Timeout for leaving memberlist cluster. (default 20s) -memberlist.left-ingesters-timeout duration How long to keep LEFT ingesters in the ring. (default 5m0s) -memberlist.max-join-backoff duration @@ -1113,7 +1113,7 @@ Usage of ./cmd/mimir/mimir: -memberlist.nodename string Name of the node in memberlist cluster. Defaults to hostname. -memberlist.packet-dial-timeout duration - Timeout used when connecting to other nodes to send packet. (default 5s) + Timeout used when connecting to other nodes to send packet. (default 2s) -memberlist.packet-write-timeout duration Timeout for writing 'packet' data. (default 5s) -memberlist.pullpush-interval duration diff --git a/docs/sources/operators-guide/configure/reference-configuration-parameters/index.md b/docs/sources/operators-guide/configure/reference-configuration-parameters/index.md index 02e65bff4c1..4cc3a60f36c 100644 --- a/docs/sources/operators-guide/configure/reference-configuration-parameters/index.md +++ b/docs/sources/operators-guide/configure/reference-configuration-parameters/index.md @@ -2228,7 +2228,7 @@ The `memberlist` block configures the Gossip memberlist. # (advanced) Timeout for leaving memberlist cluster. # CLI flag: -memberlist.leave-timeout -[leave_timeout: | default = 5s] +[leave_timeout: | default = 20s] # (advanced) How much space to use for keeping received and sent messages in # memory for troubleshooting (two buffers). 0 to disable. @@ -2246,7 +2246,7 @@ The `memberlist` block configures the Gossip memberlist. # (advanced) Timeout used when connecting to other nodes to send packet. # CLI flag: -memberlist.packet-dial-timeout -[packet_dial_timeout: | default = 5s] +[packet_dial_timeout: | default = 2s] # (advanced) Timeout for writing 'packet' data. # CLI flag: -memberlist.packet-write-timeout