[1.21] oci: fix a couple of deadlocks in container stop code

[openshift-cherrypick-robot]

This is an automated cherry-pick of #5447

/assign haircommander

none

[codecov]

Codecov Report

Merging #5475 (f8d6d07) into release-1.21 (84fa55d) will decrease coverage by 0.00%.
The diff coverage is 82.75%.

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

@@               Coverage Diff                @@
##           release-1.21    #5475      +/-   ##
================================================
- Coverage         44.91%   44.90%   -0.01%     
================================================
  Files               107      107              
  Lines             10986    10989       +3     
================================================
+ Hits               4934     4935       +1     
- Misses             5571     5573       +2     
  Partials            481      481              

[openshift-ci]

@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	f12d4b4	link	false	/test integration_cgroupv2
ci/openshift-jenkins/e2e_crun_cgroupv2	f12d4b4	link	false	/test e2e_cgroupv2

Full PR test history. Your PR dashboard.

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.

[nee1esh]

/retest-required

[haircommander]

/lgtm
/approve

[openshift-ci]

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

• OWNERS [haircommander]

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

[haircommander]

/cherry-pick release-1.20

[openshift-cherrypick-robot]

@haircommander: #5475 failed to apply on top of branch "release-1.20":

Applying: oci: make some channels buffered
Applying: oci: always close chControl
Applying: oci: fix deadlock in container stop code
Using index info to reconstruct a base tree...
M	internal/oci/container.go
M	internal/oci/runtime_oci.go
Falling back to patching base and 3-way merge...
Auto-merging internal/oci/runtime_oci.go
CONFLICT (content): Merge conflict in internal/oci/runtime_oci.go
Auto-merging internal/oci/container.go
CONFLICT (content): Merge conflict in internal/oci/container.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 oci: fix deadlock in container stop code
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.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.