From c5fa7d70bcddd84b6f04de77fd15b49fe998137d Mon Sep 17 00:00:00 2001 From: gentlewang Date: Fri, 10 Apr 2020 10:31:27 +0800 Subject: [PATCH 1/5] The max merge count of metafixer should be configurable in MetaFixer --- hbase-common/src/main/resources/hbase-default.xml | 5 +++++ .../main/java/org/apache/hadoop/hbase/master/MetaFixer.java | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml index d2ff712a2c5c..88da3b720f15 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 8f3744192356..4fb9d3fc876e 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 @@ @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 { From 8501b9d8c6fbd8070eb8e888b15989fb18870646 Mon Sep 17 00:00:00 2001 From: gentlewang Date: Fri, 10 Apr 2020 15:49:35 +0800 Subject: [PATCH 2/5] add description of configure the max merge count --- hbase-common/src/main/resources/hbase-default.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml index 88da3b720f15..4e9fc70b90c1 100644 --- a/hbase-common/src/main/resources/hbase-default.xml +++ b/hbase-common/src/main/resources/hbase-default.xml @@ -1949,6 +1949,7 @@ possible configurations would overwhelm and obscure the important. hbase.master.metafixer.max.merge.count 10 - configure the max merge count + Maximum regions to merge at a time when we fix overlaps noted in + CJ consistency report, but avoid merging 100 regions in one go! From 3a06f41d24ebc8b7362524aa32201e8932e966b2 Mon Sep 17 00:00:00 2001 From: gentlewang Date: Wed, 15 Apr 2020 11:21:11 +0800 Subject: [PATCH 3/5] The max merge count of metafixer may be remind in hbase-site.xml --- .../main/java/org/apache/hadoop/hbase/master/MetaFixer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 4fb9d3fc876e..766597efd1d0 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,6 +51,8 @@ @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; /** @@ -61,7 +63,7 @@ class MetaFixer { MetaFixer(MasterServices masterServices) { this.masterServices = masterServices; this.maxMergeCount = this.masterServices.getConfiguration(). - getInt("hbase.master.metafixer.max.merge.count", 10); + getInt(MAX_MERGE_COUNT_KEY, MAX_MERGE_COUNT_DEFAULT); } void fix() throws IOException { From 50bd97cfa8cc152355c3576822c8c4fffed2b04b Mon Sep 17 00:00:00 2001 From: gentlewang Date: Thu, 16 Apr 2020 10:01:25 +0800 Subject: [PATCH 4/5] add description to hbase-default.adoc --- src/main/asciidoc/_chapters/hbase-default.adoc | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/main/asciidoc/_chapters/hbase-default.adoc b/src/main/asciidoc/_chapters/hbase-default.adoc index dd51c4964bbe..81dd7aa5441b 100644 --- a/src/main/asciidoc/_chapters/hbase-default.adoc +++ b/src/main/asciidoc/_chapters/hbase-default.adoc @@ -2245,3 +2245,16 @@ The percent of region server RPC threads failed to abort RS. .Default `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 +`10` From d72d8e14a3ef1ca1a7cfdfeb89f2cef40fe71db9 Mon Sep 17 00:00:00 2001 From: gentlewang Date: Tue, 5 May 2020 23:17:56 +0800 Subject: [PATCH 5/5] change default value --- hbase-common/src/main/resources/hbase-default.xml | 2 +- src/main/asciidoc/_chapters/hbase-default.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml index 76626b191cfe..5f5ba4228809 100644 --- a/hbase-common/src/main/resources/hbase-default.xml +++ b/hbase-common/src/main/resources/hbase-default.xml @@ -1948,7 +1948,7 @@ possible configurations would overwhelm and obscure the important. hbase.master.metafixer.max.merge.count - 10 + 64 Maximum regions to merge at a time when we fix overlaps noted in CJ consistency report, but avoid merging 100 regions in one go! diff --git a/src/main/asciidoc/_chapters/hbase-default.adoc b/src/main/asciidoc/_chapters/hbase-default.adoc index 0ecd52bf8236..6da700423247 100644 --- a/src/main/asciidoc/_chapters/hbase-default.adoc +++ b/src/main/asciidoc/_chapters/hbase-default.adoc @@ -2257,7 +2257,7 @@ The percent of region server RPC threads failed to abort RS. + .Default -`10` +`64` [[hbase.rpc.rows.size.threshold.reject]]