Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11564 from eddycjy/balancer-error

Browse Source 
clientv3: Fix grpc-go(v1.27.0) incompatible changes to balancer/resolver.
This commit is contained in:
Joe Betz 2020-03-06 10:35:22 -08:00 committed by GitHub
commit 221f0cc107
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clientv3/balancer/picker/err.go
View File

@ -34,6 +34,6 @@ func (ep *errPicker) String() string {
return ep.p.String() return ep.p.String()
} }
func (ep *errPicker) Pick(context.Context, balancer.PickOptions) (balancer.SubConn, func(balancer.DoneInfo), error) { func (ep *errPicker) Pick(context.Context, balancer.PickInfo) (balancer.SubConn, func(balancer.DoneInfo), error) {
return nil, nil, ep.err return nil, nil, ep.err
} }

2
clientv3/balancer/picker/roundrobin_balanced.go
View File

@ -52,7 +52,7 @@ type rrBalanced struct {
func (rb *rrBalanced) String() string { return rb.p.String() } func (rb *rrBalanced) String() string { return rb.p.String() }
// Pick is called for every client request. // Pick is called for every client request.
func (rb *rrBalanced) Pick(ctx context.Context, opts balancer.PickOptions) (balancer.SubConn, func(balancer.DoneInfo), error) { func (rb *rrBalanced) Pick(ctx context.Context, opts balancer.PickInfo) (balancer.SubConn, func(balancer.DoneInfo), error) {
rb.mu.RLock() rb.mu.RLock()
n := len(rb.scs) n := len(rb.scs)
rb.mu.RUnlock() rb.mu.RUnlock()

4
clientv3/balancer/resolver/endpoint/endpoint.go
View File

@ -111,7 +111,7 @@ func (e *ResolverGroup) Close() {
} }
// Build creates or reuses an etcd resolver for the etcd cluster name identified by the authority part of the target. // Build creates or reuses an etcd resolver for the etcd cluster name identified by the authority part of the target.
func (b *builder) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOption) (resolver.Resolver, error) { func (b *builder) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (resolver.Resolver, error) {
if len(target.Authority) < 1 { if len(target.Authority) < 1 {
return nil, fmt.Errorf("'etcd' target scheme requires non-empty authority identifying etcd cluster being routed to") return nil, fmt.Errorf("'etcd' target scheme requires non-empty authority identifying etcd cluster being routed to")
} }
@ -180,7 +180,7 @@ func epsToAddrs(eps ...string) (addrs []resolver.Address) {
return addrs return addrs
} }
func (*Resolver) ResolveNow(o resolver.ResolveNowOption) {} func (*Resolver) ResolveNow(o resolver.ResolveNowOptions) {}
func (r *Resolver) Close() { func (r *Resolver) Close() {
es, err := bldr.getResolverGroup(r.endpointID) es, err := bldr.getResolverGroup(r.endpointID)