Re-word makeOffers by more readable lines

markhamstra · Jul 21, 2015 · 6e2ed96 · 6e2ed96
1 parent b5546ce
commit 6e2ed96
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala
@@ -169,12 +169,12 @@ class CoarseGrainedSchedulerBackend(scheduler: TaskSchedulerImpl, val rpcEnv: Rp
 
     // Make fake resource offers on all executors
     private def makeOffers() {
-      launchTasks(scheduler.resourceOffers(executorDataMap
-        // Filter out executors under killing
-        .filterKeys(!executorsPendingToRemove.contains(_))
-        .map { case (id, executorData) =>
-          new WorkerOffer(id, executorData.executorHost, executorData.freeCores)
-      }.toSeq))
+      // Filter out executors under killing
+      val activeExecutors = executorDataMap.filterKeys(!executorsPendingToRemove.contains(_))
+      val workOffers = activeExecutors.map { case (id, executorData) =>
+        new WorkerOffer(id, executorData.executorHost, executorData.freeCores)
+      }.toSeq
+      launchTasks(scheduler.resourceOffers(workOffers))
     }
 
     override def onDisconnected(remoteAddress: RpcAddress): Unit = {
@@ -187,8 +187,8 @@ class CoarseGrainedSchedulerBackend(scheduler: TaskSchedulerImpl, val rpcEnv: Rp
       // Filter out executors under killing
       if (!executorsPendingToRemove.contains(executorId)) {
         val executorData = executorDataMap(executorId)
-        launchTasks(scheduler.resourceOffers(
-          Seq(new WorkerOffer(executorId, executorData.executorHost, executorData.freeCores))))
+        val workOffers = Seq(new WorkerOffer(executorId, executorData.executorHost, executorData.freeCores))
+        launchTasks(scheduler.resourceOffers(workOffers))
       }
     }