diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-07 15:01:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-07 15:01:27 -0700 |
| commit | c817ea1b33966c2f1f089b5c086df8cc45437065 (patch) | |
| tree | eccc53908a469d5b71234bebf5957a70a8f9fd3a /pkg/sysinfo/sysinfo_linux.go | |
| parent | 589261f275b485d78a6ac1bd7b95578257fc020f (diff) | |
| parent | 118cf1fc634ffc63b908d6b082ffc3a53553a6af (diff) | |
| download | podman-c817ea1b33966c2f1f089b5c086df8cc45437065.tar.gz podman-c817ea1b33966c2f1f089b5c086df8cc45437065.tar.bz2 podman-c817ea1b33966c2f1f089b5c086df8cc45437065.zip | |
Merge pull request #4032 from rhatdan/pids-limit
Setup a reasonable default for pids-limit 4096
Diffstat (limited to 'pkg/sysinfo/sysinfo_linux.go')
| -rw-r--r-- | pkg/sysinfo/sysinfo_linux.go | 15 |
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{ |