Skip to content
Snippets Groups Projects
Commit cae8a679 authored by Stephen Haberman's avatar Stephen Haberman
Browse files

Fix dangling old variable names.

parent 696eec32
No related branches found
No related tags found
No related merge requests found
...@@ -79,7 +79,7 @@ private[spark] class MesosSchedulerBackend( ...@@ -79,7 +79,7 @@ private[spark] class MesosSchedulerBackend(
val memory = Resource.newBuilder() val memory = Resource.newBuilder()
.setName("mem") .setName("mem")
.setType(Value.Type.SCALAR) .setType(Value.Type.SCALAR)
.setScalar(Value.Scalar.newBuilder().setValue(EXECUTOR_MEMORY).build()) .setScalar(Value.Scalar.newBuilder().setValue(executorMemory).build())
.build() .build()
val command = CommandInfo.newBuilder() val command = CommandInfo.newBuilder()
.setValue(execScript) .setValue(execScript)
...@@ -151,7 +151,7 @@ private[spark] class MesosSchedulerBackend( ...@@ -151,7 +151,7 @@ private[spark] class MesosSchedulerBackend(
def enoughMemory(o: Offer) = { def enoughMemory(o: Offer) = {
val mem = getResource(o.getResourcesList, "mem") val mem = getResource(o.getResourcesList, "mem")
val slaveId = o.getSlaveId.getValue val slaveId = o.getSlaveId.getValue
mem >= EXECUTOR_MEMORY || slaveIdsWithExecutors.contains(slaveId) mem >= executorMemory || slaveIdsWithExecutors.contains(slaveId)
} }
for ((offer, index) <- offers.zipWithIndex if enoughMemory(offer)) { for ((offer, index) <- offers.zipWithIndex if enoughMemory(offer)) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment