diff options
| author | Stephen Haberman <stephen@exigencecorp.com> | 2013-02-02 02:15:39 -0600 |
|---|---|---|
| committer | Stephen Haberman <stephen@exigencecorp.com> | 2013-02-02 02:15:39 -0600 |
| commit | cae8a6795c7f454b74c8d3c4425a6ced151d6d9b (patch) | |
| tree | 1a9ac8893ae278e39125dec929b80c927b9b1a3c | |
| parent | 696eec32c982ca516c506de33f383a173bcbd131 (diff) | |
| download | spark-cae8a6795c7f454b74c8d3c4425a6ced151d6d9b.tar.gz spark-cae8a6795c7f454b74c8d3c4425a6ced151d6d9b.tar.bz2 spark-cae8a6795c7f454b74c8d3c4425a6ced151d6d9b.zip | |
Fix dangling old variable names.
| -rw-r--r-- | core/src/main/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala b/core/src/main/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala index 5c8b531de3..300766d0f5 100644 --- a/core/src/main/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala +++ b/core/src/main/scala/spark/scheduler/mesos/MesosSchedulerBackend.scala @@ -79,7 +79,7 @@ private[spark] class MesosSchedulerBackend( val memory = Resource.newBuilder() .setName("mem") .setType(Value.Type.SCALAR) - .setScalar(Value.Scalar.newBuilder().setValue(EXECUTOR_MEMORY).build()) + .setScalar(Value.Scalar.newBuilder().setValue(executorMemory).build()) .build() val command = CommandInfo.newBuilder() .setValue(execScript) @@ -151,7 +151,7 @@ private[spark] class MesosSchedulerBackend( def enoughMemory(o: Offer) = { val mem = getResource(o.getResourcesList, "mem") val slaveId = o.getSlaveId.getValue - mem >= EXECUTOR_MEMORY || slaveIdsWithExecutors.contains(slaveId) + mem >= executorMemory || slaveIdsWithExecutors.contains(slaveId) } for ((offer, index) <- offers.zipWithIndex if enoughMemory(offer)) { |