client: Respect client.WithTimeout option

vvoland · k8s-infra-cherrypick-robot · commit 6b5efba83b2a · 2025-03-13T18:11:16.000Z
Fix the gRPC client dialer not using the timeout passed by the containerd client timeout option. Commit 63b4688 replaced the usage of deprecated `grpc.DialContext` with `grpc.NewClient`. However, the `dialer.ContextDialer` relied on the context deadline to propagate the timeout: https://github.com/containerd/containerd/blob/388fb336b0a458e2cf64212072743e622a3f44c7/vendor/google.golang.org/grpc/clientconn.go#L216 This assumption is now broken, because `grpc.NewClient` doesn't do any initial connection and defers it to the first RPC usage. This commit passes the timeout via the `MinConnectTimeout` grpc connection param, which will be applied to **every** connection attempt (not just the first). Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
diff --git a/client/client.go b/client/client.go
@@ -129,7 +129,8 @@ func New(address string, opts ...Opt) (*Client, error) {
 		backoffConfig := backoff.DefaultConfig
 		backoffConfig.MaxDelay = copts.timeout
 		connParams := grpc.ConnectParams{
-			Backoff: backoffConfig,
+			Backoff:           backoffConfig,
+			MinConnectTimeout: copts.timeout,
 		}
 		gopts := []grpc.DialOption{
 			grpc.WithTransportCredentials(insecure.NewCredentials()),
