Repository: tez Updated Branches: refs/heads/branch-0.7 58218fb25 -> 8d6025445
TEZ-3129. Tez task and task attempt UI needs application fails with NotFoundException (jeagles) (cherry picked from commit 9710575b152a0b93b1fa213d9017fd21070e09a5) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/8d602544 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/8d602544 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/8d602544 Branch: refs/heads/branch-0.7 Commit: 8d6025445234359107df3e59864e9ac26c30c621 Parents: 58218fb Author: Jonathan Eagles <[email protected]> Authored: Fri Feb 26 10:38:58 2016 -0600 Committer: Jonathan Eagles <[email protected]> Committed: Fri Feb 26 10:40:55 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../webapp/app/scripts/controllers/task_attempt_controller.js | 6 ++++-- .../src/main/webapp/app/scripts/controllers/task_controller.js | 6 ++++-- 3 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/8d602544/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 8ea37dc..87055b7 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,6 +9,7 @@ INCOMPATIBLE CHANGES TEZ-2972. Avoid task rescheduling when a node turns unhealthy ALL CHANGES + TEZ-3129. Tez task and task attempt UI needs application fails with NotFoundException TEZ-3114. Shuffle OOM due to EventMetaData flood TEZ-3102. Fetch failure of a speculated task causes job hang TEZ-3137. Tez task failed with illegal state exception in recovery http://git-wip-us.apache.org/repos/asf/tez/blob/8d602544/tez-ui/src/main/webapp/app/scripts/controllers/task_attempt_controller.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/task_attempt_controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/task_attempt_controller.js index de24ccd..9c398a5 100644 --- a/tez-ui/src/main/webapp/app/scripts/controllers/task_attempt_controller.js +++ b/tez-ui/src/main/webapp/app/scripts/controllers/task_attempt_controller.js @@ -74,7 +74,10 @@ App.TaskAttemptController = App.BaseController.extend(App.Helpers.DisplayHelper, var dagLoader = this.store.find('dag', attempt.get('dagID')); var vertexLoader = this.store.find('vertex', attempt.get('vertexID')); var taskLoader = this.store.find('task', attempt.get('taskID')); - var appDetailLoader = App.Helpers.misc.loadApp(this.store, applicationId); + var appDetailLoader = App.Helpers.misc.loadApp(this.store, applicationId) + .then(function(app) { + attempt.set('appDetail', app); + }).catch(function(){}); var allLoaders = Em.RSVP.hash({ dag: dagLoader, @@ -86,7 +89,6 @@ App.TaskAttemptController = App.BaseController.extend(App.Helpers.DisplayHelper, attempt.set('task', results.task); attempt.set('task.vertex', results.vertex); attempt.set('task.vertex.dag', results.dag); - attempt.set('appDetail', results.appDetail); }).finally(function() { that.set('loading', false); }); http://git-wip-us.apache.org/repos/asf/tez/blob/8d602544/tez-ui/src/main/webapp/app/scripts/controllers/task_controller.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/task_controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/task_controller.js index 829881f..421b0e3 100644 --- a/tez-ui/src/main/webapp/app/scripts/controllers/task_controller.js +++ b/tez-ui/src/main/webapp/app/scripts/controllers/task_controller.js @@ -64,7 +64,10 @@ App.TaskController = App.PollingController.extend(App.Helpers.DisplayHelper, App var dagLoader = this.store.find('dag', task.get('dagID')); var vertexLoader = this.store.find('vertex', task.get('vertexID')); var tezAppLoader = this.store.find('tezApp', 'tez_' + applicationId); - var appDetailLoader = App.Helpers.misc.loadApp(this.store, applicationId); + var appDetailLoader = App.Helpers.misc.loadApp(this.store, applicationId) + .then(function(app) { + task.set('appDetail', app); + }).catch(function(){}); task.set('progress', undefined); var allLoaders = Em.RSVP.hash({ @@ -78,7 +81,6 @@ App.TaskController = App.PollingController.extend(App.Helpers.DisplayHelper, App task.set('vertex', results.vertex); task.set('vertex.dag', results.dag); task.set('tezApp', results.tezApp); - task.set('appDetail', results.appDetail); }).finally(function() { that.set('loading', false); });
