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

Skip to content

[1.19] cgmgr: reuse dbus connection #5053

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 8 commits into from
Jul 9, 2021
Merged

[1.19] cgmgr: reuse dbus connection #5053

openshift-merge-robot merged 8 commits into from
Jul 9, 2021

Conversation

@haircommander
Copy link
Member

@haircommander haircommander commented Jun 30, 2021

What type of PR is this?

/kind bug

What this PR does / why we need it:

reuse dbus connection and attempt to reconnect if we get a dbus error
this PR heavily adapts https://github.com/opencontainers/runc/blob/7362fa2d282feffb9b19911150e01e390a23899d/libcontainer/cgroups/systemd

eventually, the plan is to upstream the internal/dbusmgr package to godbus, but we're picking this here first

cherry-pick of #4986

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Reuse connection when connecting to dbus, as well as reattempt the connection if it fails temporarily

@haircommander
vendor: bump go-systemd to v22.2.0
299380f 
Signed-off-by: Peter Hunt <[email protected]>
@haircommander
try again on EAGAIN from dbus
be3f544 
Signed-off-by: Peter Hunt <[email protected]>
@haircommander
cgmgr: create systemd manager constructor
2f43323 
Signed-off-by: Peter Hunt <[email protected]>
@haircommander
cgmgr: reuse dbus connection
0094292 
as well as adapt opencontainers/runc code for retrying dbus connections

Signed-off-by: Peter Hunt <[email protected]>
@haircommander
dbusmgr: protect against races in NewDbusConnManager
4f7db54 
Signed-off-by: Peter Hunt <[email protected]>
@haircommander
utils: close dbus conn channel
c1d8742 
Signed-off-by: Peter Hunt <[email protected]>
@haircommander
simplify checking for dbus error
cfdb0bf 
Signed-off-by: Peter Hunt <[email protected]>
@haircommander
dbus: update retryondisconnect to handle eagain too
dbf5e32 
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. kind/bug Categorizes issue or PR as related to a bug. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Jun 30, 2021
@openshift-ci openshift-ci bot requested review from giuseppe and sboeuf June 30, 2021 20:11
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 30, 2021
saschagrunert
saschagrunert approved these changes Jul 9, 2021
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 Jul 9, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 9, 2021

[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

@haircommander
Copy link
Member Author

haircommander commented Jul 9, 2021

/retest

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jul 9, 2021

@haircommander: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/kata-jenkins dbf5e32 link /test kata-containers
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-ci
Copy link
Contributor

openshift-ci bot commented Jul 9, 2021 •
edited
Loading

@haircommander: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/openshift-jenkins/e2e_crun_cgroupv2 dbf5e32 link /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.

@haircommander
Copy link
Member Author

haircommander commented Jul 9, 2021

/override ci/kata-jenkins

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 9, 2021

@haircommander: Overrode contexts on behalf of haircommander: ci/kata-jenkins

Details

In response to this:

/override ci/kata-jenkins

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.

@openshift-merge-robot openshift-merge-robot merged commit 76013e3 into cri-o:release-1.19 Jul 9, 2021
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

@giuseppe giuseppe Awaiting requested review from giuseppe

@sboeuf sboeuf Awaiting requested review from sboeuf

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/bug Categorizes issue or PR as related to a bug. 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-ci-robot @saschagrunert @openshift-merge-robot