Repository: tez Updated Branches: refs/heads/master 7221d386a -> 727584fd2
TEZ-3233. Tez UI: Have LLAP information reflect in Tez UI (sree) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/727584fd Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/727584fd Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/727584fd Branch: refs/heads/master Commit: 727584fd2d99a319214ba75f11967a1d4f2a7dbd Parents: 7221d38 Author: Sreenath Somarajapuram <[email protected]> Authored: Fri Apr 29 14:26:25 2016 +0530 Committer: Sreenath Somarajapuram <[email protected]> Committed: Fri Apr 29 14:26:25 2016 +0530 ---------------------------------------------------------------------- CHANGES.txt | 1 + tez-ui/src/main/webapp/app/models/vertex.js | 2 ++ .../src/main/webapp/app/serializers/vertex.js | 2 ++ .../main/webapp/app/templates/vertex/index.hbs | 25 ++++++++++++++++++++ .../webapp/tests/unit/models/vertex-test.js | 2 ++ 5 files changed, 32 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/727584fd/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 3979725..b436b9a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -20,6 +20,7 @@ ALL CHANGES: TEZ-3087. Tez UI 2: Add log links in task & attempt details page TEZ-3146. Tez UI 2: CSS & JS assets in the UI must be minified TEZ-3227. Tez UI: Replace UI1 with UI2 + TEZ-3233. Tez UI: Have LLAP information reflect in Tez UI Release 0.8.4: Unreleased http://git-wip-us.apache.org/repos/asf/tez/blob/727584fd/tez-ui/src/main/webapp/app/models/vertex.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/models/vertex.js b/tez-ui/src/main/webapp/app/models/vertex.js index e54bff2..a195892 100644 --- a/tez-ui/src/main/webapp/app/models/vertex.js +++ b/tez-ui/src/main/webapp/app/models/vertex.js @@ -143,4 +143,6 @@ export default AMTimelineModel.extend({ dagID: DS.attr('string'), dag: DS.attr('object'), // Auto-loaded by need + + servicePlugin: DS.attr('object'), }); http://git-wip-us.apache.org/repos/asf/tez/blob/727584fd/tez-ui/src/main/webapp/app/serializers/vertex.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/serializers/vertex.js b/tez-ui/src/main/webapp/app/serializers/vertex.js index a3cb22f..a1d0d52 100644 --- a/tez-ui/src/main/webapp/app/serializers/vertex.js +++ b/tez-ui/src/main/webapp/app/serializers/vertex.js @@ -55,5 +55,7 @@ export default TimelineSerializer.extend({ processorClassName: getProcessorClass, dagID: 'primaryfilters.TEZ_DAG_ID.0', + + servicePlugin: 'otherinfo.servicePlugin', } }); http://git-wip-us.apache.org/repos/asf/tez/blob/727584fd/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 15ffde3..f7bc5c4 100644 --- a/tez-ui/src/main/webapp/app/templates/vertex/index.hbs +++ b/tez-ui/src/main/webapp/app/templates/vertex/index.hbs @@ -127,6 +127,31 @@ </tbody> </table> + <!-- Service plugin specific details --> + {{#if model.servicePlugin.taskSchedulerName}} + <table class='detail-list'> + <thead> + <tr> + <th colspan=2>Service Plugin Details</th> + </tr> + </thead> + <tbody> + <tr> + <td>Task Scheduler Plugin</td> + <td>{{txt model.servicePlugin.taskSchedulerName}} [ {{txt model.servicePlugin.taskSchedulerClassName}} ]</td> + </tr> + <tr> + <td>Task Communicator Plugin</td> + <td>{{txt model.servicePlugin.taskCommunicatorName}} [ {{txt model.servicePlugin.taskCommunicatorClassName}} ]</td> + </tr> + <tr> + <td>Container Launcher Plugin</td> + <td>{{txt model.servicePlugin.containerLauncherName}} [ {{txt model.servicePlugin.containerLauncherClassName}} ]</td> + </tr> + </tbody> + </table> + {{/if}} + {{#if model.diagnostics}} <div class="panel panel-danger"> <div class="panel-heading"> http://git-wip-us.apache.org/repos/asf/tez/blob/727584fd/tez-ui/src/main/webapp/tests/unit/models/vertex-test.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/tests/unit/models/vertex-test.js b/tez-ui/src/main/webapp/tests/unit/models/vertex-test.js index e3195bd..a4c1ce9 100644 --- a/tez-ui/src/main/webapp/tests/unit/models/vertex-test.js +++ b/tez-ui/src/main/webapp/tests/unit/models/vertex-test.js @@ -43,6 +43,8 @@ test('Basic creation test', function(assert) { assert.ok(model.lastTaskFinishTime); assert.ok(model.finalStatus); + + assert.ok(model.servicePlugin); }); test('runningTasks test', function(assert) {
