OCPBUGS-76451: [release-1.35] : fix: prevent panic on closed stopTimeoutChan in StopContainer by openshift-cherrypick-robot · Pull Request #9814 · cri-o/cri-o

openshift-cherrypick-robot · 2026-03-13T10:39:14Z

This is an automated cherry-pick of #9799

/assign bitoku

Fixed a panic when concurrent StopContainer calls race against the stop lifecycle completing.

A race condition occurs when a second StopContainer call arrives after the container has already been marked as done stopping. Specifically, SetAsDoneStopping closes the stopTimeoutChan, and subsequent calls attempting to interact with or close this channel result in a "panic: close of closed channel". This patch adds a guard using the stopDone internal state within WaitOnStopTimeout to ensure we return early if the stop lifecycle has already completed, preventing redundant channel operations. Addresses: OCPBUGS-76451 Signed-off-by: Sabuj Maity <samaity@redhat.com>

openshift-ci-robot · 2026-03-13T10:39:19Z

@openshift-cherrypick-robot: Could not make automatic cherrypick of Jira Issue OCPBUGS-76451 for this PR as the target version is not set for this branch in the jira plugin config. Running refresh:
/jira refresh

/retitle [release-1.35] : fix: prevent panic on closed stopTimeoutChan in StopContainer

Details

In response to this:

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 openshift-eng/jira-lifecycle-plugin repository.

coderabbitai · 2026-03-13T10:39:23Z

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: eded6151-0764-479d-9805-3bd9b0b9c66f

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Post copyable unit tests in a comment

📝 Coding Plan

Generate coding plan for human review comments

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

Tip

You can make CodeRabbit's review stricter and more nitpicky using the `assertive` profile, if that's what you prefer.

Change the reviews.profile setting to assertive to make CodeRabbit's nitpick more issues in your PRs.

openshift-ci-robot · 2026-03-13T10:39:26Z

@openshift-ci-robot: This pull request references Jira Issue OCPBUGS-76451, which is invalid:

expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is MODIFIED instead
release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
expected Jira Issue OCPBUGS-76451 to depend on a bug in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

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 openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2026-03-13T10:39:31Z

@openshift-cherrypick-robot: No Jira issue is referenced in the title of this pull request.
To reference a jira issue, add 'XYZ-NNN:' to the title of this pull request and request another refresh with /jira refresh.

Details

In response to this:

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 openshift-eng/jira-lifecycle-plugin repository.

bitoku · 2026-03-13T10:41:22Z

/cherry-pick release-1.34

openshift-cherrypick-robot · 2026-03-13T10:41:26Z

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

Details

In response to this:

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-sigs/prow repository.

openshift-ci-robot · 2026-03-13T10:42:57Z

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-76451, which is invalid:

expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is MODIFIED instead
release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
expected Jira Issue OCPBUGS-76451 to depend on a bug in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

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 openshift-eng/jira-lifecycle-plugin repository.

bitoku · 2026-03-13T10:43:26Z

/jira refresh

openshift-ci-robot · 2026-03-13T10:43:31Z

@bitoku: This pull request references Jira Issue OCPBUGS-76451, which is invalid:

release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
expected Jira Issue OCPBUGS-76451 to depend on a bug in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

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 openshift-eng/jira-lifecycle-plugin repository.

bitoku · 2026-03-13T10:54:02Z

/jira refresh

codecov · 2026-03-13T13:48:47Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 67.82%. Comparing base (f998e4a) to head (f75bc6e).
⚠️ Report is 26 commits behind head on release-1.35.

Additional details and impacted files

@@               Coverage Diff                @@
##           release-1.35    #9814      +/-   ##
================================================
+ Coverage         67.53%   67.82%   +0.29%     
================================================
  Files               211      211              
  Lines             29161    30098     +937     
================================================
+ Hits              19693    20415     +722     
- Misses             7793     7974     +181     
- Partials           1675     1709      +34

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

github-actions · 2026-04-13T00:11:16Z

A friendly reminder that this PR had no activity for 30 days.

openshift-ci-robot · 2026-04-13T10:17:12Z

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-76451. The bug has been updated to no longer refer to the pull request using the external bug tracker.

Details

In response to this:

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 openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2026-04-13T10:17:19Z

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-76451, which is invalid:

expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is ON_QA instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

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 openshift-eng/jira-lifecycle-plugin repository.

bitoku · 2026-04-13T10:20:31Z

@cri-o/cri-o-maintainers PTAL

haircommander · 2026-04-13T17:51:03Z

/approve
/lgtm

openshift-ci · 2026-04-13T17:51:21Z

[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

sabujmaity · 2026-04-23T03:45:28Z

/retest

sabujmaity · 2026-04-23T06:56:53Z

/retest

bitoku · 2026-04-27T04:55:03Z

/retest

bitoku · 2026-04-28T14:25:37Z

/retest

bitoku · 2026-04-29T13:55:59Z

/retest

fgallott · 2026-04-29T15:18:23Z

/test images

ashwindasr · 2026-04-29T20:48:34Z

/test images

fgallott · 2026-04-30T06:58:51Z

/test images

bitoku · 2026-04-30T07:49:05Z

/retest

openshift-ci-robot · 2026-04-30T14:17:32Z

@openshift-cherrypick-robot: Jira Issue OCPBUGS-76451: All pull requests linked via external trackers have merged:

cri-o/cri-o#9814

Jira Issue OCPBUGS-76451 has been moved to the MODIFIED state.

Details

In response to this:

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 openshift-eng/jira-lifecycle-plugin repository.

openshift-cherrypick-robot · 2026-04-30T14:18:28Z

@bitoku: #9814 failed to apply on top of branch "release-1.34":

Applying: fix: prevent panic on closed stopTimeoutChan in StopContainer
Using index info to reconstruct a base tree...
M	internal/oci/container.go
M	internal/oci/container_test.go
Falling back to patching base and 3-way merge...
Auto-merging internal/oci/container_test.go
CONFLICT (content): Merge conflict in internal/oci/container_test.go
Auto-merging internal/oci/container.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 fix: prevent panic on closed stopTimeoutChan in StopContainer

Details

In response to this:

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-sigs/prow repository.

openshift-ci · 2026-04-30T17:31:17Z

@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/prow/e2e-aws-ovn	`f75bc6e`	link	unknown	`/test e2e-aws-ovn`

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-sigs/prow repository. I understand the commands that are listed here.

openshift-cherrypick-robot requested a review from mrunalp as a code owner March 13, 2026 10:39

openshift-cherrypick-robot mentioned this pull request Mar 13, 2026

OCPBUGS-76451: fix: prevent panic on closed stopTimeoutChan in StopContainer #9799

Merged

openshift-ci Bot assigned bitoku Mar 13, 2026

openshift-ci Bot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Mar 13, 2026

openshift-ci Bot added the dco-signoff: yes Indicates the PR's author has DCO signed all their commits. label Mar 13, 2026

openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Mar 13, 2026

openshift-ci Bot changed the title ~~[release-1.35] OCPBUGS-76451: fix: prevent panic on closed stopTimeoutChan in StopContainer~~ [release-1.35] : fix: prevent panic on closed stopTimeoutChan in StopContainer Mar 13, 2026

openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Mar 13, 2026

openshift-ci Bot requested review from bitoku and littlejawa March 13, 2026 10:39

bitoku changed the title ~~[release-1.35] : fix: prevent panic on closed stopTimeoutChan in StopContainer~~ OCPBUGS-76451: [release-1.35] : fix: prevent panic on closed stopTimeoutChan in StopContainer Mar 13, 2026

openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Mar 13, 2026

github-actions Bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Apr 13, 2026

bitoku closed this Apr 13, 2026

bitoku reopened this Apr 13, 2026

openshift-ci-robot added jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. and removed jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Apr 13, 2026

openshift-ci Bot assigned haircommander Apr 13, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 13, 2026

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 13, 2026

github-actions Bot removed the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Apr 14, 2026

openshift-merge-bot Bot merged commit b7a5104 into cri-o:release-1.35 Apr 30, 2026
85 of 93 checks passed

sabujmaity mentioned this pull request May 4, 2026

OCPBUGS-84922: fix: prevent panic on concurrent StopContainer calls #9920

Merged

Conversation

openshift-cherrypick-robot commented Mar 13, 2026

Uh oh!

openshift-ci-robot commented Mar 13, 2026

Uh oh!

coderabbitai Bot commented Mar 13, 2026

Review skipped

Uh oh!

openshift-ci-robot commented Mar 13, 2026

Uh oh!

openshift-ci-robot commented Mar 13, 2026

Uh oh!

bitoku commented Mar 13, 2026

Uh oh!

openshift-cherrypick-robot commented Mar 13, 2026

Uh oh!

openshift-ci-robot commented Mar 13, 2026

Uh oh!

bitoku commented Mar 13, 2026

Uh oh!

openshift-ci-robot commented Mar 13, 2026

Uh oh!

bitoku commented Mar 13, 2026

Uh oh!

codecov Bot commented Mar 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

github-actions Bot commented Apr 13, 2026

Uh oh!

openshift-ci-robot commented Apr 13, 2026

Uh oh!

openshift-ci-robot commented Apr 13, 2026

Uh oh!

bitoku commented Apr 13, 2026

Uh oh!

haircommander commented Apr 13, 2026

Uh oh!

openshift-ci Bot commented Apr 13, 2026

Uh oh!

sabujmaity commented Apr 23, 2026

Uh oh!

sabujmaity commented Apr 23, 2026

Uh oh!

bitoku commented Apr 27, 2026

Uh oh!

bitoku commented Apr 28, 2026

Uh oh!

bitoku commented Apr 29, 2026

Uh oh!

fgallott commented Apr 29, 2026

Uh oh!

ashwindasr commented Apr 29, 2026

Uh oh!

fgallott commented Apr 30, 2026

Uh oh!

bitoku commented Apr 30, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Apr 30, 2026

Uh oh!

openshift-cherrypick-robot commented Apr 30, 2026

Uh oh!

openshift-ci Bot commented Apr 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

codecov Bot commented Mar 13, 2026 •

edited

Loading