You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nd...@apache.org on 2015/08/06 20:16:26 UTC
hbase git commit: HBASE-13865 Increase the default value for
hbase.hregion.memstore.block.multipler from 2 to 4 (part 2)
Repository: hbase
Updated Branches:
refs/heads/master 7a9e10dc1 -> 741783585
HBASE-13865 Increase the default value for hbase.hregion.memstore.block.multipler from 2 to 4 (part 2)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/74178358
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/74178358
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/74178358
Branch: refs/heads/master
Commit: 741783585306e03eec8074841b342ab742cf37e7
Parents: 7a9e10d
Author: Gábor Lipták <gl...@gmail.com>
Authored: Mon Jun 8 19:53:44 2015 -0400
Committer: Nick Dimiduk <nd...@apache.org>
Committed: Thu Aug 6 10:03:23 2015 -0700
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hbase/HConstants.java | 12 ++++++++++++
.../org/apache/hadoop/hbase/regionserver/HRegion.java | 3 ++-
.../apache/hadoop/hbase/client/TestClientPushback.java | 2 +-
.../hadoop/hbase/regionserver/TestCompaction.java | 2 +-
.../hadoop/hbase/regionserver/TestMajorCompaction.java | 2 +-
.../hadoop/hbase/regionserver/TestMinorCompaction.java | 2 +-
6 files changed, 18 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/74178358/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
index f9cd6d0..2a1a8c8 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
@@ -355,6 +355,18 @@ public final class HConstants {
*/
public static final int DEFAULT_HSTORE_OPEN_AND_CLOSE_THREADS_MAX = 1;
+ /**
+ * Block updates if memstore has hbase.hregion.memstore.block.multiplier
+ * times hbase.hregion.memstore.flush.size bytes. Useful preventing
+ * runaway memstore during spikes in update traffic.
+ */
+ public static final String HREGION_MEMSTORE_BLOCK_MULTIPLIER =
+ "hbase.hregion.memstore.block.multiplier";
+
+ /**
+ * Default value for hbase.hregion.memstore.block.multiplier
+ */
+ public static final int DEFAULT_HREGION_MEMSTORE_BLOCK_MULTIPLIER = 4;
/** Conf key for the memstore size at which we flush the memstore */
public static final String HREGION_MEMSTORE_FLUSH_SIZE =
http://git-wip-us.apache.org/repos/asf/hbase/blob/74178358/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
index ebbb582..568a7c3 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -758,7 +758,8 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi
}
this.memstoreFlushSize = flushSize;
this.blockingMemStoreSize = this.memstoreFlushSize *
- conf.getLong("hbase.hregion.memstore.block.multiplier", 2);
+ conf.getLong(HConstants.HREGION_MEMSTORE_BLOCK_MULTIPLIER,
+ HConstants.DEFAULT_HREGION_MEMSTORE_BLOCK_MULTIPLIER);
}
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/74178358/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientPushback.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientPushback.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientPushback.java
index 294d7a9..995e3e5 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientPushback.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientPushback.java
@@ -73,7 +73,7 @@ public class TestClientPushback {
// load
conf.setLong(HConstants.HREGION_MEMSTORE_FLUSH_SIZE, flushSizeBytes);
// ensure we block the flushes when we are double that flushsize
- conf.setLong("hbase.hregion.memstore.block.multiplier", 2);
+ conf.setLong(HConstants.HREGION_MEMSTORE_BLOCK_MULTIPLIER, HConstants.DEFAULT_HREGION_MEMSTORE_BLOCK_MULTIPLIER);
UTIL.startMiniCluster(1);
UTIL.createTable(tableName, family);
http://git-wip-us.apache.org/repos/asf/hbase/blob/74178358/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java
index fcc9fc3..122b7a5 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java
@@ -104,7 +104,7 @@ public class TestCompaction {
// Set cache flush size to 1MB
conf.setInt(HConstants.HREGION_MEMSTORE_FLUSH_SIZE, 1024 * 1024);
- conf.setInt("hbase.hregion.memstore.block.multiplier", 100);
+ conf.setInt(HConstants.HREGION_MEMSTORE_BLOCK_MULTIPLIER, 100);
conf.set(CompactionThroughputControllerFactory.HBASE_THROUGHPUT_CONTROLLER_KEY,
NoLimitCompactionThroughputController.class.getName());
compactionThreshold = conf.getInt("hbase.hstore.compactionThreshold", 3);
http://git-wip-us.apache.org/repos/asf/hbase/blob/74178358/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java
index aaf20da..0409df3 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java
@@ -92,7 +92,7 @@ public class TestMajorCompaction {
// Set cache flush size to 1MB
conf.setInt(HConstants.HREGION_MEMSTORE_FLUSH_SIZE, 1024*1024);
- conf.setInt("hbase.hregion.memstore.block.multiplier", 100);
+ conf.setInt(HConstants.HREGION_MEMSTORE_BLOCK_MULTIPLIER, 100);
compactionThreshold = conf.getInt("hbase.hstore.compactionThreshold", 3);
secondRowBytes = START_KEY_BYTES.clone();
http://git-wip-us.apache.org/repos/asf/hbase/blob/74178358/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinorCompaction.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinorCompaction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinorCompaction.java
index 2504d9c..47f3a8f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinorCompaction.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinorCompaction.java
@@ -69,7 +69,7 @@ public class TestMinorCompaction {
// Set cache flush size to 1MB
conf.setInt(HConstants.HREGION_MEMSTORE_FLUSH_SIZE, 1024*1024);
- conf.setInt("hbase.hregion.memstore.block.multiplier", 100);
+ conf.setInt(HConstants.HREGION_MEMSTORE_BLOCK_MULTIPLIER, 100);
compactionThreshold = conf.getInt("hbase.hstore.compactionThreshold", 3);
firstRowBytes = START_KEY_BYTES;