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

Skip to content

[release-1.22] Use timeout for conmon cgroup move #5545

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 1 commit into from
Jan 18, 2022
Merged

[release-1.22] Use timeout for conmon cgroup move #5545

openshift-merge-robot merged 1 commit into from
Jan 18, 2022

Conversation

@openshift-cherrypick-robot
Copy link

@openshift-cherrypick-robot openshift-cherrypick-robot commented Jan 17, 2022

This is an automated cherry-pick of #5535

/assign haircommander

none

@saschagrunert
Use timeout for conmon cgroup move
257889b 
We're now using a timeout which is able to unblock gaining
the sandbox mutex in a container creation vs sandbox stop race.

Signed-off-by: Sascha Grunert <[email protected]>
Signed-off-by: Peter Hunt <[email protected]>
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jan 17, 2022
Merged
@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 Jan 17, 2022
@openshift-ci openshift-ci bot requested review from sameo and sboeuf January 17, 2022 18:02
@codecov
Copy link

codecov bot commented Jan 17, 2022

Codecov Report

Merging #5545 (257889b) into release-1.22 (f1d2c6e) will decrease coverage by 0.00%.
The diff coverage is 14.28%.

@@               Coverage Diff                @@
##           release-1.22    #5545      +/-   ##
================================================
- Coverage         43.72%   43.71%   -0.01%     
================================================
  Files               118      118              
  Lines             11785    11787       +2     
================================================
  Hits               5153     5153              
- Misses             6145     6147       +2     
  Partials            487      487

@haircommander
Copy link
Member

haircommander commented Jan 18, 2022

/retest
/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 18, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 18, 2022

[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 Jan 18, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 18, 2022 •
edited
Loading

@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/e2e_crun_cgroupv2 257889b link false /test e2e_cgroupv2
ci/openshift-jenkins/integration_crun_cgroupv2 257889b link false /test integration_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.

@openshift-bot
Copy link

openshift-bot commented Jan 18, 2022

/retest-required

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link

openshift-bot commented Jan 18, 2022

/retest-required

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 936ed81 into cri-o:release-1.22 Jan 18, 2022
@haircommander
Copy link
Member

haircommander commented Jan 20, 2022

/cherry-pick release-1.21

@openshift-cherrypick-robot
Copy link
Author

openshift-cherrypick-robot commented Jan 20, 2022

@haircommander: #5545 failed to apply on top of branch "release-1.21":

Applying: Use timeout for conmon cgroup move
Using index info to reconstruct a base tree...
M	utils/utils.go
Falling back to patching base and 3-way merge...
Auto-merging utils/utils.go
CONFLICT (content): Merge conflict in utils/utils.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use timeout for conmon cgroup move
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.21

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.

@haircommander haircommander mentioned this pull request Jan 20, 2022
Merged
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

@sameo sameo Awaiting requested review from sameo

@sboeuf sboeuf Awaiting requested review from sboeuf

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.

5 participants

@openshift-cherrypick-robot @haircommander @openshift-bot @openshift-merge-robot @saschagrunert