You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by rb...@apache.org on 2015/02/13 11:11:13 UTC
tez git commit: TEZ-2098. Tez UI: Dag details should be the default
page for dag,
fix invalid time entries for failed Vertices (pramachandran via rbalamohan)
Repository: tez
Updated Branches:
refs/heads/master b74bab471 -> b26fdfe7f
TEZ-2098. Tez UI: Dag details should be the default page for dag, fix invalid time entries for failed Vertices (pramachandran via rbalamohan)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/b26fdfe7
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/b26fdfe7
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/b26fdfe7
Branch: refs/heads/master
Commit: b26fdfe7f63553f3c0abc14e30547aebb049f16b
Parents: b74bab4
Author: Rajesh Balamohan <rb...@hortonworks.com>
Authored: Fri Feb 13 15:39:40 2015 +0530
Committer: Rajesh Balamohan <rb...@hortonworks.com>
Committed: Fri Feb 13 15:39:40 2015 +0530
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../src/main/webapp/app/scripts/controllers/dags_controller.js | 2 +-
tez-ui/src/main/webapp/app/scripts/helpers/date.js | 6 +++---
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/b26fdfe7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1e8c116..d62308b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -61,6 +61,7 @@ Release 0.6.1: Unreleased
INCOMPATIBLE CHANGES
ALL CHANGES:
+ TEZ-2098. Tez UI: Dag details should be the default page for dag, fix invalid time entries for failed Vertices.
TEZ-2024. TaskFinishedEvent may not be logged in recovery.
TEZ-2031. Tez UI: horizontal scrollbars do not appear in tables, causing them to look truncated.
TEZ-2073. SimpleHistoryLoggingService cannot be read by log aggregation (umask)
http://git-wip-us.apache.org/repos/asf/tez/blob/b26fdfe7/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js
index 9d1a243..fbe49ef 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/dags_controller.js
@@ -137,7 +137,7 @@ App.DagsController = Em.ObjectController.extend(App.PaginatedContentMixin, App.C
filterID: 'dagName_filter',
tableCellViewClass: Em.Table.TableCell.extend({
template: Em.Handlebars.compile(
- "{{#link-to 'dag.view' view.cellContent.id class='ember-table-content'}}{{view.cellContent.name}}{{/link-to}}")
+ "{{#link-to 'dag.index' view.cellContent.id class='ember-table-content'}}{{view.cellContent.name}}{{/link-to}}")
}),
getCellContent: function(row) {
return {
http://git-wip-us.apache.org/repos/asf/tez/blob/b26fdfe7/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 750b4f4..10df10b 100644
--- a/tez-ui/src/main/webapp/app/scripts/helpers/date.js
+++ b/tez-ui/src/main/webapp/app/scripts/helpers/date.js
@@ -52,8 +52,8 @@ App.Helpers.date = {
* @method dateFormat
*/
dateFormat: function (timestamp, showSeconds, showMilliseconds) {
- if (!App.Helpers.number.isValidInt(timestamp)) {
- return timestamp;
+ if (!App.Helpers.number.isValidInt(timestamp) || timestamp == 0) {
+ return "";
}
if(showSeconds == undefined) showSeconds = true;
var format = 'DD MMM YYYY HH:mm';
@@ -165,7 +165,7 @@ App.Helpers.date = {
*/
timingFormat: function (time, /* optional */ zeroValid) {
var intTime = parseInt(time);
- if (zeroValid && intTime == 0) {
+ if (zeroValid && intTime <= 0) {
return 0 + ' secs';
}
if (!intTime) {