aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Ousterhout <kayousterhout@gmail.com>2013-11-13 23:06:17 -0800
committerKay Ousterhout <kayousterhout@gmail.com>2013-11-13 23:06:17 -0800
commit5125cd34663b83edceaa40deaf5f7f48a12138e5 (patch)
treee149e9899b9a06f27d18f9340267a172b536e67e
parent2054c61a18c277c00661b89bbae365470c297031 (diff)
downloadspark-5125cd34663b83edceaa40deaf5f7f48a12138e5.tar.gz
spark-5125cd34663b83edceaa40deaf5f7f48a12138e5.tar.bz2
spark-5125cd34663b83edceaa40deaf5f7f48a12138e5.zip
Don't ignore spark.cores.max when using Mesos Coarse mode
-rw-r--r--core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
index 300fe693f1..cd521e0f2b 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala
@@ -181,6 +181,7 @@ private[spark] class CoarseMesosSchedulerBackend(
!slaveIdsWithExecutors.contains(slaveId)) {
// Launch an executor on the slave
val cpusToUse = math.min(cpus, maxCores - totalCoresAcquired)
+ totalCoresAcquired += cpusToUse
val taskId = newMesosTaskId()
taskIdToSlaveId(taskId) = slaveId
slaveIdsWithExecutors += slaveId