Merge pull request #1617 from go-redis/feature/cluster-read-only

vmihailenco · web-flow · commit b0ac2eefc3a9 · 2021-01-22T09:44:18.000+02:00
Fix ReadOnly option in ClusterClient
diff --git a/cluster.go b/cluster.go
@@ -1639,7 +1639,7 @@ func (c *ClusterClient) cmdNode(
 		return nil, err
 	}
 
-	if (c.opt.RouteByLatency || c.opt.RouteRandomly) && cmdInfo != nil && cmdInfo.ReadOnly {
+	if c.opt.ReadOnly && cmdInfo != nil && cmdInfo.ReadOnly {
 		return c.slotReadOnlyNode(state, slot)
 	}
 	return state.slotMasterNode(slot)

Original file line number	Diff line number	Diff line change
`@@ -1639,7 +1639,7 @@ func (c *ClusterClient) cmdNode(`
`1639`	`1639`	`return nil, err`
`1640`	`1640`	`}`
`1641`	`1641`
`1642`		`- if (c.opt.RouteByLatency \|\| c.opt.RouteRandomly) && cmdInfo != nil && cmdInfo.ReadOnly {`
	`1642`	`+ if c.opt.ReadOnly && cmdInfo != nil && cmdInfo.ReadOnly {`
`1643`	`1643`	`return c.slotReadOnlyNode(state, slot)`
`1644`	`1644`	`}`
`1645`	`1645`	`return state.slotMasterNode(slot)`