[release/2.0] Respect client.WithTimeout option on connect#11536
Merged
AkihiroSuda merged 1 commit intocontainerd:release/2.0from Mar 14, 2025
Merged
Conversation
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>
|
Hi @k8s-infra-cherrypick-robot. Thanks for your PR. I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
client.WithTimeout optionclient.WithTimeout option on connect
Member
|
/ok-to-test |
djdongjin
approved these changes
Mar 13, 2025
AkihiroSuda
approved these changes
Mar 14, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an automated cherry-pick of #11508
/assign dmcgowan