Merge pull request redis#948 from go-redis/fix/reload-more-often

Reload cluster state almost on any error

cluster.go

@@ -844,15 +844,12 @@ func (c *ClusterClient) Watch(fn func(*Tx) error, keys ...string) error {
 		if err == nil {
 			break
 		}
-
-		if internal.IsRetryableError(err, true) {
+		if err != Nil {
 			c.state.LazyReload()
-			continue
 		}
 
 		moved, ask, addr := internal.IsMovedError(err)
 		if moved || ask {
-			c.state.LazyReload()
 			node, err = c.nodes.GetOrCreate(addr)
 			if err != nil {
 				return err
@@ -868,6 +865,10 @@ func (c *ClusterClient) Watch(fn func(*Tx) error, keys ...string) error {
 			continue
 		}
 
+		if internal.IsRetryableError(err, true) {
+			continue
+		}
+
 		return err
 	}
 
@@ -932,6 +933,9 @@ func (c *ClusterClient) defaultProcess(cmd Cmder) error {
 		if err == nil {
 			break
 		}
+		if err != Nil {
+			c.state.LazyReload()
+		}
 
 		// If slave is loading - pick another node.
 		if c.opt.ReadOnly && internal.IsLoadingError(err) {
@@ -940,28 +944,10 @@ func (c *ClusterClient) defaultProcess(cmd Cmder) error {
 			continue
 		}
 
-		if internal.IsRetryableError(err, true) {
-			c.state.LazyReload()
-
-			// First retry the same node.
-			if attempt == 0 {
-				continue
-			}
-
-			// Second try random node.
-			node, err = c.nodes.Random()
-			if err != nil {
-				break
-			}
-			continue
-		}
-
 		var moved bool
 		var addr string
 		moved, ask, addr = internal.IsMovedError(err)
 		if moved || ask {
-			c.state.LazyReload()
-
 			node, err = c.nodes.GetOrCreate(addr)
 			if err != nil {
 				break
@@ -974,6 +960,20 @@ func (c *ClusterClient) defaultProcess(cmd Cmder) error {
 			continue
 		}
 
+		if internal.IsRetryableError(err, true) {
+			// First retry the same node.
+			if attempt == 0 {
+				continue
+			}
+
+			// Second try random node.
+			node, err = c.nodes.Random()
+			if err != nil {
+				break
+			}
+			continue
+		}
+
 		break
 	}