diff options
| author | Kousuke Saruta <sarutak@oss.nttdata.co.jp> | 2016-04-05 10:51:23 -0700 |
|---|---|---|
| committer | Shixiong Zhu <shixiong@databricks.com> | 2016-04-05 10:51:23 -0700 |
| commit | e4bd50412043c1ed2816406ba8d2af4f775ee3cf (patch) | |
| tree | bf52807fdd712fc5af0ba724e7057373f09c3e58 | |
| parent | d35690158810465809679ef39548e1400b38d448 (diff) | |
| download | spark-e4bd50412043c1ed2816406ba8d2af4f775ee3cf.tar.gz spark-e4bd50412043c1ed2816406ba8d2af4f775ee3cf.tar.bz2 spark-e4bd50412043c1ed2816406ba8d2af4f775ee3cf.zip | |
[SPARK-14397][WEBUI] <html> and <body> tags are nested in LogPage
## What changes were proposed in this pull request?
In `LogPage`, the content to be rendered is defined as follows.
```
val content =
<html>
<body>
{linkToMaster}
<div>
<div style="float:left; margin-right:10px">{backButton}</div>
<div style="float:left;">{range}</div>
<div style="float:right; margin-left:10px">{nextButton}</div>
</div>
<br />
<div style="height:500px; overflow:auto; padding:5px;">
<pre>{logText}</pre>
</div>
</body>
</html>
UIUtils.basicSparkPage(content, logType + " log page for " + pageName)
```
As you can see, <html> and <body> tags will be rendered.
On the other hand, `UIUtils.basicSparkPage` will render those tags so those tags will be nested.
```
def basicSparkPage(
content: => Seq[Node],
title: String,
useDataTables: Boolean = false): Seq[Node] = {
<html>
<head>
{commonHeaderNodes}
{if (useDataTables) dataTablesHeaderNodes else Seq.empty}
<title>{title}</title>
</head>
<body>
<div class="container-fluid">
<div class="row-fluid">
<div class="span12">
<h3 style="vertical-align: middle; display: inline-block;">
<a style="text-decoration: none" href={prependBaseUri("/")}>
<img src={prependBaseUri("/static/spark-logo-77x50px-hd.png")} />
<span class="version"
style="margin-right: 15px;">{org.apache.spark.SPARK_VERSION}</span>
</a>
{title}
</h3>
</div>
</div>
{content}
</div>
</body>
</html>
}
```
These are the screen shots before this patch is applied.
And these are the ones after this patch is applied.
The appearance is not changed but the html source code is changed.
## How was this patch tested?
Manually run some jobs on my standalone-cluster and check the WebUI.
Author: Kousuke Saruta <sarutak@oss.nttdata.co.jp>
Closes #12170 from sarutak/SPARK-14397.
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/worker/ui/LogPage.scala | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/ui/LogPage.scala b/core/src/main/scala/org/apache/spark/deploy/worker/ui/LogPage.scala index 6500cab73b..e75c0cec4a 100644 --- a/core/src/main/scala/org/apache/spark/deploy/worker/ui/LogPage.scala +++ b/core/src/main/scala/org/apache/spark/deploy/worker/ui/LogPage.scala @@ -107,20 +107,18 @@ private[ui] class LogPage(parent: WorkerWebUI) extends WebUIPage("logPage") with } val content = - <html> - <body> - {linkToMaster} - <div> - <div style="float:left; margin-right:10px">{backButton}</div> - <div style="float:left;">{range}</div> - <div style="float:right; margin-left:10px">{nextButton}</div> - </div> - <br /> - <div style="height:500px; overflow:auto; padding:5px;"> - <pre>{logText}</pre> - </div> - </body> - </html> + <div> + {linkToMaster} + <div> + <div style="float:left; margin-right:10px">{backButton}</div> + <div style="float:left;">{range}</div> + <div style="float:right; margin-left:10px">{nextButton}</div> + </div> + <br /> + <div style="height:500px; overflow:auto; padding:5px;"> + <pre>{logText}</pre> + </div> + </div> UIUtils.basicSparkPage(content, logType + " log page for " + pageName) } |