[release-1.21] oci: call wait on conmon if cgroup move fails #5297

openshift-cherrypick-robot · 2021-09-10T15:00:45Z

This is an automated cherry-pick of #5295

/assign haircommander

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

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]>

or else we will leak a pid Signed-off-by: Peter Hunt <[email protected]>

haircommander · 2021-09-10T15:03:18Z

/hold
until https://bugzilla.redhat.com/show_bug.cgi?id=2003197 is verified

codecov · 2021-09-10T15:13:07Z

Codecov Report

Merging #5297 (cee3ce9) into release-1.21 (ff0b7fe) will decrease coverage by 0.02%.
The diff coverage is 0.00%.

@@               Coverage Diff                @@
##           release-1.21    #5297      +/-   ##
================================================
- Coverage         44.98%   44.95%   -0.03%     
================================================
  Files               107      107              
  Lines             10960    10966       +6     
================================================
  Hits               4930     4930              
- Misses             5549     5555       +6     
  Partials            481      481

haircommander · 2021-09-29T16:23:16Z

/hold cancel
/retest
/lgtm
/approve

openshift-ci · 2021-09-29T16:23:22Z

[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:

~~OWNERS~~ [haircommander]

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

openshift-bot · 2021-09-29T16:33:04Z

/retest-required

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

openshift-bot · 2021-09-29T16:59:50Z

/retest-required

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

openshift-bot · 2021-09-29T18:10:21Z

/retest-required

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

openshift-bot · 2021-09-29T18:13:40Z

/retest-required

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

openshift-bot · 2021-09-29T18:26:38Z

/retest-required

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

openshift-bot · 2021-09-29T19:30:42Z

/retest-required

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

openshift-bot · 2021-09-29T19:43:38Z

/retest-required

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

openshift-bot · 2021-09-29T20:48:05Z

/retest-required

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

openshift-bot · 2021-09-29T21:36:02Z

/retest-required

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

openshift-bot · 2021-09-29T23:00:04Z

/retest-required

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

openshift-bot · 2021-09-29T23:12:30Z

/retest-required

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

openshift-bot · 2021-09-30T01:49:02Z

/retest-required

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

openshift-bot · 2021-09-30T20:26:33Z

/retest-required

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

openshift-bot · 2021-09-30T20:38:35Z

/retest-required

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

openshift-bot · 2021-09-30T20:50:35Z

/retest-required

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

openshift-bot · 2021-09-30T21:38:33Z

/retest-required

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

openshift-bot · 2021-09-30T21:50:34Z

/retest-required

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

openshift-bot · 2021-09-30T23:41:34Z

/retest-required

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

openshift-bot · 2021-10-01T00:07:35Z

/retest-required

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

openshift-bot · 2021-10-01T01:25:33Z

/retest-required

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

openshift-bot · 2021-10-01T01:38:43Z

/retest-required

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

openshift-bot · 2021-10-01T02:30:41Z

/retest-required

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

openshift-bot · 2021-10-01T02:43:57Z

/retest-required

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

openshift-bot · 2021-10-01T03:09:43Z

/retest-required

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

openshift-bot · 2021-10-01T04:53:42Z

/retest-required

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

openshift-bot · 2021-10-01T05:45:42Z

/retest-required

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

openshift-bot · 2021-10-01T06:24:41Z

/retest-required

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

openshift-bot · 2021-10-01T07:03:40Z

/retest-required

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

openshift-bot · 2021-10-01T07:42:47Z

/retest-required

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

openshift-bot · 2021-10-01T07:55:42Z

/retest-required

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

openshift-bot · 2021-10-01T08:34:43Z

/retest-required

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

openshift-bot · 2021-10-01T08:47:44Z

/retest-required

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

openshift-bot · 2021-10-01T09:13:41Z

/retest-required

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

openshift-ci · 2021-10-01T09:30:00Z

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

Test name	Commit	Details	Required	Rerun command
ci/openshift-jenkins/integration_crun_cgroupv2	`cee3ce9`	link	false	`/test integration_cgroupv2`
ci/openshift-jenkins/e2e_crun_cgroupv2	`cee3ce9`	link	false	`/test e2e_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-bot · 2021-10-01T10:31:42Z

/retest-required

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

openshift-bot · 2021-10-01T10:58:30Z

/retest-required

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

openshift-bot · 2021-10-01T11:20:45Z

/retest-required

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

haircommander · 2021-10-01T13:40:14Z

/cherry-pick release-1.20

openshift-cherrypick-robot · 2021-10-01T13:41:02Z

@haircommander: new pull request created: #5370

Details

In response to this:

/cherry-pick release-1.20

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.

haircommander added 2 commits September 10, 2021 15:00

oci: call wait on conmon if cgroup move fails

a25bf1a

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]>

call cmd.Wait() in all cases we call Start()

cee3ce9

or else we will leak a pid Signed-off-by: Peter Hunt <[email protected]>

openshift-cherrypick-robot requested review from mrunalp and runcom as code owners September 10, 2021 15:00

openshift-cherrypick-robot mentioned this pull request Sep 10, 2021

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

Merged

openshift-ci bot assigned haircommander Sep 10, 2021

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. labels Sep 10, 2021

openshift-ci bot requested a review from fidencio September 10, 2021 15:00

haircommander changed the title ~~[release-1.21] [release-1.22] oci: call wait on conmon if cgroup move fails~~ [release-1.21] oci: call wait on conmon if cgroup move fails Sep 10, 2021

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 10, 2021

openshift-ci bot added lgtm Indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Sep 29, 2021

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 29, 2021

openshift-merge-robot merged commit 2933275 into cri-o:release-1.21 Oct 1, 2021

openshift-cherrypick-robot mentioned this pull request Oct 1, 2021

[release-1.20] oci: call wait on conmon if cgroup move fails #5370

Merged

openshift-ci bot mentioned this pull request Mar 15, 2022

WIP: Bug 2062899 #5723

Closed

[release-1.21] oci: call wait on conmon if cgroup move fails #5297

[release-1.21] oci: call wait on conmon if cgroup move fails #5297

Uh oh!

Conversation

openshift-cherrypick-robot commented Sep 10, 2021

Uh oh!

haircommander commented Sep 10, 2021

Uh oh!

codecov bot commented Sep 10, 2021

Codecov Report

Uh oh!

haircommander commented Sep 29, 2021

Uh oh!

openshift-ci bot commented Sep 29, 2021

Uh oh!

openshift-bot commented Sep 29, 2021

Uh oh!

openshift-bot commented Sep 29, 2021

Uh oh!

openshift-bot commented Sep 29, 2021

Uh oh!

openshift-bot commented Sep 29, 2021

Uh oh!

openshift-bot commented Sep 29, 2021

Uh oh!

openshift-bot commented Sep 29, 2021

Uh oh!

openshift-bot commented Sep 29, 2021

Uh oh!

openshift-bot commented Sep 29, 2021

Uh oh!

openshift-bot commented Sep 29, 2021

Uh oh!

openshift-bot commented Sep 29, 2021

Uh oh!

openshift-bot commented Sep 29, 2021

Uh oh!

openshift-bot commented Sep 30, 2021

Uh oh!

openshift-bot commented Sep 30, 2021

Uh oh!

openshift-bot commented Sep 30, 2021

Uh oh!

openshift-bot commented Sep 30, 2021

Uh oh!

openshift-bot commented Sep 30, 2021

Uh oh!

openshift-bot commented Sep 30, 2021

Uh oh!

openshift-bot commented Sep 30, 2021

Uh oh!

openshift-bot commented Oct 1, 2021

Uh oh!

openshift-bot commented Oct 1, 2021

Uh oh!

openshift-bot commented Oct 1, 2021

Uh oh!

openshift-bot commented Oct 1, 2021

Uh oh!

openshift-bot commented Oct 1, 2021

Uh oh!

openshift-bot commented Oct 1, 2021

Uh oh!

openshift-bot commented Oct 1, 2021

Uh oh!

openshift-bot commented Oct 1, 2021

Uh oh!

openshift-bot commented Oct 1, 2021

Uh oh!

openshift-bot commented Oct 1, 2021

Uh oh!

openshift-bot commented Oct 1, 2021

Uh oh!

openshift-bot commented Oct 1, 2021

Uh oh!

openshift-bot commented Oct 1, 2021

Uh oh!

openshift-bot commented Oct 1, 2021

Uh oh!

openshift-bot commented Oct 1, 2021

openshift-ci bot commented Oct 1, 2021 •

edited

Loading