Skip to content

runtime/v2: net.Dial gRPC shim sockets before trying grpc#9447

Merged
mxpv merged 1 commit intocontainerd:mainfrom
dcantah:dial-grpc-shim-socket
Dec 1, 2023
Merged

runtime/v2: net.Dial gRPC shim sockets before trying grpc#9447
mxpv merged 1 commit intocontainerd:mainfrom
dcantah:dial-grpc-shim-socket

Conversation

@dcantah
Copy link
Member

@dcantah dcantah commented Dec 1, 2023

This is mostly to workaround an issue with gRPC based shims after containerd restart. If a shim dies while containerd is also down/restarting, on reboot grpc.DialContext with our current set of DialOptions will make us wait for 100 seconds per shim even if the socket no longer exists or has no listener.

@dcantah
runtime/v2: net.Dial gRPC shim sockets before trying grpc
0bc9633 
This is mostly to workaround an issue with gRPC based shims after containerd
restart. If a shim dies while containerd is also down/restarting, on reboot
grpc.DialContext with our current set of DialOptions will make us wait for
100 seconds per shim even if the socket no longer exists or has no listener.

Signed-off-by: Danny Canter <[email protected]>
fuweid
fuweid approved these changes Dec 1, 2023
View reviewed changes
Copy link
Member

@fuweid fuweid left a comment •
edited by thaJeztah
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mxpv mxpv added this pull request to the merge queue Dec 1, 2023
Merged via the queue into containerd:main with commit 6f405e8 Dec 1, 2023
@dcantah dcantah added the cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch label Dec 3, 2023
@dcantah
Copy link
Member Author

dcantah commented Dec 3, 2023

/cherrypick release/1.7

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Dec 3, 2023

@dcantah: #9447 failed to apply on top of branch "release/1.7":

Applying: runtime/v2: net.Dial gRPC shim sockets before trying grpc
Using index info to reconstruct a base tree...
M	runtime/v2/shim.go
Falling back to patching base and 3-way merge...
Auto-merging runtime/v2/shim.go
CONFLICT (content): Merge conflict in runtime/v2/shim.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 runtime/v2: net.Dial gRPC shim sockets before trying grpc
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherrypick release/1.7

Instructions 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/test-infra repository.

@dmcgowan dmcgowan mentioned this pull request Jan 12, 2024
Merged
@ZhangShuaiyi ZhangShuaiyi mentioned this pull request May 23, 2024
Merged
@thaJeztah thaJeztah mentioned this pull request Jan 6, 2025
Merged
@thaJeztah thaJeztah added cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch and removed cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Jan 6, 2025
@thaJeztah
Copy link
Member

thaJeztah commented Jan 6, 2025

This was cherry-picked in #9458

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mxpv mxpv mxpv approved these changes

@fuweid fuweid fuweid approved these changes

Assignees

No one assigned

Labels

cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch size/S

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@dcantah @k8s-infra-cherrypick-robot @thaJeztah @mxpv @fuweid @k8s-ci-robot