Merge pull request #3917 from jaininshah9/master

schmichael · web-flow · commit 262772197368 · 2018-02-28T20:00:37.000-08:00
changing the formula to correctly pass the CPUQota to docker
diff --git a/client/driver/docker.go b/client/driver/docker.go
@@ -1138,9 +1138,13 @@ func (d *DockerDriver) createContainerConfig(ctx *ExecContext, task *structs.Tas
 	}
 
 	// Calculate CPU Quota
+	// cfs_quota_us is the time per core, so we must
+	// multiply the time by the number of cores available
+	// See https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/6/html/resource_management_guide/sec-cpu
 	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

Original file line number	Diff line number	Diff line change
`@@ -1138,9 +1138,13 @@ func (d DockerDriver) createContainerConfig(ctx ExecContext, task *structs.Tas`
`1138`	`1138`	`}`
`1139`	`1139`
`1140`	`1140`	`// Calculate CPU Quota`
	`1141`	`+ // cfs_quota_us is the time per core, so we must`
	`1142`	`+ // multiply the time by the number of cores available`
	`1143`	`+ // See https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/6/html/resource_management_guide/sec-cpu`
`1141`	`1144`	`if driverConfig.CPUHardLimit {`
	`1145`	`+ numCores := runtime.NumCPU()`
`1142`	`1146`	`percentTicks := float64(task.Resources.CPU) / float64(d.node.Resources.CPU)`
`1143`		`- hostConfig.CPUQuota = int64(percentTicks * defaultCFSPeriodUS)`
	`1147`	`+ hostConfig.CPUQuota = int64(percentTicksdefaultCFSPeriodUS) int64(numCores)`
`1144`	`1148`	`}`
`1145`	`1149`
`1146`	`1150`	`// Windows does not support MemorySwap/MemorySwappiness #2193`