Merge branch 'streaming-web-ui' of github.com:tdas/spark into streami…

…ng-web-ui
markhamstra · Apr 11, 2014 · 89dae36 · 89dae36
2 parents 2fc09c8 + 72fe256
commit 89dae36
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 7 deletions.
diff --git a/...ache/spark/deploy/history/IndexPage.scala → ...he/spark/deploy/history/HistoryPage.scala b/...ache/spark/deploy/history/IndexPage.scala → ...he/spark/deploy/history/HistoryPage.scala
diff --git a/...he/spark/deploy/master/ui/IndexPage.scala → ...e/spark/deploy/master/ui/MasterPage.scala b/...he/spark/deploy/master/ui/IndexPage.scala → ...e/spark/deploy/master/ui/MasterPage.scala
diff --git a/...he/spark/deploy/worker/ui/IndexPage.scala → ...e/spark/deploy/worker/ui/WorkerPage.scala b/...he/spark/deploy/worker/ui/IndexPage.scala → ...e/spark/deploy/worker/ui/WorkerPage.scala
diff --git a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala
@@ -24,7 +24,7 @@ import org.apache.spark.ui.JettyUtils._
 import org.apache.spark.ui.env.EnvironmentTab
 import org.apache.spark.ui.exec.ExecutorsTab
 import org.apache.spark.ui.jobs.JobProgressTab
-import org.apache.spark.ui.storage.BlockManagerTab
+import org.apache.spark.ui.storage.StorageTab
 
 /**
  * Top level user interface for Spark.
@@ -55,7 +55,7 @@ private[spark] class SparkUI(
   def initialize() {
     listenerBus.addListener(storageStatusListener)
     attachTab(new JobProgressTab(this))
-    attachTab(new BlockManagerTab(this))
+    attachTab(new StorageTab(this))
     attachTab(new EnvironmentTab(this))
     attachTab(new ExecutorsTab(this))
     attachHandler(createStaticHandler(SparkUI.STATIC_RESOURCE_DIR, "/static"))

diff --git a/...a/org/apache/spark/ui/env/IndexPage.scala → ...apache/spark/ui/env/EnvironmentPage.scala b/...a/org/apache/spark/ui/env/IndexPage.scala → ...apache/spark/ui/env/EnvironmentPage.scala
diff --git a/.../org/apache/spark/ui/exec/IndexPage.scala → .../apache/spark/ui/exec/ExecutorsPage.scala b/.../org/apache/spark/ui/exec/IndexPage.scala → .../apache/spark/ui/exec/ExecutorsPage.scala
diff --git a/.../org/apache/spark/ui/jobs/IndexPage.scala → ...pache/spark/ui/jobs/JobProgressPage.scala b/.../org/apache/spark/ui/jobs/IndexPage.scala → ...pache/spark/ui/jobs/JobProgressPage.scala
diff --git a/core/src/main/scala/org/apache/spark/ui/storage/RDDPage.scala b/core/src/main/scala/org/apache/spark/ui/storage/RDDPage.scala
@@ -26,7 +26,7 @@ import org.apache.spark.ui.{WebUIPage, UIUtils}
 import org.apache.spark.util.Utils
 
 /** Page showing storage details for a given RDD */
-private[ui] class RddPage(parent: BlockManagerTab) extends WebUIPage("rdd") {
+private[ui] class RddPage(parent: StorageTab) extends WebUIPage("rdd") {
   private val appName = parent.appName
   private val basePath = parent.basePath
   private val listener = parent.listener

diff --git a/...g/apache/spark/ui/storage/IndexPage.scala → ...apache/spark/ui/storage/StoragePage.scala b/...g/apache/spark/ui/storage/IndexPage.scala → ...apache/spark/ui/storage/StoragePage.scala
@@ -26,7 +26,7 @@ import org.apache.spark.ui.{WebUIPage, UIUtils}
 import org.apache.spark.util.Utils
 
 /** Page showing list of RDD's currently stored in the cluster */
-private[ui] class IndexPage(parent: BlockManagerTab) extends WebUIPage("") {
+private[ui] class IndexPage(parent: StorageTab) extends WebUIPage("") {
   private val appName = parent.appName
   private val basePath = parent.basePath
   private val listener = parent.listener

diff --git a/...he/spark/ui/storage/BlockManagerTab.scala → .../apache/spark/ui/storage/StorageTab.scala b/...he/spark/ui/storage/BlockManagerTab.scala → .../apache/spark/ui/storage/StorageTab.scala
@@ -24,10 +24,10 @@ import org.apache.spark.scheduler._
 import org.apache.spark.storage.{RDDInfo, StorageStatusListener, StorageUtils}
 
 /** Web UI showing storage status of all RDD's in the given SparkContext. */
-private[ui] class BlockManagerTab(parent: SparkUI) extends WebUITab(parent, "storage") {
+private[ui] class StorageTab(parent: SparkUI) extends WebUITab(parent, "storage") {
   val appName = parent.appName
   val basePath = parent.basePath
-  val listener = new BlockManagerListener(parent.storageStatusListener)
+  val listener = new StorageListener(parent.storageStatusListener)
 
   attachPage(new IndexPage(this))
   attachPage(new RddPage(this))
@@ -37,7 +37,7 @@ private[ui] class BlockManagerTab(parent: SparkUI) extends WebUITab(parent, "sto
 /**
  * A SparkListener that prepares information to be displayed on the BlockManagerUI
  */
-private[ui] class BlockManagerListener(storageStatusListener: StorageStatusListener)
+private[ui] class StorageListener(storageStatusListener: StorageStatusListener)
   extends SparkListener {
 
   private val _rddInfoMap = mutable.Map[Int, RDDInfo]()