fix linking problems in history page & not display empty tables in pool page

Author: nblintao

core/src/main/scala/org/apache/spark/ui/jobs/AllStagesPage.scala

@@ -38,18 +38,19 @@ private[ui] class AllStagesPage(parent: StagesTab) extends WebUIPage("") {
       val numCompletedStages = listener.numCompletedStages
       val failedStages = listener.failedStages.reverse.toSeq
       val numFailedStages = listener.numFailedStages
+      val subPath = "stages"
 
       val activeStagesTable =
-        new StageTableBase(request, activeStages, "activeStage", parent.basePath,
+        new StageTableBase(request, activeStages, "activeStage", parent.basePath, subPath,
           parent.progressListener, parent.isFairScheduler, parent.killEnabled, false)
       val pendingStagesTable =
-        new StageTableBase(request, pendingStages, "pendingStage", parent.basePath,
+        new StageTableBase(request, pendingStages, "pendingStage", parent.basePath, subPath,
           parent.progressListener, parent.isFairScheduler, false, false)
       val completedStagesTable =
-        new StageTableBase(request, completedStages, "completedStage", parent.basePath,
+        new StageTableBase(request, completedStages, "completedStage", parent.basePath, subPath,
           parent.progressListener, parent.isFairScheduler, false, false)
       val failedStagesTable =
-        new StageTableBase(request, failedStages, "failedStage", parent.basePath,
+        new StageTableBase(request, failedStages, "failedStage", parent.basePath, subPath,
           parent.progressListener, parent.isFairScheduler, false, true)
 
       // For now, pool information is only accessible in live UIs

core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala

@@ -229,18 +229,20 @@ private[ui] class JobPage(parent: JobsTab) extends WebUIPage("job") {
         }
       }
 
+      val basePath = "jobs/job"
+
       val activeStagesTable =
         new StageTableBase(request, activeStages, "activeStage", parent.basePath,
-          parent.jobProgresslistener, parent.isFairScheduler, parent.killEnabled, false)
+          basePath, parent.jobProgresslistener, parent.isFairScheduler, parent.killEnabled, false)
       val pendingOrSkippedStagesTable =
         new StageTableBase(request, pendingOrSkippedStages, "pendingStage", parent.basePath,
-          parent.jobProgresslistener, parent.isFairScheduler, false, false)
+          basePath, parent.jobProgresslistener, parent.isFairScheduler, false, false)
       val completedStagesTable =
         new StageTableBase(request, completedStages, "completedStage", parent.basePath,
-          parent.jobProgresslistener, parent.isFairScheduler, false, false)
+          basePath, parent.jobProgresslistener, parent.isFairScheduler, false, false)
       val failedStagesTable =
         new StageTableBase(request, failedStages, "failedStage", parent.basePath,
-          parent.jobProgresslistener, parent.isFairScheduler, false, true)
+          basePath, parent.jobProgresslistener, parent.isFairScheduler, false, true)
 
       val shouldShowActiveStages = activeStages.nonEmpty
       val shouldShowPendingStages = !isComplete && pendingOrSkippedStages.nonEmpty

core/src/main/scala/org/apache/spark/ui/jobs/PoolPage.scala

@@ -42,8 +42,9 @@ private[ui] class PoolPage(parent: StagesTab) extends WebUIPage("pool") {
         case Some(s) => s.values.toSeq
         case None => Seq[StageInfo]()
       }
+      val shouldShowActiveStages = activeStages.nonEmpty
       val activeStagesTable =
-        new StageTableBase(request, activeStages, "activeStage", parent.basePath,
+        new StageTableBase(request, activeStages, "activeStage", parent.basePath, "stages/pool",
           parent.progressListener, parent.isFairScheduler, parent.killEnabled, false)
 
       // For now, pool information is only accessible in live UIs
@@ -52,9 +53,10 @@ private[ui] class PoolPage(parent: StagesTab) extends WebUIPage("pool") {
       }).toSeq
       val poolTable = new PoolTable(pools, parent)
 
-      val content =
-        <h4>Summary </h4> ++ poolTable.toNodeSeq ++
-        <h4>{activeStages.size} Active Stages</h4> ++ activeStagesTable.toNodeSeq
+      var content = <h4>Summary </h4> ++ poolTable.toNodeSeq
+      if (shouldShowActiveStages) {
+        content ++= <h4>{activeStages.size} Active Stages</h4> ++ activeStagesTable.toNodeSeq
+      }
 
       UIUtils.headerSparkPage("Fair Scheduler Pool: " + poolName, content, parent)
     }

core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala

@@ -36,6 +36,7 @@ private[ui] class StageTableBase(
     stages: Seq[StageInfo],
     stageTag: String,
     basePath: String,
+    subPath: String,
     progressListener: JobProgressListener,
     isFairScheduler: Boolean,
     killEnabled: Boolean,
@@ -78,6 +79,7 @@ private[ui] class StageTableBase(
       stages,
       stageTag,
       basePath,
+      subPath,
       progressListener,
       isFairScheduler,
       killEnabled,
@@ -131,6 +133,7 @@ private[ui] class StagePagedTable(
     stages: Seq[StageInfo],
     stageTag: String,
     basePath: String,
+    subPath: String,
     listener: JobProgressListener,
     isFairScheduler: Boolean,
     killEnabled: Boolean,
@@ -152,12 +155,12 @@ private[ui] class StagePagedTable(
 
   override def pageNumberFormField: String = stageTag + ".page"
 
-  val parameterPath = basePath + "?" + parameterOtherTable.mkString("&")
+  val parameterPath = UIUtils.prependBaseUri(basePath) + s"/$subPath/?" +
+    parameterOtherTable.mkString("&")
 
   override val dataSource = new StageDataSource(
     stages,
     listener,
-    basePath,
     currentTime,
     pageSize,
     sortColumn,
@@ -391,7 +394,6 @@ private[ui] class StagePagedTable(
 private[ui] class StageDataSource(
     stages: Seq[StageInfo],
     listener: JobProgressListener,
-    basePath: String,
     currentTime: Long,
     pageSize: Int,
     sortColumn: String,