You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2020/05/21 14:47:31 UTC
[hbase-site] branch asf-site updated: Published site at
a8724e8120738488d863ac547495d3209b898e83.
This is an automated email from the ASF dual-hosted git repository.
git-site-role pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/hbase-site.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 4cef563 Published site at a8724e8120738488d863ac547495d3209b898e83.
4cef563 is described below
commit 4cef563faa74c3e60645c09c7706502221077a74
Author: jenkins <bu...@apache.org>
AuthorDate: Thu May 21 14:47:08 2020 +0000
Published site at a8724e8120738488d863ac547495d3209b898e83.
---
acid-semantics.html | 2 +-
apache_hbase_reference_guide.pdf | 4 +-
book.html | 2 +-
bulk-loads.html | 2 +-
checkstyle-aggregate.html | 18 +-
coc.html | 2 +-
dependencies.html | 2 +-
dependency-convergence.html | 2 +-
dependency-info.html | 2 +-
dependency-management.html | 2 +-
devapidocs/constant-values.html | 4 +-
.../hadoop/hbase/master/CatalogJanitor.Report.html | 34 +-
.../master/CatalogJanitor.ReportMakingVisitor.html | 32 +-
.../apache/hadoop/hbase/master/CatalogJanitor.html | 4 +-
.../src-html/org/apache/hadoop/hbase/Version.html | 4 +-
.../hadoop/hbase/master/CatalogJanitor.Report.html | 750 ++++++------
.../master/CatalogJanitor.ReportMakingVisitor.html | 750 ++++++------
.../CatalogJanitor.SplitParentFirstComparator.html | 750 ++++++------
.../apache/hadoop/hbase/master/CatalogJanitor.html | 750 ++++++------
downloads.html | 2 +-
export_control.html | 2 +-
index.html | 2 +-
issue-tracking.html | 2 +-
mail-lists.html | 2 +-
metrics.html | 2 +-
old_news.html | 2 +-
plugin-management.html | 2 +-
plugins.html | 2 +-
poweredbyhbase.html | 2 +-
project-info.html | 2 +-
project-reports.html | 2 +-
project-summary.html | 2 +-
pseudo-distributed.html | 2 +-
replication.html | 2 +-
resources.html | 2 +-
source-repository.html | 2 +-
sponsors.html | 2 +-
supportingprojects.html | 2 +-
team-list.html | 2 +-
testdevapidocs/index-all.html | 5 +
.../apache/hadoop/hbase/backup/package-tree.html | 2 +-
.../hadoop/hbase/chaos/actions/package-tree.html | 2 +-
.../org/apache/hadoop/hbase/client/TestAdmin1.html | 36 +-
.../hbase/client/TestAsyncRegionAdminApi2.html | 22 +-
.../apache/hadoop/hbase/master/TestMetaFixer.html | 76 +-
.../org/apache/hadoop/hbase/package-tree.html | 14 +-
.../hadoop/hbase/procedure/package-tree.html | 8 +-
.../hadoop/hbase/procedure2/package-tree.html | 2 +-
.../hadoop/hbase/regionserver/package-tree.html | 2 +-
.../org/apache/hadoop/hbase/test/package-tree.html | 4 +-
.../org/apache/hadoop/hbase/wal/package-tree.html | 4 +-
.../org/apache/hadoop/hbase/client/TestAdmin1.html | 1194 ++++++++++----------
.../hbase/client/TestAsyncRegionAdminApi2.html | 506 +++++----
.../apache/hadoop/hbase/master/TestMetaFixer.html | 742 ++++++------
54 files changed, 2967 insertions(+), 2808 deletions(-)
diff --git a/acid-semantics.html b/acid-semantics.html
index 7c52589..b7921df 100644
--- a/acid-semantics.html
+++ b/acid-semantics.html
@@ -467,7 +467,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/apache_hbase_reference_guide.pdf b/apache_hbase_reference_guide.pdf
index 72dfc56..7ac28a0f 100644
--- a/apache_hbase_reference_guide.pdf
+++ b/apache_hbase_reference_guide.pdf
@@ -5,8 +5,8 @@
/Author (Apache HBase Team)
/Creator (Asciidoctor PDF 1.5.0.rc.2, based on Prawn 2.2.2)
/Producer (Apache HBase Team)
-/ModDate (D:20200520143143+00'00')
-/CreationDate (D:20200520144322+00'00')
+/ModDate (D:20200521143133+00'00')
+/CreationDate (D:20200521144421+00'00')
>>
endobj
2 0 obj
diff --git a/book.html b/book.html
index 0a2c6fb..4c42bd9 100644
--- a/book.html
+++ b/book.html
@@ -45219,7 +45219,7 @@ org/apache/hadoop/hbase/security/access/AccessControlClient.revoke:(Lorg/apache/
<div id="footer">
<div id="footer-text">
Version 3.0.0-SNAPSHOT<br>
-Last updated 2020-05-20 14:31:43 UTC
+Last updated 2020-05-21 14:31:33 UTC
</div>
</div>
<script type="text/x-mathjax-config">
diff --git a/bulk-loads.html b/bulk-loads.html
index 5f56a90..1b17f98 100644
--- a/bulk-loads.html
+++ b/bulk-loads.html
@@ -172,7 +172,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/checkstyle-aggregate.html b/checkstyle-aggregate.html
index c405b7b..6343db1 100644
--- a/checkstyle-aggregate.html
+++ b/checkstyle-aggregate.html
@@ -7478,12 +7478,12 @@
<td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_javadoc.html#JavadocTagContinuationIndentation">JavadocTagContinuationIndentation</a>
<ul>
<li>offset: <tt>"2"</tt></li></ul></td>
-<td>584</td>
+<td>586</td>
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td></tr>
<tr class="b">
<td></td>
<td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_javadoc.html#NonEmptyAtclauseDescription">NonEmptyAtclauseDescription</a></td>
-<td>2496</td>
+<td>2494</td>
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td></tr>
<tr class="a">
<td>misc</td>
@@ -8509,7 +8509,7 @@
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 33 has parse error. Details: no viable alternative at input '<Map.Entry<' while parsing HTML_ELEMENT</td>
<td>637</td></tr>
<tr class="b">
@@ -12343,7 +12343,7 @@
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>javadoc</td>
-<td>NonEmptyAtclauseDescription</td>
+<td>JavadocTagContinuationIndentation</td>
<td>Javadoc comment at column 47 has parse error. Details: no viable alternative at input '<qualifier,' while parsing HTML_ELEMENT</td>
<td>387</td></tr>
<tr class="b">
@@ -18369,19 +18369,19 @@
<td>javadoc</td>
<td>JavadocTagContinuationIndentation</td>
<td>Line continuation have incorrect indentation level, expected level should be 2.</td>
-<td>52</td></tr>
+<td>55</td></tr>
<tr class="a">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>sizes</td>
<td>LineLength</td>
<td>Line is longer than 100 characters (found 104).</td>
-<td>214</td></tr>
+<td>236</td></tr>
<tr class="b">
<td><img src="images/icon_error_sml.gif" alt="" /> Error</td>
<td>indentation</td>
<td>Indentation</td>
<td>'splitTest' has incorrect indentation level 2, expected level should be 4.</td>
-<td>218</td></tr></table></div>
+<td>240</td></tr></table></div>
<div class="section">
<h3 id="org.apache.hadoop.hbase.client.TestAsyncTableAdminApi2.java">org/apache/hadoop/hbase/client/TestAsyncTableAdminApi2.java</h3>
<table border="0" class="table table-striped">
@@ -42573,7 +42573,7 @@
<td>imports</td>
<td>ImportOrder</td>
<td>Wrong order for 'org.apache.hadoop.hbase.master.assignment.GCMultipleMergedRegionsProcedure' import.</td>
-<td>40</td></tr></table></div>
+<td>44</td></tr></table></div>
<div class="section">
<h3 id="org.apache.hadoop.hbase.master.TestMirroringTableStateManager.java">org/apache/hadoop/hbase/master/TestMirroringTableStateManager.java</h3>
<table border="0" class="table table-striped">
@@ -79395,7 +79395,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/coc.html b/coc.html
index 207b27e..510eea8 100644
--- a/coc.html
+++ b/coc.html
@@ -241,7 +241,7 @@ email to <a class="externalLink" href="mailto:private@hbase.apache.org">the priv
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/dependencies.html b/dependencies.html
index 5a512a3..eb8f3aa 100644
--- a/dependencies.html
+++ b/dependencies.html
@@ -313,7 +313,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/dependency-convergence.html b/dependency-convergence.html
index f9a487d..7d71dd0 100644
--- a/dependency-convergence.html
+++ b/dependency-convergence.html
@@ -788,7 +788,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/dependency-info.html b/dependency-info.html
index a0e180d..4a1e367 100644
--- a/dependency-info.html
+++ b/dependency-info.html
@@ -194,7 +194,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/dependency-management.html b/dependency-management.html
index 0ee539d..62252bd 100644
--- a/dependency-management.html
+++ b/dependency-management.html
@@ -1096,7 +1096,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/devapidocs/constant-values.html b/devapidocs/constant-values.html
index b1eb5ce..64bc6d1 100644
--- a/devapidocs/constant-values.html
+++ b/devapidocs/constant-values.html
@@ -4172,14 +4172,14 @@
<!-- -->
</a><code>public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/apache/hadoop/hbase/Version.html#date">date</a></code></td>
-<td class="colLast"><code>"Wed May 20 14:39:16 UTC 2020"</code></td>
+<td class="colLast"><code>"Thu May 21 14:40:37 UTC 2020"</code></td>
</tr>
<tr class="rowColor">
<td class="colFirst"><a name="org.apache.hadoop.hbase.Version.revision">
<!-- -->
</a><code>public static final <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
<td><code><a href="org/apache/hadoop/hbase/Version.html#revision">revision</a></code></td>
-<td class="colLast"><code>"86a2692dc4480308b9d1e4b84f0ff56a1af0fd04"</code></td>
+<td class="colLast"><code>"a8724e8120738488d863ac547495d3209b898e83"</code></td>
</tr>
<tr class="altColor">
<td class="colFirst"><a name="org.apache.hadoop.hbase.Version.srcChecksum">
diff --git a/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html b/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html
index 2e7f123..b5ea49b 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html
@@ -113,7 +113,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.433">CatalogJanitor.Report</a>
+<pre>public static class <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.437">CatalogJanitor.Report</a>
extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
<div class="block">Report made by ReportMakingVisitor</div>
</li>
@@ -258,7 +258,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>now</h4>
-<pre>private final long <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html#line.434">now</a></pre>
+<pre>private final long <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html#line.438">now</a></pre>
</li>
</ul>
<a name="splitParents">
@@ -267,7 +267,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>splitParents</h4>
-<pre>final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/Cat [...]
+<pre>final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/Cat [...]
</li>
</ul>
<a name="mergedRegions">
@@ -276,7 +276,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>mergedRegions</h4>
-<pre>final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/Cat [...]
+<pre>final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a><<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a>> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/Cat [...]
</li>
</ul>
<a name="count">
@@ -285,7 +285,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>count</h4>
-<pre>int <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html#line.440">count</a></pre>
+<pre>int <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html#line.444">count</a></pre>
</li>
</ul>
<a name="holes">
@@ -294,7 +294,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>holes</h4>
-<pre>private final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a><<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo. [...]
+<pre>private final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a><<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo. [...]
</li>
</ul>
<a name="overlaps">
@@ -303,7 +303,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>overlaps</h4>
-<pre>private final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a><<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo. [...]
+<pre>private final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a><<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo. [...]
</li>
</ul>
<a name="unknownServers">
@@ -312,7 +312,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>unknownServers</h4>
-<pre>private final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a><<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/ServerName.html" t [...]
+<pre>private final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a><<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/ServerName.html" t [...]
<div class="block">TODO: If CatalogJanitor finds an 'Unknown Server', it should 'fix' it by queuing
a <a href="../../../../../org/apache/hadoop/hbase/master/procedure/HBCKServerCrashProcedure.html" title="class in org.apache.hadoop.hbase.master.procedure"><code>HBCKServerCrashProcedure</code></a> for
found server for it to clean up meta.</div>
@@ -324,7 +324,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>emptyRegionInfo</h4>
-<pre>private final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><byte[]> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html#line.452">emptyRegionInfo</a></pre>
+<pre>private final <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><byte[]> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html#line.456">emptyRegionInfo</a></pre>
</li>
</ul>
</li>
@@ -341,7 +341,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>Report</h4>
-<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html#line.455">Report</a>()</pre>
+<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html#line.459">Report</a>()</pre>
</li>
</ul>
</li>
@@ -358,7 +358,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getCreateTime</h4>
-<pre>public long <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html#line.457">getCreateTime</a>()</pre>
+<pre>public long <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html#line.461">getCreateTime</a>()</pre>
</li>
</ul>
<a name="getHoles--">
@@ -367,7 +367,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getHoles</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a><<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" t [...]
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a><<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" t [...]
</li>
</ul>
<a name="getOverlaps--">
@@ -376,7 +376,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getOverlaps</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a><<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" t [...]
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a><<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" t [...]
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>Overlap pairs found as we scanned hbase:meta; ordered by hbase:meta
@@ -393,7 +393,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getUnknownServers</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a><<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="c [...]
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a><<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>,<a href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="c [...]
</li>
</ul>
<a name="getEmptyRegionInfo--">
@@ -402,7 +402,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>getEmptyRegionInfo</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><byte[]> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html#line.479">getEmptyRegionInfo</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true" title="class or interface in java.util">List</a><byte[]> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html#line.483">getEmptyRegionInfo</a>()</pre>
</li>
</ul>
<a name="isEmpty--">
@@ -411,7 +411,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>isEmpty</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html#line.486">isEmpty</a>()</pre>
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html#line.490">isEmpty</a>()</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>True if an 'empty' lastReport -- no problems found.</dd>
@@ -424,7 +424,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>toString</h4>
-<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html#line.492">toString</a>()</pre>
+<pre>public <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html#line.496">toString</a>()</pre>
<dl>
<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code> in class <code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
diff --git a/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html b/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html
index d74bab6..1414179 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
</dl>
<hr>
<br>
-<pre>static class <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.532">CatalogJanitor.ReportMakingVisitor</a>
+<pre>static class <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.536">CatalogJanitor.ReportMakingVisitor</a>
extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
implements <a href="../../../../../org/apache/hadoop/hbase/MetaTableAccessor.CloseableVisitor.html" title="interface in org.apache.hadoop.hbase">MetaTableAccessor.CloseableVisitor</a></pre>
<div class="block">Visitor we use in here in CatalogJanitor to go against hbase:meta table.
@@ -275,7 +275,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/MetaTableAccessor.Clo
<ul class="blockList">
<li class="blockList">
<h4>services</h4>
-<pre>private final <a href="../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.533">services</a></pre>
+<pre>private final <a href="../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.537">services</a></pre>
</li>
</ul>
<a name="closed">
@@ -284,7 +284,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/MetaTableAccessor.Clo
<ul class="blockList">
<li class="blockList">
<h4>closed</h4>
-<pre>private volatile boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.534">closed</a></pre>
+<pre>private volatile boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.538">closed</a></pre>
</li>
</ul>
<a name="report">
@@ -293,7 +293,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/MetaTableAccessor.Clo
<ul class="blockList">
<li class="blockList">
<h4>report</h4>
-<pre>private <a href="../../../../../org/apache/hadoop/hbase/master/CatalogJanitor.Report.html" title="class in org.apache.hadoop.hbase.master">CatalogJanitor.Report</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.541">report</a></pre>
+<pre>private <a href="../../../../../org/apache/hadoop/hbase/master/CatalogJanitor.Report.html" title="class in org.apache.hadoop.hbase.master">CatalogJanitor.Report</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.545">report</a></pre>
<div class="block">Report is not done until after the close has been called.</div>
<dl>
<dt><span class="seeLabel">See Also:</span></dt>
@@ -308,7 +308,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/MetaTableAccessor.Clo
<ul class="blockList">
<li class="blockList">
<h4>previous</h4>
-<pre>private <a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.546">previous</a></pre>
+<pre>private <a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.550">previous</a></pre>
<div class="block">RegionInfo from previous row.</div>
</li>
</ul>
@@ -318,7 +318,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/MetaTableAccessor.Clo
<ul class="blockListLast">
<li class="blockList">
<h4>highestEndKeyRegionInfo</h4>
-<pre>private <a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.556">highestEndKeyRegionInfo</a></pre>
+<pre>private <a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.560">highestEndKeyRegionInfo</a></pre>
<div class="block">Keep account of the highest end key seen as we move through hbase:meta.
Usually, the current RegionInfo has the highest end key but if an overlap,
this may no longer hold. An overlap may be a region with startkey 'd' and
@@ -341,7 +341,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/MetaTableAccessor.Clo
<ul class="blockListLast">
<li class="blockList">
<h4>ReportMakingVisitor</h4>
-<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.558">ReportMakingVisitor</a>(<a href="../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a> services)</pre>
+<pre><a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.562">ReportMakingVisitor</a>(<a href="../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a> services)</pre>
</li>
</ul>
</li>
@@ -358,7 +358,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/MetaTableAccessor.Clo
<ul class="blockList">
<li class="blockList">
<h4>getReport</h4>
-<pre><a href="../../../../../org/apache/hadoop/hbase/master/CatalogJanitor.Report.html" title="class in org.apache.hadoop.hbase.master">CatalogJanitor.Report</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.566">getReport</a>()</pre>
+<pre><a href="../../../../../org/apache/hadoop/hbase/master/CatalogJanitor.Report.html" title="class in org.apache.hadoop.hbase.master">CatalogJanitor.Report</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.570">getReport</a>()</pre>
<div class="block">Do not call until after <a href="../../../../../org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#close--"><code>close()</code></a>.
Will throw a <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/RuntimeException.html?is-external=true" title="class or interface in java.lang"><code>RuntimeException</code></a> if you do.</div>
</li>
@@ -369,7 +369,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/MetaTableAccessor.Clo
<ul class="blockList">
<li class="blockList">
<h4>visit</h4>
-<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.574">visit</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a> r)</pre>
+<pre>public boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.578">visit</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a> r)</pre>
<div class="block"><span class="descfrmTypeLabel">Description copied from interface: <code><a href="../../../../../org/apache/hadoop/hbase/MetaTableAccessor.Visitor.html#visit-org.apache.hadoop.hbase.client.Result-">MetaTableAccessor.Visitor</a></code></span></div>
<div class="block">Visit the catalog table row.</div>
<dl>
@@ -389,7 +389,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/MetaTableAccessor.Clo
<ul class="blockList">
<li class="blockList">
<h4>metaTableConsistencyCheck</h4>
-<pre>private <a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.604">metaTableConsistencyCheck</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a> metaTableRow)</pre>
+<pre>private <a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.608">metaTableConsistencyCheck</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Result.html" title="class in org.apache.hadoop.hbase.client">Result</a> metaTableRow)</pre>
<div class="block">Check row.</div>
<dl>
<dt><span class="paramLabel">Parameters:</span></dt>
@@ -406,7 +406,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/MetaTableAccessor.Clo
<ul class="blockList">
<li class="blockList">
<h4>addOverlap</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.667">addOverlap</a>(<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> a,
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.671">addOverlap</a>(<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> a,
<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> b)</pre>
</li>
</ul>
@@ -416,7 +416,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/MetaTableAccessor.Clo
<ul class="blockList">
<li class="blockList">
<h4>addHole</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.671">addHole</a>(<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> a,
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.675">addHole</a>(<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> a,
<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> b)</pre>
</li>
</ul>
@@ -426,7 +426,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/MetaTableAccessor.Clo
<ul class="blockList">
<li class="blockList">
<h4>isTableDisabled</h4>
-<pre>boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.678">isTableDisabled</a>(<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> ri)</pre>
+<pre>boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.682">isTableDisabled</a>(<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> ri)</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>True if table is disabled or disabling; defaults false!</dd>
@@ -439,7 +439,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/MetaTableAccessor.Clo
<ul class="blockList">
<li class="blockList">
<h4>checkServer</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.700">checkServer</a>(<a href="../../../../../org/apache/hadoop/hbase/RegionLocations.html" title="class in org.apache.hadoop.hbase">RegionLocations</a> locations)</pre>
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.704">checkServer</a>(<a href="../../../../../org/apache/hadoop/hbase/RegionLocations.html" title="class in org.apache.hadoop.hbase">RegionLocations</a> locations)</pre>
<div class="block">Run through referenced servers and save off unknown and the dead.</div>
</li>
</ul>
@@ -449,7 +449,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/MetaTableAccessor.Clo
<ul class="blockList">
<li class="blockList">
<h4>isTableTransition</h4>
-<pre>private boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.757">isTableTransition</a>(<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> ri)</pre>
+<pre>private boolean <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.761">isTableTransition</a>(<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> ri)</pre>
<dl>
<dt><span class="returnLabel">Returns:</span></dt>
<dd>True iff first row in hbase:meta or if we've broached a new table in hbase:meta</dd>
@@ -462,7 +462,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/MetaTableAccessor.Clo
<ul class="blockListLast">
<li class="blockList">
<h4>close</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.763">close</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html#line.767">close</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
diff --git a/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.html b/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.html
index 6cd279a..cda4c96 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/CatalogJanitor.html
@@ -664,7 +664,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/ScheduledChore.html" tit
<ul class="blockList">
<li class="blockList">
<h4>checkLog4jProperties</h4>
-<pre>private static void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.773">checkLog4jProperties</a>()</pre>
+<pre>private static void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.777">checkLog4jProperties</a>()</pre>
</li>
</ul>
<a name="main-java.lang.String:A-">
@@ -673,7 +673,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/ScheduledChore.html" tit
<ul class="blockListLast">
<li class="blockList">
<h4>main</h4>
-<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.792">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
+<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html#line.796">main</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>[] args)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">For testing against a cluster.
Doesn't have a MasterServices context so does not report on good vs bad servers.</div>
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
index 7e15ec9..6a1c98a 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
@@ -18,9 +18,9 @@
<span class="sourceLineNo">010</span> justification="Intentional; to be modified in test")<a name="line.10"></a>
<span class="sourceLineNo">011</span>public class Version {<a name="line.11"></a>
<span class="sourceLineNo">012</span> public static final String version = new String("3.0.0-SNAPSHOT");<a name="line.12"></a>
-<span class="sourceLineNo">013</span> public static final String revision = "86a2692dc4480308b9d1e4b84f0ff56a1af0fd04";<a name="line.13"></a>
+<span class="sourceLineNo">013</span> public static final String revision = "a8724e8120738488d863ac547495d3209b898e83";<a name="line.13"></a>
<span class="sourceLineNo">014</span> public static final String user = "jenkins";<a name="line.14"></a>
-<span class="sourceLineNo">015</span> public static final String date = "Wed May 20 14:39:16 UTC 2020";<a name="line.15"></a>
+<span class="sourceLineNo">015</span> public static final String date = "Thu May 21 14:40:37 UTC 2020";<a name="line.15"></a>
<span class="sourceLineNo">016</span> public static final String url = "git://jenkins-websites-he-de.apache.org/home/jenkins/jenkins-slave/workspace/hbase_generate_website/hbase";<a name="line.16"></a>
<span class="sourceLineNo">017</span> public static final String srcChecksum = "(stdin)=";<a name="line.17"></a>
<span class="sourceLineNo">018</span>}<a name="line.18"></a>
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html
index fe0853b..8d4383e 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.Report.html
@@ -432,396 +432,400 @@
<span class="sourceLineNo">424</span> // It doesn't have merge qualifier, no need to clean<a name="line.424"></a>
<span class="sourceLineNo">425</span> return true;<a name="line.425"></a>
<span class="sourceLineNo">426</span> }<a name="line.426"></a>
-<span class="sourceLineNo">427</span> return cleanMergeRegion(region, parents);<a name="line.427"></a>
-<span class="sourceLineNo">428</span> }<a name="line.428"></a>
-<span class="sourceLineNo">429</span><a name="line.429"></a>
-<span class="sourceLineNo">430</span> /**<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * Report made by ReportMakingVisitor<a name="line.431"></a>
-<span class="sourceLineNo">432</span> */<a name="line.432"></a>
-<span class="sourceLineNo">433</span> public static class Report {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> private final long now = EnvironmentEdgeManager.currentTime();<a name="line.434"></a>
-<span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span> // Keep Map of found split parents. These are candidates for cleanup.<a name="line.436"></a>
-<span class="sourceLineNo">437</span> // Use a comparator that has split parents come before its daughters.<a name="line.437"></a>
-<span class="sourceLineNo">438</span> final Map<RegionInfo, Result> splitParents = new TreeMap<>(new SplitParentFirstComparator());<a name="line.438"></a>
-<span class="sourceLineNo">439</span> final Map<RegionInfo, Result> mergedRegions = new TreeMap<>(RegionInfo.COMPARATOR);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> int count = 0;<a name="line.440"></a>
-<span class="sourceLineNo">441</span><a name="line.441"></a>
-<span class="sourceLineNo">442</span> private final List<Pair<RegionInfo, RegionInfo>> holes = new ArrayList<>();<a name="line.442"></a>
-<span class="sourceLineNo">443</span> private final List<Pair<RegionInfo, RegionInfo>> overlaps = new ArrayList<>();<a name="line.443"></a>
-<span class="sourceLineNo">444</span><a name="line.444"></a>
-<span class="sourceLineNo">445</span> /**<a name="line.445"></a>
-<span class="sourceLineNo">446</span> * TODO: If CatalogJanitor finds an 'Unknown Server', it should 'fix' it by queuing<a name="line.446"></a>
-<span class="sourceLineNo">447</span> * a {@link org.apache.hadoop.hbase.master.procedure.HBCKServerCrashProcedure} for<a name="line.447"></a>
-<span class="sourceLineNo">448</span> * found server for it to clean up meta.<a name="line.448"></a>
-<span class="sourceLineNo">449</span> */<a name="line.449"></a>
-<span class="sourceLineNo">450</span> private final List<Pair<RegionInfo, ServerName>> unknownServers = new ArrayList<>();<a name="line.450"></a>
-<span class="sourceLineNo">451</span><a name="line.451"></a>
-<span class="sourceLineNo">452</span> private final List<byte []> emptyRegionInfo = new ArrayList<>();<a name="line.452"></a>
-<span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span> @VisibleForTesting<a name="line.454"></a>
-<span class="sourceLineNo">455</span> Report() {}<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span> public long getCreateTime() {<a name="line.457"></a>
-<span class="sourceLineNo">458</span> return this.now;<a name="line.458"></a>
-<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">427</span><a name="line.427"></a>
+<span class="sourceLineNo">428</span> // If a parent region is a merged child region and GC has not kicked in/finish its work yet,<a name="line.428"></a>
+<span class="sourceLineNo">429</span> // return false in this case to avoid kicking in a merge, trying later.<a name="line.429"></a>
+<span class="sourceLineNo">430</span> cleanMergeRegion(region, parents);<a name="line.430"></a>
+<span class="sourceLineNo">431</span> return false;<a name="line.431"></a>
+<span class="sourceLineNo">432</span> }<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> /**<a name="line.434"></a>
+<span class="sourceLineNo">435</span> * Report made by ReportMakingVisitor<a name="line.435"></a>
+<span class="sourceLineNo">436</span> */<a name="line.436"></a>
+<span class="sourceLineNo">437</span> public static class Report {<a name="line.437"></a>
+<span class="sourceLineNo">438</span> private final long now = EnvironmentEdgeManager.currentTime();<a name="line.438"></a>
+<span class="sourceLineNo">439</span><a name="line.439"></a>
+<span class="sourceLineNo">440</span> // Keep Map of found split parents. These are candidates for cleanup.<a name="line.440"></a>
+<span class="sourceLineNo">441</span> // Use a comparator that has split parents come before its daughters.<a name="line.441"></a>
+<span class="sourceLineNo">442</span> final Map<RegionInfo, Result> splitParents = new TreeMap<>(new SplitParentFirstComparator());<a name="line.442"></a>
+<span class="sourceLineNo">443</span> final Map<RegionInfo, Result> mergedRegions = new TreeMap<>(RegionInfo.COMPARATOR);<a name="line.443"></a>
+<span class="sourceLineNo">444</span> int count = 0;<a name="line.444"></a>
+<span class="sourceLineNo">445</span><a name="line.445"></a>
+<span class="sourceLineNo">446</span> private final List<Pair<RegionInfo, RegionInfo>> holes = new ArrayList<>();<a name="line.446"></a>
+<span class="sourceLineNo">447</span> private final List<Pair<RegionInfo, RegionInfo>> overlaps = new ArrayList<>();<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span> /**<a name="line.449"></a>
+<span class="sourceLineNo">450</span> * TODO: If CatalogJanitor finds an 'Unknown Server', it should 'fix' it by queuing<a name="line.450"></a>
+<span class="sourceLineNo">451</span> * a {@link org.apache.hadoop.hbase.master.procedure.HBCKServerCrashProcedure} for<a name="line.451"></a>
+<span class="sourceLineNo">452</span> * found server for it to clean up meta.<a name="line.452"></a>
+<span class="sourceLineNo">453</span> */<a name="line.453"></a>
+<span class="sourceLineNo">454</span> private final List<Pair<RegionInfo, ServerName>> unknownServers = new ArrayList<>();<a name="line.454"></a>
+<span class="sourceLineNo">455</span><a name="line.455"></a>
+<span class="sourceLineNo">456</span> private final List<byte []> emptyRegionInfo = new ArrayList<>();<a name="line.456"></a>
+<span class="sourceLineNo">457</span><a name="line.457"></a>
+<span class="sourceLineNo">458</span> @VisibleForTesting<a name="line.458"></a>
+<span class="sourceLineNo">459</span> Report() {}<a name="line.459"></a>
<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span> public List<Pair<RegionInfo, RegionInfo>> getHoles() {<a name="line.461"></a>
-<span class="sourceLineNo">462</span> return this.holes;<a name="line.462"></a>
+<span class="sourceLineNo">461</span> public long getCreateTime() {<a name="line.461"></a>
+<span class="sourceLineNo">462</span> return this.now;<a name="line.462"></a>
<span class="sourceLineNo">463</span> }<a name="line.463"></a>
<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span> /**<a name="line.465"></a>
-<span class="sourceLineNo">466</span> * @return Overlap pairs found as we scanned hbase:meta; ordered by hbase:meta<a name="line.466"></a>
-<span class="sourceLineNo">467</span> * table sort. Pairs of overlaps may have overlap with subsequent pairs.<a name="line.467"></a>
-<span class="sourceLineNo">468</span> * @see MetaFixer#calculateMerges(int, List) where we aggregate overlaps<a name="line.468"></a>
-<span class="sourceLineNo">469</span> * for a single 'merge' call.<a name="line.469"></a>
-<span class="sourceLineNo">470</span> */<a name="line.470"></a>
-<span class="sourceLineNo">471</span> public List<Pair<RegionInfo, RegionInfo>> getOverlaps() {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> return this.overlaps;<a name="line.472"></a>
-<span class="sourceLineNo">473</span> }<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span> public List<Pair<RegionInfo, ServerName>> getUnknownServers() {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> return unknownServers;<a name="line.476"></a>
+<span class="sourceLineNo">465</span> public List<Pair<RegionInfo, RegionInfo>> getHoles() {<a name="line.465"></a>
+<span class="sourceLineNo">466</span> return this.holes;<a name="line.466"></a>
+<span class="sourceLineNo">467</span> }<a name="line.467"></a>
+<span class="sourceLineNo">468</span><a name="line.468"></a>
+<span class="sourceLineNo">469</span> /**<a name="line.469"></a>
+<span class="sourceLineNo">470</span> * @return Overlap pairs found as we scanned hbase:meta; ordered by hbase:meta<a name="line.470"></a>
+<span class="sourceLineNo">471</span> * table sort. Pairs of overlaps may have overlap with subsequent pairs.<a name="line.471"></a>
+<span class="sourceLineNo">472</span> * @see MetaFixer#calculateMerges(int, List) where we aggregate overlaps<a name="line.472"></a>
+<span class="sourceLineNo">473</span> * for a single 'merge' call.<a name="line.473"></a>
+<span class="sourceLineNo">474</span> */<a name="line.474"></a>
+<span class="sourceLineNo">475</span> public List<Pair<RegionInfo, RegionInfo>> getOverlaps() {<a name="line.475"></a>
+<span class="sourceLineNo">476</span> return this.overlaps;<a name="line.476"></a>
<span class="sourceLineNo">477</span> }<a name="line.477"></a>
<span class="sourceLineNo">478</span><a name="line.478"></a>
-<span class="sourceLineNo">479</span> public List<byte[]> getEmptyRegionInfo() {<a name="line.479"></a>
-<span class="sourceLineNo">480</span> return emptyRegionInfo;<a name="line.480"></a>
+<span class="sourceLineNo">479</span> public List<Pair<RegionInfo, ServerName>> getUnknownServers() {<a name="line.479"></a>
+<span class="sourceLineNo">480</span> return unknownServers;<a name="line.480"></a>
<span class="sourceLineNo">481</span> }<a name="line.481"></a>
<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span> /**<a name="line.483"></a>
-<span class="sourceLineNo">484</span> * @return True if an 'empty' lastReport -- no problems found.<a name="line.484"></a>
-<span class="sourceLineNo">485</span> */<a name="line.485"></a>
-<span class="sourceLineNo">486</span> public boolean isEmpty() {<a name="line.486"></a>
-<span class="sourceLineNo">487</span> return this.holes.isEmpty() && this.overlaps.isEmpty() && this.unknownServers.isEmpty() &&<a name="line.487"></a>
-<span class="sourceLineNo">488</span> this.emptyRegionInfo.isEmpty();<a name="line.488"></a>
-<span class="sourceLineNo">489</span> }<a name="line.489"></a>
-<span class="sourceLineNo">490</span><a name="line.490"></a>
-<span class="sourceLineNo">491</span> @Override<a name="line.491"></a>
-<span class="sourceLineNo">492</span> public String toString() {<a name="line.492"></a>
-<span class="sourceLineNo">493</span> StringBuilder sb = new StringBuilder();<a name="line.493"></a>
-<span class="sourceLineNo">494</span> for (Pair<RegionInfo, RegionInfo> p: this.holes) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span> if (sb.length() > 0) {<a name="line.495"></a>
-<span class="sourceLineNo">496</span> sb.append(", ");<a name="line.496"></a>
-<span class="sourceLineNo">497</span> }<a name="line.497"></a>
-<span class="sourceLineNo">498</span> sb.append("hole=").append(p.getFirst().getRegionNameAsString()).append("/").<a name="line.498"></a>
-<span class="sourceLineNo">499</span> append(p.getSecond().getRegionNameAsString());<a name="line.499"></a>
-<span class="sourceLineNo">500</span> }<a name="line.500"></a>
-<span class="sourceLineNo">501</span> for (Pair<RegionInfo, RegionInfo> p: this.overlaps) {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> if (sb.length() > 0) {<a name="line.502"></a>
-<span class="sourceLineNo">503</span> sb.append(", ");<a name="line.503"></a>
-<span class="sourceLineNo">504</span> }<a name="line.504"></a>
-<span class="sourceLineNo">505</span> sb.append("overlap=").append(p.getFirst().getRegionNameAsString()).append("/").<a name="line.505"></a>
-<span class="sourceLineNo">506</span> append(p.getSecond().getRegionNameAsString());<a name="line.506"></a>
-<span class="sourceLineNo">507</span> }<a name="line.507"></a>
-<span class="sourceLineNo">508</span> for (byte [] r: this.emptyRegionInfo) {<a name="line.508"></a>
-<span class="sourceLineNo">509</span> if (sb.length() > 0) {<a name="line.509"></a>
-<span class="sourceLineNo">510</span> sb.append(", ");<a name="line.510"></a>
-<span class="sourceLineNo">511</span> }<a name="line.511"></a>
-<span class="sourceLineNo">512</span> sb.append("empty=").append(Bytes.toStringBinary(r));<a name="line.512"></a>
-<span class="sourceLineNo">513</span> }<a name="line.513"></a>
-<span class="sourceLineNo">514</span> for (Pair<RegionInfo, ServerName> p: this.unknownServers) {<a name="line.514"></a>
-<span class="sourceLineNo">515</span> if (sb.length() > 0) {<a name="line.515"></a>
-<span class="sourceLineNo">516</span> sb.append(", ");<a name="line.516"></a>
-<span class="sourceLineNo">517</span> }<a name="line.517"></a>
-<span class="sourceLineNo">518</span> sb.append("unknown_server=").append(p.getSecond()).append("/").<a name="line.518"></a>
-<span class="sourceLineNo">519</span> append(p.getFirst().getRegionNameAsString());<a name="line.519"></a>
-<span class="sourceLineNo">520</span> }<a name="line.520"></a>
-<span class="sourceLineNo">521</span> return sb.toString();<a name="line.521"></a>
-<span class="sourceLineNo">522</span> }<a name="line.522"></a>
-<span class="sourceLineNo">523</span> }<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span> /**<a name="line.525"></a>
-<span class="sourceLineNo">526</span> * Visitor we use in here in CatalogJanitor to go against hbase:meta table.<a name="line.526"></a>
-<span class="sourceLineNo">527</span> * Generates a Report made of a collection of split parents and counts of rows<a name="line.527"></a>
-<span class="sourceLineNo">528</span> * in the hbase:meta table. Also runs hbase:meta consistency checks to<a name="line.528"></a>
-<span class="sourceLineNo">529</span> * generate more report. Report is NOT ready until after this visitor has been<a name="line.529"></a>
-<span class="sourceLineNo">530</span> * {@link #close()}'d.<a name="line.530"></a>
-<span class="sourceLineNo">531</span> */<a name="line.531"></a>
-<span class="sourceLineNo">532</span> static class ReportMakingVisitor implements MetaTableAccessor.CloseableVisitor {<a name="line.532"></a>
-<span class="sourceLineNo">533</span> private final MasterServices services;<a name="line.533"></a>
-<span class="sourceLineNo">534</span> private volatile boolean closed;<a name="line.534"></a>
-<span class="sourceLineNo">535</span><a name="line.535"></a>
-<span class="sourceLineNo">536</span> /**<a name="line.536"></a>
-<span class="sourceLineNo">537</span> * Report is not done until after the close has been called.<a name="line.537"></a>
-<span class="sourceLineNo">538</span> * @see #close()<a name="line.538"></a>
-<span class="sourceLineNo">539</span> * @see #getReport()<a name="line.539"></a>
-<span class="sourceLineNo">540</span> */<a name="line.540"></a>
-<span class="sourceLineNo">541</span> private Report report = new Report();<a name="line.541"></a>
-<span class="sourceLineNo">542</span><a name="line.542"></a>
-<span class="sourceLineNo">543</span> /**<a name="line.543"></a>
-<span class="sourceLineNo">544</span> * RegionInfo from previous row.<a name="line.544"></a>
-<span class="sourceLineNo">545</span> */<a name="line.545"></a>
-<span class="sourceLineNo">546</span> private RegionInfo previous = null;<a name="line.546"></a>
-<span class="sourceLineNo">547</span><a name="line.547"></a>
-<span class="sourceLineNo">548</span> /**<a name="line.548"></a>
-<span class="sourceLineNo">549</span> * Keep account of the highest end key seen as we move through hbase:meta.<a name="line.549"></a>
-<span class="sourceLineNo">550</span> * Usually, the current RegionInfo has the highest end key but if an overlap,<a name="line.550"></a>
-<span class="sourceLineNo">551</span> * this may no longer hold. An overlap may be a region with startkey 'd' and<a name="line.551"></a>
-<span class="sourceLineNo">552</span> * endkey 'g'. The next region in meta may be 'e' to 'f' and then 'f' to 'g'.<a name="line.552"></a>
-<span class="sourceLineNo">553</span> * Looking at previous and current meta row, we won't know about the 'd' to 'g'<a name="line.553"></a>
-<span class="sourceLineNo">554</span> * overlap unless we keep a running 'highest-endpoint-seen'.<a name="line.554"></a>
-<span class="sourceLineNo">555</span> */<a name="line.555"></a>
-<span class="sourceLineNo">556</span> private RegionInfo highestEndKeyRegionInfo = null;<a name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span> ReportMakingVisitor(MasterServices services) {<a name="line.558"></a>
-<span class="sourceLineNo">559</span> this.services = services;<a name="line.559"></a>
-<span class="sourceLineNo">560</span> }<a name="line.560"></a>
+<span class="sourceLineNo">483</span> public List<byte[]> getEmptyRegionInfo() {<a name="line.483"></a>
+<span class="sourceLineNo">484</span> return emptyRegionInfo;<a name="line.484"></a>
+<span class="sourceLineNo">485</span> }<a name="line.485"></a>
+<span class="sourceLineNo">486</span><a name="line.486"></a>
+<span class="sourceLineNo">487</span> /**<a name="line.487"></a>
+<span class="sourceLineNo">488</span> * @return True if an 'empty' lastReport -- no problems found.<a name="line.488"></a>
+<span class="sourceLineNo">489</span> */<a name="line.489"></a>
+<span class="sourceLineNo">490</span> public boolean isEmpty() {<a name="line.490"></a>
+<span class="sourceLineNo">491</span> return this.holes.isEmpty() && this.overlaps.isEmpty() && this.unknownServers.isEmpty() &&<a name="line.491"></a>
+<span class="sourceLineNo">492</span> this.emptyRegionInfo.isEmpty();<a name="line.492"></a>
+<span class="sourceLineNo">493</span> }<a name="line.493"></a>
+<span class="sourceLineNo">494</span><a name="line.494"></a>
+<span class="sourceLineNo">495</span> @Override<a name="line.495"></a>
+<span class="sourceLineNo">496</span> public String toString() {<a name="line.496"></a>
+<span class="sourceLineNo">497</span> StringBuilder sb = new StringBuilder();<a name="line.497"></a>
+<span class="sourceLineNo">498</span> for (Pair<RegionInfo, RegionInfo> p: this.holes) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span> if (sb.length() > 0) {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> sb.append(", ");<a name="line.500"></a>
+<span class="sourceLineNo">501</span> }<a name="line.501"></a>
+<span class="sourceLineNo">502</span> sb.append("hole=").append(p.getFirst().getRegionNameAsString()).append("/").<a name="line.502"></a>
+<span class="sourceLineNo">503</span> append(p.getSecond().getRegionNameAsString());<a name="line.503"></a>
+<span class="sourceLineNo">504</span> }<a name="line.504"></a>
+<span class="sourceLineNo">505</span> for (Pair<RegionInfo, RegionInfo> p: this.overlaps) {<a name="line.505"></a>
+<span class="sourceLineNo">506</span> if (sb.length() > 0) {<a name="line.506"></a>
+<span class="sourceLineNo">507</span> sb.append(", ");<a name="line.507"></a>
+<span class="sourceLineNo">508</span> }<a name="line.508"></a>
+<span class="sourceLineNo">509</span> sb.append("overlap=").append(p.getFirst().getRegionNameAsString()).append("/").<a name="line.509"></a>
+<span class="sourceLineNo">510</span> append(p.getSecond().getRegionNameAsString());<a name="line.510"></a>
+<span class="sourceLineNo">511</span> }<a name="line.511"></a>
+<span class="sourceLineNo">512</span> for (byte [] r: this.emptyRegionInfo) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> if (sb.length() > 0) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span> sb.append(", ");<a name="line.514"></a>
+<span class="sourceLineNo">515</span> }<a name="line.515"></a>
+<span class="sourceLineNo">516</span> sb.append("empty=").append(Bytes.toStringBinary(r));<a name="line.516"></a>
+<span class="sourceLineNo">517</span> }<a name="line.517"></a>
+<span class="sourceLineNo">518</span> for (Pair<RegionInfo, ServerName> p: this.unknownServers) {<a name="line.518"></a>
+<span class="sourceLineNo">519</span> if (sb.length() > 0) {<a name="line.519"></a>
+<span class="sourceLineNo">520</span> sb.append(", ");<a name="line.520"></a>
+<span class="sourceLineNo">521</span> }<a name="line.521"></a>
+<span class="sourceLineNo">522</span> sb.append("unknown_server=").append(p.getSecond()).append("/").<a name="line.522"></a>
+<span class="sourceLineNo">523</span> append(p.getFirst().getRegionNameAsString());<a name="line.523"></a>
+<span class="sourceLineNo">524</span> }<a name="line.524"></a>
+<span class="sourceLineNo">525</span> return sb.toString();<a name="line.525"></a>
+<span class="sourceLineNo">526</span> }<a name="line.526"></a>
+<span class="sourceLineNo">527</span> }<a name="line.527"></a>
+<span class="sourceLineNo">528</span><a name="line.528"></a>
+<span class="sourceLineNo">529</span> /**<a name="line.529"></a>
+<span class="sourceLineNo">530</span> * Visitor we use in here in CatalogJanitor to go against hbase:meta table.<a name="line.530"></a>
+<span class="sourceLineNo">531</span> * Generates a Report made of a collection of split parents and counts of rows<a name="line.531"></a>
+<span class="sourceLineNo">532</span> * in the hbase:meta table. Also runs hbase:meta consistency checks to<a name="line.532"></a>
+<span class="sourceLineNo">533</span> * generate more report. Report is NOT ready until after this visitor has been<a name="line.533"></a>
+<span class="sourceLineNo">534</span> * {@link #close()}'d.<a name="line.534"></a>
+<span class="sourceLineNo">535</span> */<a name="line.535"></a>
+<span class="sourceLineNo">536</span> static class ReportMakingVisitor implements MetaTableAccessor.CloseableVisitor {<a name="line.536"></a>
+<span class="sourceLineNo">537</span> private final MasterServices services;<a name="line.537"></a>
+<span class="sourceLineNo">538</span> private volatile boolean closed;<a name="line.538"></a>
+<span class="sourceLineNo">539</span><a name="line.539"></a>
+<span class="sourceLineNo">540</span> /**<a name="line.540"></a>
+<span class="sourceLineNo">541</span> * Report is not done until after the close has been called.<a name="line.541"></a>
+<span class="sourceLineNo">542</span> * @see #close()<a name="line.542"></a>
+<span class="sourceLineNo">543</span> * @see #getReport()<a name="line.543"></a>
+<span class="sourceLineNo">544</span> */<a name="line.544"></a>
+<span class="sourceLineNo">545</span> private Report report = new Report();<a name="line.545"></a>
+<span class="sourceLineNo">546</span><a name="line.546"></a>
+<span class="sourceLineNo">547</span> /**<a name="line.547"></a>
+<span class="sourceLineNo">548</span> * RegionInfo from previous row.<a name="line.548"></a>
+<span class="sourceLineNo">549</span> */<a name="line.549"></a>
+<span class="sourceLineNo">550</span> private RegionInfo previous = null;<a name="line.550"></a>
+<span class="sourceLineNo">551</span><a name="line.551"></a>
+<span class="sourceLineNo">552</span> /**<a name="line.552"></a>
+<span class="sourceLineNo">553</span> * Keep account of the highest end key seen as we move through hbase:meta.<a name="line.553"></a>
+<span class="sourceLineNo">554</span> * Usually, the current RegionInfo has the highest end key but if an overlap,<a name="line.554"></a>
+<span class="sourceLineNo">555</span> * this may no longer hold. An overlap may be a region with startkey 'd' and<a name="line.555"></a>
+<span class="sourceLineNo">556</span> * endkey 'g'. The next region in meta may be 'e' to 'f' and then 'f' to 'g'.<a name="line.556"></a>
+<span class="sourceLineNo">557</span> * Looking at previous and current meta row, we won't know about the 'd' to 'g'<a name="line.557"></a>
+<span class="sourceLineNo">558</span> * overlap unless we keep a running 'highest-endpoint-seen'.<a name="line.558"></a>
+<span class="sourceLineNo">559</span> */<a name="line.559"></a>
+<span class="sourceLineNo">560</span> private RegionInfo highestEndKeyRegionInfo = null;<a name="line.560"></a>
<span class="sourceLineNo">561</span><a name="line.561"></a>
-<span class="sourceLineNo">562</span> /**<a name="line.562"></a>
-<span class="sourceLineNo">563</span> * Do not call until after {@link #close()}.<a name="line.563"></a>
-<span class="sourceLineNo">564</span> * Will throw a {@link RuntimeException} if you do.<a name="line.564"></a>
-<span class="sourceLineNo">565</span> */<a name="line.565"></a>
-<span class="sourceLineNo">566</span> Report getReport() {<a name="line.566"></a>
-<span class="sourceLineNo">567</span> if (!this.closed) {<a name="line.567"></a>
-<span class="sourceLineNo">568</span> throw new RuntimeException("Report not ready until after close()");<a name="line.568"></a>
-<span class="sourceLineNo">569</span> }<a name="line.569"></a>
-<span class="sourceLineNo">570</span> return this.report;<a name="line.570"></a>
-<span class="sourceLineNo">571</span> }<a name="line.571"></a>
-<span class="sourceLineNo">572</span><a name="line.572"></a>
-<span class="sourceLineNo">573</span> @Override<a name="line.573"></a>
-<span class="sourceLineNo">574</span> public boolean visit(Result r) {<a name="line.574"></a>
-<span class="sourceLineNo">575</span> if (r == null || r.isEmpty()) {<a name="line.575"></a>
-<span class="sourceLineNo">576</span> return true;<a name="line.576"></a>
-<span class="sourceLineNo">577</span> }<a name="line.577"></a>
-<span class="sourceLineNo">578</span> this.report.count++;<a name="line.578"></a>
-<span class="sourceLineNo">579</span> RegionInfo regionInfo = null;<a name="line.579"></a>
-<span class="sourceLineNo">580</span> try {<a name="line.580"></a>
-<span class="sourceLineNo">581</span> regionInfo = metaTableConsistencyCheck(r);<a name="line.581"></a>
-<span class="sourceLineNo">582</span> } catch(Throwable t) {<a name="line.582"></a>
-<span class="sourceLineNo">583</span> LOG.warn("Failed consistency check on {}", Bytes.toStringBinary(r.getRow()), t);<a name="line.583"></a>
-<span class="sourceLineNo">584</span> }<a name="line.584"></a>
-<span class="sourceLineNo">585</span> if (regionInfo != null) {<a name="line.585"></a>
-<span class="sourceLineNo">586</span> LOG.trace(regionInfo.toString());<a name="line.586"></a>
-<span class="sourceLineNo">587</span> if (regionInfo.isSplitParent()) { // splitParent means split and offline.<a name="line.587"></a>
-<span class="sourceLineNo">588</span> this.report.splitParents.put(regionInfo, r);<a name="line.588"></a>
-<span class="sourceLineNo">589</span> }<a name="line.589"></a>
-<span class="sourceLineNo">590</span> if (MetaTableAccessor.hasMergeRegions(r.rawCells())) {<a name="line.590"></a>
-<span class="sourceLineNo">591</span> this.report.mergedRegions.put(regionInfo, r);<a name="line.591"></a>
-<span class="sourceLineNo">592</span> }<a name="line.592"></a>
-<span class="sourceLineNo">593</span> }<a name="line.593"></a>
-<span class="sourceLineNo">594</span> // Returning true means "keep scanning"<a name="line.594"></a>
-<span class="sourceLineNo">595</span> return true;<a name="line.595"></a>
-<span class="sourceLineNo">596</span> }<a name="line.596"></a>
-<span class="sourceLineNo">597</span><a name="line.597"></a>
-<span class="sourceLineNo">598</span> /**<a name="line.598"></a>
-<span class="sourceLineNo">599</span> * Check row.<a name="line.599"></a>
-<span class="sourceLineNo">600</span> * @param metaTableRow Row from hbase:meta table.<a name="line.600"></a>
-<span class="sourceLineNo">601</span> * @return Returns default regioninfo found in row parse as a convenience to save<a name="line.601"></a>
-<span class="sourceLineNo">602</span> * on having to do a double-parse of Result.<a name="line.602"></a>
-<span class="sourceLineNo">603</span> */<a name="line.603"></a>
-<span class="sourceLineNo">604</span> private RegionInfo metaTableConsistencyCheck(Result metaTableRow) {<a name="line.604"></a>
-<span class="sourceLineNo">605</span> RegionInfo ri;<a name="line.605"></a>
-<span class="sourceLineNo">606</span> // Locations comes back null if the RegionInfo field is empty.<a name="line.606"></a>
-<span class="sourceLineNo">607</span> // If locations is null, ensure the regioninfo is for sure empty before progressing.<a name="line.607"></a>
-<span class="sourceLineNo">608</span> // If really empty, report as missing regioninfo! Otherwise, can run server check<a name="line.608"></a>
-<span class="sourceLineNo">609</span> // and get RegionInfo from locations.<a name="line.609"></a>
-<span class="sourceLineNo">610</span> RegionLocations locations = MetaTableAccessor.getRegionLocations(metaTableRow);<a name="line.610"></a>
-<span class="sourceLineNo">611</span> if (locations == null) {<a name="line.611"></a>
-<span class="sourceLineNo">612</span> ri = MetaTableAccessor.getRegionInfo(metaTableRow,<a name="line.612"></a>
-<span class="sourceLineNo">613</span> MetaTableAccessor.getRegionInfoColumn());<a name="line.613"></a>
-<span class="sourceLineNo">614</span> } else {<a name="line.614"></a>
-<span class="sourceLineNo">615</span> ri = locations.getDefaultRegionLocation().getRegion();<a name="line.615"></a>
-<span class="sourceLineNo">616</span> checkServer(locations);<a name="line.616"></a>
-<span class="sourceLineNo">617</span> }<a name="line.617"></a>
-<span class="sourceLineNo">618</span><a name="line.618"></a>
-<span class="sourceLineNo">619</span> if (ri == null) {<a name="line.619"></a>
-<span class="sourceLineNo">620</span> this.report.emptyRegionInfo.add(metaTableRow.getRow());<a name="line.620"></a>
-<span class="sourceLineNo">621</span> return ri;<a name="line.621"></a>
-<span class="sourceLineNo">622</span> }<a name="line.622"></a>
-<span class="sourceLineNo">623</span><a name="line.623"></a>
-<span class="sourceLineNo">624</span> if (!Bytes.equals(metaTableRow.getRow(), ri.getRegionName())) {<a name="line.624"></a>
-<span class="sourceLineNo">625</span> LOG.warn("INCONSISTENCY: Row name is not equal to serialized info:regioninfo content; " +<a name="line.625"></a>
-<span class="sourceLineNo">626</span> "row={} {}; See if RegionInfo is referenced in another hbase:meta row? Delete?",<a name="line.626"></a>
-<span class="sourceLineNo">627</span> Bytes.toStringBinary(metaTableRow.getRow()), ri.getRegionNameAsString());<a name="line.627"></a>
-<span class="sourceLineNo">628</span> return null;<a name="line.628"></a>
-<span class="sourceLineNo">629</span> }<a name="line.629"></a>
-<span class="sourceLineNo">630</span> // Skip split parent region<a name="line.630"></a>
-<span class="sourceLineNo">631</span> if (ri.isSplitParent()) {<a name="line.631"></a>
-<span class="sourceLineNo">632</span> return ri;<a name="line.632"></a>
+<span class="sourceLineNo">562</span> ReportMakingVisitor(MasterServices services) {<a name="line.562"></a>
+<span class="sourceLineNo">563</span> this.services = services;<a name="line.563"></a>
+<span class="sourceLineNo">564</span> }<a name="line.564"></a>
+<span class="sourceLineNo">565</span><a name="line.565"></a>
+<span class="sourceLineNo">566</span> /**<a name="line.566"></a>
+<span class="sourceLineNo">567</span> * Do not call until after {@link #close()}.<a name="line.567"></a>
+<span class="sourceLineNo">568</span> * Will throw a {@link RuntimeException} if you do.<a name="line.568"></a>
+<span class="sourceLineNo">569</span> */<a name="line.569"></a>
+<span class="sourceLineNo">570</span> Report getReport() {<a name="line.570"></a>
+<span class="sourceLineNo">571</span> if (!this.closed) {<a name="line.571"></a>
+<span class="sourceLineNo">572</span> throw new RuntimeException("Report not ready until after close()");<a name="line.572"></a>
+<span class="sourceLineNo">573</span> }<a name="line.573"></a>
+<span class="sourceLineNo">574</span> return this.report;<a name="line.574"></a>
+<span class="sourceLineNo">575</span> }<a name="line.575"></a>
+<span class="sourceLineNo">576</span><a name="line.576"></a>
+<span class="sourceLineNo">577</span> @Override<a name="line.577"></a>
+<span class="sourceLineNo">578</span> public boolean visit(Result r) {<a name="line.578"></a>
+<span class="sourceLineNo">579</span> if (r == null || r.isEmpty()) {<a name="line.579"></a>
+<span class="sourceLineNo">580</span> return true;<a name="line.580"></a>
+<span class="sourceLineNo">581</span> }<a name="line.581"></a>
+<span class="sourceLineNo">582</span> this.report.count++;<a name="line.582"></a>
+<span class="sourceLineNo">583</span> RegionInfo regionInfo = null;<a name="line.583"></a>
+<span class="sourceLineNo">584</span> try {<a name="line.584"></a>
+<span class="sourceLineNo">585</span> regionInfo = metaTableConsistencyCheck(r);<a name="line.585"></a>
+<span class="sourceLineNo">586</span> } catch(Throwable t) {<a name="line.586"></a>
+<span class="sourceLineNo">587</span> LOG.warn("Failed consistency check on {}", Bytes.toStringBinary(r.getRow()), t);<a name="line.587"></a>
+<span class="sourceLineNo">588</span> }<a name="line.588"></a>
+<span class="sourceLineNo">589</span> if (regionInfo != null) {<a name="line.589"></a>
+<span class="sourceLineNo">590</span> LOG.trace(regionInfo.toString());<a name="line.590"></a>
+<span class="sourceLineNo">591</span> if (regionInfo.isSplitParent()) { // splitParent means split and offline.<a name="line.591"></a>
+<span class="sourceLineNo">592</span> this.report.splitParents.put(regionInfo, r);<a name="line.592"></a>
+<span class="sourceLineNo">593</span> }<a name="line.593"></a>
+<span class="sourceLineNo">594</span> if (MetaTableAccessor.hasMergeRegions(r.rawCells())) {<a name="line.594"></a>
+<span class="sourceLineNo">595</span> this.report.mergedRegions.put(regionInfo, r);<a name="line.595"></a>
+<span class="sourceLineNo">596</span> }<a name="line.596"></a>
+<span class="sourceLineNo">597</span> }<a name="line.597"></a>
+<span class="sourceLineNo">598</span> // Returning true means "keep scanning"<a name="line.598"></a>
+<span class="sourceLineNo">599</span> return true;<a name="line.599"></a>
+<span class="sourceLineNo">600</span> }<a name="line.600"></a>
+<span class="sourceLineNo">601</span><a name="line.601"></a>
+<span class="sourceLineNo">602</span> /**<a name="line.602"></a>
+<span class="sourceLineNo">603</span> * Check row.<a name="line.603"></a>
+<span class="sourceLineNo">604</span> * @param metaTableRow Row from hbase:meta table.<a name="line.604"></a>
+<span class="sourceLineNo">605</span> * @return Returns default regioninfo found in row parse as a convenience to save<a name="line.605"></a>
+<span class="sourceLineNo">606</span> * on having to do a double-parse of Result.<a name="line.606"></a>
+<span class="sourceLineNo">607</span> */<a name="line.607"></a>
+<span class="sourceLineNo">608</span> private RegionInfo metaTableConsistencyCheck(Result metaTableRow) {<a name="line.608"></a>
+<span class="sourceLineNo">609</span> RegionInfo ri;<a name="line.609"></a>
+<span class="sourceLineNo">610</span> // Locations comes back null if the RegionInfo field is empty.<a name="line.610"></a>
+<span class="sourceLineNo">611</span> // If locations is null, ensure the regioninfo is for sure empty before progressing.<a name="line.611"></a>
+<span class="sourceLineNo">612</span> // If really empty, report as missing regioninfo! Otherwise, can run server check<a name="line.612"></a>
+<span class="sourceLineNo">613</span> // and get RegionInfo from locations.<a name="line.613"></a>
+<span class="sourceLineNo">614</span> RegionLocations locations = MetaTableAccessor.getRegionLocations(metaTableRow);<a name="line.614"></a>
+<span class="sourceLineNo">615</span> if (locations == null) {<a name="line.615"></a>
+<span class="sourceLineNo">616</span> ri = MetaTableAccessor.getRegionInfo(metaTableRow,<a name="line.616"></a>
+<span class="sourceLineNo">617</span> MetaTableAccessor.getRegionInfoColumn());<a name="line.617"></a>
+<span class="sourceLineNo">618</span> } else {<a name="line.618"></a>
+<span class="sourceLineNo">619</span> ri = locations.getDefaultRegionLocation().getRegion();<a name="line.619"></a>
+<span class="sourceLineNo">620</span> checkServer(locations);<a name="line.620"></a>
+<span class="sourceLineNo">621</span> }<a name="line.621"></a>
+<span class="sourceLineNo">622</span><a name="line.622"></a>
+<span class="sourceLineNo">623</span> if (ri == null) {<a name="line.623"></a>
+<span class="sourceLineNo">624</span> this.report.emptyRegionInfo.add(metaTableRow.getRow());<a name="line.624"></a>
+<span class="sourceLineNo">625</span> return ri;<a name="line.625"></a>
+<span class="sourceLineNo">626</span> }<a name="line.626"></a>
+<span class="sourceLineNo">627</span><a name="line.627"></a>
+<span class="sourceLineNo">628</span> if (!Bytes.equals(metaTableRow.getRow(), ri.getRegionName())) {<a name="line.628"></a>
+<span class="sourceLineNo">629</span> LOG.warn("INCONSISTENCY: Row name is not equal to serialized info:regioninfo content; " +<a name="line.629"></a>
+<span class="sourceLineNo">630</span> "row={} {}; See if RegionInfo is referenced in another hbase:meta row? Delete?",<a name="line.630"></a>
+<span class="sourceLineNo">631</span> Bytes.toStringBinary(metaTableRow.getRow()), ri.getRegionNameAsString());<a name="line.631"></a>
+<span class="sourceLineNo">632</span> return null;<a name="line.632"></a>
<span class="sourceLineNo">633</span> }<a name="line.633"></a>
-<span class="sourceLineNo">634</span> // If table is disabled, skip integrity check.<a name="line.634"></a>
-<span class="sourceLineNo">635</span> if (!isTableDisabled(ri)) {<a name="line.635"></a>
-<span class="sourceLineNo">636</span> if (isTableTransition(ri)) {<a name="line.636"></a>
-<span class="sourceLineNo">637</span> // On table transition, look to see if last region was last in table<a name="line.637"></a>
-<span class="sourceLineNo">638</span> // and if this is the first. Report 'hole' if neither is true.<a name="line.638"></a>
-<span class="sourceLineNo">639</span> // HBCK1 used to have a special category for missing start or end keys.<a name="line.639"></a>
-<span class="sourceLineNo">640</span> // We'll just lump them in as 'holes'.<a name="line.640"></a>
-<span class="sourceLineNo">641</span> if ((this.previous != null && !this.previous.isLast()) || !ri.isFirst()) {<a name="line.641"></a>
-<span class="sourceLineNo">642</span> addHole(this.previous == null? RegionInfo.UNDEFINED: this.previous, ri);<a name="line.642"></a>
-<span class="sourceLineNo">643</span> }<a name="line.643"></a>
-<span class="sourceLineNo">644</span> } else {<a name="line.644"></a>
-<span class="sourceLineNo">645</span> if (!this.previous.isNext(ri)) {<a name="line.645"></a>
-<span class="sourceLineNo">646</span> if (this.previous.isOverlap(ri)) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span> addOverlap(this.previous, ri);<a name="line.647"></a>
-<span class="sourceLineNo">648</span> } else if (ri.isOverlap(this.highestEndKeyRegionInfo)) {<a name="line.648"></a>
-<span class="sourceLineNo">649</span> // We may have seen a region a few rows back that overlaps this one.<a name="line.649"></a>
-<span class="sourceLineNo">650</span> addOverlap(this.highestEndKeyRegionInfo, ri);<a name="line.650"></a>
-<span class="sourceLineNo">651</span> } else {<a name="line.651"></a>
-<span class="sourceLineNo">652</span> addHole(this.previous, ri);<a name="line.652"></a>
-<span class="sourceLineNo">653</span> }<a name="line.653"></a>
-<span class="sourceLineNo">654</span> } else if (ri.isOverlap(this.highestEndKeyRegionInfo)) {<a name="line.654"></a>
-<span class="sourceLineNo">655</span> // We may have seen a region a few rows back that overlaps this one<a name="line.655"></a>
-<span class="sourceLineNo">656</span> // even though it properly 'follows' the region just before.<a name="line.656"></a>
-<span class="sourceLineNo">657</span> addOverlap(this.highestEndKeyRegionInfo, ri);<a name="line.657"></a>
-<span class="sourceLineNo">658</span> }<a name="line.658"></a>
-<span class="sourceLineNo">659</span> }<a name="line.659"></a>
-<span class="sourceLineNo">660</span> }<a name="line.660"></a>
-<span class="sourceLineNo">661</span> this.previous = ri;<a name="line.661"></a>
-<span class="sourceLineNo">662</span> this.highestEndKeyRegionInfo =<a name="line.662"></a>
-<span class="sourceLineNo">663</span> MetaFixer.getRegionInfoWithLargestEndKey(this.highestEndKeyRegionInfo, ri);<a name="line.663"></a>
-<span class="sourceLineNo">664</span> return ri;<a name="line.664"></a>
-<span class="sourceLineNo">665</span> }<a name="line.665"></a>
-<span class="sourceLineNo">666</span><a name="line.666"></a>
-<span class="sourceLineNo">667</span> private void addOverlap(RegionInfo a, RegionInfo b) {<a name="line.667"></a>
-<span class="sourceLineNo">668</span> this.report.overlaps.add(new Pair<>(a, b));<a name="line.668"></a>
+<span class="sourceLineNo">634</span> // Skip split parent region<a name="line.634"></a>
+<span class="sourceLineNo">635</span> if (ri.isSplitParent()) {<a name="line.635"></a>
+<span class="sourceLineNo">636</span> return ri;<a name="line.636"></a>
+<span class="sourceLineNo">637</span> }<a name="line.637"></a>
+<span class="sourceLineNo">638</span> // If table is disabled, skip integrity check.<a name="line.638"></a>
+<span class="sourceLineNo">639</span> if (!isTableDisabled(ri)) {<a name="line.639"></a>
+<span class="sourceLineNo">640</span> if (isTableTransition(ri)) {<a name="line.640"></a>
+<span class="sourceLineNo">641</span> // On table transition, look to see if last region was last in table<a name="line.641"></a>
+<span class="sourceLineNo">642</span> // and if this is the first. Report 'hole' if neither is true.<a name="line.642"></a>
+<span class="sourceLineNo">643</span> // HBCK1 used to have a special category for missing start or end keys.<a name="line.643"></a>
+<span class="sourceLineNo">644</span> // We'll just lump them in as 'holes'.<a name="line.644"></a>
+<span class="sourceLineNo">645</span> if ((this.previous != null && !this.previous.isLast()) || !ri.isFirst()) {<a name="line.645"></a>
+<span class="sourceLineNo">646</span> addHole(this.previous == null? RegionInfo.UNDEFINED: this.previous, ri);<a name="line.646"></a>
+<span class="sourceLineNo">647</span> }<a name="line.647"></a>
+<span class="sourceLineNo">648</span> } else {<a name="line.648"></a>
+<span class="sourceLineNo">649</span> if (!this.previous.isNext(ri)) {<a name="line.649"></a>
+<span class="sourceLineNo">650</span> if (this.previous.isOverlap(ri)) {<a name="line.650"></a>
+<span class="sourceLineNo">651</span> addOverlap(this.previous, ri);<a name="line.651"></a>
+<span class="sourceLineNo">652</span> } else if (ri.isOverlap(this.highestEndKeyRegionInfo)) {<a name="line.652"></a>
+<span class="sourceLineNo">653</span> // We may have seen a region a few rows back that overlaps this one.<a name="line.653"></a>
+<span class="sourceLineNo">654</span> addOverlap(this.highestEndKeyRegionInfo, ri);<a name="line.654"></a>
+<span class="sourceLineNo">655</span> } else {<a name="line.655"></a>
+<span class="sourceLineNo">656</span> addHole(this.previous, ri);<a name="line.656"></a>
+<span class="sourceLineNo">657</span> }<a name="line.657"></a>
+<span class="sourceLineNo">658</span> } else if (ri.isOverlap(this.highestEndKeyRegionInfo)) {<a name="line.658"></a>
+<span class="sourceLineNo">659</span> // We may have seen a region a few rows back that overlaps this one<a name="line.659"></a>
+<span class="sourceLineNo">660</span> // even though it properly 'follows' the region just before.<a name="line.660"></a>
+<span class="sourceLineNo">661</span> addOverlap(this.highestEndKeyRegionInfo, ri);<a name="line.661"></a>
+<span class="sourceLineNo">662</span> }<a name="line.662"></a>
+<span class="sourceLineNo">663</span> }<a name="line.663"></a>
+<span class="sourceLineNo">664</span> }<a name="line.664"></a>
+<span class="sourceLineNo">665</span> this.previous = ri;<a name="line.665"></a>
+<span class="sourceLineNo">666</span> this.highestEndKeyRegionInfo =<a name="line.666"></a>
+<span class="sourceLineNo">667</span> MetaFixer.getRegionInfoWithLargestEndKey(this.highestEndKeyRegionInfo, ri);<a name="line.667"></a>
+<span class="sourceLineNo">668</span> return ri;<a name="line.668"></a>
<span class="sourceLineNo">669</span> }<a name="line.669"></a>
<span class="sourceLineNo">670</span><a name="line.670"></a>
-<span class="sourceLineNo">671</span> private void addHole(RegionInfo a, RegionInfo b) {<a name="line.671"></a>
-<span class="sourceLineNo">672</span> this.report.holes.add(new Pair<>(a, b));<a name="line.672"></a>
+<span class="sourceLineNo">671</span> private void addOverlap(RegionInfo a, RegionInfo b) {<a name="line.671"></a>
+<span class="sourceLineNo">672</span> this.report.overlaps.add(new Pair<>(a, b));<a name="line.672"></a>
<span class="sourceLineNo">673</span> }<a name="line.673"></a>
<span class="sourceLineNo">674</span><a name="line.674"></a>
-<span class="sourceLineNo">675</span> /**<a name="line.675"></a>
-<span class="sourceLineNo">676</span> * @return True if table is disabled or disabling; defaults false!<a name="line.676"></a>
-<span class="sourceLineNo">677</span> */<a name="line.677"></a>
-<span class="sourceLineNo">678</span> boolean isTableDisabled(RegionInfo ri) {<a name="line.678"></a>
-<span class="sourceLineNo">679</span> if (ri == null) {<a name="line.679"></a>
-<span class="sourceLineNo">680</span> return false;<a name="line.680"></a>
-<span class="sourceLineNo">681</span> }<a name="line.681"></a>
-<span class="sourceLineNo">682</span> if (this.services == null) {<a name="line.682"></a>
-<span class="sourceLineNo">683</span> return false;<a name="line.683"></a>
-<span class="sourceLineNo">684</span> }<a name="line.684"></a>
-<span class="sourceLineNo">685</span> if (this.services.getTableStateManager() == null) {<a name="line.685"></a>
-<span class="sourceLineNo">686</span> return false;<a name="line.686"></a>
-<span class="sourceLineNo">687</span> }<a name="line.687"></a>
-<span class="sourceLineNo">688</span> TableState state = null;<a name="line.688"></a>
-<span class="sourceLineNo">689</span> try {<a name="line.689"></a>
-<span class="sourceLineNo">690</span> state = this.services.getTableStateManager().getTableState(ri.getTable());<a name="line.690"></a>
-<span class="sourceLineNo">691</span> } catch (IOException e) {<a name="line.691"></a>
-<span class="sourceLineNo">692</span> LOG.warn("Failed getting table state", e);<a name="line.692"></a>
-<span class="sourceLineNo">693</span> }<a name="line.693"></a>
-<span class="sourceLineNo">694</span> return state != null && state.isDisabledOrDisabling();<a name="line.694"></a>
-<span class="sourceLineNo">695</span> }<a name="line.695"></a>
-<span class="sourceLineNo">696</span><a name="line.696"></a>
-<span class="sourceLineNo">697</span> /**<a name="line.697"></a>
-<span class="sourceLineNo">698</span> * Run through referenced servers and save off unknown and the dead.<a name="line.698"></a>
-<span class="sourceLineNo">699</span> */<a name="line.699"></a>
-<span class="sourceLineNo">700</span> private void checkServer(RegionLocations locations) {<a name="line.700"></a>
-<span class="sourceLineNo">701</span> if (this.services == null) {<a name="line.701"></a>
-<span class="sourceLineNo">702</span> // Can't do this test if no services.<a name="line.702"></a>
-<span class="sourceLineNo">703</span> return;<a name="line.703"></a>
-<span class="sourceLineNo">704</span> }<a name="line.704"></a>
-<span class="sourceLineNo">705</span> if (locations == null) {<a name="line.705"></a>
-<span class="sourceLineNo">706</span> return;<a name="line.706"></a>
-<span class="sourceLineNo">707</span> }<a name="line.707"></a>
-<span class="sourceLineNo">708</span> if (locations.getRegionLocations() == null) {<a name="line.708"></a>
-<span class="sourceLineNo">709</span> return;<a name="line.709"></a>
-<span class="sourceLineNo">710</span> }<a name="line.710"></a>
-<span class="sourceLineNo">711</span> // Check referenced servers are known/online. Here we are looking<a name="line.711"></a>
-<span class="sourceLineNo">712</span> // at both the default replica -- the main replica -- and then replica<a name="line.712"></a>
-<span class="sourceLineNo">713</span> // locations too.<a name="line.713"></a>
-<span class="sourceLineNo">714</span> for (HRegionLocation location: locations.getRegionLocations()) {<a name="line.714"></a>
-<span class="sourceLineNo">715</span> if (location == null) {<a name="line.715"></a>
-<span class="sourceLineNo">716</span> continue;<a name="line.716"></a>
-<span class="sourceLineNo">717</span> }<a name="line.717"></a>
-<span class="sourceLineNo">718</span> ServerName sn = location.getServerName();<a name="line.718"></a>
-<span class="sourceLineNo">719</span> if (sn == null) {<a name="line.719"></a>
+<span class="sourceLineNo">675</span> private void addHole(RegionInfo a, RegionInfo b) {<a name="line.675"></a>
+<span class="sourceLineNo">676</span> this.report.holes.add(new Pair<>(a, b));<a name="line.676"></a>
+<span class="sourceLineNo">677</span> }<a name="line.677"></a>
+<span class="sourceLineNo">678</span><a name="line.678"></a>
+<span class="sourceLineNo">679</span> /**<a name="line.679"></a>
+<span class="sourceLineNo">680</span> * @return True if table is disabled or disabling; defaults false!<a name="line.680"></a>
+<span class="sourceLineNo">681</span> */<a name="line.681"></a>
+<span class="sourceLineNo">682</span> boolean isTableDisabled(RegionInfo ri) {<a name="line.682"></a>
+<span class="sourceLineNo">683</span> if (ri == null) {<a name="line.683"></a>
+<span class="sourceLineNo">684</span> return false;<a name="line.684"></a>
+<span class="sourceLineNo">685</span> }<a name="line.685"></a>
+<span class="sourceLineNo">686</span> if (this.services == null) {<a name="line.686"></a>
+<span class="sourceLineNo">687</span> return false;<a name="line.687"></a>
+<span class="sourceLineNo">688</span> }<a name="line.688"></a>
+<span class="sourceLineNo">689</span> if (this.services.getTableStateManager() == null) {<a name="line.689"></a>
+<span class="sourceLineNo">690</span> return false;<a name="line.690"></a>
+<span class="sourceLineNo">691</span> }<a name="line.691"></a>
+<span class="sourceLineNo">692</span> TableState state = null;<a name="line.692"></a>
+<span class="sourceLineNo">693</span> try {<a name="line.693"></a>
+<span class="sourceLineNo">694</span> state = this.services.getTableStateManager().getTableState(ri.getTable());<a name="line.694"></a>
+<span class="sourceLineNo">695</span> } catch (IOException e) {<a name="line.695"></a>
+<span class="sourceLineNo">696</span> LOG.warn("Failed getting table state", e);<a name="line.696"></a>
+<span class="sourceLineNo">697</span> }<a name="line.697"></a>
+<span class="sourceLineNo">698</span> return state != null && state.isDisabledOrDisabling();<a name="line.698"></a>
+<span class="sourceLineNo">699</span> }<a name="line.699"></a>
+<span class="sourceLineNo">700</span><a name="line.700"></a>
+<span class="sourceLineNo">701</span> /**<a name="line.701"></a>
+<span class="sourceLineNo">702</span> * Run through referenced servers and save off unknown and the dead.<a name="line.702"></a>
+<span class="sourceLineNo">703</span> */<a name="line.703"></a>
+<span class="sourceLineNo">704</span> private void checkServer(RegionLocations locations) {<a name="line.704"></a>
+<span class="sourceLineNo">705</span> if (this.services == null) {<a name="line.705"></a>
+<span class="sourceLineNo">706</span> // Can't do this test if no services.<a name="line.706"></a>
+<span class="sourceLineNo">707</span> return;<a name="line.707"></a>
+<span class="sourceLineNo">708</span> }<a name="line.708"></a>
+<span class="sourceLineNo">709</span> if (locations == null) {<a name="line.709"></a>
+<span class="sourceLineNo">710</span> return;<a name="line.710"></a>
+<span class="sourceLineNo">711</span> }<a name="line.711"></a>
+<span class="sourceLineNo">712</span> if (locations.getRegionLocations() == null) {<a name="line.712"></a>
+<span class="sourceLineNo">713</span> return;<a name="line.713"></a>
+<span class="sourceLineNo">714</span> }<a name="line.714"></a>
+<span class="sourceLineNo">715</span> // Check referenced servers are known/online. Here we are looking<a name="line.715"></a>
+<span class="sourceLineNo">716</span> // at both the default replica -- the main replica -- and then replica<a name="line.716"></a>
+<span class="sourceLineNo">717</span> // locations too.<a name="line.717"></a>
+<span class="sourceLineNo">718</span> for (HRegionLocation location: locations.getRegionLocations()) {<a name="line.718"></a>
+<span class="sourceLineNo">719</span> if (location == null) {<a name="line.719"></a>
<span class="sourceLineNo">720</span> continue;<a name="line.720"></a>
<span class="sourceLineNo">721</span> }<a name="line.721"></a>
-<span class="sourceLineNo">722</span> if (location.getRegion() == null) {<a name="line.722"></a>
-<span class="sourceLineNo">723</span> LOG.warn("Empty RegionInfo in {}", location);<a name="line.723"></a>
-<span class="sourceLineNo">724</span> // This should never happen but if it does, will mess up below.<a name="line.724"></a>
-<span class="sourceLineNo">725</span> continue;<a name="line.725"></a>
-<span class="sourceLineNo">726</span> }<a name="line.726"></a>
-<span class="sourceLineNo">727</span> RegionInfo ri = location.getRegion();<a name="line.727"></a>
-<span class="sourceLineNo">728</span> // Skip split parent region<a name="line.728"></a>
-<span class="sourceLineNo">729</span> if (ri.isSplitParent()) {<a name="line.729"></a>
-<span class="sourceLineNo">730</span> continue;<a name="line.730"></a>
-<span class="sourceLineNo">731</span> }<a name="line.731"></a>
-<span class="sourceLineNo">732</span> // skip the offline regions which belong to disabled table.<a name="line.732"></a>
-<span class="sourceLineNo">733</span> if (isTableDisabled(ri)) {<a name="line.733"></a>
+<span class="sourceLineNo">722</span> ServerName sn = location.getServerName();<a name="line.722"></a>
+<span class="sourceLineNo">723</span> if (sn == null) {<a name="line.723"></a>
+<span class="sourceLineNo">724</span> continue;<a name="line.724"></a>
+<span class="sourceLineNo">725</span> }<a name="line.725"></a>
+<span class="sourceLineNo">726</span> if (location.getRegion() == null) {<a name="line.726"></a>
+<span class="sourceLineNo">727</span> LOG.warn("Empty RegionInfo in {}", location);<a name="line.727"></a>
+<span class="sourceLineNo">728</span> // This should never happen but if it does, will mess up below.<a name="line.728"></a>
+<span class="sourceLineNo">729</span> continue;<a name="line.729"></a>
+<span class="sourceLineNo">730</span> }<a name="line.730"></a>
+<span class="sourceLineNo">731</span> RegionInfo ri = location.getRegion();<a name="line.731"></a>
+<span class="sourceLineNo">732</span> // Skip split parent region<a name="line.732"></a>
+<span class="sourceLineNo">733</span> if (ri.isSplitParent()) {<a name="line.733"></a>
<span class="sourceLineNo">734</span> continue;<a name="line.734"></a>
<span class="sourceLineNo">735</span> }<a name="line.735"></a>
-<span class="sourceLineNo">736</span> RegionState rs = this.services.getAssignmentManager().getRegionStates().getRegionState(ri);<a name="line.736"></a>
-<span class="sourceLineNo">737</span> if (rs == null || rs.isClosedOrAbnormallyClosed()) {<a name="line.737"></a>
-<span class="sourceLineNo">738</span> // If closed against an 'Unknown Server', that is should be fine.<a name="line.738"></a>
-<span class="sourceLineNo">739</span> continue;<a name="line.739"></a>
-<span class="sourceLineNo">740</span> }<a name="line.740"></a>
-<span class="sourceLineNo">741</span> ServerManager.ServerLiveState state = this.services.getServerManager().<a name="line.741"></a>
-<span class="sourceLineNo">742</span> isServerKnownAndOnline(sn);<a name="line.742"></a>
-<span class="sourceLineNo">743</span> switch (state) {<a name="line.743"></a>
-<span class="sourceLineNo">744</span> case UNKNOWN:<a name="line.744"></a>
-<span class="sourceLineNo">745</span> this.report.unknownServers.add(new Pair<>(ri, sn));<a name="line.745"></a>
-<span class="sourceLineNo">746</span> break;<a name="line.746"></a>
-<span class="sourceLineNo">747</span><a name="line.747"></a>
-<span class="sourceLineNo">748</span> default:<a name="line.748"></a>
-<span class="sourceLineNo">749</span> break;<a name="line.749"></a>
-<span class="sourceLineNo">750</span> }<a name="line.750"></a>
-<span class="sourceLineNo">751</span> }<a name="line.751"></a>
-<span class="sourceLineNo">752</span> }<a name="line.752"></a>
-<span class="sourceLineNo">753</span><a name="line.753"></a>
-<span class="sourceLineNo">754</span> /**<a name="line.754"></a>
-<span class="sourceLineNo">755</span> * @return True iff first row in hbase:meta or if we've broached a new table in hbase:meta<a name="line.755"></a>
-<span class="sourceLineNo">756</span> */<a name="line.756"></a>
-<span class="sourceLineNo">757</span> private boolean isTableTransition(RegionInfo ri) {<a name="line.757"></a>
-<span class="sourceLineNo">758</span> return this.previous == null ||<a name="line.758"></a>
-<span class="sourceLineNo">759</span> !this.previous.getTable().equals(ri.getTable());<a name="line.759"></a>
-<span class="sourceLineNo">760</span> }<a name="line.760"></a>
-<span class="sourceLineNo">761</span><a name="line.761"></a>
-<span class="sourceLineNo">762</span> @Override<a name="line.762"></a>
-<span class="sourceLineNo">763</span> public void close() throws IOException {<a name="line.763"></a>
-<span class="sourceLineNo">764</span> // This is a table transition... after the last region. Check previous.<a name="line.764"></a>
-<span class="sourceLineNo">765</span> // Should be last region. If not, its a hole on end of laster table.<a name="line.765"></a>
-<span class="sourceLineNo">766</span> if (this.previous != null && !this.previous.isLast()) {<a name="line.766"></a>
-<span class="sourceLineNo">767</span> addHole(this.previous, RegionInfo.UNDEFINED);<a name="line.767"></a>
-<span class="sourceLineNo">768</span> }<a name="line.768"></a>
-<span class="sourceLineNo">769</span> this.closed = true;<a name="line.769"></a>
-<span class="sourceLineNo">770</span> }<a name="line.770"></a>
-<span class="sourceLineNo">771</span> }<a name="line.771"></a>
-<span class="sourceLineNo">772</span><a name="line.772"></a>
-<span class="sourceLineNo">773</span> private static void checkLog4jProperties() {<a name="line.773"></a>
-<span class="sourceLineNo">774</span> String filename = "log4j.properties";<a name="line.774"></a>
-<span class="sourceLineNo">775</span> try {<a name="line.775"></a>
-<span class="sourceLineNo">776</span> final InputStream inStream =<a name="line.776"></a>
-<span class="sourceLineNo">777</span> CatalogJanitor.class.getClassLoader().getResourceAsStream(filename);<a name="line.777"></a>
-<span class="sourceLineNo">778</span> if (inStream != null) {<a name="line.778"></a>
-<span class="sourceLineNo">779</span> new Properties().load(inStream);<a name="line.779"></a>
-<span class="sourceLineNo">780</span> } else {<a name="line.780"></a>
-<span class="sourceLineNo">781</span> System.out.println("No " + filename + " on classpath; Add one else no logging output!");<a name="line.781"></a>
-<span class="sourceLineNo">782</span> }<a name="line.782"></a>
-<span class="sourceLineNo">783</span> } catch (IOException e) {<a name="line.783"></a>
-<span class="sourceLineNo">784</span> LOG.error("Log4j check failed", e);<a name="line.784"></a>
-<span class="sourceLineNo">785</span> }<a name="line.785"></a>
-<span class="sourceLineNo">786</span> }<a name="line.786"></a>
-<span class="sourceLineNo">787</span><a name="line.787"></a>
-<span class="sourceLineNo">788</span> /**<a name="line.788"></a>
-<span class="sourceLineNo">789</span> * For testing against a cluster.<a name="line.789"></a>
-<span class="sourceLineNo">790</span> * Doesn't have a MasterServices context so does not report on good vs bad servers.<a name="line.790"></a>
-<span class="sourceLineNo">791</span> */<a name="line.791"></a>
-<span class="sourceLineNo">792</span> public static void main(String [] args) throws IOException {<a name="line.792"></a>
-<span class="sourceLineNo">793</span> checkLog4jProperties();<a name="line.793"></a>
-<span class="sourceLineNo">794</span> ReportMakingVisitor visitor = new ReportMakingVisitor(null);<a name="line.794"></a>
-<span class="sourceLineNo">795</span> Configuration configuration = HBaseConfiguration.create();<a name="line.795"></a>
-<span class="sourceLineNo">796</span> configuration.setBoolean("hbase.defaults.for.version.skip", true);<a name="line.796"></a>
-<span class="sourceLineNo">797</span> try (Connection connection = ConnectionFactory.createConnection(configuration)) {<a name="line.797"></a>
-<span class="sourceLineNo">798</span> /* Used to generate an overlap.<a name="line.798"></a>
-<span class="sourceLineNo">799</span> */<a name="line.799"></a>
-<span class="sourceLineNo">800</span> Get g = new Get(Bytes.toBytes("t2,40,1564119846424.1db8c57d64e0733e0f027aaeae7a0bf0."));<a name="line.800"></a>
-<span class="sourceLineNo">801</span> g.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER);<a name="line.801"></a>
-<span class="sourceLineNo">802</span> try (Table t = connection.getTable(TableName.META_TABLE_NAME)) {<a name="line.802"></a>
-<span class="sourceLineNo">803</span> Result r = t.get(g);<a name="line.803"></a>
-<span class="sourceLineNo">804</span> byte [] row = g.getRow();<a name="line.804"></a>
-<span class="sourceLineNo">805</span> row[row.length - 2] <<= row[row.length - 2];<a name="line.805"></a>
-<span class="sourceLineNo">806</span> Put p = new Put(g.getRow());<a name="line.806"></a>
-<span class="sourceLineNo">807</span> p.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER,<a name="line.807"></a>
-<span class="sourceLineNo">808</span> r.getValue(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER));<a name="line.808"></a>
-<span class="sourceLineNo">809</span> t.put(p);<a name="line.809"></a>
-<span class="sourceLineNo">810</span> }<a name="line.810"></a>
-<span class="sourceLineNo">811</span> MetaTableAccessor.scanMetaForTableRegions(connection, visitor, null);<a name="line.811"></a>
-<span class="sourceLineNo">812</span> Report report = visitor.getReport();<a name="line.812"></a>
-<span class="sourceLineNo">813</span> LOG.info(report != null? report.toString(): "empty");<a name="line.813"></a>
-<span class="sourceLineNo">814</span> }<a name="line.814"></a>
-<span class="sourceLineNo">815</span> }<a name="line.815"></a>
-<span class="sourceLineNo">816</span>}<a name="line.816"></a>
+<span class="sourceLineNo">736</span> // skip the offline regions which belong to disabled table.<a name="line.736"></a>
+<span class="sourceLineNo">737</span> if (isTableDisabled(ri)) {<a name="line.737"></a>
+<span class="sourceLineNo">738</span> continue;<a name="line.738"></a>
+<span class="sourceLineNo">739</span> }<a name="line.739"></a>
+<span class="sourceLineNo">740</span> RegionState rs = this.services.getAssignmentManager().getRegionStates().getRegionState(ri);<a name="line.740"></a>
+<span class="sourceLineNo">741</span> if (rs == null || rs.isClosedOrAbnormallyClosed()) {<a name="line.741"></a>
+<span class="sourceLineNo">742</span> // If closed against an 'Unknown Server', that is should be fine.<a name="line.742"></a>
+<span class="sourceLineNo">743</span> continue;<a name="line.743"></a>
+<span class="sourceLineNo">744</span> }<a name="line.744"></a>
+<span class="sourceLineNo">745</span> ServerManager.ServerLiveState state = this.services.getServerManager().<a name="line.745"></a>
+<span class="sourceLineNo">746</span> isServerKnownAndOnline(sn);<a name="line.746"></a>
+<span class="sourceLineNo">747</span> switch (state) {<a name="line.747"></a>
+<span class="sourceLineNo">748</span> case UNKNOWN:<a name="line.748"></a>
+<span class="sourceLineNo">749</span> this.report.unknownServers.add(new Pair<>(ri, sn));<a name="line.749"></a>
+<span class="sourceLineNo">750</span> break;<a name="line.750"></a>
+<span class="sourceLineNo">751</span><a name="line.751"></a>
+<span class="sourceLineNo">752</span> default:<a name="line.752"></a>
+<span class="sourceLineNo">753</span> break;<a name="line.753"></a>
+<span class="sourceLineNo">754</span> }<a name="line.754"></a>
+<span class="sourceLineNo">755</span> }<a name="line.755"></a>
+<span class="sourceLineNo">756</span> }<a name="line.756"></a>
+<span class="sourceLineNo">757</span><a name="line.757"></a>
+<span class="sourceLineNo">758</span> /**<a name="line.758"></a>
+<span class="sourceLineNo">759</span> * @return True iff first row in hbase:meta or if we've broached a new table in hbase:meta<a name="line.759"></a>
+<span class="sourceLineNo">760</span> */<a name="line.760"></a>
+<span class="sourceLineNo">761</span> private boolean isTableTransition(RegionInfo ri) {<a name="line.761"></a>
+<span class="sourceLineNo">762</span> return this.previous == null ||<a name="line.762"></a>
+<span class="sourceLineNo">763</span> !this.previous.getTable().equals(ri.getTable());<a name="line.763"></a>
+<span class="sourceLineNo">764</span> }<a name="line.764"></a>
+<span class="sourceLineNo">765</span><a name="line.765"></a>
+<span class="sourceLineNo">766</span> @Override<a name="line.766"></a>
+<span class="sourceLineNo">767</span> public void close() throws IOException {<a name="line.767"></a>
+<span class="sourceLineNo">768</span> // This is a table transition... after the last region. Check previous.<a name="line.768"></a>
+<span class="sourceLineNo">769</span> // Should be last region. If not, its a hole on end of laster table.<a name="line.769"></a>
+<span class="sourceLineNo">770</span> if (this.previous != null && !this.previous.isLast()) {<a name="line.770"></a>
+<span class="sourceLineNo">771</span> addHole(this.previous, RegionInfo.UNDEFINED);<a name="line.771"></a>
+<span class="sourceLineNo">772</span> }<a name="line.772"></a>
+<span class="sourceLineNo">773</span> this.closed = true;<a name="line.773"></a>
+<span class="sourceLineNo">774</span> }<a name="line.774"></a>
+<span class="sourceLineNo">775</span> }<a name="line.775"></a>
+<span class="sourceLineNo">776</span><a name="line.776"></a>
+<span class="sourceLineNo">777</span> private static void checkLog4jProperties() {<a name="line.777"></a>
+<span class="sourceLineNo">778</span> String filename = "log4j.properties";<a name="line.778"></a>
+<span class="sourceLineNo">779</span> try {<a name="line.779"></a>
+<span class="sourceLineNo">780</span> final InputStream inStream =<a name="line.780"></a>
+<span class="sourceLineNo">781</span> CatalogJanitor.class.getClassLoader().getResourceAsStream(filename);<a name="line.781"></a>
+<span class="sourceLineNo">782</span> if (inStream != null) {<a name="line.782"></a>
+<span class="sourceLineNo">783</span> new Properties().load(inStream);<a name="line.783"></a>
+<span class="sourceLineNo">784</span> } else {<a name="line.784"></a>
+<span class="sourceLineNo">785</span> System.out.println("No " + filename + " on classpath; Add one else no logging output!");<a name="line.785"></a>
+<span class="sourceLineNo">786</span> }<a name="line.786"></a>
+<span class="sourceLineNo">787</span> } catch (IOException e) {<a name="line.787"></a>
+<span class="sourceLineNo">788</span> LOG.error("Log4j check failed", e);<a name="line.788"></a>
+<span class="sourceLineNo">789</span> }<a name="line.789"></a>
+<span class="sourceLineNo">790</span> }<a name="line.790"></a>
+<span class="sourceLineNo">791</span><a name="line.791"></a>
+<span class="sourceLineNo">792</span> /**<a name="line.792"></a>
+<span class="sourceLineNo">793</span> * For testing against a cluster.<a name="line.793"></a>
+<span class="sourceLineNo">794</span> * Doesn't have a MasterServices context so does not report on good vs bad servers.<a name="line.794"></a>
+<span class="sourceLineNo">795</span> */<a name="line.795"></a>
+<span class="sourceLineNo">796</span> public static void main(String [] args) throws IOException {<a name="line.796"></a>
+<span class="sourceLineNo">797</span> checkLog4jProperties();<a name="line.797"></a>
+<span class="sourceLineNo">798</span> ReportMakingVisitor visitor = new ReportMakingVisitor(null);<a name="line.798"></a>
+<span class="sourceLineNo">799</span> Configuration configuration = HBaseConfiguration.create();<a name="line.799"></a>
+<span class="sourceLineNo">800</span> configuration.setBoolean("hbase.defaults.for.version.skip", true);<a name="line.800"></a>
+<span class="sourceLineNo">801</span> try (Connection connection = ConnectionFactory.createConnection(configuration)) {<a name="line.801"></a>
+<span class="sourceLineNo">802</span> /* Used to generate an overlap.<a name="line.802"></a>
+<span class="sourceLineNo">803</span> */<a name="line.803"></a>
+<span class="sourceLineNo">804</span> Get g = new Get(Bytes.toBytes("t2,40,1564119846424.1db8c57d64e0733e0f027aaeae7a0bf0."));<a name="line.804"></a>
+<span class="sourceLineNo">805</span> g.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER);<a name="line.805"></a>
+<span class="sourceLineNo">806</span> try (Table t = connection.getTable(TableName.META_TABLE_NAME)) {<a name="line.806"></a>
+<span class="sourceLineNo">807</span> Result r = t.get(g);<a name="line.807"></a>
+<span class="sourceLineNo">808</span> byte [] row = g.getRow();<a name="line.808"></a>
+<span class="sourceLineNo">809</span> row[row.length - 2] <<= row[row.length - 2];<a name="line.809"></a>
+<span class="sourceLineNo">810</span> Put p = new Put(g.getRow());<a name="line.810"></a>
+<span class="sourceLineNo">811</span> p.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER,<a name="line.811"></a>
+<span class="sourceLineNo">812</span> r.getValue(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER));<a name="line.812"></a>
+<span class="sourceLineNo">813</span> t.put(p);<a name="line.813"></a>
+<span class="sourceLineNo">814</span> }<a name="line.814"></a>
+<span class="sourceLineNo">815</span> MetaTableAccessor.scanMetaForTableRegions(connection, visitor, null);<a name="line.815"></a>
+<span class="sourceLineNo">816</span> Report report = visitor.getReport();<a name="line.816"></a>
+<span class="sourceLineNo">817</span> LOG.info(report != null? report.toString(): "empty");<a name="line.817"></a>
+<span class="sourceLineNo">818</span> }<a name="line.818"></a>
+<span class="sourceLineNo">819</span> }<a name="line.819"></a>
+<span class="sourceLineNo">820</span>}<a name="line.820"></a>
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html
index fe0853b..8d4383e 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.ReportMakingVisitor.html
@@ -432,396 +432,400 @@
<span class="sourceLineNo">424</span> // It doesn't have merge qualifier, no need to clean<a name="line.424"></a>
<span class="sourceLineNo">425</span> return true;<a name="line.425"></a>
<span class="sourceLineNo">426</span> }<a name="line.426"></a>
-<span class="sourceLineNo">427</span> return cleanMergeRegion(region, parents);<a name="line.427"></a>
-<span class="sourceLineNo">428</span> }<a name="line.428"></a>
-<span class="sourceLineNo">429</span><a name="line.429"></a>
-<span class="sourceLineNo">430</span> /**<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * Report made by ReportMakingVisitor<a name="line.431"></a>
-<span class="sourceLineNo">432</span> */<a name="line.432"></a>
-<span class="sourceLineNo">433</span> public static class Report {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> private final long now = EnvironmentEdgeManager.currentTime();<a name="line.434"></a>
-<span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span> // Keep Map of found split parents. These are candidates for cleanup.<a name="line.436"></a>
-<span class="sourceLineNo">437</span> // Use a comparator that has split parents come before its daughters.<a name="line.437"></a>
-<span class="sourceLineNo">438</span> final Map<RegionInfo, Result> splitParents = new TreeMap<>(new SplitParentFirstComparator());<a name="line.438"></a>
-<span class="sourceLineNo">439</span> final Map<RegionInfo, Result> mergedRegions = new TreeMap<>(RegionInfo.COMPARATOR);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> int count = 0;<a name="line.440"></a>
-<span class="sourceLineNo">441</span><a name="line.441"></a>
-<span class="sourceLineNo">442</span> private final List<Pair<RegionInfo, RegionInfo>> holes = new ArrayList<>();<a name="line.442"></a>
-<span class="sourceLineNo">443</span> private final List<Pair<RegionInfo, RegionInfo>> overlaps = new ArrayList<>();<a name="line.443"></a>
-<span class="sourceLineNo">444</span><a name="line.444"></a>
-<span class="sourceLineNo">445</span> /**<a name="line.445"></a>
-<span class="sourceLineNo">446</span> * TODO: If CatalogJanitor finds an 'Unknown Server', it should 'fix' it by queuing<a name="line.446"></a>
-<span class="sourceLineNo">447</span> * a {@link org.apache.hadoop.hbase.master.procedure.HBCKServerCrashProcedure} for<a name="line.447"></a>
-<span class="sourceLineNo">448</span> * found server for it to clean up meta.<a name="line.448"></a>
-<span class="sourceLineNo">449</span> */<a name="line.449"></a>
-<span class="sourceLineNo">450</span> private final List<Pair<RegionInfo, ServerName>> unknownServers = new ArrayList<>();<a name="line.450"></a>
-<span class="sourceLineNo">451</span><a name="line.451"></a>
-<span class="sourceLineNo">452</span> private final List<byte []> emptyRegionInfo = new ArrayList<>();<a name="line.452"></a>
-<span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span> @VisibleForTesting<a name="line.454"></a>
-<span class="sourceLineNo">455</span> Report() {}<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span> public long getCreateTime() {<a name="line.457"></a>
-<span class="sourceLineNo">458</span> return this.now;<a name="line.458"></a>
-<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">427</span><a name="line.427"></a>
+<span class="sourceLineNo">428</span> // If a parent region is a merged child region and GC has not kicked in/finish its work yet,<a name="line.428"></a>
+<span class="sourceLineNo">429</span> // return false in this case to avoid kicking in a merge, trying later.<a name="line.429"></a>
+<span class="sourceLineNo">430</span> cleanMergeRegion(region, parents);<a name="line.430"></a>
+<span class="sourceLineNo">431</span> return false;<a name="line.431"></a>
+<span class="sourceLineNo">432</span> }<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> /**<a name="line.434"></a>
+<span class="sourceLineNo">435</span> * Report made by ReportMakingVisitor<a name="line.435"></a>
+<span class="sourceLineNo">436</span> */<a name="line.436"></a>
+<span class="sourceLineNo">437</span> public static class Report {<a name="line.437"></a>
+<span class="sourceLineNo">438</span> private final long now = EnvironmentEdgeManager.currentTime();<a name="line.438"></a>
+<span class="sourceLineNo">439</span><a name="line.439"></a>
+<span class="sourceLineNo">440</span> // Keep Map of found split parents. These are candidates for cleanup.<a name="line.440"></a>
+<span class="sourceLineNo">441</span> // Use a comparator that has split parents come before its daughters.<a name="line.441"></a>
+<span class="sourceLineNo">442</span> final Map<RegionInfo, Result> splitParents = new TreeMap<>(new SplitParentFirstComparator());<a name="line.442"></a>
+<span class="sourceLineNo">443</span> final Map<RegionInfo, Result> mergedRegions = new TreeMap<>(RegionInfo.COMPARATOR);<a name="line.443"></a>
+<span class="sourceLineNo">444</span> int count = 0;<a name="line.444"></a>
+<span class="sourceLineNo">445</span><a name="line.445"></a>
+<span class="sourceLineNo">446</span> private final List<Pair<RegionInfo, RegionInfo>> holes = new ArrayList<>();<a name="line.446"></a>
+<span class="sourceLineNo">447</span> private final List<Pair<RegionInfo, RegionInfo>> overlaps = new ArrayList<>();<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span> /**<a name="line.449"></a>
+<span class="sourceLineNo">450</span> * TODO: If CatalogJanitor finds an 'Unknown Server', it should 'fix' it by queuing<a name="line.450"></a>
+<span class="sourceLineNo">451</span> * a {@link org.apache.hadoop.hbase.master.procedure.HBCKServerCrashProcedure} for<a name="line.451"></a>
+<span class="sourceLineNo">452</span> * found server for it to clean up meta.<a name="line.452"></a>
+<span class="sourceLineNo">453</span> */<a name="line.453"></a>
+<span class="sourceLineNo">454</span> private final List<Pair<RegionInfo, ServerName>> unknownServers = new ArrayList<>();<a name="line.454"></a>
+<span class="sourceLineNo">455</span><a name="line.455"></a>
+<span class="sourceLineNo">456</span> private final List<byte []> emptyRegionInfo = new ArrayList<>();<a name="line.456"></a>
+<span class="sourceLineNo">457</span><a name="line.457"></a>
+<span class="sourceLineNo">458</span> @VisibleForTesting<a name="line.458"></a>
+<span class="sourceLineNo">459</span> Report() {}<a name="line.459"></a>
<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span> public List<Pair<RegionInfo, RegionInfo>> getHoles() {<a name="line.461"></a>
-<span class="sourceLineNo">462</span> return this.holes;<a name="line.462"></a>
+<span class="sourceLineNo">461</span> public long getCreateTime() {<a name="line.461"></a>
+<span class="sourceLineNo">462</span> return this.now;<a name="line.462"></a>
<span class="sourceLineNo">463</span> }<a name="line.463"></a>
<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span> /**<a name="line.465"></a>
-<span class="sourceLineNo">466</span> * @return Overlap pairs found as we scanned hbase:meta; ordered by hbase:meta<a name="line.466"></a>
-<span class="sourceLineNo">467</span> * table sort. Pairs of overlaps may have overlap with subsequent pairs.<a name="line.467"></a>
-<span class="sourceLineNo">468</span> * @see MetaFixer#calculateMerges(int, List) where we aggregate overlaps<a name="line.468"></a>
-<span class="sourceLineNo">469</span> * for a single 'merge' call.<a name="line.469"></a>
-<span class="sourceLineNo">470</span> */<a name="line.470"></a>
-<span class="sourceLineNo">471</span> public List<Pair<RegionInfo, RegionInfo>> getOverlaps() {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> return this.overlaps;<a name="line.472"></a>
-<span class="sourceLineNo">473</span> }<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span> public List<Pair<RegionInfo, ServerName>> getUnknownServers() {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> return unknownServers;<a name="line.476"></a>
+<span class="sourceLineNo">465</span> public List<Pair<RegionInfo, RegionInfo>> getHoles() {<a name="line.465"></a>
+<span class="sourceLineNo">466</span> return this.holes;<a name="line.466"></a>
+<span class="sourceLineNo">467</span> }<a name="line.467"></a>
+<span class="sourceLineNo">468</span><a name="line.468"></a>
+<span class="sourceLineNo">469</span> /**<a name="line.469"></a>
+<span class="sourceLineNo">470</span> * @return Overlap pairs found as we scanned hbase:meta; ordered by hbase:meta<a name="line.470"></a>
+<span class="sourceLineNo">471</span> * table sort. Pairs of overlaps may have overlap with subsequent pairs.<a name="line.471"></a>
+<span class="sourceLineNo">472</span> * @see MetaFixer#calculateMerges(int, List) where we aggregate overlaps<a name="line.472"></a>
+<span class="sourceLineNo">473</span> * for a single 'merge' call.<a name="line.473"></a>
+<span class="sourceLineNo">474</span> */<a name="line.474"></a>
+<span class="sourceLineNo">475</span> public List<Pair<RegionInfo, RegionInfo>> getOverlaps() {<a name="line.475"></a>
+<span class="sourceLineNo">476</span> return this.overlaps;<a name="line.476"></a>
<span class="sourceLineNo">477</span> }<a name="line.477"></a>
<span class="sourceLineNo">478</span><a name="line.478"></a>
-<span class="sourceLineNo">479</span> public List<byte[]> getEmptyRegionInfo() {<a name="line.479"></a>
-<span class="sourceLineNo">480</span> return emptyRegionInfo;<a name="line.480"></a>
+<span class="sourceLineNo">479</span> public List<Pair<RegionInfo, ServerName>> getUnknownServers() {<a name="line.479"></a>
+<span class="sourceLineNo">480</span> return unknownServers;<a name="line.480"></a>
<span class="sourceLineNo">481</span> }<a name="line.481"></a>
<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span> /**<a name="line.483"></a>
-<span class="sourceLineNo">484</span> * @return True if an 'empty' lastReport -- no problems found.<a name="line.484"></a>
-<span class="sourceLineNo">485</span> */<a name="line.485"></a>
-<span class="sourceLineNo">486</span> public boolean isEmpty() {<a name="line.486"></a>
-<span class="sourceLineNo">487</span> return this.holes.isEmpty() && this.overlaps.isEmpty() && this.unknownServers.isEmpty() &&<a name="line.487"></a>
-<span class="sourceLineNo">488</span> this.emptyRegionInfo.isEmpty();<a name="line.488"></a>
-<span class="sourceLineNo">489</span> }<a name="line.489"></a>
-<span class="sourceLineNo">490</span><a name="line.490"></a>
-<span class="sourceLineNo">491</span> @Override<a name="line.491"></a>
-<span class="sourceLineNo">492</span> public String toString() {<a name="line.492"></a>
-<span class="sourceLineNo">493</span> StringBuilder sb = new StringBuilder();<a name="line.493"></a>
-<span class="sourceLineNo">494</span> for (Pair<RegionInfo, RegionInfo> p: this.holes) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span> if (sb.length() > 0) {<a name="line.495"></a>
-<span class="sourceLineNo">496</span> sb.append(", ");<a name="line.496"></a>
-<span class="sourceLineNo">497</span> }<a name="line.497"></a>
-<span class="sourceLineNo">498</span> sb.append("hole=").append(p.getFirst().getRegionNameAsString()).append("/").<a name="line.498"></a>
-<span class="sourceLineNo">499</span> append(p.getSecond().getRegionNameAsString());<a name="line.499"></a>
-<span class="sourceLineNo">500</span> }<a name="line.500"></a>
-<span class="sourceLineNo">501</span> for (Pair<RegionInfo, RegionInfo> p: this.overlaps) {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> if (sb.length() > 0) {<a name="line.502"></a>
-<span class="sourceLineNo">503</span> sb.append(", ");<a name="line.503"></a>
-<span class="sourceLineNo">504</span> }<a name="line.504"></a>
-<span class="sourceLineNo">505</span> sb.append("overlap=").append(p.getFirst().getRegionNameAsString()).append("/").<a name="line.505"></a>
-<span class="sourceLineNo">506</span> append(p.getSecond().getRegionNameAsString());<a name="line.506"></a>
-<span class="sourceLineNo">507</span> }<a name="line.507"></a>
-<span class="sourceLineNo">508</span> for (byte [] r: this.emptyRegionInfo) {<a name="line.508"></a>
-<span class="sourceLineNo">509</span> if (sb.length() > 0) {<a name="line.509"></a>
-<span class="sourceLineNo">510</span> sb.append(", ");<a name="line.510"></a>
-<span class="sourceLineNo">511</span> }<a name="line.511"></a>
-<span class="sourceLineNo">512</span> sb.append("empty=").append(Bytes.toStringBinary(r));<a name="line.512"></a>
-<span class="sourceLineNo">513</span> }<a name="line.513"></a>
-<span class="sourceLineNo">514</span> for (Pair<RegionInfo, ServerName> p: this.unknownServers) {<a name="line.514"></a>
-<span class="sourceLineNo">515</span> if (sb.length() > 0) {<a name="line.515"></a>
-<span class="sourceLineNo">516</span> sb.append(", ");<a name="line.516"></a>
-<span class="sourceLineNo">517</span> }<a name="line.517"></a>
-<span class="sourceLineNo">518</span> sb.append("unknown_server=").append(p.getSecond()).append("/").<a name="line.518"></a>
-<span class="sourceLineNo">519</span> append(p.getFirst().getRegionNameAsString());<a name="line.519"></a>
-<span class="sourceLineNo">520</span> }<a name="line.520"></a>
-<span class="sourceLineNo">521</span> return sb.toString();<a name="line.521"></a>
-<span class="sourceLineNo">522</span> }<a name="line.522"></a>
-<span class="sourceLineNo">523</span> }<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span> /**<a name="line.525"></a>
-<span class="sourceLineNo">526</span> * Visitor we use in here in CatalogJanitor to go against hbase:meta table.<a name="line.526"></a>
-<span class="sourceLineNo">527</span> * Generates a Report made of a collection of split parents and counts of rows<a name="line.527"></a>
-<span class="sourceLineNo">528</span> * in the hbase:meta table. Also runs hbase:meta consistency checks to<a name="line.528"></a>
-<span class="sourceLineNo">529</span> * generate more report. Report is NOT ready until after this visitor has been<a name="line.529"></a>
-<span class="sourceLineNo">530</span> * {@link #close()}'d.<a name="line.530"></a>
-<span class="sourceLineNo">531</span> */<a name="line.531"></a>
-<span class="sourceLineNo">532</span> static class ReportMakingVisitor implements MetaTableAccessor.CloseableVisitor {<a name="line.532"></a>
-<span class="sourceLineNo">533</span> private final MasterServices services;<a name="line.533"></a>
-<span class="sourceLineNo">534</span> private volatile boolean closed;<a name="line.534"></a>
-<span class="sourceLineNo">535</span><a name="line.535"></a>
-<span class="sourceLineNo">536</span> /**<a name="line.536"></a>
-<span class="sourceLineNo">537</span> * Report is not done until after the close has been called.<a name="line.537"></a>
-<span class="sourceLineNo">538</span> * @see #close()<a name="line.538"></a>
-<span class="sourceLineNo">539</span> * @see #getReport()<a name="line.539"></a>
-<span class="sourceLineNo">540</span> */<a name="line.540"></a>
-<span class="sourceLineNo">541</span> private Report report = new Report();<a name="line.541"></a>
-<span class="sourceLineNo">542</span><a name="line.542"></a>
-<span class="sourceLineNo">543</span> /**<a name="line.543"></a>
-<span class="sourceLineNo">544</span> * RegionInfo from previous row.<a name="line.544"></a>
-<span class="sourceLineNo">545</span> */<a name="line.545"></a>
-<span class="sourceLineNo">546</span> private RegionInfo previous = null;<a name="line.546"></a>
-<span class="sourceLineNo">547</span><a name="line.547"></a>
-<span class="sourceLineNo">548</span> /**<a name="line.548"></a>
-<span class="sourceLineNo">549</span> * Keep account of the highest end key seen as we move through hbase:meta.<a name="line.549"></a>
-<span class="sourceLineNo">550</span> * Usually, the current RegionInfo has the highest end key but if an overlap,<a name="line.550"></a>
-<span class="sourceLineNo">551</span> * this may no longer hold. An overlap may be a region with startkey 'd' and<a name="line.551"></a>
-<span class="sourceLineNo">552</span> * endkey 'g'. The next region in meta may be 'e' to 'f' and then 'f' to 'g'.<a name="line.552"></a>
-<span class="sourceLineNo">553</span> * Looking at previous and current meta row, we won't know about the 'd' to 'g'<a name="line.553"></a>
-<span class="sourceLineNo">554</span> * overlap unless we keep a running 'highest-endpoint-seen'.<a name="line.554"></a>
-<span class="sourceLineNo">555</span> */<a name="line.555"></a>
-<span class="sourceLineNo">556</span> private RegionInfo highestEndKeyRegionInfo = null;<a name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span> ReportMakingVisitor(MasterServices services) {<a name="line.558"></a>
-<span class="sourceLineNo">559</span> this.services = services;<a name="line.559"></a>
-<span class="sourceLineNo">560</span> }<a name="line.560"></a>
+<span class="sourceLineNo">483</span> public List<byte[]> getEmptyRegionInfo() {<a name="line.483"></a>
+<span class="sourceLineNo">484</span> return emptyRegionInfo;<a name="line.484"></a>
+<span class="sourceLineNo">485</span> }<a name="line.485"></a>
+<span class="sourceLineNo">486</span><a name="line.486"></a>
+<span class="sourceLineNo">487</span> /**<a name="line.487"></a>
+<span class="sourceLineNo">488</span> * @return True if an 'empty' lastReport -- no problems found.<a name="line.488"></a>
+<span class="sourceLineNo">489</span> */<a name="line.489"></a>
+<span class="sourceLineNo">490</span> public boolean isEmpty() {<a name="line.490"></a>
+<span class="sourceLineNo">491</span> return this.holes.isEmpty() && this.overlaps.isEmpty() && this.unknownServers.isEmpty() &&<a name="line.491"></a>
+<span class="sourceLineNo">492</span> this.emptyRegionInfo.isEmpty();<a name="line.492"></a>
+<span class="sourceLineNo">493</span> }<a name="line.493"></a>
+<span class="sourceLineNo">494</span><a name="line.494"></a>
+<span class="sourceLineNo">495</span> @Override<a name="line.495"></a>
+<span class="sourceLineNo">496</span> public String toString() {<a name="line.496"></a>
+<span class="sourceLineNo">497</span> StringBuilder sb = new StringBuilder();<a name="line.497"></a>
+<span class="sourceLineNo">498</span> for (Pair<RegionInfo, RegionInfo> p: this.holes) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span> if (sb.length() > 0) {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> sb.append(", ");<a name="line.500"></a>
+<span class="sourceLineNo">501</span> }<a name="line.501"></a>
+<span class="sourceLineNo">502</span> sb.append("hole=").append(p.getFirst().getRegionNameAsString()).append("/").<a name="line.502"></a>
+<span class="sourceLineNo">503</span> append(p.getSecond().getRegionNameAsString());<a name="line.503"></a>
+<span class="sourceLineNo">504</span> }<a name="line.504"></a>
+<span class="sourceLineNo">505</span> for (Pair<RegionInfo, RegionInfo> p: this.overlaps) {<a name="line.505"></a>
+<span class="sourceLineNo">506</span> if (sb.length() > 0) {<a name="line.506"></a>
+<span class="sourceLineNo">507</span> sb.append(", ");<a name="line.507"></a>
+<span class="sourceLineNo">508</span> }<a name="line.508"></a>
+<span class="sourceLineNo">509</span> sb.append("overlap=").append(p.getFirst().getRegionNameAsString()).append("/").<a name="line.509"></a>
+<span class="sourceLineNo">510</span> append(p.getSecond().getRegionNameAsString());<a name="line.510"></a>
+<span class="sourceLineNo">511</span> }<a name="line.511"></a>
+<span class="sourceLineNo">512</span> for (byte [] r: this.emptyRegionInfo) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> if (sb.length() > 0) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span> sb.append(", ");<a name="line.514"></a>
+<span class="sourceLineNo">515</span> }<a name="line.515"></a>
+<span class="sourceLineNo">516</span> sb.append("empty=").append(Bytes.toStringBinary(r));<a name="line.516"></a>
+<span class="sourceLineNo">517</span> }<a name="line.517"></a>
+<span class="sourceLineNo">518</span> for (Pair<RegionInfo, ServerName> p: this.unknownServers) {<a name="line.518"></a>
+<span class="sourceLineNo">519</span> if (sb.length() > 0) {<a name="line.519"></a>
+<span class="sourceLineNo">520</span> sb.append(", ");<a name="line.520"></a>
+<span class="sourceLineNo">521</span> }<a name="line.521"></a>
+<span class="sourceLineNo">522</span> sb.append("unknown_server=").append(p.getSecond()).append("/").<a name="line.522"></a>
+<span class="sourceLineNo">523</span> append(p.getFirst().getRegionNameAsString());<a name="line.523"></a>
+<span class="sourceLineNo">524</span> }<a name="line.524"></a>
+<span class="sourceLineNo">525</span> return sb.toString();<a name="line.525"></a>
+<span class="sourceLineNo">526</span> }<a name="line.526"></a>
+<span class="sourceLineNo">527</span> }<a name="line.527"></a>
+<span class="sourceLineNo">528</span><a name="line.528"></a>
+<span class="sourceLineNo">529</span> /**<a name="line.529"></a>
+<span class="sourceLineNo">530</span> * Visitor we use in here in CatalogJanitor to go against hbase:meta table.<a name="line.530"></a>
+<span class="sourceLineNo">531</span> * Generates a Report made of a collection of split parents and counts of rows<a name="line.531"></a>
+<span class="sourceLineNo">532</span> * in the hbase:meta table. Also runs hbase:meta consistency checks to<a name="line.532"></a>
+<span class="sourceLineNo">533</span> * generate more report. Report is NOT ready until after this visitor has been<a name="line.533"></a>
+<span class="sourceLineNo">534</span> * {@link #close()}'d.<a name="line.534"></a>
+<span class="sourceLineNo">535</span> */<a name="line.535"></a>
+<span class="sourceLineNo">536</span> static class ReportMakingVisitor implements MetaTableAccessor.CloseableVisitor {<a name="line.536"></a>
+<span class="sourceLineNo">537</span> private final MasterServices services;<a name="line.537"></a>
+<span class="sourceLineNo">538</span> private volatile boolean closed;<a name="line.538"></a>
+<span class="sourceLineNo">539</span><a name="line.539"></a>
+<span class="sourceLineNo">540</span> /**<a name="line.540"></a>
+<span class="sourceLineNo">541</span> * Report is not done until after the close has been called.<a name="line.541"></a>
+<span class="sourceLineNo">542</span> * @see #close()<a name="line.542"></a>
+<span class="sourceLineNo">543</span> * @see #getReport()<a name="line.543"></a>
+<span class="sourceLineNo">544</span> */<a name="line.544"></a>
+<span class="sourceLineNo">545</span> private Report report = new Report();<a name="line.545"></a>
+<span class="sourceLineNo">546</span><a name="line.546"></a>
+<span class="sourceLineNo">547</span> /**<a name="line.547"></a>
+<span class="sourceLineNo">548</span> * RegionInfo from previous row.<a name="line.548"></a>
+<span class="sourceLineNo">549</span> */<a name="line.549"></a>
+<span class="sourceLineNo">550</span> private RegionInfo previous = null;<a name="line.550"></a>
+<span class="sourceLineNo">551</span><a name="line.551"></a>
+<span class="sourceLineNo">552</span> /**<a name="line.552"></a>
+<span class="sourceLineNo">553</span> * Keep account of the highest end key seen as we move through hbase:meta.<a name="line.553"></a>
+<span class="sourceLineNo">554</span> * Usually, the current RegionInfo has the highest end key but if an overlap,<a name="line.554"></a>
+<span class="sourceLineNo">555</span> * this may no longer hold. An overlap may be a region with startkey 'd' and<a name="line.555"></a>
+<span class="sourceLineNo">556</span> * endkey 'g'. The next region in meta may be 'e' to 'f' and then 'f' to 'g'.<a name="line.556"></a>
+<span class="sourceLineNo">557</span> * Looking at previous and current meta row, we won't know about the 'd' to 'g'<a name="line.557"></a>
+<span class="sourceLineNo">558</span> * overlap unless we keep a running 'highest-endpoint-seen'.<a name="line.558"></a>
+<span class="sourceLineNo">559</span> */<a name="line.559"></a>
+<span class="sourceLineNo">560</span> private RegionInfo highestEndKeyRegionInfo = null;<a name="line.560"></a>
<span class="sourceLineNo">561</span><a name="line.561"></a>
-<span class="sourceLineNo">562</span> /**<a name="line.562"></a>
-<span class="sourceLineNo">563</span> * Do not call until after {@link #close()}.<a name="line.563"></a>
-<span class="sourceLineNo">564</span> * Will throw a {@link RuntimeException} if you do.<a name="line.564"></a>
-<span class="sourceLineNo">565</span> */<a name="line.565"></a>
-<span class="sourceLineNo">566</span> Report getReport() {<a name="line.566"></a>
-<span class="sourceLineNo">567</span> if (!this.closed) {<a name="line.567"></a>
-<span class="sourceLineNo">568</span> throw new RuntimeException("Report not ready until after close()");<a name="line.568"></a>
-<span class="sourceLineNo">569</span> }<a name="line.569"></a>
-<span class="sourceLineNo">570</span> return this.report;<a name="line.570"></a>
-<span class="sourceLineNo">571</span> }<a name="line.571"></a>
-<span class="sourceLineNo">572</span><a name="line.572"></a>
-<span class="sourceLineNo">573</span> @Override<a name="line.573"></a>
-<span class="sourceLineNo">574</span> public boolean visit(Result r) {<a name="line.574"></a>
-<span class="sourceLineNo">575</span> if (r == null || r.isEmpty()) {<a name="line.575"></a>
-<span class="sourceLineNo">576</span> return true;<a name="line.576"></a>
-<span class="sourceLineNo">577</span> }<a name="line.577"></a>
-<span class="sourceLineNo">578</span> this.report.count++;<a name="line.578"></a>
-<span class="sourceLineNo">579</span> RegionInfo regionInfo = null;<a name="line.579"></a>
-<span class="sourceLineNo">580</span> try {<a name="line.580"></a>
-<span class="sourceLineNo">581</span> regionInfo = metaTableConsistencyCheck(r);<a name="line.581"></a>
-<span class="sourceLineNo">582</span> } catch(Throwable t) {<a name="line.582"></a>
-<span class="sourceLineNo">583</span> LOG.warn("Failed consistency check on {}", Bytes.toStringBinary(r.getRow()), t);<a name="line.583"></a>
-<span class="sourceLineNo">584</span> }<a name="line.584"></a>
-<span class="sourceLineNo">585</span> if (regionInfo != null) {<a name="line.585"></a>
-<span class="sourceLineNo">586</span> LOG.trace(regionInfo.toString());<a name="line.586"></a>
-<span class="sourceLineNo">587</span> if (regionInfo.isSplitParent()) { // splitParent means split and offline.<a name="line.587"></a>
-<span class="sourceLineNo">588</span> this.report.splitParents.put(regionInfo, r);<a name="line.588"></a>
-<span class="sourceLineNo">589</span> }<a name="line.589"></a>
-<span class="sourceLineNo">590</span> if (MetaTableAccessor.hasMergeRegions(r.rawCells())) {<a name="line.590"></a>
-<span class="sourceLineNo">591</span> this.report.mergedRegions.put(regionInfo, r);<a name="line.591"></a>
-<span class="sourceLineNo">592</span> }<a name="line.592"></a>
-<span class="sourceLineNo">593</span> }<a name="line.593"></a>
-<span class="sourceLineNo">594</span> // Returning true means "keep scanning"<a name="line.594"></a>
-<span class="sourceLineNo">595</span> return true;<a name="line.595"></a>
-<span class="sourceLineNo">596</span> }<a name="line.596"></a>
-<span class="sourceLineNo">597</span><a name="line.597"></a>
-<span class="sourceLineNo">598</span> /**<a name="line.598"></a>
-<span class="sourceLineNo">599</span> * Check row.<a name="line.599"></a>
-<span class="sourceLineNo">600</span> * @param metaTableRow Row from hbase:meta table.<a name="line.600"></a>
-<span class="sourceLineNo">601</span> * @return Returns default regioninfo found in row parse as a convenience to save<a name="line.601"></a>
-<span class="sourceLineNo">602</span> * on having to do a double-parse of Result.<a name="line.602"></a>
-<span class="sourceLineNo">603</span> */<a name="line.603"></a>
-<span class="sourceLineNo">604</span> private RegionInfo metaTableConsistencyCheck(Result metaTableRow) {<a name="line.604"></a>
-<span class="sourceLineNo">605</span> RegionInfo ri;<a name="line.605"></a>
-<span class="sourceLineNo">606</span> // Locations comes back null if the RegionInfo field is empty.<a name="line.606"></a>
-<span class="sourceLineNo">607</span> // If locations is null, ensure the regioninfo is for sure empty before progressing.<a name="line.607"></a>
-<span class="sourceLineNo">608</span> // If really empty, report as missing regioninfo! Otherwise, can run server check<a name="line.608"></a>
-<span class="sourceLineNo">609</span> // and get RegionInfo from locations.<a name="line.609"></a>
-<span class="sourceLineNo">610</span> RegionLocations locations = MetaTableAccessor.getRegionLocations(metaTableRow);<a name="line.610"></a>
-<span class="sourceLineNo">611</span> if (locations == null) {<a name="line.611"></a>
-<span class="sourceLineNo">612</span> ri = MetaTableAccessor.getRegionInfo(metaTableRow,<a name="line.612"></a>
-<span class="sourceLineNo">613</span> MetaTableAccessor.getRegionInfoColumn());<a name="line.613"></a>
-<span class="sourceLineNo">614</span> } else {<a name="line.614"></a>
-<span class="sourceLineNo">615</span> ri = locations.getDefaultRegionLocation().getRegion();<a name="line.615"></a>
-<span class="sourceLineNo">616</span> checkServer(locations);<a name="line.616"></a>
-<span class="sourceLineNo">617</span> }<a name="line.617"></a>
-<span class="sourceLineNo">618</span><a name="line.618"></a>
-<span class="sourceLineNo">619</span> if (ri == null) {<a name="line.619"></a>
-<span class="sourceLineNo">620</span> this.report.emptyRegionInfo.add(metaTableRow.getRow());<a name="line.620"></a>
-<span class="sourceLineNo">621</span> return ri;<a name="line.621"></a>
-<span class="sourceLineNo">622</span> }<a name="line.622"></a>
-<span class="sourceLineNo">623</span><a name="line.623"></a>
-<span class="sourceLineNo">624</span> if (!Bytes.equals(metaTableRow.getRow(), ri.getRegionName())) {<a name="line.624"></a>
-<span class="sourceLineNo">625</span> LOG.warn("INCONSISTENCY: Row name is not equal to serialized info:regioninfo content; " +<a name="line.625"></a>
-<span class="sourceLineNo">626</span> "row={} {}; See if RegionInfo is referenced in another hbase:meta row? Delete?",<a name="line.626"></a>
-<span class="sourceLineNo">627</span> Bytes.toStringBinary(metaTableRow.getRow()), ri.getRegionNameAsString());<a name="line.627"></a>
-<span class="sourceLineNo">628</span> return null;<a name="line.628"></a>
-<span class="sourceLineNo">629</span> }<a name="line.629"></a>
-<span class="sourceLineNo">630</span> // Skip split parent region<a name="line.630"></a>
-<span class="sourceLineNo">631</span> if (ri.isSplitParent()) {<a name="line.631"></a>
-<span class="sourceLineNo">632</span> return ri;<a name="line.632"></a>
+<span class="sourceLineNo">562</span> ReportMakingVisitor(MasterServices services) {<a name="line.562"></a>
+<span class="sourceLineNo">563</span> this.services = services;<a name="line.563"></a>
+<span class="sourceLineNo">564</span> }<a name="line.564"></a>
+<span class="sourceLineNo">565</span><a name="line.565"></a>
+<span class="sourceLineNo">566</span> /**<a name="line.566"></a>
+<span class="sourceLineNo">567</span> * Do not call until after {@link #close()}.<a name="line.567"></a>
+<span class="sourceLineNo">568</span> * Will throw a {@link RuntimeException} if you do.<a name="line.568"></a>
+<span class="sourceLineNo">569</span> */<a name="line.569"></a>
+<span class="sourceLineNo">570</span> Report getReport() {<a name="line.570"></a>
+<span class="sourceLineNo">571</span> if (!this.closed) {<a name="line.571"></a>
+<span class="sourceLineNo">572</span> throw new RuntimeException("Report not ready until after close()");<a name="line.572"></a>
+<span class="sourceLineNo">573</span> }<a name="line.573"></a>
+<span class="sourceLineNo">574</span> return this.report;<a name="line.574"></a>
+<span class="sourceLineNo">575</span> }<a name="line.575"></a>
+<span class="sourceLineNo">576</span><a name="line.576"></a>
+<span class="sourceLineNo">577</span> @Override<a name="line.577"></a>
+<span class="sourceLineNo">578</span> public boolean visit(Result r) {<a name="line.578"></a>
+<span class="sourceLineNo">579</span> if (r == null || r.isEmpty()) {<a name="line.579"></a>
+<span class="sourceLineNo">580</span> return true;<a name="line.580"></a>
+<span class="sourceLineNo">581</span> }<a name="line.581"></a>
+<span class="sourceLineNo">582</span> this.report.count++;<a name="line.582"></a>
+<span class="sourceLineNo">583</span> RegionInfo regionInfo = null;<a name="line.583"></a>
+<span class="sourceLineNo">584</span> try {<a name="line.584"></a>
+<span class="sourceLineNo">585</span> regionInfo = metaTableConsistencyCheck(r);<a name="line.585"></a>
+<span class="sourceLineNo">586</span> } catch(Throwable t) {<a name="line.586"></a>
+<span class="sourceLineNo">587</span> LOG.warn("Failed consistency check on {}", Bytes.toStringBinary(r.getRow()), t);<a name="line.587"></a>
+<span class="sourceLineNo">588</span> }<a name="line.588"></a>
+<span class="sourceLineNo">589</span> if (regionInfo != null) {<a name="line.589"></a>
+<span class="sourceLineNo">590</span> LOG.trace(regionInfo.toString());<a name="line.590"></a>
+<span class="sourceLineNo">591</span> if (regionInfo.isSplitParent()) { // splitParent means split and offline.<a name="line.591"></a>
+<span class="sourceLineNo">592</span> this.report.splitParents.put(regionInfo, r);<a name="line.592"></a>
+<span class="sourceLineNo">593</span> }<a name="line.593"></a>
+<span class="sourceLineNo">594</span> if (MetaTableAccessor.hasMergeRegions(r.rawCells())) {<a name="line.594"></a>
+<span class="sourceLineNo">595</span> this.report.mergedRegions.put(regionInfo, r);<a name="line.595"></a>
+<span class="sourceLineNo">596</span> }<a name="line.596"></a>
+<span class="sourceLineNo">597</span> }<a name="line.597"></a>
+<span class="sourceLineNo">598</span> // Returning true means "keep scanning"<a name="line.598"></a>
+<span class="sourceLineNo">599</span> return true;<a name="line.599"></a>
+<span class="sourceLineNo">600</span> }<a name="line.600"></a>
+<span class="sourceLineNo">601</span><a name="line.601"></a>
+<span class="sourceLineNo">602</span> /**<a name="line.602"></a>
+<span class="sourceLineNo">603</span> * Check row.<a name="line.603"></a>
+<span class="sourceLineNo">604</span> * @param metaTableRow Row from hbase:meta table.<a name="line.604"></a>
+<span class="sourceLineNo">605</span> * @return Returns default regioninfo found in row parse as a convenience to save<a name="line.605"></a>
+<span class="sourceLineNo">606</span> * on having to do a double-parse of Result.<a name="line.606"></a>
+<span class="sourceLineNo">607</span> */<a name="line.607"></a>
+<span class="sourceLineNo">608</span> private RegionInfo metaTableConsistencyCheck(Result metaTableRow) {<a name="line.608"></a>
+<span class="sourceLineNo">609</span> RegionInfo ri;<a name="line.609"></a>
+<span class="sourceLineNo">610</span> // Locations comes back null if the RegionInfo field is empty.<a name="line.610"></a>
+<span class="sourceLineNo">611</span> // If locations is null, ensure the regioninfo is for sure empty before progressing.<a name="line.611"></a>
+<span class="sourceLineNo">612</span> // If really empty, report as missing regioninfo! Otherwise, can run server check<a name="line.612"></a>
+<span class="sourceLineNo">613</span> // and get RegionInfo from locations.<a name="line.613"></a>
+<span class="sourceLineNo">614</span> RegionLocations locations = MetaTableAccessor.getRegionLocations(metaTableRow);<a name="line.614"></a>
+<span class="sourceLineNo">615</span> if (locations == null) {<a name="line.615"></a>
+<span class="sourceLineNo">616</span> ri = MetaTableAccessor.getRegionInfo(metaTableRow,<a name="line.616"></a>
+<span class="sourceLineNo">617</span> MetaTableAccessor.getRegionInfoColumn());<a name="line.617"></a>
+<span class="sourceLineNo">618</span> } else {<a name="line.618"></a>
+<span class="sourceLineNo">619</span> ri = locations.getDefaultRegionLocation().getRegion();<a name="line.619"></a>
+<span class="sourceLineNo">620</span> checkServer(locations);<a name="line.620"></a>
+<span class="sourceLineNo">621</span> }<a name="line.621"></a>
+<span class="sourceLineNo">622</span><a name="line.622"></a>
+<span class="sourceLineNo">623</span> if (ri == null) {<a name="line.623"></a>
+<span class="sourceLineNo">624</span> this.report.emptyRegionInfo.add(metaTableRow.getRow());<a name="line.624"></a>
+<span class="sourceLineNo">625</span> return ri;<a name="line.625"></a>
+<span class="sourceLineNo">626</span> }<a name="line.626"></a>
+<span class="sourceLineNo">627</span><a name="line.627"></a>
+<span class="sourceLineNo">628</span> if (!Bytes.equals(metaTableRow.getRow(), ri.getRegionName())) {<a name="line.628"></a>
+<span class="sourceLineNo">629</span> LOG.warn("INCONSISTENCY: Row name is not equal to serialized info:regioninfo content; " +<a name="line.629"></a>
+<span class="sourceLineNo">630</span> "row={} {}; See if RegionInfo is referenced in another hbase:meta row? Delete?",<a name="line.630"></a>
+<span class="sourceLineNo">631</span> Bytes.toStringBinary(metaTableRow.getRow()), ri.getRegionNameAsString());<a name="line.631"></a>
+<span class="sourceLineNo">632</span> return null;<a name="line.632"></a>
<span class="sourceLineNo">633</span> }<a name="line.633"></a>
-<span class="sourceLineNo">634</span> // If table is disabled, skip integrity check.<a name="line.634"></a>
-<span class="sourceLineNo">635</span> if (!isTableDisabled(ri)) {<a name="line.635"></a>
-<span class="sourceLineNo">636</span> if (isTableTransition(ri)) {<a name="line.636"></a>
-<span class="sourceLineNo">637</span> // On table transition, look to see if last region was last in table<a name="line.637"></a>
-<span class="sourceLineNo">638</span> // and if this is the first. Report 'hole' if neither is true.<a name="line.638"></a>
-<span class="sourceLineNo">639</span> // HBCK1 used to have a special category for missing start or end keys.<a name="line.639"></a>
-<span class="sourceLineNo">640</span> // We'll just lump them in as 'holes'.<a name="line.640"></a>
-<span class="sourceLineNo">641</span> if ((this.previous != null && !this.previous.isLast()) || !ri.isFirst()) {<a name="line.641"></a>
-<span class="sourceLineNo">642</span> addHole(this.previous == null? RegionInfo.UNDEFINED: this.previous, ri);<a name="line.642"></a>
-<span class="sourceLineNo">643</span> }<a name="line.643"></a>
-<span class="sourceLineNo">644</span> } else {<a name="line.644"></a>
-<span class="sourceLineNo">645</span> if (!this.previous.isNext(ri)) {<a name="line.645"></a>
-<span class="sourceLineNo">646</span> if (this.previous.isOverlap(ri)) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span> addOverlap(this.previous, ri);<a name="line.647"></a>
-<span class="sourceLineNo">648</span> } else if (ri.isOverlap(this.highestEndKeyRegionInfo)) {<a name="line.648"></a>
-<span class="sourceLineNo">649</span> // We may have seen a region a few rows back that overlaps this one.<a name="line.649"></a>
-<span class="sourceLineNo">650</span> addOverlap(this.highestEndKeyRegionInfo, ri);<a name="line.650"></a>
-<span class="sourceLineNo">651</span> } else {<a name="line.651"></a>
-<span class="sourceLineNo">652</span> addHole(this.previous, ri);<a name="line.652"></a>
-<span class="sourceLineNo">653</span> }<a name="line.653"></a>
-<span class="sourceLineNo">654</span> } else if (ri.isOverlap(this.highestEndKeyRegionInfo)) {<a name="line.654"></a>
-<span class="sourceLineNo">655</span> // We may have seen a region a few rows back that overlaps this one<a name="line.655"></a>
-<span class="sourceLineNo">656</span> // even though it properly 'follows' the region just before.<a name="line.656"></a>
-<span class="sourceLineNo">657</span> addOverlap(this.highestEndKeyRegionInfo, ri);<a name="line.657"></a>
-<span class="sourceLineNo">658</span> }<a name="line.658"></a>
-<span class="sourceLineNo">659</span> }<a name="line.659"></a>
-<span class="sourceLineNo">660</span> }<a name="line.660"></a>
-<span class="sourceLineNo">661</span> this.previous = ri;<a name="line.661"></a>
-<span class="sourceLineNo">662</span> this.highestEndKeyRegionInfo =<a name="line.662"></a>
-<span class="sourceLineNo">663</span> MetaFixer.getRegionInfoWithLargestEndKey(this.highestEndKeyRegionInfo, ri);<a name="line.663"></a>
-<span class="sourceLineNo">664</span> return ri;<a name="line.664"></a>
-<span class="sourceLineNo">665</span> }<a name="line.665"></a>
-<span class="sourceLineNo">666</span><a name="line.666"></a>
-<span class="sourceLineNo">667</span> private void addOverlap(RegionInfo a, RegionInfo b) {<a name="line.667"></a>
-<span class="sourceLineNo">668</span> this.report.overlaps.add(new Pair<>(a, b));<a name="line.668"></a>
+<span class="sourceLineNo">634</span> // Skip split parent region<a name="line.634"></a>
+<span class="sourceLineNo">635</span> if (ri.isSplitParent()) {<a name="line.635"></a>
+<span class="sourceLineNo">636</span> return ri;<a name="line.636"></a>
+<span class="sourceLineNo">637</span> }<a name="line.637"></a>
+<span class="sourceLineNo">638</span> // If table is disabled, skip integrity check.<a name="line.638"></a>
+<span class="sourceLineNo">639</span> if (!isTableDisabled(ri)) {<a name="line.639"></a>
+<span class="sourceLineNo">640</span> if (isTableTransition(ri)) {<a name="line.640"></a>
+<span class="sourceLineNo">641</span> // On table transition, look to see if last region was last in table<a name="line.641"></a>
+<span class="sourceLineNo">642</span> // and if this is the first. Report 'hole' if neither is true.<a name="line.642"></a>
+<span class="sourceLineNo">643</span> // HBCK1 used to have a special category for missing start or end keys.<a name="line.643"></a>
+<span class="sourceLineNo">644</span> // We'll just lump them in as 'holes'.<a name="line.644"></a>
+<span class="sourceLineNo">645</span> if ((this.previous != null && !this.previous.isLast()) || !ri.isFirst()) {<a name="line.645"></a>
+<span class="sourceLineNo">646</span> addHole(this.previous == null? RegionInfo.UNDEFINED: this.previous, ri);<a name="line.646"></a>
+<span class="sourceLineNo">647</span> }<a name="line.647"></a>
+<span class="sourceLineNo">648</span> } else {<a name="line.648"></a>
+<span class="sourceLineNo">649</span> if (!this.previous.isNext(ri)) {<a name="line.649"></a>
+<span class="sourceLineNo">650</span> if (this.previous.isOverlap(ri)) {<a name="line.650"></a>
+<span class="sourceLineNo">651</span> addOverlap(this.previous, ri);<a name="line.651"></a>
+<span class="sourceLineNo">652</span> } else if (ri.isOverlap(this.highestEndKeyRegionInfo)) {<a name="line.652"></a>
+<span class="sourceLineNo">653</span> // We may have seen a region a few rows back that overlaps this one.<a name="line.653"></a>
+<span class="sourceLineNo">654</span> addOverlap(this.highestEndKeyRegionInfo, ri);<a name="line.654"></a>
+<span class="sourceLineNo">655</span> } else {<a name="line.655"></a>
+<span class="sourceLineNo">656</span> addHole(this.previous, ri);<a name="line.656"></a>
+<span class="sourceLineNo">657</span> }<a name="line.657"></a>
+<span class="sourceLineNo">658</span> } else if (ri.isOverlap(this.highestEndKeyRegionInfo)) {<a name="line.658"></a>
+<span class="sourceLineNo">659</span> // We may have seen a region a few rows back that overlaps this one<a name="line.659"></a>
+<span class="sourceLineNo">660</span> // even though it properly 'follows' the region just before.<a name="line.660"></a>
+<span class="sourceLineNo">661</span> addOverlap(this.highestEndKeyRegionInfo, ri);<a name="line.661"></a>
+<span class="sourceLineNo">662</span> }<a name="line.662"></a>
+<span class="sourceLineNo">663</span> }<a name="line.663"></a>
+<span class="sourceLineNo">664</span> }<a name="line.664"></a>
+<span class="sourceLineNo">665</span> this.previous = ri;<a name="line.665"></a>
+<span class="sourceLineNo">666</span> this.highestEndKeyRegionInfo =<a name="line.666"></a>
+<span class="sourceLineNo">667</span> MetaFixer.getRegionInfoWithLargestEndKey(this.highestEndKeyRegionInfo, ri);<a name="line.667"></a>
+<span class="sourceLineNo">668</span> return ri;<a name="line.668"></a>
<span class="sourceLineNo">669</span> }<a name="line.669"></a>
<span class="sourceLineNo">670</span><a name="line.670"></a>
-<span class="sourceLineNo">671</span> private void addHole(RegionInfo a, RegionInfo b) {<a name="line.671"></a>
-<span class="sourceLineNo">672</span> this.report.holes.add(new Pair<>(a, b));<a name="line.672"></a>
+<span class="sourceLineNo">671</span> private void addOverlap(RegionInfo a, RegionInfo b) {<a name="line.671"></a>
+<span class="sourceLineNo">672</span> this.report.overlaps.add(new Pair<>(a, b));<a name="line.672"></a>
<span class="sourceLineNo">673</span> }<a name="line.673"></a>
<span class="sourceLineNo">674</span><a name="line.674"></a>
-<span class="sourceLineNo">675</span> /**<a name="line.675"></a>
-<span class="sourceLineNo">676</span> * @return True if table is disabled or disabling; defaults false!<a name="line.676"></a>
-<span class="sourceLineNo">677</span> */<a name="line.677"></a>
-<span class="sourceLineNo">678</span> boolean isTableDisabled(RegionInfo ri) {<a name="line.678"></a>
-<span class="sourceLineNo">679</span> if (ri == null) {<a name="line.679"></a>
-<span class="sourceLineNo">680</span> return false;<a name="line.680"></a>
-<span class="sourceLineNo">681</span> }<a name="line.681"></a>
-<span class="sourceLineNo">682</span> if (this.services == null) {<a name="line.682"></a>
-<span class="sourceLineNo">683</span> return false;<a name="line.683"></a>
-<span class="sourceLineNo">684</span> }<a name="line.684"></a>
-<span class="sourceLineNo">685</span> if (this.services.getTableStateManager() == null) {<a name="line.685"></a>
-<span class="sourceLineNo">686</span> return false;<a name="line.686"></a>
-<span class="sourceLineNo">687</span> }<a name="line.687"></a>
-<span class="sourceLineNo">688</span> TableState state = null;<a name="line.688"></a>
-<span class="sourceLineNo">689</span> try {<a name="line.689"></a>
-<span class="sourceLineNo">690</span> state = this.services.getTableStateManager().getTableState(ri.getTable());<a name="line.690"></a>
-<span class="sourceLineNo">691</span> } catch (IOException e) {<a name="line.691"></a>
-<span class="sourceLineNo">692</span> LOG.warn("Failed getting table state", e);<a name="line.692"></a>
-<span class="sourceLineNo">693</span> }<a name="line.693"></a>
-<span class="sourceLineNo">694</span> return state != null && state.isDisabledOrDisabling();<a name="line.694"></a>
-<span class="sourceLineNo">695</span> }<a name="line.695"></a>
-<span class="sourceLineNo">696</span><a name="line.696"></a>
-<span class="sourceLineNo">697</span> /**<a name="line.697"></a>
-<span class="sourceLineNo">698</span> * Run through referenced servers and save off unknown and the dead.<a name="line.698"></a>
-<span class="sourceLineNo">699</span> */<a name="line.699"></a>
-<span class="sourceLineNo">700</span> private void checkServer(RegionLocations locations) {<a name="line.700"></a>
-<span class="sourceLineNo">701</span> if (this.services == null) {<a name="line.701"></a>
-<span class="sourceLineNo">702</span> // Can't do this test if no services.<a name="line.702"></a>
-<span class="sourceLineNo">703</span> return;<a name="line.703"></a>
-<span class="sourceLineNo">704</span> }<a name="line.704"></a>
-<span class="sourceLineNo">705</span> if (locations == null) {<a name="line.705"></a>
-<span class="sourceLineNo">706</span> return;<a name="line.706"></a>
-<span class="sourceLineNo">707</span> }<a name="line.707"></a>
-<span class="sourceLineNo">708</span> if (locations.getRegionLocations() == null) {<a name="line.708"></a>
-<span class="sourceLineNo">709</span> return;<a name="line.709"></a>
-<span class="sourceLineNo">710</span> }<a name="line.710"></a>
-<span class="sourceLineNo">711</span> // Check referenced servers are known/online. Here we are looking<a name="line.711"></a>
-<span class="sourceLineNo">712</span> // at both the default replica -- the main replica -- and then replica<a name="line.712"></a>
-<span class="sourceLineNo">713</span> // locations too.<a name="line.713"></a>
-<span class="sourceLineNo">714</span> for (HRegionLocation location: locations.getRegionLocations()) {<a name="line.714"></a>
-<span class="sourceLineNo">715</span> if (location == null) {<a name="line.715"></a>
-<span class="sourceLineNo">716</span> continue;<a name="line.716"></a>
-<span class="sourceLineNo">717</span> }<a name="line.717"></a>
-<span class="sourceLineNo">718</span> ServerName sn = location.getServerName();<a name="line.718"></a>
-<span class="sourceLineNo">719</span> if (sn == null) {<a name="line.719"></a>
+<span class="sourceLineNo">675</span> private void addHole(RegionInfo a, RegionInfo b) {<a name="line.675"></a>
+<span class="sourceLineNo">676</span> this.report.holes.add(new Pair<>(a, b));<a name="line.676"></a>
+<span class="sourceLineNo">677</span> }<a name="line.677"></a>
+<span class="sourceLineNo">678</span><a name="line.678"></a>
+<span class="sourceLineNo">679</span> /**<a name="line.679"></a>
+<span class="sourceLineNo">680</span> * @return True if table is disabled or disabling; defaults false!<a name="line.680"></a>
+<span class="sourceLineNo">681</span> */<a name="line.681"></a>
+<span class="sourceLineNo">682</span> boolean isTableDisabled(RegionInfo ri) {<a name="line.682"></a>
+<span class="sourceLineNo">683</span> if (ri == null) {<a name="line.683"></a>
+<span class="sourceLineNo">684</span> return false;<a name="line.684"></a>
+<span class="sourceLineNo">685</span> }<a name="line.685"></a>
+<span class="sourceLineNo">686</span> if (this.services == null) {<a name="line.686"></a>
+<span class="sourceLineNo">687</span> return false;<a name="line.687"></a>
+<span class="sourceLineNo">688</span> }<a name="line.688"></a>
+<span class="sourceLineNo">689</span> if (this.services.getTableStateManager() == null) {<a name="line.689"></a>
+<span class="sourceLineNo">690</span> return false;<a name="line.690"></a>
+<span class="sourceLineNo">691</span> }<a name="line.691"></a>
+<span class="sourceLineNo">692</span> TableState state = null;<a name="line.692"></a>
+<span class="sourceLineNo">693</span> try {<a name="line.693"></a>
+<span class="sourceLineNo">694</span> state = this.services.getTableStateManager().getTableState(ri.getTable());<a name="line.694"></a>
+<span class="sourceLineNo">695</span> } catch (IOException e) {<a name="line.695"></a>
+<span class="sourceLineNo">696</span> LOG.warn("Failed getting table state", e);<a name="line.696"></a>
+<span class="sourceLineNo">697</span> }<a name="line.697"></a>
+<span class="sourceLineNo">698</span> return state != null && state.isDisabledOrDisabling();<a name="line.698"></a>
+<span class="sourceLineNo">699</span> }<a name="line.699"></a>
+<span class="sourceLineNo">700</span><a name="line.700"></a>
+<span class="sourceLineNo">701</span> /**<a name="line.701"></a>
+<span class="sourceLineNo">702</span> * Run through referenced servers and save off unknown and the dead.<a name="line.702"></a>
+<span class="sourceLineNo">703</span> */<a name="line.703"></a>
+<span class="sourceLineNo">704</span> private void checkServer(RegionLocations locations) {<a name="line.704"></a>
+<span class="sourceLineNo">705</span> if (this.services == null) {<a name="line.705"></a>
+<span class="sourceLineNo">706</span> // Can't do this test if no services.<a name="line.706"></a>
+<span class="sourceLineNo">707</span> return;<a name="line.707"></a>
+<span class="sourceLineNo">708</span> }<a name="line.708"></a>
+<span class="sourceLineNo">709</span> if (locations == null) {<a name="line.709"></a>
+<span class="sourceLineNo">710</span> return;<a name="line.710"></a>
+<span class="sourceLineNo">711</span> }<a name="line.711"></a>
+<span class="sourceLineNo">712</span> if (locations.getRegionLocations() == null) {<a name="line.712"></a>
+<span class="sourceLineNo">713</span> return;<a name="line.713"></a>
+<span class="sourceLineNo">714</span> }<a name="line.714"></a>
+<span class="sourceLineNo">715</span> // Check referenced servers are known/online. Here we are looking<a name="line.715"></a>
+<span class="sourceLineNo">716</span> // at both the default replica -- the main replica -- and then replica<a name="line.716"></a>
+<span class="sourceLineNo">717</span> // locations too.<a name="line.717"></a>
+<span class="sourceLineNo">718</span> for (HRegionLocation location: locations.getRegionLocations()) {<a name="line.718"></a>
+<span class="sourceLineNo">719</span> if (location == null) {<a name="line.719"></a>
<span class="sourceLineNo">720</span> continue;<a name="line.720"></a>
<span class="sourceLineNo">721</span> }<a name="line.721"></a>
-<span class="sourceLineNo">722</span> if (location.getRegion() == null) {<a name="line.722"></a>
-<span class="sourceLineNo">723</span> LOG.warn("Empty RegionInfo in {}", location);<a name="line.723"></a>
-<span class="sourceLineNo">724</span> // This should never happen but if it does, will mess up below.<a name="line.724"></a>
-<span class="sourceLineNo">725</span> continue;<a name="line.725"></a>
-<span class="sourceLineNo">726</span> }<a name="line.726"></a>
-<span class="sourceLineNo">727</span> RegionInfo ri = location.getRegion();<a name="line.727"></a>
-<span class="sourceLineNo">728</span> // Skip split parent region<a name="line.728"></a>
-<span class="sourceLineNo">729</span> if (ri.isSplitParent()) {<a name="line.729"></a>
-<span class="sourceLineNo">730</span> continue;<a name="line.730"></a>
-<span class="sourceLineNo">731</span> }<a name="line.731"></a>
-<span class="sourceLineNo">732</span> // skip the offline regions which belong to disabled table.<a name="line.732"></a>
-<span class="sourceLineNo">733</span> if (isTableDisabled(ri)) {<a name="line.733"></a>
+<span class="sourceLineNo">722</span> ServerName sn = location.getServerName();<a name="line.722"></a>
+<span class="sourceLineNo">723</span> if (sn == null) {<a name="line.723"></a>
+<span class="sourceLineNo">724</span> continue;<a name="line.724"></a>
+<span class="sourceLineNo">725</span> }<a name="line.725"></a>
+<span class="sourceLineNo">726</span> if (location.getRegion() == null) {<a name="line.726"></a>
+<span class="sourceLineNo">727</span> LOG.warn("Empty RegionInfo in {}", location);<a name="line.727"></a>
+<span class="sourceLineNo">728</span> // This should never happen but if it does, will mess up below.<a name="line.728"></a>
+<span class="sourceLineNo">729</span> continue;<a name="line.729"></a>
+<span class="sourceLineNo">730</span> }<a name="line.730"></a>
+<span class="sourceLineNo">731</span> RegionInfo ri = location.getRegion();<a name="line.731"></a>
+<span class="sourceLineNo">732</span> // Skip split parent region<a name="line.732"></a>
+<span class="sourceLineNo">733</span> if (ri.isSplitParent()) {<a name="line.733"></a>
<span class="sourceLineNo">734</span> continue;<a name="line.734"></a>
<span class="sourceLineNo">735</span> }<a name="line.735"></a>
-<span class="sourceLineNo">736</span> RegionState rs = this.services.getAssignmentManager().getRegionStates().getRegionState(ri);<a name="line.736"></a>
-<span class="sourceLineNo">737</span> if (rs == null || rs.isClosedOrAbnormallyClosed()) {<a name="line.737"></a>
-<span class="sourceLineNo">738</span> // If closed against an 'Unknown Server', that is should be fine.<a name="line.738"></a>
-<span class="sourceLineNo">739</span> continue;<a name="line.739"></a>
-<span class="sourceLineNo">740</span> }<a name="line.740"></a>
-<span class="sourceLineNo">741</span> ServerManager.ServerLiveState state = this.services.getServerManager().<a name="line.741"></a>
-<span class="sourceLineNo">742</span> isServerKnownAndOnline(sn);<a name="line.742"></a>
-<span class="sourceLineNo">743</span> switch (state) {<a name="line.743"></a>
-<span class="sourceLineNo">744</span> case UNKNOWN:<a name="line.744"></a>
-<span class="sourceLineNo">745</span> this.report.unknownServers.add(new Pair<>(ri, sn));<a name="line.745"></a>
-<span class="sourceLineNo">746</span> break;<a name="line.746"></a>
-<span class="sourceLineNo">747</span><a name="line.747"></a>
-<span class="sourceLineNo">748</span> default:<a name="line.748"></a>
-<span class="sourceLineNo">749</span> break;<a name="line.749"></a>
-<span class="sourceLineNo">750</span> }<a name="line.750"></a>
-<span class="sourceLineNo">751</span> }<a name="line.751"></a>
-<span class="sourceLineNo">752</span> }<a name="line.752"></a>
-<span class="sourceLineNo">753</span><a name="line.753"></a>
-<span class="sourceLineNo">754</span> /**<a name="line.754"></a>
-<span class="sourceLineNo">755</span> * @return True iff first row in hbase:meta or if we've broached a new table in hbase:meta<a name="line.755"></a>
-<span class="sourceLineNo">756</span> */<a name="line.756"></a>
-<span class="sourceLineNo">757</span> private boolean isTableTransition(RegionInfo ri) {<a name="line.757"></a>
-<span class="sourceLineNo">758</span> return this.previous == null ||<a name="line.758"></a>
-<span class="sourceLineNo">759</span> !this.previous.getTable().equals(ri.getTable());<a name="line.759"></a>
-<span class="sourceLineNo">760</span> }<a name="line.760"></a>
-<span class="sourceLineNo">761</span><a name="line.761"></a>
-<span class="sourceLineNo">762</span> @Override<a name="line.762"></a>
-<span class="sourceLineNo">763</span> public void close() throws IOException {<a name="line.763"></a>
-<span class="sourceLineNo">764</span> // This is a table transition... after the last region. Check previous.<a name="line.764"></a>
-<span class="sourceLineNo">765</span> // Should be last region. If not, its a hole on end of laster table.<a name="line.765"></a>
-<span class="sourceLineNo">766</span> if (this.previous != null && !this.previous.isLast()) {<a name="line.766"></a>
-<span class="sourceLineNo">767</span> addHole(this.previous, RegionInfo.UNDEFINED);<a name="line.767"></a>
-<span class="sourceLineNo">768</span> }<a name="line.768"></a>
-<span class="sourceLineNo">769</span> this.closed = true;<a name="line.769"></a>
-<span class="sourceLineNo">770</span> }<a name="line.770"></a>
-<span class="sourceLineNo">771</span> }<a name="line.771"></a>
-<span class="sourceLineNo">772</span><a name="line.772"></a>
-<span class="sourceLineNo">773</span> private static void checkLog4jProperties() {<a name="line.773"></a>
-<span class="sourceLineNo">774</span> String filename = "log4j.properties";<a name="line.774"></a>
-<span class="sourceLineNo">775</span> try {<a name="line.775"></a>
-<span class="sourceLineNo">776</span> final InputStream inStream =<a name="line.776"></a>
-<span class="sourceLineNo">777</span> CatalogJanitor.class.getClassLoader().getResourceAsStream(filename);<a name="line.777"></a>
-<span class="sourceLineNo">778</span> if (inStream != null) {<a name="line.778"></a>
-<span class="sourceLineNo">779</span> new Properties().load(inStream);<a name="line.779"></a>
-<span class="sourceLineNo">780</span> } else {<a name="line.780"></a>
-<span class="sourceLineNo">781</span> System.out.println("No " + filename + " on classpath; Add one else no logging output!");<a name="line.781"></a>
-<span class="sourceLineNo">782</span> }<a name="line.782"></a>
-<span class="sourceLineNo">783</span> } catch (IOException e) {<a name="line.783"></a>
-<span class="sourceLineNo">784</span> LOG.error("Log4j check failed", e);<a name="line.784"></a>
-<span class="sourceLineNo">785</span> }<a name="line.785"></a>
-<span class="sourceLineNo">786</span> }<a name="line.786"></a>
-<span class="sourceLineNo">787</span><a name="line.787"></a>
-<span class="sourceLineNo">788</span> /**<a name="line.788"></a>
-<span class="sourceLineNo">789</span> * For testing against a cluster.<a name="line.789"></a>
-<span class="sourceLineNo">790</span> * Doesn't have a MasterServices context so does not report on good vs bad servers.<a name="line.790"></a>
-<span class="sourceLineNo">791</span> */<a name="line.791"></a>
-<span class="sourceLineNo">792</span> public static void main(String [] args) throws IOException {<a name="line.792"></a>
-<span class="sourceLineNo">793</span> checkLog4jProperties();<a name="line.793"></a>
-<span class="sourceLineNo">794</span> ReportMakingVisitor visitor = new ReportMakingVisitor(null);<a name="line.794"></a>
-<span class="sourceLineNo">795</span> Configuration configuration = HBaseConfiguration.create();<a name="line.795"></a>
-<span class="sourceLineNo">796</span> configuration.setBoolean("hbase.defaults.for.version.skip", true);<a name="line.796"></a>
-<span class="sourceLineNo">797</span> try (Connection connection = ConnectionFactory.createConnection(configuration)) {<a name="line.797"></a>
-<span class="sourceLineNo">798</span> /* Used to generate an overlap.<a name="line.798"></a>
-<span class="sourceLineNo">799</span> */<a name="line.799"></a>
-<span class="sourceLineNo">800</span> Get g = new Get(Bytes.toBytes("t2,40,1564119846424.1db8c57d64e0733e0f027aaeae7a0bf0."));<a name="line.800"></a>
-<span class="sourceLineNo">801</span> g.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER);<a name="line.801"></a>
-<span class="sourceLineNo">802</span> try (Table t = connection.getTable(TableName.META_TABLE_NAME)) {<a name="line.802"></a>
-<span class="sourceLineNo">803</span> Result r = t.get(g);<a name="line.803"></a>
-<span class="sourceLineNo">804</span> byte [] row = g.getRow();<a name="line.804"></a>
-<span class="sourceLineNo">805</span> row[row.length - 2] <<= row[row.length - 2];<a name="line.805"></a>
-<span class="sourceLineNo">806</span> Put p = new Put(g.getRow());<a name="line.806"></a>
-<span class="sourceLineNo">807</span> p.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER,<a name="line.807"></a>
-<span class="sourceLineNo">808</span> r.getValue(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER));<a name="line.808"></a>
-<span class="sourceLineNo">809</span> t.put(p);<a name="line.809"></a>
-<span class="sourceLineNo">810</span> }<a name="line.810"></a>
-<span class="sourceLineNo">811</span> MetaTableAccessor.scanMetaForTableRegions(connection, visitor, null);<a name="line.811"></a>
-<span class="sourceLineNo">812</span> Report report = visitor.getReport();<a name="line.812"></a>
-<span class="sourceLineNo">813</span> LOG.info(report != null? report.toString(): "empty");<a name="line.813"></a>
-<span class="sourceLineNo">814</span> }<a name="line.814"></a>
-<span class="sourceLineNo">815</span> }<a name="line.815"></a>
-<span class="sourceLineNo">816</span>}<a name="line.816"></a>
+<span class="sourceLineNo">736</span> // skip the offline regions which belong to disabled table.<a name="line.736"></a>
+<span class="sourceLineNo">737</span> if (isTableDisabled(ri)) {<a name="line.737"></a>
+<span class="sourceLineNo">738</span> continue;<a name="line.738"></a>
+<span class="sourceLineNo">739</span> }<a name="line.739"></a>
+<span class="sourceLineNo">740</span> RegionState rs = this.services.getAssignmentManager().getRegionStates().getRegionState(ri);<a name="line.740"></a>
+<span class="sourceLineNo">741</span> if (rs == null || rs.isClosedOrAbnormallyClosed()) {<a name="line.741"></a>
+<span class="sourceLineNo">742</span> // If closed against an 'Unknown Server', that is should be fine.<a name="line.742"></a>
+<span class="sourceLineNo">743</span> continue;<a name="line.743"></a>
+<span class="sourceLineNo">744</span> }<a name="line.744"></a>
+<span class="sourceLineNo">745</span> ServerManager.ServerLiveState state = this.services.getServerManager().<a name="line.745"></a>
+<span class="sourceLineNo">746</span> isServerKnownAndOnline(sn);<a name="line.746"></a>
+<span class="sourceLineNo">747</span> switch (state) {<a name="line.747"></a>
+<span class="sourceLineNo">748</span> case UNKNOWN:<a name="line.748"></a>
+<span class="sourceLineNo">749</span> this.report.unknownServers.add(new Pair<>(ri, sn));<a name="line.749"></a>
+<span class="sourceLineNo">750</span> break;<a name="line.750"></a>
+<span class="sourceLineNo">751</span><a name="line.751"></a>
+<span class="sourceLineNo">752</span> default:<a name="line.752"></a>
+<span class="sourceLineNo">753</span> break;<a name="line.753"></a>
+<span class="sourceLineNo">754</span> }<a name="line.754"></a>
+<span class="sourceLineNo">755</span> }<a name="line.755"></a>
+<span class="sourceLineNo">756</span> }<a name="line.756"></a>
+<span class="sourceLineNo">757</span><a name="line.757"></a>
+<span class="sourceLineNo">758</span> /**<a name="line.758"></a>
+<span class="sourceLineNo">759</span> * @return True iff first row in hbase:meta or if we've broached a new table in hbase:meta<a name="line.759"></a>
+<span class="sourceLineNo">760</span> */<a name="line.760"></a>
+<span class="sourceLineNo">761</span> private boolean isTableTransition(RegionInfo ri) {<a name="line.761"></a>
+<span class="sourceLineNo">762</span> return this.previous == null ||<a name="line.762"></a>
+<span class="sourceLineNo">763</span> !this.previous.getTable().equals(ri.getTable());<a name="line.763"></a>
+<span class="sourceLineNo">764</span> }<a name="line.764"></a>
+<span class="sourceLineNo">765</span><a name="line.765"></a>
+<span class="sourceLineNo">766</span> @Override<a name="line.766"></a>
+<span class="sourceLineNo">767</span> public void close() throws IOException {<a name="line.767"></a>
+<span class="sourceLineNo">768</span> // This is a table transition... after the last region. Check previous.<a name="line.768"></a>
+<span class="sourceLineNo">769</span> // Should be last region. If not, its a hole on end of laster table.<a name="line.769"></a>
+<span class="sourceLineNo">770</span> if (this.previous != null && !this.previous.isLast()) {<a name="line.770"></a>
+<span class="sourceLineNo">771</span> addHole(this.previous, RegionInfo.UNDEFINED);<a name="line.771"></a>
+<span class="sourceLineNo">772</span> }<a name="line.772"></a>
+<span class="sourceLineNo">773</span> this.closed = true;<a name="line.773"></a>
+<span class="sourceLineNo">774</span> }<a name="line.774"></a>
+<span class="sourceLineNo">775</span> }<a name="line.775"></a>
+<span class="sourceLineNo">776</span><a name="line.776"></a>
+<span class="sourceLineNo">777</span> private static void checkLog4jProperties() {<a name="line.777"></a>
+<span class="sourceLineNo">778</span> String filename = "log4j.properties";<a name="line.778"></a>
+<span class="sourceLineNo">779</span> try {<a name="line.779"></a>
+<span class="sourceLineNo">780</span> final InputStream inStream =<a name="line.780"></a>
+<span class="sourceLineNo">781</span> CatalogJanitor.class.getClassLoader().getResourceAsStream(filename);<a name="line.781"></a>
+<span class="sourceLineNo">782</span> if (inStream != null) {<a name="line.782"></a>
+<span class="sourceLineNo">783</span> new Properties().load(inStream);<a name="line.783"></a>
+<span class="sourceLineNo">784</span> } else {<a name="line.784"></a>
+<span class="sourceLineNo">785</span> System.out.println("No " + filename + " on classpath; Add one else no logging output!");<a name="line.785"></a>
+<span class="sourceLineNo">786</span> }<a name="line.786"></a>
+<span class="sourceLineNo">787</span> } catch (IOException e) {<a name="line.787"></a>
+<span class="sourceLineNo">788</span> LOG.error("Log4j check failed", e);<a name="line.788"></a>
+<span class="sourceLineNo">789</span> }<a name="line.789"></a>
+<span class="sourceLineNo">790</span> }<a name="line.790"></a>
+<span class="sourceLineNo">791</span><a name="line.791"></a>
+<span class="sourceLineNo">792</span> /**<a name="line.792"></a>
+<span class="sourceLineNo">793</span> * For testing against a cluster.<a name="line.793"></a>
+<span class="sourceLineNo">794</span> * Doesn't have a MasterServices context so does not report on good vs bad servers.<a name="line.794"></a>
+<span class="sourceLineNo">795</span> */<a name="line.795"></a>
+<span class="sourceLineNo">796</span> public static void main(String [] args) throws IOException {<a name="line.796"></a>
+<span class="sourceLineNo">797</span> checkLog4jProperties();<a name="line.797"></a>
+<span class="sourceLineNo">798</span> ReportMakingVisitor visitor = new ReportMakingVisitor(null);<a name="line.798"></a>
+<span class="sourceLineNo">799</span> Configuration configuration = HBaseConfiguration.create();<a name="line.799"></a>
+<span class="sourceLineNo">800</span> configuration.setBoolean("hbase.defaults.for.version.skip", true);<a name="line.800"></a>
+<span class="sourceLineNo">801</span> try (Connection connection = ConnectionFactory.createConnection(configuration)) {<a name="line.801"></a>
+<span class="sourceLineNo">802</span> /* Used to generate an overlap.<a name="line.802"></a>
+<span class="sourceLineNo">803</span> */<a name="line.803"></a>
+<span class="sourceLineNo">804</span> Get g = new Get(Bytes.toBytes("t2,40,1564119846424.1db8c57d64e0733e0f027aaeae7a0bf0."));<a name="line.804"></a>
+<span class="sourceLineNo">805</span> g.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER);<a name="line.805"></a>
+<span class="sourceLineNo">806</span> try (Table t = connection.getTable(TableName.META_TABLE_NAME)) {<a name="line.806"></a>
+<span class="sourceLineNo">807</span> Result r = t.get(g);<a name="line.807"></a>
+<span class="sourceLineNo">808</span> byte [] row = g.getRow();<a name="line.808"></a>
+<span class="sourceLineNo">809</span> row[row.length - 2] <<= row[row.length - 2];<a name="line.809"></a>
+<span class="sourceLineNo">810</span> Put p = new Put(g.getRow());<a name="line.810"></a>
+<span class="sourceLineNo">811</span> p.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER,<a name="line.811"></a>
+<span class="sourceLineNo">812</span> r.getValue(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER));<a name="line.812"></a>
+<span class="sourceLineNo">813</span> t.put(p);<a name="line.813"></a>
+<span class="sourceLineNo">814</span> }<a name="line.814"></a>
+<span class="sourceLineNo">815</span> MetaTableAccessor.scanMetaForTableRegions(connection, visitor, null);<a name="line.815"></a>
+<span class="sourceLineNo">816</span> Report report = visitor.getReport();<a name="line.816"></a>
+<span class="sourceLineNo">817</span> LOG.info(report != null? report.toString(): "empty");<a name="line.817"></a>
+<span class="sourceLineNo">818</span> }<a name="line.818"></a>
+<span class="sourceLineNo">819</span> }<a name="line.819"></a>
+<span class="sourceLineNo">820</span>}<a name="line.820"></a>
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.SplitParentFirstComparator.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.SplitParentFirstComparator.html
index fe0853b..8d4383e 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.SplitParentFirstComparator.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.SplitParentFirstComparator.html
@@ -432,396 +432,400 @@
<span class="sourceLineNo">424</span> // It doesn't have merge qualifier, no need to clean<a name="line.424"></a>
<span class="sourceLineNo">425</span> return true;<a name="line.425"></a>
<span class="sourceLineNo">426</span> }<a name="line.426"></a>
-<span class="sourceLineNo">427</span> return cleanMergeRegion(region, parents);<a name="line.427"></a>
-<span class="sourceLineNo">428</span> }<a name="line.428"></a>
-<span class="sourceLineNo">429</span><a name="line.429"></a>
-<span class="sourceLineNo">430</span> /**<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * Report made by ReportMakingVisitor<a name="line.431"></a>
-<span class="sourceLineNo">432</span> */<a name="line.432"></a>
-<span class="sourceLineNo">433</span> public static class Report {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> private final long now = EnvironmentEdgeManager.currentTime();<a name="line.434"></a>
-<span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span> // Keep Map of found split parents. These are candidates for cleanup.<a name="line.436"></a>
-<span class="sourceLineNo">437</span> // Use a comparator that has split parents come before its daughters.<a name="line.437"></a>
-<span class="sourceLineNo">438</span> final Map<RegionInfo, Result> splitParents = new TreeMap<>(new SplitParentFirstComparator());<a name="line.438"></a>
-<span class="sourceLineNo">439</span> final Map<RegionInfo, Result> mergedRegions = new TreeMap<>(RegionInfo.COMPARATOR);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> int count = 0;<a name="line.440"></a>
-<span class="sourceLineNo">441</span><a name="line.441"></a>
-<span class="sourceLineNo">442</span> private final List<Pair<RegionInfo, RegionInfo>> holes = new ArrayList<>();<a name="line.442"></a>
-<span class="sourceLineNo">443</span> private final List<Pair<RegionInfo, RegionInfo>> overlaps = new ArrayList<>();<a name="line.443"></a>
-<span class="sourceLineNo">444</span><a name="line.444"></a>
-<span class="sourceLineNo">445</span> /**<a name="line.445"></a>
-<span class="sourceLineNo">446</span> * TODO: If CatalogJanitor finds an 'Unknown Server', it should 'fix' it by queuing<a name="line.446"></a>
-<span class="sourceLineNo">447</span> * a {@link org.apache.hadoop.hbase.master.procedure.HBCKServerCrashProcedure} for<a name="line.447"></a>
-<span class="sourceLineNo">448</span> * found server for it to clean up meta.<a name="line.448"></a>
-<span class="sourceLineNo">449</span> */<a name="line.449"></a>
-<span class="sourceLineNo">450</span> private final List<Pair<RegionInfo, ServerName>> unknownServers = new ArrayList<>();<a name="line.450"></a>
-<span class="sourceLineNo">451</span><a name="line.451"></a>
-<span class="sourceLineNo">452</span> private final List<byte []> emptyRegionInfo = new ArrayList<>();<a name="line.452"></a>
-<span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span> @VisibleForTesting<a name="line.454"></a>
-<span class="sourceLineNo">455</span> Report() {}<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span> public long getCreateTime() {<a name="line.457"></a>
-<span class="sourceLineNo">458</span> return this.now;<a name="line.458"></a>
-<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">427</span><a name="line.427"></a>
+<span class="sourceLineNo">428</span> // If a parent region is a merged child region and GC has not kicked in/finish its work yet,<a name="line.428"></a>
+<span class="sourceLineNo">429</span> // return false in this case to avoid kicking in a merge, trying later.<a name="line.429"></a>
+<span class="sourceLineNo">430</span> cleanMergeRegion(region, parents);<a name="line.430"></a>
+<span class="sourceLineNo">431</span> return false;<a name="line.431"></a>
+<span class="sourceLineNo">432</span> }<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> /**<a name="line.434"></a>
+<span class="sourceLineNo">435</span> * Report made by ReportMakingVisitor<a name="line.435"></a>
+<span class="sourceLineNo">436</span> */<a name="line.436"></a>
+<span class="sourceLineNo">437</span> public static class Report {<a name="line.437"></a>
+<span class="sourceLineNo">438</span> private final long now = EnvironmentEdgeManager.currentTime();<a name="line.438"></a>
+<span class="sourceLineNo">439</span><a name="line.439"></a>
+<span class="sourceLineNo">440</span> // Keep Map of found split parents. These are candidates for cleanup.<a name="line.440"></a>
+<span class="sourceLineNo">441</span> // Use a comparator that has split parents come before its daughters.<a name="line.441"></a>
+<span class="sourceLineNo">442</span> final Map<RegionInfo, Result> splitParents = new TreeMap<>(new SplitParentFirstComparator());<a name="line.442"></a>
+<span class="sourceLineNo">443</span> final Map<RegionInfo, Result> mergedRegions = new TreeMap<>(RegionInfo.COMPARATOR);<a name="line.443"></a>
+<span class="sourceLineNo">444</span> int count = 0;<a name="line.444"></a>
+<span class="sourceLineNo">445</span><a name="line.445"></a>
+<span class="sourceLineNo">446</span> private final List<Pair<RegionInfo, RegionInfo>> holes = new ArrayList<>();<a name="line.446"></a>
+<span class="sourceLineNo">447</span> private final List<Pair<RegionInfo, RegionInfo>> overlaps = new ArrayList<>();<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span> /**<a name="line.449"></a>
+<span class="sourceLineNo">450</span> * TODO: If CatalogJanitor finds an 'Unknown Server', it should 'fix' it by queuing<a name="line.450"></a>
+<span class="sourceLineNo">451</span> * a {@link org.apache.hadoop.hbase.master.procedure.HBCKServerCrashProcedure} for<a name="line.451"></a>
+<span class="sourceLineNo">452</span> * found server for it to clean up meta.<a name="line.452"></a>
+<span class="sourceLineNo">453</span> */<a name="line.453"></a>
+<span class="sourceLineNo">454</span> private final List<Pair<RegionInfo, ServerName>> unknownServers = new ArrayList<>();<a name="line.454"></a>
+<span class="sourceLineNo">455</span><a name="line.455"></a>
+<span class="sourceLineNo">456</span> private final List<byte []> emptyRegionInfo = new ArrayList<>();<a name="line.456"></a>
+<span class="sourceLineNo">457</span><a name="line.457"></a>
+<span class="sourceLineNo">458</span> @VisibleForTesting<a name="line.458"></a>
+<span class="sourceLineNo">459</span> Report() {}<a name="line.459"></a>
<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span> public List<Pair<RegionInfo, RegionInfo>> getHoles() {<a name="line.461"></a>
-<span class="sourceLineNo">462</span> return this.holes;<a name="line.462"></a>
+<span class="sourceLineNo">461</span> public long getCreateTime() {<a name="line.461"></a>
+<span class="sourceLineNo">462</span> return this.now;<a name="line.462"></a>
<span class="sourceLineNo">463</span> }<a name="line.463"></a>
<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span> /**<a name="line.465"></a>
-<span class="sourceLineNo">466</span> * @return Overlap pairs found as we scanned hbase:meta; ordered by hbase:meta<a name="line.466"></a>
-<span class="sourceLineNo">467</span> * table sort. Pairs of overlaps may have overlap with subsequent pairs.<a name="line.467"></a>
-<span class="sourceLineNo">468</span> * @see MetaFixer#calculateMerges(int, List) where we aggregate overlaps<a name="line.468"></a>
-<span class="sourceLineNo">469</span> * for a single 'merge' call.<a name="line.469"></a>
-<span class="sourceLineNo">470</span> */<a name="line.470"></a>
-<span class="sourceLineNo">471</span> public List<Pair<RegionInfo, RegionInfo>> getOverlaps() {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> return this.overlaps;<a name="line.472"></a>
-<span class="sourceLineNo">473</span> }<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span> public List<Pair<RegionInfo, ServerName>> getUnknownServers() {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> return unknownServers;<a name="line.476"></a>
+<span class="sourceLineNo">465</span> public List<Pair<RegionInfo, RegionInfo>> getHoles() {<a name="line.465"></a>
+<span class="sourceLineNo">466</span> return this.holes;<a name="line.466"></a>
+<span class="sourceLineNo">467</span> }<a name="line.467"></a>
+<span class="sourceLineNo">468</span><a name="line.468"></a>
+<span class="sourceLineNo">469</span> /**<a name="line.469"></a>
+<span class="sourceLineNo">470</span> * @return Overlap pairs found as we scanned hbase:meta; ordered by hbase:meta<a name="line.470"></a>
+<span class="sourceLineNo">471</span> * table sort. Pairs of overlaps may have overlap with subsequent pairs.<a name="line.471"></a>
+<span class="sourceLineNo">472</span> * @see MetaFixer#calculateMerges(int, List) where we aggregate overlaps<a name="line.472"></a>
+<span class="sourceLineNo">473</span> * for a single 'merge' call.<a name="line.473"></a>
+<span class="sourceLineNo">474</span> */<a name="line.474"></a>
+<span class="sourceLineNo">475</span> public List<Pair<RegionInfo, RegionInfo>> getOverlaps() {<a name="line.475"></a>
+<span class="sourceLineNo">476</span> return this.overlaps;<a name="line.476"></a>
<span class="sourceLineNo">477</span> }<a name="line.477"></a>
<span class="sourceLineNo">478</span><a name="line.478"></a>
-<span class="sourceLineNo">479</span> public List<byte[]> getEmptyRegionInfo() {<a name="line.479"></a>
-<span class="sourceLineNo">480</span> return emptyRegionInfo;<a name="line.480"></a>
+<span class="sourceLineNo">479</span> public List<Pair<RegionInfo, ServerName>> getUnknownServers() {<a name="line.479"></a>
+<span class="sourceLineNo">480</span> return unknownServers;<a name="line.480"></a>
<span class="sourceLineNo">481</span> }<a name="line.481"></a>
<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span> /**<a name="line.483"></a>
-<span class="sourceLineNo">484</span> * @return True if an 'empty' lastReport -- no problems found.<a name="line.484"></a>
-<span class="sourceLineNo">485</span> */<a name="line.485"></a>
-<span class="sourceLineNo">486</span> public boolean isEmpty() {<a name="line.486"></a>
-<span class="sourceLineNo">487</span> return this.holes.isEmpty() && this.overlaps.isEmpty() && this.unknownServers.isEmpty() &&<a name="line.487"></a>
-<span class="sourceLineNo">488</span> this.emptyRegionInfo.isEmpty();<a name="line.488"></a>
-<span class="sourceLineNo">489</span> }<a name="line.489"></a>
-<span class="sourceLineNo">490</span><a name="line.490"></a>
-<span class="sourceLineNo">491</span> @Override<a name="line.491"></a>
-<span class="sourceLineNo">492</span> public String toString() {<a name="line.492"></a>
-<span class="sourceLineNo">493</span> StringBuilder sb = new StringBuilder();<a name="line.493"></a>
-<span class="sourceLineNo">494</span> for (Pair<RegionInfo, RegionInfo> p: this.holes) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span> if (sb.length() > 0) {<a name="line.495"></a>
-<span class="sourceLineNo">496</span> sb.append(", ");<a name="line.496"></a>
-<span class="sourceLineNo">497</span> }<a name="line.497"></a>
-<span class="sourceLineNo">498</span> sb.append("hole=").append(p.getFirst().getRegionNameAsString()).append("/").<a name="line.498"></a>
-<span class="sourceLineNo">499</span> append(p.getSecond().getRegionNameAsString());<a name="line.499"></a>
-<span class="sourceLineNo">500</span> }<a name="line.500"></a>
-<span class="sourceLineNo">501</span> for (Pair<RegionInfo, RegionInfo> p: this.overlaps) {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> if (sb.length() > 0) {<a name="line.502"></a>
-<span class="sourceLineNo">503</span> sb.append(", ");<a name="line.503"></a>
-<span class="sourceLineNo">504</span> }<a name="line.504"></a>
-<span class="sourceLineNo">505</span> sb.append("overlap=").append(p.getFirst().getRegionNameAsString()).append("/").<a name="line.505"></a>
-<span class="sourceLineNo">506</span> append(p.getSecond().getRegionNameAsString());<a name="line.506"></a>
-<span class="sourceLineNo">507</span> }<a name="line.507"></a>
-<span class="sourceLineNo">508</span> for (byte [] r: this.emptyRegionInfo) {<a name="line.508"></a>
-<span class="sourceLineNo">509</span> if (sb.length() > 0) {<a name="line.509"></a>
-<span class="sourceLineNo">510</span> sb.append(", ");<a name="line.510"></a>
-<span class="sourceLineNo">511</span> }<a name="line.511"></a>
-<span class="sourceLineNo">512</span> sb.append("empty=").append(Bytes.toStringBinary(r));<a name="line.512"></a>
-<span class="sourceLineNo">513</span> }<a name="line.513"></a>
-<span class="sourceLineNo">514</span> for (Pair<RegionInfo, ServerName> p: this.unknownServers) {<a name="line.514"></a>
-<span class="sourceLineNo">515</span> if (sb.length() > 0) {<a name="line.515"></a>
-<span class="sourceLineNo">516</span> sb.append(", ");<a name="line.516"></a>
-<span class="sourceLineNo">517</span> }<a name="line.517"></a>
-<span class="sourceLineNo">518</span> sb.append("unknown_server=").append(p.getSecond()).append("/").<a name="line.518"></a>
-<span class="sourceLineNo">519</span> append(p.getFirst().getRegionNameAsString());<a name="line.519"></a>
-<span class="sourceLineNo">520</span> }<a name="line.520"></a>
-<span class="sourceLineNo">521</span> return sb.toString();<a name="line.521"></a>
-<span class="sourceLineNo">522</span> }<a name="line.522"></a>
-<span class="sourceLineNo">523</span> }<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span> /**<a name="line.525"></a>
-<span class="sourceLineNo">526</span> * Visitor we use in here in CatalogJanitor to go against hbase:meta table.<a name="line.526"></a>
-<span class="sourceLineNo">527</span> * Generates a Report made of a collection of split parents and counts of rows<a name="line.527"></a>
-<span class="sourceLineNo">528</span> * in the hbase:meta table. Also runs hbase:meta consistency checks to<a name="line.528"></a>
-<span class="sourceLineNo">529</span> * generate more report. Report is NOT ready until after this visitor has been<a name="line.529"></a>
-<span class="sourceLineNo">530</span> * {@link #close()}'d.<a name="line.530"></a>
-<span class="sourceLineNo">531</span> */<a name="line.531"></a>
-<span class="sourceLineNo">532</span> static class ReportMakingVisitor implements MetaTableAccessor.CloseableVisitor {<a name="line.532"></a>
-<span class="sourceLineNo">533</span> private final MasterServices services;<a name="line.533"></a>
-<span class="sourceLineNo">534</span> private volatile boolean closed;<a name="line.534"></a>
-<span class="sourceLineNo">535</span><a name="line.535"></a>
-<span class="sourceLineNo">536</span> /**<a name="line.536"></a>
-<span class="sourceLineNo">537</span> * Report is not done until after the close has been called.<a name="line.537"></a>
-<span class="sourceLineNo">538</span> * @see #close()<a name="line.538"></a>
-<span class="sourceLineNo">539</span> * @see #getReport()<a name="line.539"></a>
-<span class="sourceLineNo">540</span> */<a name="line.540"></a>
-<span class="sourceLineNo">541</span> private Report report = new Report();<a name="line.541"></a>
-<span class="sourceLineNo">542</span><a name="line.542"></a>
-<span class="sourceLineNo">543</span> /**<a name="line.543"></a>
-<span class="sourceLineNo">544</span> * RegionInfo from previous row.<a name="line.544"></a>
-<span class="sourceLineNo">545</span> */<a name="line.545"></a>
-<span class="sourceLineNo">546</span> private RegionInfo previous = null;<a name="line.546"></a>
-<span class="sourceLineNo">547</span><a name="line.547"></a>
-<span class="sourceLineNo">548</span> /**<a name="line.548"></a>
-<span class="sourceLineNo">549</span> * Keep account of the highest end key seen as we move through hbase:meta.<a name="line.549"></a>
-<span class="sourceLineNo">550</span> * Usually, the current RegionInfo has the highest end key but if an overlap,<a name="line.550"></a>
-<span class="sourceLineNo">551</span> * this may no longer hold. An overlap may be a region with startkey 'd' and<a name="line.551"></a>
-<span class="sourceLineNo">552</span> * endkey 'g'. The next region in meta may be 'e' to 'f' and then 'f' to 'g'.<a name="line.552"></a>
-<span class="sourceLineNo">553</span> * Looking at previous and current meta row, we won't know about the 'd' to 'g'<a name="line.553"></a>
-<span class="sourceLineNo">554</span> * overlap unless we keep a running 'highest-endpoint-seen'.<a name="line.554"></a>
-<span class="sourceLineNo">555</span> */<a name="line.555"></a>
-<span class="sourceLineNo">556</span> private RegionInfo highestEndKeyRegionInfo = null;<a name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span> ReportMakingVisitor(MasterServices services) {<a name="line.558"></a>
-<span class="sourceLineNo">559</span> this.services = services;<a name="line.559"></a>
-<span class="sourceLineNo">560</span> }<a name="line.560"></a>
+<span class="sourceLineNo">483</span> public List<byte[]> getEmptyRegionInfo() {<a name="line.483"></a>
+<span class="sourceLineNo">484</span> return emptyRegionInfo;<a name="line.484"></a>
+<span class="sourceLineNo">485</span> }<a name="line.485"></a>
+<span class="sourceLineNo">486</span><a name="line.486"></a>
+<span class="sourceLineNo">487</span> /**<a name="line.487"></a>
+<span class="sourceLineNo">488</span> * @return True if an 'empty' lastReport -- no problems found.<a name="line.488"></a>
+<span class="sourceLineNo">489</span> */<a name="line.489"></a>
+<span class="sourceLineNo">490</span> public boolean isEmpty() {<a name="line.490"></a>
+<span class="sourceLineNo">491</span> return this.holes.isEmpty() && this.overlaps.isEmpty() && this.unknownServers.isEmpty() &&<a name="line.491"></a>
+<span class="sourceLineNo">492</span> this.emptyRegionInfo.isEmpty();<a name="line.492"></a>
+<span class="sourceLineNo">493</span> }<a name="line.493"></a>
+<span class="sourceLineNo">494</span><a name="line.494"></a>
+<span class="sourceLineNo">495</span> @Override<a name="line.495"></a>
+<span class="sourceLineNo">496</span> public String toString() {<a name="line.496"></a>
+<span class="sourceLineNo">497</span> StringBuilder sb = new StringBuilder();<a name="line.497"></a>
+<span class="sourceLineNo">498</span> for (Pair<RegionInfo, RegionInfo> p: this.holes) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span> if (sb.length() > 0) {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> sb.append(", ");<a name="line.500"></a>
+<span class="sourceLineNo">501</span> }<a name="line.501"></a>
+<span class="sourceLineNo">502</span> sb.append("hole=").append(p.getFirst().getRegionNameAsString()).append("/").<a name="line.502"></a>
+<span class="sourceLineNo">503</span> append(p.getSecond().getRegionNameAsString());<a name="line.503"></a>
+<span class="sourceLineNo">504</span> }<a name="line.504"></a>
+<span class="sourceLineNo">505</span> for (Pair<RegionInfo, RegionInfo> p: this.overlaps) {<a name="line.505"></a>
+<span class="sourceLineNo">506</span> if (sb.length() > 0) {<a name="line.506"></a>
+<span class="sourceLineNo">507</span> sb.append(", ");<a name="line.507"></a>
+<span class="sourceLineNo">508</span> }<a name="line.508"></a>
+<span class="sourceLineNo">509</span> sb.append("overlap=").append(p.getFirst().getRegionNameAsString()).append("/").<a name="line.509"></a>
+<span class="sourceLineNo">510</span> append(p.getSecond().getRegionNameAsString());<a name="line.510"></a>
+<span class="sourceLineNo">511</span> }<a name="line.511"></a>
+<span class="sourceLineNo">512</span> for (byte [] r: this.emptyRegionInfo) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> if (sb.length() > 0) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span> sb.append(", ");<a name="line.514"></a>
+<span class="sourceLineNo">515</span> }<a name="line.515"></a>
+<span class="sourceLineNo">516</span> sb.append("empty=").append(Bytes.toStringBinary(r));<a name="line.516"></a>
+<span class="sourceLineNo">517</span> }<a name="line.517"></a>
+<span class="sourceLineNo">518</span> for (Pair<RegionInfo, ServerName> p: this.unknownServers) {<a name="line.518"></a>
+<span class="sourceLineNo">519</span> if (sb.length() > 0) {<a name="line.519"></a>
+<span class="sourceLineNo">520</span> sb.append(", ");<a name="line.520"></a>
+<span class="sourceLineNo">521</span> }<a name="line.521"></a>
+<span class="sourceLineNo">522</span> sb.append("unknown_server=").append(p.getSecond()).append("/").<a name="line.522"></a>
+<span class="sourceLineNo">523</span> append(p.getFirst().getRegionNameAsString());<a name="line.523"></a>
+<span class="sourceLineNo">524</span> }<a name="line.524"></a>
+<span class="sourceLineNo">525</span> return sb.toString();<a name="line.525"></a>
+<span class="sourceLineNo">526</span> }<a name="line.526"></a>
+<span class="sourceLineNo">527</span> }<a name="line.527"></a>
+<span class="sourceLineNo">528</span><a name="line.528"></a>
+<span class="sourceLineNo">529</span> /**<a name="line.529"></a>
+<span class="sourceLineNo">530</span> * Visitor we use in here in CatalogJanitor to go against hbase:meta table.<a name="line.530"></a>
+<span class="sourceLineNo">531</span> * Generates a Report made of a collection of split parents and counts of rows<a name="line.531"></a>
+<span class="sourceLineNo">532</span> * in the hbase:meta table. Also runs hbase:meta consistency checks to<a name="line.532"></a>
+<span class="sourceLineNo">533</span> * generate more report. Report is NOT ready until after this visitor has been<a name="line.533"></a>
+<span class="sourceLineNo">534</span> * {@link #close()}'d.<a name="line.534"></a>
+<span class="sourceLineNo">535</span> */<a name="line.535"></a>
+<span class="sourceLineNo">536</span> static class ReportMakingVisitor implements MetaTableAccessor.CloseableVisitor {<a name="line.536"></a>
+<span class="sourceLineNo">537</span> private final MasterServices services;<a name="line.537"></a>
+<span class="sourceLineNo">538</span> private volatile boolean closed;<a name="line.538"></a>
+<span class="sourceLineNo">539</span><a name="line.539"></a>
+<span class="sourceLineNo">540</span> /**<a name="line.540"></a>
+<span class="sourceLineNo">541</span> * Report is not done until after the close has been called.<a name="line.541"></a>
+<span class="sourceLineNo">542</span> * @see #close()<a name="line.542"></a>
+<span class="sourceLineNo">543</span> * @see #getReport()<a name="line.543"></a>
+<span class="sourceLineNo">544</span> */<a name="line.544"></a>
+<span class="sourceLineNo">545</span> private Report report = new Report();<a name="line.545"></a>
+<span class="sourceLineNo">546</span><a name="line.546"></a>
+<span class="sourceLineNo">547</span> /**<a name="line.547"></a>
+<span class="sourceLineNo">548</span> * RegionInfo from previous row.<a name="line.548"></a>
+<span class="sourceLineNo">549</span> */<a name="line.549"></a>
+<span class="sourceLineNo">550</span> private RegionInfo previous = null;<a name="line.550"></a>
+<span class="sourceLineNo">551</span><a name="line.551"></a>
+<span class="sourceLineNo">552</span> /**<a name="line.552"></a>
+<span class="sourceLineNo">553</span> * Keep account of the highest end key seen as we move through hbase:meta.<a name="line.553"></a>
+<span class="sourceLineNo">554</span> * Usually, the current RegionInfo has the highest end key but if an overlap,<a name="line.554"></a>
+<span class="sourceLineNo">555</span> * this may no longer hold. An overlap may be a region with startkey 'd' and<a name="line.555"></a>
+<span class="sourceLineNo">556</span> * endkey 'g'. The next region in meta may be 'e' to 'f' and then 'f' to 'g'.<a name="line.556"></a>
+<span class="sourceLineNo">557</span> * Looking at previous and current meta row, we won't know about the 'd' to 'g'<a name="line.557"></a>
+<span class="sourceLineNo">558</span> * overlap unless we keep a running 'highest-endpoint-seen'.<a name="line.558"></a>
+<span class="sourceLineNo">559</span> */<a name="line.559"></a>
+<span class="sourceLineNo">560</span> private RegionInfo highestEndKeyRegionInfo = null;<a name="line.560"></a>
<span class="sourceLineNo">561</span><a name="line.561"></a>
-<span class="sourceLineNo">562</span> /**<a name="line.562"></a>
-<span class="sourceLineNo">563</span> * Do not call until after {@link #close()}.<a name="line.563"></a>
-<span class="sourceLineNo">564</span> * Will throw a {@link RuntimeException} if you do.<a name="line.564"></a>
-<span class="sourceLineNo">565</span> */<a name="line.565"></a>
-<span class="sourceLineNo">566</span> Report getReport() {<a name="line.566"></a>
-<span class="sourceLineNo">567</span> if (!this.closed) {<a name="line.567"></a>
-<span class="sourceLineNo">568</span> throw new RuntimeException("Report not ready until after close()");<a name="line.568"></a>
-<span class="sourceLineNo">569</span> }<a name="line.569"></a>
-<span class="sourceLineNo">570</span> return this.report;<a name="line.570"></a>
-<span class="sourceLineNo">571</span> }<a name="line.571"></a>
-<span class="sourceLineNo">572</span><a name="line.572"></a>
-<span class="sourceLineNo">573</span> @Override<a name="line.573"></a>
-<span class="sourceLineNo">574</span> public boolean visit(Result r) {<a name="line.574"></a>
-<span class="sourceLineNo">575</span> if (r == null || r.isEmpty()) {<a name="line.575"></a>
-<span class="sourceLineNo">576</span> return true;<a name="line.576"></a>
-<span class="sourceLineNo">577</span> }<a name="line.577"></a>
-<span class="sourceLineNo">578</span> this.report.count++;<a name="line.578"></a>
-<span class="sourceLineNo">579</span> RegionInfo regionInfo = null;<a name="line.579"></a>
-<span class="sourceLineNo">580</span> try {<a name="line.580"></a>
-<span class="sourceLineNo">581</span> regionInfo = metaTableConsistencyCheck(r);<a name="line.581"></a>
-<span class="sourceLineNo">582</span> } catch(Throwable t) {<a name="line.582"></a>
-<span class="sourceLineNo">583</span> LOG.warn("Failed consistency check on {}", Bytes.toStringBinary(r.getRow()), t);<a name="line.583"></a>
-<span class="sourceLineNo">584</span> }<a name="line.584"></a>
-<span class="sourceLineNo">585</span> if (regionInfo != null) {<a name="line.585"></a>
-<span class="sourceLineNo">586</span> LOG.trace(regionInfo.toString());<a name="line.586"></a>
-<span class="sourceLineNo">587</span> if (regionInfo.isSplitParent()) { // splitParent means split and offline.<a name="line.587"></a>
-<span class="sourceLineNo">588</span> this.report.splitParents.put(regionInfo, r);<a name="line.588"></a>
-<span class="sourceLineNo">589</span> }<a name="line.589"></a>
-<span class="sourceLineNo">590</span> if (MetaTableAccessor.hasMergeRegions(r.rawCells())) {<a name="line.590"></a>
-<span class="sourceLineNo">591</span> this.report.mergedRegions.put(regionInfo, r);<a name="line.591"></a>
-<span class="sourceLineNo">592</span> }<a name="line.592"></a>
-<span class="sourceLineNo">593</span> }<a name="line.593"></a>
-<span class="sourceLineNo">594</span> // Returning true means "keep scanning"<a name="line.594"></a>
-<span class="sourceLineNo">595</span> return true;<a name="line.595"></a>
-<span class="sourceLineNo">596</span> }<a name="line.596"></a>
-<span class="sourceLineNo">597</span><a name="line.597"></a>
-<span class="sourceLineNo">598</span> /**<a name="line.598"></a>
-<span class="sourceLineNo">599</span> * Check row.<a name="line.599"></a>
-<span class="sourceLineNo">600</span> * @param metaTableRow Row from hbase:meta table.<a name="line.600"></a>
-<span class="sourceLineNo">601</span> * @return Returns default regioninfo found in row parse as a convenience to save<a name="line.601"></a>
-<span class="sourceLineNo">602</span> * on having to do a double-parse of Result.<a name="line.602"></a>
-<span class="sourceLineNo">603</span> */<a name="line.603"></a>
-<span class="sourceLineNo">604</span> private RegionInfo metaTableConsistencyCheck(Result metaTableRow) {<a name="line.604"></a>
-<span class="sourceLineNo">605</span> RegionInfo ri;<a name="line.605"></a>
-<span class="sourceLineNo">606</span> // Locations comes back null if the RegionInfo field is empty.<a name="line.606"></a>
-<span class="sourceLineNo">607</span> // If locations is null, ensure the regioninfo is for sure empty before progressing.<a name="line.607"></a>
-<span class="sourceLineNo">608</span> // If really empty, report as missing regioninfo! Otherwise, can run server check<a name="line.608"></a>
-<span class="sourceLineNo">609</span> // and get RegionInfo from locations.<a name="line.609"></a>
-<span class="sourceLineNo">610</span> RegionLocations locations = MetaTableAccessor.getRegionLocations(metaTableRow);<a name="line.610"></a>
-<span class="sourceLineNo">611</span> if (locations == null) {<a name="line.611"></a>
-<span class="sourceLineNo">612</span> ri = MetaTableAccessor.getRegionInfo(metaTableRow,<a name="line.612"></a>
-<span class="sourceLineNo">613</span> MetaTableAccessor.getRegionInfoColumn());<a name="line.613"></a>
-<span class="sourceLineNo">614</span> } else {<a name="line.614"></a>
-<span class="sourceLineNo">615</span> ri = locations.getDefaultRegionLocation().getRegion();<a name="line.615"></a>
-<span class="sourceLineNo">616</span> checkServer(locations);<a name="line.616"></a>
-<span class="sourceLineNo">617</span> }<a name="line.617"></a>
-<span class="sourceLineNo">618</span><a name="line.618"></a>
-<span class="sourceLineNo">619</span> if (ri == null) {<a name="line.619"></a>
-<span class="sourceLineNo">620</span> this.report.emptyRegionInfo.add(metaTableRow.getRow());<a name="line.620"></a>
-<span class="sourceLineNo">621</span> return ri;<a name="line.621"></a>
-<span class="sourceLineNo">622</span> }<a name="line.622"></a>
-<span class="sourceLineNo">623</span><a name="line.623"></a>
-<span class="sourceLineNo">624</span> if (!Bytes.equals(metaTableRow.getRow(), ri.getRegionName())) {<a name="line.624"></a>
-<span class="sourceLineNo">625</span> LOG.warn("INCONSISTENCY: Row name is not equal to serialized info:regioninfo content; " +<a name="line.625"></a>
-<span class="sourceLineNo">626</span> "row={} {}; See if RegionInfo is referenced in another hbase:meta row? Delete?",<a name="line.626"></a>
-<span class="sourceLineNo">627</span> Bytes.toStringBinary(metaTableRow.getRow()), ri.getRegionNameAsString());<a name="line.627"></a>
-<span class="sourceLineNo">628</span> return null;<a name="line.628"></a>
-<span class="sourceLineNo">629</span> }<a name="line.629"></a>
-<span class="sourceLineNo">630</span> // Skip split parent region<a name="line.630"></a>
-<span class="sourceLineNo">631</span> if (ri.isSplitParent()) {<a name="line.631"></a>
-<span class="sourceLineNo">632</span> return ri;<a name="line.632"></a>
+<span class="sourceLineNo">562</span> ReportMakingVisitor(MasterServices services) {<a name="line.562"></a>
+<span class="sourceLineNo">563</span> this.services = services;<a name="line.563"></a>
+<span class="sourceLineNo">564</span> }<a name="line.564"></a>
+<span class="sourceLineNo">565</span><a name="line.565"></a>
+<span class="sourceLineNo">566</span> /**<a name="line.566"></a>
+<span class="sourceLineNo">567</span> * Do not call until after {@link #close()}.<a name="line.567"></a>
+<span class="sourceLineNo">568</span> * Will throw a {@link RuntimeException} if you do.<a name="line.568"></a>
+<span class="sourceLineNo">569</span> */<a name="line.569"></a>
+<span class="sourceLineNo">570</span> Report getReport() {<a name="line.570"></a>
+<span class="sourceLineNo">571</span> if (!this.closed) {<a name="line.571"></a>
+<span class="sourceLineNo">572</span> throw new RuntimeException("Report not ready until after close()");<a name="line.572"></a>
+<span class="sourceLineNo">573</span> }<a name="line.573"></a>
+<span class="sourceLineNo">574</span> return this.report;<a name="line.574"></a>
+<span class="sourceLineNo">575</span> }<a name="line.575"></a>
+<span class="sourceLineNo">576</span><a name="line.576"></a>
+<span class="sourceLineNo">577</span> @Override<a name="line.577"></a>
+<span class="sourceLineNo">578</span> public boolean visit(Result r) {<a name="line.578"></a>
+<span class="sourceLineNo">579</span> if (r == null || r.isEmpty()) {<a name="line.579"></a>
+<span class="sourceLineNo">580</span> return true;<a name="line.580"></a>
+<span class="sourceLineNo">581</span> }<a name="line.581"></a>
+<span class="sourceLineNo">582</span> this.report.count++;<a name="line.582"></a>
+<span class="sourceLineNo">583</span> RegionInfo regionInfo = null;<a name="line.583"></a>
+<span class="sourceLineNo">584</span> try {<a name="line.584"></a>
+<span class="sourceLineNo">585</span> regionInfo = metaTableConsistencyCheck(r);<a name="line.585"></a>
+<span class="sourceLineNo">586</span> } catch(Throwable t) {<a name="line.586"></a>
+<span class="sourceLineNo">587</span> LOG.warn("Failed consistency check on {}", Bytes.toStringBinary(r.getRow()), t);<a name="line.587"></a>
+<span class="sourceLineNo">588</span> }<a name="line.588"></a>
+<span class="sourceLineNo">589</span> if (regionInfo != null) {<a name="line.589"></a>
+<span class="sourceLineNo">590</span> LOG.trace(regionInfo.toString());<a name="line.590"></a>
+<span class="sourceLineNo">591</span> if (regionInfo.isSplitParent()) { // splitParent means split and offline.<a name="line.591"></a>
+<span class="sourceLineNo">592</span> this.report.splitParents.put(regionInfo, r);<a name="line.592"></a>
+<span class="sourceLineNo">593</span> }<a name="line.593"></a>
+<span class="sourceLineNo">594</span> if (MetaTableAccessor.hasMergeRegions(r.rawCells())) {<a name="line.594"></a>
+<span class="sourceLineNo">595</span> this.report.mergedRegions.put(regionInfo, r);<a name="line.595"></a>
+<span class="sourceLineNo">596</span> }<a name="line.596"></a>
+<span class="sourceLineNo">597</span> }<a name="line.597"></a>
+<span class="sourceLineNo">598</span> // Returning true means "keep scanning"<a name="line.598"></a>
+<span class="sourceLineNo">599</span> return true;<a name="line.599"></a>
+<span class="sourceLineNo">600</span> }<a name="line.600"></a>
+<span class="sourceLineNo">601</span><a name="line.601"></a>
+<span class="sourceLineNo">602</span> /**<a name="line.602"></a>
+<span class="sourceLineNo">603</span> * Check row.<a name="line.603"></a>
+<span class="sourceLineNo">604</span> * @param metaTableRow Row from hbase:meta table.<a name="line.604"></a>
+<span class="sourceLineNo">605</span> * @return Returns default regioninfo found in row parse as a convenience to save<a name="line.605"></a>
+<span class="sourceLineNo">606</span> * on having to do a double-parse of Result.<a name="line.606"></a>
+<span class="sourceLineNo">607</span> */<a name="line.607"></a>
+<span class="sourceLineNo">608</span> private RegionInfo metaTableConsistencyCheck(Result metaTableRow) {<a name="line.608"></a>
+<span class="sourceLineNo">609</span> RegionInfo ri;<a name="line.609"></a>
+<span class="sourceLineNo">610</span> // Locations comes back null if the RegionInfo field is empty.<a name="line.610"></a>
+<span class="sourceLineNo">611</span> // If locations is null, ensure the regioninfo is for sure empty before progressing.<a name="line.611"></a>
+<span class="sourceLineNo">612</span> // If really empty, report as missing regioninfo! Otherwise, can run server check<a name="line.612"></a>
+<span class="sourceLineNo">613</span> // and get RegionInfo from locations.<a name="line.613"></a>
+<span class="sourceLineNo">614</span> RegionLocations locations = MetaTableAccessor.getRegionLocations(metaTableRow);<a name="line.614"></a>
+<span class="sourceLineNo">615</span> if (locations == null) {<a name="line.615"></a>
+<span class="sourceLineNo">616</span> ri = MetaTableAccessor.getRegionInfo(metaTableRow,<a name="line.616"></a>
+<span class="sourceLineNo">617</span> MetaTableAccessor.getRegionInfoColumn());<a name="line.617"></a>
+<span class="sourceLineNo">618</span> } else {<a name="line.618"></a>
+<span class="sourceLineNo">619</span> ri = locations.getDefaultRegionLocation().getRegion();<a name="line.619"></a>
+<span class="sourceLineNo">620</span> checkServer(locations);<a name="line.620"></a>
+<span class="sourceLineNo">621</span> }<a name="line.621"></a>
+<span class="sourceLineNo">622</span><a name="line.622"></a>
+<span class="sourceLineNo">623</span> if (ri == null) {<a name="line.623"></a>
+<span class="sourceLineNo">624</span> this.report.emptyRegionInfo.add(metaTableRow.getRow());<a name="line.624"></a>
+<span class="sourceLineNo">625</span> return ri;<a name="line.625"></a>
+<span class="sourceLineNo">626</span> }<a name="line.626"></a>
+<span class="sourceLineNo">627</span><a name="line.627"></a>
+<span class="sourceLineNo">628</span> if (!Bytes.equals(metaTableRow.getRow(), ri.getRegionName())) {<a name="line.628"></a>
+<span class="sourceLineNo">629</span> LOG.warn("INCONSISTENCY: Row name is not equal to serialized info:regioninfo content; " +<a name="line.629"></a>
+<span class="sourceLineNo">630</span> "row={} {}; See if RegionInfo is referenced in another hbase:meta row? Delete?",<a name="line.630"></a>
+<span class="sourceLineNo">631</span> Bytes.toStringBinary(metaTableRow.getRow()), ri.getRegionNameAsString());<a name="line.631"></a>
+<span class="sourceLineNo">632</span> return null;<a name="line.632"></a>
<span class="sourceLineNo">633</span> }<a name="line.633"></a>
-<span class="sourceLineNo">634</span> // If table is disabled, skip integrity check.<a name="line.634"></a>
-<span class="sourceLineNo">635</span> if (!isTableDisabled(ri)) {<a name="line.635"></a>
-<span class="sourceLineNo">636</span> if (isTableTransition(ri)) {<a name="line.636"></a>
-<span class="sourceLineNo">637</span> // On table transition, look to see if last region was last in table<a name="line.637"></a>
-<span class="sourceLineNo">638</span> // and if this is the first. Report 'hole' if neither is true.<a name="line.638"></a>
-<span class="sourceLineNo">639</span> // HBCK1 used to have a special category for missing start or end keys.<a name="line.639"></a>
-<span class="sourceLineNo">640</span> // We'll just lump them in as 'holes'.<a name="line.640"></a>
-<span class="sourceLineNo">641</span> if ((this.previous != null && !this.previous.isLast()) || !ri.isFirst()) {<a name="line.641"></a>
-<span class="sourceLineNo">642</span> addHole(this.previous == null? RegionInfo.UNDEFINED: this.previous, ri);<a name="line.642"></a>
-<span class="sourceLineNo">643</span> }<a name="line.643"></a>
-<span class="sourceLineNo">644</span> } else {<a name="line.644"></a>
-<span class="sourceLineNo">645</span> if (!this.previous.isNext(ri)) {<a name="line.645"></a>
-<span class="sourceLineNo">646</span> if (this.previous.isOverlap(ri)) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span> addOverlap(this.previous, ri);<a name="line.647"></a>
-<span class="sourceLineNo">648</span> } else if (ri.isOverlap(this.highestEndKeyRegionInfo)) {<a name="line.648"></a>
-<span class="sourceLineNo">649</span> // We may have seen a region a few rows back that overlaps this one.<a name="line.649"></a>
-<span class="sourceLineNo">650</span> addOverlap(this.highestEndKeyRegionInfo, ri);<a name="line.650"></a>
-<span class="sourceLineNo">651</span> } else {<a name="line.651"></a>
-<span class="sourceLineNo">652</span> addHole(this.previous, ri);<a name="line.652"></a>
-<span class="sourceLineNo">653</span> }<a name="line.653"></a>
-<span class="sourceLineNo">654</span> } else if (ri.isOverlap(this.highestEndKeyRegionInfo)) {<a name="line.654"></a>
-<span class="sourceLineNo">655</span> // We may have seen a region a few rows back that overlaps this one<a name="line.655"></a>
-<span class="sourceLineNo">656</span> // even though it properly 'follows' the region just before.<a name="line.656"></a>
-<span class="sourceLineNo">657</span> addOverlap(this.highestEndKeyRegionInfo, ri);<a name="line.657"></a>
-<span class="sourceLineNo">658</span> }<a name="line.658"></a>
-<span class="sourceLineNo">659</span> }<a name="line.659"></a>
-<span class="sourceLineNo">660</span> }<a name="line.660"></a>
-<span class="sourceLineNo">661</span> this.previous = ri;<a name="line.661"></a>
-<span class="sourceLineNo">662</span> this.highestEndKeyRegionInfo =<a name="line.662"></a>
-<span class="sourceLineNo">663</span> MetaFixer.getRegionInfoWithLargestEndKey(this.highestEndKeyRegionInfo, ri);<a name="line.663"></a>
-<span class="sourceLineNo">664</span> return ri;<a name="line.664"></a>
-<span class="sourceLineNo">665</span> }<a name="line.665"></a>
-<span class="sourceLineNo">666</span><a name="line.666"></a>
-<span class="sourceLineNo">667</span> private void addOverlap(RegionInfo a, RegionInfo b) {<a name="line.667"></a>
-<span class="sourceLineNo">668</span> this.report.overlaps.add(new Pair<>(a, b));<a name="line.668"></a>
+<span class="sourceLineNo">634</span> // Skip split parent region<a name="line.634"></a>
+<span class="sourceLineNo">635</span> if (ri.isSplitParent()) {<a name="line.635"></a>
+<span class="sourceLineNo">636</span> return ri;<a name="line.636"></a>
+<span class="sourceLineNo">637</span> }<a name="line.637"></a>
+<span class="sourceLineNo">638</span> // If table is disabled, skip integrity check.<a name="line.638"></a>
+<span class="sourceLineNo">639</span> if (!isTableDisabled(ri)) {<a name="line.639"></a>
+<span class="sourceLineNo">640</span> if (isTableTransition(ri)) {<a name="line.640"></a>
+<span class="sourceLineNo">641</span> // On table transition, look to see if last region was last in table<a name="line.641"></a>
+<span class="sourceLineNo">642</span> // and if this is the first. Report 'hole' if neither is true.<a name="line.642"></a>
+<span class="sourceLineNo">643</span> // HBCK1 used to have a special category for missing start or end keys.<a name="line.643"></a>
+<span class="sourceLineNo">644</span> // We'll just lump them in as 'holes'.<a name="line.644"></a>
+<span class="sourceLineNo">645</span> if ((this.previous != null && !this.previous.isLast()) || !ri.isFirst()) {<a name="line.645"></a>
+<span class="sourceLineNo">646</span> addHole(this.previous == null? RegionInfo.UNDEFINED: this.previous, ri);<a name="line.646"></a>
+<span class="sourceLineNo">647</span> }<a name="line.647"></a>
+<span class="sourceLineNo">648</span> } else {<a name="line.648"></a>
+<span class="sourceLineNo">649</span> if (!this.previous.isNext(ri)) {<a name="line.649"></a>
+<span class="sourceLineNo">650</span> if (this.previous.isOverlap(ri)) {<a name="line.650"></a>
+<span class="sourceLineNo">651</span> addOverlap(this.previous, ri);<a name="line.651"></a>
+<span class="sourceLineNo">652</span> } else if (ri.isOverlap(this.highestEndKeyRegionInfo)) {<a name="line.652"></a>
+<span class="sourceLineNo">653</span> // We may have seen a region a few rows back that overlaps this one.<a name="line.653"></a>
+<span class="sourceLineNo">654</span> addOverlap(this.highestEndKeyRegionInfo, ri);<a name="line.654"></a>
+<span class="sourceLineNo">655</span> } else {<a name="line.655"></a>
+<span class="sourceLineNo">656</span> addHole(this.previous, ri);<a name="line.656"></a>
+<span class="sourceLineNo">657</span> }<a name="line.657"></a>
+<span class="sourceLineNo">658</span> } else if (ri.isOverlap(this.highestEndKeyRegionInfo)) {<a name="line.658"></a>
+<span class="sourceLineNo">659</span> // We may have seen a region a few rows back that overlaps this one<a name="line.659"></a>
+<span class="sourceLineNo">660</span> // even though it properly 'follows' the region just before.<a name="line.660"></a>
+<span class="sourceLineNo">661</span> addOverlap(this.highestEndKeyRegionInfo, ri);<a name="line.661"></a>
+<span class="sourceLineNo">662</span> }<a name="line.662"></a>
+<span class="sourceLineNo">663</span> }<a name="line.663"></a>
+<span class="sourceLineNo">664</span> }<a name="line.664"></a>
+<span class="sourceLineNo">665</span> this.previous = ri;<a name="line.665"></a>
+<span class="sourceLineNo">666</span> this.highestEndKeyRegionInfo =<a name="line.666"></a>
+<span class="sourceLineNo">667</span> MetaFixer.getRegionInfoWithLargestEndKey(this.highestEndKeyRegionInfo, ri);<a name="line.667"></a>
+<span class="sourceLineNo">668</span> return ri;<a name="line.668"></a>
<span class="sourceLineNo">669</span> }<a name="line.669"></a>
<span class="sourceLineNo">670</span><a name="line.670"></a>
-<span class="sourceLineNo">671</span> private void addHole(RegionInfo a, RegionInfo b) {<a name="line.671"></a>
-<span class="sourceLineNo">672</span> this.report.holes.add(new Pair<>(a, b));<a name="line.672"></a>
+<span class="sourceLineNo">671</span> private void addOverlap(RegionInfo a, RegionInfo b) {<a name="line.671"></a>
+<span class="sourceLineNo">672</span> this.report.overlaps.add(new Pair<>(a, b));<a name="line.672"></a>
<span class="sourceLineNo">673</span> }<a name="line.673"></a>
<span class="sourceLineNo">674</span><a name="line.674"></a>
-<span class="sourceLineNo">675</span> /**<a name="line.675"></a>
-<span class="sourceLineNo">676</span> * @return True if table is disabled or disabling; defaults false!<a name="line.676"></a>
-<span class="sourceLineNo">677</span> */<a name="line.677"></a>
-<span class="sourceLineNo">678</span> boolean isTableDisabled(RegionInfo ri) {<a name="line.678"></a>
-<span class="sourceLineNo">679</span> if (ri == null) {<a name="line.679"></a>
-<span class="sourceLineNo">680</span> return false;<a name="line.680"></a>
-<span class="sourceLineNo">681</span> }<a name="line.681"></a>
-<span class="sourceLineNo">682</span> if (this.services == null) {<a name="line.682"></a>
-<span class="sourceLineNo">683</span> return false;<a name="line.683"></a>
-<span class="sourceLineNo">684</span> }<a name="line.684"></a>
-<span class="sourceLineNo">685</span> if (this.services.getTableStateManager() == null) {<a name="line.685"></a>
-<span class="sourceLineNo">686</span> return false;<a name="line.686"></a>
-<span class="sourceLineNo">687</span> }<a name="line.687"></a>
-<span class="sourceLineNo">688</span> TableState state = null;<a name="line.688"></a>
-<span class="sourceLineNo">689</span> try {<a name="line.689"></a>
-<span class="sourceLineNo">690</span> state = this.services.getTableStateManager().getTableState(ri.getTable());<a name="line.690"></a>
-<span class="sourceLineNo">691</span> } catch (IOException e) {<a name="line.691"></a>
-<span class="sourceLineNo">692</span> LOG.warn("Failed getting table state", e);<a name="line.692"></a>
-<span class="sourceLineNo">693</span> }<a name="line.693"></a>
-<span class="sourceLineNo">694</span> return state != null && state.isDisabledOrDisabling();<a name="line.694"></a>
-<span class="sourceLineNo">695</span> }<a name="line.695"></a>
-<span class="sourceLineNo">696</span><a name="line.696"></a>
-<span class="sourceLineNo">697</span> /**<a name="line.697"></a>
-<span class="sourceLineNo">698</span> * Run through referenced servers and save off unknown and the dead.<a name="line.698"></a>
-<span class="sourceLineNo">699</span> */<a name="line.699"></a>
-<span class="sourceLineNo">700</span> private void checkServer(RegionLocations locations) {<a name="line.700"></a>
-<span class="sourceLineNo">701</span> if (this.services == null) {<a name="line.701"></a>
-<span class="sourceLineNo">702</span> // Can't do this test if no services.<a name="line.702"></a>
-<span class="sourceLineNo">703</span> return;<a name="line.703"></a>
-<span class="sourceLineNo">704</span> }<a name="line.704"></a>
-<span class="sourceLineNo">705</span> if (locations == null) {<a name="line.705"></a>
-<span class="sourceLineNo">706</span> return;<a name="line.706"></a>
-<span class="sourceLineNo">707</span> }<a name="line.707"></a>
-<span class="sourceLineNo">708</span> if (locations.getRegionLocations() == null) {<a name="line.708"></a>
-<span class="sourceLineNo">709</span> return;<a name="line.709"></a>
-<span class="sourceLineNo">710</span> }<a name="line.710"></a>
-<span class="sourceLineNo">711</span> // Check referenced servers are known/online. Here we are looking<a name="line.711"></a>
-<span class="sourceLineNo">712</span> // at both the default replica -- the main replica -- and then replica<a name="line.712"></a>
-<span class="sourceLineNo">713</span> // locations too.<a name="line.713"></a>
-<span class="sourceLineNo">714</span> for (HRegionLocation location: locations.getRegionLocations()) {<a name="line.714"></a>
-<span class="sourceLineNo">715</span> if (location == null) {<a name="line.715"></a>
-<span class="sourceLineNo">716</span> continue;<a name="line.716"></a>
-<span class="sourceLineNo">717</span> }<a name="line.717"></a>
-<span class="sourceLineNo">718</span> ServerName sn = location.getServerName();<a name="line.718"></a>
-<span class="sourceLineNo">719</span> if (sn == null) {<a name="line.719"></a>
+<span class="sourceLineNo">675</span> private void addHole(RegionInfo a, RegionInfo b) {<a name="line.675"></a>
+<span class="sourceLineNo">676</span> this.report.holes.add(new Pair<>(a, b));<a name="line.676"></a>
+<span class="sourceLineNo">677</span> }<a name="line.677"></a>
+<span class="sourceLineNo">678</span><a name="line.678"></a>
+<span class="sourceLineNo">679</span> /**<a name="line.679"></a>
+<span class="sourceLineNo">680</span> * @return True if table is disabled or disabling; defaults false!<a name="line.680"></a>
+<span class="sourceLineNo">681</span> */<a name="line.681"></a>
+<span class="sourceLineNo">682</span> boolean isTableDisabled(RegionInfo ri) {<a name="line.682"></a>
+<span class="sourceLineNo">683</span> if (ri == null) {<a name="line.683"></a>
+<span class="sourceLineNo">684</span> return false;<a name="line.684"></a>
+<span class="sourceLineNo">685</span> }<a name="line.685"></a>
+<span class="sourceLineNo">686</span> if (this.services == null) {<a name="line.686"></a>
+<span class="sourceLineNo">687</span> return false;<a name="line.687"></a>
+<span class="sourceLineNo">688</span> }<a name="line.688"></a>
+<span class="sourceLineNo">689</span> if (this.services.getTableStateManager() == null) {<a name="line.689"></a>
+<span class="sourceLineNo">690</span> return false;<a name="line.690"></a>
+<span class="sourceLineNo">691</span> }<a name="line.691"></a>
+<span class="sourceLineNo">692</span> TableState state = null;<a name="line.692"></a>
+<span class="sourceLineNo">693</span> try {<a name="line.693"></a>
+<span class="sourceLineNo">694</span> state = this.services.getTableStateManager().getTableState(ri.getTable());<a name="line.694"></a>
+<span class="sourceLineNo">695</span> } catch (IOException e) {<a name="line.695"></a>
+<span class="sourceLineNo">696</span> LOG.warn("Failed getting table state", e);<a name="line.696"></a>
+<span class="sourceLineNo">697</span> }<a name="line.697"></a>
+<span class="sourceLineNo">698</span> return state != null && state.isDisabledOrDisabling();<a name="line.698"></a>
+<span class="sourceLineNo">699</span> }<a name="line.699"></a>
+<span class="sourceLineNo">700</span><a name="line.700"></a>
+<span class="sourceLineNo">701</span> /**<a name="line.701"></a>
+<span class="sourceLineNo">702</span> * Run through referenced servers and save off unknown and the dead.<a name="line.702"></a>
+<span class="sourceLineNo">703</span> */<a name="line.703"></a>
+<span class="sourceLineNo">704</span> private void checkServer(RegionLocations locations) {<a name="line.704"></a>
+<span class="sourceLineNo">705</span> if (this.services == null) {<a name="line.705"></a>
+<span class="sourceLineNo">706</span> // Can't do this test if no services.<a name="line.706"></a>
+<span class="sourceLineNo">707</span> return;<a name="line.707"></a>
+<span class="sourceLineNo">708</span> }<a name="line.708"></a>
+<span class="sourceLineNo">709</span> if (locations == null) {<a name="line.709"></a>
+<span class="sourceLineNo">710</span> return;<a name="line.710"></a>
+<span class="sourceLineNo">711</span> }<a name="line.711"></a>
+<span class="sourceLineNo">712</span> if (locations.getRegionLocations() == null) {<a name="line.712"></a>
+<span class="sourceLineNo">713</span> return;<a name="line.713"></a>
+<span class="sourceLineNo">714</span> }<a name="line.714"></a>
+<span class="sourceLineNo">715</span> // Check referenced servers are known/online. Here we are looking<a name="line.715"></a>
+<span class="sourceLineNo">716</span> // at both the default replica -- the main replica -- and then replica<a name="line.716"></a>
+<span class="sourceLineNo">717</span> // locations too.<a name="line.717"></a>
+<span class="sourceLineNo">718</span> for (HRegionLocation location: locations.getRegionLocations()) {<a name="line.718"></a>
+<span class="sourceLineNo">719</span> if (location == null) {<a name="line.719"></a>
<span class="sourceLineNo">720</span> continue;<a name="line.720"></a>
<span class="sourceLineNo">721</span> }<a name="line.721"></a>
-<span class="sourceLineNo">722</span> if (location.getRegion() == null) {<a name="line.722"></a>
-<span class="sourceLineNo">723</span> LOG.warn("Empty RegionInfo in {}", location);<a name="line.723"></a>
-<span class="sourceLineNo">724</span> // This should never happen but if it does, will mess up below.<a name="line.724"></a>
-<span class="sourceLineNo">725</span> continue;<a name="line.725"></a>
-<span class="sourceLineNo">726</span> }<a name="line.726"></a>
-<span class="sourceLineNo">727</span> RegionInfo ri = location.getRegion();<a name="line.727"></a>
-<span class="sourceLineNo">728</span> // Skip split parent region<a name="line.728"></a>
-<span class="sourceLineNo">729</span> if (ri.isSplitParent()) {<a name="line.729"></a>
-<span class="sourceLineNo">730</span> continue;<a name="line.730"></a>
-<span class="sourceLineNo">731</span> }<a name="line.731"></a>
-<span class="sourceLineNo">732</span> // skip the offline regions which belong to disabled table.<a name="line.732"></a>
-<span class="sourceLineNo">733</span> if (isTableDisabled(ri)) {<a name="line.733"></a>
+<span class="sourceLineNo">722</span> ServerName sn = location.getServerName();<a name="line.722"></a>
+<span class="sourceLineNo">723</span> if (sn == null) {<a name="line.723"></a>
+<span class="sourceLineNo">724</span> continue;<a name="line.724"></a>
+<span class="sourceLineNo">725</span> }<a name="line.725"></a>
+<span class="sourceLineNo">726</span> if (location.getRegion() == null) {<a name="line.726"></a>
+<span class="sourceLineNo">727</span> LOG.warn("Empty RegionInfo in {}", location);<a name="line.727"></a>
+<span class="sourceLineNo">728</span> // This should never happen but if it does, will mess up below.<a name="line.728"></a>
+<span class="sourceLineNo">729</span> continue;<a name="line.729"></a>
+<span class="sourceLineNo">730</span> }<a name="line.730"></a>
+<span class="sourceLineNo">731</span> RegionInfo ri = location.getRegion();<a name="line.731"></a>
+<span class="sourceLineNo">732</span> // Skip split parent region<a name="line.732"></a>
+<span class="sourceLineNo">733</span> if (ri.isSplitParent()) {<a name="line.733"></a>
<span class="sourceLineNo">734</span> continue;<a name="line.734"></a>
<span class="sourceLineNo">735</span> }<a name="line.735"></a>
-<span class="sourceLineNo">736</span> RegionState rs = this.services.getAssignmentManager().getRegionStates().getRegionState(ri);<a name="line.736"></a>
-<span class="sourceLineNo">737</span> if (rs == null || rs.isClosedOrAbnormallyClosed()) {<a name="line.737"></a>
-<span class="sourceLineNo">738</span> // If closed against an 'Unknown Server', that is should be fine.<a name="line.738"></a>
-<span class="sourceLineNo">739</span> continue;<a name="line.739"></a>
-<span class="sourceLineNo">740</span> }<a name="line.740"></a>
-<span class="sourceLineNo">741</span> ServerManager.ServerLiveState state = this.services.getServerManager().<a name="line.741"></a>
-<span class="sourceLineNo">742</span> isServerKnownAndOnline(sn);<a name="line.742"></a>
-<span class="sourceLineNo">743</span> switch (state) {<a name="line.743"></a>
-<span class="sourceLineNo">744</span> case UNKNOWN:<a name="line.744"></a>
-<span class="sourceLineNo">745</span> this.report.unknownServers.add(new Pair<>(ri, sn));<a name="line.745"></a>
-<span class="sourceLineNo">746</span> break;<a name="line.746"></a>
-<span class="sourceLineNo">747</span><a name="line.747"></a>
-<span class="sourceLineNo">748</span> default:<a name="line.748"></a>
-<span class="sourceLineNo">749</span> break;<a name="line.749"></a>
-<span class="sourceLineNo">750</span> }<a name="line.750"></a>
-<span class="sourceLineNo">751</span> }<a name="line.751"></a>
-<span class="sourceLineNo">752</span> }<a name="line.752"></a>
-<span class="sourceLineNo">753</span><a name="line.753"></a>
-<span class="sourceLineNo">754</span> /**<a name="line.754"></a>
-<span class="sourceLineNo">755</span> * @return True iff first row in hbase:meta or if we've broached a new table in hbase:meta<a name="line.755"></a>
-<span class="sourceLineNo">756</span> */<a name="line.756"></a>
-<span class="sourceLineNo">757</span> private boolean isTableTransition(RegionInfo ri) {<a name="line.757"></a>
-<span class="sourceLineNo">758</span> return this.previous == null ||<a name="line.758"></a>
-<span class="sourceLineNo">759</span> !this.previous.getTable().equals(ri.getTable());<a name="line.759"></a>
-<span class="sourceLineNo">760</span> }<a name="line.760"></a>
-<span class="sourceLineNo">761</span><a name="line.761"></a>
-<span class="sourceLineNo">762</span> @Override<a name="line.762"></a>
-<span class="sourceLineNo">763</span> public void close() throws IOException {<a name="line.763"></a>
-<span class="sourceLineNo">764</span> // This is a table transition... after the last region. Check previous.<a name="line.764"></a>
-<span class="sourceLineNo">765</span> // Should be last region. If not, its a hole on end of laster table.<a name="line.765"></a>
-<span class="sourceLineNo">766</span> if (this.previous != null && !this.previous.isLast()) {<a name="line.766"></a>
-<span class="sourceLineNo">767</span> addHole(this.previous, RegionInfo.UNDEFINED);<a name="line.767"></a>
-<span class="sourceLineNo">768</span> }<a name="line.768"></a>
-<span class="sourceLineNo">769</span> this.closed = true;<a name="line.769"></a>
-<span class="sourceLineNo">770</span> }<a name="line.770"></a>
-<span class="sourceLineNo">771</span> }<a name="line.771"></a>
-<span class="sourceLineNo">772</span><a name="line.772"></a>
-<span class="sourceLineNo">773</span> private static void checkLog4jProperties() {<a name="line.773"></a>
-<span class="sourceLineNo">774</span> String filename = "log4j.properties";<a name="line.774"></a>
-<span class="sourceLineNo">775</span> try {<a name="line.775"></a>
-<span class="sourceLineNo">776</span> final InputStream inStream =<a name="line.776"></a>
-<span class="sourceLineNo">777</span> CatalogJanitor.class.getClassLoader().getResourceAsStream(filename);<a name="line.777"></a>
-<span class="sourceLineNo">778</span> if (inStream != null) {<a name="line.778"></a>
-<span class="sourceLineNo">779</span> new Properties().load(inStream);<a name="line.779"></a>
-<span class="sourceLineNo">780</span> } else {<a name="line.780"></a>
-<span class="sourceLineNo">781</span> System.out.println("No " + filename + " on classpath; Add one else no logging output!");<a name="line.781"></a>
-<span class="sourceLineNo">782</span> }<a name="line.782"></a>
-<span class="sourceLineNo">783</span> } catch (IOException e) {<a name="line.783"></a>
-<span class="sourceLineNo">784</span> LOG.error("Log4j check failed", e);<a name="line.784"></a>
-<span class="sourceLineNo">785</span> }<a name="line.785"></a>
-<span class="sourceLineNo">786</span> }<a name="line.786"></a>
-<span class="sourceLineNo">787</span><a name="line.787"></a>
-<span class="sourceLineNo">788</span> /**<a name="line.788"></a>
-<span class="sourceLineNo">789</span> * For testing against a cluster.<a name="line.789"></a>
-<span class="sourceLineNo">790</span> * Doesn't have a MasterServices context so does not report on good vs bad servers.<a name="line.790"></a>
-<span class="sourceLineNo">791</span> */<a name="line.791"></a>
-<span class="sourceLineNo">792</span> public static void main(String [] args) throws IOException {<a name="line.792"></a>
-<span class="sourceLineNo">793</span> checkLog4jProperties();<a name="line.793"></a>
-<span class="sourceLineNo">794</span> ReportMakingVisitor visitor = new ReportMakingVisitor(null);<a name="line.794"></a>
-<span class="sourceLineNo">795</span> Configuration configuration = HBaseConfiguration.create();<a name="line.795"></a>
-<span class="sourceLineNo">796</span> configuration.setBoolean("hbase.defaults.for.version.skip", true);<a name="line.796"></a>
-<span class="sourceLineNo">797</span> try (Connection connection = ConnectionFactory.createConnection(configuration)) {<a name="line.797"></a>
-<span class="sourceLineNo">798</span> /* Used to generate an overlap.<a name="line.798"></a>
-<span class="sourceLineNo">799</span> */<a name="line.799"></a>
-<span class="sourceLineNo">800</span> Get g = new Get(Bytes.toBytes("t2,40,1564119846424.1db8c57d64e0733e0f027aaeae7a0bf0."));<a name="line.800"></a>
-<span class="sourceLineNo">801</span> g.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER);<a name="line.801"></a>
-<span class="sourceLineNo">802</span> try (Table t = connection.getTable(TableName.META_TABLE_NAME)) {<a name="line.802"></a>
-<span class="sourceLineNo">803</span> Result r = t.get(g);<a name="line.803"></a>
-<span class="sourceLineNo">804</span> byte [] row = g.getRow();<a name="line.804"></a>
-<span class="sourceLineNo">805</span> row[row.length - 2] <<= row[row.length - 2];<a name="line.805"></a>
-<span class="sourceLineNo">806</span> Put p = new Put(g.getRow());<a name="line.806"></a>
-<span class="sourceLineNo">807</span> p.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER,<a name="line.807"></a>
-<span class="sourceLineNo">808</span> r.getValue(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER));<a name="line.808"></a>
-<span class="sourceLineNo">809</span> t.put(p);<a name="line.809"></a>
-<span class="sourceLineNo">810</span> }<a name="line.810"></a>
-<span class="sourceLineNo">811</span> MetaTableAccessor.scanMetaForTableRegions(connection, visitor, null);<a name="line.811"></a>
-<span class="sourceLineNo">812</span> Report report = visitor.getReport();<a name="line.812"></a>
-<span class="sourceLineNo">813</span> LOG.info(report != null? report.toString(): "empty");<a name="line.813"></a>
-<span class="sourceLineNo">814</span> }<a name="line.814"></a>
-<span class="sourceLineNo">815</span> }<a name="line.815"></a>
-<span class="sourceLineNo">816</span>}<a name="line.816"></a>
+<span class="sourceLineNo">736</span> // skip the offline regions which belong to disabled table.<a name="line.736"></a>
+<span class="sourceLineNo">737</span> if (isTableDisabled(ri)) {<a name="line.737"></a>
+<span class="sourceLineNo">738</span> continue;<a name="line.738"></a>
+<span class="sourceLineNo">739</span> }<a name="line.739"></a>
+<span class="sourceLineNo">740</span> RegionState rs = this.services.getAssignmentManager().getRegionStates().getRegionState(ri);<a name="line.740"></a>
+<span class="sourceLineNo">741</span> if (rs == null || rs.isClosedOrAbnormallyClosed()) {<a name="line.741"></a>
+<span class="sourceLineNo">742</span> // If closed against an 'Unknown Server', that is should be fine.<a name="line.742"></a>
+<span class="sourceLineNo">743</span> continue;<a name="line.743"></a>
+<span class="sourceLineNo">744</span> }<a name="line.744"></a>
+<span class="sourceLineNo">745</span> ServerManager.ServerLiveState state = this.services.getServerManager().<a name="line.745"></a>
+<span class="sourceLineNo">746</span> isServerKnownAndOnline(sn);<a name="line.746"></a>
+<span class="sourceLineNo">747</span> switch (state) {<a name="line.747"></a>
+<span class="sourceLineNo">748</span> case UNKNOWN:<a name="line.748"></a>
+<span class="sourceLineNo">749</span> this.report.unknownServers.add(new Pair<>(ri, sn));<a name="line.749"></a>
+<span class="sourceLineNo">750</span> break;<a name="line.750"></a>
+<span class="sourceLineNo">751</span><a name="line.751"></a>
+<span class="sourceLineNo">752</span> default:<a name="line.752"></a>
+<span class="sourceLineNo">753</span> break;<a name="line.753"></a>
+<span class="sourceLineNo">754</span> }<a name="line.754"></a>
+<span class="sourceLineNo">755</span> }<a name="line.755"></a>
+<span class="sourceLineNo">756</span> }<a name="line.756"></a>
+<span class="sourceLineNo">757</span><a name="line.757"></a>
+<span class="sourceLineNo">758</span> /**<a name="line.758"></a>
+<span class="sourceLineNo">759</span> * @return True iff first row in hbase:meta or if we've broached a new table in hbase:meta<a name="line.759"></a>
+<span class="sourceLineNo">760</span> */<a name="line.760"></a>
+<span class="sourceLineNo">761</span> private boolean isTableTransition(RegionInfo ri) {<a name="line.761"></a>
+<span class="sourceLineNo">762</span> return this.previous == null ||<a name="line.762"></a>
+<span class="sourceLineNo">763</span> !this.previous.getTable().equals(ri.getTable());<a name="line.763"></a>
+<span class="sourceLineNo">764</span> }<a name="line.764"></a>
+<span class="sourceLineNo">765</span><a name="line.765"></a>
+<span class="sourceLineNo">766</span> @Override<a name="line.766"></a>
+<span class="sourceLineNo">767</span> public void close() throws IOException {<a name="line.767"></a>
+<span class="sourceLineNo">768</span> // This is a table transition... after the last region. Check previous.<a name="line.768"></a>
+<span class="sourceLineNo">769</span> // Should be last region. If not, its a hole on end of laster table.<a name="line.769"></a>
+<span class="sourceLineNo">770</span> if (this.previous != null && !this.previous.isLast()) {<a name="line.770"></a>
+<span class="sourceLineNo">771</span> addHole(this.previous, RegionInfo.UNDEFINED);<a name="line.771"></a>
+<span class="sourceLineNo">772</span> }<a name="line.772"></a>
+<span class="sourceLineNo">773</span> this.closed = true;<a name="line.773"></a>
+<span class="sourceLineNo">774</span> }<a name="line.774"></a>
+<span class="sourceLineNo">775</span> }<a name="line.775"></a>
+<span class="sourceLineNo">776</span><a name="line.776"></a>
+<span class="sourceLineNo">777</span> private static void checkLog4jProperties() {<a name="line.777"></a>
+<span class="sourceLineNo">778</span> String filename = "log4j.properties";<a name="line.778"></a>
+<span class="sourceLineNo">779</span> try {<a name="line.779"></a>
+<span class="sourceLineNo">780</span> final InputStream inStream =<a name="line.780"></a>
+<span class="sourceLineNo">781</span> CatalogJanitor.class.getClassLoader().getResourceAsStream(filename);<a name="line.781"></a>
+<span class="sourceLineNo">782</span> if (inStream != null) {<a name="line.782"></a>
+<span class="sourceLineNo">783</span> new Properties().load(inStream);<a name="line.783"></a>
+<span class="sourceLineNo">784</span> } else {<a name="line.784"></a>
+<span class="sourceLineNo">785</span> System.out.println("No " + filename + " on classpath; Add one else no logging output!");<a name="line.785"></a>
+<span class="sourceLineNo">786</span> }<a name="line.786"></a>
+<span class="sourceLineNo">787</span> } catch (IOException e) {<a name="line.787"></a>
+<span class="sourceLineNo">788</span> LOG.error("Log4j check failed", e);<a name="line.788"></a>
+<span class="sourceLineNo">789</span> }<a name="line.789"></a>
+<span class="sourceLineNo">790</span> }<a name="line.790"></a>
+<span class="sourceLineNo">791</span><a name="line.791"></a>
+<span class="sourceLineNo">792</span> /**<a name="line.792"></a>
+<span class="sourceLineNo">793</span> * For testing against a cluster.<a name="line.793"></a>
+<span class="sourceLineNo">794</span> * Doesn't have a MasterServices context so does not report on good vs bad servers.<a name="line.794"></a>
+<span class="sourceLineNo">795</span> */<a name="line.795"></a>
+<span class="sourceLineNo">796</span> public static void main(String [] args) throws IOException {<a name="line.796"></a>
+<span class="sourceLineNo">797</span> checkLog4jProperties();<a name="line.797"></a>
+<span class="sourceLineNo">798</span> ReportMakingVisitor visitor = new ReportMakingVisitor(null);<a name="line.798"></a>
+<span class="sourceLineNo">799</span> Configuration configuration = HBaseConfiguration.create();<a name="line.799"></a>
+<span class="sourceLineNo">800</span> configuration.setBoolean("hbase.defaults.for.version.skip", true);<a name="line.800"></a>
+<span class="sourceLineNo">801</span> try (Connection connection = ConnectionFactory.createConnection(configuration)) {<a name="line.801"></a>
+<span class="sourceLineNo">802</span> /* Used to generate an overlap.<a name="line.802"></a>
+<span class="sourceLineNo">803</span> */<a name="line.803"></a>
+<span class="sourceLineNo">804</span> Get g = new Get(Bytes.toBytes("t2,40,1564119846424.1db8c57d64e0733e0f027aaeae7a0bf0."));<a name="line.804"></a>
+<span class="sourceLineNo">805</span> g.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER);<a name="line.805"></a>
+<span class="sourceLineNo">806</span> try (Table t = connection.getTable(TableName.META_TABLE_NAME)) {<a name="line.806"></a>
+<span class="sourceLineNo">807</span> Result r = t.get(g);<a name="line.807"></a>
+<span class="sourceLineNo">808</span> byte [] row = g.getRow();<a name="line.808"></a>
+<span class="sourceLineNo">809</span> row[row.length - 2] <<= row[row.length - 2];<a name="line.809"></a>
+<span class="sourceLineNo">810</span> Put p = new Put(g.getRow());<a name="line.810"></a>
+<span class="sourceLineNo">811</span> p.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER,<a name="line.811"></a>
+<span class="sourceLineNo">812</span> r.getValue(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER));<a name="line.812"></a>
+<span class="sourceLineNo">813</span> t.put(p);<a name="line.813"></a>
+<span class="sourceLineNo">814</span> }<a name="line.814"></a>
+<span class="sourceLineNo">815</span> MetaTableAccessor.scanMetaForTableRegions(connection, visitor, null);<a name="line.815"></a>
+<span class="sourceLineNo">816</span> Report report = visitor.getReport();<a name="line.816"></a>
+<span class="sourceLineNo">817</span> LOG.info(report != null? report.toString(): "empty");<a name="line.817"></a>
+<span class="sourceLineNo">818</span> }<a name="line.818"></a>
+<span class="sourceLineNo">819</span> }<a name="line.819"></a>
+<span class="sourceLineNo">820</span>}<a name="line.820"></a>
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html
index fe0853b..8d4383e 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/CatalogJanitor.html
@@ -432,396 +432,400 @@
<span class="sourceLineNo">424</span> // It doesn't have merge qualifier, no need to clean<a name="line.424"></a>
<span class="sourceLineNo">425</span> return true;<a name="line.425"></a>
<span class="sourceLineNo">426</span> }<a name="line.426"></a>
-<span class="sourceLineNo">427</span> return cleanMergeRegion(region, parents);<a name="line.427"></a>
-<span class="sourceLineNo">428</span> }<a name="line.428"></a>
-<span class="sourceLineNo">429</span><a name="line.429"></a>
-<span class="sourceLineNo">430</span> /**<a name="line.430"></a>
-<span class="sourceLineNo">431</span> * Report made by ReportMakingVisitor<a name="line.431"></a>
-<span class="sourceLineNo">432</span> */<a name="line.432"></a>
-<span class="sourceLineNo">433</span> public static class Report {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> private final long now = EnvironmentEdgeManager.currentTime();<a name="line.434"></a>
-<span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span> // Keep Map of found split parents. These are candidates for cleanup.<a name="line.436"></a>
-<span class="sourceLineNo">437</span> // Use a comparator that has split parents come before its daughters.<a name="line.437"></a>
-<span class="sourceLineNo">438</span> final Map<RegionInfo, Result> splitParents = new TreeMap<>(new SplitParentFirstComparator());<a name="line.438"></a>
-<span class="sourceLineNo">439</span> final Map<RegionInfo, Result> mergedRegions = new TreeMap<>(RegionInfo.COMPARATOR);<a name="line.439"></a>
-<span class="sourceLineNo">440</span> int count = 0;<a name="line.440"></a>
-<span class="sourceLineNo">441</span><a name="line.441"></a>
-<span class="sourceLineNo">442</span> private final List<Pair<RegionInfo, RegionInfo>> holes = new ArrayList<>();<a name="line.442"></a>
-<span class="sourceLineNo">443</span> private final List<Pair<RegionInfo, RegionInfo>> overlaps = new ArrayList<>();<a name="line.443"></a>
-<span class="sourceLineNo">444</span><a name="line.444"></a>
-<span class="sourceLineNo">445</span> /**<a name="line.445"></a>
-<span class="sourceLineNo">446</span> * TODO: If CatalogJanitor finds an 'Unknown Server', it should 'fix' it by queuing<a name="line.446"></a>
-<span class="sourceLineNo">447</span> * a {@link org.apache.hadoop.hbase.master.procedure.HBCKServerCrashProcedure} for<a name="line.447"></a>
-<span class="sourceLineNo">448</span> * found server for it to clean up meta.<a name="line.448"></a>
-<span class="sourceLineNo">449</span> */<a name="line.449"></a>
-<span class="sourceLineNo">450</span> private final List<Pair<RegionInfo, ServerName>> unknownServers = new ArrayList<>();<a name="line.450"></a>
-<span class="sourceLineNo">451</span><a name="line.451"></a>
-<span class="sourceLineNo">452</span> private final List<byte []> emptyRegionInfo = new ArrayList<>();<a name="line.452"></a>
-<span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span> @VisibleForTesting<a name="line.454"></a>
-<span class="sourceLineNo">455</span> Report() {}<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span> public long getCreateTime() {<a name="line.457"></a>
-<span class="sourceLineNo">458</span> return this.now;<a name="line.458"></a>
-<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">427</span><a name="line.427"></a>
+<span class="sourceLineNo">428</span> // If a parent region is a merged child region and GC has not kicked in/finish its work yet,<a name="line.428"></a>
+<span class="sourceLineNo">429</span> // return false in this case to avoid kicking in a merge, trying later.<a name="line.429"></a>
+<span class="sourceLineNo">430</span> cleanMergeRegion(region, parents);<a name="line.430"></a>
+<span class="sourceLineNo">431</span> return false;<a name="line.431"></a>
+<span class="sourceLineNo">432</span> }<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> /**<a name="line.434"></a>
+<span class="sourceLineNo">435</span> * Report made by ReportMakingVisitor<a name="line.435"></a>
+<span class="sourceLineNo">436</span> */<a name="line.436"></a>
+<span class="sourceLineNo">437</span> public static class Report {<a name="line.437"></a>
+<span class="sourceLineNo">438</span> private final long now = EnvironmentEdgeManager.currentTime();<a name="line.438"></a>
+<span class="sourceLineNo">439</span><a name="line.439"></a>
+<span class="sourceLineNo">440</span> // Keep Map of found split parents. These are candidates for cleanup.<a name="line.440"></a>
+<span class="sourceLineNo">441</span> // Use a comparator that has split parents come before its daughters.<a name="line.441"></a>
+<span class="sourceLineNo">442</span> final Map<RegionInfo, Result> splitParents = new TreeMap<>(new SplitParentFirstComparator());<a name="line.442"></a>
+<span class="sourceLineNo">443</span> final Map<RegionInfo, Result> mergedRegions = new TreeMap<>(RegionInfo.COMPARATOR);<a name="line.443"></a>
+<span class="sourceLineNo">444</span> int count = 0;<a name="line.444"></a>
+<span class="sourceLineNo">445</span><a name="line.445"></a>
+<span class="sourceLineNo">446</span> private final List<Pair<RegionInfo, RegionInfo>> holes = new ArrayList<>();<a name="line.446"></a>
+<span class="sourceLineNo">447</span> private final List<Pair<RegionInfo, RegionInfo>> overlaps = new ArrayList<>();<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span> /**<a name="line.449"></a>
+<span class="sourceLineNo">450</span> * TODO: If CatalogJanitor finds an 'Unknown Server', it should 'fix' it by queuing<a name="line.450"></a>
+<span class="sourceLineNo">451</span> * a {@link org.apache.hadoop.hbase.master.procedure.HBCKServerCrashProcedure} for<a name="line.451"></a>
+<span class="sourceLineNo">452</span> * found server for it to clean up meta.<a name="line.452"></a>
+<span class="sourceLineNo">453</span> */<a name="line.453"></a>
+<span class="sourceLineNo">454</span> private final List<Pair<RegionInfo, ServerName>> unknownServers = new ArrayList<>();<a name="line.454"></a>
+<span class="sourceLineNo">455</span><a name="line.455"></a>
+<span class="sourceLineNo">456</span> private final List<byte []> emptyRegionInfo = new ArrayList<>();<a name="line.456"></a>
+<span class="sourceLineNo">457</span><a name="line.457"></a>
+<span class="sourceLineNo">458</span> @VisibleForTesting<a name="line.458"></a>
+<span class="sourceLineNo">459</span> Report() {}<a name="line.459"></a>
<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span> public List<Pair<RegionInfo, RegionInfo>> getHoles() {<a name="line.461"></a>
-<span class="sourceLineNo">462</span> return this.holes;<a name="line.462"></a>
+<span class="sourceLineNo">461</span> public long getCreateTime() {<a name="line.461"></a>
+<span class="sourceLineNo">462</span> return this.now;<a name="line.462"></a>
<span class="sourceLineNo">463</span> }<a name="line.463"></a>
<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span> /**<a name="line.465"></a>
-<span class="sourceLineNo">466</span> * @return Overlap pairs found as we scanned hbase:meta; ordered by hbase:meta<a name="line.466"></a>
-<span class="sourceLineNo">467</span> * table sort. Pairs of overlaps may have overlap with subsequent pairs.<a name="line.467"></a>
-<span class="sourceLineNo">468</span> * @see MetaFixer#calculateMerges(int, List) where we aggregate overlaps<a name="line.468"></a>
-<span class="sourceLineNo">469</span> * for a single 'merge' call.<a name="line.469"></a>
-<span class="sourceLineNo">470</span> */<a name="line.470"></a>
-<span class="sourceLineNo">471</span> public List<Pair<RegionInfo, RegionInfo>> getOverlaps() {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> return this.overlaps;<a name="line.472"></a>
-<span class="sourceLineNo">473</span> }<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span> public List<Pair<RegionInfo, ServerName>> getUnknownServers() {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> return unknownServers;<a name="line.476"></a>
+<span class="sourceLineNo">465</span> public List<Pair<RegionInfo, RegionInfo>> getHoles() {<a name="line.465"></a>
+<span class="sourceLineNo">466</span> return this.holes;<a name="line.466"></a>
+<span class="sourceLineNo">467</span> }<a name="line.467"></a>
+<span class="sourceLineNo">468</span><a name="line.468"></a>
+<span class="sourceLineNo">469</span> /**<a name="line.469"></a>
+<span class="sourceLineNo">470</span> * @return Overlap pairs found as we scanned hbase:meta; ordered by hbase:meta<a name="line.470"></a>
+<span class="sourceLineNo">471</span> * table sort. Pairs of overlaps may have overlap with subsequent pairs.<a name="line.471"></a>
+<span class="sourceLineNo">472</span> * @see MetaFixer#calculateMerges(int, List) where we aggregate overlaps<a name="line.472"></a>
+<span class="sourceLineNo">473</span> * for a single 'merge' call.<a name="line.473"></a>
+<span class="sourceLineNo">474</span> */<a name="line.474"></a>
+<span class="sourceLineNo">475</span> public List<Pair<RegionInfo, RegionInfo>> getOverlaps() {<a name="line.475"></a>
+<span class="sourceLineNo">476</span> return this.overlaps;<a name="line.476"></a>
<span class="sourceLineNo">477</span> }<a name="line.477"></a>
<span class="sourceLineNo">478</span><a name="line.478"></a>
-<span class="sourceLineNo">479</span> public List<byte[]> getEmptyRegionInfo() {<a name="line.479"></a>
-<span class="sourceLineNo">480</span> return emptyRegionInfo;<a name="line.480"></a>
+<span class="sourceLineNo">479</span> public List<Pair<RegionInfo, ServerName>> getUnknownServers() {<a name="line.479"></a>
+<span class="sourceLineNo">480</span> return unknownServers;<a name="line.480"></a>
<span class="sourceLineNo">481</span> }<a name="line.481"></a>
<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span> /**<a name="line.483"></a>
-<span class="sourceLineNo">484</span> * @return True if an 'empty' lastReport -- no problems found.<a name="line.484"></a>
-<span class="sourceLineNo">485</span> */<a name="line.485"></a>
-<span class="sourceLineNo">486</span> public boolean isEmpty() {<a name="line.486"></a>
-<span class="sourceLineNo">487</span> return this.holes.isEmpty() && this.overlaps.isEmpty() && this.unknownServers.isEmpty() &&<a name="line.487"></a>
-<span class="sourceLineNo">488</span> this.emptyRegionInfo.isEmpty();<a name="line.488"></a>
-<span class="sourceLineNo">489</span> }<a name="line.489"></a>
-<span class="sourceLineNo">490</span><a name="line.490"></a>
-<span class="sourceLineNo">491</span> @Override<a name="line.491"></a>
-<span class="sourceLineNo">492</span> public String toString() {<a name="line.492"></a>
-<span class="sourceLineNo">493</span> StringBuilder sb = new StringBuilder();<a name="line.493"></a>
-<span class="sourceLineNo">494</span> for (Pair<RegionInfo, RegionInfo> p: this.holes) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span> if (sb.length() > 0) {<a name="line.495"></a>
-<span class="sourceLineNo">496</span> sb.append(", ");<a name="line.496"></a>
-<span class="sourceLineNo">497</span> }<a name="line.497"></a>
-<span class="sourceLineNo">498</span> sb.append("hole=").append(p.getFirst().getRegionNameAsString()).append("/").<a name="line.498"></a>
-<span class="sourceLineNo">499</span> append(p.getSecond().getRegionNameAsString());<a name="line.499"></a>
-<span class="sourceLineNo">500</span> }<a name="line.500"></a>
-<span class="sourceLineNo">501</span> for (Pair<RegionInfo, RegionInfo> p: this.overlaps) {<a name="line.501"></a>
-<span class="sourceLineNo">502</span> if (sb.length() > 0) {<a name="line.502"></a>
-<span class="sourceLineNo">503</span> sb.append(", ");<a name="line.503"></a>
-<span class="sourceLineNo">504</span> }<a name="line.504"></a>
-<span class="sourceLineNo">505</span> sb.append("overlap=").append(p.getFirst().getRegionNameAsString()).append("/").<a name="line.505"></a>
-<span class="sourceLineNo">506</span> append(p.getSecond().getRegionNameAsString());<a name="line.506"></a>
-<span class="sourceLineNo">507</span> }<a name="line.507"></a>
-<span class="sourceLineNo">508</span> for (byte [] r: this.emptyRegionInfo) {<a name="line.508"></a>
-<span class="sourceLineNo">509</span> if (sb.length() > 0) {<a name="line.509"></a>
-<span class="sourceLineNo">510</span> sb.append(", ");<a name="line.510"></a>
-<span class="sourceLineNo">511</span> }<a name="line.511"></a>
-<span class="sourceLineNo">512</span> sb.append("empty=").append(Bytes.toStringBinary(r));<a name="line.512"></a>
-<span class="sourceLineNo">513</span> }<a name="line.513"></a>
-<span class="sourceLineNo">514</span> for (Pair<RegionInfo, ServerName> p: this.unknownServers) {<a name="line.514"></a>
-<span class="sourceLineNo">515</span> if (sb.length() > 0) {<a name="line.515"></a>
-<span class="sourceLineNo">516</span> sb.append(", ");<a name="line.516"></a>
-<span class="sourceLineNo">517</span> }<a name="line.517"></a>
-<span class="sourceLineNo">518</span> sb.append("unknown_server=").append(p.getSecond()).append("/").<a name="line.518"></a>
-<span class="sourceLineNo">519</span> append(p.getFirst().getRegionNameAsString());<a name="line.519"></a>
-<span class="sourceLineNo">520</span> }<a name="line.520"></a>
-<span class="sourceLineNo">521</span> return sb.toString();<a name="line.521"></a>
-<span class="sourceLineNo">522</span> }<a name="line.522"></a>
-<span class="sourceLineNo">523</span> }<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span> /**<a name="line.525"></a>
-<span class="sourceLineNo">526</span> * Visitor we use in here in CatalogJanitor to go against hbase:meta table.<a name="line.526"></a>
-<span class="sourceLineNo">527</span> * Generates a Report made of a collection of split parents and counts of rows<a name="line.527"></a>
-<span class="sourceLineNo">528</span> * in the hbase:meta table. Also runs hbase:meta consistency checks to<a name="line.528"></a>
-<span class="sourceLineNo">529</span> * generate more report. Report is NOT ready until after this visitor has been<a name="line.529"></a>
-<span class="sourceLineNo">530</span> * {@link #close()}'d.<a name="line.530"></a>
-<span class="sourceLineNo">531</span> */<a name="line.531"></a>
-<span class="sourceLineNo">532</span> static class ReportMakingVisitor implements MetaTableAccessor.CloseableVisitor {<a name="line.532"></a>
-<span class="sourceLineNo">533</span> private final MasterServices services;<a name="line.533"></a>
-<span class="sourceLineNo">534</span> private volatile boolean closed;<a name="line.534"></a>
-<span class="sourceLineNo">535</span><a name="line.535"></a>
-<span class="sourceLineNo">536</span> /**<a name="line.536"></a>
-<span class="sourceLineNo">537</span> * Report is not done until after the close has been called.<a name="line.537"></a>
-<span class="sourceLineNo">538</span> * @see #close()<a name="line.538"></a>
-<span class="sourceLineNo">539</span> * @see #getReport()<a name="line.539"></a>
-<span class="sourceLineNo">540</span> */<a name="line.540"></a>
-<span class="sourceLineNo">541</span> private Report report = new Report();<a name="line.541"></a>
-<span class="sourceLineNo">542</span><a name="line.542"></a>
-<span class="sourceLineNo">543</span> /**<a name="line.543"></a>
-<span class="sourceLineNo">544</span> * RegionInfo from previous row.<a name="line.544"></a>
-<span class="sourceLineNo">545</span> */<a name="line.545"></a>
-<span class="sourceLineNo">546</span> private RegionInfo previous = null;<a name="line.546"></a>
-<span class="sourceLineNo">547</span><a name="line.547"></a>
-<span class="sourceLineNo">548</span> /**<a name="line.548"></a>
-<span class="sourceLineNo">549</span> * Keep account of the highest end key seen as we move through hbase:meta.<a name="line.549"></a>
-<span class="sourceLineNo">550</span> * Usually, the current RegionInfo has the highest end key but if an overlap,<a name="line.550"></a>
-<span class="sourceLineNo">551</span> * this may no longer hold. An overlap may be a region with startkey 'd' and<a name="line.551"></a>
-<span class="sourceLineNo">552</span> * endkey 'g'. The next region in meta may be 'e' to 'f' and then 'f' to 'g'.<a name="line.552"></a>
-<span class="sourceLineNo">553</span> * Looking at previous and current meta row, we won't know about the 'd' to 'g'<a name="line.553"></a>
-<span class="sourceLineNo">554</span> * overlap unless we keep a running 'highest-endpoint-seen'.<a name="line.554"></a>
-<span class="sourceLineNo">555</span> */<a name="line.555"></a>
-<span class="sourceLineNo">556</span> private RegionInfo highestEndKeyRegionInfo = null;<a name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span> ReportMakingVisitor(MasterServices services) {<a name="line.558"></a>
-<span class="sourceLineNo">559</span> this.services = services;<a name="line.559"></a>
-<span class="sourceLineNo">560</span> }<a name="line.560"></a>
+<span class="sourceLineNo">483</span> public List<byte[]> getEmptyRegionInfo() {<a name="line.483"></a>
+<span class="sourceLineNo">484</span> return emptyRegionInfo;<a name="line.484"></a>
+<span class="sourceLineNo">485</span> }<a name="line.485"></a>
+<span class="sourceLineNo">486</span><a name="line.486"></a>
+<span class="sourceLineNo">487</span> /**<a name="line.487"></a>
+<span class="sourceLineNo">488</span> * @return True if an 'empty' lastReport -- no problems found.<a name="line.488"></a>
+<span class="sourceLineNo">489</span> */<a name="line.489"></a>
+<span class="sourceLineNo">490</span> public boolean isEmpty() {<a name="line.490"></a>
+<span class="sourceLineNo">491</span> return this.holes.isEmpty() && this.overlaps.isEmpty() && this.unknownServers.isEmpty() &&<a name="line.491"></a>
+<span class="sourceLineNo">492</span> this.emptyRegionInfo.isEmpty();<a name="line.492"></a>
+<span class="sourceLineNo">493</span> }<a name="line.493"></a>
+<span class="sourceLineNo">494</span><a name="line.494"></a>
+<span class="sourceLineNo">495</span> @Override<a name="line.495"></a>
+<span class="sourceLineNo">496</span> public String toString() {<a name="line.496"></a>
+<span class="sourceLineNo">497</span> StringBuilder sb = new StringBuilder();<a name="line.497"></a>
+<span class="sourceLineNo">498</span> for (Pair<RegionInfo, RegionInfo> p: this.holes) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span> if (sb.length() > 0) {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> sb.append(", ");<a name="line.500"></a>
+<span class="sourceLineNo">501</span> }<a name="line.501"></a>
+<span class="sourceLineNo">502</span> sb.append("hole=").append(p.getFirst().getRegionNameAsString()).append("/").<a name="line.502"></a>
+<span class="sourceLineNo">503</span> append(p.getSecond().getRegionNameAsString());<a name="line.503"></a>
+<span class="sourceLineNo">504</span> }<a name="line.504"></a>
+<span class="sourceLineNo">505</span> for (Pair<RegionInfo, RegionInfo> p: this.overlaps) {<a name="line.505"></a>
+<span class="sourceLineNo">506</span> if (sb.length() > 0) {<a name="line.506"></a>
+<span class="sourceLineNo">507</span> sb.append(", ");<a name="line.507"></a>
+<span class="sourceLineNo">508</span> }<a name="line.508"></a>
+<span class="sourceLineNo">509</span> sb.append("overlap=").append(p.getFirst().getRegionNameAsString()).append("/").<a name="line.509"></a>
+<span class="sourceLineNo">510</span> append(p.getSecond().getRegionNameAsString());<a name="line.510"></a>
+<span class="sourceLineNo">511</span> }<a name="line.511"></a>
+<span class="sourceLineNo">512</span> for (byte [] r: this.emptyRegionInfo) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> if (sb.length() > 0) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span> sb.append(", ");<a name="line.514"></a>
+<span class="sourceLineNo">515</span> }<a name="line.515"></a>
+<span class="sourceLineNo">516</span> sb.append("empty=").append(Bytes.toStringBinary(r));<a name="line.516"></a>
+<span class="sourceLineNo">517</span> }<a name="line.517"></a>
+<span class="sourceLineNo">518</span> for (Pair<RegionInfo, ServerName> p: this.unknownServers) {<a name="line.518"></a>
+<span class="sourceLineNo">519</span> if (sb.length() > 0) {<a name="line.519"></a>
+<span class="sourceLineNo">520</span> sb.append(", ");<a name="line.520"></a>
+<span class="sourceLineNo">521</span> }<a name="line.521"></a>
+<span class="sourceLineNo">522</span> sb.append("unknown_server=").append(p.getSecond()).append("/").<a name="line.522"></a>
+<span class="sourceLineNo">523</span> append(p.getFirst().getRegionNameAsString());<a name="line.523"></a>
+<span class="sourceLineNo">524</span> }<a name="line.524"></a>
+<span class="sourceLineNo">525</span> return sb.toString();<a name="line.525"></a>
+<span class="sourceLineNo">526</span> }<a name="line.526"></a>
+<span class="sourceLineNo">527</span> }<a name="line.527"></a>
+<span class="sourceLineNo">528</span><a name="line.528"></a>
+<span class="sourceLineNo">529</span> /**<a name="line.529"></a>
+<span class="sourceLineNo">530</span> * Visitor we use in here in CatalogJanitor to go against hbase:meta table.<a name="line.530"></a>
+<span class="sourceLineNo">531</span> * Generates a Report made of a collection of split parents and counts of rows<a name="line.531"></a>
+<span class="sourceLineNo">532</span> * in the hbase:meta table. Also runs hbase:meta consistency checks to<a name="line.532"></a>
+<span class="sourceLineNo">533</span> * generate more report. Report is NOT ready until after this visitor has been<a name="line.533"></a>
+<span class="sourceLineNo">534</span> * {@link #close()}'d.<a name="line.534"></a>
+<span class="sourceLineNo">535</span> */<a name="line.535"></a>
+<span class="sourceLineNo">536</span> static class ReportMakingVisitor implements MetaTableAccessor.CloseableVisitor {<a name="line.536"></a>
+<span class="sourceLineNo">537</span> private final MasterServices services;<a name="line.537"></a>
+<span class="sourceLineNo">538</span> private volatile boolean closed;<a name="line.538"></a>
+<span class="sourceLineNo">539</span><a name="line.539"></a>
+<span class="sourceLineNo">540</span> /**<a name="line.540"></a>
+<span class="sourceLineNo">541</span> * Report is not done until after the close has been called.<a name="line.541"></a>
+<span class="sourceLineNo">542</span> * @see #close()<a name="line.542"></a>
+<span class="sourceLineNo">543</span> * @see #getReport()<a name="line.543"></a>
+<span class="sourceLineNo">544</span> */<a name="line.544"></a>
+<span class="sourceLineNo">545</span> private Report report = new Report();<a name="line.545"></a>
+<span class="sourceLineNo">546</span><a name="line.546"></a>
+<span class="sourceLineNo">547</span> /**<a name="line.547"></a>
+<span class="sourceLineNo">548</span> * RegionInfo from previous row.<a name="line.548"></a>
+<span class="sourceLineNo">549</span> */<a name="line.549"></a>
+<span class="sourceLineNo">550</span> private RegionInfo previous = null;<a name="line.550"></a>
+<span class="sourceLineNo">551</span><a name="line.551"></a>
+<span class="sourceLineNo">552</span> /**<a name="line.552"></a>
+<span class="sourceLineNo">553</span> * Keep account of the highest end key seen as we move through hbase:meta.<a name="line.553"></a>
+<span class="sourceLineNo">554</span> * Usually, the current RegionInfo has the highest end key but if an overlap,<a name="line.554"></a>
+<span class="sourceLineNo">555</span> * this may no longer hold. An overlap may be a region with startkey 'd' and<a name="line.555"></a>
+<span class="sourceLineNo">556</span> * endkey 'g'. The next region in meta may be 'e' to 'f' and then 'f' to 'g'.<a name="line.556"></a>
+<span class="sourceLineNo">557</span> * Looking at previous and current meta row, we won't know about the 'd' to 'g'<a name="line.557"></a>
+<span class="sourceLineNo">558</span> * overlap unless we keep a running 'highest-endpoint-seen'.<a name="line.558"></a>
+<span class="sourceLineNo">559</span> */<a name="line.559"></a>
+<span class="sourceLineNo">560</span> private RegionInfo highestEndKeyRegionInfo = null;<a name="line.560"></a>
<span class="sourceLineNo">561</span><a name="line.561"></a>
-<span class="sourceLineNo">562</span> /**<a name="line.562"></a>
-<span class="sourceLineNo">563</span> * Do not call until after {@link #close()}.<a name="line.563"></a>
-<span class="sourceLineNo">564</span> * Will throw a {@link RuntimeException} if you do.<a name="line.564"></a>
-<span class="sourceLineNo">565</span> */<a name="line.565"></a>
-<span class="sourceLineNo">566</span> Report getReport() {<a name="line.566"></a>
-<span class="sourceLineNo">567</span> if (!this.closed) {<a name="line.567"></a>
-<span class="sourceLineNo">568</span> throw new RuntimeException("Report not ready until after close()");<a name="line.568"></a>
-<span class="sourceLineNo">569</span> }<a name="line.569"></a>
-<span class="sourceLineNo">570</span> return this.report;<a name="line.570"></a>
-<span class="sourceLineNo">571</span> }<a name="line.571"></a>
-<span class="sourceLineNo">572</span><a name="line.572"></a>
-<span class="sourceLineNo">573</span> @Override<a name="line.573"></a>
-<span class="sourceLineNo">574</span> public boolean visit(Result r) {<a name="line.574"></a>
-<span class="sourceLineNo">575</span> if (r == null || r.isEmpty()) {<a name="line.575"></a>
-<span class="sourceLineNo">576</span> return true;<a name="line.576"></a>
-<span class="sourceLineNo">577</span> }<a name="line.577"></a>
-<span class="sourceLineNo">578</span> this.report.count++;<a name="line.578"></a>
-<span class="sourceLineNo">579</span> RegionInfo regionInfo = null;<a name="line.579"></a>
-<span class="sourceLineNo">580</span> try {<a name="line.580"></a>
-<span class="sourceLineNo">581</span> regionInfo = metaTableConsistencyCheck(r);<a name="line.581"></a>
-<span class="sourceLineNo">582</span> } catch(Throwable t) {<a name="line.582"></a>
-<span class="sourceLineNo">583</span> LOG.warn("Failed consistency check on {}", Bytes.toStringBinary(r.getRow()), t);<a name="line.583"></a>
-<span class="sourceLineNo">584</span> }<a name="line.584"></a>
-<span class="sourceLineNo">585</span> if (regionInfo != null) {<a name="line.585"></a>
-<span class="sourceLineNo">586</span> LOG.trace(regionInfo.toString());<a name="line.586"></a>
-<span class="sourceLineNo">587</span> if (regionInfo.isSplitParent()) { // splitParent means split and offline.<a name="line.587"></a>
-<span class="sourceLineNo">588</span> this.report.splitParents.put(regionInfo, r);<a name="line.588"></a>
-<span class="sourceLineNo">589</span> }<a name="line.589"></a>
-<span class="sourceLineNo">590</span> if (MetaTableAccessor.hasMergeRegions(r.rawCells())) {<a name="line.590"></a>
-<span class="sourceLineNo">591</span> this.report.mergedRegions.put(regionInfo, r);<a name="line.591"></a>
-<span class="sourceLineNo">592</span> }<a name="line.592"></a>
-<span class="sourceLineNo">593</span> }<a name="line.593"></a>
-<span class="sourceLineNo">594</span> // Returning true means "keep scanning"<a name="line.594"></a>
-<span class="sourceLineNo">595</span> return true;<a name="line.595"></a>
-<span class="sourceLineNo">596</span> }<a name="line.596"></a>
-<span class="sourceLineNo">597</span><a name="line.597"></a>
-<span class="sourceLineNo">598</span> /**<a name="line.598"></a>
-<span class="sourceLineNo">599</span> * Check row.<a name="line.599"></a>
-<span class="sourceLineNo">600</span> * @param metaTableRow Row from hbase:meta table.<a name="line.600"></a>
-<span class="sourceLineNo">601</span> * @return Returns default regioninfo found in row parse as a convenience to save<a name="line.601"></a>
-<span class="sourceLineNo">602</span> * on having to do a double-parse of Result.<a name="line.602"></a>
-<span class="sourceLineNo">603</span> */<a name="line.603"></a>
-<span class="sourceLineNo">604</span> private RegionInfo metaTableConsistencyCheck(Result metaTableRow) {<a name="line.604"></a>
-<span class="sourceLineNo">605</span> RegionInfo ri;<a name="line.605"></a>
-<span class="sourceLineNo">606</span> // Locations comes back null if the RegionInfo field is empty.<a name="line.606"></a>
-<span class="sourceLineNo">607</span> // If locations is null, ensure the regioninfo is for sure empty before progressing.<a name="line.607"></a>
-<span class="sourceLineNo">608</span> // If really empty, report as missing regioninfo! Otherwise, can run server check<a name="line.608"></a>
-<span class="sourceLineNo">609</span> // and get RegionInfo from locations.<a name="line.609"></a>
-<span class="sourceLineNo">610</span> RegionLocations locations = MetaTableAccessor.getRegionLocations(metaTableRow);<a name="line.610"></a>
-<span class="sourceLineNo">611</span> if (locations == null) {<a name="line.611"></a>
-<span class="sourceLineNo">612</span> ri = MetaTableAccessor.getRegionInfo(metaTableRow,<a name="line.612"></a>
-<span class="sourceLineNo">613</span> MetaTableAccessor.getRegionInfoColumn());<a name="line.613"></a>
-<span class="sourceLineNo">614</span> } else {<a name="line.614"></a>
-<span class="sourceLineNo">615</span> ri = locations.getDefaultRegionLocation().getRegion();<a name="line.615"></a>
-<span class="sourceLineNo">616</span> checkServer(locations);<a name="line.616"></a>
-<span class="sourceLineNo">617</span> }<a name="line.617"></a>
-<span class="sourceLineNo">618</span><a name="line.618"></a>
-<span class="sourceLineNo">619</span> if (ri == null) {<a name="line.619"></a>
-<span class="sourceLineNo">620</span> this.report.emptyRegionInfo.add(metaTableRow.getRow());<a name="line.620"></a>
-<span class="sourceLineNo">621</span> return ri;<a name="line.621"></a>
-<span class="sourceLineNo">622</span> }<a name="line.622"></a>
-<span class="sourceLineNo">623</span><a name="line.623"></a>
-<span class="sourceLineNo">624</span> if (!Bytes.equals(metaTableRow.getRow(), ri.getRegionName())) {<a name="line.624"></a>
-<span class="sourceLineNo">625</span> LOG.warn("INCONSISTENCY: Row name is not equal to serialized info:regioninfo content; " +<a name="line.625"></a>
-<span class="sourceLineNo">626</span> "row={} {}; See if RegionInfo is referenced in another hbase:meta row? Delete?",<a name="line.626"></a>
-<span class="sourceLineNo">627</span> Bytes.toStringBinary(metaTableRow.getRow()), ri.getRegionNameAsString());<a name="line.627"></a>
-<span class="sourceLineNo">628</span> return null;<a name="line.628"></a>
-<span class="sourceLineNo">629</span> }<a name="line.629"></a>
-<span class="sourceLineNo">630</span> // Skip split parent region<a name="line.630"></a>
-<span class="sourceLineNo">631</span> if (ri.isSplitParent()) {<a name="line.631"></a>
-<span class="sourceLineNo">632</span> return ri;<a name="line.632"></a>
+<span class="sourceLineNo">562</span> ReportMakingVisitor(MasterServices services) {<a name="line.562"></a>
+<span class="sourceLineNo">563</span> this.services = services;<a name="line.563"></a>
+<span class="sourceLineNo">564</span> }<a name="line.564"></a>
+<span class="sourceLineNo">565</span><a name="line.565"></a>
+<span class="sourceLineNo">566</span> /**<a name="line.566"></a>
+<span class="sourceLineNo">567</span> * Do not call until after {@link #close()}.<a name="line.567"></a>
+<span class="sourceLineNo">568</span> * Will throw a {@link RuntimeException} if you do.<a name="line.568"></a>
+<span class="sourceLineNo">569</span> */<a name="line.569"></a>
+<span class="sourceLineNo">570</span> Report getReport() {<a name="line.570"></a>
+<span class="sourceLineNo">571</span> if (!this.closed) {<a name="line.571"></a>
+<span class="sourceLineNo">572</span> throw new RuntimeException("Report not ready until after close()");<a name="line.572"></a>
+<span class="sourceLineNo">573</span> }<a name="line.573"></a>
+<span class="sourceLineNo">574</span> return this.report;<a name="line.574"></a>
+<span class="sourceLineNo">575</span> }<a name="line.575"></a>
+<span class="sourceLineNo">576</span><a name="line.576"></a>
+<span class="sourceLineNo">577</span> @Override<a name="line.577"></a>
+<span class="sourceLineNo">578</span> public boolean visit(Result r) {<a name="line.578"></a>
+<span class="sourceLineNo">579</span> if (r == null || r.isEmpty()) {<a name="line.579"></a>
+<span class="sourceLineNo">580</span> return true;<a name="line.580"></a>
+<span class="sourceLineNo">581</span> }<a name="line.581"></a>
+<span class="sourceLineNo">582</span> this.report.count++;<a name="line.582"></a>
+<span class="sourceLineNo">583</span> RegionInfo regionInfo = null;<a name="line.583"></a>
+<span class="sourceLineNo">584</span> try {<a name="line.584"></a>
+<span class="sourceLineNo">585</span> regionInfo = metaTableConsistencyCheck(r);<a name="line.585"></a>
+<span class="sourceLineNo">586</span> } catch(Throwable t) {<a name="line.586"></a>
+<span class="sourceLineNo">587</span> LOG.warn("Failed consistency check on {}", Bytes.toStringBinary(r.getRow()), t);<a name="line.587"></a>
+<span class="sourceLineNo">588</span> }<a name="line.588"></a>
+<span class="sourceLineNo">589</span> if (regionInfo != null) {<a name="line.589"></a>
+<span class="sourceLineNo">590</span> LOG.trace(regionInfo.toString());<a name="line.590"></a>
+<span class="sourceLineNo">591</span> if (regionInfo.isSplitParent()) { // splitParent means split and offline.<a name="line.591"></a>
+<span class="sourceLineNo">592</span> this.report.splitParents.put(regionInfo, r);<a name="line.592"></a>
+<span class="sourceLineNo">593</span> }<a name="line.593"></a>
+<span class="sourceLineNo">594</span> if (MetaTableAccessor.hasMergeRegions(r.rawCells())) {<a name="line.594"></a>
+<span class="sourceLineNo">595</span> this.report.mergedRegions.put(regionInfo, r);<a name="line.595"></a>
+<span class="sourceLineNo">596</span> }<a name="line.596"></a>
+<span class="sourceLineNo">597</span> }<a name="line.597"></a>
+<span class="sourceLineNo">598</span> // Returning true means "keep scanning"<a name="line.598"></a>
+<span class="sourceLineNo">599</span> return true;<a name="line.599"></a>
+<span class="sourceLineNo">600</span> }<a name="line.600"></a>
+<span class="sourceLineNo">601</span><a name="line.601"></a>
+<span class="sourceLineNo">602</span> /**<a name="line.602"></a>
+<span class="sourceLineNo">603</span> * Check row.<a name="line.603"></a>
+<span class="sourceLineNo">604</span> * @param metaTableRow Row from hbase:meta table.<a name="line.604"></a>
+<span class="sourceLineNo">605</span> * @return Returns default regioninfo found in row parse as a convenience to save<a name="line.605"></a>
+<span class="sourceLineNo">606</span> * on having to do a double-parse of Result.<a name="line.606"></a>
+<span class="sourceLineNo">607</span> */<a name="line.607"></a>
+<span class="sourceLineNo">608</span> private RegionInfo metaTableConsistencyCheck(Result metaTableRow) {<a name="line.608"></a>
+<span class="sourceLineNo">609</span> RegionInfo ri;<a name="line.609"></a>
+<span class="sourceLineNo">610</span> // Locations comes back null if the RegionInfo field is empty.<a name="line.610"></a>
+<span class="sourceLineNo">611</span> // If locations is null, ensure the regioninfo is for sure empty before progressing.<a name="line.611"></a>
+<span class="sourceLineNo">612</span> // If really empty, report as missing regioninfo! Otherwise, can run server check<a name="line.612"></a>
+<span class="sourceLineNo">613</span> // and get RegionInfo from locations.<a name="line.613"></a>
+<span class="sourceLineNo">614</span> RegionLocations locations = MetaTableAccessor.getRegionLocations(metaTableRow);<a name="line.614"></a>
+<span class="sourceLineNo">615</span> if (locations == null) {<a name="line.615"></a>
+<span class="sourceLineNo">616</span> ri = MetaTableAccessor.getRegionInfo(metaTableRow,<a name="line.616"></a>
+<span class="sourceLineNo">617</span> MetaTableAccessor.getRegionInfoColumn());<a name="line.617"></a>
+<span class="sourceLineNo">618</span> } else {<a name="line.618"></a>
+<span class="sourceLineNo">619</span> ri = locations.getDefaultRegionLocation().getRegion();<a name="line.619"></a>
+<span class="sourceLineNo">620</span> checkServer(locations);<a name="line.620"></a>
+<span class="sourceLineNo">621</span> }<a name="line.621"></a>
+<span class="sourceLineNo">622</span><a name="line.622"></a>
+<span class="sourceLineNo">623</span> if (ri == null) {<a name="line.623"></a>
+<span class="sourceLineNo">624</span> this.report.emptyRegionInfo.add(metaTableRow.getRow());<a name="line.624"></a>
+<span class="sourceLineNo">625</span> return ri;<a name="line.625"></a>
+<span class="sourceLineNo">626</span> }<a name="line.626"></a>
+<span class="sourceLineNo">627</span><a name="line.627"></a>
+<span class="sourceLineNo">628</span> if (!Bytes.equals(metaTableRow.getRow(), ri.getRegionName())) {<a name="line.628"></a>
+<span class="sourceLineNo">629</span> LOG.warn("INCONSISTENCY: Row name is not equal to serialized info:regioninfo content; " +<a name="line.629"></a>
+<span class="sourceLineNo">630</span> "row={} {}; See if RegionInfo is referenced in another hbase:meta row? Delete?",<a name="line.630"></a>
+<span class="sourceLineNo">631</span> Bytes.toStringBinary(metaTableRow.getRow()), ri.getRegionNameAsString());<a name="line.631"></a>
+<span class="sourceLineNo">632</span> return null;<a name="line.632"></a>
<span class="sourceLineNo">633</span> }<a name="line.633"></a>
-<span class="sourceLineNo">634</span> // If table is disabled, skip integrity check.<a name="line.634"></a>
-<span class="sourceLineNo">635</span> if (!isTableDisabled(ri)) {<a name="line.635"></a>
-<span class="sourceLineNo">636</span> if (isTableTransition(ri)) {<a name="line.636"></a>
-<span class="sourceLineNo">637</span> // On table transition, look to see if last region was last in table<a name="line.637"></a>
-<span class="sourceLineNo">638</span> // and if this is the first. Report 'hole' if neither is true.<a name="line.638"></a>
-<span class="sourceLineNo">639</span> // HBCK1 used to have a special category for missing start or end keys.<a name="line.639"></a>
-<span class="sourceLineNo">640</span> // We'll just lump them in as 'holes'.<a name="line.640"></a>
-<span class="sourceLineNo">641</span> if ((this.previous != null && !this.previous.isLast()) || !ri.isFirst()) {<a name="line.641"></a>
-<span class="sourceLineNo">642</span> addHole(this.previous == null? RegionInfo.UNDEFINED: this.previous, ri);<a name="line.642"></a>
-<span class="sourceLineNo">643</span> }<a name="line.643"></a>
-<span class="sourceLineNo">644</span> } else {<a name="line.644"></a>
-<span class="sourceLineNo">645</span> if (!this.previous.isNext(ri)) {<a name="line.645"></a>
-<span class="sourceLineNo">646</span> if (this.previous.isOverlap(ri)) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span> addOverlap(this.previous, ri);<a name="line.647"></a>
-<span class="sourceLineNo">648</span> } else if (ri.isOverlap(this.highestEndKeyRegionInfo)) {<a name="line.648"></a>
-<span class="sourceLineNo">649</span> // We may have seen a region a few rows back that overlaps this one.<a name="line.649"></a>
-<span class="sourceLineNo">650</span> addOverlap(this.highestEndKeyRegionInfo, ri);<a name="line.650"></a>
-<span class="sourceLineNo">651</span> } else {<a name="line.651"></a>
-<span class="sourceLineNo">652</span> addHole(this.previous, ri);<a name="line.652"></a>
-<span class="sourceLineNo">653</span> }<a name="line.653"></a>
-<span class="sourceLineNo">654</span> } else if (ri.isOverlap(this.highestEndKeyRegionInfo)) {<a name="line.654"></a>
-<span class="sourceLineNo">655</span> // We may have seen a region a few rows back that overlaps this one<a name="line.655"></a>
-<span class="sourceLineNo">656</span> // even though it properly 'follows' the region just before.<a name="line.656"></a>
-<span class="sourceLineNo">657</span> addOverlap(this.highestEndKeyRegionInfo, ri);<a name="line.657"></a>
-<span class="sourceLineNo">658</span> }<a name="line.658"></a>
-<span class="sourceLineNo">659</span> }<a name="line.659"></a>
-<span class="sourceLineNo">660</span> }<a name="line.660"></a>
-<span class="sourceLineNo">661</span> this.previous = ri;<a name="line.661"></a>
-<span class="sourceLineNo">662</span> this.highestEndKeyRegionInfo =<a name="line.662"></a>
-<span class="sourceLineNo">663</span> MetaFixer.getRegionInfoWithLargestEndKey(this.highestEndKeyRegionInfo, ri);<a name="line.663"></a>
-<span class="sourceLineNo">664</span> return ri;<a name="line.664"></a>
-<span class="sourceLineNo">665</span> }<a name="line.665"></a>
-<span class="sourceLineNo">666</span><a name="line.666"></a>
-<span class="sourceLineNo">667</span> private void addOverlap(RegionInfo a, RegionInfo b) {<a name="line.667"></a>
-<span class="sourceLineNo">668</span> this.report.overlaps.add(new Pair<>(a, b));<a name="line.668"></a>
+<span class="sourceLineNo">634</span> // Skip split parent region<a name="line.634"></a>
+<span class="sourceLineNo">635</span> if (ri.isSplitParent()) {<a name="line.635"></a>
+<span class="sourceLineNo">636</span> return ri;<a name="line.636"></a>
+<span class="sourceLineNo">637</span> }<a name="line.637"></a>
+<span class="sourceLineNo">638</span> // If table is disabled, skip integrity check.<a name="line.638"></a>
+<span class="sourceLineNo">639</span> if (!isTableDisabled(ri)) {<a name="line.639"></a>
+<span class="sourceLineNo">640</span> if (isTableTransition(ri)) {<a name="line.640"></a>
+<span class="sourceLineNo">641</span> // On table transition, look to see if last region was last in table<a name="line.641"></a>
+<span class="sourceLineNo">642</span> // and if this is the first. Report 'hole' if neither is true.<a name="line.642"></a>
+<span class="sourceLineNo">643</span> // HBCK1 used to have a special category for missing start or end keys.<a name="line.643"></a>
+<span class="sourceLineNo">644</span> // We'll just lump them in as 'holes'.<a name="line.644"></a>
+<span class="sourceLineNo">645</span> if ((this.previous != null && !this.previous.isLast()) || !ri.isFirst()) {<a name="line.645"></a>
+<span class="sourceLineNo">646</span> addHole(this.previous == null? RegionInfo.UNDEFINED: this.previous, ri);<a name="line.646"></a>
+<span class="sourceLineNo">647</span> }<a name="line.647"></a>
+<span class="sourceLineNo">648</span> } else {<a name="line.648"></a>
+<span class="sourceLineNo">649</span> if (!this.previous.isNext(ri)) {<a name="line.649"></a>
+<span class="sourceLineNo">650</span> if (this.previous.isOverlap(ri)) {<a name="line.650"></a>
+<span class="sourceLineNo">651</span> addOverlap(this.previous, ri);<a name="line.651"></a>
+<span class="sourceLineNo">652</span> } else if (ri.isOverlap(this.highestEndKeyRegionInfo)) {<a name="line.652"></a>
+<span class="sourceLineNo">653</span> // We may have seen a region a few rows back that overlaps this one.<a name="line.653"></a>
+<span class="sourceLineNo">654</span> addOverlap(this.highestEndKeyRegionInfo, ri);<a name="line.654"></a>
+<span class="sourceLineNo">655</span> } else {<a name="line.655"></a>
+<span class="sourceLineNo">656</span> addHole(this.previous, ri);<a name="line.656"></a>
+<span class="sourceLineNo">657</span> }<a name="line.657"></a>
+<span class="sourceLineNo">658</span> } else if (ri.isOverlap(this.highestEndKeyRegionInfo)) {<a name="line.658"></a>
+<span class="sourceLineNo">659</span> // We may have seen a region a few rows back that overlaps this one<a name="line.659"></a>
+<span class="sourceLineNo">660</span> // even though it properly 'follows' the region just before.<a name="line.660"></a>
+<span class="sourceLineNo">661</span> addOverlap(this.highestEndKeyRegionInfo, ri);<a name="line.661"></a>
+<span class="sourceLineNo">662</span> }<a name="line.662"></a>
+<span class="sourceLineNo">663</span> }<a name="line.663"></a>
+<span class="sourceLineNo">664</span> }<a name="line.664"></a>
+<span class="sourceLineNo">665</span> this.previous = ri;<a name="line.665"></a>
+<span class="sourceLineNo">666</span> this.highestEndKeyRegionInfo =<a name="line.666"></a>
+<span class="sourceLineNo">667</span> MetaFixer.getRegionInfoWithLargestEndKey(this.highestEndKeyRegionInfo, ri);<a name="line.667"></a>
+<span class="sourceLineNo">668</span> return ri;<a name="line.668"></a>
<span class="sourceLineNo">669</span> }<a name="line.669"></a>
<span class="sourceLineNo">670</span><a name="line.670"></a>
-<span class="sourceLineNo">671</span> private void addHole(RegionInfo a, RegionInfo b) {<a name="line.671"></a>
-<span class="sourceLineNo">672</span> this.report.holes.add(new Pair<>(a, b));<a name="line.672"></a>
+<span class="sourceLineNo">671</span> private void addOverlap(RegionInfo a, RegionInfo b) {<a name="line.671"></a>
+<span class="sourceLineNo">672</span> this.report.overlaps.add(new Pair<>(a, b));<a name="line.672"></a>
<span class="sourceLineNo">673</span> }<a name="line.673"></a>
<span class="sourceLineNo">674</span><a name="line.674"></a>
-<span class="sourceLineNo">675</span> /**<a name="line.675"></a>
-<span class="sourceLineNo">676</span> * @return True if table is disabled or disabling; defaults false!<a name="line.676"></a>
-<span class="sourceLineNo">677</span> */<a name="line.677"></a>
-<span class="sourceLineNo">678</span> boolean isTableDisabled(RegionInfo ri) {<a name="line.678"></a>
-<span class="sourceLineNo">679</span> if (ri == null) {<a name="line.679"></a>
-<span class="sourceLineNo">680</span> return false;<a name="line.680"></a>
-<span class="sourceLineNo">681</span> }<a name="line.681"></a>
-<span class="sourceLineNo">682</span> if (this.services == null) {<a name="line.682"></a>
-<span class="sourceLineNo">683</span> return false;<a name="line.683"></a>
-<span class="sourceLineNo">684</span> }<a name="line.684"></a>
-<span class="sourceLineNo">685</span> if (this.services.getTableStateManager() == null) {<a name="line.685"></a>
-<span class="sourceLineNo">686</span> return false;<a name="line.686"></a>
-<span class="sourceLineNo">687</span> }<a name="line.687"></a>
-<span class="sourceLineNo">688</span> TableState state = null;<a name="line.688"></a>
-<span class="sourceLineNo">689</span> try {<a name="line.689"></a>
-<span class="sourceLineNo">690</span> state = this.services.getTableStateManager().getTableState(ri.getTable());<a name="line.690"></a>
-<span class="sourceLineNo">691</span> } catch (IOException e) {<a name="line.691"></a>
-<span class="sourceLineNo">692</span> LOG.warn("Failed getting table state", e);<a name="line.692"></a>
-<span class="sourceLineNo">693</span> }<a name="line.693"></a>
-<span class="sourceLineNo">694</span> return state != null && state.isDisabledOrDisabling();<a name="line.694"></a>
-<span class="sourceLineNo">695</span> }<a name="line.695"></a>
-<span class="sourceLineNo">696</span><a name="line.696"></a>
-<span class="sourceLineNo">697</span> /**<a name="line.697"></a>
-<span class="sourceLineNo">698</span> * Run through referenced servers and save off unknown and the dead.<a name="line.698"></a>
-<span class="sourceLineNo">699</span> */<a name="line.699"></a>
-<span class="sourceLineNo">700</span> private void checkServer(RegionLocations locations) {<a name="line.700"></a>
-<span class="sourceLineNo">701</span> if (this.services == null) {<a name="line.701"></a>
-<span class="sourceLineNo">702</span> // Can't do this test if no services.<a name="line.702"></a>
-<span class="sourceLineNo">703</span> return;<a name="line.703"></a>
-<span class="sourceLineNo">704</span> }<a name="line.704"></a>
-<span class="sourceLineNo">705</span> if (locations == null) {<a name="line.705"></a>
-<span class="sourceLineNo">706</span> return;<a name="line.706"></a>
-<span class="sourceLineNo">707</span> }<a name="line.707"></a>
-<span class="sourceLineNo">708</span> if (locations.getRegionLocations() == null) {<a name="line.708"></a>
-<span class="sourceLineNo">709</span> return;<a name="line.709"></a>
-<span class="sourceLineNo">710</span> }<a name="line.710"></a>
-<span class="sourceLineNo">711</span> // Check referenced servers are known/online. Here we are looking<a name="line.711"></a>
-<span class="sourceLineNo">712</span> // at both the default replica -- the main replica -- and then replica<a name="line.712"></a>
-<span class="sourceLineNo">713</span> // locations too.<a name="line.713"></a>
-<span class="sourceLineNo">714</span> for (HRegionLocation location: locations.getRegionLocations()) {<a name="line.714"></a>
-<span class="sourceLineNo">715</span> if (location == null) {<a name="line.715"></a>
-<span class="sourceLineNo">716</span> continue;<a name="line.716"></a>
-<span class="sourceLineNo">717</span> }<a name="line.717"></a>
-<span class="sourceLineNo">718</span> ServerName sn = location.getServerName();<a name="line.718"></a>
-<span class="sourceLineNo">719</span> if (sn == null) {<a name="line.719"></a>
+<span class="sourceLineNo">675</span> private void addHole(RegionInfo a, RegionInfo b) {<a name="line.675"></a>
+<span class="sourceLineNo">676</span> this.report.holes.add(new Pair<>(a, b));<a name="line.676"></a>
+<span class="sourceLineNo">677</span> }<a name="line.677"></a>
+<span class="sourceLineNo">678</span><a name="line.678"></a>
+<span class="sourceLineNo">679</span> /**<a name="line.679"></a>
+<span class="sourceLineNo">680</span> * @return True if table is disabled or disabling; defaults false!<a name="line.680"></a>
+<span class="sourceLineNo">681</span> */<a name="line.681"></a>
+<span class="sourceLineNo">682</span> boolean isTableDisabled(RegionInfo ri) {<a name="line.682"></a>
+<span class="sourceLineNo">683</span> if (ri == null) {<a name="line.683"></a>
+<span class="sourceLineNo">684</span> return false;<a name="line.684"></a>
+<span class="sourceLineNo">685</span> }<a name="line.685"></a>
+<span class="sourceLineNo">686</span> if (this.services == null) {<a name="line.686"></a>
+<span class="sourceLineNo">687</span> return false;<a name="line.687"></a>
+<span class="sourceLineNo">688</span> }<a name="line.688"></a>
+<span class="sourceLineNo">689</span> if (this.services.getTableStateManager() == null) {<a name="line.689"></a>
+<span class="sourceLineNo">690</span> return false;<a name="line.690"></a>
+<span class="sourceLineNo">691</span> }<a name="line.691"></a>
+<span class="sourceLineNo">692</span> TableState state = null;<a name="line.692"></a>
+<span class="sourceLineNo">693</span> try {<a name="line.693"></a>
+<span class="sourceLineNo">694</span> state = this.services.getTableStateManager().getTableState(ri.getTable());<a name="line.694"></a>
+<span class="sourceLineNo">695</span> } catch (IOException e) {<a name="line.695"></a>
+<span class="sourceLineNo">696</span> LOG.warn("Failed getting table state", e);<a name="line.696"></a>
+<span class="sourceLineNo">697</span> }<a name="line.697"></a>
+<span class="sourceLineNo">698</span> return state != null && state.isDisabledOrDisabling();<a name="line.698"></a>
+<span class="sourceLineNo">699</span> }<a name="line.699"></a>
+<span class="sourceLineNo">700</span><a name="line.700"></a>
+<span class="sourceLineNo">701</span> /**<a name="line.701"></a>
+<span class="sourceLineNo">702</span> * Run through referenced servers and save off unknown and the dead.<a name="line.702"></a>
+<span class="sourceLineNo">703</span> */<a name="line.703"></a>
+<span class="sourceLineNo">704</span> private void checkServer(RegionLocations locations) {<a name="line.704"></a>
+<span class="sourceLineNo">705</span> if (this.services == null) {<a name="line.705"></a>
+<span class="sourceLineNo">706</span> // Can't do this test if no services.<a name="line.706"></a>
+<span class="sourceLineNo">707</span> return;<a name="line.707"></a>
+<span class="sourceLineNo">708</span> }<a name="line.708"></a>
+<span class="sourceLineNo">709</span> if (locations == null) {<a name="line.709"></a>
+<span class="sourceLineNo">710</span> return;<a name="line.710"></a>
+<span class="sourceLineNo">711</span> }<a name="line.711"></a>
+<span class="sourceLineNo">712</span> if (locations.getRegionLocations() == null) {<a name="line.712"></a>
+<span class="sourceLineNo">713</span> return;<a name="line.713"></a>
+<span class="sourceLineNo">714</span> }<a name="line.714"></a>
+<span class="sourceLineNo">715</span> // Check referenced servers are known/online. Here we are looking<a name="line.715"></a>
+<span class="sourceLineNo">716</span> // at both the default replica -- the main replica -- and then replica<a name="line.716"></a>
+<span class="sourceLineNo">717</span> // locations too.<a name="line.717"></a>
+<span class="sourceLineNo">718</span> for (HRegionLocation location: locations.getRegionLocations()) {<a name="line.718"></a>
+<span class="sourceLineNo">719</span> if (location == null) {<a name="line.719"></a>
<span class="sourceLineNo">720</span> continue;<a name="line.720"></a>
<span class="sourceLineNo">721</span> }<a name="line.721"></a>
-<span class="sourceLineNo">722</span> if (location.getRegion() == null) {<a name="line.722"></a>
-<span class="sourceLineNo">723</span> LOG.warn("Empty RegionInfo in {}", location);<a name="line.723"></a>
-<span class="sourceLineNo">724</span> // This should never happen but if it does, will mess up below.<a name="line.724"></a>
-<span class="sourceLineNo">725</span> continue;<a name="line.725"></a>
-<span class="sourceLineNo">726</span> }<a name="line.726"></a>
-<span class="sourceLineNo">727</span> RegionInfo ri = location.getRegion();<a name="line.727"></a>
-<span class="sourceLineNo">728</span> // Skip split parent region<a name="line.728"></a>
-<span class="sourceLineNo">729</span> if (ri.isSplitParent()) {<a name="line.729"></a>
-<span class="sourceLineNo">730</span> continue;<a name="line.730"></a>
-<span class="sourceLineNo">731</span> }<a name="line.731"></a>
-<span class="sourceLineNo">732</span> // skip the offline regions which belong to disabled table.<a name="line.732"></a>
-<span class="sourceLineNo">733</span> if (isTableDisabled(ri)) {<a name="line.733"></a>
+<span class="sourceLineNo">722</span> ServerName sn = location.getServerName();<a name="line.722"></a>
+<span class="sourceLineNo">723</span> if (sn == null) {<a name="line.723"></a>
+<span class="sourceLineNo">724</span> continue;<a name="line.724"></a>
+<span class="sourceLineNo">725</span> }<a name="line.725"></a>
+<span class="sourceLineNo">726</span> if (location.getRegion() == null) {<a name="line.726"></a>
+<span class="sourceLineNo">727</span> LOG.warn("Empty RegionInfo in {}", location);<a name="line.727"></a>
+<span class="sourceLineNo">728</span> // This should never happen but if it does, will mess up below.<a name="line.728"></a>
+<span class="sourceLineNo">729</span> continue;<a name="line.729"></a>
+<span class="sourceLineNo">730</span> }<a name="line.730"></a>
+<span class="sourceLineNo">731</span> RegionInfo ri = location.getRegion();<a name="line.731"></a>
+<span class="sourceLineNo">732</span> // Skip split parent region<a name="line.732"></a>
+<span class="sourceLineNo">733</span> if (ri.isSplitParent()) {<a name="line.733"></a>
<span class="sourceLineNo">734</span> continue;<a name="line.734"></a>
<span class="sourceLineNo">735</span> }<a name="line.735"></a>
-<span class="sourceLineNo">736</span> RegionState rs = this.services.getAssignmentManager().getRegionStates().getRegionState(ri);<a name="line.736"></a>
-<span class="sourceLineNo">737</span> if (rs == null || rs.isClosedOrAbnormallyClosed()) {<a name="line.737"></a>
-<span class="sourceLineNo">738</span> // If closed against an 'Unknown Server', that is should be fine.<a name="line.738"></a>
-<span class="sourceLineNo">739</span> continue;<a name="line.739"></a>
-<span class="sourceLineNo">740</span> }<a name="line.740"></a>
-<span class="sourceLineNo">741</span> ServerManager.ServerLiveState state = this.services.getServerManager().<a name="line.741"></a>
-<span class="sourceLineNo">742</span> isServerKnownAndOnline(sn);<a name="line.742"></a>
-<span class="sourceLineNo">743</span> switch (state) {<a name="line.743"></a>
-<span class="sourceLineNo">744</span> case UNKNOWN:<a name="line.744"></a>
-<span class="sourceLineNo">745</span> this.report.unknownServers.add(new Pair<>(ri, sn));<a name="line.745"></a>
-<span class="sourceLineNo">746</span> break;<a name="line.746"></a>
-<span class="sourceLineNo">747</span><a name="line.747"></a>
-<span class="sourceLineNo">748</span> default:<a name="line.748"></a>
-<span class="sourceLineNo">749</span> break;<a name="line.749"></a>
-<span class="sourceLineNo">750</span> }<a name="line.750"></a>
-<span class="sourceLineNo">751</span> }<a name="line.751"></a>
-<span class="sourceLineNo">752</span> }<a name="line.752"></a>
-<span class="sourceLineNo">753</span><a name="line.753"></a>
-<span class="sourceLineNo">754</span> /**<a name="line.754"></a>
-<span class="sourceLineNo">755</span> * @return True iff first row in hbase:meta or if we've broached a new table in hbase:meta<a name="line.755"></a>
-<span class="sourceLineNo">756</span> */<a name="line.756"></a>
-<span class="sourceLineNo">757</span> private boolean isTableTransition(RegionInfo ri) {<a name="line.757"></a>
-<span class="sourceLineNo">758</span> return this.previous == null ||<a name="line.758"></a>
-<span class="sourceLineNo">759</span> !this.previous.getTable().equals(ri.getTable());<a name="line.759"></a>
-<span class="sourceLineNo">760</span> }<a name="line.760"></a>
-<span class="sourceLineNo">761</span><a name="line.761"></a>
-<span class="sourceLineNo">762</span> @Override<a name="line.762"></a>
-<span class="sourceLineNo">763</span> public void close() throws IOException {<a name="line.763"></a>
-<span class="sourceLineNo">764</span> // This is a table transition... after the last region. Check previous.<a name="line.764"></a>
-<span class="sourceLineNo">765</span> // Should be last region. If not, its a hole on end of laster table.<a name="line.765"></a>
-<span class="sourceLineNo">766</span> if (this.previous != null && !this.previous.isLast()) {<a name="line.766"></a>
-<span class="sourceLineNo">767</span> addHole(this.previous, RegionInfo.UNDEFINED);<a name="line.767"></a>
-<span class="sourceLineNo">768</span> }<a name="line.768"></a>
-<span class="sourceLineNo">769</span> this.closed = true;<a name="line.769"></a>
-<span class="sourceLineNo">770</span> }<a name="line.770"></a>
-<span class="sourceLineNo">771</span> }<a name="line.771"></a>
-<span class="sourceLineNo">772</span><a name="line.772"></a>
-<span class="sourceLineNo">773</span> private static void checkLog4jProperties() {<a name="line.773"></a>
-<span class="sourceLineNo">774</span> String filename = "log4j.properties";<a name="line.774"></a>
-<span class="sourceLineNo">775</span> try {<a name="line.775"></a>
-<span class="sourceLineNo">776</span> final InputStream inStream =<a name="line.776"></a>
-<span class="sourceLineNo">777</span> CatalogJanitor.class.getClassLoader().getResourceAsStream(filename);<a name="line.777"></a>
-<span class="sourceLineNo">778</span> if (inStream != null) {<a name="line.778"></a>
-<span class="sourceLineNo">779</span> new Properties().load(inStream);<a name="line.779"></a>
-<span class="sourceLineNo">780</span> } else {<a name="line.780"></a>
-<span class="sourceLineNo">781</span> System.out.println("No " + filename + " on classpath; Add one else no logging output!");<a name="line.781"></a>
-<span class="sourceLineNo">782</span> }<a name="line.782"></a>
-<span class="sourceLineNo">783</span> } catch (IOException e) {<a name="line.783"></a>
-<span class="sourceLineNo">784</span> LOG.error("Log4j check failed", e);<a name="line.784"></a>
-<span class="sourceLineNo">785</span> }<a name="line.785"></a>
-<span class="sourceLineNo">786</span> }<a name="line.786"></a>
-<span class="sourceLineNo">787</span><a name="line.787"></a>
-<span class="sourceLineNo">788</span> /**<a name="line.788"></a>
-<span class="sourceLineNo">789</span> * For testing against a cluster.<a name="line.789"></a>
-<span class="sourceLineNo">790</span> * Doesn't have a MasterServices context so does not report on good vs bad servers.<a name="line.790"></a>
-<span class="sourceLineNo">791</span> */<a name="line.791"></a>
-<span class="sourceLineNo">792</span> public static void main(String [] args) throws IOException {<a name="line.792"></a>
-<span class="sourceLineNo">793</span> checkLog4jProperties();<a name="line.793"></a>
-<span class="sourceLineNo">794</span> ReportMakingVisitor visitor = new ReportMakingVisitor(null);<a name="line.794"></a>
-<span class="sourceLineNo">795</span> Configuration configuration = HBaseConfiguration.create();<a name="line.795"></a>
-<span class="sourceLineNo">796</span> configuration.setBoolean("hbase.defaults.for.version.skip", true);<a name="line.796"></a>
-<span class="sourceLineNo">797</span> try (Connection connection = ConnectionFactory.createConnection(configuration)) {<a name="line.797"></a>
-<span class="sourceLineNo">798</span> /* Used to generate an overlap.<a name="line.798"></a>
-<span class="sourceLineNo">799</span> */<a name="line.799"></a>
-<span class="sourceLineNo">800</span> Get g = new Get(Bytes.toBytes("t2,40,1564119846424.1db8c57d64e0733e0f027aaeae7a0bf0."));<a name="line.800"></a>
-<span class="sourceLineNo">801</span> g.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER);<a name="line.801"></a>
-<span class="sourceLineNo">802</span> try (Table t = connection.getTable(TableName.META_TABLE_NAME)) {<a name="line.802"></a>
-<span class="sourceLineNo">803</span> Result r = t.get(g);<a name="line.803"></a>
-<span class="sourceLineNo">804</span> byte [] row = g.getRow();<a name="line.804"></a>
-<span class="sourceLineNo">805</span> row[row.length - 2] <<= row[row.length - 2];<a name="line.805"></a>
-<span class="sourceLineNo">806</span> Put p = new Put(g.getRow());<a name="line.806"></a>
-<span class="sourceLineNo">807</span> p.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER,<a name="line.807"></a>
-<span class="sourceLineNo">808</span> r.getValue(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER));<a name="line.808"></a>
-<span class="sourceLineNo">809</span> t.put(p);<a name="line.809"></a>
-<span class="sourceLineNo">810</span> }<a name="line.810"></a>
-<span class="sourceLineNo">811</span> MetaTableAccessor.scanMetaForTableRegions(connection, visitor, null);<a name="line.811"></a>
-<span class="sourceLineNo">812</span> Report report = visitor.getReport();<a name="line.812"></a>
-<span class="sourceLineNo">813</span> LOG.info(report != null? report.toString(): "empty");<a name="line.813"></a>
-<span class="sourceLineNo">814</span> }<a name="line.814"></a>
-<span class="sourceLineNo">815</span> }<a name="line.815"></a>
-<span class="sourceLineNo">816</span>}<a name="line.816"></a>
+<span class="sourceLineNo">736</span> // skip the offline regions which belong to disabled table.<a name="line.736"></a>
+<span class="sourceLineNo">737</span> if (isTableDisabled(ri)) {<a name="line.737"></a>
+<span class="sourceLineNo">738</span> continue;<a name="line.738"></a>
+<span class="sourceLineNo">739</span> }<a name="line.739"></a>
+<span class="sourceLineNo">740</span> RegionState rs = this.services.getAssignmentManager().getRegionStates().getRegionState(ri);<a name="line.740"></a>
+<span class="sourceLineNo">741</span> if (rs == null || rs.isClosedOrAbnormallyClosed()) {<a name="line.741"></a>
+<span class="sourceLineNo">742</span> // If closed against an 'Unknown Server', that is should be fine.<a name="line.742"></a>
+<span class="sourceLineNo">743</span> continue;<a name="line.743"></a>
+<span class="sourceLineNo">744</span> }<a name="line.744"></a>
+<span class="sourceLineNo">745</span> ServerManager.ServerLiveState state = this.services.getServerManager().<a name="line.745"></a>
+<span class="sourceLineNo">746</span> isServerKnownAndOnline(sn);<a name="line.746"></a>
+<span class="sourceLineNo">747</span> switch (state) {<a name="line.747"></a>
+<span class="sourceLineNo">748</span> case UNKNOWN:<a name="line.748"></a>
+<span class="sourceLineNo">749</span> this.report.unknownServers.add(new Pair<>(ri, sn));<a name="line.749"></a>
+<span class="sourceLineNo">750</span> break;<a name="line.750"></a>
+<span class="sourceLineNo">751</span><a name="line.751"></a>
+<span class="sourceLineNo">752</span> default:<a name="line.752"></a>
+<span class="sourceLineNo">753</span> break;<a name="line.753"></a>
+<span class="sourceLineNo">754</span> }<a name="line.754"></a>
+<span class="sourceLineNo">755</span> }<a name="line.755"></a>
+<span class="sourceLineNo">756</span> }<a name="line.756"></a>
+<span class="sourceLineNo">757</span><a name="line.757"></a>
+<span class="sourceLineNo">758</span> /**<a name="line.758"></a>
+<span class="sourceLineNo">759</span> * @return True iff first row in hbase:meta or if we've broached a new table in hbase:meta<a name="line.759"></a>
+<span class="sourceLineNo">760</span> */<a name="line.760"></a>
+<span class="sourceLineNo">761</span> private boolean isTableTransition(RegionInfo ri) {<a name="line.761"></a>
+<span class="sourceLineNo">762</span> return this.previous == null ||<a name="line.762"></a>
+<span class="sourceLineNo">763</span> !this.previous.getTable().equals(ri.getTable());<a name="line.763"></a>
+<span class="sourceLineNo">764</span> }<a name="line.764"></a>
+<span class="sourceLineNo">765</span><a name="line.765"></a>
+<span class="sourceLineNo">766</span> @Override<a name="line.766"></a>
+<span class="sourceLineNo">767</span> public void close() throws IOException {<a name="line.767"></a>
+<span class="sourceLineNo">768</span> // This is a table transition... after the last region. Check previous.<a name="line.768"></a>
+<span class="sourceLineNo">769</span> // Should be last region. If not, its a hole on end of laster table.<a name="line.769"></a>
+<span class="sourceLineNo">770</span> if (this.previous != null && !this.previous.isLast()) {<a name="line.770"></a>
+<span class="sourceLineNo">771</span> addHole(this.previous, RegionInfo.UNDEFINED);<a name="line.771"></a>
+<span class="sourceLineNo">772</span> }<a name="line.772"></a>
+<span class="sourceLineNo">773</span> this.closed = true;<a name="line.773"></a>
+<span class="sourceLineNo">774</span> }<a name="line.774"></a>
+<span class="sourceLineNo">775</span> }<a name="line.775"></a>
+<span class="sourceLineNo">776</span><a name="line.776"></a>
+<span class="sourceLineNo">777</span> private static void checkLog4jProperties() {<a name="line.777"></a>
+<span class="sourceLineNo">778</span> String filename = "log4j.properties";<a name="line.778"></a>
+<span class="sourceLineNo">779</span> try {<a name="line.779"></a>
+<span class="sourceLineNo">780</span> final InputStream inStream =<a name="line.780"></a>
+<span class="sourceLineNo">781</span> CatalogJanitor.class.getClassLoader().getResourceAsStream(filename);<a name="line.781"></a>
+<span class="sourceLineNo">782</span> if (inStream != null) {<a name="line.782"></a>
+<span class="sourceLineNo">783</span> new Properties().load(inStream);<a name="line.783"></a>
+<span class="sourceLineNo">784</span> } else {<a name="line.784"></a>
+<span class="sourceLineNo">785</span> System.out.println("No " + filename + " on classpath; Add one else no logging output!");<a name="line.785"></a>
+<span class="sourceLineNo">786</span> }<a name="line.786"></a>
+<span class="sourceLineNo">787</span> } catch (IOException e) {<a name="line.787"></a>
+<span class="sourceLineNo">788</span> LOG.error("Log4j check failed", e);<a name="line.788"></a>
+<span class="sourceLineNo">789</span> }<a name="line.789"></a>
+<span class="sourceLineNo">790</span> }<a name="line.790"></a>
+<span class="sourceLineNo">791</span><a name="line.791"></a>
+<span class="sourceLineNo">792</span> /**<a name="line.792"></a>
+<span class="sourceLineNo">793</span> * For testing against a cluster.<a name="line.793"></a>
+<span class="sourceLineNo">794</span> * Doesn't have a MasterServices context so does not report on good vs bad servers.<a name="line.794"></a>
+<span class="sourceLineNo">795</span> */<a name="line.795"></a>
+<span class="sourceLineNo">796</span> public static void main(String [] args) throws IOException {<a name="line.796"></a>
+<span class="sourceLineNo">797</span> checkLog4jProperties();<a name="line.797"></a>
+<span class="sourceLineNo">798</span> ReportMakingVisitor visitor = new ReportMakingVisitor(null);<a name="line.798"></a>
+<span class="sourceLineNo">799</span> Configuration configuration = HBaseConfiguration.create();<a name="line.799"></a>
+<span class="sourceLineNo">800</span> configuration.setBoolean("hbase.defaults.for.version.skip", true);<a name="line.800"></a>
+<span class="sourceLineNo">801</span> try (Connection connection = ConnectionFactory.createConnection(configuration)) {<a name="line.801"></a>
+<span class="sourceLineNo">802</span> /* Used to generate an overlap.<a name="line.802"></a>
+<span class="sourceLineNo">803</span> */<a name="line.803"></a>
+<span class="sourceLineNo">804</span> Get g = new Get(Bytes.toBytes("t2,40,1564119846424.1db8c57d64e0733e0f027aaeae7a0bf0."));<a name="line.804"></a>
+<span class="sourceLineNo">805</span> g.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER);<a name="line.805"></a>
+<span class="sourceLineNo">806</span> try (Table t = connection.getTable(TableName.META_TABLE_NAME)) {<a name="line.806"></a>
+<span class="sourceLineNo">807</span> Result r = t.get(g);<a name="line.807"></a>
+<span class="sourceLineNo">808</span> byte [] row = g.getRow();<a name="line.808"></a>
+<span class="sourceLineNo">809</span> row[row.length - 2] <<= row[row.length - 2];<a name="line.809"></a>
+<span class="sourceLineNo">810</span> Put p = new Put(g.getRow());<a name="line.810"></a>
+<span class="sourceLineNo">811</span> p.addColumn(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER,<a name="line.811"></a>
+<span class="sourceLineNo">812</span> r.getValue(HConstants.CATALOG_FAMILY, HConstants.REGIONINFO_QUALIFIER));<a name="line.812"></a>
+<span class="sourceLineNo">813</span> t.put(p);<a name="line.813"></a>
+<span class="sourceLineNo">814</span> }<a name="line.814"></a>
+<span class="sourceLineNo">815</span> MetaTableAccessor.scanMetaForTableRegions(connection, visitor, null);<a name="line.815"></a>
+<span class="sourceLineNo">816</span> Report report = visitor.getReport();<a name="line.816"></a>
+<span class="sourceLineNo">817</span> LOG.info(report != null? report.toString(): "empty");<a name="line.817"></a>
+<span class="sourceLineNo">818</span> }<a name="line.818"></a>
+<span class="sourceLineNo">819</span> }<a name="line.819"></a>
+<span class="sourceLineNo">820</span>}<a name="line.820"></a>
diff --git a/downloads.html b/downloads.html
index a7254fc..0fdaf6f 100644
--- a/downloads.html
+++ b/downloads.html
@@ -434,7 +434,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/export_control.html b/export_control.html
index c8ec16c..d943a66 100644
--- a/export_control.html
+++ b/export_control.html
@@ -197,7 +197,7 @@ for more details.</p>
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/index.html b/index.html
index 66978e2..13b8d99 100644
--- a/index.html
+++ b/index.html
@@ -275,7 +275,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/issue-tracking.html b/issue-tracking.html
index 7347c92..1f8f5f15 100644
--- a/issue-tracking.html
+++ b/issue-tracking.html
@@ -169,7 +169,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/mail-lists.html b/mail-lists.html
index 470bde4..ccfdef1 100644
--- a/mail-lists.html
+++ b/mail-lists.html
@@ -229,7 +229,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/metrics.html b/metrics.html
index 077bd26..fc558e9 100644
--- a/metrics.html
+++ b/metrics.html
@@ -325,7 +325,7 @@ export HBASE_REGIONSERVER_OPTS="$HBASE_JMX_OPTS -Dcom.sun.management.jmxrem
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/old_news.html b/old_news.html
index b4a30c4..0fea976 100644
--- a/old_news.html
+++ b/old_news.html
@@ -316,7 +316,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/plugin-management.html b/plugin-management.html
index 1275428..084d50f 100644
--- a/plugin-management.html
+++ b/plugin-management.html
@@ -321,7 +321,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/plugins.html b/plugins.html
index 0145239..f4561e9 100644
--- a/plugins.html
+++ b/plugins.html
@@ -248,7 +248,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/poweredbyhbase.html b/poweredbyhbase.html
index 4d8c020..f9da951 100644
--- a/poweredbyhbase.html
+++ b/poweredbyhbase.html
@@ -650,7 +650,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/project-info.html b/project-info.html
index 3559951..1d12c82 100644
--- a/project-info.html
+++ b/project-info.html
@@ -210,7 +210,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/project-reports.html b/project-reports.html
index 1c54c3a..564f200 100644
--- a/project-reports.html
+++ b/project-reports.html
@@ -186,7 +186,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/project-summary.html b/project-summary.html
index 86d1662..88d0d5a 100644
--- a/project-summary.html
+++ b/project-summary.html
@@ -212,7 +212,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/pseudo-distributed.html b/pseudo-distributed.html
index bbd7089..1d300f3 100644
--- a/pseudo-distributed.html
+++ b/pseudo-distributed.html
@@ -174,7 +174,7 @@ Running Apache HBase (TM) in pseudo-distributed mode
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/replication.html b/replication.html
index ef467ef..4a1abeb 100644
--- a/replication.html
+++ b/replication.html
@@ -169,7 +169,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/resources.html b/resources.html
index 180bafc..624dd09 100644
--- a/resources.html
+++ b/resources.html
@@ -197,7 +197,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/source-repository.html b/source-repository.html
index eac3c87..066bfb4 100644
--- a/source-repository.html
+++ b/source-repository.html
@@ -180,7 +180,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/sponsors.html b/sponsors.html
index 20548cf..22fad22 100644
--- a/sponsors.html
+++ b/sponsors.html
@@ -199,7 +199,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/supportingprojects.html b/supportingprojects.html
index dbc787e..21f969e 100644
--- a/supportingprojects.html
+++ b/supportingprojects.html
@@ -390,7 +390,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/team-list.html b/team-list.html
index 84c2c0d..706eee6 100644
--- a/team-list.html
+++ b/team-list.html
@@ -701,7 +701,7 @@
<div class="row">
<p>Copyright ©2007–2020
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-20</li>
+All rights reserved. <li id="publishDate" class="pull-right">Last Published: 2020-05-21</li>
</p>
</div>
<p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/testdevapidocs/index-all.html b/testdevapidocs/index-all.html
index 9eed66b..8e8f5f0 100644
--- a/testdevapidocs/index-all.html
+++ b/testdevapidocs/index-all.html
@@ -62788,6 +62788,11 @@
<dd>
<div class="block">This tests two region merges</div>
</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/TestMetaFixer.html#testMergeWithMergedChildRegion--">testMergeWithMergedChildRegion()</a></span> - Method in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/TestMetaFixer.html" title="class in org.apache.hadoop.hbase.master">TestMetaFixer</a></dt>
+<dd>
+<div class="block">This test covers the case that one of merged parent regions is a merged child region that
+ has not been GCed but there is no reference files anymore.</div>
+</dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/assignment/TestMergeTableRegionsProcedure.html#testMergeWithoutPONR--">testMergeWithoutPONR()</a></span> - Method in class org.apache.hadoop.hbase.master.assignment.<a href="org/apache/hadoop/hbase/master/assignment/TestMergeTableRegionsProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">TestMergeTableRegionsProcedure</a></dt>
<dd> </dd>
<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html#testMergeWithReplicas--">testMergeWithReplicas()</a></span> - Method in class org.apache.hadoop.hbase.regionserver.<a href="org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.html" title="class in org.apache.hadoop.hbase.regionserver">TestRegionMergeTransactionOnCluster</a></dt>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html
index 88e37d3..fa6650a 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html
@@ -150,8 +150,8 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true [...]
<ul>
-<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/TestBackupDeleteWithFailures.Failure.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">TestBackupDeleteWithFailures.Failure</span></a></li>
<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.FailurePhase.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">TestIncrementalBackupMergeWithFailures.FailurePhase</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/TestBackupDeleteWithFailures.Failure.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">TestBackupDeleteWithFailures.Failure</span></a></li>
</ul>
</li>
</ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/chaos/actions/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/chaos/actions/package-tree.html
index 93a914e..93d1d32 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/chaos/actions/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/chaos/actions/package-tree.html
@@ -159,8 +159,8 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true [...]
<ul>
-<li type="circle">org.apache.hadoop.hbase.chaos.actions.<a href="../../../../../../org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsAction.KillOrStart.html" title="enum in org.apache.hadoop.hbase.chaos.actions"><span class="typeNameLink">RollingBatchRestartRsAction.KillOrStart</span></a></li>
<li type="circle">org.apache.hadoop.hbase.chaos.actions.<a href="../../../../../../org/apache/hadoop/hbase/chaos/actions/RollingBatchSuspendResumeRsAction.SuspendOrResume.html" title="enum in org.apache.hadoop.hbase.chaos.actions"><span class="typeNameLink">RollingBatchSuspendResumeRsAction.SuspendOrResume</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.chaos.actions.<a href="../../../../../../org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsAction.KillOrStart.html" title="enum in org.apache.hadoop.hbase.chaos.actions"><span class="typeNameLink">RollingBatchRestartRsAction.KillOrStart</span></a></li>
</ul>
</li>
</ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/client/TestAdmin1.html b/testdevapidocs/org/apache/hadoop/hbase/client/TestAdmin1.html
index edb86f7..032df83 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/client/TestAdmin1.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/client/TestAdmin1.html
@@ -114,7 +114,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<hr>
<br>
-<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.64">TestAdmin1</a>
+<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.67">TestAdmin1</a>
extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAdminBase.html" title="class in org.apache.hadoop.hbase.client">TestAdminBase</a></pre>
<div class="block">Class to test HBaseAdmin. Spins up the minicluster once at test start and then takes it down
afterward. Add any testing of HBaseAdmin functionality here.</div>
@@ -286,7 +286,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAdminBase.htm
<ul class="blockList">
<li class="blockList">
<h4>CLASS_RULE</h4>
-<pre>public static final <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.67">CLASS_RULE</a></pre>
+<pre>public static final <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.70">CLASS_RULE</a></pre>
</li>
</ul>
<a name="LOG">
@@ -295,7 +295,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAdminBase.htm
<ul class="blockListLast">
<li class="blockList">
<h4>LOG</h4>
-<pre>private static final org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.69">LOG</a></pre>
+<pre>private static final org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.72">LOG</a></pre>
</li>
</ul>
</li>
@@ -312,7 +312,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAdminBase.htm
<ul class="blockListLast">
<li class="blockList">
<h4>TestAdmin1</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.64">TestAdmin1</a>()</pre>
+<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.67">TestAdmin1</a>()</pre>
</li>
</ul>
</li>
@@ -329,7 +329,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAdminBase.htm
<ul class="blockList">
<li class="blockList">
<h4>testSplitFlushCompactUnknownTable</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.72">testSplitFlushCompactUnknownTable</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.75">testSplitFlushCompactUnknownTable</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -343,7 +343,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAdminBase.htm
<ul class="blockList">
<li class="blockList">
<h4>testCompactionTimestamps</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.100">testCompactionTimestamps</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.103">testCompactionTimestamps</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -357,7 +357,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAdminBase.htm
<ul class="blockList">
<li class="blockList">
<h4>testColumnValidName</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.153">testColumnValidName</a>()</pre>
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.156">testColumnValidName</a>()</pre>
</li>
</ul>
<a name="testTableExist--">
@@ -366,7 +366,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAdminBase.htm
<ul class="blockList">
<li class="blockList">
<h4>testTableExist</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.158">testTableExist</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.161">testTableExist</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -380,7 +380,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAdminBase.htm
<ul class="blockList">
<li class="blockList">
<h4>testForceSplit</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.172">testForceSplit</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.175">testForceSplit</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Tests forcing split from client and having scanners successfully ride over split.</div>
<dl>
@@ -395,7 +395,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAdminBase.htm
<ul class="blockList">
<li class="blockList">
<h4>testForceSplitMultiFamily</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.190">testForceSplitMultiFamily</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.193">testForceSplitMultiFamily</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Multi-family scenario. Tests forcing split from client and having scanners successfully ride
over split.</div>
@@ -411,7 +411,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAdminBase.htm
<ul class="blockList">
<li class="blockList">
<h4>count</h4>
-<pre>private int <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.215">count</a>(org.apache.hadoop.hbase.client.ResultScanner scanner)
+<pre>private int <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.218">count</a>(org.apache.hadoop.hbase.client.ResultScanner scanner)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -425,7 +425,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAdminBase.htm
<ul class="blockList">
<li class="blockList">
<h4>splitTest</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.223">splitTest</a>(byte[] splitPoint,
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.226">splitTest</a>(byte[] splitPoint,
byte[][] familyNames,
int[] rowCounts,
int numVersions,
@@ -444,7 +444,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAdminBase.htm
<ul class="blockList">
<li class="blockList">
<h4>testSplitAndMergeWithReplicaTable</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.359">testSplitAndMergeWithReplicaTable</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.362">testSplitAndMergeWithReplicaTable</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -458,7 +458,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAdminBase.htm
<ul class="blockList">
<li class="blockList">
<h4>testInvalidColumnDescriptor</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.460">testInvalidColumnDescriptor</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.463">testInvalidColumnDescriptor</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -472,7 +472,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAdminBase.htm
<ul class="blockList">
<li class="blockList">
<h4>testHFileReplication</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.469">testHFileReplication</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.472">testHFileReplication</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Test DFS replication for column families, where one CF has default replication(3) and the other
is set to 1.</div>
@@ -488,7 +488,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAdminBase.htm
<ul class="blockList">
<li class="blockList">
<h4>testMergeRegions</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.519">testMergeRegions</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.522">testMergeRegions</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -502,7 +502,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAdminBase.htm
<ul class="blockList">
<li class="blockList">
<h4>testMergeRegionsInvalidRegionCount</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.562">testMergeRegionsInvalidRegionCount</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.582">testMergeRegionsInvalidRegionCount</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a>,
<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a>,
<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ExecutionException.html?is-external=true" title="class or interface in java.util.concurrent">ExecutionException</a></pre>
@@ -520,7 +520,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAdminBase.htm
<ul class="blockListLast">
<li class="blockList">
<h4>testSplitShouldNotHappenIfSplitIsDisabledForTable</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.597">testSplitShouldNotHappenIfSplitIsDisabledForTable</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAdmin1.html#line.617">testSplitShouldNotHappenIfSplitIsDisabledForTable</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html b/testdevapidocs/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html
index 64dde6a..71e2283 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html
@@ -119,7 +119,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<hr>
<br>
-<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.56">TestAsyncRegionAdminApi2</a>
+<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.59">TestAsyncRegionAdminApi2</a>
extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAsyncAdminBase.html" title="class in org.apache.hadoop.hbase.client">TestAsyncAdminBase</a></pre>
<div class="block">Class to test asynchronous region admin operations.</div>
<dl>
@@ -265,7 +265,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAsyncAdminBas
<ul class="blockListLast">
<li class="blockList">
<h4>CLASS_RULE</h4>
-<pre>public static final <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.59">CLASS_RULE</a></pre>
+<pre>public static final <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.62">CLASS_RULE</a></pre>
</li>
</ul>
</li>
@@ -282,7 +282,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAsyncAdminBas
<ul class="blockListLast">
<li class="blockList">
<h4>TestAsyncRegionAdminApi2</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.56">TestAsyncRegionAdminApi2</a>()</pre>
+<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.59">TestAsyncRegionAdminApi2</a>()</pre>
</li>
</ul>
</li>
@@ -299,7 +299,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAsyncAdminBas
<ul class="blockList">
<li class="blockList">
<h4>testGetRegionLocation</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.63">testGetRegionLocation</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.66">testGetRegionLocation</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -313,7 +313,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAsyncAdminBas
<ul class="blockList">
<li class="blockList">
<h4>testSplitSwitch</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.77">testSplitSwitch</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.80">testSplitSwitch</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -327,7 +327,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAsyncAdminBas
<ul class="blockList">
<li class="blockList">
<h4>testMergeSwitch</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.109">testMergeSwitch</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.112">testMergeSwitch</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -341,7 +341,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAsyncAdminBas
<ul class="blockList">
<li class="blockList">
<h4>initSplitMergeSwitch</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.143">initSplitMergeSwitch</a>()
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.146">initSplitMergeSwitch</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -355,7 +355,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAsyncAdminBas
<ul class="blockList">
<li class="blockList">
<h4>testMergeRegions</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.155">testMergeRegions</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.158">testMergeRegions</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -369,7 +369,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAsyncAdminBas
<ul class="blockList">
<li class="blockList">
<h4>testMergeRegionsInvalidRegionCount</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.185">testMergeRegionsInvalidRegionCount</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.207">testMergeRegionsInvalidRegionCount</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -383,7 +383,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAsyncAdminBas
<ul class="blockList">
<li class="blockList">
<h4>testSplitTable</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.209">testSplitTable</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.231">testSplitTable</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -397,7 +397,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/TestAsyncAdminBas
<ul class="blockListLast">
<li class="blockList">
<h4>splitTest</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.218">splitTest</a>(org.apache.hadoop.hbase.TableName tableName,
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html#line.240">splitTest</a>(org.apache.hadoop.hbase.TableName tableName,
int rowCount,
boolean isSplitRegion,
byte[] splitPoint)
diff --git a/testdevapidocs/org/apache/hadoop/hbase/master/TestMetaFixer.html b/testdevapidocs/org/apache/hadoop/hbase/master/TestMetaFixer.html
index 4552c99..079ead8 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/master/TestMetaFixer.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/master/TestMetaFixer.html
@@ -18,7 +18,7 @@
catch(err) {
}
//-->
-var methods = {"i0":9,"i1":10,"i2":9,"i3":9,"i4":9,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10};
+var methods = {"i0":9,"i1":10,"i2":9,"i3":9,"i4":9,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10};
var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
var altColor = "altColor";
var rowColor = "rowColor";
@@ -109,7 +109,7 @@ var activeTableTab = "activeTableTab";
<li class="blockList">
<hr>
<br>
-<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.57">TestMetaFixer</a>
+<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.62">TestMetaFixer</a>
extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
</li>
</ul>
@@ -187,7 +187,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
org.apache.hadoop.hbase.client.RegionInfo ri)</code> </td>
</tr>
<tr id="i2" class="altColor">
-<td class="colFirst"><code>private static void</code></td>
+<td class="colFirst"><code>private static org.apache.hadoop.hbase.client.RegionInfo</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMetaFixer.html#makeOverlap-org.apache.hadoop.hbase.master.MasterServices-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.client.RegionInfo-">makeOverlap</a></span>(org.apache.hadoop.hbase.master.MasterServices services,
org.apache.hadoop.hbase.client.RegionInfo a,
org.apache.hadoop.hbase.client.RegionInfo b)</code> </td>
@@ -202,30 +202,37 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
</tr>
<tr id="i5" class="rowColor">
<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMetaFixer.html#testMergeWithMergedChildRegion--">testMergeWithMergedChildRegion</a></span>()</code>
+<div class="block">This test covers the case that one of merged parent regions is a merged child region that
+ has not been GCed but there is no reference files anymore.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMetaFixer.html#testOneRegionTable--">testOneRegionTable</a></span>()</code>
<div class="block">Just make sure running fixMeta does right thing for the case
of a single-region Table where the region gets dropped.</div>
</td>
</tr>
-<tr id="i6" class="altColor">
+<tr id="i7" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMetaFixer.html#testOverlap--">testOverlap</a></span>()</code> </td>
</tr>
-<tr id="i7" class="rowColor">
+<tr id="i8" class="altColor">
<td class="colFirst"><code>private void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMetaFixer.html#testOverlapCommon-org.apache.hadoop.hbase.TableName-">testOverlapCommon</a></span>(org.apache.hadoop.hbase.TableName tn)</code> </td>
</tr>
-<tr id="i8" class="altColor">
+<tr id="i9" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMetaFixer.html#testOverlapWithMergeOfNonContiguous--">testOverlapWithMergeOfNonContiguous</a></span>()</code>
<div class="block">Make it so a big overlap spans many Regions, some of which are non-contiguous.</div>
</td>
</tr>
-<tr id="i9" class="rowColor">
+<tr id="i10" class="altColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMetaFixer.html#testOverlapWithSmallMergeCount--">testOverlapWithSmallMergeCount</a></span>()</code> </td>
</tr>
-<tr id="i10" class="altColor">
+<tr id="i11" class="rowColor">
<td class="colFirst"><code>void</code></td>
<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/TestMetaFixer.html#testPlugsHoles--">testPlugsHoles</a></span>()</code> </td>
</tr>
@@ -257,7 +264,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>CLASS_RULE</h4>
-<pre>public static final <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.59">CLASS_RULE</a></pre>
+<pre>public static final <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.64">CLASS_RULE</a></pre>
</li>
</ul>
<a name="name">
@@ -266,7 +273,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>name</h4>
-<pre>public org.junit.rules.TestName <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.62">name</a></pre>
+<pre>public org.junit.rules.TestName <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.67">name</a></pre>
</li>
</ul>
<a name="TEST_UTIL">
@@ -275,7 +282,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>TEST_UTIL</h4>
-<pre>private static final <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.64">TEST_UTIL</a></pre>
+<pre>private static final <a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.69">TEST_UTIL</a></pre>
</li>
</ul>
</li>
@@ -292,7 +299,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>TestMetaFixer</h4>
-<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.57">TestMetaFixer</a>()</pre>
+<pre>public <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.62">TestMetaFixer</a>()</pre>
</li>
</ul>
</li>
@@ -309,7 +316,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>setupBeforeClass</h4>
-<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.67">setupBeforeClass</a>()
+<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.72">setupBeforeClass</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -323,7 +330,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>tearDownAfterClass</h4>
-<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.72">tearDownAfterClass</a>()
+<pre>public static void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.77">tearDownAfterClass</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -337,7 +344,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>deleteRegion</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.76">deleteRegion</a>(org.apache.hadoop.hbase.master.MasterServices services,
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.81">deleteRegion</a>(org.apache.hadoop.hbase.master.MasterServices services,
org.apache.hadoop.hbase.client.RegionInfo ri)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
@@ -352,7 +359,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>testPlugsHoles</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.83">testPlugsHoles</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.88">testPlugsHoles</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -366,7 +373,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>testOneRegionTable</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.125">testOneRegionTable</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.130">testOneRegionTable</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<div class="block">Just make sure running fixMeta does right thing for the case
of a single-region Table where the region gets dropped.
@@ -384,10 +391,10 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>makeOverlap</h4>
-<pre>private static void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.144">makeOverlap</a>(org.apache.hadoop.hbase.master.MasterServices services,
- org.apache.hadoop.hbase.client.RegionInfo a,
- org.apache.hadoop.hbase.client.RegionInfo b)
- throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<pre>private static org.apache.hadoop.hbase.client.RegionInfo <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.149">makeOverlap</a>(org.apache.hadoop.hbase.master.MasterServices services,
+ org.apache.hadoop.hbase.client.RegionInfo a,
+ org.apache.hadoop.hbase.client.RegionInfo b)
+ throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
@@ -400,7 +407,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>testOverlapCommon</h4>
-<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.157">testOverlapCommon</a>(org.apache.hadoop.hbase.TableName tn)
+<pre>private void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.163">testOverlapCommon</a>(org.apache.hadoop.hbase.TableName tn)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -414,7 +421,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>testOverlap</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.174">testOverlap</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.179">testOverlap</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
@@ -428,8 +435,25 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>testOverlapWithSmallMergeCount</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.228">testOverlapWithSmallMergeCount</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.233">testOverlapWithSmallMergeCount</a>()
+ throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="testMergeWithMergedChildRegion--">
+<!-- -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testMergeWithMergedChildRegion</h4>
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.322">testMergeWithMergedChildRegion</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
+<div class="block">This test covers the case that one of merged parent regions is a merged child region that
+ has not been GCed but there is no reference files anymore. In this case, it will kick off
+ a GC procedure, but no merge will happen.</div>
<dl>
<dt><span class="throwsLabel">Throws:</span></dt>
<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
@@ -442,7 +466,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockList">
<li class="blockList">
<h4>testOverlapWithMergeOfNonContiguous</h4>
-<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.316">testOverlapWithMergeOfNonContiguous</a>()
+<pre>public void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.389">testOverlapWithMergeOfNonContiguous</a>()
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
<div class="block">Make it so a big overlap spans many Regions, some of which are non-contiguous. Make it so
we can fix this condition. HBASE-24247</div>
@@ -458,7 +482,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
<ul class="blockListLast">
<li class="blockList">
<h4>await</h4>
-<pre>private static void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.360">await</a>(long sleepMillis,
+<pre>private static void <a href="../../../../../src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html#line.432">await</a>(long sleepMillis,
<a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/BooleanSupplier.html?is-external=true" title="class or interface in java.util.function">BooleanSupplier</a> condition)
throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/InterruptedException.html?is-external=true" title="class or interface in java.lang">InterruptedException</a></pre>
<div class="block">Await the successful return of <code>condition</code>, sleeping <code>sleepMillis</code> between
diff --git a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
index 6cbb41d..616a473 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -670,18 +670,18 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true [...]
<ul>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ScanPerformanceEvaluation.ScanCounter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ScanPerformanceEvaluation.ScanCounter</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.Stat.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">IntegrationTestRegionReplicaPerf.Stat</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/PerformanceEvaluation.Counter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">PerformanceEvaluation.Counter</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.Service</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.RoleCommand</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ResourceChecker.Phase.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ResourceChecker.Phase</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterManager.ServiceType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClusterManager.ServiceType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.Signal.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.Signal</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.ACTION.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">IntegrationTestDDLMasterFailover.ACTION</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleState.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.RoleState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.RoleCommand</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.HealthSummary.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.HealthSummary</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ScanPerformanceEvaluation.ScanCounter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ScanPerformanceEvaluation.ScanCounter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ResourceChecker.Phase.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ResourceChecker.Phase</span></a></li>
<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.CommandProvider.Operation</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.Stat.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">IntegrationTestRegionReplicaPerf.Stat</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.ACTION.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">IntegrationTestDDLMasterFailover.ACTION</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.Service</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.Signal.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.Signal</span></a></li>
</ul>
</li>
</ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html
index c6bce5f..8ff917c 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html
@@ -81,14 +81,14 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Object</span></a>
<ul>
-<li type="circle">org.apache.hadoop.hbase.procedure2.Procedure<TEnvironment> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>)
+<li type="circle">org.apache.hadoop.hbase.procedure.Procedure (implements java.util.concurrent.<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Callable.html?is-external=true" title="class or interface in java.util.concurrent">Callable</a><V>, org.apache.hadoop.hbase.errorhandling.ForeignExceptionListener)
<ul>
-<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedureDescriber.TestProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedureDescriber.TestProcedure</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedure.LatchedProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedure.LatchedProcedure</span></a></li>
</ul>
</li>
-<li type="circle">org.apache.hadoop.hbase.procedure.Procedure (implements java.util.concurrent.<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Callable.html?is-external=true" title="class or interface in java.util.concurrent">Callable</a><V>, org.apache.hadoop.hbase.errorhandling.ForeignExceptionListener)
+<li type="circle">org.apache.hadoop.hbase.procedure2.Procedure<TEnvironment> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>)
<ul>
-<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedure.LatchedProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedure.LatchedProcedure</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedureDescriber.TestProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedureDescriber.TestProcedure</span></a></li>
</ul>
</li>
<li type="circle">org.apache.hadoop.hbase.procedure.ProcedureManager
diff --git a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index dae0474..18e22ae 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -242,8 +242,8 @@
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true [...]
<ul>
<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestProcedureRecovery.TestStateMachineProcedure.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestYieldProcedures.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestYieldProcedures.TestStateMachineProcedure.State</span></a></li>
<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestStateMachineProcedure.TestSMProcedureState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestYieldProcedures.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestYieldProcedures.TestStateMachineProcedure.State</span></a></li>
<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestProcedureBypass.StuckStateMachineState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestProcedureBypass.StuckStateMachineState</span></a></li>
</ul>
</li>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index c3a77b5..aa7c5e3 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -719,11 +719,11 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true [...]
<ul>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestAtomicOperation.TestStep.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestAtomicOperation.TestStep</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestMultiLogThreshold.ActionType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestMultiLogThreshold.ActionType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.Manipulation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DataBlockEncodingTool.Manipulation</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.Metric.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestRegionServerReadRequestMetrics.Metric</span></a></li>
<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.CacheOnWriteType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestCacheOnWriteInSchema.CacheOnWriteType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestAtomicOperation.TestStep.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestAtomicOperation.TestStep</span></a></li>
</ul>
</li>
</ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
index 254dc65..b901079 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
@@ -253,10 +253,10 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true [...]
<ul>
-<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestWithCellVisibilityLoadAndVerify.Counters</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Generator.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Generator.Counts</span></a></li>
<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Verify.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Verify.Counts</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestWithCellVisibilityLoadAndVerify.Counters</span></a></li>
<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestLoadAndVerify.Counters</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Generator.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Generator.Counts</span></a></li>
</ul>
</li>
</ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
index da87dd9..a8b0f08 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
@@ -163,9 +163,9 @@
<ul>
<li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a><E> (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a><T>, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true [...]
<ul>
-<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">TestWALSplit.Corruptions</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/FaultyFSLog.FailureType.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">FaultyFSLog.FailureType</span></a></li>
<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/IOTestProvider.AllowedOperations.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">IOTestProvider.AllowedOperations</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/FaultyFSLog.FailureType.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">FaultyFSLog.FailureType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">TestWALSplit.Corruptions</span></a></li>
</ul>
</li>
</ul>
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAdmin1.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAdmin1.html
index 44abd49..5e27c59 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAdmin1.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAdmin1.html
@@ -27,607 +27,627 @@
<span class="sourceLineNo">019</span><a name="line.19"></a>
<span class="sourceLineNo">020</span>import static org.junit.Assert.assertEquals;<a name="line.20"></a>
<span class="sourceLineNo">021</span>import static org.junit.Assert.assertFalse;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import static org.junit.Assert.assertTrue;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import static org.junit.Assert.fail;<a name="line.23"></a>
-<span class="sourceLineNo">024</span><a name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.io.IOException;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.util.ArrayList;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import java.util.List;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import java.util.concurrent.ExecutionException;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import java.util.concurrent.TimeUnit;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import java.util.concurrent.atomic.AtomicInteger;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.HConstants;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.HRegionLocation;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.ServerName;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.TableName;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.exceptions.MergeRegionException;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.regionserver.DisabledRegionSplitPolicy;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.regionserver.HRegion;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.regionserver.HStore;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.regionserver.HStoreFile;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.util.CommonFSUtils;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.util.FutureUtils;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.util.Threads;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.junit.ClassRule;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.junit.Test;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.junit.experimental.categories.Category;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.slf4j.Logger;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.slf4j.LoggerFactory;<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.shaded.protobuf.RequestConverter;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.MergeTableRegionsRequest;<a name="line.57"></a>
+<span class="sourceLineNo">022</span>import static org.junit.Assert.assertNotNull;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import static org.junit.Assert.assertTrue;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import static org.junit.Assert.fail;<a name="line.24"></a>
+<span class="sourceLineNo">025</span><a name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.io.IOException;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.util.ArrayList;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import java.util.List;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import java.util.concurrent.ExecutionException;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import java.util.concurrent.TimeUnit;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import java.util.concurrent.atomic.AtomicInteger;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.HConstants;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.HRegionLocation;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.ServerName;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.TableName;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.exceptions.MergeRegionException;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.master.CatalogJanitor;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.master.HMaster;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.regionserver.DisabledRegionSplitPolicy;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.regionserver.HRegion;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.regionserver.HStore;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.regionserver.HStoreFile;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.util.CommonFSUtils;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.util.FutureUtils;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.util.Threads;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.junit.ClassRule;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.junit.Test;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.junit.experimental.categories.Category;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.slf4j.Logger;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.slf4j.LoggerFactory;<a name="line.57"></a>
<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>/**<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * Class to test HBaseAdmin. Spins up the minicluster once at test start and then takes it down<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * afterward. Add any testing of HBaseAdmin functionality here.<a name="line.61"></a>
-<span class="sourceLineNo">062</span> */<a name="line.62"></a>
-<span class="sourceLineNo">063</span>@Category({ LargeTests.class, ClientTests.class })<a name="line.63"></a>
-<span class="sourceLineNo">064</span>public class TestAdmin1 extends TestAdminBase {<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span> @ClassRule<a name="line.66"></a>
-<span class="sourceLineNo">067</span> public static final HBaseClassTestRule CLASS_RULE = HBaseClassTestRule.forClass(TestAdmin1.class);<a name="line.67"></a>
+<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.shaded.protobuf.RequestConverter;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.MergeTableRegionsRequest;<a name="line.60"></a>
+<span class="sourceLineNo">061</span><a name="line.61"></a>
+<span class="sourceLineNo">062</span>/**<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * Class to test HBaseAdmin. Spins up the minicluster once at test start and then takes it down<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * afterward. Add any testing of HBaseAdmin functionality here.<a name="line.64"></a>
+<span class="sourceLineNo">065</span> */<a name="line.65"></a>
+<span class="sourceLineNo">066</span>@Category({ LargeTests.class, ClientTests.class })<a name="line.66"></a>
+<span class="sourceLineNo">067</span>public class TestAdmin1 extends TestAdminBase {<a name="line.67"></a>
<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span> private static final Logger LOG = LoggerFactory.getLogger(TestAdmin1.class);<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span> @Test<a name="line.71"></a>
-<span class="sourceLineNo">072</span> public void testSplitFlushCompactUnknownTable() throws InterruptedException {<a name="line.72"></a>
-<span class="sourceLineNo">073</span> final TableName unknowntable = TableName.valueOf(name.getMethodName());<a name="line.73"></a>
-<span class="sourceLineNo">074</span> Exception exception = null;<a name="line.74"></a>
-<span class="sourceLineNo">075</span> try {<a name="line.75"></a>
-<span class="sourceLineNo">076</span> ADMIN.compact(unknowntable);<a name="line.76"></a>
-<span class="sourceLineNo">077</span> } catch (IOException e) {<a name="line.77"></a>
-<span class="sourceLineNo">078</span> exception = e;<a name="line.78"></a>
-<span class="sourceLineNo">079</span> }<a name="line.79"></a>
-<span class="sourceLineNo">080</span> assertTrue(exception instanceof TableNotFoundException);<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span> exception = null;<a name="line.82"></a>
-<span class="sourceLineNo">083</span> try {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> ADMIN.flush(unknowntable);<a name="line.84"></a>
-<span class="sourceLineNo">085</span> } catch (IOException e) {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> exception = e;<a name="line.86"></a>
-<span class="sourceLineNo">087</span> }<a name="line.87"></a>
-<span class="sourceLineNo">088</span> assertTrue(exception instanceof TableNotFoundException);<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span> exception = null;<a name="line.90"></a>
-<span class="sourceLineNo">091</span> try {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> ADMIN.split(unknowntable);<a name="line.92"></a>
-<span class="sourceLineNo">093</span> } catch (IOException e) {<a name="line.93"></a>
-<span class="sourceLineNo">094</span> exception = e;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> }<a name="line.95"></a>
-<span class="sourceLineNo">096</span> assertTrue(exception instanceof TableNotFoundException);<a name="line.96"></a>
-<span class="sourceLineNo">097</span> }<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span> @Test<a name="line.99"></a>
-<span class="sourceLineNo">100</span> public void testCompactionTimestamps() throws Exception {<a name="line.100"></a>
-<span class="sourceLineNo">101</span> TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.101"></a>
-<span class="sourceLineNo">102</span> TableDescriptor htd = TableDescriptorBuilder.newBuilder(tableName)<a name="line.102"></a>
-<span class="sourceLineNo">103</span> .setColumnFamily(ColumnFamilyDescriptorBuilder.of("fam1")).build();<a name="line.103"></a>
-<span class="sourceLineNo">104</span> ADMIN.createTable(htd);<a name="line.104"></a>
-<span class="sourceLineNo">105</span> Table table = TEST_UTIL.getConnection().getTable(htd.getTableName());<a name="line.105"></a>
-<span class="sourceLineNo">106</span> long ts = ADMIN.getLastMajorCompactionTimestamp(tableName);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> assertEquals(0, ts);<a name="line.107"></a>
-<span class="sourceLineNo">108</span> Put p = new Put(Bytes.toBytes("row1"));<a name="line.108"></a>
-<span class="sourceLineNo">109</span> p.addColumn(Bytes.toBytes("fam1"), Bytes.toBytes("fam1"), Bytes.toBytes("fam1"));<a name="line.109"></a>
-<span class="sourceLineNo">110</span> table.put(p);<a name="line.110"></a>
-<span class="sourceLineNo">111</span> ts = ADMIN.getLastMajorCompactionTimestamp(tableName);<a name="line.111"></a>
-<span class="sourceLineNo">112</span> // no files written -> no data<a name="line.112"></a>
-<span class="sourceLineNo">113</span> assertEquals(0, ts);<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span> ADMIN.flush(tableName);<a name="line.115"></a>
-<span class="sourceLineNo">116</span> ts = ADMIN.getLastMajorCompactionTimestamp(tableName);<a name="line.116"></a>
-<span class="sourceLineNo">117</span> // still 0, we flushed a file, but no major compaction happened<a name="line.117"></a>
-<span class="sourceLineNo">118</span> assertEquals(0, ts);<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span> byte[] regionName;<a name="line.120"></a>
-<span class="sourceLineNo">121</span> try (RegionLocator l = TEST_UTIL.getConnection().getRegionLocator(tableName)) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span> regionName = l.getAllRegionLocations().get(0).getRegion().getRegionName();<a name="line.122"></a>
-<span class="sourceLineNo">123</span> }<a name="line.123"></a>
-<span class="sourceLineNo">124</span> long ts1 = ADMIN.getLastMajorCompactionTimestampForRegion(regionName);<a name="line.124"></a>
-<span class="sourceLineNo">125</span> assertEquals(ts, ts1);<a name="line.125"></a>
-<span class="sourceLineNo">126</span> p = new Put(Bytes.toBytes("row2"));<a name="line.126"></a>
-<span class="sourceLineNo">127</span> p.addColumn(Bytes.toBytes("fam1"), Bytes.toBytes("fam1"), Bytes.toBytes("fam1"));<a name="line.127"></a>
-<span class="sourceLineNo">128</span> table.put(p);<a name="line.128"></a>
-<span class="sourceLineNo">129</span> ADMIN.flush(tableName);<a name="line.129"></a>
-<span class="sourceLineNo">130</span> ts = ADMIN.getLastMajorCompactionTimestamp(tableName);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> // make sure the region API returns the same value, as the old file is still around<a name="line.131"></a>
-<span class="sourceLineNo">132</span> assertEquals(ts1, ts);<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span> TEST_UTIL.compact(tableName, true);<a name="line.134"></a>
-<span class="sourceLineNo">135</span> table.put(p);<a name="line.135"></a>
-<span class="sourceLineNo">136</span> // forces a wait for the compaction<a name="line.136"></a>
-<span class="sourceLineNo">137</span> ADMIN.flush(tableName);<a name="line.137"></a>
-<span class="sourceLineNo">138</span> ts = ADMIN.getLastMajorCompactionTimestamp(tableName);<a name="line.138"></a>
-<span class="sourceLineNo">139</span> // after a compaction our earliest timestamp will have progressed forward<a name="line.139"></a>
-<span class="sourceLineNo">140</span> assertTrue(ts > ts1);<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> // region api still the same<a name="line.142"></a>
-<span class="sourceLineNo">143</span> ts1 = ADMIN.getLastMajorCompactionTimestampForRegion(regionName);<a name="line.143"></a>
-<span class="sourceLineNo">144</span> assertEquals(ts, ts1);<a name="line.144"></a>
-<span class="sourceLineNo">145</span> table.put(p);<a name="line.145"></a>
-<span class="sourceLineNo">146</span> ADMIN.flush(tableName);<a name="line.146"></a>
-<span class="sourceLineNo">147</span> ts = ADMIN.getLastMajorCompactionTimestamp(tableName);<a name="line.147"></a>
-<span class="sourceLineNo">148</span> assertEquals(ts, ts1);<a name="line.148"></a>
-<span class="sourceLineNo">149</span> table.close();<a name="line.149"></a>
-<span class="sourceLineNo">150</span> }<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span> @Test(expected = IllegalArgumentException.class)<a name="line.152"></a>
-<span class="sourceLineNo">153</span> public void testColumnValidName() {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> ColumnFamilyDescriptorBuilder.of("\\test\\abc");<a name="line.154"></a>
-<span class="sourceLineNo">155</span> }<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span> @Test<a name="line.157"></a>
-<span class="sourceLineNo">158</span> public void testTableExist() throws IOException {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> final TableName table = TableName.valueOf(name.getMethodName());<a name="line.159"></a>
-<span class="sourceLineNo">160</span> boolean exist;<a name="line.160"></a>
-<span class="sourceLineNo">161</span> exist = ADMIN.tableExists(table);<a name="line.161"></a>
-<span class="sourceLineNo">162</span> assertEquals(false, exist);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> TEST_UTIL.createTable(table, HConstants.CATALOG_FAMILY);<a name="line.163"></a>
+<span class="sourceLineNo">069</span> @ClassRule<a name="line.69"></a>
+<span class="sourceLineNo">070</span> public static final HBaseClassTestRule CLASS_RULE = HBaseClassTestRule.forClass(TestAdmin1.class);<a name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span> private static final Logger LOG = LoggerFactory.getLogger(TestAdmin1.class);<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span> @Test<a name="line.74"></a>
+<span class="sourceLineNo">075</span> public void testSplitFlushCompactUnknownTable() throws InterruptedException {<a name="line.75"></a>
+<span class="sourceLineNo">076</span> final TableName unknowntable = TableName.valueOf(name.getMethodName());<a name="line.76"></a>
+<span class="sourceLineNo">077</span> Exception exception = null;<a name="line.77"></a>
+<span class="sourceLineNo">078</span> try {<a name="line.78"></a>
+<span class="sourceLineNo">079</span> ADMIN.compact(unknowntable);<a name="line.79"></a>
+<span class="sourceLineNo">080</span> } catch (IOException e) {<a name="line.80"></a>
+<span class="sourceLineNo">081</span> exception = e;<a name="line.81"></a>
+<span class="sourceLineNo">082</span> }<a name="line.82"></a>
+<span class="sourceLineNo">083</span> assertTrue(exception instanceof TableNotFoundException);<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span> exception = null;<a name="line.85"></a>
+<span class="sourceLineNo">086</span> try {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> ADMIN.flush(unknowntable);<a name="line.87"></a>
+<span class="sourceLineNo">088</span> } catch (IOException e) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span> exception = e;<a name="line.89"></a>
+<span class="sourceLineNo">090</span> }<a name="line.90"></a>
+<span class="sourceLineNo">091</span> assertTrue(exception instanceof TableNotFoundException);<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span> exception = null;<a name="line.93"></a>
+<span class="sourceLineNo">094</span> try {<a name="line.94"></a>
+<span class="sourceLineNo">095</span> ADMIN.split(unknowntable);<a name="line.95"></a>
+<span class="sourceLineNo">096</span> } catch (IOException e) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span> exception = e;<a name="line.97"></a>
+<span class="sourceLineNo">098</span> }<a name="line.98"></a>
+<span class="sourceLineNo">099</span> assertTrue(exception instanceof TableNotFoundException);<a name="line.99"></a>
+<span class="sourceLineNo">100</span> }<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span> @Test<a name="line.102"></a>
+<span class="sourceLineNo">103</span> public void testCompactionTimestamps() throws Exception {<a name="line.103"></a>
+<span class="sourceLineNo">104</span> TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.104"></a>
+<span class="sourceLineNo">105</span> TableDescriptor htd = TableDescriptorBuilder.newBuilder(tableName)<a name="line.105"></a>
+<span class="sourceLineNo">106</span> .setColumnFamily(ColumnFamilyDescriptorBuilder.of("fam1")).build();<a name="line.106"></a>
+<span class="sourceLineNo">107</span> ADMIN.createTable(htd);<a name="line.107"></a>
+<span class="sourceLineNo">108</span> Table table = TEST_UTIL.getConnection().getTable(htd.getTableName());<a name="line.108"></a>
+<span class="sourceLineNo">109</span> long ts = ADMIN.getLastMajorCompactionTimestamp(tableName);<a name="line.109"></a>
+<span class="sourceLineNo">110</span> assertEquals(0, ts);<a name="line.110"></a>
+<span class="sourceLineNo">111</span> Put p = new Put(Bytes.toBytes("row1"));<a name="line.111"></a>
+<span class="sourceLineNo">112</span> p.addColumn(Bytes.toBytes("fam1"), Bytes.toBytes("fam1"), Bytes.toBytes("fam1"));<a name="line.112"></a>
+<span class="sourceLineNo">113</span> table.put(p);<a name="line.113"></a>
+<span class="sourceLineNo">114</span> ts = ADMIN.getLastMajorCompactionTimestamp(tableName);<a name="line.114"></a>
+<span class="sourceLineNo">115</span> // no files written -> no data<a name="line.115"></a>
+<span class="sourceLineNo">116</span> assertEquals(0, ts);<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span> ADMIN.flush(tableName);<a name="line.118"></a>
+<span class="sourceLineNo">119</span> ts = ADMIN.getLastMajorCompactionTimestamp(tableName);<a name="line.119"></a>
+<span class="sourceLineNo">120</span> // still 0, we flushed a file, but no major compaction happened<a name="line.120"></a>
+<span class="sourceLineNo">121</span> assertEquals(0, ts);<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span> byte[] regionName;<a name="line.123"></a>
+<span class="sourceLineNo">124</span> try (RegionLocator l = TEST_UTIL.getConnection().getRegionLocator(tableName)) {<a name="line.124"></a>
+<span class="sourceLineNo">125</span> regionName = l.getAllRegionLocations().get(0).getRegion().getRegionName();<a name="line.125"></a>
+<span class="sourceLineNo">126</span> }<a name="line.126"></a>
+<span class="sourceLineNo">127</span> long ts1 = ADMIN.getLastMajorCompactionTimestampForRegion(regionName);<a name="line.127"></a>
+<span class="sourceLineNo">128</span> assertEquals(ts, ts1);<a name="line.128"></a>
+<span class="sourceLineNo">129</span> p = new Put(Bytes.toBytes("row2"));<a name="line.129"></a>
+<span class="sourceLineNo">130</span> p.addColumn(Bytes.toBytes("fam1"), Bytes.toBytes("fam1"), Bytes.toBytes("fam1"));<a name="line.130"></a>
+<span class="sourceLineNo">131</span> table.put(p);<a name="line.131"></a>
+<span class="sourceLineNo">132</span> ADMIN.flush(tableName);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> ts = ADMIN.getLastMajorCompactionTimestamp(tableName);<a name="line.133"></a>
+<span class="sourceLineNo">134</span> // make sure the region API returns the same value, as the old file is still around<a name="line.134"></a>
+<span class="sourceLineNo">135</span> assertEquals(ts1, ts);<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span> TEST_UTIL.compact(tableName, true);<a name="line.137"></a>
+<span class="sourceLineNo">138</span> table.put(p);<a name="line.138"></a>
+<span class="sourceLineNo">139</span> // forces a wait for the compaction<a name="line.139"></a>
+<span class="sourceLineNo">140</span> ADMIN.flush(tableName);<a name="line.140"></a>
+<span class="sourceLineNo">141</span> ts = ADMIN.getLastMajorCompactionTimestamp(tableName);<a name="line.141"></a>
+<span class="sourceLineNo">142</span> // after a compaction our earliest timestamp will have progressed forward<a name="line.142"></a>
+<span class="sourceLineNo">143</span> assertTrue(ts > ts1);<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span> // region api still the same<a name="line.145"></a>
+<span class="sourceLineNo">146</span> ts1 = ADMIN.getLastMajorCompactionTimestampForRegion(regionName);<a name="line.146"></a>
+<span class="sourceLineNo">147</span> assertEquals(ts, ts1);<a name="line.147"></a>
+<span class="sourceLineNo">148</span> table.put(p);<a name="line.148"></a>
+<span class="sourceLineNo">149</span> ADMIN.flush(tableName);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> ts = ADMIN.getLastMajorCompactionTimestamp(tableName);<a name="line.150"></a>
+<span class="sourceLineNo">151</span> assertEquals(ts, ts1);<a name="line.151"></a>
+<span class="sourceLineNo">152</span> table.close();<a name="line.152"></a>
+<span class="sourceLineNo">153</span> }<a name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span> @Test(expected = IllegalArgumentException.class)<a name="line.155"></a>
+<span class="sourceLineNo">156</span> public void testColumnValidName() {<a name="line.156"></a>
+<span class="sourceLineNo">157</span> ColumnFamilyDescriptorBuilder.of("\\test\\abc");<a name="line.157"></a>
+<span class="sourceLineNo">158</span> }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span> @Test<a name="line.160"></a>
+<span class="sourceLineNo">161</span> public void testTableExist() throws IOException {<a name="line.161"></a>
+<span class="sourceLineNo">162</span> final TableName table = TableName.valueOf(name.getMethodName());<a name="line.162"></a>
+<span class="sourceLineNo">163</span> boolean exist;<a name="line.163"></a>
<span class="sourceLineNo">164</span> exist = ADMIN.tableExists(table);<a name="line.164"></a>
-<span class="sourceLineNo">165</span> assertEquals(true, exist);<a name="line.165"></a>
-<span class="sourceLineNo">166</span> }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> /**<a name="line.168"></a>
-<span class="sourceLineNo">169</span> * Tests forcing split from client and having scanners successfully ride over split.<a name="line.169"></a>
-<span class="sourceLineNo">170</span> */<a name="line.170"></a>
-<span class="sourceLineNo">171</span> @Test<a name="line.171"></a>
-<span class="sourceLineNo">172</span> public void testForceSplit() throws Exception {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> byte[][] familyNames = new byte[][] { Bytes.toBytes("cf") };<a name="line.173"></a>
-<span class="sourceLineNo">174</span> int[] rowCounts = new int[] { 6000 };<a name="line.174"></a>
-<span class="sourceLineNo">175</span> int numVersions = ColumnFamilyDescriptorBuilder.DEFAULT_MAX_VERSIONS;<a name="line.175"></a>
-<span class="sourceLineNo">176</span> int blockSize = 256;<a name="line.176"></a>
-<span class="sourceLineNo">177</span> splitTest(null, familyNames, rowCounts, numVersions, blockSize, true);<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> byte[] splitKey = Bytes.toBytes(3500);<a name="line.179"></a>
-<span class="sourceLineNo">180</span> splitTest(splitKey, familyNames, rowCounts, numVersions, blockSize, true);<a name="line.180"></a>
-<span class="sourceLineNo">181</span> // test regionSplitSync<a name="line.181"></a>
-<span class="sourceLineNo">182</span> splitTest(splitKey, familyNames, rowCounts, numVersions, blockSize, false);<a name="line.182"></a>
-<span class="sourceLineNo">183</span> }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span> /**<a name="line.185"></a>
-<span class="sourceLineNo">186</span> * Multi-family scenario. Tests forcing split from client and having scanners successfully ride<a name="line.186"></a>
-<span class="sourceLineNo">187</span> * over split.<a name="line.187"></a>
-<span class="sourceLineNo">188</span> */<a name="line.188"></a>
-<span class="sourceLineNo">189</span> @Test<a name="line.189"></a>
-<span class="sourceLineNo">190</span> public void testForceSplitMultiFamily() throws Exception {<a name="line.190"></a>
-<span class="sourceLineNo">191</span> int numVersions = ColumnFamilyDescriptorBuilder.DEFAULT_MAX_VERSIONS;<a name="line.191"></a>
-<span class="sourceLineNo">192</span><a name="line.192"></a>
-<span class="sourceLineNo">193</span> // use small HFile block size so that we can have lots of blocks in HFile<a name="line.193"></a>
-<span class="sourceLineNo">194</span> // Otherwise, if there is only one block,<a name="line.194"></a>
-<span class="sourceLineNo">195</span> // HFileBlockIndex.midKey()'s value == startKey<a name="line.195"></a>
-<span class="sourceLineNo">196</span> int blockSize = 256;<a name="line.196"></a>
-<span class="sourceLineNo">197</span> byte[][] familyNames = new byte[][] { Bytes.toBytes("cf1"), Bytes.toBytes("cf2") };<a name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span> // one of the column families isn't splittable<a name="line.199"></a>
-<span class="sourceLineNo">200</span> int[] rowCounts = new int[] { 6000, 1 };<a name="line.200"></a>
-<span class="sourceLineNo">201</span> splitTest(null, familyNames, rowCounts, numVersions, blockSize, true);<a name="line.201"></a>
-<span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span> rowCounts = new int[] { 1, 6000 };<a name="line.203"></a>
+<span class="sourceLineNo">165</span> assertEquals(false, exist);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> TEST_UTIL.createTable(table, HConstants.CATALOG_FAMILY);<a name="line.166"></a>
+<span class="sourceLineNo">167</span> exist = ADMIN.tableExists(table);<a name="line.167"></a>
+<span class="sourceLineNo">168</span> assertEquals(true, exist);<a name="line.168"></a>
+<span class="sourceLineNo">169</span> }<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span> /**<a name="line.171"></a>
+<span class="sourceLineNo">172</span> * Tests forcing split from client and having scanners successfully ride over split.<a name="line.172"></a>
+<span class="sourceLineNo">173</span> */<a name="line.173"></a>
+<span class="sourceLineNo">174</span> @Test<a name="line.174"></a>
+<span class="sourceLineNo">175</span> public void testForceSplit() throws Exception {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> byte[][] familyNames = new byte[][] { Bytes.toBytes("cf") };<a name="line.176"></a>
+<span class="sourceLineNo">177</span> int[] rowCounts = new int[] { 6000 };<a name="line.177"></a>
+<span class="sourceLineNo">178</span> int numVersions = ColumnFamilyDescriptorBuilder.DEFAULT_MAX_VERSIONS;<a name="line.178"></a>
+<span class="sourceLineNo">179</span> int blockSize = 256;<a name="line.179"></a>
+<span class="sourceLineNo">180</span> splitTest(null, familyNames, rowCounts, numVersions, blockSize, true);<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span> byte[] splitKey = Bytes.toBytes(3500);<a name="line.182"></a>
+<span class="sourceLineNo">183</span> splitTest(splitKey, familyNames, rowCounts, numVersions, blockSize, true);<a name="line.183"></a>
+<span class="sourceLineNo">184</span> // test regionSplitSync<a name="line.184"></a>
+<span class="sourceLineNo">185</span> splitTest(splitKey, familyNames, rowCounts, numVersions, blockSize, false);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> }<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span> /**<a name="line.188"></a>
+<span class="sourceLineNo">189</span> * Multi-family scenario. Tests forcing split from client and having scanners successfully ride<a name="line.189"></a>
+<span class="sourceLineNo">190</span> * over split.<a name="line.190"></a>
+<span class="sourceLineNo">191</span> */<a name="line.191"></a>
+<span class="sourceLineNo">192</span> @Test<a name="line.192"></a>
+<span class="sourceLineNo">193</span> public void testForceSplitMultiFamily() throws Exception {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> int numVersions = ColumnFamilyDescriptorBuilder.DEFAULT_MAX_VERSIONS;<a name="line.194"></a>
+<span class="sourceLineNo">195</span><a name="line.195"></a>
+<span class="sourceLineNo">196</span> // use small HFile block size so that we can have lots of blocks in HFile<a name="line.196"></a>
+<span class="sourceLineNo">197</span> // Otherwise, if there is only one block,<a name="line.197"></a>
+<span class="sourceLineNo">198</span> // HFileBlockIndex.midKey()'s value == startKey<a name="line.198"></a>
+<span class="sourceLineNo">199</span> int blockSize = 256;<a name="line.199"></a>
+<span class="sourceLineNo">200</span> byte[][] familyNames = new byte[][] { Bytes.toBytes("cf1"), Bytes.toBytes("cf2") };<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span> // one of the column families isn't splittable<a name="line.202"></a>
+<span class="sourceLineNo">203</span> int[] rowCounts = new int[] { 6000, 1 };<a name="line.203"></a>
<span class="sourceLineNo">204</span> splitTest(null, familyNames, rowCounts, numVersions, blockSize, true);<a name="line.204"></a>
<span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span> // one column family has much smaller data than the other<a name="line.206"></a>
-<span class="sourceLineNo">207</span> // the split key should be based on the largest column family<a name="line.207"></a>
-<span class="sourceLineNo">208</span> rowCounts = new int[] { 6000, 300 };<a name="line.208"></a>
-<span class="sourceLineNo">209</span> splitTest(null, familyNames, rowCounts, numVersions, blockSize, true);<a name="line.209"></a>
-<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span> rowCounts = new int[] { 300, 6000 };<a name="line.211"></a>
+<span class="sourceLineNo">206</span> rowCounts = new int[] { 1, 6000 };<a name="line.206"></a>
+<span class="sourceLineNo">207</span> splitTest(null, familyNames, rowCounts, numVersions, blockSize, true);<a name="line.207"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span> // one column family has much smaller data than the other<a name="line.209"></a>
+<span class="sourceLineNo">210</span> // the split key should be based on the largest column family<a name="line.210"></a>
+<span class="sourceLineNo">211</span> rowCounts = new int[] { 6000, 300 };<a name="line.211"></a>
<span class="sourceLineNo">212</span> splitTest(null, familyNames, rowCounts, numVersions, blockSize, true);<a name="line.212"></a>
-<span class="sourceLineNo">213</span> }<a name="line.213"></a>
-<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span> private int count(ResultScanner scanner) throws IOException {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> int rows = 0;<a name="line.216"></a>
-<span class="sourceLineNo">217</span> while (scanner.next() != null) {<a name="line.217"></a>
-<span class="sourceLineNo">218</span> rows++;<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span> return rows;<a name="line.220"></a>
-<span class="sourceLineNo">221</span> }<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span> private void splitTest(byte[] splitPoint, byte[][] familyNames, int[] rowCounts, int numVersions,<a name="line.223"></a>
-<span class="sourceLineNo">224</span> int blockSize, boolean async) throws Exception {<a name="line.224"></a>
-<span class="sourceLineNo">225</span> TableName tableName = TableName.valueOf("testForceSplit");<a name="line.225"></a>
-<span class="sourceLineNo">226</span> StringBuilder sb = new StringBuilder();<a name="line.226"></a>
-<span class="sourceLineNo">227</span> // Add tail to String so can see better in logs where a test is running.<a name="line.227"></a>
-<span class="sourceLineNo">228</span> for (int i = 0; i < rowCounts.length; i++) {<a name="line.228"></a>
-<span class="sourceLineNo">229</span> sb.append("_").append(Integer.toString(rowCounts[i]));<a name="line.229"></a>
-<span class="sourceLineNo">230</span> }<a name="line.230"></a>
-<span class="sourceLineNo">231</span> assertFalse(ADMIN.tableExists(tableName));<a name="line.231"></a>
-<span class="sourceLineNo">232</span> try (final Table table = TEST_UTIL.createTable(tableName, familyNames, numVersions, blockSize);<a name="line.232"></a>
-<span class="sourceLineNo">233</span> final RegionLocator locator = TEST_UTIL.getConnection().getRegionLocator(tableName)) {<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span> int rowCount = 0;<a name="line.235"></a>
-<span class="sourceLineNo">236</span> byte[] q = new byte[0];<a name="line.236"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span> rowCounts = new int[] { 300, 6000 };<a name="line.214"></a>
+<span class="sourceLineNo">215</span> splitTest(null, familyNames, rowCounts, numVersions, blockSize, true);<a name="line.215"></a>
+<span class="sourceLineNo">216</span> }<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span> private int count(ResultScanner scanner) throws IOException {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> int rows = 0;<a name="line.219"></a>
+<span class="sourceLineNo">220</span> while (scanner.next() != null) {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> rows++;<a name="line.221"></a>
+<span class="sourceLineNo">222</span> }<a name="line.222"></a>
+<span class="sourceLineNo">223</span> return rows;<a name="line.223"></a>
+<span class="sourceLineNo">224</span> }<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> private void splitTest(byte[] splitPoint, byte[][] familyNames, int[] rowCounts, int numVersions,<a name="line.226"></a>
+<span class="sourceLineNo">227</span> int blockSize, boolean async) throws Exception {<a name="line.227"></a>
+<span class="sourceLineNo">228</span> TableName tableName = TableName.valueOf("testForceSplit");<a name="line.228"></a>
+<span class="sourceLineNo">229</span> StringBuilder sb = new StringBuilder();<a name="line.229"></a>
+<span class="sourceLineNo">230</span> // Add tail to String so can see better in logs where a test is running.<a name="line.230"></a>
+<span class="sourceLineNo">231</span> for (int i = 0; i < rowCounts.length; i++) {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> sb.append("_").append(Integer.toString(rowCounts[i]));<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<a name="line.233"></a>
+<span class="sourceLineNo">234</span> assertFalse(ADMIN.tableExists(tableName));<a name="line.234"></a>
+<span class="sourceLineNo">235</span> try (final Table table = TEST_UTIL.createTable(tableName, familyNames, numVersions, blockSize);<a name="line.235"></a>
+<span class="sourceLineNo">236</span> final RegionLocator locator = TEST_UTIL.getConnection().getRegionLocator(tableName)) {<a name="line.236"></a>
<span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span> // insert rows into column families. The number of rows that have values<a name="line.238"></a>
-<span class="sourceLineNo">239</span> // in a specific column family is decided by rowCounts[familyIndex]<a name="line.239"></a>
-<span class="sourceLineNo">240</span> for (int index = 0; index < familyNames.length; index++) {<a name="line.240"></a>
-<span class="sourceLineNo">241</span> ArrayList<Put> puts = new ArrayList<>(rowCounts[index]);<a name="line.241"></a>
-<span class="sourceLineNo">242</span> for (int i = 0; i < rowCounts[index]; i++) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> byte[] k = Bytes.toBytes(i);<a name="line.243"></a>
-<span class="sourceLineNo">244</span> Put put = new Put(k);<a name="line.244"></a>
-<span class="sourceLineNo">245</span> put.addColumn(familyNames[index], q, k);<a name="line.245"></a>
-<span class="sourceLineNo">246</span> puts.add(put);<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span> table.put(puts);<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> if (rowCount < rowCounts[index]) {<a name="line.250"></a>
-<span class="sourceLineNo">251</span> rowCount = rowCounts[index];<a name="line.251"></a>
-<span class="sourceLineNo">252</span> }<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span> // get the initial layout (should just be one region)<a name="line.255"></a>
-<span class="sourceLineNo">256</span> List<HRegionLocation> m = locator.getAllRegionLocations();<a name="line.256"></a>
-<span class="sourceLineNo">257</span> LOG.info("Initial regions (" + m.size() + "): " + m);<a name="line.257"></a>
-<span class="sourceLineNo">258</span> assertTrue(m.size() == 1);<a name="line.258"></a>
-<span class="sourceLineNo">259</span><a name="line.259"></a>
-<span class="sourceLineNo">260</span> // Verify row count<a name="line.260"></a>
-<span class="sourceLineNo">261</span> Scan scan = new Scan();<a name="line.261"></a>
-<span class="sourceLineNo">262</span> int rows;<a name="line.262"></a>
-<span class="sourceLineNo">263</span> try (ResultScanner scanner = table.getScanner(scan)) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> rows = count(scanner);<a name="line.264"></a>
-<span class="sourceLineNo">265</span> }<a name="line.265"></a>
-<span class="sourceLineNo">266</span> assertEquals(rowCount, rows);<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span> // Have an outstanding scan going on to make sure we can scan over splits.<a name="line.268"></a>
-<span class="sourceLineNo">269</span> scan = new Scan();<a name="line.269"></a>
-<span class="sourceLineNo">270</span> try (ResultScanner scanner = table.getScanner(scan)) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> // Scan first row so we are into first region before split happens.<a name="line.271"></a>
-<span class="sourceLineNo">272</span> scanner.next();<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span> // Split the table<a name="line.274"></a>
-<span class="sourceLineNo">275</span> if (async) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span> if (splitPoint != null) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> ADMIN.split(tableName, splitPoint);<a name="line.277"></a>
-<span class="sourceLineNo">278</span> } else {<a name="line.278"></a>
-<span class="sourceLineNo">279</span> ADMIN.split(tableName);<a name="line.279"></a>
-<span class="sourceLineNo">280</span> }<a name="line.280"></a>
-<span class="sourceLineNo">281</span> final AtomicInteger count = new AtomicInteger(0);<a name="line.281"></a>
-<span class="sourceLineNo">282</span> Thread t = new Thread("CheckForSplit") {<a name="line.282"></a>
-<span class="sourceLineNo">283</span> @Override<a name="line.283"></a>
-<span class="sourceLineNo">284</span> public void run() {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> for (int i = 0; i < 45; i++) {<a name="line.285"></a>
-<span class="sourceLineNo">286</span> try {<a name="line.286"></a>
-<span class="sourceLineNo">287</span> sleep(1000);<a name="line.287"></a>
-<span class="sourceLineNo">288</span> } catch (InterruptedException e) {<a name="line.288"></a>
-<span class="sourceLineNo">289</span> continue;<a name="line.289"></a>
-<span class="sourceLineNo">290</span> }<a name="line.290"></a>
-<span class="sourceLineNo">291</span> // check again<a name="line.291"></a>
-<span class="sourceLineNo">292</span> List<HRegionLocation> regions = null;<a name="line.292"></a>
-<span class="sourceLineNo">293</span> try {<a name="line.293"></a>
-<span class="sourceLineNo">294</span> regions = locator.getAllRegionLocations();<a name="line.294"></a>
-<span class="sourceLineNo">295</span> } catch (IOException e) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> LOG.warn("get location failed", e);<a name="line.296"></a>
-<span class="sourceLineNo">297</span> }<a name="line.297"></a>
-<span class="sourceLineNo">298</span> if (regions == null) {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> continue;<a name="line.299"></a>
+<span class="sourceLineNo">238</span> int rowCount = 0;<a name="line.238"></a>
+<span class="sourceLineNo">239</span> byte[] q = new byte[0];<a name="line.239"></a>
+<span class="sourceLineNo">240</span><a name="line.240"></a>
+<span class="sourceLineNo">241</span> // insert rows into column families. The number of rows that have values<a name="line.241"></a>
+<span class="sourceLineNo">242</span> // in a specific column family is decided by rowCounts[familyIndex]<a name="line.242"></a>
+<span class="sourceLineNo">243</span> for (int index = 0; index < familyNames.length; index++) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span> ArrayList<Put> puts = new ArrayList<>(rowCounts[index]);<a name="line.244"></a>
+<span class="sourceLineNo">245</span> for (int i = 0; i < rowCounts[index]; i++) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> byte[] k = Bytes.toBytes(i);<a name="line.246"></a>
+<span class="sourceLineNo">247</span> Put put = new Put(k);<a name="line.247"></a>
+<span class="sourceLineNo">248</span> put.addColumn(familyNames[index], q, k);<a name="line.248"></a>
+<span class="sourceLineNo">249</span> puts.add(put);<a name="line.249"></a>
+<span class="sourceLineNo">250</span> }<a name="line.250"></a>
+<span class="sourceLineNo">251</span> table.put(puts);<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span> if (rowCount < rowCounts[index]) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> rowCount = rowCounts[index];<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span> // get the initial layout (should just be one region)<a name="line.258"></a>
+<span class="sourceLineNo">259</span> List<HRegionLocation> m = locator.getAllRegionLocations();<a name="line.259"></a>
+<span class="sourceLineNo">260</span> LOG.info("Initial regions (" + m.size() + "): " + m);<a name="line.260"></a>
+<span class="sourceLineNo">261</span> assertTrue(m.size() == 1);<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span> // Verify row count<a name="line.263"></a>
+<span class="sourceLineNo">264</span> Scan scan = new Scan();<a name="line.264"></a>
+<span class="sourceLineNo">265</span> int rows;<a name="line.265"></a>
+<span class="sourceLineNo">266</span> try (ResultScanner scanner = table.getScanner(scan)) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> rows = count(scanner);<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
+<span class="sourceLineNo">269</span> assertEquals(rowCount, rows);<a name="line.269"></a>
+<span class="sourceLineNo">270</span><a name="line.270"></a>
+<span class="sourceLineNo">271</span> // Have an outstanding scan going on to make sure we can scan over splits.<a name="line.271"></a>
+<span class="sourceLineNo">272</span> scan = new Scan();<a name="line.272"></a>
+<span class="sourceLineNo">273</span> try (ResultScanner scanner = table.getScanner(scan)) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> // Scan first row so we are into first region before split happens.<a name="line.274"></a>
+<span class="sourceLineNo">275</span> scanner.next();<a name="line.275"></a>
+<span class="sourceLineNo">276</span><a name="line.276"></a>
+<span class="sourceLineNo">277</span> // Split the table<a name="line.277"></a>
+<span class="sourceLineNo">278</span> if (async) {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> if (splitPoint != null) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> ADMIN.split(tableName, splitPoint);<a name="line.280"></a>
+<span class="sourceLineNo">281</span> } else {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> ADMIN.split(tableName);<a name="line.282"></a>
+<span class="sourceLineNo">283</span> }<a name="line.283"></a>
+<span class="sourceLineNo">284</span> final AtomicInteger count = new AtomicInteger(0);<a name="line.284"></a>
+<span class="sourceLineNo">285</span> Thread t = new Thread("CheckForSplit") {<a name="line.285"></a>
+<span class="sourceLineNo">286</span> @Override<a name="line.286"></a>
+<span class="sourceLineNo">287</span> public void run() {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> for (int i = 0; i < 45; i++) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> try {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> sleep(1000);<a name="line.290"></a>
+<span class="sourceLineNo">291</span> } catch (InterruptedException e) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> continue;<a name="line.292"></a>
+<span class="sourceLineNo">293</span> }<a name="line.293"></a>
+<span class="sourceLineNo">294</span> // check again<a name="line.294"></a>
+<span class="sourceLineNo">295</span> List<HRegionLocation> regions = null;<a name="line.295"></a>
+<span class="sourceLineNo">296</span> try {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> regions = locator.getAllRegionLocations();<a name="line.297"></a>
+<span class="sourceLineNo">298</span> } catch (IOException e) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> LOG.warn("get location failed", e);<a name="line.299"></a>
<span class="sourceLineNo">300</span> }<a name="line.300"></a>
-<span class="sourceLineNo">301</span> count.set(regions.size());<a name="line.301"></a>
-<span class="sourceLineNo">302</span> if (count.get() >= 2) {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> LOG.info("Found: " + regions);<a name="line.303"></a>
-<span class="sourceLineNo">304</span> break;<a name="line.304"></a>
-<span class="sourceLineNo">305</span> }<a name="line.305"></a>
-<span class="sourceLineNo">306</span> LOG.debug("Cycle waiting on split");<a name="line.306"></a>
-<span class="sourceLineNo">307</span> }<a name="line.307"></a>
-<span class="sourceLineNo">308</span> LOG.debug("CheckForSplit thread exited, current region count: " + count.get());<a name="line.308"></a>
-<span class="sourceLineNo">309</span> }<a name="line.309"></a>
-<span class="sourceLineNo">310</span> };<a name="line.310"></a>
-<span class="sourceLineNo">311</span> t.setPriority(Thread.NORM_PRIORITY - 2);<a name="line.311"></a>
-<span class="sourceLineNo">312</span> t.start();<a name="line.312"></a>
-<span class="sourceLineNo">313</span> t.join();<a name="line.313"></a>
-<span class="sourceLineNo">314</span> } else {<a name="line.314"></a>
-<span class="sourceLineNo">315</span> // Sync split region, no need to create a thread to check<a name="line.315"></a>
-<span class="sourceLineNo">316</span> ADMIN.splitRegionAsync(m.get(0).getRegion().getRegionName(), splitPoint).get();<a name="line.316"></a>
-<span class="sourceLineNo">317</span> }<a name="line.317"></a>
-<span class="sourceLineNo">318</span> // Verify row count<a name="line.318"></a>
-<span class="sourceLineNo">319</span> rows = 1 + count(scanner); // We counted one row above.<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span> assertEquals(rowCount, rows);<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span> List<HRegionLocation> regions = null;<a name="line.323"></a>
-<span class="sourceLineNo">324</span> try {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> regions = locator.getAllRegionLocations();<a name="line.325"></a>
-<span class="sourceLineNo">326</span> } catch (IOException e) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> e.printStackTrace();<a name="line.327"></a>
-<span class="sourceLineNo">328</span> }<a name="line.328"></a>
-<span class="sourceLineNo">329</span> assertEquals(2, regions.size());<a name="line.329"></a>
-<span class="sourceLineNo">330</span> if (splitPoint != null) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span> // make sure the split point matches our explicit configuration<a name="line.331"></a>
-<span class="sourceLineNo">332</span> assertEquals(Bytes.toString(splitPoint),<a name="line.332"></a>
-<span class="sourceLineNo">333</span> Bytes.toString(regions.get(0).getRegion().getEndKey()));<a name="line.333"></a>
-<span class="sourceLineNo">334</span> assertEquals(Bytes.toString(splitPoint),<a name="line.334"></a>
-<span class="sourceLineNo">335</span> Bytes.toString(regions.get(1).getRegion().getStartKey()));<a name="line.335"></a>
-<span class="sourceLineNo">336</span> LOG.debug("Properly split on " + Bytes.toString(splitPoint));<a name="line.336"></a>
-<span class="sourceLineNo">337</span> } else {<a name="line.337"></a>
-<span class="sourceLineNo">338</span> if (familyNames.length > 1) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span> int splitKey = Bytes.toInt(regions.get(0).getRegion().getEndKey());<a name="line.339"></a>
-<span class="sourceLineNo">340</span> // check if splitKey is based on the largest column family<a name="line.340"></a>
-<span class="sourceLineNo">341</span> // in terms of it store size<a name="line.341"></a>
-<span class="sourceLineNo">342</span> int deltaForLargestFamily = Math.abs(rowCount / 2 - splitKey);<a name="line.342"></a>
-<span class="sourceLineNo">343</span> LOG.debug("SplitKey=" + splitKey + "&deltaForLargestFamily=" + deltaForLargestFamily +<a name="line.343"></a>
-<span class="sourceLineNo">344</span> ", r=" + regions.get(0).getRegion());<a name="line.344"></a>
-<span class="sourceLineNo">345</span> for (int index = 0; index < familyNames.length; index++) {<a name="line.345"></a>
-<span class="sourceLineNo">346</span> int delta = Math.abs(rowCounts[index] / 2 - splitKey);<a name="line.346"></a>
-<span class="sourceLineNo">347</span> if (delta < deltaForLargestFamily) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> assertTrue("Delta " + delta + " for family " + index + " should be at least " +<a name="line.348"></a>
-<span class="sourceLineNo">349</span> "deltaForLargestFamily " + deltaForLargestFamily, false);<a name="line.349"></a>
-<span class="sourceLineNo">350</span> }<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span> }<a name="line.352"></a>
-<span class="sourceLineNo">353</span> }<a name="line.353"></a>
-<span class="sourceLineNo">354</span> TEST_UTIL.deleteTable(tableName);<a name="line.354"></a>
-<span class="sourceLineNo">355</span> }<a name="line.355"></a>
-<span class="sourceLineNo">356</span> }<a name="line.356"></a>
-<span class="sourceLineNo">357</span><a name="line.357"></a>
-<span class="sourceLineNo">358</span> @Test<a name="line.358"></a>
-<span class="sourceLineNo">359</span> public void testSplitAndMergeWithReplicaTable() throws Exception {<a name="line.359"></a>
-<span class="sourceLineNo">360</span> // The test tries to directly split replica regions and directly merge replica regions. These<a name="line.360"></a>
-<span class="sourceLineNo">361</span> // are not allowed. The test validates that. Then the test does a valid split/merge of allowed<a name="line.361"></a>
-<span class="sourceLineNo">362</span> // regions.<a name="line.362"></a>
-<span class="sourceLineNo">363</span> // Set up a table with 3 regions and replication set to 3<a name="line.363"></a>
-<span class="sourceLineNo">364</span> TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.364"></a>
-<span class="sourceLineNo">365</span> byte[] cf = Bytes.toBytes("f");<a name="line.365"></a>
-<span class="sourceLineNo">366</span> TableDescriptor desc = TableDescriptorBuilder.newBuilder(tableName).setRegionReplication(3)<a name="line.366"></a>
-<span class="sourceLineNo">367</span> .setColumnFamily(ColumnFamilyDescriptorBuilder.of(cf)).build();<a name="line.367"></a>
-<span class="sourceLineNo">368</span> byte[][] splitRows = new byte[2][];<a name="line.368"></a>
-<span class="sourceLineNo">369</span> splitRows[0] = new byte[] { (byte) '4' };<a name="line.369"></a>
-<span class="sourceLineNo">370</span> splitRows[1] = new byte[] { (byte) '7' };<a name="line.370"></a>
-<span class="sourceLineNo">371</span> TEST_UTIL.getAdmin().createTable(desc, splitRows);<a name="line.371"></a>
-<span class="sourceLineNo">372</span> List<HRegion> oldRegions;<a name="line.372"></a>
-<span class="sourceLineNo">373</span> do {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> oldRegions = TEST_UTIL.getHBaseCluster().getRegions(tableName);<a name="line.374"></a>
-<span class="sourceLineNo">375</span> Thread.sleep(10);<a name="line.375"></a>
-<span class="sourceLineNo">376</span> } while (oldRegions.size() != 9); // 3 regions * 3 replicas<a name="line.376"></a>
-<span class="sourceLineNo">377</span> // write some data to the table<a name="line.377"></a>
-<span class="sourceLineNo">378</span> Table ht = TEST_UTIL.getConnection().getTable(tableName);<a name="line.378"></a>
-<span class="sourceLineNo">379</span> List<Put> puts = new ArrayList<>();<a name="line.379"></a>
-<span class="sourceLineNo">380</span> byte[] qualifier = Bytes.toBytes("c");<a name="line.380"></a>
-<span class="sourceLineNo">381</span> Put put = new Put(new byte[] { (byte) '1' });<a name="line.381"></a>
-<span class="sourceLineNo">382</span> put.addColumn(cf, qualifier, Bytes.toBytes("100"));<a name="line.382"></a>
-<span class="sourceLineNo">383</span> puts.add(put);<a name="line.383"></a>
-<span class="sourceLineNo">384</span> put = new Put(new byte[] { (byte) '6' });<a name="line.384"></a>
+<span class="sourceLineNo">301</span> if (regions == null) {<a name="line.301"></a>
+<span class="sourceLineNo">302</span> continue;<a name="line.302"></a>
+<span class="sourceLineNo">303</span> }<a name="line.303"></a>
+<span class="sourceLineNo">304</span> count.set(regions.size());<a name="line.304"></a>
+<span class="sourceLineNo">305</span> if (count.get() >= 2) {<a name="line.305"></a>
+<span class="sourceLineNo">306</span> LOG.info("Found: " + regions);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> break;<a name="line.307"></a>
+<span class="sourceLineNo">308</span> }<a name="line.308"></a>
+<span class="sourceLineNo">309</span> LOG.debug("Cycle waiting on split");<a name="line.309"></a>
+<span class="sourceLineNo">310</span> }<a name="line.310"></a>
+<span class="sourceLineNo">311</span> LOG.debug("CheckForSplit thread exited, current region count: " + count.get());<a name="line.311"></a>
+<span class="sourceLineNo">312</span> }<a name="line.312"></a>
+<span class="sourceLineNo">313</span> };<a name="line.313"></a>
+<span class="sourceLineNo">314</span> t.setPriority(Thread.NORM_PRIORITY - 2);<a name="line.314"></a>
+<span class="sourceLineNo">315</span> t.start();<a name="line.315"></a>
+<span class="sourceLineNo">316</span> t.join();<a name="line.316"></a>
+<span class="sourceLineNo">317</span> } else {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> // Sync split region, no need to create a thread to check<a name="line.318"></a>
+<span class="sourceLineNo">319</span> ADMIN.splitRegionAsync(m.get(0).getRegion().getRegionName(), splitPoint).get();<a name="line.319"></a>
+<span class="sourceLineNo">320</span> }<a name="line.320"></a>
+<span class="sourceLineNo">321</span> // Verify row count<a name="line.321"></a>
+<span class="sourceLineNo">322</span> rows = 1 + count(scanner); // We counted one row above.<a name="line.322"></a>
+<span class="sourceLineNo">323</span> }<a name="line.323"></a>
+<span class="sourceLineNo">324</span> assertEquals(rowCount, rows);<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span> List<HRegionLocation> regions = null;<a name="line.326"></a>
+<span class="sourceLineNo">327</span> try {<a name="line.327"></a>
+<span class="sourceLineNo">328</span> regions = locator.getAllRegionLocations();<a name="line.328"></a>
+<span class="sourceLineNo">329</span> } catch (IOException e) {<a name="line.329"></a>
+<span class="sourceLineNo">330</span> e.printStackTrace();<a name="line.330"></a>
+<span class="sourceLineNo">331</span> }<a name="line.331"></a>
+<span class="sourceLineNo">332</span> assertEquals(2, regions.size());<a name="line.332"></a>
+<span class="sourceLineNo">333</span> if (splitPoint != null) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span> // make sure the split point matches our explicit configuration<a name="line.334"></a>
+<span class="sourceLineNo">335</span> assertEquals(Bytes.toString(splitPoint),<a name="line.335"></a>
+<span class="sourceLineNo">336</span> Bytes.toString(regions.get(0).getRegion().getEndKey()));<a name="line.336"></a>
+<span class="sourceLineNo">337</span> assertEquals(Bytes.toString(splitPoint),<a name="line.337"></a>
+<span class="sourceLineNo">338</span> Bytes.toString(regions.get(1).getRegion().getStartKey()));<a name="line.338"></a>
+<span class="sourceLineNo">339</span> LOG.debug("Properly split on " + Bytes.toString(splitPoint));<a name="line.339"></a>
+<span class="sourceLineNo">340</span> } else {<a name="line.340"></a>
+<span class="sourceLineNo">341</span> if (familyNames.length > 1) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span> int splitKey = Bytes.toInt(regions.get(0).getRegion().getEndKey());<a name="line.342"></a>
+<span class="sourceLineNo">343</span> // check if splitKey is based on the largest column family<a name="line.343"></a>
+<span class="sourceLineNo">344</span> // in terms of it store size<a name="line.344"></a>
+<span class="sourceLineNo">345</span> int deltaForLargestFamily = Math.abs(rowCount / 2 - splitKey);<a name="line.345"></a>
+<span class="sourceLineNo">346</span> LOG.debug("SplitKey=" + splitKey + "&deltaForLargestFamily=" + deltaForLargestFamily +<a name="line.346"></a>
+<span class="sourceLineNo">347</span> ", r=" + regions.get(0).getRegion());<a name="line.347"></a>
+<span class="sourceLineNo">348</span> for (int index = 0; index < familyNames.length; index++) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span> int delta = Math.abs(rowCounts[index] / 2 - splitKey);<a name="line.349"></a>
+<span class="sourceLineNo">350</span> if (delta < deltaForLargestFamily) {<a name="line.350"></a>
+<span class="sourceLineNo">351</span> assertTrue("Delta " + delta + " for family " + index + " should be at least " +<a name="line.351"></a>
+<span class="sourceLineNo">352</span> "deltaForLargestFamily " + deltaForLargestFamily, false);<a name="line.352"></a>
+<span class="sourceLineNo">353</span> }<a name="line.353"></a>
+<span class="sourceLineNo">354</span> }<a name="line.354"></a>
+<span class="sourceLineNo">355</span> }<a name="line.355"></a>
+<span class="sourceLineNo">356</span> }<a name="line.356"></a>
+<span class="sourceLineNo">357</span> TEST_UTIL.deleteTable(tableName);<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span> @Test<a name="line.361"></a>
+<span class="sourceLineNo">362</span> public void testSplitAndMergeWithReplicaTable() throws Exception {<a name="line.362"></a>
+<span class="sourceLineNo">363</span> // The test tries to directly split replica regions and directly merge replica regions. These<a name="line.363"></a>
+<span class="sourceLineNo">364</span> // are not allowed. The test validates that. Then the test does a valid split/merge of allowed<a name="line.364"></a>
+<span class="sourceLineNo">365</span> // regions.<a name="line.365"></a>
+<span class="sourceLineNo">366</span> // Set up a table with 3 regions and replication set to 3<a name="line.366"></a>
+<span class="sourceLineNo">367</span> TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.367"></a>
+<span class="sourceLineNo">368</span> byte[] cf = Bytes.toBytes("f");<a name="line.368"></a>
+<span class="sourceLineNo">369</span> TableDescriptor desc = TableDescriptorBuilder.newBuilder(tableName).setRegionReplication(3)<a name="line.369"></a>
+<span class="sourceLineNo">370</span> .setColumnFamily(ColumnFamilyDescriptorBuilder.of(cf)).build();<a name="line.370"></a>
+<span class="sourceLineNo">371</span> byte[][] splitRows = new byte[2][];<a name="line.371"></a>
+<span class="sourceLineNo">372</span> splitRows[0] = new byte[] { (byte) '4' };<a name="line.372"></a>
+<span class="sourceLineNo">373</span> splitRows[1] = new byte[] { (byte) '7' };<a name="line.373"></a>
+<span class="sourceLineNo">374</span> TEST_UTIL.getAdmin().createTable(desc, splitRows);<a name="line.374"></a>
+<span class="sourceLineNo">375</span> List<HRegion> oldRegions;<a name="line.375"></a>
+<span class="sourceLineNo">376</span> do {<a name="line.376"></a>
+<span class="sourceLineNo">377</span> oldRegions = TEST_UTIL.getHBaseCluster().getRegions(tableName);<a name="line.377"></a>
+<span class="sourceLineNo">378</span> Thread.sleep(10);<a name="line.378"></a>
+<span class="sourceLineNo">379</span> } while (oldRegions.size() != 9); // 3 regions * 3 replicas<a name="line.379"></a>
+<span class="sourceLineNo">380</span> // write some data to the table<a name="line.380"></a>
+<span class="sourceLineNo">381</span> Table ht = TEST_UTIL.getConnection().getTable(tableName);<a name="line.381"></a>
+<span class="sourceLineNo">382</span> List<Put> puts = new ArrayList<>();<a name="line.382"></a>
+<span class="sourceLineNo">383</span> byte[] qualifier = Bytes.toBytes("c");<a name="line.383"></a>
+<span class="sourceLineNo">384</span> Put put = new Put(new byte[] { (byte) '1' });<a name="line.384"></a>
<span class="sourceLineNo">385</span> put.addColumn(cf, qualifier, Bytes.toBytes("100"));<a name="line.385"></a>
<span class="sourceLineNo">386</span> puts.add(put);<a name="line.386"></a>
-<span class="sourceLineNo">387</span> put = new Put(new byte[] { (byte) '8' });<a name="line.387"></a>
+<span class="sourceLineNo">387</span> put = new Put(new byte[] { (byte) '6' });<a name="line.387"></a>
<span class="sourceLineNo">388</span> put.addColumn(cf, qualifier, Bytes.toBytes("100"));<a name="line.388"></a>
<span class="sourceLineNo">389</span> puts.add(put);<a name="line.389"></a>
-<span class="sourceLineNo">390</span> ht.put(puts);<a name="line.390"></a>
-<span class="sourceLineNo">391</span> ht.close();<a name="line.391"></a>
-<span class="sourceLineNo">392</span> List<Pair<RegionInfo, ServerName>> regions =<a name="line.392"></a>
-<span class="sourceLineNo">393</span> MetaTableAccessor.getTableRegionsAndLocations(TEST_UTIL.getConnection(), tableName);<a name="line.393"></a>
-<span class="sourceLineNo">394</span> boolean gotException = false;<a name="line.394"></a>
-<span class="sourceLineNo">395</span> // the element at index 1 would be a replica (since the metareader gives us ordered<a name="line.395"></a>
-<span class="sourceLineNo">396</span> // regions). Try splitting that region via the split API . Should fail<a name="line.396"></a>
-<span class="sourceLineNo">397</span> try {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> FutureUtils.get(<a name="line.398"></a>
-<span class="sourceLineNo">399</span> TEST_UTIL.getAdmin().splitRegionAsync(regions.get(1).getFirst().getRegionName()));<a name="line.399"></a>
-<span class="sourceLineNo">400</span> } catch (IllegalArgumentException ex) {<a name="line.400"></a>
-<span class="sourceLineNo">401</span> gotException = true;<a name="line.401"></a>
-<span class="sourceLineNo">402</span> }<a name="line.402"></a>
-<span class="sourceLineNo">403</span> assertTrue(gotException);<a name="line.403"></a>
-<span class="sourceLineNo">404</span> gotException = false;<a name="line.404"></a>
-<span class="sourceLineNo">405</span> // the element at index 1 would be a replica (since the metareader gives us ordered<a name="line.405"></a>
-<span class="sourceLineNo">406</span> // regions). Try splitting that region via a different split API (the difference is<a name="line.406"></a>
-<span class="sourceLineNo">407</span> // this API goes direct to the regionserver skipping any checks in the admin). Should fail<a name="line.407"></a>
-<span class="sourceLineNo">408</span> try {<a name="line.408"></a>
-<span class="sourceLineNo">409</span> FutureUtils.get(TEST_UTIL.getAdmin().splitRegionAsync(<a name="line.409"></a>
-<span class="sourceLineNo">410</span> regions.get(1).getFirst().getEncodedNameAsBytes(), new byte[] { (byte) '1' }));<a name="line.410"></a>
-<span class="sourceLineNo">411</span> } catch (IllegalArgumentException ex) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span> gotException = true;<a name="line.412"></a>
-<span class="sourceLineNo">413</span> }<a name="line.413"></a>
-<span class="sourceLineNo">414</span> assertTrue(gotException);<a name="line.414"></a>
-<span class="sourceLineNo">415</span><a name="line.415"></a>
-<span class="sourceLineNo">416</span> gotException = false;<a name="line.416"></a>
-<span class="sourceLineNo">417</span> // testing Sync split operation<a name="line.417"></a>
-<span class="sourceLineNo">418</span> try {<a name="line.418"></a>
-<span class="sourceLineNo">419</span> FutureUtils.get(TEST_UTIL.getAdmin()<a name="line.419"></a>
-<span class="sourceLineNo">420</span> .splitRegionAsync(regions.get(1).getFirst().getRegionName(), new byte[] { (byte) '1' }));<a name="line.420"></a>
-<span class="sourceLineNo">421</span> } catch (IllegalArgumentException ex) {<a name="line.421"></a>
-<span class="sourceLineNo">422</span> gotException = true;<a name="line.422"></a>
-<span class="sourceLineNo">423</span> }<a name="line.423"></a>
-<span class="sourceLineNo">424</span> assertTrue(gotException);<a name="line.424"></a>
-<span class="sourceLineNo">425</span><a name="line.425"></a>
-<span class="sourceLineNo">426</span> gotException = false;<a name="line.426"></a>
-<span class="sourceLineNo">427</span> // Try merging a replica with another. Should fail.<a name="line.427"></a>
-<span class="sourceLineNo">428</span> try {<a name="line.428"></a>
-<span class="sourceLineNo">429</span> FutureUtils.get(TEST_UTIL.getAdmin().mergeRegionsAsync(<a name="line.429"></a>
-<span class="sourceLineNo">430</span> regions.get(1).getFirst().getEncodedNameAsBytes(),<a name="line.430"></a>
-<span class="sourceLineNo">431</span> regions.get(2).getFirst().getEncodedNameAsBytes(),<a name="line.431"></a>
-<span class="sourceLineNo">432</span> true));<a name="line.432"></a>
-<span class="sourceLineNo">433</span> } catch (IllegalArgumentException m) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> gotException = true;<a name="line.434"></a>
-<span class="sourceLineNo">435</span> }<a name="line.435"></a>
-<span class="sourceLineNo">436</span> assertTrue(gotException);<a name="line.436"></a>
-<span class="sourceLineNo">437</span> // Try going to the master directly (that will skip the check in admin)<a name="line.437"></a>
-<span class="sourceLineNo">438</span> try {<a name="line.438"></a>
-<span class="sourceLineNo">439</span> byte[][] nameofRegionsToMerge = new byte[2][];<a name="line.439"></a>
-<span class="sourceLineNo">440</span> nameofRegionsToMerge[0] = regions.get(1).getFirst().getEncodedNameAsBytes();<a name="line.440"></a>
-<span class="sourceLineNo">441</span> nameofRegionsToMerge[1] = regions.get(2).getFirst().getEncodedNameAsBytes();<a name="line.441"></a>
-<span class="sourceLineNo">442</span> MergeTableRegionsRequest request = RequestConverter.buildMergeTableRegionsRequest(<a name="line.442"></a>
-<span class="sourceLineNo">443</span> nameofRegionsToMerge, true, HConstants.NO_NONCE, HConstants.NO_NONCE);<a name="line.443"></a>
-<span class="sourceLineNo">444</span> TEST_UTIL.getMiniHBaseCluster().getMaster().getMasterRpcServices().mergeTableRegions(null,<a name="line.444"></a>
-<span class="sourceLineNo">445</span> request);<a name="line.445"></a>
-<span class="sourceLineNo">446</span> } catch (org.apache.hbase.thirdparty.com.google.protobuf.ServiceException m) {<a name="line.446"></a>
-<span class="sourceLineNo">447</span> Throwable t = m.getCause();<a name="line.447"></a>
-<span class="sourceLineNo">448</span> do {<a name="line.448"></a>
-<span class="sourceLineNo">449</span> if (t instanceof MergeRegionException) {<a name="line.449"></a>
-<span class="sourceLineNo">450</span> gotException = true;<a name="line.450"></a>
-<span class="sourceLineNo">451</span> break;<a name="line.451"></a>
-<span class="sourceLineNo">452</span> }<a name="line.452"></a>
-<span class="sourceLineNo">453</span> t = t.getCause();<a name="line.453"></a>
-<span class="sourceLineNo">454</span> } while (t != null);<a name="line.454"></a>
-<span class="sourceLineNo">455</span> }<a name="line.455"></a>
-<span class="sourceLineNo">456</span> assertTrue(gotException);<a name="line.456"></a>
-<span class="sourceLineNo">457</span> }<a name="line.457"></a>
-<span class="sourceLineNo">458</span><a name="line.458"></a>
-<span class="sourceLineNo">459</span> @Test(expected = IllegalArgumentException.class)<a name="line.459"></a>
-<span class="sourceLineNo">460</span> public void testInvalidColumnDescriptor() throws IOException {<a name="line.460"></a>
-<span class="sourceLineNo">461</span> ColumnFamilyDescriptorBuilder.of("/cfamily/name");<a name="line.461"></a>
-<span class="sourceLineNo">462</span> }<a name="line.462"></a>
-<span class="sourceLineNo">463</span><a name="line.463"></a>
-<span class="sourceLineNo">464</span> /**<a name="line.464"></a>
-<span class="sourceLineNo">465</span> * Test DFS replication for column families, where one CF has default replication(3) and the other<a name="line.465"></a>
-<span class="sourceLineNo">466</span> * is set to 1.<a name="line.466"></a>
-<span class="sourceLineNo">467</span> */<a name="line.467"></a>
-<span class="sourceLineNo">468</span> @Test<a name="line.468"></a>
-<span class="sourceLineNo">469</span> public void testHFileReplication() throws Exception {<a name="line.469"></a>
-<span class="sourceLineNo">470</span> final TableName tableName = TableName.valueOf(this.name.getMethodName());<a name="line.470"></a>
-<span class="sourceLineNo">471</span> String fn1 = "rep1";<a name="line.471"></a>
-<span class="sourceLineNo">472</span> String fn = "defaultRep";<a name="line.472"></a>
-<span class="sourceLineNo">473</span> TableDescriptor htd = TableDescriptorBuilder.newBuilder(tableName)<a name="line.473"></a>
-<span class="sourceLineNo">474</span> .setColumnFamily(ColumnFamilyDescriptorBuilder.of(fn))<a name="line.474"></a>
-<span class="sourceLineNo">475</span> .setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes(fn1))<a name="line.475"></a>
-<span class="sourceLineNo">476</span> .setDFSReplication((short) 1).build())<a name="line.476"></a>
-<span class="sourceLineNo">477</span> .build();<a name="line.477"></a>
-<span class="sourceLineNo">478</span> Table table = TEST_UTIL.createTable(htd, null);<a name="line.478"></a>
-<span class="sourceLineNo">479</span> TEST_UTIL.waitTableAvailable(tableName);<a name="line.479"></a>
-<span class="sourceLineNo">480</span> Put p = new Put(Bytes.toBytes("defaultRep_rk"));<a name="line.480"></a>
-<span class="sourceLineNo">481</span> byte[] q1 = Bytes.toBytes("q1");<a name="line.481"></a>
-<span class="sourceLineNo">482</span> byte[] v1 = Bytes.toBytes("v1");<a name="line.482"></a>
-<span class="sourceLineNo">483</span> p.addColumn(Bytes.toBytes(fn), q1, v1);<a name="line.483"></a>
-<span class="sourceLineNo">484</span> List<Put> puts = new ArrayList<>(2);<a name="line.484"></a>
-<span class="sourceLineNo">485</span> puts.add(p);<a name="line.485"></a>
-<span class="sourceLineNo">486</span> p = new Put(Bytes.toBytes("rep1_rk"));<a name="line.486"></a>
-<span class="sourceLineNo">487</span> p.addColumn(Bytes.toBytes(fn1), q1, v1);<a name="line.487"></a>
+<span class="sourceLineNo">390</span> put = new Put(new byte[] { (byte) '8' });<a name="line.390"></a>
+<span class="sourceLineNo">391</span> put.addColumn(cf, qualifier, Bytes.toBytes("100"));<a name="line.391"></a>
+<span class="sourceLineNo">392</span> puts.add(put);<a name="line.392"></a>
+<span class="sourceLineNo">393</span> ht.put(puts);<a name="line.393"></a>
+<span class="sourceLineNo">394</span> ht.close();<a name="line.394"></a>
+<span class="sourceLineNo">395</span> List<Pair<RegionInfo, ServerName>> regions =<a name="line.395"></a>
+<span class="sourceLineNo">396</span> MetaTableAccessor.getTableRegionsAndLocations(TEST_UTIL.getConnection(), tableName);<a name="line.396"></a>
+<span class="sourceLineNo">397</span> boolean gotException = false;<a name="line.397"></a>
+<span class="sourceLineNo">398</span> // the element at index 1 would be a replica (since the metareader gives us ordered<a name="line.398"></a>
+<span class="sourceLineNo">399</span> // regions). Try splitting that region via the split API . Should fail<a name="line.399"></a>
+<span class="sourceLineNo">400</span> try {<a name="line.400"></a>
+<span class="sourceLineNo">401</span> FutureUtils.get(<a name="line.401"></a>
+<span class="sourceLineNo">402</span> TEST_UTIL.getAdmin().splitRegionAsync(regions.get(1).getFirst().getRegionName()));<a name="line.402"></a>
+<span class="sourceLineNo">403</span> } catch (IllegalArgumentException ex) {<a name="line.403"></a>
+<span class="sourceLineNo">404</span> gotException = true;<a name="line.404"></a>
+<span class="sourceLineNo">405</span> }<a name="line.405"></a>
+<span class="sourceLineNo">406</span> assertTrue(gotException);<a name="line.406"></a>
+<span class="sourceLineNo">407</span> gotException = false;<a name="line.407"></a>
+<span class="sourceLineNo">408</span> // the element at index 1 would be a replica (since the metareader gives us ordered<a name="line.408"></a>
+<span class="sourceLineNo">409</span> // regions). Try splitting that region via a different split API (the difference is<a name="line.409"></a>
+<span class="sourceLineNo">410</span> // this API goes direct to the regionserver skipping any checks in the admin). Should fail<a name="line.410"></a>
+<span class="sourceLineNo">411</span> try {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> FutureUtils.get(TEST_UTIL.getAdmin().splitRegionAsync(<a name="line.412"></a>
+<span class="sourceLineNo">413</span> regions.get(1).getFirst().getEncodedNameAsBytes(), new byte[] { (byte) '1' }));<a name="line.413"></a>
+<span class="sourceLineNo">414</span> } catch (IllegalArgumentException ex) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span> gotException = true;<a name="line.415"></a>
+<span class="sourceLineNo">416</span> }<a name="line.416"></a>
+<span class="sourceLineNo">417</span> assertTrue(gotException);<a name="line.417"></a>
+<span class="sourceLineNo">418</span><a name="line.418"></a>
+<span class="sourceLineNo">419</span> gotException = false;<a name="line.419"></a>
+<span class="sourceLineNo">420</span> // testing Sync split operation<a name="line.420"></a>
+<span class="sourceLineNo">421</span> try {<a name="line.421"></a>
+<span class="sourceLineNo">422</span> FutureUtils.get(TEST_UTIL.getAdmin()<a name="line.422"></a>
+<span class="sourceLineNo">423</span> .splitRegionAsync(regions.get(1).getFirst().getRegionName(), new byte[] { (byte) '1' }));<a name="line.423"></a>
+<span class="sourceLineNo">424</span> } catch (IllegalArgumentException ex) {<a name="line.424"></a>
+<span class="sourceLineNo">425</span> gotException = true;<a name="line.425"></a>
+<span class="sourceLineNo">426</span> }<a name="line.426"></a>
+<span class="sourceLineNo">427</span> assertTrue(gotException);<a name="line.427"></a>
+<span class="sourceLineNo">428</span><a name="line.428"></a>
+<span class="sourceLineNo">429</span> gotException = false;<a name="line.429"></a>
+<span class="sourceLineNo">430</span> // Try merging a replica with another. Should fail.<a name="line.430"></a>
+<span class="sourceLineNo">431</span> try {<a name="line.431"></a>
+<span class="sourceLineNo">432</span> FutureUtils.get(TEST_UTIL.getAdmin().mergeRegionsAsync(<a name="line.432"></a>
+<span class="sourceLineNo">433</span> regions.get(1).getFirst().getEncodedNameAsBytes(),<a name="line.433"></a>
+<span class="sourceLineNo">434</span> regions.get(2).getFirst().getEncodedNameAsBytes(),<a name="line.434"></a>
+<span class="sourceLineNo">435</span> true));<a name="line.435"></a>
+<span class="sourceLineNo">436</span> } catch (IllegalArgumentException m) {<a name="line.436"></a>
+<span class="sourceLineNo">437</span> gotException = true;<a name="line.437"></a>
+<span class="sourceLineNo">438</span> }<a name="line.438"></a>
+<span class="sourceLineNo">439</span> assertTrue(gotException);<a name="line.439"></a>
+<span class="sourceLineNo">440</span> // Try going to the master directly (that will skip the check in admin)<a name="line.440"></a>
+<span class="sourceLineNo">441</span> try {<a name="line.441"></a>
+<span class="sourceLineNo">442</span> byte[][] nameofRegionsToMerge = new byte[2][];<a name="line.442"></a>
+<span class="sourceLineNo">443</span> nameofRegionsToMerge[0] = regions.get(1).getFirst().getEncodedNameAsBytes();<a name="line.443"></a>
+<span class="sourceLineNo">444</span> nameofRegionsToMerge[1] = regions.get(2).getFirst().getEncodedNameAsBytes();<a name="line.444"></a>
+<span class="sourceLineNo">445</span> MergeTableRegionsRequest request = RequestConverter.buildMergeTableRegionsRequest(<a name="line.445"></a>
+<span class="sourceLineNo">446</span> nameofRegionsToMerge, true, HConstants.NO_NONCE, HConstants.NO_NONCE);<a name="line.446"></a>
+<span class="sourceLineNo">447</span> TEST_UTIL.getMiniHBaseCluster().getMaster().getMasterRpcServices().mergeTableRegions(null,<a name="line.447"></a>
+<span class="sourceLineNo">448</span> request);<a name="line.448"></a>
+<span class="sourceLineNo">449</span> } catch (org.apache.hbase.thirdparty.com.google.protobuf.ServiceException m) {<a name="line.449"></a>
+<span class="sourceLineNo">450</span> Throwable t = m.getCause();<a name="line.450"></a>
+<span class="sourceLineNo">451</span> do {<a name="line.451"></a>
+<span class="sourceLineNo">452</span> if (t instanceof MergeRegionException) {<a name="line.452"></a>
+<span class="sourceLineNo">453</span> gotException = true;<a name="line.453"></a>
+<span class="sourceLineNo">454</span> break;<a name="line.454"></a>
+<span class="sourceLineNo">455</span> }<a name="line.455"></a>
+<span class="sourceLineNo">456</span> t = t.getCause();<a name="line.456"></a>
+<span class="sourceLineNo">457</span> } while (t != null);<a name="line.457"></a>
+<span class="sourceLineNo">458</span> }<a name="line.458"></a>
+<span class="sourceLineNo">459</span> assertTrue(gotException);<a name="line.459"></a>
+<span class="sourceLineNo">460</span> }<a name="line.460"></a>
+<span class="sourceLineNo">461</span><a name="line.461"></a>
+<span class="sourceLineNo">462</span> @Test(expected = IllegalArgumentException.class)<a name="line.462"></a>
+<span class="sourceLineNo">463</span> public void testInvalidColumnDescriptor() throws IOException {<a name="line.463"></a>
+<span class="sourceLineNo">464</span> ColumnFamilyDescriptorBuilder.of("/cfamily/name");<a name="line.464"></a>
+<span class="sourceLineNo">465</span> }<a name="line.465"></a>
+<span class="sourceLineNo">466</span><a name="line.466"></a>
+<span class="sourceLineNo">467</span> /**<a name="line.467"></a>
+<span class="sourceLineNo">468</span> * Test DFS replication for column families, where one CF has default replication(3) and the other<a name="line.468"></a>
+<span class="sourceLineNo">469</span> * is set to 1.<a name="line.469"></a>
+<span class="sourceLineNo">470</span> */<a name="line.470"></a>
+<span class="sourceLineNo">471</span> @Test<a name="line.471"></a>
+<span class="sourceLineNo">472</span> public void testHFileReplication() throws Exception {<a name="line.472"></a>
+<span class="sourceLineNo">473</span> final TableName tableName = TableName.valueOf(this.name.getMethodName());<a name="line.473"></a>
+<span class="sourceLineNo">474</span> String fn1 = "rep1";<a name="line.474"></a>
+<span class="sourceLineNo">475</span> String fn = "defaultRep";<a name="line.475"></a>
+<span class="sourceLineNo">476</span> TableDescriptor htd = TableDescriptorBuilder.newBuilder(tableName)<a name="line.476"></a>
+<span class="sourceLineNo">477</span> .setColumnFamily(ColumnFamilyDescriptorBuilder.of(fn))<a name="line.477"></a>
+<span class="sourceLineNo">478</span> .setColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes(fn1))<a name="line.478"></a>
+<span class="sourceLineNo">479</span> .setDFSReplication((short) 1).build())<a name="line.479"></a>
+<span class="sourceLineNo">480</span> .build();<a name="line.480"></a>
+<span class="sourceLineNo">481</span> Table table = TEST_UTIL.createTable(htd, null);<a name="line.481"></a>
+<span class="sourceLineNo">482</span> TEST_UTIL.waitTableAvailable(tableName);<a name="line.482"></a>
+<span class="sourceLineNo">483</span> Put p = new Put(Bytes.toBytes("defaultRep_rk"));<a name="line.483"></a>
+<span class="sourceLineNo">484</span> byte[] q1 = Bytes.toBytes("q1");<a name="line.484"></a>
+<span class="sourceLineNo">485</span> byte[] v1 = Bytes.toBytes("v1");<a name="line.485"></a>
+<span class="sourceLineNo">486</span> p.addColumn(Bytes.toBytes(fn), q1, v1);<a name="line.486"></a>
+<span class="sourceLineNo">487</span> List<Put> puts = new ArrayList<>(2);<a name="line.487"></a>
<span class="sourceLineNo">488</span> puts.add(p);<a name="line.488"></a>
-<span class="sourceLineNo">489</span> try {<a name="line.489"></a>
-<span class="sourceLineNo">490</span> table.put(puts);<a name="line.490"></a>
-<span class="sourceLineNo">491</span> ADMIN.flush(tableName);<a name="line.491"></a>
-<span class="sourceLineNo">492</span><a name="line.492"></a>
-<span class="sourceLineNo">493</span> List<HRegion> regions = TEST_UTIL.getMiniHBaseCluster().getRegions(tableName);<a name="line.493"></a>
-<span class="sourceLineNo">494</span> for (HRegion r : regions) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span> HStore store = r.getStore(Bytes.toBytes(fn));<a name="line.495"></a>
-<span class="sourceLineNo">496</span> for (HStoreFile sf : store.getStorefiles()) {<a name="line.496"></a>
-<span class="sourceLineNo">497</span> assertTrue(sf.toString().contains(fn));<a name="line.497"></a>
-<span class="sourceLineNo">498</span> assertTrue("Column family " + fn + " should have 3 copies",<a name="line.498"></a>
-<span class="sourceLineNo">499</span> CommonFSUtils.getDefaultReplication(TEST_UTIL.getTestFileSystem(),<a name="line.499"></a>
-<span class="sourceLineNo">500</span> sf.getPath()) == (sf.getFileInfo().getFileStatus().getReplication()));<a name="line.500"></a>
-<span class="sourceLineNo">501</span> }<a name="line.501"></a>
-<span class="sourceLineNo">502</span><a name="line.502"></a>
-<span class="sourceLineNo">503</span> store = r.getStore(Bytes.toBytes(fn1));<a name="line.503"></a>
-<span class="sourceLineNo">504</span> for (HStoreFile sf : store.getStorefiles()) {<a name="line.504"></a>
-<span class="sourceLineNo">505</span> assertTrue(sf.toString().contains(fn1));<a name="line.505"></a>
-<span class="sourceLineNo">506</span> assertTrue("Column family " + fn1 + " should have only 1 copy",<a name="line.506"></a>
-<span class="sourceLineNo">507</span> 1 == sf.getFileInfo().getFileStatus().getReplication());<a name="line.507"></a>
-<span class="sourceLineNo">508</span> }<a name="line.508"></a>
-<span class="sourceLineNo">509</span> }<a name="line.509"></a>
-<span class="sourceLineNo">510</span> } finally {<a name="line.510"></a>
-<span class="sourceLineNo">511</span> if (ADMIN.isTableEnabled(tableName)) {<a name="line.511"></a>
-<span class="sourceLineNo">512</span> ADMIN.disableTable(tableName);<a name="line.512"></a>
-<span class="sourceLineNo">513</span> ADMIN.deleteTable(tableName);<a name="line.513"></a>
-<span class="sourceLineNo">514</span> }<a name="line.514"></a>
-<span class="sourceLineNo">515</span> }<a name="line.515"></a>
-<span class="sourceLineNo">516</span> }<a name="line.516"></a>
-<span class="sourceLineNo">517</span><a name="line.517"></a>
-<span class="sourceLineNo">518</span> @Test<a name="line.518"></a>
-<span class="sourceLineNo">519</span> public void testMergeRegions() throws Exception {<a name="line.519"></a>
-<span class="sourceLineNo">520</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.520"></a>
-<span class="sourceLineNo">521</span> TableDescriptor td = TableDescriptorBuilder.newBuilder(tableName)<a name="line.521"></a>
-<span class="sourceLineNo">522</span> .setColumnFamily(ColumnFamilyDescriptorBuilder.of("d")).build();<a name="line.522"></a>
-<span class="sourceLineNo">523</span> byte[][] splitRows = new byte[2][];<a name="line.523"></a>
-<span class="sourceLineNo">524</span> splitRows[0] = new byte[] { (byte) '3' };<a name="line.524"></a>
-<span class="sourceLineNo">525</span> splitRows[1] = new byte[] { (byte) '6' };<a name="line.525"></a>
-<span class="sourceLineNo">526</span> try {<a name="line.526"></a>
-<span class="sourceLineNo">527</span> TEST_UTIL.createTable(td, splitRows);<a name="line.527"></a>
-<span class="sourceLineNo">528</span> TEST_UTIL.waitTableAvailable(tableName);<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span> List<RegionInfo> tableRegions;<a name="line.530"></a>
-<span class="sourceLineNo">531</span> RegionInfo regionA;<a name="line.531"></a>
-<span class="sourceLineNo">532</span> RegionInfo regionB;<a name="line.532"></a>
-<span class="sourceLineNo">533</span><a name="line.533"></a>
-<span class="sourceLineNo">534</span> // merge with full name<a name="line.534"></a>
-<span class="sourceLineNo">535</span> tableRegions = ADMIN.getRegions(tableName);<a name="line.535"></a>
-<span class="sourceLineNo">536</span> assertEquals(3, ADMIN.getRegions(tableName).size());<a name="line.536"></a>
-<span class="sourceLineNo">537</span> regionA = tableRegions.get(0);<a name="line.537"></a>
-<span class="sourceLineNo">538</span> regionB = tableRegions.get(1);<a name="line.538"></a>
-<span class="sourceLineNo">539</span> // TODO convert this to version that is synchronous (See HBASE-16668)<a name="line.539"></a>
-<span class="sourceLineNo">540</span> ADMIN.mergeRegionsAsync(regionA.getRegionName(), regionB.getRegionName(), false).get(60,<a name="line.540"></a>
-<span class="sourceLineNo">541</span> TimeUnit.SECONDS);<a name="line.541"></a>
-<span class="sourceLineNo">542</span><a name="line.542"></a>
-<span class="sourceLineNo">543</span> assertEquals(2, ADMIN.getRegions(tableName).size());<a name="line.543"></a>
-<span class="sourceLineNo">544</span><a name="line.544"></a>
-<span class="sourceLineNo">545</span> // merge with encoded name<a name="line.545"></a>
-<span class="sourceLineNo">546</span> tableRegions = ADMIN.getRegions(tableName);<a name="line.546"></a>
-<span class="sourceLineNo">547</span> regionA = tableRegions.get(0);<a name="line.547"></a>
-<span class="sourceLineNo">548</span> regionB = tableRegions.get(1);<a name="line.548"></a>
-<span class="sourceLineNo">549</span> // TODO convert this to version that is synchronous (See HBASE-16668)<a name="line.549"></a>
-<span class="sourceLineNo">550</span> ADMIN<a name="line.550"></a>
-<span class="sourceLineNo">551</span> .mergeRegionsAsync(regionA.getEncodedNameAsBytes(), regionB.getEncodedNameAsBytes(), false)<a name="line.551"></a>
-<span class="sourceLineNo">552</span> .get(60, TimeUnit.SECONDS);<a name="line.552"></a>
-<span class="sourceLineNo">553</span><a name="line.553"></a>
-<span class="sourceLineNo">554</span> assertEquals(1, ADMIN.getRegions(tableName).size());<a name="line.554"></a>
-<span class="sourceLineNo">555</span> } finally {<a name="line.555"></a>
-<span class="sourceLineNo">556</span> ADMIN.disableTable(tableName);<a name="line.556"></a>
-<span class="sourceLineNo">557</span> ADMIN.deleteTable(tableName);<a name="line.557"></a>
-<span class="sourceLineNo">558</span> }<a name="line.558"></a>
-<span class="sourceLineNo">559</span> }<a name="line.559"></a>
-<span class="sourceLineNo">560</span><a name="line.560"></a>
-<span class="sourceLineNo">561</span> @Test<a name="line.561"></a>
-<span class="sourceLineNo">562</span> public void testMergeRegionsInvalidRegionCount()<a name="line.562"></a>
-<span class="sourceLineNo">563</span> throws IOException, InterruptedException, ExecutionException {<a name="line.563"></a>
-<span class="sourceLineNo">564</span> TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.564"></a>
-<span class="sourceLineNo">565</span> TableDescriptor td = TableDescriptorBuilder.newBuilder(tableName)<a name="line.565"></a>
-<span class="sourceLineNo">566</span> .setColumnFamily(ColumnFamilyDescriptorBuilder.of("d")).build();<a name="line.566"></a>
-<span class="sourceLineNo">567</span> byte[][] splitRows = new byte[2][];<a name="line.567"></a>
-<span class="sourceLineNo">568</span> splitRows[0] = new byte[] { (byte) '3' };<a name="line.568"></a>
-<span class="sourceLineNo">569</span> splitRows[1] = new byte[] { (byte) '6' };<a name="line.569"></a>
-<span class="sourceLineNo">570</span> try {<a name="line.570"></a>
-<span class="sourceLineNo">571</span> TEST_UTIL.createTable(td, splitRows);<a name="line.571"></a>
-<span class="sourceLineNo">572</span> TEST_UTIL.waitTableAvailable(tableName);<a name="line.572"></a>
+<span class="sourceLineNo">489</span> p = new Put(Bytes.toBytes("rep1_rk"));<a name="line.489"></a>
+<span class="sourceLineNo">490</span> p.addColumn(Bytes.toBytes(fn1), q1, v1);<a name="line.490"></a>
+<span class="sourceLineNo">491</span> puts.add(p);<a name="line.491"></a>
+<span class="sourceLineNo">492</span> try {<a name="line.492"></a>
+<span class="sourceLineNo">493</span> table.put(puts);<a name="line.493"></a>
+<span class="sourceLineNo">494</span> ADMIN.flush(tableName);<a name="line.494"></a>
+<span class="sourceLineNo">495</span><a name="line.495"></a>
+<span class="sourceLineNo">496</span> List<HRegion> regions = TEST_UTIL.getMiniHBaseCluster().getRegions(tableName);<a name="line.496"></a>
+<span class="sourceLineNo">497</span> for (HRegion r : regions) {<a name="line.497"></a>
+<span class="sourceLineNo">498</span> HStore store = r.getStore(Bytes.toBytes(fn));<a name="line.498"></a>
+<span class="sourceLineNo">499</span> for (HStoreFile sf : store.getStorefiles()) {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> assertTrue(sf.toString().contains(fn));<a name="line.500"></a>
+<span class="sourceLineNo">501</span> assertTrue("Column family " + fn + " should have 3 copies",<a name="line.501"></a>
+<span class="sourceLineNo">502</span> CommonFSUtils.getDefaultReplication(TEST_UTIL.getTestFileSystem(),<a name="line.502"></a>
+<span class="sourceLineNo">503</span> sf.getPath()) == (sf.getFileInfo().getFileStatus().getReplication()));<a name="line.503"></a>
+<span class="sourceLineNo">504</span> }<a name="line.504"></a>
+<span class="sourceLineNo">505</span><a name="line.505"></a>
+<span class="sourceLineNo">506</span> store = r.getStore(Bytes.toBytes(fn1));<a name="line.506"></a>
+<span class="sourceLineNo">507</span> for (HStoreFile sf : store.getStorefiles()) {<a name="line.507"></a>
+<span class="sourceLineNo">508</span> assertTrue(sf.toString().contains(fn1));<a name="line.508"></a>
+<span class="sourceLineNo">509</span> assertTrue("Column family " + fn1 + " should have only 1 copy",<a name="line.509"></a>
+<span class="sourceLineNo">510</span> 1 == sf.getFileInfo().getFileStatus().getReplication());<a name="line.510"></a>
+<span class="sourceLineNo">511</span> }<a name="line.511"></a>
+<span class="sourceLineNo">512</span> }<a name="line.512"></a>
+<span class="sourceLineNo">513</span> } finally {<a name="line.513"></a>
+<span class="sourceLineNo">514</span> if (ADMIN.isTableEnabled(tableName)) {<a name="line.514"></a>
+<span class="sourceLineNo">515</span> ADMIN.disableTable(tableName);<a name="line.515"></a>
+<span class="sourceLineNo">516</span> ADMIN.deleteTable(tableName);<a name="line.516"></a>
+<span class="sourceLineNo">517</span> }<a name="line.517"></a>
+<span class="sourceLineNo">518</span> }<a name="line.518"></a>
+<span class="sourceLineNo">519</span> }<a name="line.519"></a>
+<span class="sourceLineNo">520</span><a name="line.520"></a>
+<span class="sourceLineNo">521</span> @Test<a name="line.521"></a>
+<span class="sourceLineNo">522</span> public void testMergeRegions() throws Exception {<a name="line.522"></a>
+<span class="sourceLineNo">523</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.523"></a>
+<span class="sourceLineNo">524</span> TableDescriptor td = TableDescriptorBuilder.newBuilder(tableName)<a name="line.524"></a>
+<span class="sourceLineNo">525</span> .setColumnFamily(ColumnFamilyDescriptorBuilder.of("d")).build();<a name="line.525"></a>
+<span class="sourceLineNo">526</span> byte[][] splitRows = new byte[2][];<a name="line.526"></a>
+<span class="sourceLineNo">527</span> splitRows[0] = new byte[] { (byte) '3' };<a name="line.527"></a>
+<span class="sourceLineNo">528</span> splitRows[1] = new byte[] { (byte) '6' };<a name="line.528"></a>
+<span class="sourceLineNo">529</span> try {<a name="line.529"></a>
+<span class="sourceLineNo">530</span> TEST_UTIL.createTable(td, splitRows);<a name="line.530"></a>
+<span class="sourceLineNo">531</span> TEST_UTIL.waitTableAvailable(tableName);<a name="line.531"></a>
+<span class="sourceLineNo">532</span><a name="line.532"></a>
+<span class="sourceLineNo">533</span> List<RegionInfo> tableRegions;<a name="line.533"></a>
+<span class="sourceLineNo">534</span> RegionInfo regionA;<a name="line.534"></a>
+<span class="sourceLineNo">535</span> RegionInfo regionB;<a name="line.535"></a>
+<span class="sourceLineNo">536</span> RegionInfo regionC;<a name="line.536"></a>
+<span class="sourceLineNo">537</span> RegionInfo mergedChildRegion = null;<a name="line.537"></a>
+<span class="sourceLineNo">538</span><a name="line.538"></a>
+<span class="sourceLineNo">539</span> // merge with full name<a name="line.539"></a>
+<span class="sourceLineNo">540</span> tableRegions = ADMIN.getRegions(tableName);<a name="line.540"></a>
+<span class="sourceLineNo">541</span> assertEquals(3, ADMIN.getRegions(tableName).size());<a name="line.541"></a>
+<span class="sourceLineNo">542</span> regionA = tableRegions.get(0);<a name="line.542"></a>
+<span class="sourceLineNo">543</span> regionB = tableRegions.get(1);<a name="line.543"></a>
+<span class="sourceLineNo">544</span> regionC = tableRegions.get(2);<a name="line.544"></a>
+<span class="sourceLineNo">545</span> // TODO convert this to version that is synchronous (See HBASE-16668)<a name="line.545"></a>
+<span class="sourceLineNo">546</span> ADMIN.mergeRegionsAsync(regionA.getRegionName(), regionB.getRegionName(),<a name="line.546"></a>
+<span class="sourceLineNo">547</span> false).get(60, TimeUnit.SECONDS);<a name="line.547"></a>
+<span class="sourceLineNo">548</span><a name="line.548"></a>
+<span class="sourceLineNo">549</span> tableRegions = ADMIN.getRegions(tableName);<a name="line.549"></a>
+<span class="sourceLineNo">550</span><a name="line.550"></a>
+<span class="sourceLineNo">551</span> assertEquals(2, tableRegions.size());<a name="line.551"></a>
+<span class="sourceLineNo">552</span> for (RegionInfo ri : tableRegions) {<a name="line.552"></a>
+<span class="sourceLineNo">553</span> if (regionC.compareTo(ri) != 0) {<a name="line.553"></a>
+<span class="sourceLineNo">554</span> mergedChildRegion = ri;<a name="line.554"></a>
+<span class="sourceLineNo">555</span> break;<a name="line.555"></a>
+<span class="sourceLineNo">556</span> }<a name="line.556"></a>
+<span class="sourceLineNo">557</span> }<a name="line.557"></a>
+<span class="sourceLineNo">558</span><a name="line.558"></a>
+<span class="sourceLineNo">559</span> assertNotNull(mergedChildRegion);<a name="line.559"></a>
+<span class="sourceLineNo">560</span> // Need to wait GC for merged child region is done.<a name="line.560"></a>
+<span class="sourceLineNo">561</span> HMaster services = TEST_UTIL.getHBaseCluster().getMaster();<a name="line.561"></a>
+<span class="sourceLineNo">562</span> CatalogJanitor cj = services.getCatalogJanitor();<a name="line.562"></a>
+<span class="sourceLineNo">563</span> cj.cleanMergeQualifier(mergedChildRegion);<a name="line.563"></a>
+<span class="sourceLineNo">564</span> // Wait until all procedures settled down<a name="line.564"></a>
+<span class="sourceLineNo">565</span> while (!services.getMasterProcedureExecutor().getActiveProcIds().isEmpty()) {<a name="line.565"></a>
+<span class="sourceLineNo">566</span> Thread.sleep(200);<a name="line.566"></a>
+<span class="sourceLineNo">567</span> }<a name="line.567"></a>
+<span class="sourceLineNo">568</span><a name="line.568"></a>
+<span class="sourceLineNo">569</span> // TODO convert this to version that is synchronous (See HBASE-16668)<a name="line.569"></a>
+<span class="sourceLineNo">570</span> ADMIN.mergeRegionsAsync(regionC.getEncodedNameAsBytes(),<a name="line.570"></a>
+<span class="sourceLineNo">571</span> mergedChildRegion.getEncodedNameAsBytes(), false)<a name="line.571"></a>
+<span class="sourceLineNo">572</span> .get(60, TimeUnit.SECONDS);<a name="line.572"></a>
<span class="sourceLineNo">573</span><a name="line.573"></a>
-<span class="sourceLineNo">574</span> List<RegionInfo> tableRegions = ADMIN.getRegions(tableName);<a name="line.574"></a>
-<span class="sourceLineNo">575</span> // 0<a name="line.575"></a>
-<span class="sourceLineNo">576</span> try {<a name="line.576"></a>
-<span class="sourceLineNo">577</span> FutureUtils.get(ADMIN.mergeRegionsAsync(new byte[0][0], false));<a name="line.577"></a>
-<span class="sourceLineNo">578</span> fail();<a name="line.578"></a>
-<span class="sourceLineNo">579</span> } catch (IllegalArgumentException e) {<a name="line.579"></a>
-<span class="sourceLineNo">580</span> // expected<a name="line.580"></a>
-<span class="sourceLineNo">581</span> }<a name="line.581"></a>
-<span class="sourceLineNo">582</span> // 1<a name="line.582"></a>
-<span class="sourceLineNo">583</span> try {<a name="line.583"></a>
-<span class="sourceLineNo">584</span> FutureUtils.get(ADMIN<a name="line.584"></a>
-<span class="sourceLineNo">585</span> .mergeRegionsAsync(new byte[][] { tableRegions.get(0).getEncodedNameAsBytes() }, false));<a name="line.585"></a>
-<span class="sourceLineNo">586</span> fail();<a name="line.586"></a>
-<span class="sourceLineNo">587</span> } catch (IllegalArgumentException e) {<a name="line.587"></a>
-<span class="sourceLineNo">588</span> // expected<a name="line.588"></a>
-<span class="sourceLineNo">589</span> }<a name="line.589"></a>
-<span class="sourceLineNo">590</span> } finally {<a name="line.590"></a>
-<span class="sourceLineNo">591</span> ADMIN.disableTable(tableName);<a name="line.591"></a>
-<span class="sourceLineNo">592</span> ADMIN.deleteTable(tableName);<a name="line.592"></a>
-<span class="sourceLineNo">593</span> }<a name="line.593"></a>
-<span class="sourceLineNo">594</span> }<a name="line.594"></a>
-<span class="sourceLineNo">595</span><a name="line.595"></a>
-<span class="sourceLineNo">596</span> @Test<a name="line.596"></a>
-<span class="sourceLineNo">597</span> public void testSplitShouldNotHappenIfSplitIsDisabledForTable() throws Exception {<a name="line.597"></a>
-<span class="sourceLineNo">598</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.598"></a>
-<span class="sourceLineNo">599</span> TableDescriptor htd = TableDescriptorBuilder.newBuilder(tableName)<a name="line.599"></a>
-<span class="sourceLineNo">600</span> .setRegionSplitPolicyClassName(DisabledRegionSplitPolicy.class.getName())<a name="line.600"></a>
-<span class="sourceLineNo">601</span> .setColumnFamily(ColumnFamilyDescriptorBuilder.of("f")).build();<a name="line.601"></a>
-<span class="sourceLineNo">602</span> Table table = TEST_UTIL.createTable(htd, null);<a name="line.602"></a>
-<span class="sourceLineNo">603</span> for (int i = 0; i < 10; i++) {<a name="line.603"></a>
-<span class="sourceLineNo">604</span> Put p = new Put(Bytes.toBytes("row" + i));<a name="line.604"></a>
-<span class="sourceLineNo">605</span> byte[] q1 = Bytes.toBytes("q1");<a name="line.605"></a>
-<span class="sourceLineNo">606</span> byte[] v1 = Bytes.toBytes("v1");<a name="line.606"></a>
-<span class="sourceLineNo">607</span> p.addColumn(Bytes.toBytes("f"), q1, v1);<a name="line.607"></a>
-<span class="sourceLineNo">608</span> table.put(p);<a name="line.608"></a>
-<span class="sourceLineNo">609</span> }<a name="line.609"></a>
-<span class="sourceLineNo">610</span> ADMIN.flush(tableName);<a name="line.610"></a>
-<span class="sourceLineNo">611</span> try {<a name="line.611"></a>
-<span class="sourceLineNo">612</span> ADMIN.split(tableName, Bytes.toBytes("row5"));<a name="line.612"></a>
-<span class="sourceLineNo">613</span> Threads.sleep(10000);<a name="line.613"></a>
-<span class="sourceLineNo">614</span> } catch (Exception e) {<a name="line.614"></a>
-<span class="sourceLineNo">615</span> // Nothing to do.<a name="line.615"></a>
-<span class="sourceLineNo">616</span> }<a name="line.616"></a>
-<span class="sourceLineNo">617</span> // Split should not happen.<a name="line.617"></a>
-<span class="sourceLineNo">618</span> List<RegionInfo> allRegions =<a name="line.618"></a>
-<span class="sourceLineNo">619</span> MetaTableAccessor.getTableRegions(ADMIN.getConnection(), tableName, true);<a name="line.619"></a>
-<span class="sourceLineNo">620</span> assertEquals(1, allRegions.size());<a name="line.620"></a>
-<span class="sourceLineNo">621</span> }<a name="line.621"></a>
-<span class="sourceLineNo">622</span>}<a name="line.622"></a>
+<span class="sourceLineNo">574</span> assertEquals(1, ADMIN.getRegions(tableName).size());<a name="line.574"></a>
+<span class="sourceLineNo">575</span> } finally {<a name="line.575"></a>
+<span class="sourceLineNo">576</span> ADMIN.disableTable(tableName);<a name="line.576"></a>
+<span class="sourceLineNo">577</span> ADMIN.deleteTable(tableName);<a name="line.577"></a>
+<span class="sourceLineNo">578</span> }<a name="line.578"></a>
+<span class="sourceLineNo">579</span> }<a name="line.579"></a>
+<span class="sourceLineNo">580</span><a name="line.580"></a>
+<span class="sourceLineNo">581</span> @Test<a name="line.581"></a>
+<span class="sourceLineNo">582</span> public void testMergeRegionsInvalidRegionCount()<a name="line.582"></a>
+<span class="sourceLineNo">583</span> throws IOException, InterruptedException, ExecutionException {<a name="line.583"></a>
+<span class="sourceLineNo">584</span> TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.584"></a>
+<span class="sourceLineNo">585</span> TableDescriptor td = TableDescriptorBuilder.newBuilder(tableName)<a name="line.585"></a>
+<span class="sourceLineNo">586</span> .setColumnFamily(ColumnFamilyDescriptorBuilder.of("d")).build();<a name="line.586"></a>
+<span class="sourceLineNo">587</span> byte[][] splitRows = new byte[2][];<a name="line.587"></a>
+<span class="sourceLineNo">588</span> splitRows[0] = new byte[] { (byte) '3' };<a name="line.588"></a>
+<span class="sourceLineNo">589</span> splitRows[1] = new byte[] { (byte) '6' };<a name="line.589"></a>
+<span class="sourceLineNo">590</span> try {<a name="line.590"></a>
+<span class="sourceLineNo">591</span> TEST_UTIL.createTable(td, splitRows);<a name="line.591"></a>
+<span class="sourceLineNo">592</span> TEST_UTIL.waitTableAvailable(tableName);<a name="line.592"></a>
+<span class="sourceLineNo">593</span><a name="line.593"></a>
+<span class="sourceLineNo">594</span> List<RegionInfo> tableRegions = ADMIN.getRegions(tableName);<a name="line.594"></a>
+<span class="sourceLineNo">595</span> // 0<a name="line.595"></a>
+<span class="sourceLineNo">596</span> try {<a name="line.596"></a>
+<span class="sourceLineNo">597</span> FutureUtils.get(ADMIN.mergeRegionsAsync(new byte[0][0], false));<a name="line.597"></a>
+<span class="sourceLineNo">598</span> fail();<a name="line.598"></a>
+<span class="sourceLineNo">599</span> } catch (IllegalArgumentException e) {<a name="line.599"></a>
+<span class="sourceLineNo">600</span> // expected<a name="line.600"></a>
+<span class="sourceLineNo">601</span> }<a name="line.601"></a>
+<span class="sourceLineNo">602</span> // 1<a name="line.602"></a>
+<span class="sourceLineNo">603</span> try {<a name="line.603"></a>
+<span class="sourceLineNo">604</span> FutureUtils.get(ADMIN<a name="line.604"></a>
+<span class="sourceLineNo">605</span> .mergeRegionsAsync(new byte[][] { tableRegions.get(0).getEncodedNameAsBytes() }, false));<a name="line.605"></a>
+<span class="sourceLineNo">606</span> fail();<a name="line.606"></a>
+<span class="sourceLineNo">607</span> } catch (IllegalArgumentException e) {<a name="line.607"></a>
+<span class="sourceLineNo">608</span> // expected<a name="line.608"></a>
+<span class="sourceLineNo">609</span> }<a name="line.609"></a>
+<span class="sourceLineNo">610</span> } finally {<a name="line.610"></a>
+<span class="sourceLineNo">611</span> ADMIN.disableTable(tableName);<a name="line.611"></a>
+<span class="sourceLineNo">612</span> ADMIN.deleteTable(tableName);<a name="line.612"></a>
+<span class="sourceLineNo">613</span> }<a name="line.613"></a>
+<span class="sourceLineNo">614</span> }<a name="line.614"></a>
+<span class="sourceLineNo">615</span><a name="line.615"></a>
+<span class="sourceLineNo">616</span> @Test<a name="line.616"></a>
+<span class="sourceLineNo">617</span> public void testSplitShouldNotHappenIfSplitIsDisabledForTable() throws Exception {<a name="line.617"></a>
+<span class="sourceLineNo">618</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.618"></a>
+<span class="sourceLineNo">619</span> TableDescriptor htd = TableDescriptorBuilder.newBuilder(tableName)<a name="line.619"></a>
+<span class="sourceLineNo">620</span> .setRegionSplitPolicyClassName(DisabledRegionSplitPolicy.class.getName())<a name="line.620"></a>
+<span class="sourceLineNo">621</span> .setColumnFamily(ColumnFamilyDescriptorBuilder.of("f")).build();<a name="line.621"></a>
+<span class="sourceLineNo">622</span> Table table = TEST_UTIL.createTable(htd, null);<a name="line.622"></a>
+<span class="sourceLineNo">623</span> for (int i = 0; i < 10; i++) {<a name="line.623"></a>
+<span class="sourceLineNo">624</span> Put p = new Put(Bytes.toBytes("row" + i));<a name="line.624"></a>
+<span class="sourceLineNo">625</span> byte[] q1 = Bytes.toBytes("q1");<a name="line.625"></a>
+<span class="sourceLineNo">626</span> byte[] v1 = Bytes.toBytes("v1");<a name="line.626"></a>
+<span class="sourceLineNo">627</span> p.addColumn(Bytes.toBytes("f"), q1, v1);<a name="line.627"></a>
+<span class="sourceLineNo">628</span> table.put(p);<a name="line.628"></a>
+<span class="sourceLineNo">629</span> }<a name="line.629"></a>
+<span class="sourceLineNo">630</span> ADMIN.flush(tableName);<a name="line.630"></a>
+<span class="sourceLineNo">631</span> try {<a name="line.631"></a>
+<span class="sourceLineNo">632</span> ADMIN.split(tableName, Bytes.toBytes("row5"));<a name="line.632"></a>
+<span class="sourceLineNo">633</span> Threads.sleep(10000);<a name="line.633"></a>
+<span class="sourceLineNo">634</span> } catch (Exception e) {<a name="line.634"></a>
+<span class="sourceLineNo">635</span> // Nothing to do.<a name="line.635"></a>
+<span class="sourceLineNo">636</span> }<a name="line.636"></a>
+<span class="sourceLineNo">637</span> // Split should not happen.<a name="line.637"></a>
+<span class="sourceLineNo">638</span> List<RegionInfo> allRegions =<a name="line.638"></a>
+<span class="sourceLineNo">639</span> MetaTableAccessor.getTableRegions(ADMIN.getConnection(), tableName, true);<a name="line.639"></a>
+<span class="sourceLineNo">640</span> assertEquals(1, allRegions.size());<a name="line.640"></a>
+<span class="sourceLineNo">641</span> }<a name="line.641"></a>
+<span class="sourceLineNo">642</span>}<a name="line.642"></a>
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html
index c93aa21..8ab5196 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi2.html
@@ -29,250 +29,272 @@
<span class="sourceLineNo">021</span>import static org.hamcrest.CoreMatchers.instanceOf;<a name="line.21"></a>
<span class="sourceLineNo">022</span>import static org.junit.Assert.assertEquals;<a name="line.22"></a>
<span class="sourceLineNo">023</span>import static org.junit.Assert.assertFalse;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import static org.junit.Assert.assertThat;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import static org.junit.Assert.assertTrue;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import static org.junit.Assert.fail;<a name="line.26"></a>
-<span class="sourceLineNo">027</span><a name="line.27"></a>
-<span class="sourceLineNo">028</span>import java.util.ArrayList;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import java.util.Collections;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import java.util.List;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import java.util.concurrent.ExecutionException;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import java.util.stream.Collectors;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.AsyncMetaTableAccessor;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.HConstants;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.HRegionLocation;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.TableName;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.util.Threads;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.junit.ClassRule;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.junit.Ignore;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.junit.Test;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.junit.experimental.categories.Category;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.junit.runner.RunWith;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.junit.runners.Parameterized;<a name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>/**<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * Class to test asynchronous region admin operations.<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * @see TestAsyncRegionAdminApi This test and it used to be joined it was taking longer than our<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * ten minute timeout so they were split.<a name="line.52"></a>
-<span class="sourceLineNo">053</span> */<a name="line.53"></a>
-<span class="sourceLineNo">054</span>@RunWith(Parameterized.class)<a name="line.54"></a>
-<span class="sourceLineNo">055</span>@Category({ LargeTests.class, ClientTests.class })<a name="line.55"></a>
-<span class="sourceLineNo">056</span>public class TestAsyncRegionAdminApi2 extends TestAsyncAdminBase {<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span> @ClassRule<a name="line.58"></a>
-<span class="sourceLineNo">059</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.59"></a>
-<span class="sourceLineNo">060</span> HBaseClassTestRule.forClass(TestAsyncRegionAdminApi2.class);<a name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span> @Test<a name="line.62"></a>
-<span class="sourceLineNo">063</span> public void testGetRegionLocation() throws Exception {<a name="line.63"></a>
-<span class="sourceLineNo">064</span> RawAsyncHBaseAdmin rawAdmin = (RawAsyncHBaseAdmin) ASYNC_CONN.getAdmin();<a name="line.64"></a>
-<span class="sourceLineNo">065</span> TEST_UTIL.createMultiRegionTable(tableName, HConstants.CATALOG_FAMILY);<a name="line.65"></a>
-<span class="sourceLineNo">066</span> AsyncTableRegionLocator locator = ASYNC_CONN.getRegionLocator(tableName);<a name="line.66"></a>
-<span class="sourceLineNo">067</span> HRegionLocation regionLocation = locator.getRegionLocation(Bytes.toBytes("mmm")).get();<a name="line.67"></a>
-<span class="sourceLineNo">068</span> RegionInfo region = regionLocation.getRegion();<a name="line.68"></a>
-<span class="sourceLineNo">069</span> byte[] regionName = regionLocation.getRegion().getRegionName();<a name="line.69"></a>
-<span class="sourceLineNo">070</span> HRegionLocation location = rawAdmin.getRegionLocation(regionName).get();<a name="line.70"></a>
-<span class="sourceLineNo">071</span> assertTrue(Bytes.equals(regionName, location.getRegion().getRegionName()));<a name="line.71"></a>
-<span class="sourceLineNo">072</span> location = rawAdmin.getRegionLocation(region.getEncodedNameAsBytes()).get();<a name="line.72"></a>
-<span class="sourceLineNo">073</span> assertTrue(Bytes.equals(regionName, location.getRegion().getRegionName()));<a name="line.73"></a>
-<span class="sourceLineNo">074</span> }<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span> @Test<a name="line.76"></a>
-<span class="sourceLineNo">077</span> public void testSplitSwitch() throws Exception {<a name="line.77"></a>
-<span class="sourceLineNo">078</span> createTableWithDefaultConf(tableName);<a name="line.78"></a>
-<span class="sourceLineNo">079</span> byte[][] families = {FAMILY};<a name="line.79"></a>
-<span class="sourceLineNo">080</span> final int rows = 10000;<a name="line.80"></a>
-<span class="sourceLineNo">081</span> TestAsyncRegionAdminApi.loadData(tableName, families, rows);<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span> AsyncTable<AdvancedScanResultConsumer> metaTable = ASYNC_CONN.getTable(META_TABLE_NAME);<a name="line.83"></a>
-<span class="sourceLineNo">084</span> List<HRegionLocation> regionLocations =<a name="line.84"></a>
-<span class="sourceLineNo">085</span> AsyncMetaTableAccessor.getTableHRegionLocations(metaTable, tableName).get();<a name="line.85"></a>
-<span class="sourceLineNo">086</span> int originalCount = regionLocations.size();<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span> initSplitMergeSwitch();<a name="line.88"></a>
-<span class="sourceLineNo">089</span> assertTrue(admin.splitSwitch(false).get());<a name="line.89"></a>
-<span class="sourceLineNo">090</span> try {<a name="line.90"></a>
-<span class="sourceLineNo">091</span> admin.split(tableName, Bytes.toBytes(rows / 2)).join();<a name="line.91"></a>
-<span class="sourceLineNo">092</span> } catch (Exception e) {<a name="line.92"></a>
-<span class="sourceLineNo">093</span> //Expected<a name="line.93"></a>
-<span class="sourceLineNo">094</span> }<a name="line.94"></a>
-<span class="sourceLineNo">095</span> int count = admin.getRegions(tableName).get().size();<a name="line.95"></a>
-<span class="sourceLineNo">096</span> assertTrue(originalCount == count);<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span> assertFalse(admin.splitSwitch(true).get());<a name="line.98"></a>
-<span class="sourceLineNo">099</span> admin.split(tableName).join();<a name="line.99"></a>
-<span class="sourceLineNo">100</span> while ((count = admin.getRegions(tableName).get().size()) == originalCount) {<a name="line.100"></a>
-<span class="sourceLineNo">101</span> Threads.sleep(100);<a name="line.101"></a>
-<span class="sourceLineNo">102</span> }<a name="line.102"></a>
-<span class="sourceLineNo">103</span> assertTrue(originalCount < count);<a name="line.103"></a>
-<span class="sourceLineNo">104</span> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span> @Test<a name="line.106"></a>
-<span class="sourceLineNo">107</span> @Ignore<a name="line.107"></a>
-<span class="sourceLineNo">108</span> // It was ignored in TestSplitOrMergeStatus, too<a name="line.108"></a>
-<span class="sourceLineNo">109</span> public void testMergeSwitch() throws Exception {<a name="line.109"></a>
-<span class="sourceLineNo">110</span> createTableWithDefaultConf(tableName);<a name="line.110"></a>
-<span class="sourceLineNo">111</span> byte[][] families = {FAMILY};<a name="line.111"></a>
-<span class="sourceLineNo">112</span> TestAsyncRegionAdminApi.loadData(tableName, families, 1000);<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span> AsyncTable<AdvancedScanResultConsumer> metaTable = ASYNC_CONN.getTable(META_TABLE_NAME);<a name="line.114"></a>
-<span class="sourceLineNo">115</span> List<HRegionLocation> regionLocations =<a name="line.115"></a>
-<span class="sourceLineNo">116</span> AsyncMetaTableAccessor.getTableHRegionLocations(metaTable, tableName).get();<a name="line.116"></a>
-<span class="sourceLineNo">117</span> int originalCount = regionLocations.size();<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span> initSplitMergeSwitch();<a name="line.119"></a>
-<span class="sourceLineNo">120</span> admin.split(tableName).join();<a name="line.120"></a>
-<span class="sourceLineNo">121</span> int postSplitCount = originalCount;<a name="line.121"></a>
-<span class="sourceLineNo">122</span> while ((postSplitCount = admin.getRegions(tableName).get().size()) == originalCount) {<a name="line.122"></a>
-<span class="sourceLineNo">123</span> Threads.sleep(100);<a name="line.123"></a>
-<span class="sourceLineNo">124</span> }<a name="line.124"></a>
-<span class="sourceLineNo">125</span> assertTrue("originalCount=" + originalCount + ", postSplitCount=" + postSplitCount,<a name="line.125"></a>
-<span class="sourceLineNo">126</span> originalCount != postSplitCount);<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span> // Merge switch is off so merge should NOT succeed.<a name="line.128"></a>
-<span class="sourceLineNo">129</span> assertTrue(admin.mergeSwitch(false).get());<a name="line.129"></a>
-<span class="sourceLineNo">130</span> List<RegionInfo> regions = admin.getRegions(tableName).get();<a name="line.130"></a>
-<span class="sourceLineNo">131</span> assertTrue(regions.size() > 1);<a name="line.131"></a>
-<span class="sourceLineNo">132</span> admin.mergeRegions(regions.get(0).getRegionName(), regions.get(1).getRegionName(), true).join();<a name="line.132"></a>
-<span class="sourceLineNo">133</span> int count = admin.getRegions(tableName).get().size();<a name="line.133"></a>
-<span class="sourceLineNo">134</span> assertTrue("postSplitCount=" + postSplitCount + ", count=" + count, postSplitCount == count);<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span> // Merge switch is on so merge should succeed.<a name="line.136"></a>
-<span class="sourceLineNo">137</span> assertFalse(admin.mergeSwitch(true).get());<a name="line.137"></a>
-<span class="sourceLineNo">138</span> admin.mergeRegions(regions.get(0).getRegionName(), regions.get(1).getRegionName(), true).join();<a name="line.138"></a>
-<span class="sourceLineNo">139</span> count = admin.getRegions(tableName).get().size();<a name="line.139"></a>
-<span class="sourceLineNo">140</span> assertTrue((postSplitCount / 2) == count);<a name="line.140"></a>
-<span class="sourceLineNo">141</span> }<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span> private void initSplitMergeSwitch() throws Exception {<a name="line.143"></a>
-<span class="sourceLineNo">144</span> if (!admin.isSplitEnabled().get()) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span> admin.splitSwitch(true).get();<a name="line.145"></a>
-<span class="sourceLineNo">146</span> }<a name="line.146"></a>
-<span class="sourceLineNo">147</span> if (!admin.isMergeEnabled().get()) {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> admin.mergeSwitch(true).get();<a name="line.148"></a>
+<span class="sourceLineNo">024</span>import static org.junit.Assert.assertNotNull;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import static org.junit.Assert.assertThat;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import static org.junit.Assert.assertTrue;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import static org.junit.Assert.fail;<a name="line.27"></a>
+<span class="sourceLineNo">028</span><a name="line.28"></a>
+<span class="sourceLineNo">029</span>import java.util.ArrayList;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import java.util.Collections;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import java.util.List;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import java.util.concurrent.ExecutionException;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import java.util.stream.Collectors;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.AsyncMetaTableAccessor;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.HConstants;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.HRegionLocation;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.TableName;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.master.CatalogJanitor;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.master.HMaster;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.util.Threads;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.junit.ClassRule;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.junit.Ignore;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.junit.Test;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.junit.experimental.categories.Category;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.junit.runner.RunWith;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.junit.runners.Parameterized;<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span>/**<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * Class to test asynchronous region admin operations.<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * @see TestAsyncRegionAdminApi This test and it used to be joined it was taking longer than our<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * ten minute timeout so they were split.<a name="line.55"></a>
+<span class="sourceLineNo">056</span> */<a name="line.56"></a>
+<span class="sourceLineNo">057</span>@RunWith(Parameterized.class)<a name="line.57"></a>
+<span class="sourceLineNo">058</span>@Category({ LargeTests.class, ClientTests.class })<a name="line.58"></a>
+<span class="sourceLineNo">059</span>public class TestAsyncRegionAdminApi2 extends TestAsyncAdminBase {<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span> @ClassRule<a name="line.61"></a>
+<span class="sourceLineNo">062</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.62"></a>
+<span class="sourceLineNo">063</span> HBaseClassTestRule.forClass(TestAsyncRegionAdminApi2.class);<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span> @Test<a name="line.65"></a>
+<span class="sourceLineNo">066</span> public void testGetRegionLocation() throws Exception {<a name="line.66"></a>
+<span class="sourceLineNo">067</span> RawAsyncHBaseAdmin rawAdmin = (RawAsyncHBaseAdmin) ASYNC_CONN.getAdmin();<a name="line.67"></a>
+<span class="sourceLineNo">068</span> TEST_UTIL.createMultiRegionTable(tableName, HConstants.CATALOG_FAMILY);<a name="line.68"></a>
+<span class="sourceLineNo">069</span> AsyncTableRegionLocator locator = ASYNC_CONN.getRegionLocator(tableName);<a name="line.69"></a>
+<span class="sourceLineNo">070</span> HRegionLocation regionLocation = locator.getRegionLocation(Bytes.toBytes("mmm")).get();<a name="line.70"></a>
+<span class="sourceLineNo">071</span> RegionInfo region = regionLocation.getRegion();<a name="line.71"></a>
+<span class="sourceLineNo">072</span> byte[] regionName = regionLocation.getRegion().getRegionName();<a name="line.72"></a>
+<span class="sourceLineNo">073</span> HRegionLocation location = rawAdmin.getRegionLocation(regionName).get();<a name="line.73"></a>
+<span class="sourceLineNo">074</span> assertTrue(Bytes.equals(regionName, location.getRegion().getRegionName()));<a name="line.74"></a>
+<span class="sourceLineNo">075</span> location = rawAdmin.getRegionLocation(region.getEncodedNameAsBytes()).get();<a name="line.75"></a>
+<span class="sourceLineNo">076</span> assertTrue(Bytes.equals(regionName, location.getRegion().getRegionName()));<a name="line.76"></a>
+<span class="sourceLineNo">077</span> }<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span> @Test<a name="line.79"></a>
+<span class="sourceLineNo">080</span> public void testSplitSwitch() throws Exception {<a name="line.80"></a>
+<span class="sourceLineNo">081</span> createTableWithDefaultConf(tableName);<a name="line.81"></a>
+<span class="sourceLineNo">082</span> byte[][] families = {FAMILY};<a name="line.82"></a>
+<span class="sourceLineNo">083</span> final int rows = 10000;<a name="line.83"></a>
+<span class="sourceLineNo">084</span> TestAsyncRegionAdminApi.loadData(tableName, families, rows);<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span> AsyncTable<AdvancedScanResultConsumer> metaTable = ASYNC_CONN.getTable(META_TABLE_NAME);<a name="line.86"></a>
+<span class="sourceLineNo">087</span> List<HRegionLocation> regionLocations =<a name="line.87"></a>
+<span class="sourceLineNo">088</span> AsyncMetaTableAccessor.getTableHRegionLocations(metaTable, tableName).get();<a name="line.88"></a>
+<span class="sourceLineNo">089</span> int originalCount = regionLocations.size();<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span> initSplitMergeSwitch();<a name="line.91"></a>
+<span class="sourceLineNo">092</span> assertTrue(admin.splitSwitch(false).get());<a name="line.92"></a>
+<span class="sourceLineNo">093</span> try {<a name="line.93"></a>
+<span class="sourceLineNo">094</span> admin.split(tableName, Bytes.toBytes(rows / 2)).join();<a name="line.94"></a>
+<span class="sourceLineNo">095</span> } catch (Exception e) {<a name="line.95"></a>
+<span class="sourceLineNo">096</span> //Expected<a name="line.96"></a>
+<span class="sourceLineNo">097</span> }<a name="line.97"></a>
+<span class="sourceLineNo">098</span> int count = admin.getRegions(tableName).get().size();<a name="line.98"></a>
+<span class="sourceLineNo">099</span> assertTrue(originalCount == count);<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span> assertFalse(admin.splitSwitch(true).get());<a name="line.101"></a>
+<span class="sourceLineNo">102</span> admin.split(tableName).join();<a name="line.102"></a>
+<span class="sourceLineNo">103</span> while ((count = admin.getRegions(tableName).get().size()) == originalCount) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span> Threads.sleep(100);<a name="line.104"></a>
+<span class="sourceLineNo">105</span> }<a name="line.105"></a>
+<span class="sourceLineNo">106</span> assertTrue(originalCount < count);<a name="line.106"></a>
+<span class="sourceLineNo">107</span> }<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span> @Test<a name="line.109"></a>
+<span class="sourceLineNo">110</span> @Ignore<a name="line.110"></a>
+<span class="sourceLineNo">111</span> // It was ignored in TestSplitOrMergeStatus, too<a name="line.111"></a>
+<span class="sourceLineNo">112</span> public void testMergeSwitch() throws Exception {<a name="line.112"></a>
+<span class="sourceLineNo">113</span> createTableWithDefaultConf(tableName);<a name="line.113"></a>
+<span class="sourceLineNo">114</span> byte[][] families = {FAMILY};<a name="line.114"></a>
+<span class="sourceLineNo">115</span> TestAsyncRegionAdminApi.loadData(tableName, families, 1000);<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span> AsyncTable<AdvancedScanResultConsumer> metaTable = ASYNC_CONN.getTable(META_TABLE_NAME);<a name="line.117"></a>
+<span class="sourceLineNo">118</span> List<HRegionLocation> regionLocations =<a name="line.118"></a>
+<span class="sourceLineNo">119</span> AsyncMetaTableAccessor.getTableHRegionLocations(metaTable, tableName).get();<a name="line.119"></a>
+<span class="sourceLineNo">120</span> int originalCount = regionLocations.size();<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> initSplitMergeSwitch();<a name="line.122"></a>
+<span class="sourceLineNo">123</span> admin.split(tableName).join();<a name="line.123"></a>
+<span class="sourceLineNo">124</span> int postSplitCount = originalCount;<a name="line.124"></a>
+<span class="sourceLineNo">125</span> while ((postSplitCount = admin.getRegions(tableName).get().size()) == originalCount) {<a name="line.125"></a>
+<span class="sourceLineNo">126</span> Threads.sleep(100);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> }<a name="line.127"></a>
+<span class="sourceLineNo">128</span> assertTrue("originalCount=" + originalCount + ", postSplitCount=" + postSplitCount,<a name="line.128"></a>
+<span class="sourceLineNo">129</span> originalCount != postSplitCount);<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span> // Merge switch is off so merge should NOT succeed.<a name="line.131"></a>
+<span class="sourceLineNo">132</span> assertTrue(admin.mergeSwitch(false).get());<a name="line.132"></a>
+<span class="sourceLineNo">133</span> List<RegionInfo> regions = admin.getRegions(tableName).get();<a name="line.133"></a>
+<span class="sourceLineNo">134</span> assertTrue(regions.size() > 1);<a name="line.134"></a>
+<span class="sourceLineNo">135</span> admin.mergeRegions(regions.get(0).getRegionName(), regions.get(1).getRegionName(), true).join();<a name="line.135"></a>
+<span class="sourceLineNo">136</span> int count = admin.getRegions(tableName).get().size();<a name="line.136"></a>
+<span class="sourceLineNo">137</span> assertTrue("postSplitCount=" + postSplitCount + ", count=" + count, postSplitCount == count);<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span> // Merge switch is on so merge should succeed.<a name="line.139"></a>
+<span class="sourceLineNo">140</span> assertFalse(admin.mergeSwitch(true).get());<a name="line.140"></a>
+<span class="sourceLineNo">141</span> admin.mergeRegions(regions.get(0).getRegionName(), regions.get(1).getRegionName(), true).join();<a name="line.141"></a>
+<span class="sourceLineNo">142</span> count = admin.getRegions(tableName).get().size();<a name="line.142"></a>
+<span class="sourceLineNo">143</span> assertTrue((postSplitCount / 2) == count);<a name="line.143"></a>
+<span class="sourceLineNo">144</span> }<a name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span> private void initSplitMergeSwitch() throws Exception {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> if (!admin.isSplitEnabled().get()) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> admin.splitSwitch(true).get();<a name="line.148"></a>
<span class="sourceLineNo">149</span> }<a name="line.149"></a>
-<span class="sourceLineNo">150</span> assertTrue(admin.isSplitEnabled().get());<a name="line.150"></a>
-<span class="sourceLineNo">151</span> assertTrue(admin.isMergeEnabled().get());<a name="line.151"></a>
-<span class="sourceLineNo">152</span> }<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span> @Test<a name="line.154"></a>
-<span class="sourceLineNo">155</span> public void testMergeRegions() throws Exception {<a name="line.155"></a>
-<span class="sourceLineNo">156</span> byte[][] splitRows = new byte[][]{Bytes.toBytes("3"), Bytes.toBytes("6")};<a name="line.156"></a>
-<span class="sourceLineNo">157</span> createTableWithDefaultConf(tableName, splitRows);<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span> AsyncTable<AdvancedScanResultConsumer> metaTable = ASYNC_CONN.getTable(META_TABLE_NAME);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> List<HRegionLocation> regionLocations = AsyncMetaTableAccessor<a name="line.160"></a>
-<span class="sourceLineNo">161</span> .getTableHRegionLocations(metaTable, tableName).get();<a name="line.161"></a>
-<span class="sourceLineNo">162</span> RegionInfo regionA;<a name="line.162"></a>
-<span class="sourceLineNo">163</span> RegionInfo regionB;<a name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span> // merge with full name<a name="line.165"></a>
-<span class="sourceLineNo">166</span> assertEquals(3, regionLocations.size());<a name="line.166"></a>
-<span class="sourceLineNo">167</span> regionA = regionLocations.get(0).getRegion();<a name="line.167"></a>
-<span class="sourceLineNo">168</span> regionB = regionLocations.get(1).getRegion();<a name="line.168"></a>
-<span class="sourceLineNo">169</span> admin.mergeRegions(regionA.getRegionName(), regionB.getRegionName(), false).get();<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span> regionLocations = AsyncMetaTableAccessor<a name="line.171"></a>
-<span class="sourceLineNo">172</span> .getTableHRegionLocations(metaTable, tableName).get();<a name="line.172"></a>
-<span class="sourceLineNo">173</span> assertEquals(2, regionLocations.size());<a name="line.173"></a>
-<span class="sourceLineNo">174</span> // merge with encoded name<a name="line.174"></a>
-<span class="sourceLineNo">175</span> regionA = regionLocations.get(0).getRegion();<a name="line.175"></a>
-<span class="sourceLineNo">176</span> regionB = regionLocations.get(1).getRegion();<a name="line.176"></a>
-<span class="sourceLineNo">177</span> admin.mergeRegions(regionA.getRegionName(), regionB.getRegionName(), false).get();<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> regionLocations = AsyncMetaTableAccessor<a name="line.179"></a>
-<span class="sourceLineNo">180</span> .getTableHRegionLocations(metaTable, tableName).get();<a name="line.180"></a>
-<span class="sourceLineNo">181</span> assertEquals(1, regionLocations.size());<a name="line.181"></a>
-<span class="sourceLineNo">182</span> }<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span> @Test<a name="line.184"></a>
-<span class="sourceLineNo">185</span> public void testMergeRegionsInvalidRegionCount() throws Exception {<a name="line.185"></a>
-<span class="sourceLineNo">186</span> byte[][] splitRows = new byte[][] { Bytes.toBytes("3"), Bytes.toBytes("6") };<a name="line.186"></a>
-<span class="sourceLineNo">187</span> createTableWithDefaultConf(tableName, splitRows);<a name="line.187"></a>
-<span class="sourceLineNo">188</span> List<RegionInfo> regions = admin.getRegions(tableName).join();<a name="line.188"></a>
-<span class="sourceLineNo">189</span> // 0<a name="line.189"></a>
-<span class="sourceLineNo">190</span> try {<a name="line.190"></a>
-<span class="sourceLineNo">191</span> admin.mergeRegions(Collections.emptyList(), false).get();<a name="line.191"></a>
-<span class="sourceLineNo">192</span> fail();<a name="line.192"></a>
-<span class="sourceLineNo">193</span> } catch (ExecutionException e) {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> // expected<a name="line.194"></a>
-<span class="sourceLineNo">195</span> assertThat(e.getCause(), instanceOf(IllegalArgumentException.class));<a name="line.195"></a>
+<span class="sourceLineNo">150</span> if (!admin.isMergeEnabled().get()) {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> admin.mergeSwitch(true).get();<a name="line.151"></a>
+<span class="sourceLineNo">152</span> }<a name="line.152"></a>
+<span class="sourceLineNo">153</span> assertTrue(admin.isSplitEnabled().get());<a name="line.153"></a>
+<span class="sourceLineNo">154</span> assertTrue(admin.isMergeEnabled().get());<a name="line.154"></a>
+<span class="sourceLineNo">155</span> }<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span> @Test<a name="line.157"></a>
+<span class="sourceLineNo">158</span> public void testMergeRegions() throws Exception {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> byte[][] splitRows = new byte[][]{Bytes.toBytes("3"), Bytes.toBytes("6")};<a name="line.159"></a>
+<span class="sourceLineNo">160</span> createTableWithDefaultConf(tableName, splitRows);<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span> AsyncTable<AdvancedScanResultConsumer> metaTable = ASYNC_CONN.getTable(META_TABLE_NAME);<a name="line.162"></a>
+<span class="sourceLineNo">163</span> List<HRegionLocation> regionLocations = AsyncMetaTableAccessor<a name="line.163"></a>
+<span class="sourceLineNo">164</span> .getTableHRegionLocations(metaTable, tableName).get();<a name="line.164"></a>
+<span class="sourceLineNo">165</span> RegionInfo regionA;<a name="line.165"></a>
+<span class="sourceLineNo">166</span> RegionInfo regionB;<a name="line.166"></a>
+<span class="sourceLineNo">167</span> RegionInfo regionC;<a name="line.167"></a>
+<span class="sourceLineNo">168</span> RegionInfo mergedChildRegion = null;<a name="line.168"></a>
+<span class="sourceLineNo">169</span><a name="line.169"></a>
+<span class="sourceLineNo">170</span> // merge with full name<a name="line.170"></a>
+<span class="sourceLineNo">171</span> assertEquals(3, regionLocations.size());<a name="line.171"></a>
+<span class="sourceLineNo">172</span> regionA = regionLocations.get(0).getRegion();<a name="line.172"></a>
+<span class="sourceLineNo">173</span> regionB = regionLocations.get(1).getRegion();<a name="line.173"></a>
+<span class="sourceLineNo">174</span> regionC = regionLocations.get(2).getRegion();<a name="line.174"></a>
+<span class="sourceLineNo">175</span> admin.mergeRegions(regionA.getRegionName(), regionB.getRegionName(), false).get();<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span> regionLocations = AsyncMetaTableAccessor<a name="line.177"></a>
+<span class="sourceLineNo">178</span> .getTableHRegionLocations(metaTable, tableName).get();<a name="line.178"></a>
+<span class="sourceLineNo">179</span><a name="line.179"></a>
+<span class="sourceLineNo">180</span> assertEquals(2, regionLocations.size());<a name="line.180"></a>
+<span class="sourceLineNo">181</span> for (HRegionLocation rl : regionLocations) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> if (regionC.compareTo(rl.getRegion()) != 0) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> mergedChildRegion = rl.getRegion();<a name="line.183"></a>
+<span class="sourceLineNo">184</span> break;<a name="line.184"></a>
+<span class="sourceLineNo">185</span> }<a name="line.185"></a>
+<span class="sourceLineNo">186</span> }<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span> assertNotNull(mergedChildRegion);<a name="line.188"></a>
+<span class="sourceLineNo">189</span> // Need to wait GC for merged child region is done.<a name="line.189"></a>
+<span class="sourceLineNo">190</span> HMaster services = TEST_UTIL.getHBaseCluster().getMaster();<a name="line.190"></a>
+<span class="sourceLineNo">191</span> CatalogJanitor cj = services.getCatalogJanitor();<a name="line.191"></a>
+<span class="sourceLineNo">192</span> cj.cleanMergeQualifier(mergedChildRegion);<a name="line.192"></a>
+<span class="sourceLineNo">193</span> // Wait until all procedures settled down<a name="line.193"></a>
+<span class="sourceLineNo">194</span> while (!services.getMasterProcedureExecutor().getActiveProcIds().isEmpty()) {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> Thread.sleep(200);<a name="line.195"></a>
<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span> // 1<a name="line.197"></a>
-<span class="sourceLineNo">198</span> try {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> admin.mergeRegions(regions.stream().limit(1).map(RegionInfo::getEncodedNameAsBytes)<a name="line.199"></a>
-<span class="sourceLineNo">200</span> .collect(Collectors.toList()), false).get();<a name="line.200"></a>
-<span class="sourceLineNo">201</span> fail();<a name="line.201"></a>
-<span class="sourceLineNo">202</span> } catch (ExecutionException e) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span> // expected<a name="line.203"></a>
-<span class="sourceLineNo">204</span> assertThat(e.getCause(), instanceOf(IllegalArgumentException.class));<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span> @Test<a name="line.208"></a>
-<span class="sourceLineNo">209</span> public void testSplitTable() throws Exception {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> initSplitMergeSwitch();<a name="line.210"></a>
-<span class="sourceLineNo">211</span> splitTest(TableName.valueOf("testSplitTable"), 3000, false, null);<a name="line.211"></a>
-<span class="sourceLineNo">212</span> splitTest(TableName.valueOf("testSplitTableWithSplitPoint"), 3000, false, Bytes.toBytes("3"));<a name="line.212"></a>
-<span class="sourceLineNo">213</span> splitTest(TableName.valueOf("testSplitTableRegion"), 3000, true, null);<a name="line.213"></a>
-<span class="sourceLineNo">214</span> splitTest(TableName.valueOf("testSplitTableRegionWithSplitPoint2"), 3000, true, Bytes.toBytes("3"));<a name="line.214"></a>
-<span class="sourceLineNo">215</span> }<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> private void<a name="line.217"></a>
-<span class="sourceLineNo">218</span> splitTest(TableName tableName, int rowCount, boolean isSplitRegion, byte[] splitPoint)<a name="line.218"></a>
-<span class="sourceLineNo">219</span> throws Exception {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> // create table<a name="line.220"></a>
-<span class="sourceLineNo">221</span> createTableWithDefaultConf(tableName);<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span> AsyncTable<AdvancedScanResultConsumer> metaTable = ASYNC_CONN.getTable(META_TABLE_NAME);<a name="line.223"></a>
-<span class="sourceLineNo">224</span> List<HRegionLocation> regionLocations = AsyncMetaTableAccessor<a name="line.224"></a>
-<span class="sourceLineNo">225</span> .getTableHRegionLocations(metaTable, tableName).get();<a name="line.225"></a>
-<span class="sourceLineNo">226</span> assertEquals(1, regionLocations.size());<a name="line.226"></a>
-<span class="sourceLineNo">227</span><a name="line.227"></a>
-<span class="sourceLineNo">228</span> AsyncTable<?> table = ASYNC_CONN.getTable(tableName);<a name="line.228"></a>
-<span class="sourceLineNo">229</span> List<Put> puts = new ArrayList<>();<a name="line.229"></a>
-<span class="sourceLineNo">230</span> for (int i = 0; i < rowCount; i++) {<a name="line.230"></a>
-<span class="sourceLineNo">231</span> Put put = new Put(Bytes.toBytes(i));<a name="line.231"></a>
-<span class="sourceLineNo">232</span> put.addColumn(FAMILY, null, Bytes.toBytes("value" + i));<a name="line.232"></a>
-<span class="sourceLineNo">233</span> puts.add(put);<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<a name="line.234"></a>
-<span class="sourceLineNo">235</span> table.putAll(puts).join();<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> if (isSplitRegion) {<a name="line.237"></a>
-<span class="sourceLineNo">238</span> if (splitPoint == null) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> admin.splitRegion(regionLocations.get(0).getRegion().getRegionName()).get();<a name="line.239"></a>
-<span class="sourceLineNo">240</span> } else {<a name="line.240"></a>
-<span class="sourceLineNo">241</span> admin.splitRegion(regionLocations.get(0).getRegion().getRegionName(), splitPoint).get();<a name="line.241"></a>
-<span class="sourceLineNo">242</span> }<a name="line.242"></a>
-<span class="sourceLineNo">243</span> } else {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> if (splitPoint == null) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> admin.split(tableName).get();<a name="line.245"></a>
-<span class="sourceLineNo">246</span> } else {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> admin.split(tableName, splitPoint).get();<a name="line.247"></a>
-<span class="sourceLineNo">248</span> }<a name="line.248"></a>
-<span class="sourceLineNo">249</span> }<a name="line.249"></a>
-<span class="sourceLineNo">250</span><a name="line.250"></a>
-<span class="sourceLineNo">251</span> int count = 0;<a name="line.251"></a>
-<span class="sourceLineNo">252</span> for (int i = 0; i < 45; i++) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> try {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> regionLocations = AsyncMetaTableAccessor<a name="line.254"></a>
-<span class="sourceLineNo">255</span> .getTableHRegionLocations(metaTable, tableName).get();<a name="line.255"></a>
-<span class="sourceLineNo">256</span> count = regionLocations.size();<a name="line.256"></a>
-<span class="sourceLineNo">257</span> if (count >= 2) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> break;<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span> Thread.sleep(1000L);<a name="line.260"></a>
-<span class="sourceLineNo">261</span> } catch (Exception e) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span> LOG.error(e.toString(), e);<a name="line.262"></a>
-<span class="sourceLineNo">263</span> }<a name="line.263"></a>
-<span class="sourceLineNo">264</span> }<a name="line.264"></a>
-<span class="sourceLineNo">265</span> assertEquals(2, count);<a name="line.265"></a>
-<span class="sourceLineNo">266</span> }<a name="line.266"></a>
-<span class="sourceLineNo">267</span>}<a name="line.267"></a>
+<span class="sourceLineNo">197</span> // merge with encoded name<a name="line.197"></a>
+<span class="sourceLineNo">198</span> admin.mergeRegions(regionC.getRegionName(), mergedChildRegion.getRegionName(),<a name="line.198"></a>
+<span class="sourceLineNo">199</span> false).get();<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span> regionLocations = AsyncMetaTableAccessor<a name="line.201"></a>
+<span class="sourceLineNo">202</span> .getTableHRegionLocations(metaTable, tableName).get();<a name="line.202"></a>
+<span class="sourceLineNo">203</span> assertEquals(1, regionLocations.size());<a name="line.203"></a>
+<span class="sourceLineNo">204</span> }<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span> @Test<a name="line.206"></a>
+<span class="sourceLineNo">207</span> public void testMergeRegionsInvalidRegionCount() throws Exception {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> byte[][] splitRows = new byte[][] { Bytes.toBytes("3"), Bytes.toBytes("6") };<a name="line.208"></a>
+<span class="sourceLineNo">209</span> createTableWithDefaultConf(tableName, splitRows);<a name="line.209"></a>
+<span class="sourceLineNo">210</span> List<RegionInfo> regions = admin.getRegions(tableName).join();<a name="line.210"></a>
+<span class="sourceLineNo">211</span> // 0<a name="line.211"></a>
+<span class="sourceLineNo">212</span> try {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> admin.mergeRegions(Collections.emptyList(), false).get();<a name="line.213"></a>
+<span class="sourceLineNo">214</span> fail();<a name="line.214"></a>
+<span class="sourceLineNo">215</span> } catch (ExecutionException e) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> // expected<a name="line.216"></a>
+<span class="sourceLineNo">217</span> assertThat(e.getCause(), instanceOf(IllegalArgumentException.class));<a name="line.217"></a>
+<span class="sourceLineNo">218</span> }<a name="line.218"></a>
+<span class="sourceLineNo">219</span> // 1<a name="line.219"></a>
+<span class="sourceLineNo">220</span> try {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> admin.mergeRegions(regions.stream().limit(1).map(RegionInfo::getEncodedNameAsBytes)<a name="line.221"></a>
+<span class="sourceLineNo">222</span> .collect(Collectors.toList()), false).get();<a name="line.222"></a>
+<span class="sourceLineNo">223</span> fail();<a name="line.223"></a>
+<span class="sourceLineNo">224</span> } catch (ExecutionException e) {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> // expected<a name="line.225"></a>
+<span class="sourceLineNo">226</span> assertThat(e.getCause(), instanceOf(IllegalArgumentException.class));<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span> @Test<a name="line.230"></a>
+<span class="sourceLineNo">231</span> public void testSplitTable() throws Exception {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> initSplitMergeSwitch();<a name="line.232"></a>
+<span class="sourceLineNo">233</span> splitTest(TableName.valueOf("testSplitTable"), 3000, false, null);<a name="line.233"></a>
+<span class="sourceLineNo">234</span> splitTest(TableName.valueOf("testSplitTableWithSplitPoint"), 3000, false, Bytes.toBytes("3"));<a name="line.234"></a>
+<span class="sourceLineNo">235</span> splitTest(TableName.valueOf("testSplitTableRegion"), 3000, true, null);<a name="line.235"></a>
+<span class="sourceLineNo">236</span> splitTest(TableName.valueOf("testSplitTableRegionWithSplitPoint2"), 3000, true, Bytes.toBytes("3"));<a name="line.236"></a>
+<span class="sourceLineNo">237</span> }<a name="line.237"></a>
+<span class="sourceLineNo">238</span><a name="line.238"></a>
+<span class="sourceLineNo">239</span> private void<a name="line.239"></a>
+<span class="sourceLineNo">240</span> splitTest(TableName tableName, int rowCount, boolean isSplitRegion, byte[] splitPoint)<a name="line.240"></a>
+<span class="sourceLineNo">241</span> throws Exception {<a name="line.241"></a>
+<span class="sourceLineNo">242</span> // create table<a name="line.242"></a>
+<span class="sourceLineNo">243</span> createTableWithDefaultConf(tableName);<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span> AsyncTable<AdvancedScanResultConsumer> metaTable = ASYNC_CONN.getTable(META_TABLE_NAME);<a name="line.245"></a>
+<span class="sourceLineNo">246</span> List<HRegionLocation> regionLocations = AsyncMetaTableAccessor<a name="line.246"></a>
+<span class="sourceLineNo">247</span> .getTableHRegionLocations(metaTable, tableName).get();<a name="line.247"></a>
+<span class="sourceLineNo">248</span> assertEquals(1, regionLocations.size());<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span> AsyncTable<?> table = ASYNC_CONN.getTable(tableName);<a name="line.250"></a>
+<span class="sourceLineNo">251</span> List<Put> puts = new ArrayList<>();<a name="line.251"></a>
+<span class="sourceLineNo">252</span> for (int i = 0; i < rowCount; i++) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> Put put = new Put(Bytes.toBytes(i));<a name="line.253"></a>
+<span class="sourceLineNo">254</span> put.addColumn(FAMILY, null, Bytes.toBytes("value" + i));<a name="line.254"></a>
+<span class="sourceLineNo">255</span> puts.add(put);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span> table.putAll(puts).join();<a name="line.257"></a>
+<span class="sourceLineNo">258</span><a name="line.258"></a>
+<span class="sourceLineNo">259</span> if (isSplitRegion) {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> if (splitPoint == null) {<a name="line.260"></a>
+<span class="sourceLineNo">261</span> admin.splitRegion(regionLocations.get(0).getRegion().getRegionName()).get();<a name="line.261"></a>
+<span class="sourceLineNo">262</span> } else {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> admin.splitRegion(regionLocations.get(0).getRegion().getRegionName(), splitPoint).get();<a name="line.263"></a>
+<span class="sourceLineNo">264</span> }<a name="line.264"></a>
+<span class="sourceLineNo">265</span> } else {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> if (splitPoint == null) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> admin.split(tableName).get();<a name="line.267"></a>
+<span class="sourceLineNo">268</span> } else {<a name="line.268"></a>
+<span class="sourceLineNo">269</span> admin.split(tableName, splitPoint).get();<a name="line.269"></a>
+<span class="sourceLineNo">270</span> }<a name="line.270"></a>
+<span class="sourceLineNo">271</span> }<a name="line.271"></a>
+<span class="sourceLineNo">272</span><a name="line.272"></a>
+<span class="sourceLineNo">273</span> int count = 0;<a name="line.273"></a>
+<span class="sourceLineNo">274</span> for (int i = 0; i < 45; i++) {<a name="line.274"></a>
+<span class="sourceLineNo">275</span> try {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> regionLocations = AsyncMetaTableAccessor<a name="line.276"></a>
+<span class="sourceLineNo">277</span> .getTableHRegionLocations(metaTable, tableName).get();<a name="line.277"></a>
+<span class="sourceLineNo">278</span> count = regionLocations.size();<a name="line.278"></a>
+<span class="sourceLineNo">279</span> if (count >= 2) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> break;<a name="line.280"></a>
+<span class="sourceLineNo">281</span> }<a name="line.281"></a>
+<span class="sourceLineNo">282</span> Thread.sleep(1000L);<a name="line.282"></a>
+<span class="sourceLineNo">283</span> } catch (Exception e) {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> LOG.error(e.toString(), e);<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span> }<a name="line.286"></a>
+<span class="sourceLineNo">287</span> assertEquals(2, count);<a name="line.287"></a>
+<span class="sourceLineNo">288</span> }<a name="line.288"></a>
+<span class="sourceLineNo">289</span>}<a name="line.289"></a>
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html
index 0fcef7a..ec4736e 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/TestMetaFixer.html
@@ -34,351 +34,423 @@
<span class="sourceLineNo">026</span>import java.util.List;<a name="line.26"></a>
<span class="sourceLineNo">027</span>import java.util.Map;<a name="line.27"></a>
<span class="sourceLineNo">028</span>import java.util.function.BooleanSupplier;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.HConstants;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.TableName;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.client.RegionInfoBuilder;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.client.Result;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.client.Table;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.master.assignment.AssignmentManager;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.master.assignment.GCRegionProcedure;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.master.assignment.GCMultipleMergedRegionsProcedure;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.master.assignment.RegionStates;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.util.Threads;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.junit.AfterClass;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.junit.BeforeClass;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.junit.ClassRule;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.junit.Rule;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.junit.Test;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.junit.experimental.categories.Category;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.junit.rules.TestName;<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span>@Category({MasterTests.class, LargeTests.class})<a name="line.56"></a>
-<span class="sourceLineNo">057</span>public class TestMetaFixer {<a name="line.57"></a>
-<span class="sourceLineNo">058</span> @ClassRule<a name="line.58"></a>
-<span class="sourceLineNo">059</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.59"></a>
-<span class="sourceLineNo">060</span> HBaseClassTestRule.forClass(TestMetaFixer.class);<a name="line.60"></a>
-<span class="sourceLineNo">061</span> @Rule<a name="line.61"></a>
-<span class="sourceLineNo">062</span> public TestName name = new TestName();<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span> @BeforeClass<a name="line.66"></a>
-<span class="sourceLineNo">067</span> public static void setupBeforeClass() throws Exception {<a name="line.67"></a>
-<span class="sourceLineNo">068</span> TEST_UTIL.startMiniCluster();<a name="line.68"></a>
-<span class="sourceLineNo">069</span> }<a name="line.69"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.Cell;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.CellBuilderFactory;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.CellBuilderType;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.HConstants;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.TableName;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.client.Put;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.client.RegionInfoBuilder;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.client.Result;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.client.Table;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.master.assignment.AssignmentManager;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.master.assignment.GCRegionProcedure;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.master.assignment.GCMultipleMergedRegionsProcedure;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.master.assignment.RegionStates;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.master.procedure.MasterProcedureEnv;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.util.Threads;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.junit.AfterClass;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.junit.BeforeClass;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.junit.ClassRule;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.junit.Rule;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.junit.Test;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.junit.experimental.categories.Category;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.junit.rules.TestName;<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>@Category({MasterTests.class, LargeTests.class})<a name="line.61"></a>
+<span class="sourceLineNo">062</span>public class TestMetaFixer {<a name="line.62"></a>
+<span class="sourceLineNo">063</span> @ClassRule<a name="line.63"></a>
+<span class="sourceLineNo">064</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.64"></a>
+<span class="sourceLineNo">065</span> HBaseClassTestRule.forClass(TestMetaFixer.class);<a name="line.65"></a>
+<span class="sourceLineNo">066</span> @Rule<a name="line.66"></a>
+<span class="sourceLineNo">067</span> public TestName name = new TestName();<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span> private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.69"></a>
<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span> @AfterClass<a name="line.71"></a>
-<span class="sourceLineNo">072</span> public static void tearDownAfterClass() throws Exception {<a name="line.72"></a>
-<span class="sourceLineNo">073</span> TEST_UTIL.shutdownMiniCluster();<a name="line.73"></a>
+<span class="sourceLineNo">071</span> @BeforeClass<a name="line.71"></a>
+<span class="sourceLineNo">072</span> public static void setupBeforeClass() throws Exception {<a name="line.72"></a>
+<span class="sourceLineNo">073</span> TEST_UTIL.startMiniCluster();<a name="line.73"></a>
<span class="sourceLineNo">074</span> }<a name="line.74"></a>
<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span> private void deleteRegion(MasterServices services, RegionInfo ri) throws IOException {<a name="line.76"></a>
-<span class="sourceLineNo">077</span> MetaTableAccessor.deleteRegionInfo(TEST_UTIL.getConnection(), ri);<a name="line.77"></a>
-<span class="sourceLineNo">078</span> // Delete it from Master context too else it sticks around.<a name="line.78"></a>
-<span class="sourceLineNo">079</span> services.getAssignmentManager().getRegionStates().deleteRegion(ri);<a name="line.79"></a>
-<span class="sourceLineNo">080</span> }<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span> @Test<a name="line.82"></a>
-<span class="sourceLineNo">083</span> public void testPlugsHoles() throws Exception {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> TableName tn = TableName.valueOf(this.name.getMethodName());<a name="line.84"></a>
-<span class="sourceLineNo">085</span> TEST_UTIL.createMultiRegionTable(tn, HConstants.CATALOG_FAMILY);<a name="line.85"></a>
-<span class="sourceLineNo">086</span> List<RegionInfo> ris = MetaTableAccessor.getTableRegions(TEST_UTIL.getConnection(), tn);<a name="line.86"></a>
-<span class="sourceLineNo">087</span> MasterServices services = TEST_UTIL.getHBaseCluster().getMaster();<a name="line.87"></a>
-<span class="sourceLineNo">088</span> int initialSize = services.getAssignmentManager().getRegionStates().getRegionStates().size();<a name="line.88"></a>
-<span class="sourceLineNo">089</span> services.getCatalogJanitor().scan();<a name="line.89"></a>
-<span class="sourceLineNo">090</span> CatalogJanitor.Report report = services.getCatalogJanitor().getLastReport();<a name="line.90"></a>
-<span class="sourceLineNo">091</span> assertTrue(report.isEmpty());<a name="line.91"></a>
-<span class="sourceLineNo">092</span> int originalCount = ris.size();<a name="line.92"></a>
-<span class="sourceLineNo">093</span> // Remove first, last and middle region. See if hole gets plugged. Table has 26 regions.<a name="line.93"></a>
-<span class="sourceLineNo">094</span> deleteRegion(services, ris.get(ris.size() -1));<a name="line.94"></a>
-<span class="sourceLineNo">095</span> deleteRegion(services, ris.get(3));<a name="line.95"></a>
-<span class="sourceLineNo">096</span> deleteRegion(services, ris.get(0));<a name="line.96"></a>
-<span class="sourceLineNo">097</span> assertEquals(initialSize - 3,<a name="line.97"></a>
-<span class="sourceLineNo">098</span> services.getAssignmentManager().getRegionStates().getRegionStates().size());<a name="line.98"></a>
-<span class="sourceLineNo">099</span> services.getCatalogJanitor().scan();<a name="line.99"></a>
-<span class="sourceLineNo">100</span> report = services.getCatalogJanitor().getLastReport();<a name="line.100"></a>
-<span class="sourceLineNo">101</span> assertEquals(report.toString(), 3, report.getHoles().size());<a name="line.101"></a>
-<span class="sourceLineNo">102</span> MetaFixer fixer = new MetaFixer(services);<a name="line.102"></a>
-<span class="sourceLineNo">103</span> fixer.fixHoles(report);<a name="line.103"></a>
+<span class="sourceLineNo">076</span> @AfterClass<a name="line.76"></a>
+<span class="sourceLineNo">077</span> public static void tearDownAfterClass() throws Exception {<a name="line.77"></a>
+<span class="sourceLineNo">078</span> TEST_UTIL.shutdownMiniCluster();<a name="line.78"></a>
+<span class="sourceLineNo">079</span> }<a name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span> private void deleteRegion(MasterServices services, RegionInfo ri) throws IOException {<a name="line.81"></a>
+<span class="sourceLineNo">082</span> MetaTableAccessor.deleteRegionInfo(TEST_UTIL.getConnection(), ri);<a name="line.82"></a>
+<span class="sourceLineNo">083</span> // Delete it from Master context too else it sticks around.<a name="line.83"></a>
+<span class="sourceLineNo">084</span> services.getAssignmentManager().getRegionStates().deleteRegion(ri);<a name="line.84"></a>
+<span class="sourceLineNo">085</span> }<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span> @Test<a name="line.87"></a>
+<span class="sourceLineNo">088</span> public void testPlugsHoles() throws Exception {<a name="line.88"></a>
+<span class="sourceLineNo">089</span> TableName tn = TableName.valueOf(this.name.getMethodName());<a name="line.89"></a>
+<span class="sourceLineNo">090</span> TEST_UTIL.createMultiRegionTable(tn, HConstants.CATALOG_FAMILY);<a name="line.90"></a>
+<span class="sourceLineNo">091</span> List<RegionInfo> ris = MetaTableAccessor.getTableRegions(TEST_UTIL.getConnection(), tn);<a name="line.91"></a>
+<span class="sourceLineNo">092</span> MasterServices services = TEST_UTIL.getHBaseCluster().getMaster();<a name="line.92"></a>
+<span class="sourceLineNo">093</span> int initialSize = services.getAssignmentManager().getRegionStates().getRegionStates().size();<a name="line.93"></a>
+<span class="sourceLineNo">094</span> services.getCatalogJanitor().scan();<a name="line.94"></a>
+<span class="sourceLineNo">095</span> CatalogJanitor.Report report = services.getCatalogJanitor().getLastReport();<a name="line.95"></a>
+<span class="sourceLineNo">096</span> assertTrue(report.isEmpty());<a name="line.96"></a>
+<span class="sourceLineNo">097</span> int originalCount = ris.size();<a name="line.97"></a>
+<span class="sourceLineNo">098</span> // Remove first, last and middle region. See if hole gets plugged. Table has 26 regions.<a name="line.98"></a>
+<span class="sourceLineNo">099</span> deleteRegion(services, ris.get(ris.size() -1));<a name="line.99"></a>
+<span class="sourceLineNo">100</span> deleteRegion(services, ris.get(3));<a name="line.100"></a>
+<span class="sourceLineNo">101</span> deleteRegion(services, ris.get(0));<a name="line.101"></a>
+<span class="sourceLineNo">102</span> assertEquals(initialSize - 3,<a name="line.102"></a>
+<span class="sourceLineNo">103</span> services.getAssignmentManager().getRegionStates().getRegionStates().size());<a name="line.103"></a>
<span class="sourceLineNo">104</span> services.getCatalogJanitor().scan();<a name="line.104"></a>
<span class="sourceLineNo">105</span> report = services.getCatalogJanitor().getLastReport();<a name="line.105"></a>
-<span class="sourceLineNo">106</span> assertTrue(report.toString(), report.isEmpty());<a name="line.106"></a>
-<span class="sourceLineNo">107</span> assertEquals(initialSize,<a name="line.107"></a>
-<span class="sourceLineNo">108</span> services.getAssignmentManager().getRegionStates().getRegionStates().size());<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span> // wait for RITs to settle -- those are the fixed regions being assigned -- or until the<a name="line.110"></a>
-<span class="sourceLineNo">111</span> // watchdog TestRule terminates the test.<a name="line.111"></a>
-<span class="sourceLineNo">112</span> await(50, () -> isNotEmpty(services.getAssignmentManager().getRegionsInTransition()));<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span> ris = MetaTableAccessor.getTableRegions(TEST_UTIL.getConnection(), tn);<a name="line.114"></a>
-<span class="sourceLineNo">115</span> assertEquals(originalCount, ris.size());<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> /**<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * Just make sure running fixMeta does right thing for the case<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * of a single-region Table where the region gets dropped.<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * There is nothing much we can do. We can't restore what<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * we don't know about (at least from a read of hbase:meta).<a name="line.122"></a>
-<span class="sourceLineNo">123</span> */<a name="line.123"></a>
-<span class="sourceLineNo">124</span> @Test<a name="line.124"></a>
-<span class="sourceLineNo">125</span> public void testOneRegionTable() throws IOException {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> TableName tn = TableName.valueOf(this.name.getMethodName());<a name="line.126"></a>
-<span class="sourceLineNo">127</span> TEST_UTIL.createTable(tn, HConstants.CATALOG_FAMILY);<a name="line.127"></a>
-<span class="sourceLineNo">128</span> List<RegionInfo> ris = MetaTableAccessor.getTableRegions(TEST_UTIL.getConnection(), tn);<a name="line.128"></a>
-<span class="sourceLineNo">129</span> MasterServices services = TEST_UTIL.getHBaseCluster().getMaster();<a name="line.129"></a>
-<span class="sourceLineNo">130</span> services.getCatalogJanitor().scan();<a name="line.130"></a>
-<span class="sourceLineNo">131</span> deleteRegion(services, ris.get(0));<a name="line.131"></a>
-<span class="sourceLineNo">132</span> services.getCatalogJanitor().scan();<a name="line.132"></a>
-<span class="sourceLineNo">133</span> CatalogJanitor.Report report = services.getCatalogJanitor().getLastReport();<a name="line.133"></a>
-<span class="sourceLineNo">134</span> ris = MetaTableAccessor.getTableRegions(TEST_UTIL.getConnection(), tn);<a name="line.134"></a>
-<span class="sourceLineNo">135</span> assertTrue(ris.isEmpty());<a name="line.135"></a>
-<span class="sourceLineNo">136</span> MetaFixer fixer = new MetaFixer(services);<a name="line.136"></a>
-<span class="sourceLineNo">137</span> fixer.fixHoles(report);<a name="line.137"></a>
-<span class="sourceLineNo">138</span> report = services.getCatalogJanitor().getLastReport();<a name="line.138"></a>
-<span class="sourceLineNo">139</span> assertTrue(report.isEmpty());<a name="line.139"></a>
-<span class="sourceLineNo">140</span> ris = MetaTableAccessor.getTableRegions(TEST_UTIL.getConnection(), tn);<a name="line.140"></a>
-<span class="sourceLineNo">141</span> assertEquals(0, ris.size());<a name="line.141"></a>
-<span class="sourceLineNo">142</span> }<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span> private static void makeOverlap(MasterServices services, RegionInfo a, RegionInfo b)<a name="line.144"></a>
-<span class="sourceLineNo">145</span> throws IOException {<a name="line.145"></a>
-<span class="sourceLineNo">146</span> RegionInfo overlapRegion = RegionInfoBuilder.newBuilder(a.getTable()).<a name="line.146"></a>
-<span class="sourceLineNo">147</span> setStartKey(a.getStartKey()).<a name="line.147"></a>
-<span class="sourceLineNo">148</span> setEndKey(b.getEndKey()).<a name="line.148"></a>
-<span class="sourceLineNo">149</span> build();<a name="line.149"></a>
-<span class="sourceLineNo">150</span> MetaTableAccessor.putsToMetaTable(services.getConnection(),<a name="line.150"></a>
-<span class="sourceLineNo">151</span> Collections.singletonList(MetaTableAccessor.makePutFromRegionInfo(overlapRegion,<a name="line.151"></a>
-<span class="sourceLineNo">152</span> System.currentTimeMillis())));<a name="line.152"></a>
-<span class="sourceLineNo">153</span> // TODO: Add checks at assign time to PREVENT being able to assign over existing assign.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> services.getAssignmentManager().assign(overlapRegion);<a name="line.154"></a>
-<span class="sourceLineNo">155</span> }<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span> private void testOverlapCommon(final TableName tn) throws Exception {<a name="line.157"></a>
-<span class="sourceLineNo">158</span> Table t = TEST_UTIL.createMultiRegionTable(tn, HConstants.CATALOG_FAMILY);<a name="line.158"></a>
-<span class="sourceLineNo">159</span> TEST_UTIL.loadTable(t, HConstants.CATALOG_FAMILY);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> List<RegionInfo> ris = MetaTableAccessor.getTableRegions(TEST_UTIL.getConnection(), tn);<a name="line.160"></a>
-<span class="sourceLineNo">161</span> assertTrue(ris.size() > 5);<a name="line.161"></a>
-<span class="sourceLineNo">162</span> HMaster services = TEST_UTIL.getHBaseCluster().getMaster();<a name="line.162"></a>
-<span class="sourceLineNo">163</span> services.getCatalogJanitor().scan();<a name="line.163"></a>
-<span class="sourceLineNo">164</span> CatalogJanitor.Report report = services.getCatalogJanitor().getLastReport();<a name="line.164"></a>
-<span class="sourceLineNo">165</span> assertTrue(report.isEmpty());<a name="line.165"></a>
-<span class="sourceLineNo">166</span> // Make a simple overlap spanning second and third region.<a name="line.166"></a>
-<span class="sourceLineNo">167</span> makeOverlap(services, ris.get(1), ris.get(3));<a name="line.167"></a>
-<span class="sourceLineNo">168</span> makeOverlap(services, ris.get(2), ris.get(3));<a name="line.168"></a>
-<span class="sourceLineNo">169</span> makeOverlap(services, ris.get(2), ris.get(4));<a name="line.169"></a>
-<span class="sourceLineNo">170</span> Threads.sleep(10000);<a name="line.170"></a>
-<span class="sourceLineNo">171</span> }<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span> @Test<a name="line.173"></a>
-<span class="sourceLineNo">174</span> public void testOverlap() throws Exception {<a name="line.174"></a>
-<span class="sourceLineNo">175</span> TableName tn = TableName.valueOf(this.name.getMethodName());<a name="line.175"></a>
-<span class="sourceLineNo">176</span> testOverlapCommon(tn);<a name="line.176"></a>
-<span class="sourceLineNo">177</span> HMaster services = TEST_UTIL.getHBaseCluster().getMaster();<a name="line.177"></a>
-<span class="sourceLineNo">178</span> HbckChore hbckChore = services.getHbckChore();<a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span> CatalogJanitor cj = services.getCatalogJanitor();<a name="line.180"></a>
-<span class="sourceLineNo">181</span> cj.scan();<a name="line.181"></a>
-<span class="sourceLineNo">182</span> CatalogJanitor.Report report = cj.getLastReport();<a name="line.182"></a>
-<span class="sourceLineNo">183</span> assertEquals(6, report.getOverlaps().size());<a name="line.183"></a>
-<span class="sourceLineNo">184</span> assertEquals(1,<a name="line.184"></a>
-<span class="sourceLineNo">185</span> MetaFixer.calculateMerges(10, report.getOverlaps()).size());<a name="line.185"></a>
-<span class="sourceLineNo">186</span> MetaFixer fixer = new MetaFixer(services);<a name="line.186"></a>
-<span class="sourceLineNo">187</span> fixer.fixOverlaps(report);<a name="line.187"></a>
-<span class="sourceLineNo">188</span><a name="line.188"></a>
-<span class="sourceLineNo">189</span> await(10, () -> {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> try {<a name="line.190"></a>
-<span class="sourceLineNo">191</span> if (cj.scan() > 0) {<a name="line.191"></a>
-<span class="sourceLineNo">192</span> // It submits GC once, then it will immediately kick off another GC to test if<a name="line.192"></a>
-<span class="sourceLineNo">193</span> // GCMultipleMergedRegionsProcedure is idempotent. If it is not, it will create<a name="line.193"></a>
-<span class="sourceLineNo">194</span> // a hole.<a name="line.194"></a>
-<span class="sourceLineNo">195</span> Map<RegionInfo, Result> mergedRegions = cj.getLastReport().mergedRegions;<a name="line.195"></a>
-<span class="sourceLineNo">196</span> for (Map.Entry<RegionInfo, Result> e : mergedRegions.entrySet()) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span> List<RegionInfo> parents = MetaTableAccessor.getMergeRegions(e.getValue().rawCells());<a name="line.197"></a>
-<span class="sourceLineNo">198</span> if (parents != null) {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> ProcedureExecutor<MasterProcedureEnv> pe = services.getMasterProcedureExecutor();<a name="line.199"></a>
-<span class="sourceLineNo">200</span> pe.submitProcedure(new GCMultipleMergedRegionsProcedure(pe.getEnvironment(),<a name="line.200"></a>
-<span class="sourceLineNo">201</span> e.getKey(), parents));<a name="line.201"></a>
-<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span> }<a name="line.203"></a>
-<span class="sourceLineNo">204</span> return true;<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span> return false;<a name="line.206"></a>
-<span class="sourceLineNo">207</span> } catch (Exception e) {<a name="line.207"></a>
-<span class="sourceLineNo">208</span> throw new RuntimeException(e);<a name="line.208"></a>
-<span class="sourceLineNo">209</span> }<a name="line.209"></a>
-<span class="sourceLineNo">210</span> });<a name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span> // Wait until all GCs settled down<a name="line.212"></a>
-<span class="sourceLineNo">213</span> await(10, () -> {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> return services.getMasterProcedureExecutor().getActiveProcIds().isEmpty();<a name="line.214"></a>
+<span class="sourceLineNo">106</span> assertEquals(report.toString(), 3, report.getHoles().size());<a name="line.106"></a>
+<span class="sourceLineNo">107</span> MetaFixer fixer = new MetaFixer(services);<a name="line.107"></a>
+<span class="sourceLineNo">108</span> fixer.fixHoles(report);<a name="line.108"></a>
+<span class="sourceLineNo">109</span> services.getCatalogJanitor().scan();<a name="line.109"></a>
+<span class="sourceLineNo">110</span> report = services.getCatalogJanitor().getLastReport();<a name="line.110"></a>
+<span class="sourceLineNo">111</span> assertTrue(report.toString(), report.isEmpty());<a name="line.111"></a>
+<span class="sourceLineNo">112</span> assertEquals(initialSize,<a name="line.112"></a>
+<span class="sourceLineNo">113</span> services.getAssignmentManager().getRegionStates().getRegionStates().size());<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span> // wait for RITs to settle -- those are the fixed regions being assigned -- or until the<a name="line.115"></a>
+<span class="sourceLineNo">116</span> // watchdog TestRule terminates the test.<a name="line.116"></a>
+<span class="sourceLineNo">117</span> await(50, () -> isNotEmpty(services.getAssignmentManager().getRegionsInTransition()));<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> ris = MetaTableAccessor.getTableRegions(TEST_UTIL.getConnection(), tn);<a name="line.119"></a>
+<span class="sourceLineNo">120</span> assertEquals(originalCount, ris.size());<a name="line.120"></a>
+<span class="sourceLineNo">121</span> }<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span> /**<a name="line.123"></a>
+<span class="sourceLineNo">124</span> * Just make sure running fixMeta does right thing for the case<a name="line.124"></a>
+<span class="sourceLineNo">125</span> * of a single-region Table where the region gets dropped.<a name="line.125"></a>
+<span class="sourceLineNo">126</span> * There is nothing much we can do. We can't restore what<a name="line.126"></a>
+<span class="sourceLineNo">127</span> * we don't know about (at least from a read of hbase:meta).<a name="line.127"></a>
+<span class="sourceLineNo">128</span> */<a name="line.128"></a>
+<span class="sourceLineNo">129</span> @Test<a name="line.129"></a>
+<span class="sourceLineNo">130</span> public void testOneRegionTable() throws IOException {<a name="line.130"></a>
+<span class="sourceLineNo">131</span> TableName tn = TableName.valueOf(this.name.getMethodName());<a name="line.131"></a>
+<span class="sourceLineNo">132</span> TEST_UTIL.createTable(tn, HConstants.CATALOG_FAMILY);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> List<RegionInfo> ris = MetaTableAccessor.getTableRegions(TEST_UTIL.getConnection(), tn);<a name="line.133"></a>
+<span class="sourceLineNo">134</span> MasterServices services = TEST_UTIL.getHBaseCluster().getMaster();<a name="line.134"></a>
+<span class="sourceLineNo">135</span> services.getCatalogJanitor().scan();<a name="line.135"></a>
+<span class="sourceLineNo">136</span> deleteRegion(services, ris.get(0));<a name="line.136"></a>
+<span class="sourceLineNo">137</span> services.getCatalogJanitor().scan();<a name="line.137"></a>
+<span class="sourceLineNo">138</span> CatalogJanitor.Report report = services.getCatalogJanitor().getLastReport();<a name="line.138"></a>
+<span class="sourceLineNo">139</span> ris = MetaTableAccessor.getTableRegions(TEST_UTIL.getConnection(), tn);<a name="line.139"></a>
+<span class="sourceLineNo">140</span> assertTrue(ris.isEmpty());<a name="line.140"></a>
+<span class="sourceLineNo">141</span> MetaFixer fixer = new MetaFixer(services);<a name="line.141"></a>
+<span class="sourceLineNo">142</span> fixer.fixHoles(report);<a name="line.142"></a>
+<span class="sourceLineNo">143</span> report = services.getCatalogJanitor().getLastReport();<a name="line.143"></a>
+<span class="sourceLineNo">144</span> assertTrue(report.isEmpty());<a name="line.144"></a>
+<span class="sourceLineNo">145</span> ris = MetaTableAccessor.getTableRegions(TEST_UTIL.getConnection(), tn);<a name="line.145"></a>
+<span class="sourceLineNo">146</span> assertEquals(0, ris.size());<a name="line.146"></a>
+<span class="sourceLineNo">147</span> }<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span> private static RegionInfo makeOverlap(MasterServices services, RegionInfo a, RegionInfo b)<a name="line.149"></a>
+<span class="sourceLineNo">150</span> throws IOException {<a name="line.150"></a>
+<span class="sourceLineNo">151</span> RegionInfo overlapRegion = RegionInfoBuilder.newBuilder(a.getTable()).<a name="line.151"></a>
+<span class="sourceLineNo">152</span> setStartKey(a.getStartKey()).<a name="line.152"></a>
+<span class="sourceLineNo">153</span> setEndKey(b.getEndKey()).<a name="line.153"></a>
+<span class="sourceLineNo">154</span> build();<a name="line.154"></a>
+<span class="sourceLineNo">155</span> MetaTableAccessor.putsToMetaTable(services.getConnection(),<a name="line.155"></a>
+<span class="sourceLineNo">156</span> Collections.singletonList(MetaTableAccessor.makePutFromRegionInfo(overlapRegion,<a name="line.156"></a>
+<span class="sourceLineNo">157</span> System.currentTimeMillis())));<a name="line.157"></a>
+<span class="sourceLineNo">158</span> // TODO: Add checks at assign time to PREVENT being able to assign over existing assign.<a name="line.158"></a>
+<span class="sourceLineNo">159</span> services.getAssignmentManager().assign(overlapRegion);<a name="line.159"></a>
+<span class="sourceLineNo">160</span> return overlapRegion;<a name="line.160"></a>
+<span class="sourceLineNo">161</span> }<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span> private void testOverlapCommon(final TableName tn) throws Exception {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> Table t = TEST_UTIL.createMultiRegionTable(tn, HConstants.CATALOG_FAMILY);<a name="line.164"></a>
+<span class="sourceLineNo">165</span> TEST_UTIL.loadTable(t, HConstants.CATALOG_FAMILY);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> List<RegionInfo> ris = MetaTableAccessor.getTableRegions(TEST_UTIL.getConnection(), tn);<a name="line.166"></a>
+<span class="sourceLineNo">167</span> assertTrue(ris.size() > 5);<a name="line.167"></a>
+<span class="sourceLineNo">168</span> HMaster services = TEST_UTIL.getHBaseCluster().getMaster();<a name="line.168"></a>
+<span class="sourceLineNo">169</span> services.getCatalogJanitor().scan();<a name="line.169"></a>
+<span class="sourceLineNo">170</span> CatalogJanitor.Report report = services.getCatalogJanitor().getLastReport();<a name="line.170"></a>
+<span class="sourceLineNo">171</span> assertTrue(report.isEmpty());<a name="line.171"></a>
+<span class="sourceLineNo">172</span> // Make a simple overlap spanning second and third region.<a name="line.172"></a>
+<span class="sourceLineNo">173</span> makeOverlap(services, ris.get(1), ris.get(3));<a name="line.173"></a>
+<span class="sourceLineNo">174</span> makeOverlap(services, ris.get(2), ris.get(3));<a name="line.174"></a>
+<span class="sourceLineNo">175</span> makeOverlap(services, ris.get(2), ris.get(4));<a name="line.175"></a>
+<span class="sourceLineNo">176</span> }<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> @Test<a name="line.178"></a>
+<span class="sourceLineNo">179</span> public void testOverlap() throws Exception {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> TableName tn = TableName.valueOf(this.name.getMethodName());<a name="line.180"></a>
+<span class="sourceLineNo">181</span> testOverlapCommon(tn);<a name="line.181"></a>
+<span class="sourceLineNo">182</span> HMaster services = TEST_UTIL.getHBaseCluster().getMaster();<a name="line.182"></a>
+<span class="sourceLineNo">183</span> HbckChore hbckChore = services.getHbckChore();<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span> CatalogJanitor cj = services.getCatalogJanitor();<a name="line.185"></a>
+<span class="sourceLineNo">186</span> cj.scan();<a name="line.186"></a>
+<span class="sourceLineNo">187</span> CatalogJanitor.Report report = cj.getLastReport();<a name="line.187"></a>
+<span class="sourceLineNo">188</span> assertEquals(6, report.getOverlaps().size());<a name="line.188"></a>
+<span class="sourceLineNo">189</span> assertEquals(1,<a name="line.189"></a>
+<span class="sourceLineNo">190</span> MetaFixer.calculateMerges(10, report.getOverlaps()).size());<a name="line.190"></a>
+<span class="sourceLineNo">191</span> MetaFixer fixer = new MetaFixer(services);<a name="line.191"></a>
+<span class="sourceLineNo">192</span> fixer.fixOverlaps(report);<a name="line.192"></a>
+<span class="sourceLineNo">193</span><a name="line.193"></a>
+<span class="sourceLineNo">194</span> await(10, () -> {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> try {<a name="line.195"></a>
+<span class="sourceLineNo">196</span> if (cj.scan() > 0) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> // It submits GC once, then it will immediately kick off another GC to test if<a name="line.197"></a>
+<span class="sourceLineNo">198</span> // GCMultipleMergedRegionsProcedure is idempotent. If it is not, it will create<a name="line.198"></a>
+<span class="sourceLineNo">199</span> // a hole.<a name="line.199"></a>
+<span class="sourceLineNo">200</span> Map<RegionInfo, Result> mergedRegions = cj.getLastReport().mergedRegions;<a name="line.200"></a>
+<span class="sourceLineNo">201</span> for (Map.Entry<RegionInfo, Result> e : mergedRegions.entrySet()) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span> List<RegionInfo> parents = MetaTableAccessor.getMergeRegions(e.getValue().rawCells());<a name="line.202"></a>
+<span class="sourceLineNo">203</span> if (parents != null) {<a name="line.203"></a>
+<span class="sourceLineNo">204</span> ProcedureExecutor<MasterProcedureEnv> pe = services.getMasterProcedureExecutor();<a name="line.204"></a>
+<span class="sourceLineNo">205</span> pe.submitProcedure(new GCMultipleMergedRegionsProcedure(pe.getEnvironment(),<a name="line.205"></a>
+<span class="sourceLineNo">206</span> e.getKey(), parents));<a name="line.206"></a>
+<span class="sourceLineNo">207</span> }<a name="line.207"></a>
+<span class="sourceLineNo">208</span> }<a name="line.208"></a>
+<span class="sourceLineNo">209</span> return true;<a name="line.209"></a>
+<span class="sourceLineNo">210</span> }<a name="line.210"></a>
+<span class="sourceLineNo">211</span> return false;<a name="line.211"></a>
+<span class="sourceLineNo">212</span> } catch (Exception e) {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> throw new RuntimeException(e);<a name="line.213"></a>
+<span class="sourceLineNo">214</span> }<a name="line.214"></a>
<span class="sourceLineNo">215</span> });<a name="line.215"></a>
<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> // No orphan regions on FS<a name="line.217"></a>
-<span class="sourceLineNo">218</span> hbckChore.chore();<a name="line.218"></a>
-<span class="sourceLineNo">219</span> assertEquals(0, hbckChore.getOrphanRegionsOnFS().size());<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> // No holes reported.<a name="line.221"></a>
-<span class="sourceLineNo">222</span> cj.scan();<a name="line.222"></a>
-<span class="sourceLineNo">223</span> final CatalogJanitor.Report postReport = cj.getLastReport();<a name="line.223"></a>
-<span class="sourceLineNo">224</span> assertTrue(postReport.isEmpty());<a name="line.224"></a>
-<span class="sourceLineNo">225</span> }<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span> @Test<a name="line.227"></a>
-<span class="sourceLineNo">228</span> public void testOverlapWithSmallMergeCount() throws Exception {<a name="line.228"></a>
-<span class="sourceLineNo">229</span> TableName tn = TableName.valueOf(this.name.getMethodName());<a name="line.229"></a>
-<span class="sourceLineNo">230</span> try {<a name="line.230"></a>
-<span class="sourceLineNo">231</span> testOverlapCommon(tn);<a name="line.231"></a>
-<span class="sourceLineNo">232</span> HMaster services = TEST_UTIL.getHBaseCluster().getMaster();<a name="line.232"></a>
-<span class="sourceLineNo">233</span> CatalogJanitor cj = services.getCatalogJanitor();<a name="line.233"></a>
-<span class="sourceLineNo">234</span> cj.scan();<a name="line.234"></a>
-<span class="sourceLineNo">235</span> CatalogJanitor.Report report = cj.getLastReport();<a name="line.235"></a>
-<span class="sourceLineNo">236</span> assertEquals(6, report.getOverlaps().size());<a name="line.236"></a>
-<span class="sourceLineNo">237</span> assertEquals(2,<a name="line.237"></a>
-<span class="sourceLineNo">238</span> MetaFixer.calculateMerges(5, report.getOverlaps()).size());<a name="line.238"></a>
-<span class="sourceLineNo">239</span><a name="line.239"></a>
-<span class="sourceLineNo">240</span> // The max merge count is set to 5 so overlap regions are divided into<a name="line.240"></a>
-<span class="sourceLineNo">241</span> // two merge requests.<a name="line.241"></a>
-<span class="sourceLineNo">242</span> TEST_UTIL.getHBaseCluster().getMaster().getConfiguration().setInt(<a name="line.242"></a>
-<span class="sourceLineNo">243</span> "hbase.master.metafixer.max.merge.count", 5);<a name="line.243"></a>
+<span class="sourceLineNo">217</span> // Wait until all GCs settled down<a name="line.217"></a>
+<span class="sourceLineNo">218</span> await(10, () -> {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> return services.getMasterProcedureExecutor().getActiveProcIds().isEmpty();<a name="line.219"></a>
+<span class="sourceLineNo">220</span> });<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span> // No orphan regions on FS<a name="line.222"></a>
+<span class="sourceLineNo">223</span> hbckChore.chore();<a name="line.223"></a>
+<span class="sourceLineNo">224</span> assertEquals(0, hbckChore.getOrphanRegionsOnFS().size());<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> // No holes reported.<a name="line.226"></a>
+<span class="sourceLineNo">227</span> cj.scan();<a name="line.227"></a>
+<span class="sourceLineNo">228</span> final CatalogJanitor.Report postReport = cj.getLastReport();<a name="line.228"></a>
+<span class="sourceLineNo">229</span> assertTrue(postReport.isEmpty());<a name="line.229"></a>
+<span class="sourceLineNo">230</span> }<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span> @Test<a name="line.232"></a>
+<span class="sourceLineNo">233</span> public void testOverlapWithSmallMergeCount() throws Exception {<a name="line.233"></a>
+<span class="sourceLineNo">234</span> TableName tn = TableName.valueOf(this.name.getMethodName());<a name="line.234"></a>
+<span class="sourceLineNo">235</span> try {<a name="line.235"></a>
+<span class="sourceLineNo">236</span> testOverlapCommon(tn);<a name="line.236"></a>
+<span class="sourceLineNo">237</span> HMaster services = TEST_UTIL.getHBaseCluster().getMaster();<a name="line.237"></a>
+<span class="sourceLineNo">238</span> CatalogJanitor cj = services.getCatalogJanitor();<a name="line.238"></a>
+<span class="sourceLineNo">239</span> cj.scan();<a name="line.239"></a>
+<span class="sourceLineNo">240</span> CatalogJanitor.Report report = cj.getLastReport();<a name="line.240"></a>
+<span class="sourceLineNo">241</span> assertEquals(6, report.getOverlaps().size());<a name="line.241"></a>
+<span class="sourceLineNo">242</span> assertEquals(2,<a name="line.242"></a>
+<span class="sourceLineNo">243</span> MetaFixer.calculateMerges(5, report.getOverlaps()).size());<a name="line.243"></a>
<span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span> // Get overlap regions<a name="line.245"></a>
-<span class="sourceLineNo">246</span> HashSet<String> overlapRegions = new HashSet<>();<a name="line.246"></a>
-<span class="sourceLineNo">247</span> for (Pair<RegionInfo, RegionInfo> pair : report.getOverlaps()) {<a name="line.247"></a>
-<span class="sourceLineNo">248</span> overlapRegions.add(pair.getFirst().getRegionNameAsString());<a name="line.248"></a>
-<span class="sourceLineNo">249</span> overlapRegions.add(pair.getSecond().getRegionNameAsString());<a name="line.249"></a>
-<span class="sourceLineNo">250</span> }<a name="line.250"></a>
-<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span> MetaFixer fixer = new MetaFixer(services);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> fixer.fixOverlaps(report);<a name="line.253"></a>
-<span class="sourceLineNo">254</span> AssignmentManager am = services.getAssignmentManager();<a name="line.254"></a>
-<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span> await(200, () -> {<a name="line.256"></a>
-<span class="sourceLineNo">257</span> try {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> cj.scan();<a name="line.258"></a>
-<span class="sourceLineNo">259</span> final CatalogJanitor.Report postReport = cj.getLastReport();<a name="line.259"></a>
-<span class="sourceLineNo">260</span> RegionStates regionStates = am.getRegionStates();<a name="line.260"></a>
-<span class="sourceLineNo">261</span><a name="line.261"></a>
-<span class="sourceLineNo">262</span> // Make sure that two merged regions are opened and GCs are done.<a name="line.262"></a>
-<span class="sourceLineNo">263</span> if (postReport.getOverlaps().size() == 1) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> Pair<RegionInfo, RegionInfo> pair = postReport.getOverlaps().get(0);<a name="line.264"></a>
-<span class="sourceLineNo">265</span> if ((!overlapRegions.contains(pair.getFirst().getRegionNameAsString()) &&<a name="line.265"></a>
-<span class="sourceLineNo">266</span> regionStates.getRegionState(pair.getFirst()).isOpened()) &&<a name="line.266"></a>
-<span class="sourceLineNo">267</span> (!overlapRegions.contains(pair.getSecond().getRegionNameAsString()) &&<a name="line.267"></a>
-<span class="sourceLineNo">268</span> regionStates.getRegionState(pair.getSecond()).isOpened())) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> // Make sure GC is done.<a name="line.269"></a>
-<span class="sourceLineNo">270</span> List<RegionInfo> firstParents = MetaTableAccessor.getMergeRegions(<a name="line.270"></a>
-<span class="sourceLineNo">271</span> services.getConnection(), pair.getFirst().getRegionName());<a name="line.271"></a>
-<span class="sourceLineNo">272</span> List<RegionInfo> secondParents = MetaTableAccessor.getMergeRegions(<a name="line.272"></a>
-<span class="sourceLineNo">273</span> services.getConnection(), pair.getSecond().getRegionName());<a name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span> return (firstParents == null || firstParents.isEmpty()) &&<a name="line.275"></a>
-<span class="sourceLineNo">276</span> (secondParents == null || secondParents.isEmpty());<a name="line.276"></a>
-<span class="sourceLineNo">277</span> }<a name="line.277"></a>
-<span class="sourceLineNo">278</span> }<a name="line.278"></a>
-<span class="sourceLineNo">279</span> return false;<a name="line.279"></a>
-<span class="sourceLineNo">280</span> } catch (Exception e) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> throw new RuntimeException(e);<a name="line.281"></a>
-<span class="sourceLineNo">282</span> }<a name="line.282"></a>
-<span class="sourceLineNo">283</span> });<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span> // Second run of fixOverlap should fix all.<a name="line.285"></a>
-<span class="sourceLineNo">286</span> report = cj.getLastReport();<a name="line.286"></a>
-<span class="sourceLineNo">287</span> fixer.fixOverlaps(report);<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span> await(20, () -> {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> try {<a name="line.290"></a>
-<span class="sourceLineNo">291</span> // Make sure it GC only once.<a name="line.291"></a>
-<span class="sourceLineNo">292</span> return (cj.scan() > 0);<a name="line.292"></a>
-<span class="sourceLineNo">293</span> } catch (Exception e) {<a name="line.293"></a>
-<span class="sourceLineNo">294</span> throw new RuntimeException(e);<a name="line.294"></a>
-<span class="sourceLineNo">295</span> }<a name="line.295"></a>
-<span class="sourceLineNo">296</span> });<a name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span> // No holes reported.<a name="line.298"></a>
-<span class="sourceLineNo">299</span> cj.scan();<a name="line.299"></a>
-<span class="sourceLineNo">300</span> final CatalogJanitor.Report postReport = cj.getLastReport();<a name="line.300"></a>
-<span class="sourceLineNo">301</span> assertTrue(postReport.isEmpty());<a name="line.301"></a>
+<span class="sourceLineNo">245</span> // The max merge count is set to 5 so overlap regions are divided into<a name="line.245"></a>
+<span class="sourceLineNo">246</span> // two merge requests.<a name="line.246"></a>
+<span class="sourceLineNo">247</span> TEST_UTIL.getHBaseCluster().getMaster().getConfiguration().setInt(<a name="line.247"></a>
+<span class="sourceLineNo">248</span> "hbase.master.metafixer.max.merge.count", 5);<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span> // Get overlap regions<a name="line.250"></a>
+<span class="sourceLineNo">251</span> HashSet<String> overlapRegions = new HashSet<>();<a name="line.251"></a>
+<span class="sourceLineNo">252</span> for (Pair<RegionInfo, RegionInfo> pair : report.getOverlaps()) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> overlapRegions.add(pair.getFirst().getRegionNameAsString());<a name="line.253"></a>
+<span class="sourceLineNo">254</span> overlapRegions.add(pair.getSecond().getRegionNameAsString());<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">256</span><a name="line.256"></a>
+<span class="sourceLineNo">257</span> MetaFixer fixer = new MetaFixer(services);<a name="line.257"></a>
+<span class="sourceLineNo">258</span> fixer.fixOverlaps(report);<a name="line.258"></a>
+<span class="sourceLineNo">259</span> AssignmentManager am = services.getAssignmentManager();<a name="line.259"></a>
+<span class="sourceLineNo">260</span><a name="line.260"></a>
+<span class="sourceLineNo">261</span> await(200, () -> {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> try {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> cj.scan();<a name="line.263"></a>
+<span class="sourceLineNo">264</span> final CatalogJanitor.Report postReport = cj.getLastReport();<a name="line.264"></a>
+<span class="sourceLineNo">265</span> RegionStates regionStates = am.getRegionStates();<a name="line.265"></a>
+<span class="sourceLineNo">266</span><a name="line.266"></a>
+<span class="sourceLineNo">267</span> // Make sure that two merged regions are opened and GCs are done.<a name="line.267"></a>
+<span class="sourceLineNo">268</span> if (postReport.getOverlaps().size() == 1) {<a name="line.268"></a>
+<span class="sourceLineNo">269</span> Pair<RegionInfo, RegionInfo> pair = postReport.getOverlaps().get(0);<a name="line.269"></a>
+<span class="sourceLineNo">270</span> if ((!overlapRegions.contains(pair.getFirst().getRegionNameAsString()) &&<a name="line.270"></a>
+<span class="sourceLineNo">271</span> regionStates.getRegionState(pair.getFirst()).isOpened()) &&<a name="line.271"></a>
+<span class="sourceLineNo">272</span> (!overlapRegions.contains(pair.getSecond().getRegionNameAsString()) &&<a name="line.272"></a>
+<span class="sourceLineNo">273</span> regionStates.getRegionState(pair.getSecond()).isOpened())) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> // Make sure GC is done.<a name="line.274"></a>
+<span class="sourceLineNo">275</span> List<RegionInfo> firstParents = MetaTableAccessor.getMergeRegions(<a name="line.275"></a>
+<span class="sourceLineNo">276</span> services.getConnection(), pair.getFirst().getRegionName());<a name="line.276"></a>
+<span class="sourceLineNo">277</span> List<RegionInfo> secondParents = MetaTableAccessor.getMergeRegions(<a name="line.277"></a>
+<span class="sourceLineNo">278</span> services.getConnection(), pair.getSecond().getRegionName());<a name="line.278"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span> return (firstParents == null || firstParents.isEmpty()) &&<a name="line.280"></a>
+<span class="sourceLineNo">281</span> (secondParents == null || secondParents.isEmpty());<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span> }<a name="line.283"></a>
+<span class="sourceLineNo">284</span> return false;<a name="line.284"></a>
+<span class="sourceLineNo">285</span> } catch (Exception e) {<a name="line.285"></a>
+<span class="sourceLineNo">286</span> throw new RuntimeException(e);<a name="line.286"></a>
+<span class="sourceLineNo">287</span> }<a name="line.287"></a>
+<span class="sourceLineNo">288</span> });<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span> // Second run of fixOverlap should fix all.<a name="line.290"></a>
+<span class="sourceLineNo">291</span> report = cj.getLastReport();<a name="line.291"></a>
+<span class="sourceLineNo">292</span> fixer.fixOverlaps(report);<a name="line.292"></a>
+<span class="sourceLineNo">293</span><a name="line.293"></a>
+<span class="sourceLineNo">294</span> await(20, () -> {<a name="line.294"></a>
+<span class="sourceLineNo">295</span> try {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> // Make sure it GC only once.<a name="line.296"></a>
+<span class="sourceLineNo">297</span> return (cj.scan() > 0);<a name="line.297"></a>
+<span class="sourceLineNo">298</span> } catch (Exception e) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> throw new RuntimeException(e);<a name="line.299"></a>
+<span class="sourceLineNo">300</span> }<a name="line.300"></a>
+<span class="sourceLineNo">301</span> });<a name="line.301"></a>
<span class="sourceLineNo">302</span><a name="line.302"></a>
-<span class="sourceLineNo">303</span> } finally {<a name="line.303"></a>
-<span class="sourceLineNo">304</span> TEST_UTIL.getHBaseCluster().getMaster().getConfiguration().unset(<a name="line.304"></a>
-<span class="sourceLineNo">305</span> "hbase.master.metafixer.max.merge.count");<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span> TEST_UTIL.deleteTable(tn);<a name="line.307"></a>
-<span class="sourceLineNo">308</span> }<a name="line.308"></a>
-<span class="sourceLineNo">309</span> }<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span> /**<a name="line.311"></a>
-<span class="sourceLineNo">312</span> * Make it so a big overlap spans many Regions, some of which are non-contiguous. Make it so<a name="line.312"></a>
-<span class="sourceLineNo">313</span> * we can fix this condition. HBASE-24247<a name="line.313"></a>
-<span class="sourceLineNo">314</span> */<a name="line.314"></a>
-<span class="sourceLineNo">315</span> @Test<a name="line.315"></a>
-<span class="sourceLineNo">316</span> public void testOverlapWithMergeOfNonContiguous() throws Exception {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> TableName tn = TableName.valueOf(this.name.getMethodName());<a name="line.317"></a>
-<span class="sourceLineNo">318</span> TEST_UTIL.createMultiRegionTable(tn, HConstants.CATALOG_FAMILY);<a name="line.318"></a>
-<span class="sourceLineNo">319</span> List<RegionInfo> ris = MetaTableAccessor.getTableRegions(TEST_UTIL.getConnection(), tn);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> assertTrue(ris.size() > 5);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> MasterServices services = TEST_UTIL.getHBaseCluster().getMaster();<a name="line.321"></a>
-<span class="sourceLineNo">322</span> services.getCatalogJanitor().scan();<a name="line.322"></a>
-<span class="sourceLineNo">323</span> CatalogJanitor.Report report = services.getCatalogJanitor().getLastReport();<a name="line.323"></a>
-<span class="sourceLineNo">324</span> assertTrue(report.isEmpty());<a name="line.324"></a>
-<span class="sourceLineNo">325</span> // Make a simple overlap spanning second and third region.<a name="line.325"></a>
-<span class="sourceLineNo">326</span> makeOverlap(services, ris.get(1), ris.get(5));<a name="line.326"></a>
-<span class="sourceLineNo">327</span> // Now Delete a region under the overlap to manufacture non-contiguous sub regions.<a name="line.327"></a>
-<span class="sourceLineNo">328</span> RegionInfo deletedRegion = ris.get(3);<a name="line.328"></a>
-<span class="sourceLineNo">329</span> long pid = services.getAssignmentManager().unassign(deletedRegion);<a name="line.329"></a>
-<span class="sourceLineNo">330</span> while (!services.getMasterProcedureExecutor().isFinished(pid)) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span> Threads.sleep(100);<a name="line.331"></a>
-<span class="sourceLineNo">332</span> }<a name="line.332"></a>
-<span class="sourceLineNo">333</span> GCRegionProcedure procedure =<a name="line.333"></a>
-<span class="sourceLineNo">334</span> new GCRegionProcedure(services.getMasterProcedureExecutor().getEnvironment(), ris.get(3));<a name="line.334"></a>
-<span class="sourceLineNo">335</span> pid = services.getMasterProcedureExecutor().submitProcedure(procedure);<a name="line.335"></a>
-<span class="sourceLineNo">336</span> while (!services.getMasterProcedureExecutor().isFinished(pid)) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span> Threads.sleep(100);<a name="line.337"></a>
-<span class="sourceLineNo">338</span> }<a name="line.338"></a>
-<span class="sourceLineNo">339</span> Threads.sleep(10000);<a name="line.339"></a>
-<span class="sourceLineNo">340</span> services.getCatalogJanitor().scan();<a name="line.340"></a>
-<span class="sourceLineNo">341</span> report = services.getCatalogJanitor().getLastReport();<a name="line.341"></a>
-<span class="sourceLineNo">342</span> assertEquals(1, MetaFixer.calculateMerges(10, report.getOverlaps()).size());<a name="line.342"></a>
-<span class="sourceLineNo">343</span> MetaFixer fixer = new MetaFixer(services);<a name="line.343"></a>
-<span class="sourceLineNo">344</span> fixer.fixOverlaps(report);<a name="line.344"></a>
-<span class="sourceLineNo">345</span> await(10, () -> {<a name="line.345"></a>
-<span class="sourceLineNo">346</span> try {<a name="line.346"></a>
-<span class="sourceLineNo">347</span> services.getCatalogJanitor().scan();<a name="line.347"></a>
-<span class="sourceLineNo">348</span> final CatalogJanitor.Report postReport = services.getCatalogJanitor().getLastReport();<a name="line.348"></a>
-<span class="sourceLineNo">349</span> return postReport.isEmpty();<a name="line.349"></a>
-<span class="sourceLineNo">350</span> } catch (Exception e) {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> throw new RuntimeException(e);<a name="line.351"></a>
-<span class="sourceLineNo">352</span> }<a name="line.352"></a>
-<span class="sourceLineNo">353</span> });<a name="line.353"></a>
-<span class="sourceLineNo">354</span> }<a name="line.354"></a>
+<span class="sourceLineNo">303</span> // No holes reported.<a name="line.303"></a>
+<span class="sourceLineNo">304</span> cj.scan();<a name="line.304"></a>
+<span class="sourceLineNo">305</span> final CatalogJanitor.Report postReport = cj.getLastReport();<a name="line.305"></a>
+<span class="sourceLineNo">306</span> assertTrue(postReport.isEmpty());<a name="line.306"></a>
+<span class="sourceLineNo">307</span><a name="line.307"></a>
+<span class="sourceLineNo">308</span> } finally {<a name="line.308"></a>
+<span class="sourceLineNo">309</span> TEST_UTIL.getHBaseCluster().getMaster().getConfiguration().unset(<a name="line.309"></a>
+<span class="sourceLineNo">310</span> "hbase.master.metafixer.max.merge.count");<a name="line.310"></a>
+<span class="sourceLineNo">311</span><a name="line.311"></a>
+<span class="sourceLineNo">312</span> TEST_UTIL.deleteTable(tn);<a name="line.312"></a>
+<span class="sourceLineNo">313</span> }<a name="line.313"></a>
+<span class="sourceLineNo">314</span> }<a name="line.314"></a>
+<span class="sourceLineNo">315</span><a name="line.315"></a>
+<span class="sourceLineNo">316</span> /**<a name="line.316"></a>
+<span class="sourceLineNo">317</span> * This test covers the case that one of merged parent regions is a merged child region that<a name="line.317"></a>
+<span class="sourceLineNo">318</span> * has not been GCed but there is no reference files anymore. In this case, it will kick off<a name="line.318"></a>
+<span class="sourceLineNo">319</span> * a GC procedure, but no merge will happen.<a name="line.319"></a>
+<span class="sourceLineNo">320</span> */<a name="line.320"></a>
+<span class="sourceLineNo">321</span> @Test<a name="line.321"></a>
+<span class="sourceLineNo">322</span> public void testMergeWithMergedChildRegion() throws Exception {<a name="line.322"></a>
+<span class="sourceLineNo">323</span> TableName tn = TableName.valueOf(this.name.getMethodName());<a name="line.323"></a>
+<span class="sourceLineNo">324</span> Table t = TEST_UTIL.createMultiRegionTable(tn, HConstants.CATALOG_FAMILY);<a name="line.324"></a>
+<span class="sourceLineNo">325</span> List<RegionInfo> ris = MetaTableAccessor.getTableRegions(TEST_UTIL.getConnection(), tn);<a name="line.325"></a>
+<span class="sourceLineNo">326</span> assertTrue(ris.size() > 5);<a name="line.326"></a>
+<span class="sourceLineNo">327</span> HMaster services = TEST_UTIL.getHBaseCluster().getMaster();<a name="line.327"></a>
+<span class="sourceLineNo">328</span> CatalogJanitor cj = services.getCatalogJanitor();<a name="line.328"></a>
+<span class="sourceLineNo">329</span> cj.scan();<a name="line.329"></a>
+<span class="sourceLineNo">330</span> CatalogJanitor.Report report = cj.getLastReport();<a name="line.330"></a>
+<span class="sourceLineNo">331</span> assertTrue(report.isEmpty());<a name="line.331"></a>
+<span class="sourceLineNo">332</span> RegionInfo overlapRegion = makeOverlap(services, ris.get(1), ris.get(2));<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span> cj.scan();<a name="line.334"></a>
+<span class="sourceLineNo">335</span> report = cj.getLastReport();<a name="line.335"></a>
+<span class="sourceLineNo">336</span> assertEquals(2, report.getOverlaps().size());<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span> // Mark it as a merged child region.<a name="line.338"></a>
+<span class="sourceLineNo">339</span> RegionInfo fakedParentRegion = RegionInfoBuilder.newBuilder(tn).<a name="line.339"></a>
+<span class="sourceLineNo">340</span> setStartKey(overlapRegion.getStartKey()).<a name="line.340"></a>
+<span class="sourceLineNo">341</span> build();<a name="line.341"></a>
+<span class="sourceLineNo">342</span><a name="line.342"></a>
+<span class="sourceLineNo">343</span> Table meta = MetaTableAccessor.getMetaHTable(TEST_UTIL.getConnection());<a name="line.343"></a>
+<span class="sourceLineNo">344</span> Put putOfMerged = MetaTableAccessor.makePutFromRegionInfo(overlapRegion,<a name="line.344"></a>
+<span class="sourceLineNo">345</span> HConstants.LATEST_TIMESTAMP);<a name="line.345"></a>
+<span class="sourceLineNo">346</span> String qualifier = String.format(HConstants.MERGE_QUALIFIER_PREFIX_STR + "%04d", 0);<a name="line.346"></a>
+<span class="sourceLineNo">347</span> putOfMerged.add(CellBuilderFactory.create(CellBuilderType.SHALLOW_COPY).setRow(<a name="line.347"></a>
+<span class="sourceLineNo">348</span> putOfMerged.getRow()).<a name="line.348"></a>
+<span class="sourceLineNo">349</span> setFamily(HConstants.CATALOG_FAMILY).<a name="line.349"></a>
+<span class="sourceLineNo">350</span> setQualifier(Bytes.toBytes(qualifier)).<a name="line.350"></a>
+<span class="sourceLineNo">351</span> setTimestamp(putOfMerged.getTimestamp()).<a name="line.351"></a>
+<span class="sourceLineNo">352</span> setType(Cell.Type.Put).<a name="line.352"></a>
+<span class="sourceLineNo">353</span> setValue(RegionInfo.toByteArray(fakedParentRegion)).<a name="line.353"></a>
+<span class="sourceLineNo">354</span> build());<a name="line.354"></a>
<span class="sourceLineNo">355</span><a name="line.355"></a>
-<span class="sourceLineNo">356</span> /**<a name="line.356"></a>
-<span class="sourceLineNo">357</span> * Await the successful return of {@code condition}, sleeping {@code sleepMillis} between<a name="line.357"></a>
-<span class="sourceLineNo">358</span> * invocations.<a name="line.358"></a>
-<span class="sourceLineNo">359</span> */<a name="line.359"></a>
-<span class="sourceLineNo">360</span> private static void await(final long sleepMillis, final BooleanSupplier condition)<a name="line.360"></a>
-<span class="sourceLineNo">361</span> throws InterruptedException {<a name="line.361"></a>
-<span class="sourceLineNo">362</span> try {<a name="line.362"></a>
-<span class="sourceLineNo">363</span> while (!condition.getAsBoolean()) {<a name="line.363"></a>
-<span class="sourceLineNo">364</span> Thread.sleep(sleepMillis);<a name="line.364"></a>
-<span class="sourceLineNo">365</span> }<a name="line.365"></a>
-<span class="sourceLineNo">366</span> } catch (RuntimeException e) {<a name="line.366"></a>
-<span class="sourceLineNo">367</span> if (e.getCause() instanceof AssertionError) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> throw (AssertionError) e.getCause();<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<a name="line.369"></a>
-<span class="sourceLineNo">370</span> throw e;<a name="line.370"></a>
-<span class="sourceLineNo">371</span> }<a name="line.371"></a>
-<span class="sourceLineNo">372</span> }<a name="line.372"></a>
-<span class="sourceLineNo">373</span>}<a name="line.373"></a>
+<span class="sourceLineNo">356</span> meta.put(putOfMerged);<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span> MetaFixer fixer = new MetaFixer(services);<a name="line.358"></a>
+<span class="sourceLineNo">359</span> fixer.fixOverlaps(report);<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span> // Wait until all procedures settled down<a name="line.361"></a>
+<span class="sourceLineNo">362</span> await(200, () -> {<a name="line.362"></a>
+<span class="sourceLineNo">363</span> return services.getMasterProcedureExecutor().getActiveProcIds().isEmpty();<a name="line.363"></a>
+<span class="sourceLineNo">364</span> });<a name="line.364"></a>
+<span class="sourceLineNo">365</span><a name="line.365"></a>
+<span class="sourceLineNo">366</span> // No merge is done, overlap is still there.<a name="line.366"></a>
+<span class="sourceLineNo">367</span> cj.scan();<a name="line.367"></a>
+<span class="sourceLineNo">368</span> report = cj.getLastReport();<a name="line.368"></a>
+<span class="sourceLineNo">369</span> assertEquals(2, report.getOverlaps().size());<a name="line.369"></a>
+<span class="sourceLineNo">370</span><a name="line.370"></a>
+<span class="sourceLineNo">371</span> fixer.fixOverlaps(report);<a name="line.371"></a>
+<span class="sourceLineNo">372</span><a name="line.372"></a>
+<span class="sourceLineNo">373</span> // Wait until all procedures settled down<a name="line.373"></a>
+<span class="sourceLineNo">374</span> await(200, () -> {<a name="line.374"></a>
+<span class="sourceLineNo">375</span> return services.getMasterProcedureExecutor().getActiveProcIds().isEmpty();<a name="line.375"></a>
+<span class="sourceLineNo">376</span> });<a name="line.376"></a>
+<span class="sourceLineNo">377</span><a name="line.377"></a>
+<span class="sourceLineNo">378</span> // Merge is done and no more overlaps<a name="line.378"></a>
+<span class="sourceLineNo">379</span> cj.scan();<a name="line.379"></a>
+<span class="sourceLineNo">380</span> report = cj.getLastReport();<a name="line.380"></a>
+<span class="sourceLineNo">381</span> assertEquals(0, report.getOverlaps().size());<a name="line.381"></a>
+<span class="sourceLineNo">382</span> }<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span> /**<a name="line.384"></a>
+<span class="sourceLineNo">385</span> * Make it so a big overlap spans many Regions, some of which are non-contiguous. Make it so<a name="line.385"></a>
+<span class="sourceLineNo">386</span> * we can fix this condition. HBASE-24247<a name="line.386"></a>
+<span class="sourceLineNo">387</span> */<a name="line.387"></a>
+<span class="sourceLineNo">388</span> @Test<a name="line.388"></a>
+<span class="sourceLineNo">389</span> public void testOverlapWithMergeOfNonContiguous() throws Exception {<a name="line.389"></a>
+<span class="sourceLineNo">390</span> TableName tn = TableName.valueOf(this.name.getMethodName());<a name="line.390"></a>
+<span class="sourceLineNo">391</span> TEST_UTIL.createMultiRegionTable(tn, HConstants.CATALOG_FAMILY);<a name="line.391"></a>
+<span class="sourceLineNo">392</span> List<RegionInfo> ris = MetaTableAccessor.getTableRegions(TEST_UTIL.getConnection(), tn);<a name="line.392"></a>
+<span class="sourceLineNo">393</span> assertTrue(ris.size() > 5);<a name="line.393"></a>
+<span class="sourceLineNo">394</span> MasterServices services = TEST_UTIL.getHBaseCluster().getMaster();<a name="line.394"></a>
+<span class="sourceLineNo">395</span> services.getCatalogJanitor().scan();<a name="line.395"></a>
+<span class="sourceLineNo">396</span> CatalogJanitor.Report report = services.getCatalogJanitor().getLastReport();<a name="line.396"></a>
+<span class="sourceLineNo">397</span> assertTrue(report.isEmpty());<a name="line.397"></a>
+<span class="sourceLineNo">398</span> // Make a simple overlap spanning second and third region.<a name="line.398"></a>
+<span class="sourceLineNo">399</span> makeOverlap(services, ris.get(1), ris.get(5));<a name="line.399"></a>
+<span class="sourceLineNo">400</span> // Now Delete a region under the overlap to manufacture non-contiguous sub regions.<a name="line.400"></a>
+<span class="sourceLineNo">401</span> RegionInfo deletedRegion = ris.get(3);<a name="line.401"></a>
+<span class="sourceLineNo">402</span> long pid = services.getAssignmentManager().unassign(deletedRegion);<a name="line.402"></a>
+<span class="sourceLineNo">403</span> while (!services.getMasterProcedureExecutor().isFinished(pid)) {<a name="line.403"></a>
+<span class="sourceLineNo">404</span> Threads.sleep(100);<a name="line.404"></a>
+<span class="sourceLineNo">405</span> }<a name="line.405"></a>
+<span class="sourceLineNo">406</span> GCRegionProcedure procedure =<a name="line.406"></a>
+<span class="sourceLineNo">407</span> new GCRegionProcedure(services.getMasterProcedureExecutor().getEnvironment(), ris.get(3));<a name="line.407"></a>
+<span class="sourceLineNo">408</span> pid = services.getMasterProcedureExecutor().submitProcedure(procedure);<a name="line.408"></a>
+<span class="sourceLineNo">409</span> while (!services.getMasterProcedureExecutor().isFinished(pid)) {<a name="line.409"></a>
+<span class="sourceLineNo">410</span> Threads.sleep(100);<a name="line.410"></a>
+<span class="sourceLineNo">411</span> }<a name="line.411"></a>
+<span class="sourceLineNo">412</span> services.getCatalogJanitor().scan();<a name="line.412"></a>
+<span class="sourceLineNo">413</span> report = services.getCatalogJanitor().getLastReport();<a name="line.413"></a>
+<span class="sourceLineNo">414</span> assertEquals(1, MetaFixer.calculateMerges(10, report.getOverlaps()).size());<a name="line.414"></a>
+<span class="sourceLineNo">415</span> MetaFixer fixer = new MetaFixer(services);<a name="line.415"></a>
+<span class="sourceLineNo">416</span> fixer.fixOverlaps(report);<a name="line.416"></a>
+<span class="sourceLineNo">417</span> await(10, () -> {<a name="line.417"></a>
+<span class="sourceLineNo">418</span> try {<a name="line.418"></a>
+<span class="sourceLineNo">419</span> services.getCatalogJanitor().scan();<a name="line.419"></a>
+<span class="sourceLineNo">420</span> final CatalogJanitor.Report postReport = services.getCatalogJanitor().getLastReport();<a name="line.420"></a>
+<span class="sourceLineNo">421</span> return postReport.isEmpty();<a name="line.421"></a>
+<span class="sourceLineNo">422</span> } catch (Exception e) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span> throw new RuntimeException(e);<a name="line.423"></a>
+<span class="sourceLineNo">424</span> }<a name="line.424"></a>
+<span class="sourceLineNo">425</span> });<a name="line.425"></a>
+<span class="sourceLineNo">426</span> }<a name="line.426"></a>
+<span class="sourceLineNo">427</span><a name="line.427"></a>
+<span class="sourceLineNo">428</span> /**<a name="line.428"></a>
+<span class="sourceLineNo">429</span> * Await the successful return of {@code condition}, sleeping {@code sleepMillis} between<a name="line.429"></a>
+<span class="sourceLineNo">430</span> * invocations.<a name="line.430"></a>
+<span class="sourceLineNo">431</span> */<a name="line.431"></a>
+<span class="sourceLineNo">432</span> private static void await(final long sleepMillis, final BooleanSupplier condition)<a name="line.432"></a>
+<span class="sourceLineNo">433</span> throws InterruptedException {<a name="line.433"></a>
+<span class="sourceLineNo">434</span> try {<a name="line.434"></a>
+<span class="sourceLineNo">435</span> while (!condition.getAsBoolean()) {<a name="line.435"></a>
+<span class="sourceLineNo">436</span> Thread.sleep(sleepMillis);<a name="line.436"></a>
+<span class="sourceLineNo">437</span> }<a name="line.437"></a>
+<span class="sourceLineNo">438</span> } catch (RuntimeException e) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> if (e.getCause() instanceof AssertionError) {<a name="line.439"></a>
+<span class="sourceLineNo">440</span> throw (AssertionError) e.getCause();<a name="line.440"></a>
+<span class="sourceLineNo">441</span> }<a name="line.441"></a>
+<span class="sourceLineNo">442</span> throw e;<a name="line.442"></a>
+<span class="sourceLineNo">443</span> }<a name="line.443"></a>
+<span class="sourceLineNo">444</span> }<a name="line.444"></a>
+<span class="sourceLineNo">445</span>}<a name="line.445"></a>