You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2014/02/13 03:36:51 UTC
git commit: AMBARI-4645. Tez vertex start and end times should be
shown. (srimanth)
Updated Branches:
refs/heads/trunk 7f8d215cc -> abbd10209
AMBARI-4645. Tez vertex start and end times should be shown. (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/abbd1020
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/abbd1020
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/abbd1020
Branch: refs/heads/trunk
Commit: abbd1020963fe41a54ca6a89cc38661c035e6231
Parents: 7f8d215
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Wed Feb 12 17:57:25 2014 -0800
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Wed Feb 12 18:36:40 2014 -0800
----------------------------------------------------------------------
ambari-web/app/messages.js | 2 +
.../templates/main/jobs/hive_job_details.hbs | 73 +++++++++++---------
ambari-web/app/utils/jobs.js | 2 +-
.../views/main/jobs/hive_job_details_view.js | 9 ++-
4 files changed, 52 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/abbd1020/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 04da1e6..dda93b7 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -183,6 +183,8 @@ Em.I18n.translations = {
'common.url': 'URL',
'common.advanced': 'Advanced',
'common.download': 'Download',
+ 'common.time.start': 'Start Time',
+ 'common.time.end': 'End Time',
'common.hostLog.popup.logDir.path':'/var/lib/ambari-agent/data/',
'common.hostLog.popup.outputLog.value': 'output-{0}.txt',
'common.hostLog.popup.errorLog.value': 'errors-{0}.txt',
http://git-wip-us.apache.org/repos/asf/ambari/blob/abbd1020/ambari-web/app/templates/main/jobs/hive_job_details.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/jobs/hive_job_details.hbs b/ambari-web/app/templates/main/jobs/hive_job_details.hbs
index 88d9b76..f1b4141 100644
--- a/ambari-web/app/templates/main/jobs/hive_job_details.hbs
+++ b/ambari-web/app/templates/main/jobs/hive_job_details.hbs
@@ -92,37 +92,48 @@
{{#if view.selectedVertex}}
<div id="section tez-vertex-details-section">
<div class="box">
- <div class="box-header">
- <h4>{{view.selectedVertex.name}}</h4>
- </div>
- <div id="tez-vertex-details-section-body">
- <table class="table">
- <tr>
- <td>{{t jobs.hive.tez.tasks}}</td>
- <td>{{view.selectedVertex.tasksCount}}</td>
- <td></td>
- </tr>
- <tr>
- <td>{{t jobs.hive.tez.hdfs}}</td>
- <td>{{view.selectedVertexIODisplay.hdfs.read.ops}} / {{view.selectedVertexIODisplay.hdfs.read.bytes}}</td>
- <td>{{view.selectedVertexIODisplay.hdfs.write.ops}} / {{view.selectedVertexIODisplay.hdfs.write.bytes}}</td>
- </tr>
- <tr>
- <td>{{t jobs.hive.tez.localFiles}}</td>
- <td>{{view.selectedVertexIODisplay.file.read.ops}} / {{view.selectedVertexIODisplay.file.read.bytes}}</td>
- <td>{{view.selectedVertexIODisplay.file.write.ops}} / {{view.selectedVertexIODisplay.file.write.bytes}}</td>
- </tr>
- <tr>
- <td>{{t jobs.hive.tez.records}}</td>
- <td>{{view.selectedVertexIODisplay.records.read}}</td>
- <td>{{view.selectedVertexIODisplay.records.write}}</td>
- </tr>
- <td>{{t jobs.hive.tez.operatorPlan}}</td>
- <td></td>
- <td></td>
- </tr>
- </table>
- {{view Ember.TextArea valueBinding="view.selectedVertex.operationPlan" rows="15"}}
+ <div class="box-header">
+ <h4>{{view.selectedVertex.name}}</h4>
+ </div>
+ <div id="tez-vertex-details-section-body">
+ <table class="table">
+ <tr>
+ <td>{{t common.time.start}}</td>
+ <td>{{view.selectedVertexIODisplay.started}}</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>{{t common.time.end}}</td>
+ <td>{{view.selectedVertexIODisplay.ended}}</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>{{t jobs.hive.tez.tasks}}</td>
+ <td>{{view.selectedVertex.tasksCount}}</td>
+ <td></td>
+ </tr>
+ <tr>
+ <td>{{t jobs.hive.tez.hdfs}}</td>
+ <td>{{view.selectedVertexIODisplay.hdfs.read.ops}} / {{view.selectedVertexIODisplay.hdfs.read.bytes}}</td>
+ <td>{{view.selectedVertexIODisplay.hdfs.write.ops}} / {{view.selectedVertexIODisplay.hdfs.write.bytes}}</td>
+ </tr>
+ <tr>
+ <td>{{t jobs.hive.tez.localFiles}}</td>
+ <td>{{view.selectedVertexIODisplay.file.read.ops}} / {{view.selectedVertexIODisplay.file.read.bytes}}</td>
+ <td>{{view.selectedVertexIODisplay.file.write.ops}} / {{view.selectedVertexIODisplay.file.write.bytes}}</td>
+ </tr>
+ <tr>
+ <td>{{t jobs.hive.tez.records}}</td>
+ <td>{{view.selectedVertexIODisplay.records.read}}</td>
+ <td>{{view.selectedVertexIODisplay.records.write}}</td>
+ </tr>
+ <td>{{t jobs.hive.tez.operatorPlan}}</td>
+ <td></td>
+ <td></td>
+ </tr>
+ </table>
+ {{view Ember.TextArea valueBinding="view.selectedVertex.operationPlan" rows="15"}}
+ </div>
</div>
</div>
{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/abbd1020/ambari-web/app/utils/jobs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/jobs.js b/ambari-web/app/utils/jobs.js
index c391b7f..7615aa7 100644
--- a/ambari-web/app/utils/jobs.js
+++ b/ambari-web/app/utils/jobs.js
@@ -158,7 +158,7 @@ module.exports = {
var vertexRecord = App.TezDagVertex.find(tezDagId + "/" + data.otherinfo.vertexName);
if (vertexRecord != null) {
vertexRecord.set('startTime', data.otherinfo.startTime);
- vertexRecord.set('endTime', data.otherinfo.startTime + +data.otherinfo.timeTaken);
+ vertexRecord.set('endTime', data.otherinfo.endTime);
vertexRecord.set('tasksCount', data.otherinfo.numTasks);
vertexRecord.set('state', data.otherinfo.status);
// TODO Need additional vertex metrics
http://git-wip-us.apache.org/repos/asf/ambari/blob/abbd1020/ambari-web/app/views/main/jobs/hive_job_details_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/jobs/hive_job_details_view.js b/ambari-web/app/views/main/jobs/hive_job_details_view.js
index 7250fd8..aac1e37 100644
--- a/ambari-web/app/views/main/jobs/hive_job_details_view.js
+++ b/ambari-web/app/views/main/jobs/hive_job_details_view.js
@@ -18,6 +18,7 @@
var App = require('app');
var date = require('utils/date');
var numberUtils = require('utils/number_utils');
+var dateUtils = require('utils/date');
App.MainHiveJobDetailsView = Em.View.extend({
templateName : require('templates/main/jobs/hive_job_details'),
@@ -124,7 +125,9 @@ App.MainHiveJobDetailsView = Em.View.extend({
* 'records': {
* 'read': '100 records',
* 'write': '123 records'
- * }
+ * },
+ * 'started': 'Feb 12, 2014 10:30am',
+ * 'ended': 'Feb 12, 2014 10:35am'
* }
*/
selectedVertexIODisplay : function() {
@@ -153,7 +156,9 @@ App.MainHiveJobDetailsView = Em.View.extend({
records : {
read : Em.I18n.t('jobs.hive.tez.records.count').format(v.get('recordReadCount')),
write : Em.I18n.t('jobs.hive.tez.records.count').format(v.get('recordWriteCount')),
- }
+ },
+ started: v.get('startTime') ? dateUtils.dateFormat(v.get('startTime')) : '',
+ ended: v.get('endTime') ? dateUtils.dateFormat(v.get('endTime')) : ''
};
}.property('selectedVertex.fileReadOps', 'selectedVertex.fileWriteOps', 'selectedVertex.hdfsReadOps', 'selectedVertex.hdfdWriteOps',
'selectedVertex.fileReadBytes', 'selectedVertex.fileWriteBytes', 'selectedVertex.hdfsReadBytes', 'selectedVertex.hdfdWriteBytes',