You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@eagle.apache.org by jj...@apache.org on 2017/03/17 06:41:17 UTC
eagle git commit: [EAGLE-963] list & detail page use same durationTime
Repository: eagle
Updated Branches:
refs/heads/master 1e7250d8e -> 0d47184a6
[EAGLE-963] list & detail page use same durationTime
job list page using time duration calculation. It's sync with detail page by durationTime now.
Author: zombieJ <sm...@gmail.com>
Closes #882 from zombieJ/EAGLE-963.
Project: http://git-wip-us.apache.org/repos/asf/eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/eagle/commit/0d47184a
Tree: http://git-wip-us.apache.org/repos/asf/eagle/tree/0d47184a
Diff: http://git-wip-us.apache.org/repos/asf/eagle/diff/0d47184a
Branch: refs/heads/master
Commit: 0d47184a6bd5f6f1d6b28095acd2267cd41c3945
Parents: 1e7250d
Author: zombieJ <sm...@gmail.com>
Authored: Fri Mar 17 06:41:02 2017 +0000
Committer: r7raul1984 <ta...@yhd.com>
Committed: Fri Mar 17 06:41:02 2017 +0000
----------------------------------------------------------------------
.../eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/listCtrl.js | 4 ++--
.../src/main/webapp/app/apps/jpm/partials/job/list.html | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/eagle/blob/0d47184a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/listCtrl.js
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/listCtrl.js b/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/listCtrl.js
index aa5fe4c..9e65ad3 100644
--- a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/listCtrl.js
+++ b/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/ctrl/listCtrl.js
@@ -87,7 +87,8 @@
"endTime",
"numTotalMaps",
"numTotalReduces",
- "runningContainers"
+ "runningContainers",
+ "durationTime"
], 100000));
$scope.jobStateList = [];
@@ -96,7 +97,6 @@
var jobStates = {};
$.each($scope.jobList, function (i, job) {
jobStates[job.currentState] = (jobStates[job.currentState] || 0) + 1;
- job.duration = Time.diff(job.startTime, job.endTime || now);
});
$scope.jobStateList = $.map(JOB_STATES, function (state) {
http://git-wip-us.apache.org/repos/asf/eagle/blob/0d47184a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/partials/job/list.html
----------------------------------------------------------------------
diff --git a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/partials/job/list.html b/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/partials/job/list.html
index f133026..32fe85e 100644
--- a/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/partials/job/list.html
+++ b/eagle-jpm/eagle-jpm-web/src/main/webapp/app/apps/jpm/partials/job/list.html
@@ -83,7 +83,7 @@
<td>{{Time.format(item.submissionTime)}}</td>
<td>{{Time.format(item.startTime)}}</td>
<td>{{Time.format(item.endTime)}}</td>
- <td>{{Time.diffStr(item.duration)}}</td>
+ <td>{{Time.diffStr(item.durationTime)}}</td>
<td>{{item.numTotalMaps}}</td>
<td>{{item.numTotalReduces}}</td>
<td>{{item.runningContainers || "-"}}</td>