svn commit: r1129469 - in /hbase/trunk: CHANGES.txt src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java

[st...@apache.org]

Author: stack
Date: Tue May 31 02:16:22 2011
New Revision: 1129469

URL: http://svn.apache.org/viewvc?rev=1129469&view=rev
Log:
HBASE-3934 MemStoreFlusher.getMemStoreLimit() doesn't honor defaultLimit

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1129469&r1=1129468&r2=1129469&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue May 31 02:16:22 2011
@@ -113,6 +113,8 @@ Release 0.91.0 - Unreleased
    HBASE-3903  A successful write to client write-buffer may be lost or not
                visible (Doug Meil)
    HBASE-3894  Thread contention over row locks set monitor (Dave Latham)
+   HBASE-3934  MemStoreFlusher.getMemStoreLimit() doesn't honor defaultLimit
+               (Ted Yu)
 
   IMPROVEMENTS
    HBASE-3290  Max Compaction Size (Nicolas Spiegelberg via Stack)  

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java?rev=1129469&r1=1129468&r2=1129469&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java Tue May 31 02:16:22 2011
@@ -134,11 +134,13 @@ class MemStoreFlusher extends Thread imp
 
   static long getMemStoreLimit(final long max, final float limit,
       final float defaultLimit) {
+    float effectiveLimit = limit;
     if (limit >= 0.9f || limit < 0.1f) {
       LOG.warn("Setting global memstore limit to default of " + defaultLimit +
         " because supplied value outside allowed range of 0.1 -> 0.9");
+      effectiveLimit = defaultLimit;
     }
-    return (long)(max * limit);
+    return (long)(max * effectiveLimit);
   }
 
   /**