Add basic application table

witgo · Mar 20, 2014 · 8aac163 · 8aac163
1 parent c086bd5
commit 8aac163
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 41 deletions.
diff --git a/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala b/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala
@@ -44,10 +44,10 @@ import org.apache.spark.scheduler.ReplayListenerBus
  * @param baseLogDir The base directory in which event logs are found
  * @param requestedPort The requested port to which this server is to be bound
  */
-class HistoryServer(baseLogDir: String, requestedPort: Int, conf: SparkConf)
+class HistoryServer(val baseLogDir: String, requestedPort: Int, conf: SparkConf)
   extends SparkUIContainer("History Server") with Logging {
 
-  private val host = Utils.localHostName()
+  private val host = Option(System.getenv("SPARK_PUBLIC_DNS")).getOrElse(Utils.localHostName())
   private val port = requestedPort
   private val indexPage = new IndexPage(this)
   private val fileSystem = Utils.getHadoopFileSystem(new URI(baseLogDir))
@@ -101,36 +101,37 @@ class HistoryServer(baseLogDir: String, requestedPort: Int, conf: SparkConf)
 
     // Remove any outdated SparkUIs
     val logPaths = logDirs.map(_.getPath.toString)
-    logPathToUI.keys.foreach { path =>
+    logPathToUI.foreach { case (path, ui) =>
       if (!logPaths.contains(path)) {
+        detachUI(ui)
         logPathToUI.remove(path)
         logPathToLastUpdated.remove(path)
       }
     }
-
-    logWarning("By the end of check for logs, the map looks like")
-    logPathToUI.foreach { case (k, v) => logWarning("* %s".format(k)) }
   }
 
   /** Attempt to render a new SparkUI from event logs residing in the given log directory. */
   def maybeRenderUI(logPath: String, lastUpdated: Long) {
-    logWarning("Maybe rendering UI %s".format(logPath))
-
-    val appName = logPath.split("/").last
+    val appName = getAppName(logPath)
     val replayBus = new ReplayListenerBus(conf)
     val ui = new SparkUI(conf, replayBus, appName, "/history/%s".format(appName))
 
     // Do not call ui.bind() to avoid creating a new server for each application
     ui.start()
     val success = replayBus.replay(logPath)
-    logWarning("Just replayed the events. Successful? %s".format(success))
     if (success) {
       attachUI(ui)
       logPathToUI(logPath) = ui
       logPathToLastUpdated(logPath) = lastUpdated
     }
   }
 
+  /** Parse app name from the given log path. */
+  def getAppName(logPath: String): String = logPath.split("/").last
+
+  /** Return the address of this server. */
+  def getAddress = "http://" + host + ":" + boundPort
+
 }
 
 object HistoryServer {

diff --git a/core/src/main/scala/org/apache/spark/deploy/history/IndexPage.scala b/core/src/main/scala/org/apache/spark/deploy/history/IndexPage.scala
@@ -17,55 +17,51 @@
 
 package org.apache.spark.deploy.history
 
+import java.text.SimpleDateFormat
+import java.util.Date
 import javax.servlet.http.HttpServletRequest
 
 import scala.xml.Node
 
-import org.apache.spark.deploy.DeployWebUI
-import org.apache.spark.deploy.master.ApplicationInfo
-import org.apache.spark.ui.UIUtils
-import org.apache.spark.util.Utils
+import org.apache.spark.ui.{SparkUI, UIUtils}
 
 private[spark] class IndexPage(parent: HistoryServer) {
+  val dateFmt = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss")
 
   def render(request: HttpServletRequest): Seq[Node] = {
+    // Check if logs have been updated
+    parent.checkForLogs()
+
+    // Populate app table, with most recently modified first
+    val appRows = parent.logPathToLastUpdated.toSeq
+      .sortBy { case (path, lastUpdated) => -lastUpdated }
+      .map { case (path, lastUpdated) =>
+        // (appName, lastUpdated, UI)
+        (parent.getAppName(path), lastUpdated, parent.logPathToUI(path))
+      }
+    val appTable = UIUtils.listingTable(appHeader, appRow, appRows)
+
     val content =
       <div class="row-fluid">
         <div class="span12">
           <ul class="unstyled">
-            <li>
-              <strong>Welcome to the Fastest and Furious-est HistoryServer in the World!</strong>
-            </li>
-            {
-              parent.logPathToUI.map { case (path, ui) =>
-                <li>{path} at {ui.basePath}</li>
-              }
-            }
+            <li><strong>Event Log Location: </strong> {parent.baseLogDir}</li>
+            <h4>Applications</h4> {appTable}
           </ul>
         </div>
       </div>
 
     UIUtils.basicSparkPage(content, "History Server")
   }
 
-  def appRow(app: ApplicationInfo): Seq[Node] = {
-    <tr>
-      <td>
-        <a href={"app?appId=" + app.id}>{app.id}</a>
-      </td>
-      <td>
-        <a href={app.desc.appUiUrl}>{app.desc.name}</a>
-      </td>
-      <td>
-        {app.coresGranted}
-      </td>
-      <td sorttable_customkey={app.desc.memoryPerSlave.toString}>
-        {Utils.megabytesToString(app.desc.memoryPerSlave)}
-      </td>
-      <td>{DeployWebUI.formatDate(app.submitDate)}</td>
-      <td>{app.desc.user}</td>
-      <td>{app.state.toString}</td>
-      <td>{DeployWebUI.formatDuration(app.duration)}</td>
-    </tr>
+  private val appHeader = Seq[String]("App Name", "Last Updated")
+
+  private def appRow(info: (String, Long, SparkUI)): Seq[Node] = {
+    info match { case (appName, lastUpdated, ui) =>
+      <tr>
+        <td><a href={parent.getAddress + ui.basePath}>{appName}</a></td>
+        <td>{dateFmt.format(new Date(lastUpdated))}</td>
+      </tr>
+    }
   }
 }