From 2368f4e885673da6d3e2277626884d11e083573e Mon Sep 17 00:00:00 2001 From: Esteban Gutierrez Date: Wed, 20 May 2015 15:10:08 -0700 Subject: [PATCH] HBASE-13729 Old hbase.regionserver.global.memstore.upperLimit is ignored if present --- .../main/java/org/apache/hadoop/hbase/io/util/HeapMemorySizeUtil.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/HeapMemorySizeUtil.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/HeapMemorySizeUtil.java index 7cfa35d..07633eb 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/HeapMemorySizeUtil.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/util/HeapMemorySizeUtil.java @@ -77,8 +77,8 @@ public class HeapMemorySizeUtil { * @param logInvalid */ public static float getGlobalMemStorePercent(final Configuration c, final boolean logInvalid) { - float limit = c.getFloat(MEMSTORE_SIZE_KEY, - c.getFloat(MEMSTORE_SIZE_OLD_KEY, DEFAULT_MEMSTORE_SIZE)); + float limit = c.getFloat(MEMSTORE_SIZE_OLD_KEY, + c.getFloat(MEMSTORE_SIZE_KEY, DEFAULT_MEMSTORE_SIZE)); if (limit > 0.8f || limit <= 0.0f) { if (logInvalid) { LOG.warn("Setting global memstore limit to default of " + DEFAULT_MEMSTORE_SIZE -- 2.4.0