Explorar o código

Merge pull request #9552 from glours/fix-deploy-cpus-issue

Fix deploy cpus issue and support pids limit
Guillaume Lours %!s(int64=3) %!d(string=hai) anos
pai
achega
57975094cc
Modificáronse 1 ficheiros con 6 adicións e 2 borrados
  1. 6 2
      pkg/compose/create.go

+ 6 - 2
pkg/compose/create.go

@@ -595,8 +595,12 @@ func setLimits(limits *types.Resource, resources *container.Resources) {
 		resources.Memory = int64(limits.MemoryBytes)
 		resources.Memory = int64(limits.MemoryBytes)
 	}
 	}
 	if limits.NanoCPUs != "" {
 	if limits.NanoCPUs != "" {
-		i, _ := strconv.ParseInt(limits.NanoCPUs, 10, 64)
-		resources.NanoCPUs = i
+		if f, err := strconv.ParseFloat(limits.NanoCPUs, 64); err == nil {
+			resources.NanoCPUs = int64(f * 1e9)
+		}
+	}
+	if limits.PIds > 0 {
+		resources.PidsLimit = &limits.PIds
 	}
 	}
 }
 }