Author: stack
Date: Tue May 31 02:17:13 2011
New Revision: 1129470
URL: http://svn.apache.org/viewvc?rev=1129470&view=rev
Log:
HBASE-3934 MemStoreFlusher.getMemStoreLimit() doesn't honor defaultLimit
Modified:
hbase/branches/0.90/CHANGES.txt
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
Modified: hbase/branches/0.90/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1129470&r1=1129469&r2=1129470&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Tue May 31 02:17:13 2011
@@ -20,6 +20,8 @@ Release 0.90.4 - Unreleased
display issues
HBASE-3914 ROOT region appeared in two regionserver's onlineRegions at
the same time (Jieshan Bean)
+ HBASE-3934 MemStoreFlusher.getMemStoreLimit() doesn't honor defaultLimit
+ (Ted Yu)
IMPROVEMENT
HBASE-3882 hbase-config.sh needs to be updated so it can auto-detects the
Modified:
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
URL:
http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java?rev=1129470&r1=1129469&r2=1129470&view=diff
==============================================================================
---
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
(original)
+++
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
Tue May 31 02:17:13 2011
@@ -135,11 +135,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);
}
/**
