From 312c68a9c6aebae6ff223e76702c28355708da94 Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Tue, 5 Sep 2017 14:10:02 -0700 Subject: [PATCH] clientv3: deprecate grpc.ErrClientConnTimeout errors Replace with context.DeadlineExceeded. Address https://github.com/coreos/etcd/issues/8504. Signed-off-by: Gyu-Ho Lee --- clientv3/client.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clientv3/client.go b/clientv3/client.go index 1f8c83f5750..b99f7dcc60f 100644 --- a/clientv3/client.go +++ b/clientv3/client.go @@ -320,7 +320,7 @@ func (c *Client) dial(endpoint string, dopts ...grpc.DialOption) (*grpc.ClientCo if err != nil { if toErr(ctx, err) != rpctypes.ErrAuthNotEnabled { if err == ctx.Err() && ctx.Err() != c.ctx.Err() { - err = grpc.ErrClientConnTimeout + err = context.DeadlineExceeded } return nil, err } @@ -397,7 +397,7 @@ func newClient(cfg *Config) (*Client, error) { case <-waitc: } if !hasConn { - err := grpc.ErrClientConnTimeout + err := context.DeadlineExceeded select { case err = <-client.dialerrc: default: