Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-1.20] oci: always reap conmon zombies #5704

Conversation

openshift-cherrypick-robot

This is an automated cherry-pick of #5510

/assign haircommander

Fix a case where conmon children are sometimes leaked

@openshift-ci openshift-ci bot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Mar 4, 2022
@openshift-ci openshift-ci bot added the dco-signoff: yes Indicates the PR's author has DCO signed all their commits. label Mar 4, 2022
@haircommander haircommander changed the title [release-1.20] [release-1.21] oci: always reap conmon zombies [release-1.20]oci: always reap conmon zombies Mar 4, 2022
@haircommander haircommander changed the title [release-1.20]oci: always reap conmon zombies [release-1.20] oci: always reap conmon zombies Mar 4, 2022
@haircommander
Copy link
Member

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 4, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 4, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, openshift-cherrypick-robot

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 4, 2022
@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 4, 2022
Even if we kill the process, we still need to wait for it, or else we'll reap a zombie.

Signed-off-by: Peter Hunt <pehunt@redhat.com>
Signed-off-by: Peter Hunt <pehunt@redhat.com>
@haircommander haircommander force-pushed the cherry-pick-5510-to-release-1.20 branch from 5643ad4 to d42b536 Compare March 4, 2022 19:43
@haircommander
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 4, 2022
@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 76ea3d0 into cri-o:release-1.20 Mar 5, 2022
@haircommander
Copy link
Member

/cherry-pick release-1.19

@haircommander
Copy link
Member

@openshift-cherrypick-robot
Copy link
Author

@haircommander: #5704 failed to apply on top of branch "release-1.19":

Applying: oci: always reap conmon zombies
Applying: run make mockgen to fix unit tests
Using index info to reconstruct a base tree...
M	test/mocks/cmdrunner/cmdrunner.go
Falling back to patching base and 3-way merge...
Auto-merging test/mocks/cmdrunner/cmdrunner.go
CONFLICT (content): Merge conflict in test/mocks/cmdrunner/cmdrunner.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 run make mockgen to fix unit tests
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".

In response to this:

/cherry-pick release-1.19

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants