accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject git commit: ACCUMULO-1295 put back inadvertent removal of memoryManager init; make default ctor public
Date Thu, 24 Oct 2013 17:42:23 GMT
Updated Branches:
  refs/heads/master acf81db0d -> 4eaf2df1c


ACCUMULO-1295 put back inadvertent removal of memoryManager init; make default ctor public


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

Branch: refs/heads/master
Commit: 4eaf2df1c3ab0d458e2d7cec1e553d1a3a6b6018
Parents: acf81db
Author: Eric Newton <eric.newton@gmail.com>
Authored: Thu Oct 24 13:42:44 2013 -0400
Committer: Eric Newton <eric.newton@gmail.com>
Committed: Thu Oct 24 13:42:44 2013 -0400

----------------------------------------------------------------------
 .../accumulo/server/tabletserver/LargestFirstMemoryManager.java    | 2 +-
 .../accumulo/server/tabletserver/TabletServerResourceManager.java  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4eaf2df1/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
b/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
index 53ce2f0..dd1a6ef 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
@@ -56,7 +56,7 @@ public class LargestFirstMemoryManager implements MemoryManager {
     numWaitingMultiplier = TSERV_MINC_MAXCONCURRENT_NUMWAITING_MULTIPLIER;
   }
   
-  LargestFirstMemoryManager() {
+  public LargestFirstMemoryManager() {
     prevIngestMemory = 0;
     compactionThreshold = 0.5;
     maxObserved = 0;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4eaf2df1/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
index 94e0285..f2852f9 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServerResourceManager.java
@@ -203,6 +203,7 @@ public class TabletServerResourceManager {
     fileManager = new FileManager(conf, fs, maxOpenFiles, _dCache, _iCache);
     
     memoryManager = Property.createInstanceFromPropertyName(acuConf, Property.TSERV_MEM_MGMT,
MemoryManager.class, new LargestFirstMemoryManager());
+    memoryManager.init(conf);
     memMgmt = new MemoryManagementFramework();
   }
   


Mime
View raw message