Some renaming and comments

This commit is contained in:
Patrick Wendell 2013-06-20 23:20:56 -07:00
parent 5c872e9ef5
commit dd696f3a3d
7 changed files with 25 additions and 19 deletions

View file

@ -10,11 +10,11 @@ import net.liftweb.json.JsonAST.JValue
import org.eclipse.jetty.server.Handler import org.eclipse.jetty.server.Handler
import scala.xml.Node import scala.xml.Node
import spark.{Logging, Utils} import spark.{Logging, Utils}
import spark.ui.JettyUI import spark.ui.JettyUtils
import JettyUI._ import JettyUtils._
import spark.deploy._ import spark.deploy._
import spark.deploy.MasterState import spark.deploy.MasterState
import spark.ui.JettyUI import spark.ui.JettyUtils
/** /**
* Web UI server for the standalone master. * Web UI server for the standalone master.
@ -29,11 +29,11 @@ class MasterWebUI(master: ActorRef) extends Logging {
def start() { def start() {
try { try {
val (server, boundPort) = JettyUI.startJettyServer("0.0.0.0", port, handlers) val (server, boundPort) = JettyUtils.startJettyServer("0.0.0.0", port, handlers)
logInfo("Started Master web UI at http://%s:%d".format(host, boundPort)) logInfo("Started Master web UI at http://%s:%d".format(host, boundPort))
} catch { } catch {
case e: Exception => case e: Exception =>
logError("Failed to create Master JettyUI", e) logError("Failed to create Master JettyUtils", e)
System.exit(1) System.exit(1)
} }
} }
@ -99,7 +99,7 @@ class MasterWebUI(master: ActorRef) extends Logging {
{executorTable(app.executors.values.toList)} {executorTable(app.executors.values.toList)}
</div> </div>
</div>; </div>;
JettyUI.sparkPage(content, "Application Info: " + app.desc.name) JettyUtils.sparkPage(content, "Application Info: " + app.desc.name)
} }
def executorTable(executors: Seq[ExecutorInfo]): Seq[Node] = { def executorTable(executors: Seq[ExecutorInfo]): Seq[Node] = {
@ -189,7 +189,7 @@ class MasterWebUI(master: ActorRef) extends Logging {
{appTable(state.completedApps.sortBy(_.endTime).reverse)} {appTable(state.completedApps.sortBy(_.endTime).reverse)}
</div> </div>
</div>; </div>;
JettyUI.sparkPage(content, "Spark Master: " + state.uri) JettyUtils.sparkPage(content, "Spark Master: " + state.uri)
} }
def workerTable(workers: Seq[spark.deploy.master.WorkerInfo]) = { def workerTable(workers: Seq[spark.deploy.master.WorkerInfo]) = {

View file

@ -12,8 +12,8 @@ import org.eclipse.jetty.server.Handler
import scala.io.Source import scala.io.Source
import spark.{Utils, Logging} import spark.{Utils, Logging}
import spark.deploy.{JsonProtocol, WorkerState, RequestWorkerState} import spark.deploy.{JsonProtocol, WorkerState, RequestWorkerState}
import spark.ui.{JettyUI => UtilsWebUI} import spark.ui.{JettyUtils => UtilsWebUI}
import spark.ui.JettyUI._ import spark.ui.JettyUtils._
import xml.Node import xml.Node
/** /**
@ -40,7 +40,7 @@ class WorkerWebUI(worker: ActorRef, workDir: File) extends Logging {
logInfo("Started Worker web UI at http://%s:%d".format(host, boundPort)) logInfo("Started Worker web UI at http://%s:%d".format(host, boundPort))
} catch { } catch {
case e: Exception => case e: Exception =>
logError("Failed to create Worker JettyUI", e) logError("Failed to create Worker JettyUtils", e)
System.exit(1) System.exit(1)
} }
} }

View file

@ -15,7 +15,9 @@ import spark.Logging
import xml.Node import xml.Node
private[spark] object JettyUI extends Logging {
/** Utilities for launching a web server using Jetty's HTTP Server class */
private[spark] object JettyUtils extends Logging {
// Base type for a function that returns something based on an HTTP request. Allows for // Base type for a function that returns something based on an HTTP request. Allows for
// implicit conversion from many types of functions to jetty Handlers. // implicit conversion from many types of functions to jetty Handlers.
type Responder[T] = HttpServletRequest => T type Responder[T] = HttpServletRequest => T

View file

@ -8,7 +8,7 @@ import spark.{Logging, SparkContext, Utils}
import spark.ui.storage.BlockManagerUI import spark.ui.storage.BlockManagerUI
import spark.ui.jobs.JobProgressUI import spark.ui.jobs.JobProgressUI
import spark.ui.UIUtils._ import spark.ui.UIUtils._
import spark.ui.JettyUI._ import spark.ui.JettyUtils._
/** Top level user interface for Spark */ /** Top level user interface for Spark */
private[spark] class SparkUI(sc: SparkContext) extends Logging { private[spark] class SparkUI(sc: SparkContext) extends Logging {
@ -27,12 +27,12 @@ private[spark] class SparkUI(sc: SparkContext) extends Logging {
def start() { def start() {
/** Start an HTTP server to run the Web interface */ /** Start an HTTP server to run the Web interface */
try { try {
val (server, usedPort) = JettyUI.startJettyServer("0.0.0.0", port, allHandlers) val (server, usedPort) = JettyUtils.startJettyServer("0.0.0.0", port, allHandlers)
logInfo("Started Spark Web UI at http://%s:%d".format(host, usedPort)) logInfo("Started Spark Web UI at http://%s:%d".format(host, usedPort))
boundPort = Some(usedPort) boundPort = Some(usedPort)
} catch { } catch {
case e: Exception => case e: Exception =>
logError("Failed to create Spark JettyUI", e) logError("Failed to create Spark JettyUtils", e)
System.exit(1) System.exit(1)
} }
} }

View file

@ -9,7 +9,7 @@ import org.eclipse.jetty.server.Handler
import scala.Seq import scala.Seq
import scala.collection.mutable.{HashSet, ListBuffer, HashMap, ArrayBuffer} import scala.collection.mutable.{HashSet, ListBuffer, HashMap, ArrayBuffer}
import spark.ui.JettyUI._ import spark.ui.JettyUtils._
import spark.SparkContext import spark.SparkContext
import spark.scheduler._ import spark.scheduler._
import spark.scheduler.cluster.TaskInfo import spark.scheduler.cluster.TaskInfo

View file

@ -1,11 +1,13 @@
package spark.ui.storage package spark.ui.storage
import akka.util.Duration import akka.util.Duration
import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletRequest
import org.eclipse.jetty.server.Handler import org.eclipse.jetty.server.Handler
import spark.{Logging, SparkContext} import spark.{Logging, SparkContext}
import spark.ui.JettyUI._ import spark.ui.JettyUtils._
import spark.ui.{UIComponent}
/** Web UI showing storage status of all RDD's in the given SparkContext. */ /** Web UI showing storage status of all RDD's in the given SparkContext. */
private[spark] private[spark]

View file

@ -1,10 +1,12 @@
package spark.ui.storage package spark.ui.storage
import xml.Node import javax.servlet.http.HttpServletRequest
import spark.storage.{RDDInfo, StorageUtils} import spark.storage.{RDDInfo, StorageUtils}
import spark.Utils import spark.Utils
import spark.ui.UIUtils._ import spark.ui.UIUtils._
import javax.servlet.http.HttpServletRequest
import xml.Node
/** Page showing list of RDD's currently stored in the cluster */ /** Page showing list of RDD's currently stored in the cluster */
class IndexPage(parent: BlockManagerUI) { class IndexPage(parent: BlockManagerUI) {