Skip to content
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.

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

Don't fail if one of the cgroups is not setup #9110

Merged
merged 1 commit into from
Jan 28, 2021

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Jan 26, 2021

It is fairly common for certain cgroups controllers to
not be enabled on a system. We should Warn when this happens
versus failing, when doing podman stats command. This way users
can get information from the other controllers.

Fixes: #8588

Signed-off-by: Daniel J Walsh [email protected]

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 26, 2021
@rhatdan
Copy link
Member Author

rhatdan commented Jan 26, 2021

@giuseppe WDYT of this PR?

pkg/cgroups/cgroups.go Outdated Show resolved Hide resolved
@rhatdan rhatdan force-pushed the cgroups branch 5 times, most recently from 3d8bacd to 4974b85 Compare January 26, 2021 22:37
pkg/cgroups/cgroups.go Outdated Show resolved Hide resolved
pkg/cgroups/cgroups.go Outdated Show resolved Hide resolved
}

var resources spec.LinuxResources
cgr, err := New("machine.slice", &resources)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we check cgr is what we want?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, I was just throwing these in to keep the test checker happy. Since I don't see an easy way to test my changes.

@giuseppe
Copy link
Member

@giuseppe WDYT of this PR?

I think it is beautiful :-)

@rhatdan rhatdan force-pushed the cgroups branch 3 times, most recently from ae0181c to 5be13ce Compare January 27, 2021 15:51
@TomSweeneyRedHat
Copy link
Member

couple nits, otherwise LGTM once tests are happy.

It is fairly common for certain cgroups controllers to
not be enabled on a system.  We should Warn when this happens
versus failing, when doing podman stats command.  This way users
can get information from the other controllers.

Fixes: containers#8588

Signed-off-by: Daniel J Walsh <[email protected]>
Copy link
Member

@giuseppe giuseppe 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-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

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

@rhatdan rhatdan added the lgtm Indicates that a PR is ready to be merged. label Jan 28, 2021
@openshift-merge-robot openshift-merge-robot merged commit 0c6a889 into containers:master Jan 28, 2021
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 23, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Issue with podman stats command since v2.2.0
6 participants