clientv3/balancer: only notify live addresses to gRPC

Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
etcd-io · Nov 8, 2017 · be80e48 · be80e48
1 parent d7a26cd
commit be80e48
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/clientv3/balancer.go b/clientv3/balancer.go
@@ -358,10 +358,10 @@ func (b *simpleBalancer) notifyAddrs(msg notifyMsg) {
 		}
 	}
 	b.mu.RLock()
-	addrs := b.addrs
 	pinAddr := b.pinAddr
 	downc := b.downc
 	b.mu.RUnlock()
+	addrs := b.liveAddrs()
 
 	var waitDown bool
 	if pinAddr != "" {

diff --git a/clientv3/balancer_test.go b/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)