Repository: tez Updated Branches: refs/heads/master bc08b19b2 -> a4a3c6dce
TEZ-3845. Tez UI Cleanup Stats Table (Jonathan Eagles via kshukla) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/a4a3c6dc Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/a4a3c6dc Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/a4a3c6dc Branch: refs/heads/master Commit: a4a3c6dce3eaaa74b64591b181dc6fdcd5b8aa5e Parents: bc08b19 Author: Kuhu Shukla <[email protected]> Authored: Thu Sep 28 16:38:11 2017 -0500 Committer: Kuhu Shukla <[email protected]> Committed: Thu Sep 28 16:38:11 2017 -0500 ---------------------------------------------------------------------- tez-ui/src/main/webapp/app/components/stats-link.js | 6 ------ .../main/webapp/app/templates/components/stats-link.hbs | 12 +++++++++--- .../src/main/webapp/app/templates/dag/index/index.hbs | 12 ++++++------ tez-ui/src/main/webapp/app/templates/vertex/index.hbs | 10 +++++++++- 4 files changed, 24 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/a4a3c6dc/tez-ui/src/main/webapp/app/components/stats-link.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/components/stats-link.js b/tez-ui/src/main/webapp/app/components/stats-link.js index 0fb56df..4131dc8 100644 --- a/tez-ui/src/main/webapp/app/components/stats-link.js +++ b/tez-ui/src/main/webapp/app/components/stats-link.js @@ -24,10 +24,4 @@ export default Ember.Component.extend({ statsType: null, searchText: Ember.computed.oneWay("statsType"), - _statsType: Ember.computed("statsType", function () { - var type = this.get("statsType"); - if(type) { - return Ember.String.capitalize(type.toLowerCase()); - } - }) }); http://git-wip-us.apache.org/repos/asf/tez/blob/a4a3c6dc/tez-ui/src/main/webapp/app/templates/components/stats-link.hbs ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/templates/components/stats-link.hbs b/tez-ui/src/main/webapp/app/templates/components/stats-link.hbs index 0d91ae9..d8155ee 100644 --- a/tez-ui/src/main/webapp/app/templates/components/stats-link.hbs +++ b/tez-ui/src/main/webapp/app/templates/components/stats-link.hbs @@ -17,9 +17,15 @@ }} {{#if value}} - {{#link-to routeName (query-params searchText=searchText)}} - {{txt value type="number"}} {{_statsType}} - {{/link-to}} + {{#if searchText}} + {{#link-to routeName (query-params searchText=searchText)}} + {{txt value type="number"}} + {{/link-to}} + {{else}} + {{#link-to routeName}} + {{txt value type="number"}} + {{/link-to}} + {{/if}} {{else}} {{txt value type="number"}} {{/if}} http://git-wip-us.apache.org/repos/asf/tez/blob/a4a3c6dc/tez-ui/src/main/webapp/app/templates/dag/index/index.hbs ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/templates/dag/index/index.hbs b/tez-ui/src/main/webapp/app/templates/dag/index/index.hbs index e39b514..de425af 100644 --- a/tez-ui/src/main/webapp/app/templates/dag/index/index.hbs +++ b/tez-ui/src/main/webapp/app/templates/dag/index/index.hbs @@ -26,22 +26,22 @@ </thead> <tbody> <tr> + <td>Total Vertices</td> + <td>{{stats-link value=stats.totalVertices routeName="dag.vertices"}}</td> + </tr> + <tr> <td>Succeeded Vertices</td> <td>{{stats-link value=stats.succeededVertices routeName="dag.vertices" statsType="SUCCEEDED"}}</td> </tr> <tr> - <td>Total Vertices</td> - <td>{{stats.totalVertices}}</td> + <td>Total Tasks</td> + <td>{{stats-link value=stats.totalTasks routeName="dag.tasks"}}</td> </tr> <tr> <td>Succeeded Tasks</td> <td>{{stats-link value=stats.succeededTasks routeName="dag.tasks" statsType="SUCCEEDED"}}</td> </tr> <tr> - <td>Total Tasks</td> - <td>{{stats.totalTasks}}</td> - </tr> - <tr> <td>Failed Tasks</td> <td>{{stats-link value=stats.failedTasks routeName="dag.tasks" statsType="FAILED"}}</td> </tr> http://git-wip-us.apache.org/repos/asf/tez/blob/a4a3c6dc/tez-ui/src/main/webapp/app/templates/vertex/index.hbs ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/templates/vertex/index.hbs b/tez-ui/src/main/webapp/app/templates/vertex/index.hbs index ff4f4fb..ce08343 100644 --- a/tez-ui/src/main/webapp/app/templates/vertex/index.hbs +++ b/tez-ui/src/main/webapp/app/templates/vertex/index.hbs @@ -68,7 +68,7 @@ <tbody> <tr> <td>Total Tasks</td> - <td>{{txt model.totalTasks type="number"}}</td> + <td>{{stats-link value=model.totalTasks routeName="vertex.tasks"}}</td> </tr> <tr> <td>Succeeded Tasks</td> @@ -83,6 +83,14 @@ <td>{{stats-link value=model.killedTasks routeName="vertex.tasks" statsType="KILLED"}}</td> </tr> <tr> + <td>Failed Task Attempts</td> + <td>{{stats-link value=model.failedTaskAttempts routeName="vertex.attempts" statsType="FAILED"}}</td> + </tr> + <tr> + <td>Killed Task Attempts</td> + <td>{{stats-link value=model.killedTaskAttempts routeName="vertex.attempts" statsType="KILLED"}}</td> + </tr> + <tr> <td>First Task Start Time</td> <td> {{date-formatter content=model.firstTaskStartTime}}
