HBASE-22709 Add a chore thread in master to do hbck checking

apache · Jul 26, 2019 · b97ddc1 · b97ddc1
1 parent 747d000
commit b97ddc1
Show file tree

Hide file tree

Showing 7 changed files with 497 additions and 144 deletions.
diff --git a/...rver/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon b/...rver/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon
@@ -42,84 +42,8 @@ int limit = 100;
 <%java>
 SortedSet<RegionState> rit = assignmentManager.getRegionStates()
     .getRegionsInTransitionOrderedByTimestamp();
-Map<String, Pair<ServerName, Set<ServerName>>> problematicRegions = assignmentManager
-    .getProblematicRegions();
 </%java>
 
-<%if !problematicRegions.isEmpty() %>
-<%java>
-int totalSize = problematicRegions.size();
-int sizePerPage = Math.min(10, totalSize);
-int numOfPages = (int) Math.ceil(totalSize * 1.0 / sizePerPage);
-</%java>
-    <section>
-    <h2><a name="problem-regions">Problematic Regions</a></h2>
-    <p>
-        <span>
-            <% problematicRegions.size() %> problematic region(s). There are three case: 1. Master
-             thought this region opened, but no regionserver reported it. 2. Master thought this
-              region opened on Server1, but regionserver reported Server2. 3. More than one
-               regionservers reported opened this region. Notice: the reported online regionservers
-                may be not right when there are regions in transition. Please check them in
-                 regionserver's web UI.
-        </span>
-    </p>
-    <div class="tabbable">
-        <div class="tab-content">
-        <%java int recordItr = 0; %>
-        <%for Map.Entry<String, Pair<ServerName, Set<ServerName>>> entry : problematicRegions.entrySet() %>
-            <%if (recordItr % sizePerPage) == 0 %>
-                <%if recordItr == 0 %>
-                    <div class="tab-pane active" id="tab_prs<% (recordItr / sizePerPage) + 1 %>">
-                <%else>
-                    <div class="tab-pane" id="tab_prs<% (recordItr / sizePerPage) + 1 %>">
-                </%if>
-                <table class="table table-striped" style="margin-bottom:0px;">
-                    <tr>
-                        <th>Region</th>
-                        <th>Location in META</th>
-                        <th>Reported Online Region Servers</th>
-                    </tr>
-            </%if>
-
-            <tr>
-                <td><% entry.getKey() %></td>
-                <td><% entry.getValue().getFirst() %></td>
-                <td><% entry.getValue().getSecond().stream().map(ServerName::getServerName)
-                    .collect(Collectors.joining(", ")) %></td>
-            </tr>
-            <%java recordItr++; %>
-            <%if (recordItr % sizePerPage) == 0 %>
-                </table>
-                </div>
-            </%if>
-        </%for>
-
-        <%if (recordItr % sizePerPage) != 0 %>
-         <%for ; (recordItr % sizePerPage) != 0 ; recordItr++ %>
-            <tr><td colspan="3" style="height:61px"></td></tr>
-         </%for>
-         </table>
-         </div>
-        </%if>
-
-        </div>
-        <nav>
-         <ul class="nav nav-pills pagination">
-         <%for int i = 1 ; i <= numOfPages; i++ %>
-             <%if i == 1 %>
-             <li class="active">
-             <%else>
-             <li>
-             </%if>
-             <a href="#tab_prs<% i %>"><% i %></a></li>
-         </%for>
-         </ul>
-        </nav>
-    </div>
-    </section>
-</%if>
-
 <%if !rit.isEmpty() %>
 <%java>
 long currentTime = System.currentTimeMillis();

diff --git a/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon b/hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon
@@ -149,7 +149,8 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
                 <li class="active"><a href="/master-status">Home</a></li>
                 <li><a href="/tablesDetailed.jsp">Table Details</a></li>
                 <%if master.isActiveMaster() %>
-                <li><a href="/procedures.jsp">Procedures &amp; Locks</a></li>
+                    <li><a href="/procedures.jsp">Procedures &amp; Locks</a></li>
+                    <li><a href="/hbck.jsp">HBCK Report</a></li>
                 </%if>
                 <li><a href="/processMaster.jsp">Process Metrics</a></li>
                 <li><a href="/logs/">Local Logs</a></li>

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -385,6 +385,7 @@ public void run() {
   private ClusterStatusPublisher clusterStatusPublisherChore = null;
   private SnapshotCleanerChore snapshotCleanerChore = null;
 
+  private HbckChecker hbckChecker;
   CatalogJanitor catalogJanitorChore;
   private LogCleaner logCleaner;
   private HFileCleaner hfileCleaner;
@@ -1108,6 +1109,8 @@ private void finishActiveMasterInitialization(MonitoredTask status) throws IOExc
     getChoreService().scheduleChore(normalizerChore);
     this.catalogJanitorChore = new CatalogJanitor(this);
     getChoreService().scheduleChore(catalogJanitorChore);
+    this.hbckChecker = new HbckChecker(this);
+    getChoreService().scheduleChore(hbckChecker);
     this.serverManager.startChore();
 
     // Only for rolling upgrade, where we need to migrate the data in namespace table to meta table.
@@ -1587,6 +1590,7 @@ private void stopChores() {
       choreService.cancelChore(this.hfileCleaner);
       choreService.cancelChore(this.replicationBarrierCleaner);
       choreService.cancelChore(this.snapshotCleanerChore);
+      choreService.cancelChore(this.hbckChecker);
     }
   }
 
@@ -3756,4 +3760,8 @@ public Map<String, ReplicationStatus> getWalGroupsReplicationStatus() {
     }
     return super.getWalGroupsReplicationStatus();
   }
+
+  public HbckChecker getHbckChecker() {
+    return this.hbckChecker;
+  }
 }