Fix using grpc.WithBalancerName("grpclb") explicitly (#2778) (#2802)

wjywbs · lyuxuan · commit ab909771a093 · 2019-05-10T15:42:49.000-07:00
diff --git a/clientconn.go b/clientconn.go
@@ -603,6 +603,7 @@ func (cc *ClientConn) updateResolverState(s resolver.State) error {
 	} else if cc.balancerWrapper == nil {
 		// Balancer dial option was set, and this is the first time handling
 		// resolved addresses. Build a balancer with dopts.balancerBuilder.
+		cc.curBalancerName = cc.dopts.balancerBuilder.Name()
 		cc.balancerWrapper = newCCBalancerWrapper(cc, cc.dopts.balancerBuilder, cc.balancerBuildOpts)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -603,6 +603,7 @@ func (cc *ClientConn) updateResolverState(s resolver.State) error {`
`603`	`603`	`} else if cc.balancerWrapper == nil {`
`604`	`604`	`// Balancer dial option was set, and this is the first time handling`
`605`	`605`	`// resolved addresses. Build a balancer with dopts.balancerBuilder.`
	`606`	`+ cc.curBalancerName = cc.dopts.balancerBuilder.Name()`
`606`	`607`	`cc.balancerWrapper = newCCBalancerWrapper(cc, cc.dopts.balancerBuilder, cc.balancerBuildOpts)`
`607`	`608`	`}`
`608`	`609`