From 841c5af42eb72b6cc2a6ef5ccc047cd7c5036fac Mon Sep 17 00:00:00 2001 From: Jiquan Long Date: Tue, 4 Jan 2022 15:13:18 +0800 Subject: [PATCH] Fixbug: client connection reset by deadline (#14683) Signed-off-by: dragondriver --- internal/util/grpcclient/client.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/internal/util/grpcclient/client.go b/internal/util/grpcclient/client.go index 9708808616..e72fe76547 100644 --- a/internal/util/grpcclient/client.go +++ b/internal/util/grpcclient/client.go @@ -183,7 +183,13 @@ func (c *ClientBase) callOnce(ctx context.Context, caller func(client interface{ if err2 == nil { return ret, nil } - if err2 == context.Canceled || err2 == context.DeadlineExceeded { + + // status.Error(codes.Canceled, context.Canceled.Error() + // if err2 == context.Canceled || err2 == context.DeadlineExceeded { + // return nil, err2 + // } + + if !funcutil.CheckCtxValid(ctx) { return nil, err2 }