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

Do not error on pids.current stats if ctr.path is empty #5728

Merged
merged 1 commit into from
Apr 7, 2020

Conversation

saschagrunert
Copy link
Member

If the ctr.path is empty, then we do not try to access
/sys/fs/cgroup/pids/pids.current any more because this path will be
wrong in any case. We now return and do not set the PIDs stats.

Refers to cri-o/cri-o#3522

/assign @giuseppe

@mheon
Copy link
Member

mheon commented Apr 6, 2020

Looks like 3 flakes (two networking pulling images, Podman RMI with cached images in special_testing_rootless). Restarted the lot.

@mheon
Copy link
Member

mheon commented Apr 6, 2020

LGTM but want a signoff from @giuseppe before we merge

@mheon
Copy link
Member

mheon commented Apr 6, 2020

/approve

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 6, 2020
pkg/cgroups/pids.go Outdated Show resolved Hide resolved
If the ctr.path is empty, then we do not try to access
`/sys/fs/cgroup/pids/pids.current` any more because this path will be
wrong in any case. We now return and do not set the PIDs stats.

Refers to cri-o/cri-o#3522

Signed-off-by: Sascha Grunert <[email protected]>
@giuseppe
Copy link
Member

giuseppe commented Apr 7, 2020

thanks, LGTM

@rhatdan
Copy link
Member

rhatdan commented Apr 7, 2020

/lgtm
/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 7, 2020
@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 7, 2020
@rhatdan
Copy link
Member

rhatdan commented Apr 7, 2020

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 7, 2020
@openshift-merge-robot openshift-merge-robot merged commit 44f910c into containers:master Apr 7, 2020
@saschagrunert saschagrunert deleted the pids.current branch April 7, 2020 14:08
@saschagrunert
Copy link
Member Author

Hey, can we create a new patch release containing this fix?

@rhatdan
Copy link
Member

rhatdan commented Apr 9, 2020

We are planning on releasing podman-1.9.0-rc1 today or Monday.

@saschagrunert
Copy link
Member Author

Sounds good, thank you! 🙏

@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 25, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 25, 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.

6 participants