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

Skip to content

[1.20] various deadlock backports #5597

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 9 commits into from
Feb 4, 2022
Merged

[1.20] various deadlock backports #5597

openshift-merge-robot merged 9 commits into from
Feb 4, 2022

Conversation

@haircommander
Copy link
Member

@haircommander haircommander commented Feb 3, 2022

What type of PR is this?

/kind feature

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Add functionality to use taskset to spawn new commands cri-o runs. Now, if InfraCtrCPUSet is called, all newly spawned commands will be placed in the InfraCtrCPUSet (as it's expected to be set to the reserved CPU set that system commands should run on).

saschagrunert and others added 9 commits February 3, 2022 15:34
@saschagrunert @haircommander
Use timeout for conmon cgroup move
4dd6849 
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]>
@haircommander
oci: make some channels buffered
f139cc0 
Signed-off-by: Peter Hunt <[email protected]>
@haircommander
oci: always close chControl
b646327 
Signed-off-by: Peter Hunt <[email protected]>
@haircommander
cmdrunner: create singleton
c45a41a 
Signed-off-by: Peter Hunt <[email protected]>
@haircommander
cmdrunner: add tests for prepended commands
9dcb022 
Signed-off-by: Peter Hunt <[email protected]>
@haircommander
config: prepend commands with taskset if InfraCtrCPUSet is configured
6965c91 
Signed-off-by: Peter Hunt <[email protected]>
@haircommander
cmdrunner: update mocks and add target to makefile
eefa7a7 
Signed-off-by: Peter Hunt <[email protected]>
@haircommander
conmonmgr: refactor for new CommandRunner
89dd820 
Signed-off-by: Peter Hunt <[email protected]>
@haircommander
use cmdrunner singleton
f707f20 
Signed-off-by: Peter Hunt <[email protected]>
@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. kind/feature Categorizes issue or PR as related to a new feature. labels Feb 3, 2022
@openshift-ci openshift-ci bot requested a review from sameo February 3, 2022 20:47
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 3, 2022
@haircommander
Copy link
Member Author

haircommander commented Feb 3, 2022

#5535 #5475 #5557

@haircommander
Copy link
Member Author

haircommander commented Feb 3, 2022

/retest

saschagrunert
saschagrunert approved these changes Feb 4, 2022
View reviewed changes
Copy link
Member

@saschagrunert saschagrunert 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 Feb 4, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 4, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: haircommander, saschagrunert

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:
  • OWNERS [haircommander,saschagrunert]

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

@openshift-merge-robot openshift-merge-robot merged commit d7f3909 into cri-o:release-1.20 Feb 4, 2022
@haircommander
Copy link
Member Author

haircommander commented Feb 4, 2022

/cherry-pick release-1.19

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Feb 4, 2022

@haircommander: #5597 failed to apply on top of branch "release-1.19":

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.19

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.

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

Reviewers

@saschagrunert saschagrunert saschagrunert approved these changes

@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

Assignees

@saschagrunert saschagrunert

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. kind/feature Categorizes issue or PR as related to a new feature. 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.

4 participants

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