redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-07-28 06:42:00 +03:00
Code Activity

Fix corner cases and a bug

Browse Source
This commit is contained in:
Vladimir Mihailenco
2018-11-21 10:49:30 +02:00
parent effc0c507a
commit 18e7a81047
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cluster.go
View File

@ -533,11 +533,13 @@ func (c *clusterState) slotSlaveNode(slot int) (*clusterNode, error) {
n := rand.Intn(len(nodes)-1) + 1 n := rand.Intn(len(nodes)-1) + 1
slave = nodes[n] slave = nodes[n]
if !slave.Loading() { if !slave.Loading() {
break
}
}
return slave, nil return slave, nil
} }
}
// All slaves are loading - use master.
return nodes[0], nil
}
} }
func (c *clusterState) slotClosestNode(slot int) (*clusterNode, error) { func (c *clusterState) slotClosestNode(slot int) (*clusterNode, error) {
@ -979,9 +981,10 @@ func (c *ClusterClient) defaultProcess(cmd Cmder) error {
break break
} }
// If slave is loading - read from master. // If slave is loading - pick another node.
if c.opt.ReadOnly && internal.IsLoadingError(err) { if c.opt.ReadOnly && internal.IsLoadingError(err) {
node.MarkAsLoading() node.MarkAsLoading()
node = nil
continue continue
} }