svn commit: r1378339 - /hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

[mb...@apache.org]

Author: mbautin
Date: Tue Aug 28 20:59:19 2012
New Revision: 1378339

URL: http://svn.apache.org/viewvc?rev=1378339&view=rev
Log:
[HBASE-6423] [0.89-fb] change hbase block multiplier to support float.

Author: aaiyer

Summary:
Currently this is set to long. So, we have to set it to 2.0 at least.
Changing it to float will allow us better control.

Test Plan: mr unit test.

Reviewers: kannan, kranganathan

CC: hbase-eng@

Differential Revision: https://phabricator.fb.com/D546696

Modified:
    hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1378339&r1=1378338&r2=1378339&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Tue Aug 28 20:59:19 2012
@@ -527,8 +527,8 @@ public class HRegion implements HeapSize
     }
     this.disableWAL = regionInfo.getTableDesc().isWALDisabled();
     this.memstoreFlushSize = flushSize;
-    this.blockingMemStoreSize = this.memstoreFlushSize *
-      conf.getLong(HConstants.HREGION_MEMSTORE_BLOCK_MULTIPLIER, 2);
+    this.blockingMemStoreSize = (long)(this.memstoreFlushSize *
+      conf.getFloat(HConstants.HREGION_MEMSTORE_BLOCK_MULTIPLIER, 2));
     this.waitOnMemstoreBlock =
         conf.getBoolean(HConstants.HREGION_MEMSTORE_WAIT_ON_BLOCK, true);
     this.scannerReadPoints = new ConcurrentHashMap<RegionScanner, Long>();