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

podman: fix --cgroups=disabled

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2020-04-24 11:56:19 +02:00
parent 9f8d002e1f
commit 2e6a62fc38
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/podman/common/specgen.go
View File

@ -119,13 +119,13 @@ func getIOLimits(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string) (
func getPidsLimits(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string) (*specs.LinuxPids, error) { func getPidsLimits(s *specgen.SpecGenerator, c *ContainerCLIOpts, args []string) (*specs.LinuxPids, error) {
pids := &specs.LinuxPids{} pids := &specs.LinuxPids{}
hasLimits := false hasLimits := false
if c.CGroupsMode == "disabled" && c.PIDsLimit > 0 {
return nil, nil
}
if c.PIDsLimit > 0 { if c.PIDsLimit > 0 {
pids.Limit = c.PIDsLimit pids.Limit = c.PIDsLimit
hasLimits = true hasLimits = true
} }
if c.CGroupsMode == "disabled" && c.PIDsLimit > 0 {
s.ResourceLimits.Pids.Limit = -1
}
if !hasLimits { if !hasLimits {
return nil, nil return nil, nil
} }

1
test/e2e/run_test.go
View File

@ -937,7 +937,6 @@ USER mail`
}) })
It("podman run with cgroups=disabled runs without cgroups", func() { It("podman run with cgroups=disabled runs without cgroups", func() {
Skip(v2fail)
SkipIfRemote() SkipIfRemote()
SkipIfRootless() SkipIfRootless()
// Only works on crun // Only works on crun