aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReynold Xin <rxin@apache.org>2014-09-27 22:18:02 -0700
committerReynold Xin <rxin@apache.org>2014-09-27 22:18:02 -0700
commit66e1c40c67f40dc4a5519812bc84877751933e7a (patch)
tree25dd39b9a3e5575eaefb690efd7a513016ae9f05
parent9966d1a8aaed3d8cfed93855959705ea3c677215 (diff)
downloadspark-66e1c40c67f40dc4a5519812bc84877751933e7a.tar.gz
spark-66e1c40c67f40dc4a5519812bc84877751933e7a.tar.bz2
spark-66e1c40c67f40dc4a5519812bc84877751933e7a.zip
Minor fix for the previous commit.
-rw-r--r--core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala6
-rw-r--r--core/src/main/scala/org/apache/spark/scheduler/cluster/ExecutorData.scala5
2 files changed, 5 insertions, 6 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
index 59e15edc75..89089e7d6f 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/CoarseGrainedSchedulerBackend.scala
@@ -142,9 +142,9 @@ class CoarseGrainedSchedulerBackend(scheduler: TaskSchedulerImpl, actorSystem: A
// Make fake resource offers on all executors
def makeOffers() {
- launchTasks(scheduler.resourceOffers(
- executorDataMap.map {case (id, executorData) =>
- new WorkerOffer(id, executorData.executorHost, executorData.freeCores)}.toSeq))
+ launchTasks(scheduler.resourceOffers(executorDataMap.map { case (id, executorData) =>
+ new WorkerOffer(id, executorData.executorHost, executorData.freeCores)
+ }.toSeq))
}
// Make fake resource offers on just one executor
diff --git a/core/src/main/scala/org/apache/spark/scheduler/cluster/ExecutorData.scala b/core/src/main/scala/org/apache/spark/scheduler/cluster/ExecutorData.scala
index 74a92985b6..b71bd5783d 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/cluster/ExecutorData.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/cluster/ExecutorData.scala
@@ -20,10 +20,9 @@ package org.apache.spark.scheduler.cluster
import akka.actor.{Address, ActorRef}
/**
- * Grouping of data that is accessed by a CourseGrainedScheduler. This class
- * is stored in a Map keyed by an executorID
+ * Grouping of data for an executor used by CoarseGrainedSchedulerBackend.
*
- * @param executorActor The actorRef representing this executor
+ * @param executorActor The ActorRef representing this executor
* @param executorAddress The network address of this executor
* @param executorHost The hostname that this executor is running on
* @param freeCores The current number of cores available for work on the executor