diff options
| author | Karen Feng <karenfeng.us@gmail.com> | 2013-07-23 15:47:16 -0700 |
|---|---|---|
| committer | Karen Feng <karenfeng.us@gmail.com> | 2013-07-23 15:47:16 -0700 |
| commit | abc78cd3318fb7bc69d10fd5422d20b299a8d7d8 (patch) | |
| tree | 2982ae7e872e6060684f5bda9f94af4cfe20582a /core | |
| parent | 383684daaa62bebc177b4c74573ce509f154f74b (diff) | |
| download | spark-abc78cd3318fb7bc69d10fd5422d20b299a8d7d8.tar.gz spark-abc78cd3318fb7bc69d10fd5422d20b299a8d7d8.tar.bz2 spark-abc78cd3318fb7bc69d10fd5422d20b299a8d7d8.zip | |
Modifies instead of copies HashSets, fixes comment style
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/spark/scheduler/DAGScheduler.scala | 2 | ||||
| -rw-r--r-- | core/src/main/scala/spark/ui/exec/ExecutorsUI.scala | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/core/src/main/scala/spark/scheduler/DAGScheduler.scala b/core/src/main/scala/spark/scheduler/DAGScheduler.scala index b02bf8f4bf..7bf50de660 100644 --- a/core/src/main/scala/spark/scheduler/DAGScheduler.scala +++ b/core/src/main/scala/spark/scheduler/DAGScheduler.scala @@ -52,7 +52,7 @@ class DAGScheduler( } taskSched.setListener(this) - //Called by TaskScheduler to report task's starting. + // Called by TaskScheduler to report task's starting. override def taskStarted(task: Task[_], taskInfo: TaskInfo) { eventQueue.put(BeginEvent(task, taskInfo)) } diff --git a/core/src/main/scala/spark/ui/exec/ExecutorsUI.scala b/core/src/main/scala/spark/ui/exec/ExecutorsUI.scala index 606e1eb2fc..69fb306074 100644 --- a/core/src/main/scala/spark/ui/exec/ExecutorsUI.scala +++ b/core/src/main/scala/spark/ui/exec/ExecutorsUI.scala @@ -121,14 +121,16 @@ private[spark] class ExecutorsUI(val sc: SparkContext) { override def onTaskStart(taskStart: SparkListenerTaskStart) { val eid = taskStart.taskInfo.executorId - executorToTasksActive(eid) = executorToTasksActive.getOrElse(eid, HashSet[Long]()) + - taskStart.taskInfo.taskId + if (!executorToTasksActive.contains(eid)) + executorToTasksActive(eid) = HashSet[Long]() + executorToTasksActive(eid) += taskStart.taskInfo.taskId } override def onTaskEnd(taskEnd: SparkListenerTaskEnd) { val eid = taskEnd.taskInfo.executorId - executorToTasksActive(eid) = executorToTasksActive.getOrElse(eid, HashSet[Long]()) - - taskEnd.taskInfo.taskId + if (!executorToTasksActive.contains(eid)) + executorToTasksActive(eid) = HashSet[Long]() + executorToTasksActive(eid) -= taskStart.taskInfo.taskId val (failureInfo, metrics): (Option[ExceptionFailure], Option[TaskMetrics]) = taskEnd.reason match { case e: ExceptionFailure => |