Merge pull request #2758 from hanlins/v0.37-backport-2749

Cherrypick to v0.37: Fix timeout flooding issue after containerd restart
google · Dec 9, 2020 · 49315fa · 49315fa
2 parents 0d3dfd7 + 36a29fe
commit 49315fa
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/container/containerd/client.go b/container/containerd/client.go
@@ -65,11 +65,10 @@ func Client(address, namespace string) (ContainerdClient, error) {
 		tryConn.Close()
 
 		connParams := grpc.ConnectParams{
-			Backoff: backoff.Config{
-				BaseDelay: baseBackoffDelay,
-				MaxDelay:  maxBackoffDelay,
-			},
+			Backoff: backoff.DefaultConfig,
 		}
+		connParams.Backoff.BaseDelay = baseBackoffDelay
+		connParams.Backoff.MaxDelay = maxBackoffDelay
 		gopts := []grpc.DialOption{
 			grpc.WithInsecure(),
 			grpc.WithContextDialer(dialer.ContextDialer),