You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2015/12/31 06:04:19 UTC
phoenix git commit: PHOENIX-2552 Fix hanging Jenkins builds
Repository: phoenix
Updated Branches:
refs/heads/master b55a44ac5 -> 49b730eb7
PHOENIX-2552 Fix hanging Jenkins builds
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/49b730eb
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/49b730eb
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/49b730eb
Branch: refs/heads/master
Commit: 49b730eb705084067b5fd3d5ea1dc4066b4bcc6d
Parents: b55a44a
Author: James Taylor <jt...@salesforce.com>
Authored: Wed Dec 30 21:04:12 2015 -0800
Committer: James Taylor <jt...@salesforce.com>
Committed: Wed Dec 30 21:04:12 2015 -0800
----------------------------------------------------------------------
.../org/apache/phoenix/memory/GlobalMemoryManager.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/49b730eb/phoenix-core/src/main/java/org/apache/phoenix/memory/GlobalMemoryManager.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/memory/GlobalMemoryManager.java b/phoenix-core/src/main/java/org/apache/phoenix/memory/GlobalMemoryManager.java
index 6460260..e70b35f 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/memory/GlobalMemoryManager.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/memory/GlobalMemoryManager.java
@@ -151,23 +151,24 @@ public class GlobalMemoryManager implements MemoryManager {
if (size > 0) {
logger.warn("Orphaned chunk of " + size + " bytes found during finalize");
}
- close();
- // TODO: log error here, but we can't use SFDC logging
- // because this runs in an hbase coprocessor.
- // Create a gack-like API (talk with GridForce or HBase folks)
+ freeMemory();
} finally {
super.finalize();
}
}
- @Override
- public void close() {
+ private void freeMemory() {
synchronized(sync) {
usedMemoryBytes -= size;
size = 0;
sync.notifyAll();
}
}
+
+ @Override
+ public void close() {
+ freeMemory();
+ }
}
}