Merge pull request #16 from konradreiche/ping-data-race

Synchronize read & write access to node ping to fix data race
joomcode · Apr 26, 2021 · 1283dc7 · 1283dc7
2 parents ea26ef8 + b09be50
commit 1283dc7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/rediscluster/mapping.go b/rediscluster/mapping.go
@@ -375,7 +375,8 @@ func (n *node) updatePingLatency() {
 			latency = l
 		}
 	}
-	n.ping = uint32(latency / redisconn.PingLatencyGranularity)
+	ping := uint32(latency / redisconn.PingLatencyGranularity)
+	atomic.StoreUint32(&n.ping, ping)
 }
 
 func nextRng(state *uint32, mod uint32) uint32 {

diff --git a/rediscluster/slotrange.go b/rediscluster/slotrange.go
@@ -175,11 +175,11 @@ func (c *Cluster) updateMappings(slotRanges []redisclusterutil.SlotsRange) {
 			sumLatency := uint32(0)
 			for _, addr := range shard.addr {
 				node := newConfig.nodes[addr]
-				sumLatency += node.ping
+				sumLatency += atomic.LoadUint32(&node.ping)
 			}
 			for i, addr := range shard.addr {
 				node := newConfig.nodes[addr]
-				weight := sumLatency / node.ping
+				weight := sumLatency / atomic.LoadUint32(&node.ping)
 				atomic.StoreUint32(&shard.weights[i], weight)
 			}
 		}