tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jh...@apache.org
Subject tajo git commit: TAJO-1538: TajoWorkerResourceManager.allocatedResourceMap is increasing forever.
Date Tue, 07 Apr 2015 13:25:56 GMT
Repository: tajo
Updated Branches:
  refs/heads/branch-0.10.1 7f7b13288 -> e75b928fe


TAJO-1538: TajoWorkerResourceManager.allocatedResourceMap is increasing forever.

Signed-off-by: Jinho Kim <jhkim@apache.org>


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

Branch: refs/heads/branch-0.10.1
Commit: e75b928fe92b00c4cf635abfc877fecd3b7e31e1
Parents: 7f7b132
Author: navis.ryu <navis@apache.org>
Authored: Tue Apr 7 22:24:34 2015 +0900
Committer: Jinho Kim <jhkim@apache.org>
Committed: Tue Apr 7 22:24:34 2015 +0900

----------------------------------------------------------------------
 CHANGES                                                           | 3 +++
 .../java/org/apache/tajo/master/rm/TajoWorkerResourceManager.java | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tajo/blob/e75b928f/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 977262a..5b1b2b6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,9 @@ Release 0.10.1 - unreleased
 
   BUG FIXES
 
+    TAJO-1538: TajoWorkerResourceManager.allocatedResourceMap is increasing 
+    forever. (Contributed by navis. Committed by jinho)
+
     TAJO-1360: VALUES_ field in OPTIONS table of catalog store should be longer.
     (Contributed by DaeMyung Kang, Committed by jaehwa)
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/e75b928f/tajo-core/src/main/java/org/apache/tajo/master/rm/TajoWorkerResourceManager.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/master/rm/TajoWorkerResourceManager.java
b/tajo-core/src/main/java/org/apache/tajo/master/rm/TajoWorkerResourceManager.java
index 0d830ea..541b1b6 100644
--- a/tajo-core/src/main/java/org/apache/tajo/master/rm/TajoWorkerResourceManager.java
+++ b/tajo-core/src/main/java/org/apache/tajo/master/rm/TajoWorkerResourceManager.java
@@ -508,7 +508,7 @@ public class TajoWorkerResourceManager extends CompositeService implements
Worke
    */
   @Override
   public void releaseWorkerResource(ContainerProtocol.TajoContainerIdProto containerId) {
-    AllocatedWorkerResource allocated = allocatedResourceMap.get(containerId);
+    AllocatedWorkerResource allocated = allocatedResourceMap.remove(containerId);
     if(allocated != null) {
       LOG.info("Release Resource: " + allocated.allocatedDiskSlots + "," + allocated.allocatedMemoryMB);
       allocated.worker.getResource().releaseResource( allocated.allocatedDiskSlots, allocated.allocatedMemoryMB);


Mime
View raw message