Merge pull request #1111 from keloyang/rpid-limit-check

dqminh · web-flow · commit d186a7552b91 · 2016-10-13T18:04:49.000+01:00
tiny fix, add a null check for specs.Resources.Pids.Limit
diff --git a/libcontainer/specconv/spec_linux.go b/libcontainer/specconv/spec_linux.go
@@ -373,7 +373,7 @@ func createCgroupConfig(name string, useSystemdCgroup bool, spec *specs.Spec) (*
 			c.Resources.CpusetMems = *r.CPU.Mems
 		}
 	}
-	if r.Pids != nil {
+	if r.Pids != nil && r.Pids.Limit != nil {
 		c.Resources.PidsLimit = *r.Pids.Limit
 	}
 	if r.BlockIO != nil {

Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ func createCgroupConfig(name string, useSystemdCgroup bool, spec specs.Spec) (`
`373`	`373`	`c.Resources.CpusetMems = *r.CPU.Mems`
`374`	`374`	`}`
`375`	`375`	`}`
`376`		`- if r.Pids != nil {`
	`376`	`+ if r.Pids != nil && r.Pids.Limit != nil {`
`377`	`377`	`c.Resources.PidsLimit = *r.Pids.Limit`
`378`	`378`	`}`
`379`	`379`	`if r.BlockIO != nil {`