Merge pull request #10551 from johncming/lbname

clientv3/balancer: change balancer name to builder name.
This commit is contained in:
Joe Betz 2019-04-10 16:16:51 -07:00 committed by GitHub
commit c7c6894527
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -54,7 +54,7 @@ func (b *builder) Build(cc balancer.ClientConn, opt balancer.BuildOptions) balan
bb := &baseBalancer{
id: strconv.FormatInt(time.Now().UnixNano(), 36),
policy: b.cfg.Policy,
name: b.cfg.Policy.String(),
name: b.cfg.Name,
lg: b.cfg.Logger,
addrToSc: make(map[resolver.Address]balancer.SubConn),
@ -67,9 +67,6 @@ func (b *builder) Build(cc balancer.ClientConn, opt balancer.BuildOptions) balan
// initialize picker always returns "ErrNoSubConnAvailable"
Picker: picker.NewErr(balancer.ErrNoSubConnAvailable),
}
if b.cfg.Name != "" {
bb.name = b.cfg.Name
}
if bb.lg == nil {
bb.lg = zap.NewNop()
}