You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by hu...@apache.org on 2020/05/25 00:21:16 UTC
[hbase] branch master updated: HBASE-24369 Provide more information
about merged child regions in Hbck Overlaps section,
which cannot be fixed immediately (#1756)
This is an automated email from the ASF dual-hosted git repository.
huaxiangsun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new eaa2762 HBASE-24369 Provide more information about merged child regions in Hbck Overlaps section, which cannot be fixed immediately (#1756)
eaa2762 is described below
commit eaa2762a4e773b973d0485a6b5654b56fe229080
Author: huaxiangsun <hu...@apache.org>
AuthorDate: Sun May 24 17:21:04 2020 -0700
HBASE-24369 Provide more information about merged child regions in Hbck Overlaps section, which cannot be fixed immediately (#1756)
Signed-off-by: Viraj Jasani <vj...@apache.org>
Signed-off-by: Jan Hentschel <ja...@ultratendency.com>
Signed-off-by: Clara Xiong
Signed-off-by: stack <st...@apache.org>
---
.../org/apache/hadoop/hbase/master/CatalogJanitor.java | 4 ++++
.../src/main/resources/hbase-webapps/master/hbck.jsp | 18 ++++++++++++++++--
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
index e39cac5..7567713 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
@@ -476,6 +476,10 @@ public class CatalogJanitor extends ScheduledChore {
return this.overlaps;
}
+ public Map<RegionInfo, Result> getMergedRegions() {
+ return this.mergedRegions;
+ }
+
public List<Pair<RegionInfo, ServerName>> getUnknownServers() {
return unknownServers;
}
diff --git a/hbase-server/src/main/resources/hbase-webapps/master/hbck.jsp b/hbase-server/src/main/resources/hbase-webapps/master/hbck.jsp
index f0a2ce1..c3c11e5 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/hbck.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/hbck.jsp
@@ -236,6 +236,12 @@
<div class="row inner_header">
<div class="page-header">
<h2>Overlaps</h2>
+ <p>
+ <span>
+ Regions highlighted in <font color="blue">blue</font> are recently merged regions, HBase is still doing cleanup for them. Overlaps involving these regions cannot be fixed by <em>hbck2 fixMeta</em> at this moment.
+ Please wait some time, run <i>catalogjanitor_run</i> in hbase shell, refresh ‘HBCK Report’ page, make sure these regions are not highlighted to start the fix.
+ </span>
+ </p>
</div>
</div>
<table class="table table-striped">
@@ -245,8 +251,16 @@
</tr>
<% for (Pair<RegionInfo, RegionInfo> p : report.getOverlaps()) { %>
<tr>
- <td><span title="<%= p.getFirst() %>"><%= p.getFirst().getEncodedName() %></span></td>
- <td><span title="<%= p.getSecond() %>"><%= p.getSecond().getEncodedName() %></span></td>
+ <% if (report.getMergedRegions().containsKey(p.getFirst())) { %>
+ <td><span style="color:blue;" title="<%= p.getFirst() %>"><%= p.getFirst().getEncodedName() %></span></td>
+ <% } else { %>
+ <td><span title="<%= p.getFirst() %>"><%= p.getFirst().getEncodedName() %></span></td>
+ <% } %>
+ <% if (report.getMergedRegions().containsKey(p.getSecond())) { %>
+ <td><span style="color:blue;" title="<%= p.getSecond() %>"><%= p.getSecond().getEncodedName() %></span></td>
+ <% } else { %>
+ <td><span title="<%= p.getSecond() %>"><%= p.getSecond().getEncodedName() %></span></td>
+ <% } %>
</tr>
<% } %>