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 e39cac5354d..7567713883a 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 getMergedRegions() { + return this.mergedRegions; + } + public List> 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 f0a2ce17704..c3c11e5210b 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 @@
@@ -245,8 +251,16 @@ <% for (Pair p : report.getOverlaps()) { %> - - + <% if (report.getMergedRegions().containsKey(p.getFirst())) { %> + + <% } else { %> + + <% } %> + <% if (report.getMergedRegions().containsKey(p.getSecond())) { %> + + <% } else { %> + + <% } %> <% } %>
<%= p.getFirst().getEncodedName() %><%= p.getSecond().getEncodedName() %><%= p.getFirst().getEncodedName() %><%= p.getFirst().getEncodedName() %><%= p.getSecond().getEncodedName() %><%= p.getSecond().getEncodedName() %>