Skip to content

Commit e49b9a7

Browse files
committed
Review comments.
Signed-off-by: Steve Simpson <steve.simpson@grafana.com>
1 parent 21f1edd commit e49b9a7

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

docs/configuration/config-file-reference.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3798,8 +3798,8 @@ The `memberlist_config` configures the Gossip memberlist.
37983798
37993799
# Enable message compression. This can be used to reduce bandwidth usage at the
38003800
# cost of slightly more CPU utilization.
3801-
# CLI flag: -memberlist.enable-compression
3802-
[enable_compression: <boolean> | default = true]
3801+
# CLI flag: -memberlist.compression-enabled
3802+
[compression_enabled: <boolean> | default = true]
38033803
38043804
# Other cluster members to join. Can be specified multiple times. It can be an
38053805
# IP, hostname or an entry specified in the DNS Service Discovery format (see

integration/integration_memberlist_single_binary_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ func TestSingleBinaryWithMemberlist(t *testing.T) {
3232

3333
t.Run("compression-disabled", func(t *testing.T) {
3434
testSingleBinaryEnv(t, false, map[string]string{
35-
"-memberlist.enable-compression": "false",
35+
"-memberlist.compression-enabled": "false",
3636
})
3737
})
3838
}

pkg/ring/kv/memberlist/memberlist_client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ type KVConfig struct {
136136
GossipNodes int `yaml:"gossip_nodes"`
137137
GossipToTheDeadTime time.Duration `yaml:"gossip_to_dead_nodes_time"`
138138
DeadNodeReclaimTime time.Duration `yaml:"dead_node_reclaim_time"`
139-
EnableCompression bool `yaml:"enable_compression"`
139+
EnableCompression bool `yaml:"compression_enabled"`
140140

141141
// List of members to join
142142
JoinMembers flagext.StringSlice `yaml:"join_members"`
@@ -188,7 +188,7 @@ func (cfg *KVConfig) RegisterFlagsWithPrefix(f *flag.FlagSet, prefix string) {
188188
f.DurationVar(&cfg.GossipToTheDeadTime, prefix+"memberlist.gossip-to-dead-nodes-time", mlDefaults.GossipToTheDeadTime, "How long to keep gossiping to dead nodes, to give them chance to refute their death.")
189189
f.DurationVar(&cfg.DeadNodeReclaimTime, prefix+"memberlist.dead-node-reclaim-time", mlDefaults.DeadNodeReclaimTime, "How soon can dead node's name be reclaimed with new address. 0 to disable.")
190190
f.IntVar(&cfg.MessageHistoryBufferBytes, prefix+"memberlist.message-history-buffer-bytes", 0, "How much space to use for keeping received and sent messages in memory for troubleshooting (two buffers). 0 to disable.")
191-
f.BoolVar(&cfg.EnableCompression, prefix+"memberlist.enable-compression", mlDefaults.EnableCompression, "Enable message compression. This can be used to reduce bandwidth usage at the cost of slightly more CPU utilization.")
191+
f.BoolVar(&cfg.EnableCompression, prefix+"memberlist.compression-enabled", mlDefaults.EnableCompression, "Enable message compression. This can be used to reduce bandwidth usage at the cost of slightly more CPU utilization.")
192192

193193
cfg.TCPTransport.RegisterFlags(f, prefix)
194194
}

0 commit comments

Comments
 (0)