Skip to content

[release/1.7] fix: cio.Cancel() should close the pipes#8624

Merged
dmcgowan merged 1 commit intocontainerd:release/1.7from
davidhsingyuchen:backport-8334
Jun 2, 2023
Merged

[release/1.7] fix: cio.Cancel() should close the pipes#8624
dmcgowan merged 1 commit intocontainerd:release/1.7from
davidhsingyuchen:backport-8334

Conversation

@davidhsingyuchen
Copy link
Contributor

@davidhsingyuchen davidhsingyuchen commented Jun 1, 2023 •
edited
Loading

PR is a backport for #8334 (82ec62b).

@k8s-ci-robot
Copy link

k8s-ci-robot commented Jun 1, 2023

Hi @davidhsingyuchen. 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.

@davidhsingyuchen davidhsingyuchen marked this pull request as ready for review June 1, 2023 17:37
@davidhsingyuchen
Copy link
Contributor Author

davidhsingyuchen commented Jun 1, 2023

/assign @AkihiroSuda

@AkihiroSuda
Copy link
Member

AkihiroSuda commented Jun 1, 2023

/ok-to-test

@davidhsingyuchen davidhsingyuchen mentioned this pull request Jun 1, 2023
Closed
@dcantah
Copy link
Member

dcantah commented Jun 1, 2023

Following the pointer over to this PR, can you cherry-pick 82ec62b instead of the merge commit?

@samuelkarp
Copy link
Member

samuelkarp commented Jun 1, 2023

Following the pointer over to this PR, can you cherry-pick 82ec62b instead of the merge commit?

Specifically, git cherry-pick -xs 82ec62b8658259eb29635045c5e190df26833da2 should do the trick (and annotate the cherry-pick properly with a pointer to the original commit).

@davidhsingyuchen
fix: cio.Cancel() should close the pipes
99582fb 
PR fixes containerd#8326.

Signed-off-by: Hsing-Yu (David) Chen <[email protected]>
(cherry picked from commit 82ec62b)
Signed-off-by: Hsing-Yu (David) Chen <[email protected]>
@davidhsingyuchen
Copy link
Contributor Author

davidhsingyuchen commented Jun 1, 2023

@dcantah @samuelkarp Thanks for the help! Done.

@dmcgowan dmcgowan merged commit a04e94b into containerd:release/1.7 Jun 2, 2023
@dcantah dcantah mentioned this pull request Jun 2, 2023
Merged
@davidhsingyuchen davidhsingyuchen deleted the backport-8334 branch June 2, 2023 16:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@samuelkarp samuelkarp samuelkarp approved these changes

@estesp estesp estesp approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees

@AkihiroSuda AkihiroSuda

Labels

ok-to-test

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@davidhsingyuchen @k8s-ci-robot @AkihiroSuda @dcantah @samuelkarp @dmcgowan @estesp