HBASE-24137:The max merge count of metafixer may be remind in hbase-s…

…ite.xml (#1478)

hbase-common/src/main/resources/hbase-default.xml

@@ -1946,6 +1946,14 @@ possible configurations would overwhelm and obscure the important.
       responses with complete data.
     </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>

hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetaFixer.java

@@ -63,7 +63,7 @@ class MetaFixer {
   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 {

src/main/asciidoc/_chapters/hbase-default.adoc

@@ -2246,6 +2246,20 @@ The percent of region server RPC threads failed to abort RS.
 `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 @@ The percent of region server RPC threads failed to abort RS.
 +
 .Default
 `false`
+