Return-Path: X-Original-To: apmail-tajo-commits-archive@minotaur.apache.org Delivered-To: apmail-tajo-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 0EE0610C35 for ; Wed, 19 Mar 2014 01:17:49 +0000 (UTC) Received: (qmail 77973 invoked by uid 500); 19 Mar 2014 01:17:48 -0000 Delivered-To: apmail-tajo-commits-archive@tajo.apache.org Received: (qmail 77933 invoked by uid 500); 19 Mar 2014 01:17:48 -0000 Mailing-List: contact commits-help@tajo.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tajo.incubator.apache.org Delivered-To: mailing list commits@tajo.incubator.apache.org Received: (qmail 77925 invoked by uid 99); 19 Mar 2014 01:17:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Mar 2014 01:17:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 19 Mar 2014 01:17:47 +0000 Received: (qmail 77811 invoked by uid 99); 19 Mar 2014 01:17:26 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Mar 2014 01:17:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8FEEB9837DB; Wed, 19 Mar 2014 01:17:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jhkim@apache.org To: commits@tajo.incubator.apache.org Message-Id: <5b10d72fa73b4a37b0908398650ead76@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: TAJO-690: infinite loop occurs when rack task is assigning. (jinho) Date: Wed, 19 Mar 2014 01:17:26 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-tajo Updated Branches: refs/heads/branch-0.8.0 434719a5c -> 9bcb65d27 TAJO-690: infinite loop occurs when rack task is assigning. (jinho) Project: http://git-wip-us.apache.org/repos/asf/incubator-tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tajo/commit/9bcb65d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tajo/tree/9bcb65d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tajo/diff/9bcb65d2 Branch: refs/heads/branch-0.8.0 Commit: 9bcb65d2747650e9ea1cd4de0c8d19e8eb7ed688 Parents: 434719a Author: jinossy Authored: Wed Mar 19 10:16:36 2014 +0900 Committer: jinossy Committed: Wed Mar 19 10:16:36 2014 +0900 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../main/java/org/apache/tajo/master/DefaultTaskScheduler.java | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/9bcb65d2/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 119adda..235c778 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -276,6 +276,8 @@ Release 0.8.0 - unreleased BUG FIXES + TAJO-690: infinite loop occurs when rack task is assigning. (jinho) + TAJO-689: NoSuchElementException occurs during assigning the leaf tasks. (jinho) TAJO-651: HcatalogStore should support (de)serialization of RCFile. (jinho) http://git-wip-us.apache.org/repos/asf/incubator-tajo/blob/9bcb65d2/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/DefaultTaskScheduler.java ---------------------------------------------------------------------- diff --git a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/DefaultTaskScheduler.java b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/DefaultTaskScheduler.java index 91f9cea..28015d5 100644 --- a/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/DefaultTaskScheduler.java +++ b/tajo-core/tajo-core-backend/src/main/java/org/apache/tajo/master/DefaultTaskScheduler.java @@ -639,7 +639,6 @@ public class DefaultTaskScheduler extends AbstractTaskScheduler { //find remaining local task if (leafTasks.contains(attemptId)) { leafTasks.remove(attemptId); - leafTasksRackMapping.get(hostVolumeMapping.getRack()).remove(attemptId); //LOG.info(attemptId + " Assigned based on host match " + hostName); hostLocalAssigned++; totalAssigned++; @@ -669,9 +668,11 @@ public class DefaultTaskScheduler extends AbstractTaskScheduler { for (HostVolumeMapping tasks : remainingTasks) { while (tasks.getRemainingLocalTaskSize() > 0){ QueryUnitAttemptId tId = tasks.getQueryUnitAttemptIdByRack(rack); + + if (tId == null) break; + if (leafTasks.contains(tId)) { leafTasks.remove(tId); - leafTasksRackMapping.get(rack).remove(tId); attemptId = tId; break; }