Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HBASE-24137:The max merge count of metafixer may be remind in hbase-site.xml #1478

Merged
merged 6 commits into from
May 5, 2020
+24 −1
Merged

HBASE-24137:The max merge count of metafixer may be remind in hbase-site.xml #1478

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c5fa7d7
The max merge count of metafixer should be configurable in MetaFixer
Apr 10, 2020
8501b9d
add description of configure the max merge count
Apr 10, 2020
3a06f41
The max merge count of metafixer may be remind in hbase-site.xml
Apr 15, 2020
50bd97c
add description to hbase-default.adoc
Apr 16, 2020
b9c9f5f
resolve conflicts
Apr 28, 2020
d72d8e1
change default value
May 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions hbase-common/src/main/resources/hbase-default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1946,4 +1946,10 @@ possible configurations would overwhelm and obscure the important.
responses with complete data.
</description>
</property>
<property>
<name>hbase.master.metafixer.max.merge.count</name>
<value>10</value>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The default changed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@saintstack I have changed the default value

Thanks

<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>
gentlewangyu marked this conversation as resolved.
Show resolved Hide resolved
</property>
</configuration>
4 changes: 1 addition & 3 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/master/MetaFixer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
/**
Expand All @@ -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);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was configurable before this change? You could add

hbase.master.metafixer.max.merge.count 11 configure the max merge count

...
to your hbase-site.xml and away you go?

But maybe you think it deserves mention in the hbase-default.xml so operators can find it easier? If so, I'd suggest a fuller description.

Thanks.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think should be add hbase.master.metafixer.max.merge.count in hbase-default.xml that so operators can change it easier. I have added fuller description in hbase-default.xml.

Thanks

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes if the purpose is to mention this config in hbase-default.xml, good to also document it in hbase-default.adoc with detailed description.
However, in that case, title of PR doesn't match. As @saintstack said, this is already configurable.

Thanks.

}

void fix() throws IOException {
Expand Down