You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by ss...@apache.org on 2015/02/10 22:52:25 UTC

[13/17] tez git commit: TEZ-2063. Tez UI: Flaky log url in tasks table. (Sreenath Somarajapuram via hitesh)

TEZ-2063. Tez UI: Flaky log url in tasks table. (Sreenath Somarajapuram via hitesh)


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

Branch: refs/heads/TEZ-2003
Commit: 4ce0b747782555527a1c1bcf69009931f9e877a2
Parents: 12c31ab
Author: Hitesh Shah <hi...@apache.org>
Authored: Tue Feb 10 12:38:15 2015 -0800
Committer: Hitesh Shah <hi...@apache.org>
Committed: Tue Feb 10 12:38:15 2015 -0800

----------------------------------------------------------------------
 CHANGES.txt                                                        | 1 +
 tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js        | 2 +-
 .../main/webapp/app/scripts/controllers/vertex_tasks_controller.js | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/4ce0b747/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ab9250b..cb4c468 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -57,6 +57,7 @@ Release 0.6.1: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2063. Tez UI: Flaky log url in tasks table.
   TEZ-2062. Tez UI: Showing 50 elements not working properly.
   TEZ-2056. Tez UI: fix VertexID filter,show only tez configs by default,fix appattemptid.
   TEZ-2052. Tez UI: log view fixes, show version from build, better handling of ats url config.

http://git-wip-us.apache.org/repos/asf/tez/blob/4ce0b747/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js b/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js
index 98958ae..3be59f0 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/dag_tasks.js
@@ -58,7 +58,6 @@ App.DagTasksController = Em.ObjectController.extend(App.PaginatedContentMixin, A
 
     store.unloadAll(childEntityType);
     store.findQuery(childEntityType, this.getFilterProperties()).then(function(entities){
-      that.set('entities', entities);
       var pivotLoaders = [];
       entities.forEach(function (task) {
         var taskAttemptId = task.get('successfulAttemptId') ||
@@ -73,6 +72,7 @@ App.DagTasksController = Em.ObjectController.extend(App.PaginatedContentMixin, A
         }
       });
       Em.RSVP.allSettled(pivotLoaders).then(function(){
+        that.set('entities', entities);
         that.set('loading', false);
       });
     }).catch(function(error){

http://git-wip-us.apache.org/repos/asf/tez/blob/4ce0b747/tez-ui/src/main/webapp/app/scripts/controllers/vertex_tasks_controller.js
----------------------------------------------------------------------
diff --git a/tez-ui/src/main/webapp/app/scripts/controllers/vertex_tasks_controller.js b/tez-ui/src/main/webapp/app/scripts/controllers/vertex_tasks_controller.js
index 4241a2b..1edb834 100644
--- a/tez-ui/src/main/webapp/app/scripts/controllers/vertex_tasks_controller.js
+++ b/tez-ui/src/main/webapp/app/scripts/controllers/vertex_tasks_controller.js
@@ -50,7 +50,6 @@ App.VertexTasksController = Em.ObjectController.extend(App.PaginatedContentMixin
 
     store.unloadAll(childEntityType);
     store.findQuery(childEntityType, this.getFilterProperties()).then(function(entities){
-      that.set('entities', entities);
       var pivotLoaders = [];
       entities.forEach(function (task) {
         var taskAttemptId = task.get('successfulAttemptId') || task.get('attempts.lastObject');
@@ -64,6 +63,7 @@ App.VertexTasksController = Em.ObjectController.extend(App.PaginatedContentMixin
         }
       });
       Em.RSVP.allSettled(pivotLoaders).then(function(){
+        that.set('entities', entities);
         that.set('loading', false);
       });
     }).catch(function(jqXHR){