You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by je...@apache.org on 2016/02/26 17:39:10 UTC

tez git commit: TEZ-3129. Tez task and task attempt UI needs application fails with NotFoundException (jeagles)

Repository: tez
Updated Branches:
  refs/heads/master 923f7b4e2 -> 9710575b1


TEZ-3129. Tez task and task attempt UI needs application fails with NotFoundException (jeagles)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/9710575b
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/9710575b
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/9710575b

Branch: refs/heads/master
Commit: 9710575b152a0b93b1fa213d9017fd21070e09a5
Parents: 923f7b4
Author: Jonathan Eagles <je...@yahoo-inc.com>
Authored: Fri Feb 26 10:38:58 2016 -0600
Committer: Jonathan Eagles <je...@yahoo-inc.com>
Committed: Fri Feb 26 10:38:58 2016 -0600

----------------------------------------------------------------------
 CHANGES.txt                                                    | 2 ++
 .../webapp/app/scripts/controllers/task_attempt_controller.js  | 6 ++++--
 .../src/main/webapp/app/scripts/controllers/task_controller.js | 6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/9710575b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index dd8b1dd..a925de7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES
   TEZ-3029. Add an onError method to service plugin contexts.
 
 ALL CHANGES:
+  TEZ-3129. Tez task and task attempt UI needs application fails with NotFoundException
   TEZ-3114. Shuffle OOM due to EventMetaData flood
   TEZ-1911. MergeManager's unconditionalReserve() should check for memory limits before allocating.
   TEZ-3102. Fetch failure of a speculated task causes job hang
@@ -387,6 +388,7 @@ INCOMPATIBLE CHANGES
   TEZ-2949. Allow duplicate dag names within session for Tez.
 
 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-3126. Log reason for not reducing parallelism

http://git-wip-us.apache.org/repos/asf/tez/blob/9710575b/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/9710575b/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);
     });