From b213a226510f50baa9e8d8de212903fc3a4a0a27 Mon Sep 17 00:00:00 2001
From: Peter Somogyi <psomogyi@apache.org>
Date: Tue, 27 Oct 2020 06:50:51 +0100
Subject: [PATCH] HBASE-25219 Backport HBASE-24369 Provide more information
 about merged child regions in Hbck Overlaps section, which cannot be fixed
 immediately (#2589)

Signed-off-by: Viraj Jasani <vjasani@apache.org>
Signed-off-by: Jan Hentschel <jan.hentschel@ultratendency.com>
Signed-off-by: Clara Xiong
Signed-off-by: stack <stack@apache.org>

Co-authored-by: huaxiangsun <huaxiangsun@apache.org>
---
 .../hadoop/hbase/master/CatalogJanitor.java    |  4 ++++
 .../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 62083068088e..2f86d7e4004f 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
@@ -473,6 +473,10 @@ public List<Pair<RegionInfo, RegionInfo>> getOverlaps() {
       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 d90827c40184..ac9cea0bcc7b 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>
               <% } %>