solve the failed test and avoid filtering

tdas · Sep 8, 2014 · 2835929 · 2835929
1 parent 2ca3091
commit 2835929
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
@@ -482,7 +482,7 @@ private[spark] class Master(
 
     // First schedule drivers, they take strict precedence over applications
     // Randomization helps balance drivers
-    val shuffledAliveWorkers = Random.shuffle(workers.filter(_.state == WorkerState.ALIVE))
+    val shuffledAliveWorkers = Random.shuffle(workers).toArray
     val aliveWorkerNum = shuffledAliveWorkers.size
     var curPos = aliveWorkerNum - 1
     for (driver <- List(waitingDrivers: _*)) {
@@ -491,7 +491,8 @@ private[spark] class Master(
       var launched = false
       while (curPos != startFlag && !launched) {
         val worker = shuffledAliveWorkers(curPos)
-        if (worker.memoryFree >= driver.desc.mem && worker.coresFree >= driver.desc.cores) {
+        if (worker.state == WorkerState.ALIVE
+          && worker.memoryFree >= driver.desc.mem && worker.coresFree >= driver.desc.cores) {
           launchDriver(worker, driver)
           waitingDrivers -= driver
           launched = true