Repository: spark
Updated Branches:
  refs/heads/branch-2.3 3737c3d32 -> 1c81c0c62


[SPARK-23384][WEB-UI] When it has no incomplete(completed) applications found, 
the last updated time is not formatted and client local time zone is not show 
in history server web ui.

## What changes were proposed in this pull request?

When it has no incomplete(completed) applications found, the last updated time 
is not formatted and client local time zone is not show in history server web 
ui. It is a bug.

fix before:
![1](https://user-images.githubusercontent.com/26266482/36070635-264d7cf0-0f3a-11e8-8426-14135ffedb16.png)

fix after:
![2](https://user-images.githubusercontent.com/26266482/36070651-8ec3800e-0f3a-11e8-991c-6122cc9539fe.png)

## How was this patch tested?

(Please explain how this patch was tested. E.g. unit tests, integration tests, 
manual tests)
(If this patch involves UI changes, please attach a screenshot; otherwise, 
remove this)

Please review http://spark.apache.org/contributing.html before opening a pull 
request.

Author: guoxiaolong <guo.xiaolo...@zte.com.cn>

Closes #20573 from guoxiaolongzte/SPARK-23384.

(cherry picked from commit 300c40f50ab4258d697f06a814d1491dc875c847)
Signed-off-by: Sean Owen <so...@cloudera.com>


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1c81c0c6
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1c81c0c6
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1c81c0c6

Branch: refs/heads/branch-2.3
Commit: 1c81c0c626f115fbfe121ad6f6367b695e9f3b5f
Parents: 3737c3d
Author: guoxiaolong <guo.xiaolo...@zte.com.cn>
Authored: Tue Feb 13 06:23:10 2018 -0600
Committer: Sean Owen <so...@cloudera.com>
Committed: Tue Feb 13 06:23:19 2018 -0600

----------------------------------------------------------------------
 .../main/scala/org/apache/spark/deploy/history/HistoryPage.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/spark/blob/1c81c0c6/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala
----------------------------------------------------------------------
diff --git 
a/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala 
b/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala
index 5d62a7d..6fc12d7 100644
--- a/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala
@@ -37,7 +37,8 @@ private[history] class HistoryPage(parent: HistoryServer) 
extends WebUIPage("")
     val lastUpdatedTime = parent.getLastUpdatedTime()
     val providerConfig = parent.getProviderConfig()
     val content =
-      <script 
src={UIUtils.prependBaseUri("/static/historypage-common.js")}></script>
+      <script 
src={UIUtils.prependBaseUri("/static/historypage-common.js")}></script> ++
+      <script src={UIUtils.prependBaseUri("/static/utils.js")}></script>
       <div>
           <div class="container-fluid">
             <ul class="unstyled">
@@ -65,7 +66,6 @@ private[history] class HistoryPage(parent: HistoryServer) 
extends WebUIPage("")
             if (allAppsSize > 0) {
               <script 
src={UIUtils.prependBaseUri("/static/dataTables.rowsGroup.js")}></script> ++
                 <div id="history-summary" class="row-fluid"></div> ++
-                <script 
src={UIUtils.prependBaseUri("/static/utils.js")}></script> ++
                 <script 
src={UIUtils.prependBaseUri("/static/historypage.js")}></script> ++
                 <script>setAppLimit({parent.maxApplications})</script>
             } else if (requestedIncomplete) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to