Merge pull request #257 from glutamatt/fix-connection-picker

Fix ErrNoConnections from defaultConnectionPicker.Remove code
scylladb · Sep 9, 2024 · bed2d7e · bed2d7e
2 parents 3a1e987 + 7e33298
commit bed2d7e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/connectionpool.go b/connectionpool.go
@@ -551,4 +551,5 @@ func (pool *hostConnPool) HandleError(conn *Conn, err error, closed bool) {
 	}
 
 	pool.connPicker.Remove(conn)
+	go pool.fill()
 }
diff --git a/connpicker.go b/connpicker.go
@@ -42,8 +42,9 @@ func (p *defaultConnPicker) Remove(conn *Conn) {
 
 	for i, candidate := range p.conns {
 		if candidate == conn {
-			p.conns[i] = nil
-			return
+			last := len(p.conns) - 1
+			p.conns[i], p.conns = p.conns[last], p.conns[:last]
+			break
 		}
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	pool.connPicker.Remove(conn)
+    	go pool.fill()
     }