Return-Path: X-Original-To: apmail-tez-commits-archive@minotaur.apache.org Delivered-To: apmail-tez-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 51570174FE for ; Tue, 10 Feb 2015 20:44:50 +0000 (UTC) Received: (qmail 13056 invoked by uid 500); 10 Feb 2015 20:44:50 -0000 Delivered-To: apmail-tez-commits-archive@tez.apache.org Received: (qmail 13017 invoked by uid 500); 10 Feb 2015 20:44:50 -0000 Mailing-List: contact commits-help@tez.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.apache.org Delivered-To: mailing list commits@tez.apache.org Received: (qmail 13002 invoked by uid 99); 10 Feb 2015 20:44:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Feb 2015 20:44:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 06C09E01DD; Tue, 10 Feb 2015 20:44:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hitesh@apache.org To: commits@tez.apache.org Date: Tue, 10 Feb 2015 20:44:50 -0000 Message-Id: <525ac302c70f40d3a558bf9a8f3acbd2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] tez git commit: TEZ-2063. Tez UI: Flaky log url in tasks table. (Sreenath Somarajapuram via hitesh) Repository: tez Updated Branches: refs/heads/branch-0.6 5c9a37565 -> e8610693f TEZ-2063. Tez UI: Flaky log url in tasks table. (Sreenath Somarajapuram via hitesh) (cherry picked from commit 4ce0b747782555527a1c1bcf69009931f9e877a2) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/f661803c Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/f661803c Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/f661803c Branch: refs/heads/branch-0.6 Commit: f661803cccca222a1bdbba981749d9eb8c3d5a41 Parents: 5c9a375 Author: Hitesh Shah Authored: Tue Feb 10 12:38:15 2015 -0800 Committer: Hitesh Shah Committed: Tue Feb 10 12:44:29 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/f661803c/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 79f7e65..02b8c24 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -6,6 +6,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-1917. Examples should extend TezExampleBase. TEZ-2056. Tez UI: fix VertexID filter,show only tez configs by default,fix appattemptid. http://git-wip-us.apache.org/repos/asf/tez/blob/f661803c/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/f661803c/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){