opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 09:28:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6786 from rhafer/rootless_rlimit

Browse Source 
specgen: fix order for setting rlimits
This commit is contained in:
OpenShift Merge Robot
2020-06-26 09:31:38 -04:00
committed by GitHub
parent bb11b42879 43c19966f6
commit d721f1fee6
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/specgen/generate/oci.go
View File

@ -52,10 +52,14 @@ func addRlimits(s *specgen.SpecGenerator, g *generate.Generator) error {
if err := unix.Getrlimit(unix.RLIMIT_NOFILE, &rlimit); err != nil { if err := unix.Getrlimit(unix.RLIMIT_NOFILE, &rlimit); err != nil {
logrus.Warnf("failed to return RLIMIT_NOFILE ulimit %q", err) logrus.Warnf("failed to return RLIMIT_NOFILE ulimit %q", err)
} }
if rlimit.Cur < current {
current = rlimit.Cur current = rlimit.Cur
}
if rlimit.Max < max {
max = rlimit.Max max = rlimit.Max
} }
g.AddProcessRlimits("RLIMIT_NOFILE", current, max) }
g.AddProcessRlimits("RLIMIT_NOFILE", max, current)
} }
if !nprocSet { if !nprocSet {
max := kernelMax max := kernelMax
@ -65,10 +69,14 @@ func addRlimits(s *specgen.SpecGenerator, g *generate.Generator) error {
if err := unix.Getrlimit(unix.RLIMIT_NPROC, &rlimit); err != nil { if err := unix.Getrlimit(unix.RLIMIT_NPROC, &rlimit); err != nil {
logrus.Warnf("failed to return RLIMIT_NPROC ulimit %q", err) logrus.Warnf("failed to return RLIMIT_NPROC ulimit %q", err)
} }
if rlimit.Cur < current {
current = rlimit.Cur current = rlimit.Cur
}
if rlimit.Max < max {
max = rlimit.Max max = rlimit.Max
} }
g.AddProcessRlimits("RLIMIT_NPROC", current, max) }
g.AddProcessRlimits("RLIMIT_NPROC", max, current)
} }
return nil return nil