From 826587fab9e2976092c0ed54b385d4c8cb596fbf Mon Sep 17 00:00:00 2001 From: "archit.thakur" Date: Fri, 20 Nov 2015 20:42:24 +0530 Subject: [PATCH] SPARK-7729: scalastyle again. --- .../main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala | 2 +- .../main/scala/org/apache/spark/ui/exec/ExecutorsTab.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala b/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala index dee2c575f12c2..8b028dcf049ef 100644 --- a/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala +++ b/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala @@ -55,7 +55,7 @@ private[ui] class ExecutorsPage( private val listener = parent.listener def render(request: HttpServletRequest): Seq[Node] = { - val storageStatusList = + val storageStatusList = listener.storageStatusList ++ listener.removedExecutorStorageStatusList val maxMem = storageStatusList.map(_.maxMem).sum val memUsed = storageStatusList.map(_.memUsed).sum diff --git a/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsTab.scala b/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsTab.scala index 96ec5d9890e7b..1e19f686cbab5 100644 --- a/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsTab.scala +++ b/core/src/main/scala/org/apache/spark/ui/exec/ExecutorsTab.scala @@ -58,8 +58,8 @@ class ExecutorsListener(storageStatusListener: StorageStatusListener) extends Sp val executorIdToData = HashMap[String, ExecutorUIData]() def storageStatusList: Seq[StorageStatus] = storageStatusListener.storageStatusList - - def removedExecutorStorageStatusList: Seq[StorageStatus] = + + def removedExecutorStorageStatusList: Seq[StorageStatus] = storageStatusListener.removedExecutorStorageStatusList override def onExecutorAdded(executorAdded: SparkListenerExecutorAdded): Unit = synchronized {