Skip to content

Commit 5d07a20

Browse files
committed
fix grpc-go(v1.27.0) incompatible changes to balancer / resolver.
1 parent 3898452 commit 5d07a20

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

clientv3/balancer/picker/err.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ func (ep *errPicker) String() string {
3434
return ep.p.String()
3535
}
3636

37-
func (ep *errPicker) Pick(context.Context, balancer.PickOptions) (balancer.SubConn, func(balancer.DoneInfo), error) {
37+
func (ep *errPicker) Pick(context.Context, balancer.PickInfo) (balancer.SubConn, func(balancer.DoneInfo), error) {
3838
return nil, nil, ep.err
3939
}

clientv3/balancer/picker/roundrobin_balanced.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ type rrBalanced struct {
5252
func (rb *rrBalanced) String() string { return rb.p.String() }
5353

5454
// Pick is called for every client request.
55-
func (rb *rrBalanced) Pick(ctx context.Context, opts balancer.PickOptions) (balancer.SubConn, func(balancer.DoneInfo), error) {
55+
func (rb *rrBalanced) Pick(ctx context.Context, opts balancer.PickInfo) (balancer.SubConn, func(balancer.DoneInfo), error) {
5656
rb.mu.RLock()
5757
n := len(rb.scs)
5858
rb.mu.RUnlock()

clientv3/balancer/resolver/endpoint/endpoint.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ func (e *ResolverGroup) Close() {
111111
}
112112

113113
// Build creates or reuses an etcd resolver for the etcd cluster name identified by the authority part of the target.
114-
func (b *builder) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOption) (resolver.Resolver, error) {
114+
func (b *builder) Build(target resolver.Target, cc resolver.ClientConn, opts resolver.BuildOptions) (resolver.Resolver, error) {
115115
if len(target.Authority) < 1 {
116116
return nil, fmt.Errorf("'etcd' target scheme requires non-empty authority identifying etcd cluster being routed to")
117117
}
@@ -179,7 +179,7 @@ func epsToAddrs(eps ...string) (addrs []resolver.Address) {
179179
return addrs
180180
}
181181

182-
func (*Resolver) ResolveNow(o resolver.ResolveNowOption) {}
182+
func (*Resolver) ResolveNow(o resolver.ResolveNowOptions) {}
183183

184184
func (r *Resolver) Close() {
185185
es, err := bldr.getResolverGroup(r.endpointID)

0 commit comments

Comments
 (0)