summaryrefslogtreecommitdiff
path: root/pkg/sysinfo/sysinfo_linux.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2019-09-14 06:21:10 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2019-10-04 16:09:13 -0400
commit118cf1fc634ffc63b908d6b082ffc3a53553a6af (patch)
tree8d7f04fd776b39f6b685ce1a37d2f4935e39915c /pkg/sysinfo/sysinfo_linux.go
parentbd08fc0e9b3a9943008585879877b68789e38c31 (diff)
downloadpodman-118cf1fc634ffc63b908d6b082ffc3a53553a6af.tar.gz
podman-118cf1fc634ffc63b908d6b082ffc3a53553a6af.tar.bz2
podman-118cf1fc634ffc63b908d6b082ffc3a53553a6af.zip
Setup a reasonable default for pids-limit 4096
CRI-O defaults to 1024 for the maximum pids in a container. Podman should have a similar limit. Once we have a containers.conf, we can set the limit in this file, and have it easily customizable. Currently the documentation says that -1 sets pids-limit=max, but -1 fails. This patch allows -1, but also indicates that 0 also sets the max pids limit. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/sysinfo/sysinfo_linux.go')
-rw-r--r--pkg/sysinfo/sysinfo_linux.go15
1 files changed, 11 insertions, 4 deletions
diff --git a/pkg/sysinfo/sysinfo_linux.go b/pkg/sysinfo/sysinfo_linux.go
index 9e675c655..76bda23c6 100644
--- a/pkg/sysinfo/sysinfo_linux.go
+++ b/pkg/sysinfo/sysinfo_linux.go
@@ -7,6 +7,7 @@ import (
"path"
"strings"
+ cg "github.com/containers/libpod/pkg/cgroups"
"github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/sirupsen/logrus"
"golang.org/x/sys/unix"
@@ -227,12 +228,18 @@ func checkCgroupCpusetInfo(cgMounts map[string]string, quiet bool) cgroupCpusetI
// checkCgroupPids reads the pids information from the pids cgroup mount point.
func checkCgroupPids(quiet bool) cgroupPids {
- _, err := cgroups.FindCgroupMountpoint("", "pids")
+ cgroup2, err := cg.IsCgroup2UnifiedMode()
if err != nil {
- if !quiet {
- logrus.Warn(err)
+ logrus.Errorf("Failed to check cgroups version: %v", err)
+ }
+ if !cgroup2 {
+ _, err := cgroups.FindCgroupMountpoint("", "pids")
+ if err != nil {
+ if !quiet {
+ logrus.Warn(err)
+ }
+ return cgroupPids{}
}
- return cgroupPids{}
}
return cgroupPids{