You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2012/10/25 22:12:54 UTC

svn commit: r1402314 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java

Author: apurtell
Date: Thu Oct 25 20:12:54 2012
New Revision: 1402314

URL: http://svn.apache.org/viewvc?rev=1402314&view=rev
Log:
HBASE-7033. Add hbase.lru.blockcache.acceptable.factor to configuration (Sergey Shelukhin)

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java?rev=1402314&r1=1402313&r2=1402314&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java Thu Oct 25 20:12:54 2012
@@ -97,9 +97,11 @@ public class LruBlockCache implements Bl
 
   static final Log LOG = LogFactory.getLog(LruBlockCache.class);
 
+  static final String LRU_MIN_FACTOR_CONFIG_NAME = "hbase.lru.blockcache.min.factor";
+  static final String LRU_ACCEPTABLE_FACTOR_CONFIG_NAME = "hbase.lru.blockcache.acceptable.factor";
+
   /** Default Configuration Parameters*/
-  static final String LRU_MIN_FACTOR = "hbase.lru.blockcache.min.factor";
-  
+
   /** Backing Concurrent Map Configuration */
   static final float DEFAULT_LOAD_FACTOR = 0.75f;
   static final int DEFAULT_CONCURRENCY_LEVEL = 16;
@@ -202,8 +204,8 @@ public class LruBlockCache implements Bl
         (int)Math.ceil(1.2*maxSize/blockSize),
         DEFAULT_LOAD_FACTOR, 
         DEFAULT_CONCURRENCY_LEVEL,
-        conf.getFloat(LRU_MIN_FACTOR, DEFAULT_MIN_FACTOR), 
-        DEFAULT_ACCEPTABLE_FACTOR,
+        conf.getFloat(LRU_MIN_FACTOR_CONFIG_NAME, DEFAULT_MIN_FACTOR), 
+        conf.getFloat(LRU_ACCEPTABLE_FACTOR_CONFIG_NAME, DEFAULT_ACCEPTABLE_FACTOR), 
         DEFAULT_SINGLE_FACTOR, 
         DEFAULT_MULTI_FACTOR,
         DEFAULT_MEMORY_FACTOR);