From d7da2b94d6107341b33ca9224e9bfa4c9a92ed88 Mon Sep 17 00:00:00 2001
From: fjh100456 <fu.jinhua6@zte.com.cn>
Date: Thu, 29 Jun 2017 10:01:12 +0100
Subject: [PATCH] =?UTF-8?q?[SPARK-21135][WEB=20UI]=20On=20history=20server?=
=?UTF-8?q?=20page=EF=BC=8Cduration=20of=20incompleted=20applications=20sh?=
=?UTF-8?q?ould=20be=20hidden=20instead=20of=20showing=20up=20as=200?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
## What changes were proposed in this pull request?
Hide duration of incompleted applications.
## How was this patch tested?
manual tests
Author: fjh100456 <fu.jinhua6@zte.com.cn>
Closes #18351 from fjh100456/master.
---
.../spark/ui/static/historypage-template.html | 4 ++--
.../org/apache/spark/ui/static/historypage.js | 15 ++++++++++-----
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/core/src/main/resources/org/apache/spark/ui/static/historypage-template.html b/core/src/main/resources/org/apache/spark/ui/static/historypage-template.html
index bfe31aae55..6cff0068d8 100644
--- a/core/src/main/resources/org/apache/spark/ui/static/historypage-template.html
+++ b/core/src/main/resources/org/apache/spark/ui/static/historypage-template.html
@@ -44,7 +44,7 @@
Completed
</span>
</th>
- <th>
+ <th class="durationColumn">
<span data-toggle="tooltip" data-placement="top" title="The duration time of this application.">
Duration
</span>
@@ -74,7 +74,7 @@
<td class="attemptIDSpan"><a href="{{uiroot}}/history/{{id}}/{{attemptId}}/jobs/">{{attemptId}}</a></td>
<td>{{startTime}}</td>
<td class="completedColumn">{{endTime}}</td>
- <td><span title="{{duration}}" class="durationClass">{{duration}}</span></td>
+ <td class="durationColumn"><span title="{{duration}}" class="durationClass">{{duration}}</span></td>
<td>{{sparkUser}}</td>
<td>{{lastUpdated}}</td>
<td><a href="{{log}}" class="btn btn-info btn-mini">Download</a></td>
diff --git a/core/src/main/resources/org/apache/spark/ui/static/historypage.js b/core/src/main/resources/org/apache/spark/ui/static/historypage.js
index 5ec1ce15a2..9edd3ba0e0 100644
--- a/core/src/main/resources/org/apache/spark/ui/static/historypage.js
+++ b/core/src/main/resources/org/apache/spark/ui/static/historypage.js
@@ -182,12 +182,17 @@ $(document).ready(function() {
for (i = 0; i < completedCells.length; i++) {
completedCells[i].style.display='none';
}
- }
- var durationCells = document.getElementsByClassName("durationClass");
- for (i = 0; i < durationCells.length; i++) {
- var timeInMilliseconds = parseInt(durationCells[i].title);
- durationCells[i].innerHTML = formatDuration(timeInMilliseconds);
+ var durationCells = document.getElementsByClassName("durationColumn");
+ for (i = 0; i < durationCells.length; i++) {
+ durationCells[i].style.display='none';
+ }
+ } else {
+ var durationCells = document.getElementsByClassName("durationClass");
+ for (i = 0; i < durationCells.length; i++) {
+ var timeInMilliseconds = parseInt(durationCells[i].title);
+ durationCells[i].innerHTML = formatDuration(timeInMilliseconds);
+ }
}
if ($(selector.concat(" tr")).length < 20) {
--
GitLab