changing the formula to correctly pass the CPUQota to docker

a64fd0c4 · Jainin Shah · 7f1e01d3 · a64fd0c4
Commit a64fd0c4 authored 7 years ago by Jainin Shah
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 1 deletion
+2 -1
--- a/client/driver/docker.go
+++ b/client/driver/docker.go
@@ -1139,8 +1139,9 @@ func (d *DockerDriver) createContainerConfig(ctx *ExecContext, task *structs.Tas

 	// Calculate CPU Quota
 	if driverConfig.CPUHardLimit {
+		numCores := runtime.NumCPU()
 		percentTicks := float64(task.Resources.CPU) / float64(d.node.Resources.CPU)
-		hostConfig.CPUQuota = int64(percentTicks * defaultCFSPeriodUS)
+		hostConfig.CPUQuota = int64(percentTicks*defaultCFSPeriodUS) * int64(numCores)
 	}

 	// Windows does not support MemorySwap/MemorySwappiness #2193