Skip to content

bugfix:fix container logs lost because io close too quickly#12364

Merged
estesp merged 1 commit intocontainerd:mainfrom
ningmingxiao:bugfix_exec
Oct 15, 2025
Merged

bugfix:fix container logs lost because io close too quickly#12364
estesp merged 1 commit intocontainerd:mainfrom
ningmingxiao:bugfix_exec

Conversation

@ningmingxiao
Copy link
Contributor

@ningmingxiao ningmingxiao commented Oct 10, 2025 •
edited
Loading

fix #12289
I find TestContainerExecLargeOutputWithTTY failed because of container exec logs lost.
https://github.com/containerd/containerd/blob/v2.1.4/cmd/containerd-shim-runc-v2/process/exec.go#L108-L109

func (e *execProcess) delete(ctx context.Context) error {
	waitTimeout(ctx, &e.wg, 2*time.Second)

waitTimeout will return context.Canceled.
so default 2 second timeout sometimes is not enough.

PTAL thanks @fuweid @cpuguy83 @AkihiroSuda @dmcgowan @djdongjin
the ci failed is because of other reason. 😮‍💨

@github-project-automation github-project-automation bot moved this to Needs Triage in Pull Request Review Oct 10, 2025
@k8s-ci-robot
Copy link

k8s-ci-robot commented Oct 10, 2025

Hi @ningmingxiao. 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-sigs/prow repository.

@ningmingxiao ningmingxiao mentioned this pull request Oct 10, 2025
Open
@ningmingxiao ningmingxiao mentioned this pull request Oct 11, 2025
Closed
@dmcgowan dmcgowan added this to the 2.2 milestone Oct 15, 2025
@dmcgowan dmcgowan moved this from Needs Triage to Review In Progress in Pull Request Review Oct 15, 2025
@estesp estesp added this pull request to the merge queue Oct 15, 2025
Merged via the queue into containerd:main with commit 890c9ef Oct 15, 2025
126 of 138 checks passed
@github-project-automation github-project-automation bot moved this from Review In Progress to Done in Pull Request Review Oct 15, 2025
@ningmingxiao ningmingxiao deleted the bugfix_exec branch October 15, 2025 19:35
@AkihiroSuda
Copy link
Member

AkihiroSuda commented Oct 16, 2025

/cherry-pick release/2.1
/cherry-pick release/2.0
/cherry-pick release/1.7

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Oct 16, 2025

@AkihiroSuda: new pull request created: #12375

Details

In response to this:

/cherry-pick release/2.1
/cherry-pick release/2.0
/cherry-pick 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-sigs/prow repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Oct 16, 2025
Merged
@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Oct 16, 2025

@AkihiroSuda: new pull request created: #12376

Details

In response to this:

/cherry-pick release/2.1
/cherry-pick release/2.0
/cherry-pick 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-sigs/prow repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Oct 16, 2025
Merged
@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Oct 16, 2025

@AkihiroSuda: new pull request created: #12377

Details

In response to this:

/cherry-pick release/2.1
/cherry-pick release/2.0
/cherry-pick 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-sigs/prow repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Oct 16, 2025
Merged
@fuweid fuweid added cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch labels Nov 5, 2025
@fuweid fuweid added the cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch label Nov 5, 2025
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

@estesp estesp estesp approved these changes

Assignees

No one assigned

Labels

area/runtime Runtime cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch cherry-picked/2.1.x PR commits are cherry picked into the release/2.1 branch kind/bug needs-ok-to-test size/XS

Projects

Pull Request Review
Archived in project

Milestone

2.2

Development

Successfully merging this pull request may close these issues.

ci failed TestContainerExecLargeOutputWithTTY

7 participants

@ningmingxiao @k8s-ci-robot @AkihiroSuda @k8s-infra-cherrypick-robot @dmcgowan @estesp @fuweid