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

Skip to content

oci: call wait on conmon if cgroup move fails #5283

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 9, 2021
Merged

oci: call wait on conmon if cgroup move fails #5283

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

Conversation

@haircommander
Copy link
Member

@haircommander haircommander commented Sep 8, 2021

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]

What type of PR is this?

What this PR does / why we need it:

/kind bug

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

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
0732862 
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]>
@openshift-ci openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/bug Categorizes issue or PR as related to a bug. labels Sep 8, 2021
@openshift-ci openshift-ci bot requested a review from fidencio September 8, 2021 15:27
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 8, 2021
saschagrunert
saschagrunert approved these changes Sep 8, 2021
View reviewed changes
Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

LGTM

@codecov
Copy link

codecov bot commented Sep 8, 2021 •
edited
Loading

Codecov Report

Merging #5283 (a6ca9d3) into master (35d1be8) will decrease coverage by 0.02%.
The diff coverage is 0.00%.

❗ Current head a6ca9d3 differs from pull request most recent head 69e8851. Consider uploading reports for the commit 69e8851 to get more accurate results

@@            Coverage Diff             @@
##           master    #5283      +/-   ##
==========================================
- Coverage   43.76%   43.74%   -0.03%     
==========================================
  Files         118      118              
  Lines       11721    11727       +6     
==========================================
  Hits         5130     5130              
- Misses       6104     6110       +6     
  Partials      487      487

@haircommander
call cmd.Wait() in all cases we call Start()
69e8851 
or else we will leak a pid

Signed-off-by: Peter Hunt <[email protected]>
@haircommander
Copy link
Member Author

haircommander commented Sep 8, 2021

caught a couple other (unlikely) leaks as well

@haircommander
Copy link
Member Author

haircommander commented Sep 8, 2021

related to https://bugzilla.redhat.com/show_bug.cgi?id=1994444

@haircommander
Copy link
Member Author

haircommander commented Sep 8, 2021

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 8, 2021 •
edited
Loading

@haircommander: The following tests 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/e2e_crun_cgroupv2 69e8851 link /test e2e_cgroupv2
ci/openshift-jenkins/integration_crun_cgroupv2 69e8851 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.

saschagrunert
saschagrunert approved these changes Sep 9, 2021
View reviewed changes
Copy link
Member

@saschagrunert saschagrunert left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 9, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 9, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, saschagrunert

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:
  • OWNERS [haircommander,saschagrunert]

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

@openshift-bot
Copy link

openshift-bot commented Sep 9, 2021

/retest-required

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

1 similar comment
@openshift-bot
Copy link

openshift-bot commented Sep 9, 2021

/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 2ae3427 into cri-o:master Sep 9, 2021
@haircommander
Copy link
Member Author

haircommander commented Sep 10, 2021

/cherry-pick release-1.22

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

openshift-cherrypick-robot commented Sep 10, 2021

@haircommander: new pull request created: #5295

Details

In response to this:

/cherry-pick release-1.22

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.

This was referenced Sep 13, 2021
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@saschagrunert saschagrunert saschagrunert approved these changes

@mrunalp mrunalp Awaiting requested review from mrunalp

@runcom runcom Awaiting requested review from runcom

@fidencio fidencio Awaiting requested review from fidencio

Assignees

@saschagrunert saschagrunert

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. kind/bug Categorizes issue or PR as related to a bug. 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.

5 participants

@haircommander @openshift-bot @openshift-cherrypick-robot @saschagrunert @openshift-merge-robot