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

rootless: do not set PIDs limit if --cgroup-manager=cgroupfs

Browse Source 
even if the system is using cgroups v2, rootless is not able to setup
limits when the cgroup-manager is not systemd.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2019-10-11 13:34:51 +02:00
parent 10cbaadf4a
commit 5036b6a9fb
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/spec/spec.go
View File

@ -302,8 +302,8 @@ func (config *CreateConfig) createConfigToOCISpec(runtime *libpod.Runtime, userM
// RESOURCES - PIDS // RESOURCES - PIDS
if config.Resources.PidsLimit > 0 { if config.Resources.PidsLimit > 0 {
// if running on rootless on a cgroupv1 machine, pids limit is // if running on rootless on a cgroupv1 machine or using the cgroupfs manager, pids
// not supported. If the value is still the default // limit is not supported. If the value is still the default
// then ignore the settings. If the caller asked for a // then ignore the settings. If the caller asked for a
// non-default, then try to use it. // non-default, then try to use it.
setPidLimit := true setPidLimit := true
@ -312,7 +312,11 @@ func (config *CreateConfig) createConfigToOCISpec(runtime *libpod.Runtime, userM
if err != nil { if err != nil {
return nil, err return nil, err
} }
if !cgroup2 && config.Resources.PidsLimit == sysinfo.GetDefaultPidsLimit() { runtimeConfig, err := runtime.GetConfig()
if err != nil {
return nil, err
}
if (!cgroup2 || runtimeConfig.CgroupManager != libpod.SystemdCgroupsManager) && config.Resources.PidsLimit == sysinfo.GetDefaultPidsLimit() {
setPidLimit = false setPidLimit = false
} }
} }