aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorKaren Feng <karenfeng.us@gmail.com>2013-07-10 15:27:52 -0700
committerKaren Feng <karenfeng.us@gmail.com>2013-07-10 15:27:52 -0700
commit24196c91f0bd560c08399eed3cb1903248ca497a (patch)
tree24c942783479cab6a655ed66889202ca064675cd /core
parentf5f3b272f874a3ac22f4e0b2caab9053657a9124 (diff)
downloadspark-24196c91f0bd560c08399eed3cb1903248ca497a.tar.gz
spark-24196c91f0bd560c08399eed3cb1903248ca497a.tar.bz2
spark-24196c91f0bd560c08399eed3cb1903248ca497a.zip
Changed buffer to 10,000 bytes, created scrollbar for fixed-height log
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/spark/deploy/master/ui/ApplicationPage.scala4
-rw-r--r--core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala4
-rw-r--r--core/src/main/scala/spark/deploy/worker/ui/WorkerWebUI.scala6
3 files changed, 7 insertions, 7 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 dae9995779..27549e3b4a 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=2000"
+ <a href={"%s/logPage?appId=%s&executorId=%s&logType=stdout&offset=0&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=2000"
+ <a href={"%s/logPage?appId=%s&executorId=%s&logType=stderr&offset=0&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/ui/IndexPage.scala b/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
index a9c6c6d519..313ecec084 100644
--- a/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
+++ b/core/src/main/scala/spark/deploy/worker/ui/IndexPage.scala
@@ -88,9 +88,9 @@ private[spark] class IndexPage(parent: WorkerWebUI) {
</ul>
</td>
<td>
- <a href={"logPage?appId=%s&executorId=%s&logType=stdout&offset=0&byteLength=2000"
+ <a href={"logPage?appId=%s&executorId=%s&logType=stdout&offset=0&byteLength=10000"
.format(executor.appId, executor.execId)}>stdout</a>
- <a href={"logPage?appId=%s&executorId=%s&logType=stderr&offset=0&byteLength=2000"
+ <a href={"logPage?appId=%s&executorId=%s&logType=stderr&offset=0&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 1f4ba5de60..490fe15fcf 100644
--- a/core/src/main/scala/spark/deploy/worker/ui/WorkerWebUI.scala
+++ b/core/src/main/scala/spark/deploy/worker/ui/WorkerWebUI.scala
@@ -118,9 +118,9 @@ class WorkerWebUI(val worker: ActorRef, val workDir: File, requestedPort: Option
{backButton}
{nextButton}
<br></br>
- <pre>{logText}</pre>
- {backButton}
- {nextButton}
+ <div style="height:500px;overflow:scroll;padding:5px;">
+ <pre>{logText}</pre>
+ </div>
</body>
</html>
UIUtils.basicSparkPage(content, "Log Page for " + appId)