diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml index d2ff712a2c..88da3b720f 100644 --- a/hbase-common/src/main/resources/hbase-default.xml +++ b/hbase-common/src/main/resources/hbase-default.xml @@ -1946,4 +1946,9 @@ possible configurations would overwhelm and obscure the important. responses with complete data. + + hbase.master.metafixer.max.merge.count + 10 + configure the max merge count + diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetaFixer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetaFixer.java index 8f37441923..4fb9d3fc87 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetaFixer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetaFixer.java @@ -51,8 +51,6 @@ import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesti @InterfaceAudience.Private class MetaFixer { private static final Logger LOG = LoggerFactory.getLogger(MetaFixer.class); - private static final String MAX_MERGE_COUNT_KEY = "hbase.master.metafixer.max.merge.count"; - private static final int MAX_MERGE_COUNT_DEFAULT = 10; private final MasterServices masterServices; /** @@ -63,7 +61,7 @@ class MetaFixer { MetaFixer(MasterServices masterServices) { this.masterServices = masterServices; this.maxMergeCount = this.masterServices.getConfiguration(). - getInt(MAX_MERGE_COUNT_KEY, MAX_MERGE_COUNT_DEFAULT); + getInt("hbase.master.metafixer.max.merge.count", 10); } void fix() throws IOException {