fire firstResolveEvent when done updating resolver state

grpc · Oct 3, 2019 · 2aebcaa · 2aebcaa
1 parent bc703a8
commit 2aebcaa
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/balancer_conn_wrappers.go b/balancer_conn_wrappers.go
@@ -140,7 +140,6 @@ func (ccb *ccBalancerWrapper) watcher() {
 			ccb.UpdateBalancerState(connectivity.Connecting, nil)
 			return
 		}
-		ccb.cc.firstResolveEvent.Fire()
 	}
 }
 

diff --git a/clientconn.go b/clientconn.go
@@ -556,6 +556,7 @@ func (cc *ClientConn) maybeApplyDefaultServiceConfig(addrs []resolver.Address) {
 }
 
 func (cc *ClientConn) updateResolverState(s resolver.State, err error) error {
+	defer cc.firstResolveEvent.Fire()
 	cc.mu.Lock()
 	// Check if the ClientConn is already closed. Some fields (e.g.
 	// balancerWrapper) are set to nil when closing the ClientConn, and could
@@ -600,7 +601,6 @@ func (cc *ClientConn) updateResolverState(s resolver.State, err error) error {
 				cc.blockingpicker.updatePicker(base.NewErrPicker(err))
 				cc.csMgr.updateState(connectivity.TransientFailure)
 				cc.mu.Unlock()
-				cc.firstResolveEvent.Fire()
 				return ret
 			}
 		}