Codecov Report

Merging #5433 (0ce45a3) into main (6ee64e9) will increase coverage by 0.00%.
The diff coverage is 77.27%.

@@           Coverage Diff           @@
##             main    #5433   +/-   ##
=======================================
  Coverage   43.46%   43.47%           
=======================================
  Files         118      118           
  Lines       11848    11851    +3     
=======================================
+ Hits         5150     5152    +2     
  Misses       6206     6206           
- Partials      492      493    +1     

for reference, we have a goroutine stack that has a ridiculous number of go routines stuck on this line

While this more seems like the go routine didn't receive correctly on the close of chControl, adding the buffer would also let the function make forward progress. i.e. I am suspecting something funky about the go runtime, but maybe we can work around it?

/retest

/test e2e-agnostic

/retest-required

so I didn't actually know why this could work but I guessed it would. Figured it out chatting with @rphillips today:
looking at https://github.com/cri-o/cri-o/blob/main/internal/oci/oci.go#L139-L146

			case <-chControl:
				return
			default:
				// Check if the container is stopped
				if err := impl.UpdateContainerStatus(ctx, c); err != nil {
					done <- err
					return
				}
				if c.State().Status == ContainerStateStopped {
					done <- nil
					return
				}

if chControl is closed while UpdateContainerStatus is running, we will wait forever on done, when we should check chControl. buffering the channel will allow us to make forward progress (without really complicating the code that much)

/retest

@cri-o/cri-o-maintainers PTAL

/retest

[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

/retest-required

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

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

Full PR test history. Your PR dashboard.

/retest-required

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

/retest-required

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

/cherry-pick release-1.22

@haircommander: once the present PR merges, I will cherry-pick it on top of release-1.22 in a new PR and assign it to you.

/retest-required

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

@haircommander: #5433 failed to apply on top of branch "release-1.22":

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
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".

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