{title}

From e4bd50412043c1ed2816406ba8d2af4f775ee3cf Mon Sep 17 00:00:00 2001 From: Kousuke Saruta Date: Tue, 5 Apr 2016 10:51:23 -0700 Subject: [SPARK-14397][WEBUI] and 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 = {linkToMaster}

{backButton}

{range}

{nextButton}

{logText}

UIUtils.basicSparkPage(content, logType + " log page for " + pageName) ``` As you can see, and 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] = { {commonHeaderNodes} {if (useDataTables) dataTablesHeaderNodes else Seq.empty} {title}

{org.apache.spark.SPARK_VERSION} {title}

{content}

} ``` These are the screen shots before this patch is applied. ![before1](https://cloud.githubusercontent.com/assets/4736016/14273236/03cbed8a-fb44-11e5-8786-bc1bfa4d3f8c.png) ![before2](https://cloud.githubusercontent.com/assets/4736016/14273237/03d1741c-fb44-11e5-9dee-ea93022033a6.png) And these are the ones after this patch is applied. ![after1](https://cloud.githubusercontent.com/assets/4736016/14273248/1b6a7d8a-fb44-11e5-8a3b-69964f3434f6.png) ![after2](https://cloud.githubusercontent.com/assets/4736016/14273249/1b6b9c38-fb44-11e5-9d6f-281d64c842e4.png) 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 Closes #12170 from sarutak/SPARK-14397. --- .../apache/spark/deploy/worker/ui/LogPage.scala | 26 ++++++++++------------ 1 file 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 = - - - {linkToMaster} -

{backButton}

{range}

{nextButton}

-
-

{logText}

- - +

+ {linkToMaster} +

{backButton}

{range}

{nextButton}

+
+

{logText}

UIUtils.basicSparkPage(content, logType + " log page for " + pageName) } -- cgit v1.2.3