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 #14922 from ramil600/target-endpoint

Browse Source 
resolver: cleanup of deprecated grpc resolver target.Endpoint field
This commit is contained in:
Benjamin Wang 2022-12-14 03:24:20 +08:00 committed by GitHub
commit d11cc9e651
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/v3/naming/resolver/resolver.go
View File

@ -16,6 +16,7 @@ package resolver
import ( import (
"context" "context"
"strings"
"sync" "sync"
clientv3 "go.etcd.io/etcd/client/v3" clientv3 "go.etcd.io/etcd/client/v3"
@ -31,9 +32,15 @@ type builder struct {
} }
func (b builder) Build(target gresolver.Target, cc gresolver.ClientConn, opts gresolver.BuildOptions) (gresolver.Resolver, error) { func (b builder) Build(target gresolver.Target, cc gresolver.ClientConn, opts gresolver.BuildOptions) (gresolver.Resolver, error) {
// Refer to https://github.com/grpc/grpc-go/blob/16d3df80f029f57cff5458f1d6da6aedbc23545d/clientconn.go#L1587-L1611
endpoint := target.URL.Path
if endpoint == "" {
endpoint = target.URL.Opaque
}
endpoint = strings.TrimPrefix(endpoint, "/")
r := &resolver{ r := &resolver{
c: b.c, c: b.c,
target: target.Endpoint, target: endpoint,
cc: cc, cc: cc,
} }
r.ctx, r.cancel = context.WithCancel(context.Background()) r.ctx, r.cancel = context.WithCancel(context.Background())