Fix default memberlist configuration value for RetransmitMult.

stevesg · stevesg · commit a301d2d48fb4 · 2021-06-10T21:23:51.000+02:00
If configuration is not explicitly given for RetransmitMult (via
`-memberlist.retransmit_factor`), then it is intended to be picked up
from `DefaultLANConfig`. However, though the correct value was being
used to configure `memberlist` itself, zero would be passed into the
`TransmitLimitedQueue` used for broadcasting ring updates. This
essentially means that ring updates are only ever gossiped once.

Signed-off-by: Steve Simpson &lt;steve.simpson@grafana.com&gt;
diff --git a/pkg/ring/kv/memberlist/memberlist_client.go b/pkg/ring/kv/memberlist/memberlist_client.go
@@ -415,7 +415,7 @@ func (m *KV) starting(_ context.Context) error {
 	m.memberlist = list
 	m.broadcasts = &memberlist.TransmitLimitedQueue{
 		NumNodes:       list.NumMembers,
-		RetransmitMult: m.cfg.RetransmitMult,
+		RetransmitMult: mlCfg.RetransmitMult,
 	}
 	m.initWG.Done()
 

Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ func (m *KV) starting(_ context.Context) error {`
`415`	`415`	`m.memberlist = list`
`416`	`416`	`m.broadcasts = &memberlist.TransmitLimitedQueue{`
`417`	`417`	`NumNodes: list.NumMembers,`
`418`		`- RetransmitMult: m.cfg.RetransmitMult,`
	`418`	`+ RetransmitMult: mlCfg.RetransmitMult,`
`419`	`419`	`}`
`420`	`420`	`m.initWG.Done()`
`421`	`421`