Skip to content

[release/1.5] go.mod: Bump hcsshim to v0.8.23#6231

Merged
estesp merged 1 commit intocontainerd:release/1.5from
dcantah:update-hcsshim-0.8.23
Nov 12, 2021
Merged

[release/1.5] go.mod: Bump hcsshim to v0.8.23#6231
estesp merged 1 commit intocontainerd:release/1.5from
dcantah:update-hcsshim-0.8.23

Conversation

@dcantah
Copy link
Copy Markdown
Member

@dcantah dcantah commented Nov 11, 2021

This tag contains some changes for the Windows shim for retrying stdio named pipe connections if containerd restarts/crashes. As the Windows runhcs shim is cloned and built based off of the tag present in hcsshim's go.mod, it will also contain a ttrpc
deadlock fix present in ttrpc v1.1.0 as that's the version hcsshim has vendored.

@k8s-ci-robot
Copy link
Copy Markdown

Hi @dcantah. 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 /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

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.

@dcantah dcantah force-pushed the update-hcsshim-0.8.23 branch from 7de3127 to 0892ddd Compare November 11, 2021 01:27
@dcantah
Copy link
Copy Markdown
Member Author

dcantah commented Nov 11, 2021

This PR bumps ttrpc to 1.1.0 also so this is kinda redundant #6229. Think it's better to update them individually so I'll wait for that to get in and rebase after.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Nov 11, 2021

Build succeeded.

@dcantah
Copy link
Copy Markdown
Member Author

dcantah commented Nov 11, 2021

cc @kevpar @dmcgowan

@thaJeztah
Copy link
Copy Markdown
Member

thaJeztah commented Nov 11, 2021

#6229 was merged; could you rebase this PR so that the diff reflects that the ttrpc changes are not actually in this PR?

This tag contains some changes for the Windows shim for retrying stdio named pipe connections if containerd restarts/crashes

note to self / reviewers: corresponding fix for the main branch (and v1.6.x) looks to be #6230

@dcantah
Copy link
Copy Markdown
Member Author

dcantah commented Nov 11, 2021

@thaJeztah Yep! Noted above that I'd need to rebase afterwards but likely should've kept this as a draft until #6229 got in. Doing now

Edit: This should be ready to go now (assuming the CI is happy and green)

This tag contains some changes for the Windows shim for retrying
stdio named pipe connections if containerd restarts/crashes. It also is built with v1.1.0 of
ttrpc which has some fixes for a deadlock we'd observed on Windows.

Signed-off-by: Daniel Canter <[email protected]>
@dcantah dcantah force-pushed the update-hcsshim-0.8.23 branch from 0892ddd to 2bd3f18 Compare November 11, 2021 10:31
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Nov 11, 2021

Build succeeded.

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp estesp merged commit c34181f into containerd:release/1.5 Nov 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants