Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[release-1.22] oci: call wait on conmon if cgroup move fails #5295

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.

Sign up for GitHub

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

Jump to bottom
Merged
openshift-merge-robot merged 2 commits into from
Sep 10, 2021
Merged

[release-1.22] oci: call wait on conmon if cgroup move fails #5295

openshift-merge-robot merged 2 commits into from
Sep 10, 2021

Conversation

@openshift-cherrypick-robot
Copy link

@openshift-cherrypick-robot openshift-cherrypick-robot commented Sep 10, 2021

This is an automated cherry-pick of #5283

/assign haircommander

fix a PID leak in situations where conmon fails to be moved into the pod cgroup

@haircommander
oci: call wait on conmon if cgroup move fails
2bd8e31 
if we fail to move conmon to a cgroup, we still need to call Wait() on the process, or else we will leak a child

Signed-off-by: Peter Hunt <[email protected]>
@haircommander
call cmd.Wait() in all cases we call Start()
4542e51 
or else we will leak a pid

Signed-off-by: Peter Hunt <[email protected]>
@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 Sep 10, 2021
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 10, 2021
Merged
@openshift-ci openshift-ci bot added the dco-signoff: yes Indicates the PR's author has DCO signed all their commits. label Sep 10, 2021
@haircommander
Copy link
Member

haircommander commented Sep 10, 2021

/lgtm
/approve

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 10, 2021
@haircommander
Copy link
Member

haircommander commented Sep 10, 2021

/lgtm
/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 10, 2021

[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

Details 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

@codecov
Copy link

codecov bot commented Sep 10, 2021

Codecov Report

Merging #5295 (dc1576c) into release-1.22 (011c10a) will decrease coverage by 0.03%.
The diff coverage is 0.00%.

❗ Current head dc1576c differs from pull request most recent head 4542e51. Consider uploading reports for the commit 4542e51 to get more accurate results

@@               Coverage Diff                @@
##           release-1.22    #5295      +/-   ##
================================================
- Coverage         43.78%   43.74%   -0.04%     
================================================
  Files               118      118              
  Lines             11721    11727       +6     
================================================
- Hits               5132     5130       -2     
- Misses             6102     6110       +8     
  Partials            487      487

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 10, 2021

@openshift-cherrypick-robot: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Rerun command
ci/openshift-jenkins/integration_crun_cgroupv2 4542e51 link /test integration_cgroupv2

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit 148b8c9 into cri-o:release-1.22 Sep 10, 2021
@haircommander
Copy link
Member

haircommander commented Sep 10, 2021

/cherry-pick release-1.21

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Sep 10, 2021
Merged
@openshift-cherrypick-robot
Copy link
Author

openshift-cherrypick-robot commented Sep 10, 2021

@haircommander: new pull request created: #5297

Details

In response to this:

/cherry-pick release-1.21

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.

@openshift-ci openshift-ci bot mentioned this pull request Jan 17, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mrunalp mrunalp Awaiting requested review from mrunalp mrunalp is a code owner

@runcom runcom Awaiting requested review from runcom runcom is a code owner

@haircommander haircommander Awaiting requested review from haircommander

Assignees

@haircommander haircommander

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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@openshift-cherrypick-robot @haircommander @openshift-merge-robot