HBASE-24137:The max merge count of metafixer may be remind in hbase-site.xml (#1478)
diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml
index 11dcbdb..5f5ba42 100644
--- a/hbase-common/src/main/resources/hbase-default.xml
+++ b/hbase-common/src/main/resources/hbase-default.xml
@@ -1947,6 +1947,14 @@
</description>
</property>
<property>
+ <name>hbase.master.metafixer.max.merge.count</name>
+ <value>64</value>
+ <description>
+ Maximum regions to merge at a time when we fix overlaps noted in
+ CJ consistency report, but avoid merging 100 regions in one go!
+ </description>
+ </property>
+ <property>
<name>hbase.rpc.rows.size.threshold.reject</name>
<value>false</value>
<description>
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 ed96b01..40ea395 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
@@ -63,7 +63,7 @@
MetaFixer(MasterServices masterServices) {
this.masterServices = masterServices;
this.maxMergeCount = this.masterServices.getConfiguration().
- getInt(MAX_MERGE_COUNT_KEY, MAX_MERGE_COUNT_DEFAULT);
+ getInt(MAX_MERGE_COUNT_KEY, MAX_MERGE_COUNT_DEFAULT);
}
void fix() throws IOException {
diff --git a/src/main/asciidoc/_chapters/hbase-default.adoc b/src/main/asciidoc/_chapters/hbase-default.adoc
index f1bfc6a..6da7004 100644
--- a/src/main/asciidoc/_chapters/hbase-default.adoc
+++ b/src/main/asciidoc/_chapters/hbase-default.adoc
@@ -2246,6 +2246,20 @@
`false`
+
+[[hbase.master.metafixer.max.merge.count]]
+*`hbase.master.metafixer.max.merge.count`*::
++
+.Description
+
+ Maximum regions to merge at a time when we fix overlaps noted in
+ CJ consistency report, but avoid merging 100 regions in one go!
+
++
+.Default
+`64`
+
+
[[hbase.rpc.rows.size.threshold.reject]]
*`hbase.rpc.rows.size.threshold.reject`*::
+
@@ -2264,3 +2278,4 @@
+
.Default
`false`
+
