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

Merge pull request #4235 from giuseppe/no-pids-cgroupfs

Browse Source 
rootless: do not set PIDs limit if --cgroup-manager=cgroupfs
This commit is contained in:
OpenShift Merge Robot
2019-10-11 16:45:46 +02:00
committed by GitHub
parent 495db28c75 5036b6a9fb
commit 9f1f4ef19e
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
if config.Resources.PidsLimit > 0 {
// if running on rootless on a cgroupv1 machine, pids limit is
// not supported. If the value is still the default
// if running on rootless on a cgroupv1 machine or using the cgroupfs manager, pids
// limit is not supported. If the value is still the default
// then ignore the settings. If the caller asked for a
// non-default, then try to use it.
setPidLimit := true
@ -312,7 +312,11 @@ func (config *CreateConfig) createConfigToOCISpec(runtime *libpod.Runtime, userM
if err != nil {
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
}
}