Skip to content

[release-1.33] RFC: sandbox: use created/stopped instead of infra container for readiness #9214

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
May 27, 2025
Merged

[release-1.33] RFC: sandbox: use created/stopped instead of infra container for readiness #9214

merged 1 commit into from
May 27, 2025

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #9188

/assign haircommander

Fix a potential deadlock when an infra container is taking a long time to exit and the sandbox's readiness is blocked on the infra container's opLock

@haircommander
sandbox: use created/stopped instead of infra container for readiness
7ca5aa7 
As we hit cases of deadlock when a sandbox is stuck stopping

Signed-off-by: Peter Hunt <pehunt@redhat.com>
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request May 21, 2025
Merged
@openshift-ci openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels May 21, 2025
@openshift-ci openshift-ci bot requested review from hasan4791 and QiWang19 May 21, 2025 14:03
@codecov Codecov
Copy link

codecov bot commented May 21, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 70.27027% with 11 lines in your changes missing coverage. Please review.

Project coverage is 47.36%. Comparing base (9d143f9) to head (7ca5aa7).
Report is 2 commits behind head on release-1.33.

Additional details and impacted files 
@@               Coverage Diff                @@
##           release-1.33    #9214      +/-   ##
================================================
+ Coverage         47.30%   47.36%   +0.06%     
================================================
  Files               162      162              
  Lines             24034    24052      +18     
================================================
+ Hits              11369    11393      +24     
+ Misses            11547    11541       -6     
  Partials           1118     1118
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@bitoku
Copy link
Contributor

bitoku commented May 21, 2025

/test all

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented May 21, 2025

@bitoku: No presubmit jobs available for cri-o/cri-o@release-1.33

In response to this:

/test all

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.

@haircommander
Copy link
Member

we need to setup CI in o/release, similar to openshift/release#60098

@bitoku
Copy link
Contributor

bitoku commented May 21, 2025

openshift/release#65211

@haircommander
Copy link
Member

I'm gonna merge this because 1.33 and main are so similar rn

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 27, 2025
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented May 27, 2025

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

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

@haircommander
Copy link
Member

/cherry-pick release-1.32

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 27, 2025
@openshift-cherrypick-robot
Copy link
Author

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

In response to this:

/cherry-pick release-1.32

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-merge-bot openshift-merge-bot bot merged commit 24b9f1f into cri-o:release-1.33 May 27, 2025
52 checks passed
@openshift-cherrypick-robot
Copy link
Author

@haircommander: #9214 failed to apply on top of branch "release-1.32":

Applying: sandbox: use created/stopped instead of infra container for readiness
Using index info to reconstruct a base tree...
M	internal/lib/container_server.go
M	internal/lib/sandbox/sandbox.go
M	internal/lib/sandbox/sandbox_test.go
M	server/container_portforward.go
M	server/sandbox_status.go
M	server/server.go
Falling back to patching base and 3-way merge...
Auto-merging server/server.go
Auto-merging server/sandbox_status.go
Auto-merging server/container_portforward.go
Auto-merging internal/lib/sandbox/sandbox_test.go
Auto-merging internal/lib/sandbox/sandbox.go
CONFLICT (content): Merge conflict in internal/lib/sandbox/sandbox.go
Auto-merging internal/lib/container_server.go
CONFLICT (content): Merge conflict in internal/lib/container_server.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 advice.mergeConflict false"
Patch failed at 0001 sandbox: use created/stopped instead of infra container for readiness

In response to this:

/cherry-pick release-1.32

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.

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

@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

@haircommander haircommander

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. 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
@openshift-cherrypick-robot @bitoku @haircommander