From e0b193feb092999a7b22d6209d7c948e8f416e40 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 --- .../org/apache/hadoop/hbase/io/util/HeapMemorySizeUtil.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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..06256cf 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 @@ -95,10 +95,6 @@ public class HeapMemorySizeUtil { * @param globalMemStorePercent */ public static float getGlobalMemStoreLowerMark(final Configuration c, float globalMemStorePercent) { - String lowMarkPercentStr = c.get(MEMSTORE_SIZE_LOWER_LIMIT_KEY); - if (lowMarkPercentStr != null) { - return Float.parseFloat(lowMarkPercentStr); - } String lowerWaterMarkOldValStr = c.get(MEMSTORE_SIZE_LOWER_LIMIT_OLD_KEY); if (lowerWaterMarkOldValStr != null) { LOG.warn(MEMSTORE_SIZE_LOWER_LIMIT_OLD_KEY + " is deprecated. Instead use " @@ -111,6 +107,10 @@ public class HeapMemorySizeUtil { } return lowerWaterMarkOldVal / globalMemStorePercent; } + String lowMarkPercentStr = c.get(MEMSTORE_SIZE_LOWER_LIMIT_KEY); + if (lowMarkPercentStr != null) { + return Float.parseFloat(lowMarkPercentStr); + } return DEFAULT_MEMSTORE_SIZE_LOWER_LIMIT; } -- 2.4.0