Skip to content

Commit

Permalink
r311: Cherry-pick memberlist debounce PR from dskit (#9715)
Browse files Browse the repository at this point in the history
* Set dskit to v0.0.0-20241022223531-b743e70423b6

* Refresh docs.

* Replace 'replace' with ref bump.
  • Loading branch information
seizethedave authored Oct 23, 2024
1 parent 5bccaf4 commit 6393cfc
Show file tree
Hide file tree
Showing 8 changed files with 101 additions and 17 deletions.
11 changes: 11 additions & 0 deletions cmd/mimir/config-descriptor.json
Original file line number Diff line number Diff line change
Expand Up @@ -16010,6 +16010,17 @@
"fieldType": "boolean",
"fieldCategory": "advanced"
},
{
"kind": "field",
"name": "notify_interval",
"required": false,
"desc": "How frequently to notify watchers when a key changes. Can reduce CPU activity in large memberlist deployments. 0 to notify without delay.",
"fieldValue": null,
"fieldDefaultValue": 0,
"fieldFlag": "memberlist.notify-interval",
"fieldType": "duration",
"fieldCategory": "advanced"
},
{
"kind": "field",
"name": "advertise_addr",
Expand Down
2 changes: 2 additions & 0 deletions cmd/mimir/help-all.txt.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -1743,6 +1743,8 @@ Usage of ./cmd/mimir/mimir:
Min backoff duration to join other cluster members. (default 1s)
-memberlist.nodename string
Name of the node in memberlist cluster. Defaults to hostname.
-memberlist.notify-interval duration
How frequently to notify watchers when a key changes. Can reduce CPU activity in large memberlist deployments. 0 to notify without delay.
-memberlist.packet-dial-timeout duration
Timeout used when connecting to other nodes to send packet. (default 2s)
-memberlist.packet-write-timeout duration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2959,6 +2959,11 @@ The `memberlist` block configures the Gossip memberlist.
# CLI flag: -memberlist.compression-enabled
[compression_enabled: <boolean> | default = true]
# (advanced) How frequently to notify watchers when a key changes. Can reduce
# CPU activity in large memberlist deployments. 0 to notify without delay.
# CLI flag: -memberlist.notify-interval
[notify_interval: <duration> | default = 0s]
# Gossip address to advertise to other members in the cluster. Used for NAT
# traversal.
# CLI flag: -memberlist.advertise-addr
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
github.com/golang/snappy v0.0.4
github.com/google/gopacket v1.1.19
github.com/gorilla/mux v1.8.1
github.com/grafana/dskit v0.0.0-20240925193654-7c41a4057319
github.com/grafana/dskit v0.0.0-20241022223531-b743e70423b6
github.com/grafana/e2e v0.1.2-0.20240118170847-db90b84177fc
github.com/hashicorp/golang-lru v1.0.2 // indirect
github.com/json-iterator/go v1.1.12
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1252,8 +1252,8 @@ github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc h1:PXZQA2WCxe85T
github.com/grafana-tools/sdk v0.0.0-20220919052116-6562121319fc/go.mod h1:AHHlOEv1+GGQ3ktHMlhuTUwo3zljV3QJbC0+8o2kn+4=
github.com/grafana/alerting v0.0.0-20240926144415-27f4e81b4b6b h1:UO4mv94pG1kzKCgBKh20TXdACBCAK2vYjV3Q2MlcpEQ=
github.com/grafana/alerting v0.0.0-20240926144415-27f4e81b4b6b/go.mod h1:GMLi6d09Xqo96fCVUjNk//rcjP5NKEdjOzfWIffD5r4=
github.com/grafana/dskit v0.0.0-20240925193654-7c41a4057319 h1:KACpOOTqA4WqyyKF2fFPQFiaSOpZdOT5f5gg0qkPLiU=
github.com/grafana/dskit v0.0.0-20240925193654-7c41a4057319/go.mod h1:SPLNCARd4xdjCkue0O6hvuoveuS1dGJjDnfxYe405YQ=
github.com/grafana/dskit v0.0.0-20241022223531-b743e70423b6 h1:p/P6COoqDjSA92GIKypU8BGd/6YIV+tEyLd/hhwbkbA=
github.com/grafana/dskit v0.0.0-20241022223531-b743e70423b6/go.mod h1:SPLNCARd4xdjCkue0O6hvuoveuS1dGJjDnfxYe405YQ=
github.com/grafana/e2e v0.1.2-0.20240118170847-db90b84177fc h1:BW+LjKJDz0So5LI8UZfW5neWeKpSkWqhmGjQFzcFfLM=
github.com/grafana/e2e v0.1.2-0.20240118170847-db90b84177fc/go.mod h1:JVmqPBe8A/pZWwRoJW5ZjyALeY5OXMzPl7LrVXOdZAI=
github.com/grafana/goautoneg v0.0.0-20240607115440-f335c04c58ce h1:WI1olbgS+sEl77qxEYbmt9TgRUz7iLqmjh8lYPpGlKQ=
Expand Down
88 changes: 77 additions & 11 deletions vendor/github.com/grafana/dskit/kv/memberlist/memberlist_client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/grafana/dskit/ring/ring.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/modules.txt

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 6393cfc

Please sign in to comment.