You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by jh...@apache.org on 2014/09/20 09:26:49 UTC

git commit: TAJO-1056: Wrong resource release or wrong task scheduling. (jinho)

Repository: tajo
Updated Branches:
  refs/heads/master 5b31fc420 -> 621d9145f


TAJO-1056: Wrong resource release or wrong task scheduling. (jinho)

Closes #151


Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/621d9145
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/621d9145
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/621d9145

Branch: refs/heads/master
Commit: 621d9145ff5f2d2551ebd3fce11a87f23413201e
Parents: 5b31fc4
Author: jhkim <jh...@apache.org>
Authored: Sat Sep 20 16:26:04 2014 +0900
Committer: jhkim <jh...@apache.org>
Committed: Sat Sep 20 16:26:04 2014 +0900

----------------------------------------------------------------------
 CHANGES                                                            | 2 ++
 .../src/main/java/org/apache/tajo/master/DefaultTaskScheduler.java | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/621d9145/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 7b2f77e..2d10e9c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -143,6 +143,8 @@ Release 0.9.0 - unreleased
 
   BUG FIXES
 
+    TAJO-1056: Wrong resource release or wrong task scheduling. (jinho)
+
     TAJO-1050: RPC client does not retry during connecting. 
     (Jihun Kang via jinho)
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/621d9145/tajo-core/src/main/java/org/apache/tajo/master/DefaultTaskScheduler.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/master/DefaultTaskScheduler.java b/tajo-core/src/main/java/org/apache/tajo/master/DefaultTaskScheduler.java
index 2cb8878..c5cf430 100644
--- a/tajo-core/src/main/java/org/apache/tajo/master/DefaultTaskScheduler.java
+++ b/tajo-core/src/main/java/org/apache/tajo/master/DefaultTaskScheduler.java
@@ -788,7 +788,6 @@ public class DefaultTaskScheduler extends AbstractTaskScheduler {
               //release container
               hostVolumeMapping.decreaseConcurrency(containerId);
               taskRequest.getCallback().run(stopTaskRunnerReq);
-              subQuery.releaseContainer(containerId);
               continue;
             }
           }