Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[1.21] oci: fix a couple of deadlocks in container stop code #5475

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
openshift-merge-robot merged 3 commits into from
Dec 2, 2021
Merged

[1.21] oci: fix a couple of deadlocks in container stop code #5475

openshift-merge-robot merged 3 commits into from
Dec 2, 2021

Conversation

@openshift-cherrypick-robot
Copy link

@openshift-cherrypick-robot openshift-cherrypick-robot commented Nov 29, 2021

This is an automated cherry-pick of #5447

/assign haircommander

none

@openshift-ci openshift-ci bot added release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Nov 29, 2021
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Nov 29, 2021
Merged
@openshift-ci openshift-ci bot requested review from giuseppe and sameo November 29, 2021 18:13
@codecov
Copy link

codecov bot commented Nov 29, 2021

Codecov Report

Merging #5475 (f8d6d07) into release-1.21 (84fa55d) will decrease coverage by 0.00%.
The diff coverage is 82.75%.

❗ Current head f8d6d07 differs from pull request most recent head f12d4b4. Consider uploading reports for the commit f12d4b4 to get more accurate results

@@               Coverage Diff                @@
##           release-1.21    #5475      +/-   ##
================================================
- Coverage         44.91%   44.90%   -0.01%     
================================================
  Files               107      107              
  Lines             10986    10989       +3     
================================================
+ Hits               4934     4935       +1     
- Misses             5571     5573       +2     
  Partials            481      481

@haircommander haircommander changed the title [release-1.21] [1.22] oci: fix a couple of deadlocks in container stop code [1.21] oci: fix a couple of deadlocks in container stop code Nov 29, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 29, 2021

@openshift-cherrypick-robot: The following tests 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/openshift-jenkins/integration_crun_cgroupv2 f12d4b4 link false /test integration_cgroupv2
ci/openshift-jenkins/e2e_crun_cgroupv2 f12d4b4 link false /test e2e_cgroupv2

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

@nee1esh
Copy link

nee1esh commented Nov 30, 2021

/retest-required

@haircommander
Copy link
Member

haircommander commented Dec 2, 2021

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 2, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 2, 2021

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

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 2, 2021
@openshift-merge-robot openshift-merge-robot merged commit c845cf4 into cri-o:release-1.21 Dec 2, 2021
@haircommander
Copy link
Member

haircommander commented Feb 3, 2022

/cherry-pick release-1.20

@openshift-cherrypick-robot
Copy link
Author

openshift-cherrypick-robot commented Feb 3, 2022

@haircommander: #5475 failed to apply on top of branch "release-1.20":

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
CONFLICT (content): Merge conflict in 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".
Details

In response to this:

/cherry-pick release-1.20

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 was referenced Feb 3, 2022
Merged
Merged
@openshift-ci openshift-ci bot mentioned this pull request Mar 15, 2022
Closed
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

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

@giuseppe giuseppe Awaiting requested review from giuseppe

@sameo sameo Awaiting requested review from sameo

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-none Denotes a PR that doesn't merit a release note.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@openshift-cherrypick-robot @nee1esh @haircommander @openshift-merge-robot