tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jihoon...@apache.org
Subject tajo git commit: TAJO-1196: Unit test hangs occasionally and randomly. (jihoon)
Date Tue, 09 Dec 2014 01:54:46 GMT
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 <jihoonson@apache.org>
Authored: Tue Dec 9 10:54:07 2014 +0900
Committer: Jihoon Son <jihoonson@apache.org>
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;


Mime
View raw message