diff --git a/kv/memberlist/memberlist_client.go b/kv/memberlist/memberlist_client.go index 1b21fa5c4..61d0813ab 100644 --- a/kv/memberlist/memberlist_client.go +++ b/kv/memberlist/memberlist_client.go @@ -1184,7 +1184,7 @@ func (m *KV) mergeValueForKey(key string, incomingValue Mergeable, casVersion ui m.storeMu.Lock() defer m.storeMu.Unlock() - curr := m.store[key].Clone() + curr := m.store[key] //.Clone() // if casVersion is 0, then there was no previous value, so we will just do normal merge, without localCAS flag set. if casVersion > 0 && curr.version != casVersion { return nil, 0, errVersionMismatch diff --git a/ring/model.go b/ring/model.go index cb2d7c787..2df1a988b 100644 --- a/ring/model.go +++ b/ring/model.go @@ -192,7 +192,7 @@ func (d *Desc) mergeWithTime(mergeable memberlist.Mergeable, localCAS bool, now return nil, nil } - thisIngesterMap := buildNormalizedIngestersMap(d) + thisIngesterMap := d.Ingesters //buildNormalizedIngestersMap(d) otherIngesterMap := buildNormalizedIngestersMap(other) var updated []string