clientv3/balancer: only notify healthy addresses

Signed-off-by: Gyu-Ho Lee <[email protected]>

clientv3/balancer.go

@@ -365,19 +365,15 @@ func (b *simpleBalancer) notifyAddrs(msg notifyMsg) {
 		}
 	}
 	b.mu.RLock()
-	addrs := b.addrs
 	pinAddr := b.pinAddr
 	downc := b.downc
 	b.mu.RUnlock()
+	addrs, hostPorts := b.liveAddrs()
 
 	var waitDown bool
 	if pinAddr != "" {
-		waitDown = true
-		for _, a := range addrs {
-			if a.Addr == pinAddr {
-				waitDown = false
-			}
-		}
+		_, ok := hostPorts[pinAddr]
+		waitDown = !ok
 	}
 
 	select {

clientv3/balancer_test.go

@@ -66,8 +66,8 @@ func TestBalancerGetUnblocking(t *testing.T) {
 	}
 
 	down1(errors.New("error"))
-	if addrs := <-sb.Notify(); len(addrs) != len(endpoints) {
-		t.Errorf("closing the only connection should triggered balancer to send the all endpoints via Notify chan so that we can establish a connection")
+	if addrs := <-sb.Notify(); len(addrs) != 2 {
+		t.Errorf("closing the only connection should triggered balancer to send the 2 endpoints via Notify chan so that we can establish a connection")
 	}
 	down2(errors.New("error"))
 	_, _, err = sb.Get(context.Background(), unblockingOpts)
@@ -121,8 +121,8 @@ func TestBalancerGetBlocking(t *testing.T) {
 	}
 
 	down1(errors.New("error"))
-	if addrs := <-sb.Notify(); len(addrs) != len(endpoints) {
-		t.Errorf("closing the only connection should triggered balancer to send the all endpoints via Notify chan so that we can establish a connection")
+	if addrs := <-sb.Notify(); len(addrs) != 2 {
+		t.Errorf("closing the only connection should triggered balancer to send the 2 endpoints via Notify chan so that we can establish a connection")
 	}
 	down2(errors.New("error"))
 	ctx, cancel = context.WithTimeout(context.Background(), time.Millisecond*100)