Skip to content

OCPBUGS-57735: [release-1.31] fix deadlock when the container is in uninterruptible sleep #9327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Jul 11, 2025
Merged

OCPBUGS-57735: [release-1.31] fix deadlock when the container is in uninterruptible sleep #9327

merged 1 commit into from
Jul 11, 2025

Conversation

bitoku
Copy link
Contributor

@bitoku bitoku commented Jul 8, 2025

(cherry picked from commit 1e751b4)

What type of PR is this?

What this PR does / why we need it:

cherry-pick from #9256

/assign bitoku

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Fix the bug that pod can't be terminated when the process is uninterruptible sleep for a while.

@bitoku
fix deadlock when the container is in uninterruptible sleep
103e03f 
Signed-off-by: Ayato Tokubi <atokubi@redhat.com>
(cherry picked from commit 1e751b4)
Signed-off-by: Ayato Tokubi <atokubi@redhat.com>

# Conflicts:
#	internal/oci/container.go
#	internal/oci/runtime_oci.go
@bitoku bitoku requested a review from mrunalp as a code owner July 8, 2025 12:06
@openshift-ci openshift-ci bot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Jul 8, 2025
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jul 8, 2025
@openshift-ci-robot
Copy link

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

  • expected dependent Jira Issue OCPBUGS-55485 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), 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.

In response to this:

(cherry picked from commit 1e751b4)

What type of PR is this?

What this PR does / why we need it:

cherry-pick from #9256

/assign bitoku

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Fix the bug that pod can't be terminated when the process is uninterruptible sleep for a while.

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 openshift-ci bot added the dco-signoff: yes Indicates the PR's author has DCO signed all their commits. label Jul 8, 2025
@openshift-ci openshift-ci bot requested review from hasan4791 and QiWang19 July 8, 2025 12:06
@bitoku
Copy link
Contributor Author

bitoku commented Jul 8, 2025

/hold
until release-1.32 is verified.

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 8, 2025
@bitoku
Copy link
Contributor Author

bitoku commented Jul 9, 2025

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Jul 9, 2025
@openshift-ci-robot
Copy link

@bitoku: This pull request references Jira Issue OCPBUGS-57735, which is valid. The bug has been moved to the POST state.

5 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-55485 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • bug has dependents

Requesting review from QA contact:
/cc @lyman9966

In response to this:

/jira refresh

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 openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jul 9, 2025
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jul 9, 2025

@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: lyman9966.

Note that only cri-o members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

@bitoku: This pull request references Jira Issue OCPBUGS-57735, which is valid. The bug has been moved to the POST state.

5 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-55485 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • bug has dependents

Requesting review from QA contact:
/cc @lyman9966

In response to this:

/jira refresh

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.

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.

@sohankunkerkar
Copy link
Member

The 1.32 release has already been accepted in this link, and it looks green.

sohankunkerkar
sohankunkerkar approved these changes Jul 11, 2025
View reviewed changes
Copy link
Member

@sohankunkerkar sohankunkerkar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 11, 2025
@sohankunkerkar sohankunkerkar added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 11, 2025
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jul 11, 2025

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: bitoku, sohankunkerkar

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:

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

@sohankunkerkar
Copy link
Member

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 11, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 0002055 into cri-o:release-1.31 Jul 11, 2025
36 of 40 checks passed
@openshift-ci-robot
Copy link

@bitoku: Jira Issue OCPBUGS-57735: All pull requests linked via external trackers have merged:

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

In response to this:

(cherry picked from commit 1e751b4)

What type of PR is this?

What this PR does / why we need it:

cherry-pick from #9256

/assign bitoku

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Fix the bug that pod can't be terminated when the process is uninterruptible sleep for a while.

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sohankunkerkar sohankunkerkar sohankunkerkar approved these changes

@mrunalp mrunalp Awaiting requested review from mrunalp mrunalp is a code owner

@hasan4791 hasan4791 Awaiting requested review from hasan4791

@QiWang19 QiWang19 Awaiting requested review from QiWang19

Assignees

@bitoku bitoku

@sohankunkerkar sohankunkerkar

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bitoku @openshift-ci-robot @sohankunkerkar