ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Import cleanup

Browse source
This commit is contained in:
Patrick Wendell 2013-06-18 19:02:20 -07:00
parent 32a45d01b1
commit 8b5c7e71c4
5 changed files with 32 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/scala/spark/deploy/WebUI.scala
View file

@ -6,7 +6,7 @@ import java.util.Date
/** /**
* Utilities used throughout the web UI. * Utilities used throughout the web UI.
*/ */
private[spark] object WebUI { private[spark] object DeployWebUI {
val DATE_FORMAT = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss") val DATE_FORMAT = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss")
def formatDate(date: Date): String = DATE_FORMAT.format(date) def formatDate(date: Date): String = DATE_FORMAT.format(date)

29
core/src/main/scala/spark/deploy/master/MasterWebUI.scala
View file

@ -1,20 +1,19 @@
package spark.deploy.master package spark.deploy.master
import akka.actor.{ActorRef} import akka.actor.ActorRef
import akka.dispatch.Await import akka.dispatch.Await
import akka.pattern.ask import akka.pattern.ask
import akka.util.{Duration} import akka.util.Duration
import akka.util.duration._ import akka.util.duration._
import scala.xml.Node
import spark.{Logging, Utils}
import spark.util.{WebUI => UtilsWebUI}
import spark.deploy._
import org.eclipse.jetty.server.Handler
import spark.util.WebUI._
import spark.deploy.MasterState
import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletRequest
import net.liftweb.json.JsonAST.JValue import net.liftweb.json.JsonAST.JValue
import org.eclipse.jetty.server.Handler
import scala.xml.Node
import spark.{Logging, Utils}
import spark.util.WebUI
import spark.util.WebUI._
import spark.deploy._
import spark.deploy.MasterState
/** /**
* Web UI server for the standalone master. * Web UI server for the standalone master.
@ -29,7 +28,7 @@ class MasterWebUI(master: ActorRef) extends Logging {
def start() { def start() {
try { try {
val (server, boundPort) = UtilsWebUI.startJettyServer("0.0.0.0", port, handlers) val (server, boundPort) = WebUI.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 =>
@ -98,7 +97,7 @@ class MasterWebUI(master: ActorRef) extends Logging {
{executorTable(app.executors.values.toList)} {executorTable(app.executors.values.toList)}
</div> </div>
</div>; </div>;
UtilsWebUI.makePage(content, "Application Info: " + app.desc.name) WebUI.makePage(content, "Application Info: " + app.desc.name)
} }
def executorTable(executors: Seq[ExecutorInfo]): Seq[Node] = { def executorTable(executors: Seq[ExecutorInfo]): Seq[Node] = {
@ -187,7 +186,7 @@ class MasterWebUI(master: ActorRef) extends Logging {
{appTable(state.completedApps.sortBy(_.endTime).reverse)} {appTable(state.completedApps.sortBy(_.endTime).reverse)}
</div> </div>
</div>; </div>;
UtilsWebUI.makePage(content, "Spark Master: " + state.uri) WebUI.makePage(content, "Spark Master: " + state.uri)
} }
def workerTable(workers: Seq[spark.deploy.master.WorkerInfo]) = { def workerTable(workers: Seq[spark.deploy.master.WorkerInfo]) = {
@ -246,10 +245,10 @@ class MasterWebUI(master: ActorRef) extends Logging {
{app.coresGranted} {app.coresGranted}
</td> </td>
<td>{Utils.memoryMegabytesToString(app.desc.memoryPerSlave)}</td> <td>{Utils.memoryMegabytesToString(app.desc.memoryPerSlave)}</td>
<td>{WebUI.formatDate(app.submitDate)}</td> <td>{DeployWebUI.formatDate(app.submitDate)}</td>
<td>{app.desc.user}</td> <td>{app.desc.user}</td>
<td>{app.state.toString}</td> <td>{app.state.toString}</td>
<td>{WebUI.formatDuration(app.duration)}</td> <td>{DeployWebUI.formatDuration(app.duration)}</td>
</tr> </tr>
} }
} }

15
core/src/main/scala/spark/deploy/worker/WorkerWebUI.scala
View file

@ -5,17 +5,16 @@ import akka.dispatch.Await
import akka.pattern.ask import akka.pattern.ask
import akka.util.{Duration, Timeout} import akka.util.{Duration, Timeout}
import akka.util.duration._ import akka.util.duration._
import spark.deploy.{JsonProtocol, WorkerState, RequestWorkerState}
import java.io.File import java.io.File
import spark.util.{WebUI => UtilsWebUI}
import spark.{Utils, Logging}
import org.eclipse.jetty.server.Handler
import spark.util.WebUI._
import scala.io.Source
import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletRequest
import xml.Node
import net.liftweb.json.JsonAST.JValue import net.liftweb.json.JsonAST.JValue
import org.eclipse.jetty.server.Handler
import scala.io.Source
import spark.{Utils, Logging}
import spark.deploy.{JsonProtocol, WorkerState, RequestWorkerState}
import spark.util.{WebUI => UtilsWebUI}
import spark.util.WebUI._
import xml.Node
/** /**
* Web UI server for the standalone worker. * Web UI server for the standalone worker.

10
core/src/main/scala/spark/storage/BlockManagerUI.scala
View file

@ -2,15 +2,13 @@ package spark.storage
import akka.actor.{ActorRef, ActorSystem} import akka.actor.{ActorRef, ActorSystem}
import akka.util.Duration import akka.util.Duration
import akka.util.duration._ import javax.servlet.http.HttpServletRequest
import org.eclipse.jetty.server.Handler
import spark.{Logging, SparkContext} import spark.{Logging, SparkContext}
import spark.Utils import spark.Utils
import spark.util.WebUI
import org.eclipse.jetty.server.Handler
import javax.servlet.http.HttpServletRequest
import xml.Node
import spark.util.WebUI._ import spark.util.WebUI._
import spark.util.WebUI
import xml.Node
/** /**
* Web UI server for the BlockManager inside each SparkContext. * Web UI server for the BlockManager inside each SparkContext.

15
core/src/main/scala/spark/util/WebUI.scala
View file

@ -1,16 +1,13 @@
package spark.util package spark.util
import xml.Node
import org.eclipse.jetty.server.{Server, Request, Handler}
import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
import org.eclipse.jetty.server.handler.{ResourceHandler, HandlerList, ContextHandler, AbstractHandler}
import util.Try
import util.Success
import util.Failure
import spark.Logging
import annotation.tailrec import annotation.tailrec
import net.liftweb.json.JsonAST.JValue import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
import net.liftweb.json._ import net.liftweb.json._
import org.eclipse.jetty.server.{Server, Request, Handler}
import org.eclipse.jetty.server.handler.{ResourceHandler, HandlerList, ContextHandler, AbstractHandler}
import spark.Logging
import util.{Try, Success, Failure}
import xml.Node
object WebUI extends Logging { object WebUI extends Logging {
type Responder[T] = HttpServletRequest => T type Responder[T] = HttpServletRequest => T