Author: ndimiduk
Date: Fri Feb 21 21:58:35 2014
New Revision: 1570721
URL: http://svn.apache.org/r1570721
Log:
HBASE-10392 Correct references to hbase.regionserver.global.memstore.upperLimit
Modified:
hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
hbase/trunk/src/main/docbkx/ops_mgt.xml
hbase/trunk/src/main/docbkx/performance.xml
Modified:
hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java?rev=1570721&r1=1570720&r2=1570721&view=diff
==============================================================================
---
hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
(original)
+++
hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HBaseConfiguration.java
Fri Feb 21 21:58:35 2014
@@ -74,8 +74,13 @@ public class HBaseConfiguration extends
}
private static void checkForClusterFreeMemoryLimit(Configuration conf) {
- float globalMemstoreLimit =
conf.getFloat("hbase.regionserver.global.memstore.upperLimit", 0.4f);
- int gml = (int)(globalMemstoreLimit * CONVERT_TO_PERCENTAGE);
+ if (conf.get("hbase.regionserver.global.memstore.upperLimit") != null) {
+ LOG.warn("hbase.regionserver.global.memstore.upperLimit is deprecated
by "
+ + "hbase.regionserver.global.memstore.size");
+ }
+ float globalMemstoreSize =
conf.getFloat("hbase.regionserver.global.memstore.size",
+ conf.getFloat("hbase.regionserver.global.memstore.upperLimit", 0.4f));
+ int gml = (int)(globalMemstoreSize * CONVERT_TO_PERCENTAGE);
float blockCacheUpperLimit =
conf.getFloat(HConstants.HFILE_BLOCK_CACHE_SIZE_KEY,
HConstants.HFILE_BLOCK_CACHE_SIZE_DEFAULT);
@@ -87,10 +92,10 @@ public class HBaseConfiguration extends
"Current heap configuration for MemStore and BlockCache exceeds " +
"the threshold required for successful cluster operation. " +
"The combined value cannot exceed 0.8. Please check " +
- "the settings for hbase.regionserver.global.memstore.upperLimit
and " +
+ "the settings for hbase.regionserver.global.memstore.size and " +
"hfile.block.cache.size in your configuration. " +
- "hbase.regionserver.global.memstore.upperLimit is " +
- globalMemstoreLimit +
+ "hbase.regionserver.global.memstore.size is " +
+ globalMemstoreSize +
" hfile.block.cache.size is " + blockCacheUpperLimit);
}
}
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java?rev=1570721&r1=1570720&r2=1570721&view=diff
==============================================================================
---
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
(original)
+++
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
Fri Feb 21 21:58:35 2014
@@ -132,10 +132,7 @@ class MemStoreFlusher implements FlushRe
}
/**
- * Calculate global memstore size for configured percentage of
<code>max</code>.
- * @param max
- * @param c
- * @return Limit.
+ * Retrieve global memstore configured size as percentage of total heap.
*/
static float getGlobalMemStorePercent(final Configuration c) {
float limit = c.getFloat(MEMSTORE_SIZE_KEY,
@@ -742,4 +739,4 @@ class MemStoreFlusher implements FlushRe
enum FlushType {
NORMAL, ABOVE_LOWER_MARK, ABOVE_HIGHER_MARK;
-}
\ No newline at end of file
+}
Modified: hbase/trunk/src/main/docbkx/ops_mgt.xml
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/docbkx/ops_mgt.xml?rev=1570721&r1=1570720&r2=1570721&view=diff
==============================================================================
Binary files - no diff available.
Modified: hbase/trunk/src/main/docbkx/performance.xml
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/docbkx/performance.xml?rev=1570721&r1=1570720&r2=1570721&view=diff
==============================================================================
Binary files - no diff available.
