Set executor cpu resources to an integer to avoid rounding errors

This avoid that we either waste cpu resources due to rounding or that we report to much to the kubelet such that the e2e tests think they can schedule more than resources are available. This fixes https://github.com/mesosphere/kubernetes-mesos/issues/437

Set executor cpu resources to an integer to avoid rounding errors
14350778 · Dr. Stefan Schimanski · ae7830b4 · 14350778 · 14350778
Commit 14350778 authored Sep 15, 2015 by Dr. Stefan Schimanski
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

docker-compose.yml cluster/mesos/docker/docker-compose.yml +1 -0

executor.go contrib/mesos/pkg/executor/executor.go +1 -0

No files found.
--- a/cluster/mesos/docker/docker-compose.yml
+++ b/cluster/mesos/docker/docker-compose.yml
@@ -145,6 +145,7 @@ scheduler:
    --mesos-master=mesosmaster1:5050
    --cluster-dns=10.10.10.10
    --cluster-domain=cluster.local
+    --mesos-executor-cpus=1.0
    --v=4
  environment:
  - MESOS_DOCKER_ETCD_TIMEOUT

--- a/contrib/mesos/pkg/executor/executor.go
+++ b/contrib/mesos/pkg/executor/executor.go
@@ -979,6 +979,7 @@ func nodeInfo(si *mesos.SlaveInfo, ei *mesos.ExecutorInfo) NodeInfo {
 		case "cpus":
 			// We intentionally take the floor of executorCPU because cores are integers
 			// and we would loose a complete cpu here if the value is <1.
+			// TODO(sttts): switch to float64 when "Machine Allocables" are implemented
 			ni.Cores = int(r.GetScalar().GetValue() - float64(int(executorCPU)))
 		case "mem":
 			ni.Mem = int64(r.GetScalar().GetValue()-executorMem) * 1024 * 1024