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

clientv3: deprecate "grpc.WithTimeout" in favor of "grpc.DialContext"

Browse Source 
"grpc.WithTimeout" dial option is being deprecated.

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyuho Lee 2018-04-13 10:26:12 -07:00
parent 994a569f53
commit bb032f3e5f
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
clientv3/client.go
View File

@ -238,9 +238,6 @@ func (c *Client) dialSetupOpts(target string, dopts ...grpc.DialOption) (opts []
return nil, fmt.Errorf("unable to parse target: %v", err) return nil, fmt.Errorf("unable to parse target: %v", err)
} }
if c.cfg.DialTimeout > 0 {
opts = []grpc.DialOption{grpc.WithTimeout(c.cfg.DialTimeout)}
}
if c.cfg.DialKeepAliveTime > 0 { if c.cfg.DialKeepAliveTime > 0 {
params := keepalive.ClientParameters{ params := keepalive.ClientParameters{
Time: c.cfg.DialKeepAliveTime, Time: c.cfg.DialKeepAliveTime,
@ -304,11 +301,11 @@ func (c *Client) getToken(ctx context.Context) error {
host := getHost(endpoint) host := getHost(endpoint)
// use dial options without dopts to avoid reusing the client balancer // use dial options without dopts to avoid reusing the client balancer
var dOpts []grpc.DialOption var dOpts []grpc.DialOption
dOpts, err = c.dialSetupOpts(c.resolver.Target(endpoint)) dOpts, err = c.dialSetupOpts(c.resolver.Target(endpoint), c.cfg.DialOptions...)
if err != nil { if err != nil {
continue continue
} }
auth, err = newAuthenticator(host, dOpts, c) auth, err = newAuthenticator(ctx, host, dOpts, c)
if err != nil { if err != nil {
continue continue
} }
@ -341,11 +338,9 @@ func (c *Client) dial(endpoint string, dopts ...grpc.DialOption) (*grpc.ClientCo
tokenMu: &sync.RWMutex{}, tokenMu: &sync.RWMutex{},
} }
ctx := c.ctx ctx, cancel := c.ctx, func() {}
if c.cfg.DialTimeout > 0 { if c.cfg.DialTimeout > 0 {
cctx, cancel := context.WithTimeout(ctx, c.cfg.DialTimeout) ctx, cancel = context.WithTimeout(ctx, c.cfg.DialTimeout)
defer cancel()
ctx = cctx
} }
err = c.getToken(ctx) err = c.getToken(ctx)
@ -354,20 +349,29 @@ func (c *Client) dial(endpoint string, dopts ...grpc.DialOption) (*grpc.ClientCo
if err == ctx.Err() && ctx.Err() != c.ctx.Err() { if err == ctx.Err() && ctx.Err() != c.ctx.Err() {
err = context.DeadlineExceeded err = context.DeadlineExceeded
} }
cancel()
return nil, err return nil, err
} }
} else { } else {
opts = append(opts, grpc.WithPerRPCCredentials(c.tokenCred)) opts = append(opts, grpc.WithPerRPCCredentials(c.tokenCred))
} }
cancel()
} }
opts = append(opts, c.cfg.DialOptions...) opts = append(opts, c.cfg.DialOptions...)
dctx := c.ctx
if c.cfg.DialTimeout > 0 {
var cancel context.CancelFunc
dctx, cancel = context.WithTimeout(c.ctx, c.cfg.DialTimeout)
defer cancel()
}
// TODO: The hosts check doesn't really make sense for a load balanced endpoint url for the new grpc load balancer interface. // TODO: The hosts check doesn't really make sense for a load balanced endpoint url for the new grpc load balancer interface.
// Is it safe/sane to use the provided endpoint here? // Is it safe/sane to use the provided endpoint here?
//host := getHost(endpoint) //host := getHost(endpoint)
//conn, err := grpc.DialContext(c.ctx, host, opts...) //conn, err := grpc.DialContext(c.ctx, host, opts...)
conn, err := grpc.DialContext(c.ctx, endpoint, opts...) conn, err := grpc.DialContext(dctx, endpoint, opts...)
if err != nil { if err != nil {
return nil, err return nil, err
} }