[release-1.24] oci: take opLock for UpdateContainer #6129
Conversation
UpdateContainer requests can come in at any time in a container's lifecycle, even when it's shutting down. In some cases, it can cause a container to get stuck: runc pauses the cgroup on v1 and systemd to prevent systemd from mucking around while the cgroup is being updated. In some cases, CRI-O calls `UpdateContainerStatus` during that time, and gets `paused` state. CRI-O does not expect a container to be paused, so it doesn't know how to handle it. Fix this by taking opLock when updating Signed-off-by: Peter Hunt <[email protected]>
|
/cherry-pick release-1.23 |
|
@haircommander: once the present PR merges, I will cherry-pick it on top of release-1.23 in a new PR and assign it to you. DetailsIn 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/test-infra repository. |
Codecov Report
@@ Coverage Diff @@
## release-1.24 #6129 +/- ##
================================================
- Coverage 42.87% 42.85% -0.02%
================================================
Files 124 124
Lines 12679 12681 +2
================================================
- Hits 5436 5435 -1
- Misses 6725 6728 +3
Partials 518 518 |
saschagrunert
left a comment
There was a problem hiding this comment.
/lgtm
/hold
Feel free to lift the hold when this is ready.
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: openshift-cherrypick-robot, saschagrunert The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/hold cancel |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
2 similar comments
|
/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. |
|
/override ci/prow/e2e-agnostic |
|
@haircommander: Overrode contexts on behalf of haircommander: ci/prow/e2e-agnostic DetailsIn 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/test-infra repository. |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
|
@haircommander: new pull request created: #6143 DetailsIn 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/test-infra repository. |
This is an automated cherry-pick of #6122
/assign haircommander