tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prak...@apache.org
Subject tez git commit: TEZ-2401. Tez UI: All-dag page has duration keep counting for KILLED dag. (pramachandran)
Date Tue, 05 May 2015 11:29:40 GMT
Repository: tez
Updated Branches:
  refs/heads/master b0054628d -> 0a6a7d3b6


TEZ-2401. Tez UI: All-dag page has duration keep counting for KILLED dag. (pramachandran)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/0a6a7d3b
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/0a6a7d3b
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/0a6a7d3b

Branch: refs/heads/master
Commit: 0a6a7d3b671ef46658fe89d203e5b771dbc3fda5
Parents: b005462
Author: Prakash Ramachandran <pramachandran@hortonworks.com>
Authored: Tue May 5 16:59:10 2015 +0530
Committer: Prakash Ramachandran <pramachandran@hortonworks.com>
Committed: Tue May 5 16:59:10 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                                  | 1 +
 tez-ui/src/main/webapp/app/scripts/helpers/date.js           | 1 +
 .../src/main/webapp/app/scripts/helpers/handlebarHelpers.js  | 8 ++++++--
 3 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/0a6a7d3b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 816c7a5..ba03aa3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -9,6 +9,7 @@ INCOMPATIBLE CHANGES
   TEZ-1993. Implement a pluggable InputSizeEstimator for grouping fairly
 
 ALL CHANGES:
+  TEZ-2401. Tez UI: All-dag page has duration keep counting for KILLED dag.
   TEZ-2392. Have all readers throw an Exception on incorrect next() usage.
   TEZ-2408. TestTaskAttempt fails to compile against hadoop-2.4 and hadoop-2.2.
   TEZ-2405. PipelinedSorter can throw NPE with custom compartor.

http://git-wip-us.apache.org/repos/asf/tez/blob/0a6a7d3b/tez-ui/src/main/webapp/app/scripts/helpers/date.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/helpers/date.js b/tez-ui/src/main/webapp/app/scripts/helpers/date.js
index 10df10b..5990c24 100644
--- a/tez-ui/src/main/webapp/app/scripts/helpers/date.js
+++ b/tez-ui/src/main/webapp/app/scripts/helpers/date.js
@@ -207,6 +207,7 @@ App.Helpers.date = {
    * @method duration
    */
   duration: function (startTime, endTime) {
+    if (!startTime || !endTime) return undefined;
     var duration = 0;
     if (startTime && startTime > 0) {
       if (!endTime || endTime < 1) {

http://git-wip-us.apache.org/repos/asf/tez/blob/0a6a7d3b/tez-ui/src/main/webapp/app/scripts/helpers/handlebarHelpers.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/helpers/handlebarHelpers.js b/tez-ui/src/main/webapp/app/scripts/helpers/handlebarHelpers.js
index f42a504..5cbdef5 100644
--- a/tez-ui/src/main/webapp/app/scripts/helpers/handlebarHelpers.js
+++ b/tez-ui/src/main/webapp/app/scripts/helpers/handlebarHelpers.js
@@ -48,9 +48,13 @@ Em.Handlebars.helper('formatNumThousands', function (value) {
  * @method formatDuration
  */
 Em.Handlebars.helper('formatDuration', function(startTime, endTime) {
+  if (!endTime || !startTime) {
+    return 'Not Available';
+  }
+
 	// unixtimestamp is in seconds. javascript expects milliseconds.
-	if (endTime < startTime || !!endTime) {
-		end = new Date().getTime();
+	if (endTime < startTime) {
+		endTime = new Date().getTime();
 	}
 
 	return App.Helpers.date.durationSummary(startTime, endTime);


Mime
View raw message