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

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

This is an automated cherry-pick of #5297

/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-10-01T13:43:21Z

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

openshift-ci-robot · 2021-10-01T14:17:00Z

@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	Required	Rerun command
ci/kata-jenkins	`826801e`	link	true	`/test kata-containers`

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.

haircommander · 2021-10-11T22:04:13Z

/retest
/approve
/lgtm

haircommander · 2021-10-11T22:04:23Z

/unhold

openshift-bot · 2021-10-11T23:19:39Z

/retest-required

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

openshift-bot · 2021-10-11T23:32:37Z

/retest-required

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

openshift-bot · 2021-10-12T00:37:36Z

/retest-required

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

openshift-bot · 2021-10-12T01:16:38Z

/retest-required

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

openshift-bot · 2021-10-12T01:29:38Z

/retest-required

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

openshift-bot · 2021-10-12T02:08:37Z

/retest-required

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

openshift-bot · 2021-10-12T02:33:36Z

/retest-required

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

openshift-bot · 2021-10-12T02:57:54Z

/retest-required

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

openshift-bot · 2021-10-12T03:09:51Z

/retest-required

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

openshift-bot · 2021-10-12T03:46:28Z

/retest-required

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

openshift-bot · 2021-10-12T03:57:54Z

/retest-required

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

openshift-bot · 2021-10-12T05:21:54Z

/retest-required

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

openshift-bot · 2021-10-12T05:57:52Z

/retest-required

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

openshift-bot · 2021-10-12T06:22:10Z

/retest-required

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

openshift-bot · 2021-10-12T06:57:51Z

/retest-required

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

openshift-bot · 2021-10-12T07:09:52Z

/retest-required

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

openshift-bot · 2021-10-12T07:21:53Z

/retest-required

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

openshift-bot · 2021-10-12T07:45:57Z

/retest-required

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

saschagrunert · 2021-10-12T07:51:10Z

@fidencio the kata containers job seems to be broken for this one, is this a known issue?

saschagrunert · 2021-10-12T07:51:31Z

/hold

mrunalp

/lgtm

saschagrunert

/lgtm

openshift-ci · 2021-10-14T07:57:59Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, mrunalp, openshift-cherrypick-robot, 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,mrunalp,saschagrunert]

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

saschagrunert · 2021-10-14T07:58:13Z

/retest

saschagrunert · 2021-10-14T07:58:40Z

/override ci/kata-jenkins

openshift-ci · 2021-10-14T07:58:44Z

@saschagrunert: Overrode contexts on behalf of saschagrunert: ci/kata-jenkins

Details

In response to this:

/override ci/kata-jenkins

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.

saschagrunert · 2021-10-14T08:12:38Z

/override ci/openshift-jenkins/integration_rhel

openshift-ci · 2021-10-14T08:13:13Z

@saschagrunert: Overrode contexts on behalf of saschagrunert: ci/openshift-jenkins/integration_rhel

Details

In response to this:

/override ci/openshift-jenkins/integration_rhel

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.

saschagrunert · 2021-10-14T08:16:41Z

/unhold

saschagrunert · 2021-10-14T08:16:49Z

Test fix in #5404

saschagrunert · 2021-10-14T08:21:44Z

/override ci/openshift-jenkins/integration_rhel

openshift-ci · 2021-10-14T08:22:21Z

@saschagrunert: Overrode contexts on behalf of saschagrunert: ci/openshift-jenkins/integration_rhel

Details

In response to this:

/override ci/openshift-jenkins/integration_rhel

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-bot · 2021-10-14T08:38:32Z

/retest-required

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

openshift-bot · 2021-10-14T09:38:33Z

/retest-required

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

haircommander · 2021-10-14T15:34:16Z

/cherry-pick release-1.19

openshift-cherrypick-robot · 2021-10-14T15:34:53Z

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

Applying: oci: call wait on conmon if cgroup move fails
Applying: call cmd.Wait() in all cases we call Start()
Using index info to reconstruct a base tree...
M	internal/oci/runtime_oci.go
M	internal/storage/image.go
Falling back to patching base and 3-way merge...
Auto-merging internal/storage/image.go
CONFLICT (content): Merge conflict in internal/storage/image.go
Auto-merging internal/oci/runtime_oci.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 call cmd.Wait() in all cases we call Start()
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".

Details

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.

haircommander added 2 commits October 1, 2021 13:41

oci: call wait on conmon if cgroup move fails

b440fdb

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()

826801e

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 October 1, 2021 13:41

openshift-ci bot assigned haircommander Oct 1, 2021

openshift-ci bot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Oct 1, 2021

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

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

Merged

openshift-ci bot added the dco-signoff: yes Indicates the PR's author has DCO signed all their commits. label Oct 1, 2021

openshift-ci bot requested review from kolyshkin and sboeuf October 1, 2021 13:41

haircommander changed the title ~~[release-1.20] [release-1.21] oci: call wait on conmon if cgroup move fails~~ [release-1.20] oci: call wait on conmon if cgroup move fails Oct 1, 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 Oct 1, 2021

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 Oct 11, 2021

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 11, 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 Oct 12, 2021

mrunalp approved these changes Oct 13, 2021

View reviewed changes

openshift-ci bot assigned mrunalp Oct 13, 2021

saschagrunert approved these changes Oct 14, 2021

View reviewed changes

openshift-ci bot assigned saschagrunert Oct 14, 2021

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

openshift-merge-robot merged commit 14a27db into cri-o:release-1.20 Oct 14, 2021

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

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

Uh oh!

Conversation

openshift-cherrypick-robot commented Oct 1, 2021

Uh oh!

haircommander commented Oct 1, 2021

Uh oh!

openshift-ci-robot commented Oct 1, 2021

Uh oh!

haircommander commented Oct 11, 2021

Uh oh!

haircommander commented Oct 11, 2021

Uh oh!

openshift-bot commented Oct 11, 2021

Uh oh!

openshift-bot commented Oct 11, 2021

Uh oh!

openshift-bot commented Oct 12, 2021

Uh oh!

openshift-bot commented Oct 12, 2021

Uh oh!

openshift-bot commented Oct 12, 2021

Uh oh!

openshift-bot commented Oct 12, 2021

Uh oh!

openshift-bot commented Oct 12, 2021

Uh oh!

openshift-bot commented Oct 12, 2021

Uh oh!

openshift-bot commented Oct 12, 2021

Uh oh!

openshift-bot commented Oct 12, 2021

Uh oh!

openshift-bot commented Oct 12, 2021

Uh oh!

openshift-bot commented Oct 12, 2021

Uh oh!

openshift-bot commented Oct 12, 2021

Uh oh!

openshift-bot commented Oct 12, 2021

Uh oh!

openshift-bot commented Oct 12, 2021

Uh oh!

openshift-bot commented Oct 12, 2021

Uh oh!

openshift-bot commented Oct 12, 2021

Uh oh!

openshift-bot commented Oct 12, 2021

Uh oh!

saschagrunert commented Oct 12, 2021

Uh oh!

saschagrunert commented Oct 12, 2021

Uh oh!

mrunalp left a comment

Choose a reason for hiding this comment

Uh oh!

saschagrunert left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Oct 14, 2021

Uh oh!

saschagrunert commented Oct 14, 2021

Uh oh!

saschagrunert commented Oct 14, 2021

Uh oh!

openshift-ci bot commented Oct 14, 2021

Uh oh!

saschagrunert commented Oct 14, 2021

Uh oh!

openshift-ci bot commented Oct 14, 2021

Uh oh!

saschagrunert commented Oct 14, 2021

Uh oh!

saschagrunert commented Oct 14, 2021

Uh oh!

saschagrunert commented Oct 14, 2021

Uh oh!

openshift-ci bot commented Oct 14, 2021

Uh oh!