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 CE977C77F for ; Tue, 9 Dec 2014 01:54:46 +0000 (UTC) Received: (qmail 18487 invoked by uid 500); 9 Dec 2014 01:54:46 -0000 Delivered-To: apmail-tajo-commits-archive@tajo.apache.org Received: (qmail 18448 invoked by uid 500); 9 Dec 2014 01:54:46 -0000 Mailing-List: contact commits-help@tajo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tajo.apache.org Delivered-To: mailing list commits@tajo.apache.org Received: (qmail 18439 invoked by uid 99); 9 Dec 2014 01:54:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Dec 2014 01:54:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 48468A1F134; Tue, 9 Dec 2014 01:54:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jihoonson@apache.org To: commits@tajo.apache.org Message-Id: <946ad63d609d4210b37d2c9f4189a5f7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: tajo git commit: TAJO-1196: Unit test hangs occasionally and randomly. (jihoon) Date: Tue, 9 Dec 2014 01:54:46 +0000 (UTC) Repository: tajo Updated Branches: refs/heads/master 88e5c9e9a -> 8f68b4baf TAJO-1196: Unit test hangs occasionally and randomly. (jihoon) Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/8f68b4ba Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/8f68b4ba Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/8f68b4ba Branch: refs/heads/master Commit: 8f68b4bafdbb216365459d5bd118534d0031e548 Parents: 88e5c9e Author: Jihoon Son Authored: Tue Dec 9 10:54:07 2014 +0900 Committer: Jihoon Son Committed: Tue Dec 9 10:54:07 2014 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ .../java/org/apache/tajo/master/querymaster/QueryMaster.java | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/8f68b4ba/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 581c997..59a8f68 100644 --- a/CHANGES +++ b/CHANGES @@ -87,6 +87,8 @@ Release 0.9.1 - unreleased BUG FIXES + TAJO-1196: Unit test hangs occasionally and randomly. (jihoon) + TAJO-1234: Rearrange timezone in date/time types. (hyunsik) TAJO-1231: Implicit table properties in session are not stored in http://git-wip-us.apache.org/repos/asf/tajo/blob/8f68b4ba/tajo-core/src/main/java/org/apache/tajo/master/querymaster/QueryMaster.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/main/java/org/apache/tajo/master/querymaster/QueryMaster.java b/tajo-core/src/main/java/org/apache/tajo/master/querymaster/QueryMaster.java index b3b4dbb..f2d8b3a 100644 --- a/tajo-core/src/main/java/org/apache/tajo/master/querymaster/QueryMaster.java +++ b/tajo-core/src/main/java/org/apache/tajo/master/querymaster/QueryMaster.java @@ -480,6 +480,10 @@ public class QueryMaster extends CompositeService implements EventHandler { QueryMasterTask queryMasterTask = new QueryMasterTask(queryMasterContext, event.getQueryId(), event.getSession(), event.getQueryContext(), event.getJsonExpr(), event.getLogicalPlanJson()); + synchronized(queryMasterTasks) { + queryMasterTasks.put(event.getQueryId(), queryMasterTask); + } + queryMasterTask.init(systemConf); if (!queryMasterTask.isInitError()) { queryMasterTask.start(); @@ -487,10 +491,6 @@ public class QueryMaster extends CompositeService implements EventHandler { queryContext = event.getQueryContext(); - synchronized(queryMasterTasks) { - queryMasterTasks.put(event.getQueryId(), queryMasterTask); - } - if (queryMasterTask.isInitError()) { queryMasterContext.stopQuery(queryMasterTask.getQueryId()); return;