From 0ecc33f0c80733ff88518157be543ec458a76bdb Mon Sep 17 00:00:00 2001
From: Karen Feng <karenfeng.us@gmail.com>
Date: Thu, 11 Jul 2013 11:25:58 -0700
Subject: [PATCH] Added byte range, page title with log name, previous/next
bytes buttons, initialization to end of log, large default buffer, buggy back
to master link
---
.../deploy/master/ui/ApplicationPage.scala | 4 +-
.../scala/spark/deploy/worker/Worker.scala | 2 +-
.../spark/deploy/worker/ui/IndexPage.scala | 9 +++--
.../spark/deploy/worker/ui/WorkerWebUI.scala | 37 +++++++++++--------
4 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/core/src/main/scala/spark/deploy/master/ui/ApplicationPage.scala b/core/src/main/scala/spark/deploy/master/ui/ApplicationPage.scala
index 27549e3b4a..b2589abb89 100644
--- a/core/src/main/scala/spark/deploy/master/ui/ApplicationPage.scala
+++ b/core/src/main/scala/spark/deploy/master/ui/ApplicationPage.scala
@@ -90,9 +90,9 @@ private[spark] class ApplicationPage(parent: MasterWebUI) {
<td>{executor.memory}</td>
<td>{executor.state}</td>
<td>
- <a href={"%s/logPage?appId=%s&executorId=%s&logType=stdout&offset=0&byteLength=10000"
+ <a href={"%s/logPage?appId=%s&executorId=%s&logType=stdout&byteLength=10000"
.format(executor.worker.webUiAddress, executor.application.id, executor.id)}>stdout</a>
- <a href={"%s/logPage?appId=%s&executorId=%s&logType=stderr&offset=0&byteLength=10000"
+ <a href={"%s/logPage?appId=%s&executorId=%s&logType=stderr&byteLength=10000"
.format(executor.worker.webUiAddress, executor.application.id, executor.id)}>stderr</a>
</td>
</tr>
diff --git a/core/src/main/scala/spark/deploy/worker/Worker.scala b/core/src/main/scala/spark/deploy/worker/Worker.scala
index 6ae1cef940..f20ea42d7f 100644
--- a/core/src/main/scala/spark/deploy/worker/Worker.scala
+++ b/core/src/main/scala/spark/deploy/worker/Worker.scala
@@ -77,7 +77,7 @@ private[spark] class Worker(
sparkHome = new File(Option(System.getenv("SPARK_HOME")).getOrElse("."))
logInfo("Spark home: " + sparkHome)
createWorkDir()
- webUi = new WorkerWebUI(self, workDir, Some(webUiPort))
+ webUi = new WorkerWebUI(this, workDir, Some(webUiPort))
webUi.start()
connectToMaster()
}
diff --git a/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala b/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
index 313ecec084..fc1ec31b4d 100644
--- a/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
+++ b/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
@@ -16,17 +16,18 @@ import spark.Utils
import spark.ui.UIUtils
private[spark] class IndexPage(parent: WorkerWebUI) {
+ val workerActor = parent.worker.self
val worker = parent.worker
val timeout = parent.timeout
def renderJson(request: HttpServletRequest): JValue = {
- val stateFuture = (worker ? RequestWorkerState)(timeout).mapTo[WorkerState]
+ val stateFuture = (workerActor ? RequestWorkerState)(timeout).mapTo[WorkerState]
val workerState = Await.result(stateFuture, 30 seconds)
JsonProtocol.writeWorkerState(workerState)
}
def render(request: HttpServletRequest): Seq[Node] = {
- val stateFuture = (worker ? RequestWorkerState)(timeout).mapTo[WorkerState]
+ val stateFuture = (workerActor ? RequestWorkerState)(timeout).mapTo[WorkerState]
val workerState = Await.result(stateFuture, 30 seconds)
val executorHeaders = Seq("ExecutorID", "Cores", "Memory", "Job Details", "Logs")
@@ -88,9 +89,9 @@ private[spark] class IndexPage(parent: WorkerWebUI) {
</ul>
</td>
<td>
- <a href={"logPage?appId=%s&executorId=%s&logType=stdout&offset=0&byteLength=10000"
+ <a href={"logPage?appId=%s&executorId=%s&logType=stdout&byteLength=10000"
.format(executor.appId, executor.execId)}>stdout</a>
- <a href={"logPage?appId=%s&executorId=%s&logType=stderr&offset=0&byteLength=10000"
+ <a href={"logPage?appId=%s&executorId=%s&logType=stderr&byteLength=10000"
.format(executor.appId, executor.execId)}>stderr</a>
</td>
</tr>
diff --git a/core/src/main/scala/spark/deploy/worker/ui/WorkerWebUI.scala b/core/src/main/scala/spark/deploy/worker/ui/WorkerWebUI.scala
index cac281eef6..3ab0f2eded 100644
--- a/core/src/main/scala/spark/deploy/worker/ui/WorkerWebUI.scala
+++ b/core/src/main/scala/spark/deploy/worker/ui/WorkerWebUI.scala
@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest
import org.eclipse.jetty.server.{Handler, Server}
+import spark.deploy.worker.Worker
import spark.{Utils, Logging}
import spark.ui.JettyUtils
import spark.ui.JettyUtils._
@@ -18,7 +19,7 @@ import spark.ui.UIUtils
* Web UI server for the standalone worker.
*/
private[spark]
-class WorkerWebUI(val worker: ActorRef, val workDir: File, requestedPort: Option[Int] = None)
+class WorkerWebUI(val worker: Worker, val workDir: File, requestedPort: Option[Int] = None)
extends Logging {
implicit val timeout = Timeout(
Duration.create(System.getProperty("spark.akka.askTimeout", "10").toLong, "seconds"))
@@ -71,14 +72,14 @@ class WorkerWebUI(val worker: ActorRef, val workDir: File, requestedPort: Option
val appId = request.getParameter("appId")
val executorId = request.getParameter("executorId")
val logType = request.getParameter("logType")
- val offset = Option(request.getParameter("offset")).map(_.toLong).getOrElse(0L)
val maxBytes = 1024 * 1024
- val defaultBytes = 100 * 1024
+ val defaultBytes = 10000
val byteLength = Option(request.getParameter("byteLength")).map(_.toInt).getOrElse(defaultBytes)
val path = "%s/%s/%s/%s".format(workDir.getPath, appId, executorId, logType)
val logLength = new File(path).length()
+ val offset = Option(request.getParameter("offset")).map(_.toLong).getOrElse(logLength-10000)
val logPageLength = math.min(byteLength, maxBytes)
val fixedOffset =
@@ -88,46 +89,52 @@ class WorkerWebUI(val worker: ActorRef, val workDir: File, requestedPort: Option
val endOffset = math.min(fixedOffset+logPageLength, logLength)
- val range = <h3>Bytes {fixedOffset.toString} - {(endOffset).toString} of {logLength}</h3>
- val logText = <node>{Utils.offsetBytes(path, fixedOffset, endOffset)}</node>
+ val linkToMaster = <p><a href={worker.masterWebUiUrl}>Back to Master</a></p>
+
+ val range = <span>Bytes {fixedOffset.toString} - {(endOffset).toString} of {logLength}</span>
val backButton =
if (fixedOffset > 0) {
<a href={"?appId=%s&executorId=%s&logType=%s&offset=%s&byteLength=%s"
.format(appId, executorId, logType, math.max(fixedOffset-logPageLength, 0),
logPageLength)}>
- <button style="float:left">back</button>
+ <button>Previous {math.min(logPageLength, fixedOffset)} Bytes</button>
</a>
}
else {
- <button style="float:left" disabled="disabled">back</button>
+ <button disabled="disabled">Previous 0 Bytes</button>
}
val nextButton =
if (endOffset < logLength) {
<a href={"?appId=%s&executorId=%s&logType=%s&offset=%s&byteLength=%s".
format(appId, executorId, logType, endOffset, logPageLength)}>
- <button style="float:right">next</button>
+ <button>Next {math.min(logPageLength, logLength-endOffset)} Bytes</button>
</a>
}
else {
- <button style="float:right" disabled="disabled">next</button>
+ <button disabled="disabled">Next 0 Bytes</button>
}
+ val logText = <node>{Utils.offsetBytes(path, fixedOffset, endOffset)}</node>
+
val content =
<html>
<body>
- {range}
- <hr></hr>
- {backButton}
- {nextButton}
- <br></br>
+ {linkToMaster}
+ <hr />
+ <div>
+ <div style="float:left;width:40%">{backButton}</div>
+ <div style="float:left;">{range}</div>
+ <div style="float:right;">{nextButton}</div>
+ </div>
+ <br />
<div style="height:500px;overflow:scroll;padding:5px;">
<pre>{logText}</pre>
</div>
</body>
</html>
- UIUtils.basicSparkPage(content, "Log Page for " + appId)
+ UIUtils.basicSparkPage(content, logType + " log Page for " + appId)
}
def stop() {
--
GitLab