fix: panic on cluster redirection to the same host

Signed-off-by: Rueian <[email protected]>
redis · Sep 21, 2024 · 129a1f8 · 129a1f8
1 parent 6188b89
commit 129a1f8
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/cluster.go b/cluster.go
@@ -397,10 +397,10 @@ func (c *clusterClient) redirectOrNew(addr string, prev conn, slot uint16, mode
 		return cc.conn
 	}
 	c.mu.Lock()
-
 	if cc = c.conns[addr]; cc.conn == nil {
 		p = c.connFn(addr, c.opt)
-		c.conns[addr] = connrole{conn: p, replica: false}
+		cc = connrole{conn: p, replica: false}
+		c.conns[addr] = cc
 		if mode == RedirectMove {
 			c.pslots[slot] = p
 		}
@@ -413,8 +413,8 @@ func (c *clusterClient) redirectOrNew(addr string, prev conn, slot uint16, mode
 			prev.Close()
 		}(prev)
 		p = c.connFn(addr, c.opt)
-		c.conns[addr] = connrole{conn: p, replica: cc.replica}
-
+		cc = connrole{conn: p, replica: cc.replica}
+		c.conns[addr] = cc
 		if mode == RedirectMove {
 			if cc.replica {
 				c.rslots[slot] = p
@@ -424,7 +424,7 @@ func (c *clusterClient) redirectOrNew(addr string, prev conn, slot uint16, mode
 		}
 	}
 	c.mu.Unlock()
-	return p
+	return cc.conn
 }
 
 func (c *clusterClient) B() Builder {