diff options
| author | Reynold Xin <rxin@apache.org> | 2013-11-14 10:32:11 -0800 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2013-11-14 10:32:11 -0800 |
| commit | 1a4cfbea334c7b0dae287eab4c3131c8f4b8a992 (patch) | |
| tree | e42ddd86809f18e82cb2816729c8c1e0f7646064 /core | |
| parent | 5a4f483652c3dc0730d1c908a6a46e2f77d270e1 (diff) | |
| parent | 5125cd34663b83edceaa40deaf5f7f48a12138e5 (diff) | |
| download | spark-1a4cfbea334c7b0dae287eab4c3131c8f4b8a992.tar.gz spark-1a4cfbea334c7b0dae287eab4c3131c8f4b8a992.tar.bz2 spark-1a4cfbea334c7b0dae287eab4c3131c8f4b8a992.zip | |
Merge pull request #169 from kayousterhout/mesos_fix
Don't ignore spark.cores.max when using Mesos Coarse mode
totalCoresAcquired is decremented but never incremented, causing Spark to effectively ignore spark.cores.max in coarse grained Mesos mode.
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/CoarseMesosSchedulerBackend.scala | 1 |
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 |