tajo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jihoon...@apache.org
Subject [06/13] tajo git commit: TAJO-1538: TajoWorkerResourceManager.allocatedResourceMap is increasing forever.
Date Sat, 11 Apr 2015 01:10:08 GMT
TAJO-1538: TajoWorkerResourceManager.allocatedResourceMap is increasing forever.

Closes #520

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/a1cf2481
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/a1cf2481
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/a1cf2481

Branch: refs/heads/index_support
Commit: a1cf24815c286b58601d1c1a0b2f745c633e4a9a
Parents: d160f6e
Author: navis.ryu <navis@apache.org>
Authored: Tue Apr 7 22:28:18 2015 +0900
Committer: Jinho Kim <jhkim@apache.org>
Committed: Tue Apr 7 22:28:18 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/a1cf2481/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index d59a205..523fb45 100644
--- a/CHANGES
+++ b/CHANGES
@@ -74,6 +74,9 @@ Release 0.11.0 - unreleased
 
   BUG FIXES
 
+    TAJO-1538: TajoWorkerResourceManager.allocatedResourceMap is increasing 
+    forever. (Contributed by navis. Committed by jinho)
+
     TAJO-1510: Change a function name from getFileCunks to getFileChunks.
     (Contributed by Soonwoong Lee, Committed by jaehwa)
 

http://git-wip-us.apache.org/repos/asf/tajo/blob/a1cf2481/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