Browse Source

Merge pull request #10551 from johncming/lbname

clientv3/balancer: change balancer name to builder name.
Joe Betz 6 years ago
parent
commit
c7c6894527
1 changed files with 1 additions and 4 deletions
  1. 1 4
      clientv3/balancer/balancer.go

+ 1 - 4
clientv3/balancer/balancer.go

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