Display finished executors table (fix bug)

The table was previously hidden by a comment, which disconnected the HTML from the rest of the content. Yay Scala DSL.
apache · Jun 17, 2014 · 161f8a2 · 161f8a2
1 parent fbb65b8
commit 161f8a2
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 60 deletions.
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala b/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala
@@ -96,15 +96,11 @@ private[spark] class ApplicationPage(parent: MasterWebUI) extends WebUIPage("app
       <div class="row-fluid"> <!-- Executors -->
         <div class="span12">
           <h4> Executor Summary </h4>
+          {executorsTable}
           {
-            executorsTable ++
-            {
-              if (removedExecutors.nonEmpty) {
-                <h4> Removed Executors </h4> ++
-                removedExecutorsTable
-              } else {
-                Seq.empty[Node]
-              }
+            if (removedExecutors.nonEmpty) {
+              <h4> Removed Executors </h4> ++
+              removedExecutorsTable
             }
           }
         </div>

diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala b/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala
@@ -47,73 +47,61 @@ private[spark] class WorkerPage(parent: WorkerWebUI) extends WebUIPage("") {
     val workerState = Await.result(stateFuture, timeout)
 
     val executorHeaders = Seq("ExecutorID", "Cores", "Memory", "Job Details", "Logs")
+    val runningExecutors = workerState.executors
     val runningExecutorTable =
-      UIUtils.listingTable(executorHeaders, executorRow, workerState.executors)
+      UIUtils.listingTable(executorHeaders, executorRow, runningExecutors)
+    val finishedExecutors = workerState.finishedExecutors
     val finishedExecutorTable =
-      UIUtils.listingTable(executorHeaders, executorRow, workerState.finishedExecutors)
+      UIUtils.listingTable(executorHeaders, executorRow, finishedExecutors)
 
     val driverHeaders = Seq("DriverID", "Main Class", "State", "Cores", "Memory", "Logs", "Notes")
     val runningDrivers = workerState.drivers.sortBy(_.driverId).reverse
     val runningDriverTable = UIUtils.listingTable(driverHeaders, driverRow, runningDrivers)
     val finishedDrivers = workerState.finishedDrivers.sortBy(_.driverId).reverse
-    def finishedDriverTable = UIUtils.listingTable(driverHeaders, driverRow, finishedDrivers)
+    val finishedDriverTable = UIUtils.listingTable(driverHeaders, driverRow, finishedDrivers)
 
     // For now we only show driver information if the user has submitted drivers to the cluster.
     // This is until we integrate the notion of drivers and applications in the UI.
-    def hasDrivers = runningDrivers.length > 0 || finishedDrivers.length > 0
 
     val content =
-        <div class="row-fluid"> <!-- Worker Details -->
-          <div class="span12">
-            <ul class="unstyled">
-              <li><strong>ID:</strong> {workerState.workerId}</li>
-              <li><strong>
-                Master URL:</strong> {workerState.masterUrl}
-              </li>
-              <li><strong>Cores:</strong> {workerState.cores} ({workerState.coresUsed} Used)</li>
-              <li><strong>Memory:</strong> {Utils.megabytesToString(workerState.memory)}
-                ({Utils.megabytesToString(workerState.memoryUsed)} Used)</li>
-            </ul>
-            <p><a href={workerState.masterWebUiUrl}>Back to Master</a></p>
-          </div>
+      <div class="row-fluid"> <!-- Worker Details -->
+        <div class="span12">
+          <ul class="unstyled">
+            <li><strong>ID:</strong> {workerState.workerId}</li>
+            <li><strong>
+              Master URL:</strong> {workerState.masterUrl}
+            </li>
+            <li><strong>Cores:</strong> {workerState.cores} ({workerState.coresUsed} Used)</li>
+            <li><strong>Memory:</strong> {Utils.megabytesToString(workerState.memory)}
+              ({Utils.megabytesToString(workerState.memoryUsed)} Used)</li>
+          </ul>
+          <p><a href={workerState.masterWebUiUrl}>Back to Master</a></p>
         </div>
-
-        <div class="row-fluid"> <!-- Running Executors -->
-          <div class="span12">
-            <h4> Running Executors {workerState.executors.size} </h4>
-            {runningExecutorTable}
-          </div>
-        </div>
-        // scalastyle:off
-        <div>
-          {if (hasDrivers)
-            <div class="row-fluid"> <!-- Running Drivers -->
-              <div class="span12">
-                <h4> Running Drivers {workerState.drivers.size} </h4>
-                {runningDriverTable}
-              </div>
-            </div>
+      </div>
+      <div class="row-fluid"> <!-- Executors and Drivers -->
+        <div class="span12">
+          <h4> Running Executors ({runningExecutors.size}) </h4>
+          {runningExecutorTable}
+          {
+            if (runningDrivers.nonEmpty) {
+              <h4> Running Drivers ({runningDrivers.size}) </h4> ++
+              runningDriverTable
+            }
           }
-        </div>
-
-        <div class="row-fluid"> <!-- Finished Executors  -->
-          <div class="span12">
-            <h4> Finished Executors </h4>
-            {finishedExecutorTable}
-          </div>
-        </div>
-
-        <div>
-          {if (hasDrivers)
-            <div class="row-fluid"> <!-- Finished Drivers  -->
-              <div class="span12">
-                <h4> Finished Drivers </h4>
-                {finishedDriverTable}
-              </div>
-            </div>
+          {
+            if (finishedExecutors.nonEmpty) {
+              <h4>Finished Executors ({finishedExecutors.size}) </h4> ++
+              finishedExecutorTable
+            }
           }
-        </div>;
-    // scalastyle:on
+          {
+            if (finishedDrivers.nonEmpty) {
+              <h4> Finished Drivers ({finishedDrivers.size}) </h4> ++
+              finishedDriverTable
+            }
+          }
+        </div>
+      </div>;
     UIUtils.basicSparkPage(content, "Spark Worker at %s:%s".format(
       workerState.host, workerState.port))
   }