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

podman: bump RLIMIT_NOFILE also without CAP_SYS_RESOURCE #2126

Merged
merged 1 commit into from
Jan 10, 2019

Conversation

giuseppe
Copy link
Member

If we are not able to make arbitrary changes to the RLIMIT_NOFILE when
lacking CAP_SYS_RESOURCE, don't fail but bump the limit to the maximum
allowed. In this way the same code path works with rootless mode.

Closes: #2123

Signed-off-by: Giuseppe Scrivano gscrivan@redhat.com

if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, rlimits); err != nil {
return errors.Wrapf(err, "error setting new rlimits")
}
} else {
logrus.Info("running as rootless")
Copy link
Member

Choose a reason for hiding this comment

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

IDK what others think, but it might be nice to keep this in play.

Copy link
Member Author

Choose a reason for hiding this comment

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

why do we need it if the more generic version handles both cases?

Copy link
Member

Choose a reason for hiding this comment

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

I think it's just a nicety/reminder when scrounging through the logs that the command was running rootless. Not a strong leaning.

@mheon
Copy link
Member

mheon commented Jan 10, 2019

I'd almost rather just ignore the error from setrlimit, but this is fine too.
/approve

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mheon

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 Jan 10, 2019
@TomSweeneyRedHat
Copy link
Member

Changes LGTM, would like to keep the informational message, but a toss on that. Tests don't look happy though.

If we are not able to make arbitrary changes to the RLIMIT_NOFILE when
lacking CAP_SYS_RESOURCE, don't fail but bump the limit to the maximum
allowed.  In this way the same code path works with rootless mode.

Closes: containers#2123

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
@mheon
Copy link
Member

mheon commented Jan 10, 2019

Code LGTM

@mheon mheon added this to the 1.0 milestone Jan 10, 2019
@baude
Copy link
Member

baude commented Jan 10, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 10, 2019
@openshift-merge-robot openshift-merge-robot merged commit c3f632d into containers:master Jan 10, 2019
@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 27, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 27, 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