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/11/23 20:16:45 UTC

[hbase-site] branch asf-site updated: Published site at 1cd8f3cf94c0b2dc6999fa17b4f3d32e16d37ac7.

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 87f2ba1  Published site at 1cd8f3cf94c0b2dc6999fa17b4f3d32e16d37ac7.
87f2ba1 is described below

commit 87f2ba15ec09934f4cd5ab43b12c735c5f0f49e6
Author: jenkins <bu...@apache.org>
AuthorDate: Mon Nov 23 20:16:23 2020 +0000

    Published site at 1cd8f3cf94c0b2dc6999fa17b4f3d32e16d37ac7.
---
 acid-semantics.html                                |    2 +-
 apache_hbase_reference_guide.pdf                   |    4 +-
 .../hbase/client/TableDescriptorBuilder.html       |    2 +-
 book.html                                          |    2 +-
 bulk-loads.html                                    |    2 +-
 checkstyle-aggregate.html                          |    4 +-
 coc.html                                           |    2 +-
 dependencies.html                                  |    2 +-
 dependency-convergence.html                        |    2 +-
 dependency-info.html                               |    2 +-
 dependency-management.html                         |    2 +-
 devapidocs/index-all.html                          |    6 +
 .../apache/hadoop/hbase/backup/package-tree.html   |    4 +-
 .../apache/hadoop/hbase/class-use/TableName.html   |   32 +-
 .../apache/hadoop/hbase/client/package-tree.html   |   24 +-
 .../hadoop/hbase/coprocessor/package-tree.html     |    2 +-
 .../apache/hadoop/hbase/executor/package-tree.html |    2 +-
 .../apache/hadoop/hbase/filter/package-tree.html   |    8 +-
 .../hadoop/hbase/hbtop/terminal/package-tree.html  |    2 +-
 .../org/apache/hadoop/hbase/http/package-tree.html |    2 +-
 .../apache/hadoop/hbase/io/hfile/package-tree.html |    6 +-
 .../org/apache/hadoop/hbase/ipc/package-tree.html  |    2 +-
 .../hadoop/hbase/mapreduce/package-tree.html       |    2 +-
 .../org/apache/hadoop/hbase/master/HMaster.html    |   24 +-
 .../hbase/master/assignment/package-tree.html      |    2 +-
 .../apache/hadoop/hbase/master/package-tree.html   |    4 +-
 .../hbase/master/procedure/package-tree.html       |    4 +-
 .../org/apache/hadoop/hbase/package-tree.html      |   16 +-
 .../hadoop/hbase/procedure2/package-tree.html      |    6 +-
 .../apache/hadoop/hbase/quotas/package-tree.html   |    4 +-
 .../hadoop/hbase/regionserver/package-tree.html    |   16 +-
 .../regionserver/querymatcher/package-tree.html    |    2 +-
 .../hbase/regionserver/wal/package-tree.html       |    4 +-
 .../replication/regionserver/package-tree.html     |    2 +-
 .../hadoop/hbase/security/access/package-tree.html |    6 +-
 .../apache/hadoop/hbase/security/package-tree.html |    2 +-
 .../apache/hadoop/hbase/thrift/package-tree.html   |    4 +-
 .../hadoop/hbase/tool/BulkLoadHFilesTool.html      |  162 ++--
 .../apache/hadoop/hbase/util/class-use/Pair.html   |   13 +
 .../org/apache/hadoop/hbase/util/package-tree.html |   10 +-
 ...escriptorBuilder.ModifyableTableDescriptor.html |    2 +-
 .../hbase/client/TableDescriptorBuilder.html       |    2 +-
 .../master/HMaster.TableDescriptorGetter.html      |  263 ++---
 .../org/apache/hadoop/hbase/master/HMaster.html    |  263 ++---
 .../tool/BulkLoadHFilesTool.BulkHFileVisitor.html  | 1010 ++++++++++----------
 .../hadoop/hbase/tool/BulkLoadHFilesTool.html      | 1010 ++++++++++----------
 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                      |    6 +
 .../hadoop/hbase/chaos/actions/package-tree.html   |    2 +-
 .../hbase/client/TestTableDescriptorBuilder.html   |   87 +-
 .../apache/hadoop/hbase/io/hfile/package-tree.html |    2 +-
 .../org/apache/hadoop/hbase/package-tree.html      |   14 +-
 .../hadoop/hbase/procedure2/package-tree.html      |    4 +-
 .../hadoop/hbase/regionserver/package-tree.html    |    6 +-
 .../hadoop/hbase/rsgroup/TestRSGroupsAdmin1.html   |   24 +-
 .../tool/TestBulkLoadHFilesSplitRecovery.html      |   40 +-
 .../TestSecureBulkLoadHFilesSplitRecovery.html     |    2 +-
 .../org/apache/hadoop/hbase/wal/package-tree.html  |    4 +-
 .../hbase/client/TestTableDescriptorBuilder.html   |  554 +++++------
 .../hadoop/hbase/rsgroup/TestRSGroupsAdmin1.html   |   37 +-
 .../tool/TestBulkLoadHFilesSplitRecovery.html      |  277 +++---
 80 files changed, 2152 insertions(+), 1896 deletions(-)

diff --git a/acid-semantics.html b/acid-semantics.html
index 5c4dd71..fe404d1 100644
--- a/acid-semantics.html
+++ b/acid-semantics.html
@@ -467,7 +467,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 d38dd9a..3543f2b 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.3, based on Prawn 2.2.2)
 /Producer (Apache HBase Team)
-/ModDate (D:20201121200434+00'00')
-/CreationDate (D:20201121201409+00'00')
+/ModDate (D:20201123200444+00'00')
+/CreationDate (D:20201123201421+00'00')
 >>
 endobj
 2 0 obj
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/client/TableDescriptorBuilder.html b/apidocs/src-html/org/apache/hadoop/hbase/client/TableDescriptorBuilder.html
index 798e88b..0d94476 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/client/TableDescriptorBuilder.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/client/TableDescriptorBuilder.html
@@ -549,7 +549,7 @@
 <span class="sourceLineNo">541</span>  }<a name="line.541"></a>
 <span class="sourceLineNo">542</span><a name="line.542"></a>
 <span class="sourceLineNo">543</span>  public TableDescriptorBuilder setRegionServerGroup(String group) {<a name="line.543"></a>
-<span class="sourceLineNo">544</span>    desc.setValue(RSGROUP_KEY, new Bytes(Bytes.toBytes(group)));<a name="line.544"></a>
+<span class="sourceLineNo">544</span>    desc.setValue(RSGROUP_KEY, group);<a name="line.544"></a>
 <span class="sourceLineNo">545</span>    return this;<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>
diff --git a/book.html b/book.html
index 1d76e8d..95ba2d6 100644
--- a/book.html
+++ b/book.html
@@ -46154,7 +46154,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-11-21 20:04:34 UTC
+Last updated 2020-11-23 20:04:44 UTC
 </div>
 </div>
 <link rel="stylesheet" href="./coderay-asciidoctor.css">
diff --git a/bulk-loads.html b/bulk-loads.html
index 00bbe07..54584df 100644
--- a/bulk-loads.html
+++ b/bulk-loads.html
@@ -172,7 +172,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 62ffc2a..2f94ede 100644
--- a/checkstyle-aggregate.html
+++ b/checkstyle-aggregate.html
@@ -68244,7 +68244,7 @@
 <td>coding</td>
 <td>InnerAssignment</td>
 <td>Inner assignments should be avoided.</td>
-<td>527</td></tr></table></div>
+<td>554</td></tr></table></div>
 <div class="section">
 <h3 id="org.apache.hadoop.hbase.trace.IntegrationTestSendTraceRequests.java">org/apache/hadoop/hbase/trace/IntegrationTestSendTraceRequests.java</h3>
 <table border="0" class="table table-striped">
@@ -75501,7 +75501,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 a20b20a..61bd2bf 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 &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 ed32a8d..0b419f1 100644
--- a/dependencies.html
+++ b/dependencies.html
@@ -313,7 +313,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 7d551ae..0c0ce96 100644
--- a/dependency-convergence.html
+++ b/dependency-convergence.html
@@ -824,7 +824,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 c1ea1a6..a28b8a3 100644
--- a/dependency-info.html
+++ b/dependency-info.html
@@ -194,7 +194,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 5d48cb2..c8977d3 100644
--- a/dependency-management.html
+++ b/dependency-management.html
@@ -1019,7 +1019,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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/index-all.html b/devapidocs/index-all.html
index d0f609c..d74e149 100644
--- a/devapidocs/index-all.html
+++ b/devapidocs/index-all.html
@@ -11653,6 +11653,10 @@
 <dd>
 <div class="block">Check all column families in a region dir.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#checkRegionIndexValid-int-java.util.List-org.apache.hadoop.hbase.TableName-">checkRegionIndexValid(int, List&lt;Pair&lt;byte[], byte[]&gt;&gt;, TableName)</a></span> - Method in class org.apache.hadoop.hbase.tool.<a href="org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFilesTool</a></dt>
+<dd>
+<div class="block">we can consider there is a region hole or overlap in following conditions.</div>
+</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/regionserver/HRegionFileSystem.html#checkRegionInfoOnFilesystem--">checkRegionInfoOnFilesystem()</a></span> - Method in class org.apache.hadoop.hbase.regionserver.<a href="org/apache/hadoop/hbase/regionserver/HRegionFileSystem.html" title="class in org.apache.hadoop.hbase.regionserver">HRegionFileSystem</a></dt>
 <dd>
 <div class="block">Write out an info file under the stored region directory.</div>
@@ -48894,6 +48898,8 @@
 <dd>
 <div class="block">Get regionId from Ops such as: get, put, delete.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#getRegionIndex-java.util.List-byte:A-">getRegionIndex(List&lt;Pair&lt;byte[], byte[]&gt;&gt;, byte[])</a></span> - Method in class org.apache.hadoop.hbase.tool.<a href="org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFilesTool</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/CatalogFamilyFormat.html#getRegionInfo-org.apache.hadoop.hbase.client.Result-byte:A-">getRegionInfo(Result, byte[])</a></span> - Static method in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/CatalogFamilyFormat.html" title="class in org.apache.hadoop.hbase">CatalogFamilyFormat</a></dt>
 <dd>
 <div class="block">Returns the RegionInfo object from the column <a href="org/apache/hadoop/hbase/HConstants.html#CATALOG_FAMILY"><code>HConstants.CATALOG_FAMILY</code></a> and
diff --git a/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html b/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
index bebdb07..8cb3f3d 100644
--- a/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
@@ -166,10 +166,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>&lt;E&gt; (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>&lt;T&gt;, 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/BackupRestoreConstants.BackupCommand.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupRestoreConstants.BackupCommand</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupInfo.BackupState.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupInfo.BackupState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupType.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupInfo.BackupState.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupInfo.BackupState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupInfo.BackupPhase.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupInfo.BackupPhase</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/BackupRestoreConstants.BackupCommand.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">BackupRestoreConstants.BackupCommand</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/class-use/TableName.html b/devapidocs/org/apache/hadoop/hbase/class-use/TableName.html
index 57e041d..2244b64 100644
--- a/devapidocs/org/apache/hadoop/hbase/class-use/TableName.html
+++ b/devapidocs/org/apache/hadoop/hbase/class-use/TableName.html
@@ -11340,12 +11340,20 @@ service.</div>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>private void</code></td>
+<td class="colLast"><span class="typeNameLabel">BulkLoadHFilesTool.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#checkRegionIndexValid-int-java.util.List-org.apache.hadoop.hbase.TableName-">checkRegionIndexValid</a></span>(int&nbsp;idx,
+                     <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>&lt;<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;byte[],byte[]&gt;&gt;&nbsp;startEndKeys,
+                     <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName)</code>
+<div class="block">we can consider there is a region hole or overlap in following conditions.</div>
+</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>private void</code></td>
 <td class="colLast"><span class="typeNameLabel">BulkLoadHFilesTool.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#cleanup-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-java.util.Deque-java.util.concurrent.ExecutorService-">cleanup</a></span>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.client"> [...]
        <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
        <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Deque.html?is-external=true" title="class or interface in java.util">Deque</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>&gt;&nbsp;queue,
        <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ExecutorService.html?is-external=true" title="class or interface in java.util.concurrent">ExecutorService</a>&nbsp;pool)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private void</code></td>
 <td class="colLast"><span class="typeNameLabel">BulkLoadHFilesTool.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#createTable-org.apache.hadoop.hbase.TableName-org.apache.hadoop.fs.Path-org.apache.hadoop.hbase.client.AsyncAdmin-">createTable</a></span>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
            org.apache.hadoop.fs.Path&nbsp;hfofDir,
@@ -11353,7 +11361,7 @@ service.</div>
 <div class="block">If the table is created for the first time, then "completebulkload" reads the files twice.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private <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>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt; [...]
 <td class="colLast"><span class="typeNameLabel">BulkLoadHFilesTool.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#doBulkLoad-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-java.util.Map-boolean-boolean-">doBulkLoad</a></span>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.client">AsyncClusterConne [...]
           <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
@@ -11363,7 +11371,7 @@ service.</div>
 <div class="block">Perform a bulk load of the given map of families to hfiles into the given pre-existing table.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private <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>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt; [...]
 <td class="colLast"><span class="typeNameLabel">BulkLoadHFilesTool.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#doBulkLoad-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-org.apache.hadoop.fs.Path-boolean-boolean-">doBulkLoad</a></span>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.client">Async [...]
           <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
@@ -11373,7 +11381,7 @@ service.</div>
 <div class="block">Perform a bulk load of the given directory into the given pre-existing table.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected <a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;<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>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>&gt;,<a href="https://docs [...]
 <td class="colLast"><span class="typeNameLabel">BulkLoadHFilesTool.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#groupOrSplit-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-org.apache.hbase.thirdparty.com.google.common.collect.Multimap-org.apache.hadoop.hbase.tool.BulkLoadHFiles.LoadQueueItem-java.util.List-">groupOrSplit</a></span>(<a href="../../../../../org/apache/hadoop/h [...]
             <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
@@ -11383,7 +11391,7 @@ service.</div>
 <div class="block">Attempt to assign the given load queue item into its target region group.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private <a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;org.apache.hbase.thirdparty.com.google.common.collect.Multimap&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop [...]
 <td class="colLast"><span class="typeNameLabel">BulkLoadHFilesTool.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#groupOrSplitPhase-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-java.util.concurrent.ExecutorService-java.util.Deque-java.util.List-">groupOrSplitPhase</a></span>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface  [...]
                  <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
@@ -11391,7 +11399,7 @@ service.</div>
                  <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Deque.html?is-external=true" title="class or interface in java.util">Deque</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>&gt;&nbsp;queue,
                  <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>&lt;<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;byte[],byte[]&gt;&gt;&nbsp;startEndKeys)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><span class="typeNameLabel">BulkLoadHFilesTool.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#loadHFileQueue-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-java.util.Deque-boolean-">loadHFileQueue</a></span>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.client">AsyncClusterCon [...]
               <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
@@ -11400,7 +11408,7 @@ service.</div>
 <div class="block">Used by the replication sink to load the hfiles from the source cluster.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private <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>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt; [...]
 <td class="colLast"><span class="typeNameLabel">BulkLoadHFilesTool.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#performBulkLoad-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-java.util.Deque-java.util.concurrent.ExecutorService-boolean-">performBulkLoad</a></span>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apac [...]
                <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
@@ -11408,7 +11416,7 @@ service.</div>
                <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ExecutorService.html?is-external=true" title="class or interface in java.util.concurrent">ExecutorService</a>&nbsp;pool,
                boolean&nbsp;copyFile)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><span class="typeNameLabel">BulkLoadHFilesTool.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#prepareHFileQueue-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-java.util.Map-java.util.Deque-boolean-">prepareHFileQueue</a></span>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.cli [...]
                  <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
@@ -11420,7 +11428,7 @@ service.</div>
  families in it.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><span class="typeNameLabel">BulkLoadHFilesTool.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#prepareHFileQueue-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-org.apache.hadoop.fs.Path-java.util.Deque-boolean-boolean-">prepareHFileQueue</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                  <a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.client">AsyncClusterConnection</a>&nbsp;conn,
@@ -11434,16 +11442,16 @@ service.</div>
  families in it.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private void</code></td>
 <td class="colLast"><span class="typeNameLabel">BulkLoadHFilesTool.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#tableExists-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-">tableExists</a></span>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.client">AsyncClusterConnection</a>&nbsp;conn,
            <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName)</code>&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><code>private void</code></td>
 <td class="colLast"><span class="typeNameLabel">BulkLoadHFilesTool.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#throwAndLogTableNotFoundException-org.apache.hadoop.hbase.TableName-">throwAndLogTableNotFoundException</a></span>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tn)</code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>protected <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true" title="class or interface in java.util.concurrent">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apach [...]
 <td class="colLast"><span class="typeNameLabel">BulkLoadHFilesTool.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#tryAtomicRegionLoad-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-boolean-byte:A-java.util.Collection-">tryAtomicRegionLoad</a></span>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.c [...]
                    <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
diff --git a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
index 9af1b35..f64cf2f 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
@@ -453,25 +453,25 @@
 <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>&lt;E&gt; (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>&lt;T&gt;, 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.client.<a href="../../../../../org/apache/hadoop/hbase/client/MobCompactPartitionPolicy.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">MobCompactPartitionPolicy</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">TableState.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Consistency.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Consistency</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/RegionLocateType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">RegionLocateType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/LogQueryFilter.FilterByOperator.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">LogQueryFilter.FilterByOperator</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Scan.ReadType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Scan.ReadType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanResumerState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/CompactionState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">CompactionState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/ServerType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">ServerType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/SnapshotType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">SnapshotType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/MobCompactPartitionPolicy.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">MobCompactPartitionPolicy</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/CompactType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">CompactType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AbstractResponse.ResponseType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AbstractResponse.ResponseType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">MasterSwitchType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/TableState.State.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">TableState.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/RequestController.ReturnCode.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">RequestController.ReturnCode</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/CatalogReplicaMode.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">CatalogReplicaMode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/ServerType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">ServerType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/RegionLocateType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">RegionLocateType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/LogQueryFilter.Type.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">LogQueryFilter.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Scan.ReadType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Scan.ReadType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/LogQueryFilter.FilterByOperator.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">LogQueryFilter.FilterByOperator</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/RequestController.ReturnCode.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">RequestController.ReturnCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">IsolationLevel</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/SnapshotType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">SnapshotType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">AsyncScanSingleRegionRpcRetryingCaller.ScanControllerState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/Durability.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">Durability</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/CompactionState.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">CompactionState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/IsolationLevel.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">IsolationLevel</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/MasterSwitchType.html" title="enum in org.apache.hadoop.hbase.client"><span class="typeNameLink">MasterSwitchType</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/coprocessor/package-tree.html b/devapidocs/org/apache/hadoop/hbase/coprocessor/package-tree.html
index 6b1ffff..b99c6c6 100644
--- a/devapidocs/org/apache/hadoop/hbase/coprocessor/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/coprocessor/package-tree.html
@@ -181,8 +181,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>&lt;E&gt; (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>&lt;T&gt;, 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.coprocessor.<a href="../../../../../org/apache/hadoop/hbase/coprocessor/MetaTableMetrics.MetaTableOps.html" title="enum in org.apache.hadoop.hbase.coprocessor"><span class="typeNameLink">MetaTableMetrics.MetaTableOps</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.coprocessor.<a href="../../../../../org/apache/hadoop/hbase/coprocessor/RegionObserver.MutationType.html" title="enum in org.apache.hadoop.hbase.coprocessor"><span class="typeNameLink">RegionObserver.MutationType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.coprocessor.<a href="../../../../../org/apache/hadoop/hbase/coprocessor/MetaTableMetrics.MetaTableOps.html" title="enum in org.apache.hadoop.hbase.coprocessor"><span class="typeNameLink">MetaTableMetrics.MetaTableOps</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html b/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html
index 0192935..880a54a 100644
--- a/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/executor/package-tree.html
@@ -104,8 +104,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>&lt;E&gt; (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>&lt;T&gt;, 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.executor.<a href="../../../../../org/apache/hadoop/hbase/executor/ExecutorType.html" title="enum in org.apache.hadoop.hbase.executor"><span class="typeNameLink">ExecutorType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.executor.<a href="../../../../../org/apache/hadoop/hbase/executor/EventType.html" title="enum in org.apache.hadoop.hbase.executor"><span class="typeNameLink">EventType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.executor.<a href="../../../../../org/apache/hadoop/hbase/executor/ExecutorType.html" title="enum in org.apache.hadoop.hbase.executor"><span class="typeNameLink">ExecutorType</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html b/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
index 72f7e90..323c5c1 100644
--- a/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
@@ -191,12 +191,12 @@
 <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>&lt;E&gt; (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>&lt;T&gt;, 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.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.Order.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FuzzyRowFilter.Order</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">BitComparator.BitwiseOp</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">Filter.ReturnCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FilterWrapper.FilterRowRetCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FilterWrapper.FilterRowRetCode</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.SatisfiesCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FuzzyRowFilter.SatisfiesCode</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/RegexStringComparator.EngineType.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">RegexStringComparator.EngineType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FuzzyRowFilter.SatisfiesCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FuzzyRowFilter.SatisfiesCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/Filter.ReturnCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">Filter.ReturnCode</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FilterList.Operator.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FilterList.Operator</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/FilterWrapper.FilterRowRetCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FilterWrapper.FilterRowRetCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.filter.<a href="../../../../../org/apache/hadoop/hbase/filter/BitComparator.BitwiseOp.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">BitComparator.BitwiseOp</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/hbtop/terminal/package-tree.html b/devapidocs/org/apache/hadoop/hbase/hbtop/terminal/package-tree.html
index b8f3866..007e90f 100644
--- a/devapidocs/org/apache/hadoop/hbase/hbtop/terminal/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/hbtop/terminal/package-tree.html
@@ -107,8 +107,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>&lt;E&gt; (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>&lt;T&gt;, 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.hbtop.terminal.<a href="../../../../../../org/apache/hadoop/hbase/hbtop/terminal/Color.html" title="enum in org.apache.hadoop.hbase.hbtop.terminal"><span class="typeNameLink">Color</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.hbtop.terminal.<a href="../../../../../../org/apache/hadoop/hbase/hbtop/terminal/KeyPress.Type.html" title="enum in org.apache.hadoop.hbase.hbtop.terminal"><span class="typeNameLink">KeyPress.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.hbtop.terminal.<a href="../../../../../../org/apache/hadoop/hbase/hbtop/terminal/Color.html" title="enum in org.apache.hadoop.hbase.hbtop.terminal"><span class="typeNameLink">Color</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/http/package-tree.html b/devapidocs/org/apache/hadoop/hbase/http/package-tree.html
index 6e8998a..d5349b6 100644
--- a/devapidocs/org/apache/hadoop/hbase/http/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/http/package-tree.html
@@ -141,8 +141,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>&lt;E&gt; (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>&lt;T&gt;, 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.http.<a href="../../../../../org/apache/hadoop/hbase/http/ProfileServlet.Event.html" title="enum in org.apache.hadoop.hbase.http"><span class="typeNameLink">ProfileServlet.Event</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.http.<a href="../../../../../org/apache/hadoop/hbase/http/HttpConfig.Policy.html" title="enum in org.apache.hadoop.hbase.http"><span class="typeNameLink">HttpConfig.Policy</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.http.<a href="../../../../../org/apache/hadoop/hbase/http/ProfileServlet.Output.html" title="enum in org.apache.hadoop.hbase.http"><span class="typeNameLink">ProfileServlet.Output</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.http.<a href="../../../../../org/apache/hadoop/hbase/http/HttpConfig.Policy.html" title="enum in org.apache.hadoop.hbase.http"><span class="typeNameLink">HttpConfig.Policy</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
index 16ba459..0330227 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
@@ -301,12 +301,12 @@
 <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>&lt;E&gt; (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>&lt;T&gt;, 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.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheFactory.ExternalBlockCaches.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockCacheFactory.ExternalBlockCaches</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/ReaderContext.ReaderType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">ReaderContext.ReaderType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockPriority.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockPriority</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.BlockCategory.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockType.BlockCategory</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockCacheFactory.ExternalBlockCaches.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockCacheFactory.ExternalBlockCaches</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/HFileBlock.Writer.State.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">HFileBlock.Writer.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/BlockPriority.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockPriority</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html b/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
index d5356e8..17eaa68 100644
--- a/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/ipc/package-tree.html
@@ -356,8 +356,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>&lt;E&gt; (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>&lt;T&gt;, 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.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.SourceStorage.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">MetricsHBaseServerSourceFactoryImpl.SourceStorage</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/CallEvent.Type.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">CallEvent.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/MetricsHBaseServerSourceFactoryImpl.SourceStorage.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">MetricsHBaseServerSourceFactoryImpl.SourceStorage</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.ipc.<a href="../../../../../org/apache/hadoop/hbase/ipc/BufferCallBeforeInitHandler.BufferCallAction.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">BufferCallBeforeInitHandler.BufferCallAction</span></a></li>
 </ul>
 </li>
diff --git a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
index bab2437..61bf661 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
@@ -297,10 +297,10 @@
 <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>&lt;E&gt; (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>&lt;T&gt;, 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.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/TableSplit.Version.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">TableSplit.Version</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/WALPlayer.Counter.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">WALPlayer.Counter</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/RowCounter.RowCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">RowCounter.RowCounterMapper.Counters</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/SyncTable.SyncMapper.Counter.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">SyncTable.SyncMapper.Counter</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/CellCounter.CellCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">CellCounter.CellCounterMapper.Counters</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.mapreduce.<a href="../../../../../org/apache/hadoop/hbase/mapreduce/WALPlayer.Counter.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">WALPlayer.Counter</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/master/HMaster.html b/devapidocs/org/apache/hadoop/hbase/master/HMaster.html
index e1f1725..be80eaf 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/HMaster.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/HMaster.html
@@ -5006,7 +5006,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/MasterServices
 <ul class="blockList">
 <li class="blockList">
 <h4>decorateMasterConfiguration</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3640">decorateMasterConfiguration</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3647">decorateMasterConfiguration</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 <div class="block">This method modifies the master's configuration in order to inject replication-related features</div>
 </li>
 </ul>
@@ -5016,7 +5016,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/MasterServices
 <ul class="blockList">
 <li class="blockList">
 <h4>getSnapshotQuotaObserverChore</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/quotas/SnapshotQuotaObserverChore.html" title="class in org.apache.hadoop.hbase.quotas">SnapshotQuotaObserverChore</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3655">getSnapshotQuotaObserverChore</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/quotas/SnapshotQuotaObserverChore.html" title="class in org.apache.hadoop.hbase.quotas">SnapshotQuotaObserverChore</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3662">getSnapshotQuotaObserverChore</a>()</pre>
 </li>
 </ul>
 <a name="getSyncReplicationReplayWALManager--">
@@ -5025,7 +5025,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/MasterServices
 <ul class="blockList">
 <li class="blockList">
 <h4>getSyncReplicationReplayWALManager</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/master/replication/SyncReplicationReplayWALManager.html" title="class in org.apache.hadoop.hbase.master.replication">SyncReplicationReplayWALManager</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3660">getSyncReplicationReplayWALManager</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/master/replication/SyncReplicationReplayWALManager.html" title="class in org.apache.hadoop.hbase.master.replication">SyncReplicationReplayWALManager</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3667">getSyncReplicationReplayWALManager</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/master/MasterServices.html#getSyncReplicationReplayWALManager--">MasterServices</a></code></span></div>
 <div class="block">Returns the <a href="../../../../../org/apache/hadoop/hbase/master/replication/SyncReplicationReplayWALManager.html" title="class in org.apache.hadoop.hbase.master.replication"><code>SyncReplicationReplayWALManager</code></a>.</div>
 <dl>
@@ -5040,7 +5040,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/MasterServices
 <ul class="blockList">
 <li class="blockList">
 <h4>getWalGroupsReplicationStatus</h4>
-<pre>public&nbsp;<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>&lt;<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="../../../../../org/apache/hadoop/hbase/replication/regionserver/ReplicationStatus.html" title="class in org.apache.hadoop.hbase.replication.regionserver">ReplicationStatus</a>&gt;&nbsp; [...]
+<pre>public&nbsp;<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>&lt;<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="../../../../../org/apache/hadoop/hbase/replication/regionserver/ReplicationStatus.html" title="class in org.apache.hadoop.hbase.replication.regionserver">ReplicationStatus</a>&gt;&nbsp; [...]
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#getWalGroupsReplicationStatus--">getWalGroupsReplicationStatus</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html" title="class in org.apache.hadoop.hbase.regionserver">HRegionServer</a></code></dd>
@@ -5053,7 +5053,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/MasterServices
 <ul class="blockList">
 <li class="blockList">
 <h4>getHbckChore</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/master/HbckChore.html" title="class in org.apache.hadoop.hbase.master">HbckChore</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3672">getHbckChore</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/master/HbckChore.html" title="class in org.apache.hadoop.hbase.master">HbckChore</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3679">getHbckChore</a>()</pre>
 </li>
 </ul>
 <a name="getClusterId--">
@@ -5062,7 +5062,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/MasterServices
 <ul class="blockList">
 <li class="blockList">
 <h4>getClusterId</h4>
-<pre>public&nbsp;<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>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3677">getClusterId</a>()</pre>
+<pre>public&nbsp;<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>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3684">getClusterId</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html#getClusterId--">getClusterId</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/HRegionServer.html" title="class in org.apache.hadoop.hbase.regionserver">HRegionServer</a></code></dd>
@@ -5075,7 +5075,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/MasterServices
 <ul class="blockList">
 <li class="blockList">
 <h4>getActiveMaster</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Optional.html?is-external=true" title="class or interface in java.util">Optional</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3684">getActiveMaster</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Optional.html?is-external=true" title="class or interface in java.util">Optional</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class in org.apache.hadoop.hbase">ServerName</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3691">getActiveMaster</a>()</pre>
 </li>
 </ul>
 <a name="runReplicationBarrierCleaner--">
@@ -5084,7 +5084,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/MasterServices
 <ul class="blockList">
 <li class="blockList">
 <h4>runReplicationBarrierCleaner</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3689">runReplicationBarrierCleaner</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3696">runReplicationBarrierCleaner</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/master/MasterServices.html#runReplicationBarrierCleaner--">MasterServices</a></code></span></div>
 <div class="block">Run the ReplicationBarrierChore.</div>
 <dl>
@@ -5099,7 +5099,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/MasterServices
 <ul class="blockList">
 <li class="blockList">
 <h4>getMetaRegionLocationCache</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/master/MetaRegionLocationCache.html" title="class in org.apache.hadoop.hbase.master">MetaRegionLocationCache</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3696">getMetaRegionLocationCache</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/master/MetaRegionLocationCache.html" title="class in org.apache.hadoop.hbase.master">MetaRegionLocationCache</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3703">getMetaRegionLocationCache</a>()</pre>
 </li>
 </ul>
 <a name="getRSGroupInfoManager--">
@@ -5108,7 +5108,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/MasterServices
 <ul class="blockList">
 <li class="blockList">
 <h4>getRSGroupInfoManager</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfoManager.html" title="interface in org.apache.hadoop.hbase.rsgroup">RSGroupInfoManager</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3701">getRSGroupInfoManager</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfoManager.html" title="interface in org.apache.hadoop.hbase.rsgroup">RSGroupInfoManager</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3708">getRSGroupInfoManager</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/master/MasterServices.html#getRSGroupInfoManager--">getRSGroupInfoManager</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a></code></dd>
@@ -5123,7 +5123,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/MasterServices
 <ul class="blockList">
 <li class="blockList">
 <h4>getCompactionState</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/CompactionState.html" title="enum in org.apache.hadoop.hbase.client">CompactionState</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3711">getCompactionState</a>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName)</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/CompactionState.html" title="enum in org.apache.hadoop.hbase.client">CompactionState</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3718">getCompactionState</a>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName)</pre>
 <div class="block">Get the compaction state of the table</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -5139,7 +5139,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/master/MasterServices
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getMetaLocationSyncer</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/master/zksyncer/MetaLocationSyncer.html" title="class in org.apache.hadoop.hbase.master.zksyncer">MetaLocationSyncer</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3749">getMetaLocationSyncer</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/master/zksyncer/MetaLocationSyncer.html" title="class in org.apache.hadoop.hbase.master.zksyncer">MetaLocationSyncer</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/master/HMaster.html#line.3756">getMetaLocationSyncer</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/master/MasterServices.html#getMetaLocationSyncer--">MasterServices</a></code></span></div>
 <div class="block">Get the meta location syncer.
  <p/>
diff --git a/devapidocs/org/apache/hadoop/hbase/master/assignment/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/assignment/package-tree.html
index 5c89e3f..f8add9f 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/assignment/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/assignment/package-tree.html
@@ -151,8 +151,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>&lt;E&gt; (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>&lt;T&gt;, 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.master.assignment.<a href="../../../../../../org/apache/hadoop/hbase/master/assignment/TransitRegionStateProcedure.TransitionType.html" title="enum in org.apache.hadoop.hbase.master.assignment"><span class="typeNameLink">TransitRegionStateProcedure.TransitionType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.assignment.<a href="../../../../../../org/apache/hadoop/hbase/master/assignment/ServerState.html" title="enum in org.apache.hadoop.hbase.master.assignment"><span class="typeNameLink">ServerState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.assignment.<a href="../../../../../../org/apache/hadoop/hbase/master/assignment/TransitRegionStateProcedure.TransitionType.html" title="enum in org.apache.hadoop.hbase.master.assignment"><span class="typeNameLink">TransitRegionStateProcedure.TransitionType</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
index 4f35479..b894e67 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
@@ -339,12 +339,12 @@
 <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>&lt;E&gt; (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>&lt;T&gt;, 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.master.<a href="../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">RegionState.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/ServerManager.ServerLiveState.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">ServerManager.ServerLiveState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.BalanceSwitchMode.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">MasterRpcServices.BalanceSwitchMode</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MetaRegionLocationCache.ZNodeOpType.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">MetaRegionLocationCache.ZNodeOpType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MetricsMasterSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">MetricsMasterSourceFactoryImpl.FactoryStorage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/RegionState.State.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">RegionState.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.ResubmitDirective.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">SplitLogManager.ResubmitDirective</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.BalanceSwitchMode.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">MasterRpcServices.BalanceSwitchMode</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.<a href="../../../../../org/apache/hadoop/hbase/master/SplitLogManager.TerminationStatus.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">SplitLogManager.TerminationStatus</span></a></li>
 </ul>
 </li>
diff --git a/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
index 7219f2a..616d87c 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/procedure/package-tree.html
@@ -222,10 +222,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>&lt;E&gt; (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>&lt;T&gt;, 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.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MetaProcedureInterface.MetaOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">MetaProcedureInterface.MetaOperationType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/ServerProcedureInterface.ServerOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">ServerProcedureInterface.ServerOperationType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/TableProcedureInterface.TableOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">TableProcedureInterface.TableOperationType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/PeerProcedureInterface.PeerOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">PeerProcedureInterface.PeerOperationType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/MetaProcedureInterface.MetaOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">MetaProcedureInterface.MetaOperationType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.master.procedure.<a href="../../../../../../org/apache/hadoop/hbase/master/procedure/TableProcedureInterface.TableOperationType.html" title="enum in org.apache.hadoop.hbase.master.procedure"><span class="typeNameLink">TableProcedureInterface.TableOperationType</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/package-tree.html b/devapidocs/org/apache/hadoop/hbase/package-tree.html
index 3ddac43..dd3350f 100644
--- a/devapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -431,19 +431,19 @@
 <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>&lt;E&gt; (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>&lt;T&gt;, 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/Size.Unit.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Size.Unit</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterMetrics.Option.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClusterMetrics.Option</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClientMetaTableAccessor.QueryType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClientMetaTableAccessor.QueryType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Coprocessor.State.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Coprocessor.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeepDeletedCells.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeepDeletedCells</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HConstants.OperationStatusCode.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HConstants.OperationStatusCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompareOperator.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CompareOperator</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HealthChecker.HealthCheckerExitStatus.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HealthChecker.HealthCheckerExitStatus</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Cell.Type.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Cell.Type</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MemoryCompactionPolicy.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">MemoryCompactionPolicy</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeyValue.Type.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeyValue.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HealthChecker.HealthCheckerExitStatus.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HealthChecker.HealthCheckerExitStatus</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Size.Unit.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Size.Unit</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CellBuilderType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CellBuilderType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClientMetaTableAccessor.QueryType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClientMetaTableAccessor.QueryType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompatibilitySingletonFactory.SingletonStorage.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CompatibilitySingletonFactory.SingletonStorage</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/CompareOperator.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">CompareOperator</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/MemoryCompactionPolicy.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">MemoryCompactionPolicy</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/KeepDeletedCells.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">KeepDeletedCells</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/Coprocessor.State.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Coprocessor.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterMetrics.Option.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClusterMetrics.Option</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index dd756fb..2b4cad4 100644
--- a/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -216,11 +216,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>&lt;E&gt; (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>&lt;T&gt;, 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/Procedure.LockState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">Procedure.LockState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/RootProcedureState.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">RootProcedureState.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/LockedResourceType.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">LockedResourceType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">StateMachineProcedure.Flow</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/LockType.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">LockType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">StateMachineProcedure.Flow</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/Procedure.LockState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">Procedure.LockState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/RootProcedureState.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">RootProcedureState.State</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html b/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
index e91d4a9..7d1f3e0 100644
--- a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
@@ -240,11 +240,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>&lt;E&gt; (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>&lt;T&gt;, 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.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">OperationQuota.OperationType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaScope.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">QuotaScope</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/ThrottleType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">ThrottleType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/RpcThrottlingException.Type.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">RpcThrottlingException.Type</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/SpaceViolationPolicy.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">SpaceViolationPolicy</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaScope.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">QuotaScope</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/OperationQuota.OperationType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">OperationQuota.OperationType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.quotas.<a href="../../../../../org/apache/hadoop/hbase/quotas/QuotaType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">QuotaType</span></a></li>
 </ul>
 </li>
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index a0d2c76..77097f6 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -733,19 +733,19 @@
 <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>&lt;E&gt; (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>&lt;T&gt;, 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/TimeRangeTracker.Type.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TimeRangeTracker.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.Operation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">Region.Operation</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ChunkCreator.ChunkType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ChunkCreator.ChunkType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/BloomType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">BloomType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DefaultHeapMemoryTuner.StepDirection.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DefaultHeapMemoryTuner.StepDirection</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/HRegion.FlushResult.Result.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">HRegion.FlushResult.Result</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.NextState</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">CompactingMemStore.IndexType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.LimitScope</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/FlushType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">FlushType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScanType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MetricsRegionServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MetricsRegionServerSourceFactoryImpl.FactoryStorage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ChunkCreator.ChunkType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ChunkCreator.ChunkType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/Region.Operation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">Region.Operation</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/SplitLogWorker.TaskExecutor.Status.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">SplitLogWorker.TaskExecutor.Status</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/BloomType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">BloomType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScanType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreCompactionStrategy.Action.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">MemStoreCompactionStrategy.Action</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/FlushType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">FlushType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.LimitScope.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.LimitScope</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScannerContext.NextState.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">ScannerContext.NextState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/CompactingMemStore.IndexType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">CompactingMemStore.IndexType</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
index bd7348f..e1c6d6d 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
@@ -130,8 +130,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>&lt;E&gt; (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>&lt;T&gt;, 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.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/StripeCompactionScanQueryMatcher.DropDeletesInOutput.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">StripeCompactionScanQueryMatcher.DropDeletesInOutput</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/ScanQueryMatcher.MatchCode.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">ScanQueryMatcher.MatchCode</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/StripeCompactionScanQueryMatcher.DropDeletesInOutput.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">StripeCompactionScanQueryMatcher.DropDeletesInOutput</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.querymatcher.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/querymatcher/DeleteTracker.DeleteResult.html" title="enum in org.apache.hadoop.hbase.regionserver.querymatcher"><span class="typeNameLink">DeleteTracker.DeleteResult</span></a></li>
 </ul>
 </li>
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html
index 7c5c42b..7ad3626 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/wal/package-tree.html
@@ -247,10 +247,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>&lt;E&gt; (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>&lt;T&gt;, 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.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/CompressionContext.DictionaryIndex.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">CompressionContext.DictionaryIndex</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/RingBufferTruck.Type.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">RingBufferTruck.Type</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.RollRequestReason.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">WALActionsListener.RollRequestReason</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/CompressionContext.DictionaryIndex.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">CompressionContext.DictionaryIndex</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/ProtobufLogReader.WALHdrResult.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">ProtobufLogReader.WALHdrResult</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.wal.<a href="../../../../../../org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.RollRequestReason.html" title="enum in org.apache.hadoop.hbase.regionserver.wal"><span class="typeNameLink">WALActionsListener.RollRequestReason</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html
index 7d42508..021ffd5 100644
--- a/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/replication/regionserver/package-tree.html
@@ -219,8 +219,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>&lt;E&gt; (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>&lt;T&gt;, 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.replication.regionserver.<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.WorkerState.html" title="enum in org.apache.hadoop.hbase.replication.regionserver"><span class="typeNameLink">ReplicationSourceShipper.WorkerState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.replication.regionserver.<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/MetricsReplicationSourceFactoryImpl.SourceHolder.html" title="enum in org.apache.hadoop.hbase.replication.regionserver"><span class="typeNameLink">MetricsReplicationSourceFactoryImpl.SourceHolder</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.replication.regionserver.<a href="../../../../../../org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceShipper.WorkerState.html" title="enum in org.apache.hadoop.hbase.replication.regionserver"><span class="typeNameLink">ReplicationSourceShipper.WorkerState</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
index ea9a5e1..40ed875 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
@@ -162,11 +162,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>&lt;E&gt; (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>&lt;T&gt;, 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.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlFilter.Strategy.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">AccessControlFilter.Strategy</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessController.OpType.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">AccessController.OpType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/SnapshotScannerHDFSAclHelper.HDFSAclOperation.OperationType.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">SnapshotScannerHDFSAclHelper.HDFSAclOperation.OperationType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/Permission.Scope.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">Permission.Scope</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/SnapshotScannerHDFSAclHelper.HDFSAclOperation.AclType.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">SnapshotScannerHDFSAclHelper.HDFSAclOperation.AclType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/Permission.Scope.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">Permission.Scope</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessControlFilter.Strategy.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">AccessControlFilter.Strategy</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/AccessController.OpType.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">AccessController.OpType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.access.<a href="../../../../../../org/apache/hadoop/hbase/security/access/Permission.Action.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">Permission.Action</span></a></li>
 </ul>
 </li>
diff --git a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
index 76d4bcb..c060011 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
@@ -189,9 +189,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>&lt;E&gt; (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>&lt;T&gt;, 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.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">SaslUtil.QualityOfProtection</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslStatus.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">SaslStatus</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/AuthMethod.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">AuthMethod</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.security.<a href="../../../../../org/apache/hadoop/hbase/security/SaslUtil.QualityOfProtection.html" title="enum in org.apache.hadoop.hbase.security"><span class="typeNameLink">SaslUtil.QualityOfProtection</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html b/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
index adc046f..60fa9ee 100644
--- a/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
@@ -211,9 +211,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>&lt;E&gt; (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>&lt;T&gt;, 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.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">MetricsThriftServerSourceFactoryImpl.FactoryStorage</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ImplType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">ImplType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ThriftMetrics.ThriftServerType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">ThriftMetrics.ThriftServerType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/ImplType.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">ImplType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.thrift.<a href="../../../../../org/apache/hadoop/hbase/thrift/MetricsThriftServerSourceFactoryImpl.FactoryStorage.html" title="enum in org.apache.hadoop.hbase.thrift"><span class="typeNameLink">MetricsThriftServerSourceFactoryImpl.FactoryStorage</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html b/devapidocs/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html
index 2c94720..a2f1a8d 100644
--- a/devapidocs/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html
+++ b/devapidocs/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":9,"i6":10,"i7":10,"i8":10,"i9":9,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":9,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":9,"i24":10,"i25":9,"i26":9,"i27":9,"i28":10,"i29":10,"i30":10,"i31":9,"i32":10,"i33":9,"i34":10,"i35":10,"i36":10,"i37":10,"i38":9,"i39":9};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":9,"i7":10,"i8":10,"i9":10,"i10":9,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":9,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":9,"i26":10,"i27":9,"i28":9,"i29":9,"i30":10,"i31":10,"i32":10,"i33":9,"i34":10,"i35":9,"i36":10,"i37":10,"i38":10,"i39":10,"i40":9,"i41":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -303,12 +303,20 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 </tr>
 <tr id="i4" class="altColor">
 <td class="colFirst"><code>private void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#checkRegionIndexValid-int-java.util.List-org.apache.hadoop.hbase.TableName-">checkRegionIndexValid</a></span>(int&nbsp;idx,
+                     <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>&lt;<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;byte[],byte[]&gt;&gt;&nbsp;startEndKeys,
+                     <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName)</code>
+<div class="block">we can consider there is a region hole or overlap in following conditions.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>private void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#cleanup-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-java.util.Deque-java.util.concurrent.ExecutorService-">cleanup</a></span>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.client">AsyncClusterConnection</a>&nbsp;conn,
        <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
        <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Deque.html?is-external=true" title="class or interface in java.util">Deque</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>&gt;&nbsp;queue,
        <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ExecutorService.html?is-external=true" title="class or interface in java.util.concurrent">ExecutorService</a>&nbsp;pool)</code>&nbsp;</td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code>private static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#copyHFileHalf-org.apache.hadoop.conf.Configuration-org.apache.hadoop.fs.Path-org.apache.hadoop.fs.Path-org.apache.hadoop.hbase.io.Reference-org.apache.hadoop.hbase.client.ColumnFamilyDescriptor-">copyHFileHalf</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
              org.apache.hadoop.fs.Path&nbsp;inFile,
@@ -318,11 +326,11 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <div class="block">Copy half of an HFile into a new HFile.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code>private <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ExecutorService.html?is-external=true" title="class or interface in java.util.concurrent">ExecutorService</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#createExecutorService--">createExecutorService</a></span>()</code>&nbsp;</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/tool/BulkLoadHFilesTool.html#createTable-org.apache.hadoop.hbase.TableName-org.apache.hadoop.fs.Path-org.apache.hadoop.hbase.client.AsyncAdmin-">createTable</a></span>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
            org.apache.hadoop.fs.Path&nbsp;hfofDir,
@@ -330,14 +338,14 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <div class="block">If the table is created for the first time, then "completebulkload" reads the files twice.</div>
 </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/tool/BulkLoadHFilesTool.html#disableReplication--">disableReplication</a></span>()</code>
 <div class="block">Disables replication for all bulkloads done via this instance,
  when bulkload replication is configured.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code>private static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#discoverLoadQueue-org.apache.hadoop.conf.Configuration-java.util.Deque-org.apache.hadoop.fs.Path-boolean-">discoverLoadQueue</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                  <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Deque.html?is-external=true" title="class or interface in java.util">Deque</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>&gt;&nbsp;ret,
@@ -346,7 +354,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <div class="block">Walk the given directory for all HFiles, and return a Queue containing all such files.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code>private <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>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt; [...]
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#doBulkLoad-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-java.util.Map-boolean-boolean-">doBulkLoad</a></span>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.client">AsyncClusterConnection</a>&nbsp;conn,
           <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
@@ -356,7 +364,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <div class="block">Perform a bulk load of the given map of families to hfiles into the given pre-existing table.</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>private <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>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt; [...]
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#doBulkLoad-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-org.apache.hadoop.fs.Path-boolean-boolean-">doBulkLoad</a></span>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.client">AsyncClusterConnection</a>&nbsp;conn,
           <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
@@ -366,15 +374,20 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <div class="block">Perform a bulk load of the given directory into the given pre-existing table.</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>private int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#getRegionIndex-java.util.List-byte:A-">getRegionIndex</a></span>(<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>&lt;<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;byte[],byte[]&gt;&gt;&nbsp;start [...]
+              byte[]&nbsp;key)</code>&nbsp;</td>
+</tr>
+<tr id="i14" class="altColor">
 <td class="colFirst"><code>private <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 class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#getUniqueName--">getUniqueName</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code>private <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>&lt;byte[],<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueue [...]
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#groupByFamilies-java.util.Collection-">groupByFamilies</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoa [...]
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code>protected <a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;<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>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>&gt;,<a href="https://docs [...]
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#groupOrSplit-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-org.apache.hbase.thirdparty.com.google.common.collect.Multimap-org.apache.hadoop.hbase.tool.BulkLoadHFiles.LoadQueueItem-java.util.List-">groupOrSplit</a></span>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interf [...]
             <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
@@ -384,7 +397,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <div class="block">Attempt to assign the given load queue item into its target region group.</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code>private <a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;org.apache.hbase.thirdparty.com.google.common.collect.Multimap&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop [...]
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#groupOrSplitPhase-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-java.util.concurrent.ExecutorService-java.util.Deque-java.util.List-">groupOrSplitPhase</a></span>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.client">AsyncClusterConnect [...]
                  <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
@@ -392,33 +405,33 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
                  <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Deque.html?is-external=true" title="class or interface in java.util">Deque</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>&gt;&nbsp;queue,
                  <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>&lt;<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;byte[],byte[]&gt;&gt;&nbsp;startEndKeys)</code>&nbsp;</td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i18" class="altColor">
 <td class="colFirst"><code>static byte[][]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#inferBoundaries-java.util.SortedMap-">inferBoundaries</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/SortedMap.html?is-external=true" title="class or interface in java.util">SortedMap</a>&lt;byte[],<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integ [...]
 <div class="block">Infers region boundaries for a new table.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#initialize--">initialize</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code>private boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#isAlwaysCopyFiles--">isAlwaysCopyFiles</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code>private boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#isCreateTable--">isCreateTable</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code>boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#isReplicationDisabled--">isReplicationDisabled</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code>private boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#isSilence--">isSilence</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i24" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#loadHFileQueue-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-java.util.Deque-boolean-">loadHFileQueue</a></span>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.client">AsyncClusterConnection</a>&nbsp;conn,
               <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
@@ -427,11 +440,11 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <div class="block">Used by the replication sink to load the hfiles from the source cluster.</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr id="i25" class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#main-java.lang.String:A-">main</a></span>(<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>[]&nbsp;args)</code>&nbsp;</td>
 </tr>
-<tr id="i24" class="altColor">
+<tr id="i26" class="altColor">
 <td class="colFirst"><code>private <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>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt; [...]
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#performBulkLoad-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-java.util.Deque-java.util.concurrent.ExecutorService-boolean-">performBulkLoad</a></span>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.client">AsyncClusterConnection</a>&nbsp;conn,
                <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
@@ -439,14 +452,14 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
                <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ExecutorService.html?is-external=true" title="class or interface in java.util.concurrent">ExecutorService</a>&nbsp;pool,
                boolean&nbsp;copyFile)</code>&nbsp;</td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr id="i27" class="rowColor">
 <td class="colFirst"><code>private static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#populateLoadQueue-java.util.Deque-java.util.Map-">populateLoadQueue</a></span>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Deque.html?is-external=true" title="class or interface in java.util">Deque</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">Bulk [...]
                  <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>&lt;byte[],<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>&lt;org.apache.hadoop.fs.Path&gt;&gt;&nbsp;map)</code>
 <div class="block">Populate the Queue with given HFiles</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr id="i28" class="altColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#prepareHFileQueue-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-java.util.Map-java.util.Deque-boolean-">prepareHFileQueue</a></span>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.client">AsyncClusterConnection</a>&nbsp;conn,
                  <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
@@ -458,7 +471,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
  families in it.</div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr id="i29" class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#prepareHFileQueue-org.apache.hadoop.conf.Configuration-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-org.apache.hadoop.fs.Path-java.util.Deque-boolean-boolean-">prepareHFileQueue</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                  <a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.client">AsyncClusterConnection</a>&nbsp;conn,
@@ -472,29 +485,29 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
  families in it.</div>
 </td>
 </tr>
-<tr id="i28" class="altColor">
+<tr id="i30" class="altColor">
 <td class="colFirst"><code>int</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#run-java.lang.String:A-">run</a></span>(<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>[]&nbsp;args)</code>&nbsp;</td>
 </tr>
-<tr id="i29" class="rowColor">
+<tr id="i31" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#setBulkToken-java.lang.String-">setBulkToken</a></span>(<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>&nbsp;bulkToken)</code>&nbsp;</td>
 </tr>
-<tr id="i30" class="altColor">
+<tr id="i32" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#setClusterIds-java.util.List-">setClusterIds</a></span>(<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>&lt;<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>&gt;&nbsp;clusterIds)< [...]
 </tr>
-<tr id="i31" class="rowColor">
+<tr id="i33" class="rowColor">
 <td class="colFirst"><code>private static boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#shouldCopyHFileMetaKey-byte:A-">shouldCopyHFileMetaKey</a></span>(byte[]&nbsp;key)</code>&nbsp;</td>
 </tr>
-<tr id="i32" class="altColor">
+<tr id="i34" class="altColor">
 <td class="colFirst"><code>private <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>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#splitStoreFile-org.apache.hadoop.hbase.tool.BulkLoadHFiles.LoadQueueItem-org.apache.hadoop.hbase.client.TableDescriptor-byte:A-">splitStoreFile</a></span>(<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>&nbsp;item,
               <a href="../../../../../org/apache/hadoop/hbase/client/TableDescriptor.html" title="interface in org.apache.hadoop.hbase.client">TableDescriptor</a>&nbsp;tableDesc,
               byte[]&nbsp;splitKey)</code>&nbsp;</td>
 </tr>
-<tr id="i33" class="rowColor">
+<tr id="i35" class="rowColor">
 <td class="colFirst"><code>(package private) static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#splitStoreFile-org.apache.hadoop.conf.Configuration-org.apache.hadoop.fs.Path-org.apache.hadoop.hbase.client.ColumnFamilyDescriptor-byte:A-org.apache.hadoop.fs.Path-org.apache.hadoop.fs.Path-">splitStoreFile</a></span>(org.apache.hadoop.conf.Configuration&nbsp;conf,
               org.apache.hadoop.fs.Path&nbsp;inFile,
@@ -506,16 +519,16 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
  filters, etc.</div>
 </td>
 </tr>
-<tr id="i34" class="altColor">
+<tr id="i36" class="altColor">
 <td class="colFirst"><code>private void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#tableExists-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-">tableExists</a></span>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.client">AsyncClusterConnection</a>&nbsp;conn,
            <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName)</code>&nbsp;</td>
 </tr>
-<tr id="i35" class="rowColor">
+<tr id="i37" class="rowColor">
 <td class="colFirst"><code>private void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#throwAndLogTableNotFoundException-org.apache.hadoop.hbase.TableName-">throwAndLogTableNotFoundException</a></span>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tn)</code>&nbsp;</td>
 </tr>
-<tr id="i36" class="altColor">
+<tr id="i38" class="altColor">
 <td class="colFirst"><code>protected <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CompletableFuture.html?is-external=true" title="class or interface in java.util.concurrent">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Collection.html?is-external=true" title="class or interface in java.util">Collection</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apach [...]
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#tryAtomicRegionLoad-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-boolean-byte:A-java.util.Collection-">tryAtomicRegionLoad</a></span>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.client">AsyncClusterConnection</a>&nbsp;conn,
                    <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
@@ -525,11 +538,11 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <div class="block">Attempts to do an atomic load of many hfiles into a region.</div>
 </td>
 </tr>
-<tr id="i37" class="rowColor">
+<tr id="i39" class="rowColor">
 <td class="colFirst"><code>private void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#usage--">usage</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i38" class="altColor">
+<tr id="i40" class="altColor">
 <td class="colFirst"><code>private static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#validateFamiliesInHFiles-org.apache.hadoop.hbase.client.TableDescriptor-java.util.Deque-boolean-">validateFamiliesInHFiles</a></span>(<a href="../../../../../org/apache/hadoop/hbase/client/TableDescriptor.html" title="interface in org.apache.hadoop.hbase.client">TableDescriptor</a>&nbsp;tableDesc,
                         <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Deque.html?is-external=true" title="class or interface in java.util">Deque</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>&gt;&nbsp;queue,
@@ -537,7 +550,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <div class="block">Checks whether there is any invalid family name in HFiles to be bulk loaded.</div>
 </td>
 </tr>
-<tr id="i39" class="rowColor">
+<tr id="i41" class="rowColor">
 <td class="colFirst"><code>private static &lt;TFamily&gt;&nbsp;void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#visitBulkHFiles-org.apache.hadoop.fs.FileSystem-org.apache.hadoop.fs.Path-org.apache.hadoop.hbase.tool.BulkLoadHFilesTool.BulkHFileVisitor-boolean-">visitBulkHFiles</a></span>(org.apache.hadoop.fs.FileSystem&nbsp;fs,
                org.apache.hadoop.fs.Path&nbsp;bulkDir,
@@ -1089,13 +1102,50 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 </dl>
 </li>
 </ul>
+<a name="getRegionIndex-java.util.List-byte:A-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getRegionIndex</h4>
+<pre>private&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.624">getRegionIndex</a>(<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>&lt;<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;byte[],byte[]&gt;&gt;&nbsp;startEndKeys,
+                           byte[]&nbsp;key)</pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>startEndKeys</code> - the start/end keys of regions belong to this table, the list in ascending
+          order by start key</dd>
+<dd><code>key</code> - the key need to find which region belong to</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>region index</dd>
+</dl>
+</li>
+</ul>
+<a name="checkRegionIndexValid-int-java.util.List-org.apache.hadoop.hbase.TableName-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>checkRegionIndexValid</h4>
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.640">checkRegionIndexValid</a>(int&nbsp;idx,
+                                   <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>&lt;<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;byte[],byte[]&gt;&gt;&nbsp;startEndKeys,
+                                   <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName)
+                            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">we can consider there is a region hole or overlap in following conditions. 1) if idx < 0,then
+ first region info is lost. 2) if the endkey of a region is not equal to the startkey of the
+ next region. 3) if the endkey of the last region is not empty.</div>
+<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>
+</dl>
+</li>
+</ul>
 <a name="groupOrSplit-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-org.apache.hbase.thirdparty.com.google.common.collect.Multimap-org.apache.hadoop.hbase.tool.BulkLoadHFiles.LoadQueueItem-java.util.List-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>groupOrSplit</h4>
-<pre>protected&nbsp;<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;<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>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>&gt;,<a href="https://docs.oracle.com/javas [...]
+<pre>protected&nbsp;<a href="../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;<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>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>&gt;,<a href="https://docs.oracle.com/javas [...]
                                                                        <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                                                                        org.apache.hbase.thirdparty.com.google.common.collect.Multimap&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>,<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>&gt;&nbsp;regionGroups,
                                                                        <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>&nbsp;item,
@@ -1118,7 +1168,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <ul class="blockList">
 <li class="blockList">
 <h4>splitStoreFile</h4>
-<pre>static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.703">splitStoreFile</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.721">splitStoreFile</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                            org.apache.hadoop.fs.Path&nbsp;inFile,
                            <a href="../../../../../org/apache/hadoop/hbase/client/ColumnFamilyDescriptor.html" title="interface in org.apache.hadoop.hbase.client">ColumnFamilyDescriptor</a>&nbsp;familyDesc,
                            byte[]&nbsp;splitKey,
@@ -1139,7 +1189,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <ul class="blockList">
 <li class="blockList">
 <h4>copyHFileHalf</h4>
-<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.716">copyHFileHalf</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
+<pre>private static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.734">copyHFileHalf</a>(org.apache.hadoop.conf.Configuration&nbsp;conf,
                                   org.apache.hadoop.fs.Path&nbsp;inFile,
                                   org.apache.hadoop.fs.Path&nbsp;outFile,
                                   <a href="../../../../../org/apache/hadoop/hbase/io/Reference.html" title="class in org.apache.hadoop.hbase.io">Reference</a>&nbsp;reference,
@@ -1158,7 +1208,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <ul class="blockList">
 <li class="blockList">
 <h4>inferBoundaries</h4>
-<pre>public static&nbsp;byte[][]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.788">inferBoundaries</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/SortedMap.html?is-external=true" title="class or interface in java.util">SortedMap</a>&lt;byte[],<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt;&nbsp;bdryMap)</pre>
+<pre>public static&nbsp;byte[][]&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.806">inferBoundaries</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/SortedMap.html?is-external=true" title="class or interface in java.util">SortedMap</a>&lt;byte[],<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt;&nbsp;bdryMap)</pre>
 <div class="block">Infers region boundaries for a new table.
  <p/>
  Parameter: <br/>
@@ -1187,7 +1237,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <ul class="blockList">
 <li class="blockList">
 <h4>createTable</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.814">createTable</a>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.832">createTable</a>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                          org.apache.hadoop.fs.Path&nbsp;hfofDir,
                          <a href="../../../../../org/apache/hadoop/hbase/client/AsyncAdmin.html" title="interface in org.apache.hadoop.hbase.client">AsyncAdmin</a>&nbsp;admin)
                   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>
@@ -1205,7 +1255,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <ul class="blockList">
 <li class="blockList">
 <h4>performBulkLoad</h4>
-<pre>private&nbsp;<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>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;<a href=".. [...]
+<pre>private&nbsp;<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>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;<a href=".. [...]
                                                                      <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                                                                      <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Deque.html?is-external=true" title="class or interface in java.util">Deque</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>&gt;&nbsp;queue,
                                                                      <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ExecutorService.html?is-external=true" title="class or interface in java.util.concurrent">ExecutorService</a>&nbsp;pool,
@@ -1223,7 +1273,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <ul class="blockList">
 <li class="blockList">
 <h4>cleanup</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.914">cleanup</a>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.client">AsyncClusterConnection</a>&nbsp;conn,
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.932">cleanup</a>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.client">AsyncClusterConnection</a>&nbsp;conn,
                      <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                      <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Deque.html?is-external=true" title="class or interface in java.util">Deque</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>&gt;&nbsp;queue,
                      <a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/ExecutorService.html?is-external=true" title="class or interface in java.util.concurrent">ExecutorService</a>&nbsp;pool)
@@ -1240,7 +1290,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <ul class="blockList">
 <li class="blockList">
 <h4>doBulkLoad</h4>
-<pre>private&nbsp;<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>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;<a href=".. [...]
+<pre>private&nbsp;<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>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;<a href=".. [...]
                                                                 <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                                                                 <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>&lt;byte[],<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>&lt;org.apache.hadoop.fs.Path&gt;&gt;&nbsp;map,
                                                                 boolean&nbsp;silence,
@@ -1265,7 +1315,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <ul class="blockList">
 <li class="blockList">
 <h4>doBulkLoad</h4>
-<pre>private&nbsp;<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>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;<a href=".. [...]
+<pre>private&nbsp;<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>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;<a href=".. [...]
                                                                 <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
                                                                 org.apache.hadoop.fs.Path&nbsp;hfofDir,
                                                                 boolean&nbsp;silence,
@@ -1291,7 +1341,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <ul class="blockList">
 <li class="blockList">
 <h4>bulkLoad</h4>
-<pre>public&nbsp;<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>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;<a href="../ [...]
+<pre>public&nbsp;<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>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;<a href="../ [...]
                                                              <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>&lt;byte[],<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>&lt;org.apache.hadoop.fs.Path&gt;&gt;&nbsp;family2Files)
                                                       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"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.html#bulkLoad-org.apache.hadoop.hbase.TableName-java.util.Map-">BulkLoadHFiles</a></code></span></div>
@@ -1314,7 +1364,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <ul class="blockList">
 <li class="blockList">
 <h4>bulkLoad</h4>
-<pre>public&nbsp;<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>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;<a href="../ [...]
+<pre>public&nbsp;<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>&lt;<a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>,<a href="https://docs.oracle.com/javase/8/docs/api/java/nio/ByteBuffer.html?is-external=true" title="class or interface in java.nio">ByteBuffer</a>&gt;&nbsp;<a href="../ [...]
                                                              org.apache.hadoop.fs.Path&nbsp;dir)
                                                       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"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.html#bulkLoad-org.apache.hadoop.hbase.TableName-org.apache.hadoop.fs.Path-">BulkLoadHFiles</a></code></span></div>
@@ -1338,7 +1388,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <ul class="blockList">
 <li class="blockList">
 <h4>tableExists</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.1039">tableExists</a>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.client">AsyncClusterConnection</a>&nbsp;conn,
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.1057">tableExists</a>(<a href="../../../../../org/apache/hadoop/hbase/client/AsyncClusterConnection.html" title="interface in org.apache.hadoop.hbase.client">AsyncClusterConnection</a>&nbsp;conn,
                          <a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName)
                   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>
@@ -1354,7 +1404,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <ul class="blockList">
 <li class="blockList">
 <h4>throwAndLogTableNotFoundException</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.1045">throwAndLogTableNotFoundException</a>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tn)
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.1063">throwAndLogTableNotFoundException</a>(<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tn)
                                         throws <a href="../../../../../org/apache/hadoop/hbase/TableNotFoundException.html" title="class in org.apache.hadoop.hbase">TableNotFoundException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -1368,7 +1418,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <ul class="blockList">
 <li class="blockList">
 <h4>setBulkToken</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.1051">setBulkToken</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>&nbsp;bulkToken)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.1069">setBulkToken</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>&nbsp;bulkToken)</pre>
 </li>
 </ul>
 <a name="setClusterIds-java.util.List-">
@@ -1377,7 +1427,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <ul class="blockList">
 <li class="blockList">
 <h4>setClusterIds</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.1055">setClusterIds</a>(<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>&lt;<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>&gt;&nbsp;clusterIds)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.1073">setClusterIds</a>(<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>&lt;<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>&gt;&nbsp;clusterIds)</pre>
 </li>
 </ul>
 <a name="usage--">
@@ -1386,7 +1436,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <ul class="blockList">
 <li class="blockList">
 <h4>usage</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.1059">usage</a>()</pre>
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.1077">usage</a>()</pre>
 </li>
 </ul>
 <a name="run-java.lang.String:A-">
@@ -1395,7 +1445,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <ul class="blockList">
 <li class="blockList">
 <h4>run</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.1076">run</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>[]&nbsp;args)
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.1094">run</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>[]&nbsp;args)
         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="overrideSpecifyLabel">Specified by:</span></dt>
@@ -1411,7 +1461,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <ul class="blockList">
 <li class="blockList">
 <h4>main</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.1105">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>[]&nbsp;args)
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.1123">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>[]&nbsp;args)
                  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>
@@ -1425,7 +1475,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <ul class="blockList">
 <li class="blockList">
 <h4>disableReplication</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.1112">disableReplication</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.1130">disableReplication</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.html#disableReplication--">BulkLoadHFiles</a></code></span></div>
 <div class="block">Disables replication for all bulkloads done via this instance,
  when bulkload replication is configured.</div>
@@ -1441,7 +1491,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.h
 <ul class="blockListLast">
 <li class="blockList">
 <h4>isReplicationDisabled</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.1117">isReplicationDisabled</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#line.1135">isReplicationDisabled</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.html#isReplicationDisabled--">isReplicationDisabled</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.html" title="interface in org.apache.hadoop.hbase.tool">BulkLoadHFiles</a></code></dd>
diff --git a/devapidocs/org/apache/hadoop/hbase/util/class-use/Pair.html b/devapidocs/org/apache/hadoop/hbase/util/class-use/Pair.html
index f6a0c2a..88daace 100644
--- a/devapidocs/org/apache/hadoop/hbase/util/class-use/Pair.html
+++ b/devapidocs/org/apache/hadoop/hbase/util/class-use/Pair.html
@@ -2229,6 +2229,19 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
 </tr>
 <tbody>
 <tr class="altColor">
+<td class="colFirst"><code>private void</code></td>
+<td class="colLast"><span class="typeNameLabel">BulkLoadHFilesTool.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#checkRegionIndexValid-int-java.util.List-org.apache.hadoop.hbase.TableName-">checkRegionIndexValid</a></span>(int&nbsp;idx,
+                     <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>&lt;<a href="../../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;byte[],byte[]&gt;&gt;&nbsp;startEndKeys,
+                     <a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName)</code>
+<div class="block">we can consider there is a region hole or overlap in following conditions.</div>
+</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>private int</code></td>
+<td class="colLast"><span class="typeNameLabel">BulkLoadHFilesTool.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#getRegionIndex-java.util.List-byte:A-">getRegionIndex</a></span>(<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>&lt;<a href="../../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.had [...]
+              byte[]&nbsp;key)</code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>protected <a href="../../../../../../org/apache/hadoop/hbase/util/Pair.html" title="class in org.apache.hadoop.hbase.util">Pair</a>&lt;<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>&lt;<a href="../../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFiles.LoadQueueItem.html" title="class in org.apache.hadoop.hbase.tool">BulkLoadHFiles.LoadQueueItem</a>&gt;,<a href="https: [...]
 <td class="colLast"><span class="typeNameLabel">BulkLoadHFilesTool.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html#groupOrSplit-org.apache.hadoop.hbase.client.AsyncClusterConnection-org.apache.hadoop.hbase.TableName-org.apache.hbase.thirdparty.com.google.common.collect.Multimap-org.apache.hadoop.hbase.tool.BulkLoadHFiles.LoadQueueItem-java.util.List-">groupOrSplit</a></span>(<a href="../../../../../../org/apache/ha [...]
             <a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName,
diff --git a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
index dc1ce2b..24b1916 100644
--- a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
@@ -541,15 +541,15 @@
 <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>&lt;E&gt; (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>&lt;T&gt;, 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.util.<a href="../../../../../org/apache/hadoop/hbase/util/HbckErrorReporter.ERROR_CODE.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">HbckErrorReporter.ERROR_CODE</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/DNS.ServerType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">DNS.ServerType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.UnsafeComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PoolMap.PoolType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PoolMap.PoolType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.PureJavaComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
 <li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PrettyPrinter.Unit.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PrettyPrinter.Unit</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Order.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Order</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/ChecksumType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">ChecksumType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Order.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Order</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/PoolMap.PoolType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">PoolMap.PoolType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/HbckErrorReporter.ERROR_CODE.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">HbckErrorReporter.ERROR_CODE</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.UnsafeComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
 <li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/IdReadWriteLockWithObjectPool.ReferenceType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">IdReadWriteLockWithObjectPool.ReferenceType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">Bytes.LexicographicalComparerHolder.PureJavaComparer</span></a> (implements org.apache.hadoop.hbase.util.<a href="../../../../../org/apache/hadoop/hbase/util/Bytes.Comparer.html" title="interface in org.apache.hadoop.hbase.util">Bytes.Comparer</a>&lt;T&gt;)</li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/TableDescriptorBuilder.ModifyableTableDescriptor.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/TableDescriptorBuilder.ModifyableTableDescriptor.html
index 798e88b..0d94476 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/TableDescriptorBuilder.ModifyableTableDescriptor.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/TableDescriptorBuilder.ModifyableTableDescriptor.html
@@ -549,7 +549,7 @@
 <span class="sourceLineNo">541</span>  }<a name="line.541"></a>
 <span class="sourceLineNo">542</span><a name="line.542"></a>
 <span class="sourceLineNo">543</span>  public TableDescriptorBuilder setRegionServerGroup(String group) {<a name="line.543"></a>
-<span class="sourceLineNo">544</span>    desc.setValue(RSGROUP_KEY, new Bytes(Bytes.toBytes(group)));<a name="line.544"></a>
+<span class="sourceLineNo">544</span>    desc.setValue(RSGROUP_KEY, group);<a name="line.544"></a>
 <span class="sourceLineNo">545</span>    return this;<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>
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/TableDescriptorBuilder.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/TableDescriptorBuilder.html
index 798e88b..0d94476 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/TableDescriptorBuilder.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/TableDescriptorBuilder.html
@@ -549,7 +549,7 @@
 <span class="sourceLineNo">541</span>  }<a name="line.541"></a>
 <span class="sourceLineNo">542</span><a name="line.542"></a>
 <span class="sourceLineNo">543</span>  public TableDescriptorBuilder setRegionServerGroup(String group) {<a name="line.543"></a>
-<span class="sourceLineNo">544</span>    desc.setValue(RSGROUP_KEY, new Bytes(Bytes.toBytes(group)));<a name="line.544"></a>
+<span class="sourceLineNo">544</span>    desc.setValue(RSGROUP_KEY, group);<a name="line.544"></a>
 <span class="sourceLineNo">545</span>    return this;<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>
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.TableDescriptorGetter.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.TableDescriptorGetter.html
index c373d4b..ec4b786 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.TableDescriptorGetter.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.TableDescriptorGetter.html
@@ -3629,135 +3629,142 @@
 <span class="sourceLineNo">3621</span>      List&lt;ReplicationLoadSource&gt; replicationLoadSources =<a name="line.3621"></a>
 <span class="sourceLineNo">3622</span>          getServerManager().getLoad(serverName).getReplicationLoadSourceList();<a name="line.3622"></a>
 <span class="sourceLineNo">3623</span>      for (ReplicationLoadSource replicationLoadSource : replicationLoadSources) {<a name="line.3623"></a>
-<span class="sourceLineNo">3624</span>        replicationLoadSourceMap.get(replicationLoadSource.getPeerID())<a name="line.3624"></a>
-<span class="sourceLineNo">3625</span>            .add(new Pair&lt;&gt;(serverName, replicationLoadSource));<a name="line.3625"></a>
-<span class="sourceLineNo">3626</span>      }<a name="line.3626"></a>
-<span class="sourceLineNo">3627</span>    }<a name="line.3627"></a>
-<span class="sourceLineNo">3628</span>    for (List&lt;Pair&lt;ServerName, ReplicationLoadSource&gt;&gt; loads : replicationLoadSourceMap.values()) {<a name="line.3628"></a>
-<span class="sourceLineNo">3629</span>      if (loads.size() &gt; 0) {<a name="line.3629"></a>
-<span class="sourceLineNo">3630</span>        loads.sort(Comparator.comparingLong(load -&gt; (-1) * load.getSecond().getReplicationLag()));<a name="line.3630"></a>
-<span class="sourceLineNo">3631</span>      }<a name="line.3631"></a>
-<span class="sourceLineNo">3632</span>    }<a name="line.3632"></a>
-<span class="sourceLineNo">3633</span>    return replicationLoadSourceMap;<a name="line.3633"></a>
-<span class="sourceLineNo">3634</span>  }<a name="line.3634"></a>
-<span class="sourceLineNo">3635</span><a name="line.3635"></a>
-<span class="sourceLineNo">3636</span>  /**<a name="line.3636"></a>
-<span class="sourceLineNo">3637</span>   * This method modifies the master's configuration in order to inject replication-related features<a name="line.3637"></a>
-<span class="sourceLineNo">3638</span>   */<a name="line.3638"></a>
-<span class="sourceLineNo">3639</span>  @VisibleForTesting<a name="line.3639"></a>
-<span class="sourceLineNo">3640</span>  public static void decorateMasterConfiguration(Configuration conf) {<a name="line.3640"></a>
-<span class="sourceLineNo">3641</span>    String plugins = conf.get(HBASE_MASTER_LOGCLEANER_PLUGINS);<a name="line.3641"></a>
-<span class="sourceLineNo">3642</span>    String cleanerClass = ReplicationLogCleaner.class.getCanonicalName();<a name="line.3642"></a>
-<span class="sourceLineNo">3643</span>    if (plugins == null || !plugins.contains(cleanerClass)) {<a name="line.3643"></a>
-<span class="sourceLineNo">3644</span>      conf.set(HBASE_MASTER_LOGCLEANER_PLUGINS, plugins + "," + cleanerClass);<a name="line.3644"></a>
-<span class="sourceLineNo">3645</span>    }<a name="line.3645"></a>
-<span class="sourceLineNo">3646</span>    if (ReplicationUtils.isReplicationForBulkLoadDataEnabled(conf)) {<a name="line.3646"></a>
-<span class="sourceLineNo">3647</span>      plugins = conf.get(HFileCleaner.MASTER_HFILE_CLEANER_PLUGINS);<a name="line.3647"></a>
-<span class="sourceLineNo">3648</span>      cleanerClass = ReplicationHFileCleaner.class.getCanonicalName();<a name="line.3648"></a>
-<span class="sourceLineNo">3649</span>      if (!plugins.contains(cleanerClass)) {<a name="line.3649"></a>
-<span class="sourceLineNo">3650</span>        conf.set(HFileCleaner.MASTER_HFILE_CLEANER_PLUGINS, plugins + "," + cleanerClass);<a name="line.3650"></a>
-<span class="sourceLineNo">3651</span>      }<a name="line.3651"></a>
+<span class="sourceLineNo">3624</span>        List&lt;Pair&lt;ServerName, ReplicationLoadSource&gt;&gt; replicationLoadSourceList =<a name="line.3624"></a>
+<span class="sourceLineNo">3625</span>          replicationLoadSourceMap.get(replicationLoadSource.getPeerID());<a name="line.3625"></a>
+<span class="sourceLineNo">3626</span>        if (replicationLoadSourceList == null) {<a name="line.3626"></a>
+<span class="sourceLineNo">3627</span>          LOG.debug("{} does not exist, but it exists "<a name="line.3627"></a>
+<span class="sourceLineNo">3628</span>            + "in znode(/hbase/replication/rs). when the rs restarts, peerId is deleted, so "<a name="line.3628"></a>
+<span class="sourceLineNo">3629</span>            + "we just need to ignore it", replicationLoadSource.getPeerID());<a name="line.3629"></a>
+<span class="sourceLineNo">3630</span>          continue;<a name="line.3630"></a>
+<span class="sourceLineNo">3631</span>        }<a name="line.3631"></a>
+<span class="sourceLineNo">3632</span>        replicationLoadSourceList.add(new Pair&lt;&gt;(serverName, replicationLoadSource));<a name="line.3632"></a>
+<span class="sourceLineNo">3633</span>      }<a name="line.3633"></a>
+<span class="sourceLineNo">3634</span>    }<a name="line.3634"></a>
+<span class="sourceLineNo">3635</span>    for (List&lt;Pair&lt;ServerName, ReplicationLoadSource&gt;&gt; loads : replicationLoadSourceMap.values()) {<a name="line.3635"></a>
+<span class="sourceLineNo">3636</span>      if (loads.size() &gt; 0) {<a name="line.3636"></a>
+<span class="sourceLineNo">3637</span>        loads.sort(Comparator.comparingLong(load -&gt; (-1) * load.getSecond().getReplicationLag()));<a name="line.3637"></a>
+<span class="sourceLineNo">3638</span>      }<a name="line.3638"></a>
+<span class="sourceLineNo">3639</span>    }<a name="line.3639"></a>
+<span class="sourceLineNo">3640</span>    return replicationLoadSourceMap;<a name="line.3640"></a>
+<span class="sourceLineNo">3641</span>  }<a name="line.3641"></a>
+<span class="sourceLineNo">3642</span><a name="line.3642"></a>
+<span class="sourceLineNo">3643</span>  /**<a name="line.3643"></a>
+<span class="sourceLineNo">3644</span>   * This method modifies the master's configuration in order to inject replication-related features<a name="line.3644"></a>
+<span class="sourceLineNo">3645</span>   */<a name="line.3645"></a>
+<span class="sourceLineNo">3646</span>  @VisibleForTesting<a name="line.3646"></a>
+<span class="sourceLineNo">3647</span>  public static void decorateMasterConfiguration(Configuration conf) {<a name="line.3647"></a>
+<span class="sourceLineNo">3648</span>    String plugins = conf.get(HBASE_MASTER_LOGCLEANER_PLUGINS);<a name="line.3648"></a>
+<span class="sourceLineNo">3649</span>    String cleanerClass = ReplicationLogCleaner.class.getCanonicalName();<a name="line.3649"></a>
+<span class="sourceLineNo">3650</span>    if (plugins == null || !plugins.contains(cleanerClass)) {<a name="line.3650"></a>
+<span class="sourceLineNo">3651</span>      conf.set(HBASE_MASTER_LOGCLEANER_PLUGINS, plugins + "," + cleanerClass);<a name="line.3651"></a>
 <span class="sourceLineNo">3652</span>    }<a name="line.3652"></a>
-<span class="sourceLineNo">3653</span>  }<a name="line.3653"></a>
-<span class="sourceLineNo">3654</span><a name="line.3654"></a>
-<span class="sourceLineNo">3655</span>  public SnapshotQuotaObserverChore getSnapshotQuotaObserverChore() {<a name="line.3655"></a>
-<span class="sourceLineNo">3656</span>    return this.snapshotQuotaChore;<a name="line.3656"></a>
-<span class="sourceLineNo">3657</span>  }<a name="line.3657"></a>
-<span class="sourceLineNo">3658</span><a name="line.3658"></a>
-<span class="sourceLineNo">3659</span>  @Override<a name="line.3659"></a>
-<span class="sourceLineNo">3660</span>  public SyncReplicationReplayWALManager getSyncReplicationReplayWALManager() {<a name="line.3660"></a>
-<span class="sourceLineNo">3661</span>    return this.syncReplicationReplayWALManager;<a name="line.3661"></a>
-<span class="sourceLineNo">3662</span>  }<a name="line.3662"></a>
-<span class="sourceLineNo">3663</span><a name="line.3663"></a>
-<span class="sourceLineNo">3664</span>  @Override<a name="line.3664"></a>
-<span class="sourceLineNo">3665</span>  public Map&lt;String, ReplicationStatus&gt; getWalGroupsReplicationStatus() {<a name="line.3665"></a>
-<span class="sourceLineNo">3666</span>    if (!this.isOnline() || !LoadBalancer.isMasterCanHostUserRegions(conf)) {<a name="line.3666"></a>
-<span class="sourceLineNo">3667</span>      return new HashMap&lt;&gt;();<a name="line.3667"></a>
-<span class="sourceLineNo">3668</span>    }<a name="line.3668"></a>
-<span class="sourceLineNo">3669</span>    return super.getWalGroupsReplicationStatus();<a name="line.3669"></a>
-<span class="sourceLineNo">3670</span>  }<a name="line.3670"></a>
-<span class="sourceLineNo">3671</span><a name="line.3671"></a>
-<span class="sourceLineNo">3672</span>  public HbckChore getHbckChore() {<a name="line.3672"></a>
-<span class="sourceLineNo">3673</span>    return this.hbckChore;<a name="line.3673"></a>
-<span class="sourceLineNo">3674</span>  }<a name="line.3674"></a>
-<span class="sourceLineNo">3675</span><a name="line.3675"></a>
-<span class="sourceLineNo">3676</span>  @Override<a name="line.3676"></a>
-<span class="sourceLineNo">3677</span>  public String getClusterId() {<a name="line.3677"></a>
-<span class="sourceLineNo">3678</span>    if (activeMaster) {<a name="line.3678"></a>
-<span class="sourceLineNo">3679</span>      return super.getClusterId();<a name="line.3679"></a>
-<span class="sourceLineNo">3680</span>    }<a name="line.3680"></a>
-<span class="sourceLineNo">3681</span>    return cachedClusterId.getFromCacheOrFetch();<a name="line.3681"></a>
-<span class="sourceLineNo">3682</span>  }<a name="line.3682"></a>
-<span class="sourceLineNo">3683</span><a name="line.3683"></a>
-<span class="sourceLineNo">3684</span>  public Optional&lt;ServerName&gt; getActiveMaster() {<a name="line.3684"></a>
-<span class="sourceLineNo">3685</span>    return activeMasterManager.getActiveMasterServerName();<a name="line.3685"></a>
-<span class="sourceLineNo">3686</span>  }<a name="line.3686"></a>
-<span class="sourceLineNo">3687</span><a name="line.3687"></a>
-<span class="sourceLineNo">3688</span>  @Override<a name="line.3688"></a>
-<span class="sourceLineNo">3689</span>  public void runReplicationBarrierCleaner() {<a name="line.3689"></a>
-<span class="sourceLineNo">3690</span>    ReplicationBarrierCleaner rbc = this.replicationBarrierCleaner;<a name="line.3690"></a>
-<span class="sourceLineNo">3691</span>    if (rbc != null) {<a name="line.3691"></a>
-<span class="sourceLineNo">3692</span>      rbc.chore();<a name="line.3692"></a>
-<span class="sourceLineNo">3693</span>    }<a name="line.3693"></a>
-<span class="sourceLineNo">3694</span>  }<a name="line.3694"></a>
-<span class="sourceLineNo">3695</span><a name="line.3695"></a>
-<span class="sourceLineNo">3696</span>  public MetaRegionLocationCache getMetaRegionLocationCache() {<a name="line.3696"></a>
-<span class="sourceLineNo">3697</span>    return this.metaRegionLocationCache;<a name="line.3697"></a>
-<span class="sourceLineNo">3698</span>  }<a name="line.3698"></a>
-<span class="sourceLineNo">3699</span><a name="line.3699"></a>
-<span class="sourceLineNo">3700</span>  @Override<a name="line.3700"></a>
-<span class="sourceLineNo">3701</span>  public RSGroupInfoManager getRSGroupInfoManager() {<a name="line.3701"></a>
-<span class="sourceLineNo">3702</span>    return rsGroupInfoManager;<a name="line.3702"></a>
-<span class="sourceLineNo">3703</span>  }<a name="line.3703"></a>
-<span class="sourceLineNo">3704</span><a name="line.3704"></a>
-<span class="sourceLineNo">3705</span>  /**<a name="line.3705"></a>
-<span class="sourceLineNo">3706</span>   * Get the compaction state of the table<a name="line.3706"></a>
-<span class="sourceLineNo">3707</span>   *<a name="line.3707"></a>
-<span class="sourceLineNo">3708</span>   * @param tableName The table name<a name="line.3708"></a>
-<span class="sourceLineNo">3709</span>   * @return CompactionState Compaction state of the table<a name="line.3709"></a>
-<span class="sourceLineNo">3710</span>   */<a name="line.3710"></a>
-<span class="sourceLineNo">3711</span>  public CompactionState getCompactionState(final TableName tableName) {<a name="line.3711"></a>
-<span class="sourceLineNo">3712</span>    CompactionState compactionState = CompactionState.NONE;<a name="line.3712"></a>
-<span class="sourceLineNo">3713</span>    try {<a name="line.3713"></a>
-<span class="sourceLineNo">3714</span>      List&lt;RegionInfo&gt; regions =<a name="line.3714"></a>
-<span class="sourceLineNo">3715</span>        assignmentManager.getRegionStates().getRegionsOfTable(tableName);<a name="line.3715"></a>
-<span class="sourceLineNo">3716</span>      for (RegionInfo regionInfo : regions) {<a name="line.3716"></a>
-<span class="sourceLineNo">3717</span>        ServerName serverName =<a name="line.3717"></a>
-<span class="sourceLineNo">3718</span>          assignmentManager.getRegionStates().getRegionServerOfRegion(regionInfo);<a name="line.3718"></a>
-<span class="sourceLineNo">3719</span>        if (serverName == null) {<a name="line.3719"></a>
-<span class="sourceLineNo">3720</span>          continue;<a name="line.3720"></a>
-<span class="sourceLineNo">3721</span>        }<a name="line.3721"></a>
-<span class="sourceLineNo">3722</span>        ServerMetrics sl = serverManager.getLoad(serverName);<a name="line.3722"></a>
-<span class="sourceLineNo">3723</span>        if (sl == null) {<a name="line.3723"></a>
-<span class="sourceLineNo">3724</span>          continue;<a name="line.3724"></a>
-<span class="sourceLineNo">3725</span>        }<a name="line.3725"></a>
-<span class="sourceLineNo">3726</span>        RegionMetrics regionMetrics = sl.getRegionMetrics().get(regionInfo.getRegionName());<a name="line.3726"></a>
-<span class="sourceLineNo">3727</span>        if (regionMetrics.getCompactionState() == CompactionState.MAJOR) {<a name="line.3727"></a>
-<span class="sourceLineNo">3728</span>          if (compactionState == CompactionState.MINOR) {<a name="line.3728"></a>
-<span class="sourceLineNo">3729</span>            compactionState = CompactionState.MAJOR_AND_MINOR;<a name="line.3729"></a>
-<span class="sourceLineNo">3730</span>          } else {<a name="line.3730"></a>
-<span class="sourceLineNo">3731</span>            compactionState = CompactionState.MAJOR;<a name="line.3731"></a>
-<span class="sourceLineNo">3732</span>          }<a name="line.3732"></a>
-<span class="sourceLineNo">3733</span>        } else if (regionMetrics.getCompactionState() == CompactionState.MINOR) {<a name="line.3733"></a>
-<span class="sourceLineNo">3734</span>          if (compactionState == CompactionState.MAJOR) {<a name="line.3734"></a>
-<span class="sourceLineNo">3735</span>            compactionState = CompactionState.MAJOR_AND_MINOR;<a name="line.3735"></a>
-<span class="sourceLineNo">3736</span>          } else {<a name="line.3736"></a>
-<span class="sourceLineNo">3737</span>            compactionState = CompactionState.MINOR;<a name="line.3737"></a>
-<span class="sourceLineNo">3738</span>          }<a name="line.3738"></a>
-<span class="sourceLineNo">3739</span>        }<a name="line.3739"></a>
-<span class="sourceLineNo">3740</span>      }<a name="line.3740"></a>
-<span class="sourceLineNo">3741</span>    } catch (Exception e) {<a name="line.3741"></a>
-<span class="sourceLineNo">3742</span>      compactionState = null;<a name="line.3742"></a>
-<span class="sourceLineNo">3743</span>      LOG.error("Exception when get compaction state for " + tableName.getNameAsString(), e);<a name="line.3743"></a>
-<span class="sourceLineNo">3744</span>    }<a name="line.3744"></a>
-<span class="sourceLineNo">3745</span>    return compactionState;<a name="line.3745"></a>
-<span class="sourceLineNo">3746</span>  }<a name="line.3746"></a>
-<span class="sourceLineNo">3747</span><a name="line.3747"></a>
-<span class="sourceLineNo">3748</span>  @Override<a name="line.3748"></a>
-<span class="sourceLineNo">3749</span>  public MetaLocationSyncer getMetaLocationSyncer() {<a name="line.3749"></a>
-<span class="sourceLineNo">3750</span>    return metaLocationSyncer;<a name="line.3750"></a>
-<span class="sourceLineNo">3751</span>  }<a name="line.3751"></a>
-<span class="sourceLineNo">3752</span>}<a name="line.3752"></a>
+<span class="sourceLineNo">3653</span>    if (ReplicationUtils.isReplicationForBulkLoadDataEnabled(conf)) {<a name="line.3653"></a>
+<span class="sourceLineNo">3654</span>      plugins = conf.get(HFileCleaner.MASTER_HFILE_CLEANER_PLUGINS);<a name="line.3654"></a>
+<span class="sourceLineNo">3655</span>      cleanerClass = ReplicationHFileCleaner.class.getCanonicalName();<a name="line.3655"></a>
+<span class="sourceLineNo">3656</span>      if (!plugins.contains(cleanerClass)) {<a name="line.3656"></a>
+<span class="sourceLineNo">3657</span>        conf.set(HFileCleaner.MASTER_HFILE_CLEANER_PLUGINS, plugins + "," + cleanerClass);<a name="line.3657"></a>
+<span class="sourceLineNo">3658</span>      }<a name="line.3658"></a>
+<span class="sourceLineNo">3659</span>    }<a name="line.3659"></a>
+<span class="sourceLineNo">3660</span>  }<a name="line.3660"></a>
+<span class="sourceLineNo">3661</span><a name="line.3661"></a>
+<span class="sourceLineNo">3662</span>  public SnapshotQuotaObserverChore getSnapshotQuotaObserverChore() {<a name="line.3662"></a>
+<span class="sourceLineNo">3663</span>    return this.snapshotQuotaChore;<a name="line.3663"></a>
+<span class="sourceLineNo">3664</span>  }<a name="line.3664"></a>
+<span class="sourceLineNo">3665</span><a name="line.3665"></a>
+<span class="sourceLineNo">3666</span>  @Override<a name="line.3666"></a>
+<span class="sourceLineNo">3667</span>  public SyncReplicationReplayWALManager getSyncReplicationReplayWALManager() {<a name="line.3667"></a>
+<span class="sourceLineNo">3668</span>    return this.syncReplicationReplayWALManager;<a name="line.3668"></a>
+<span class="sourceLineNo">3669</span>  }<a name="line.3669"></a>
+<span class="sourceLineNo">3670</span><a name="line.3670"></a>
+<span class="sourceLineNo">3671</span>  @Override<a name="line.3671"></a>
+<span class="sourceLineNo">3672</span>  public Map&lt;String, ReplicationStatus&gt; getWalGroupsReplicationStatus() {<a name="line.3672"></a>
+<span class="sourceLineNo">3673</span>    if (!this.isOnline() || !LoadBalancer.isMasterCanHostUserRegions(conf)) {<a name="line.3673"></a>
+<span class="sourceLineNo">3674</span>      return new HashMap&lt;&gt;();<a name="line.3674"></a>
+<span class="sourceLineNo">3675</span>    }<a name="line.3675"></a>
+<span class="sourceLineNo">3676</span>    return super.getWalGroupsReplicationStatus();<a name="line.3676"></a>
+<span class="sourceLineNo">3677</span>  }<a name="line.3677"></a>
+<span class="sourceLineNo">3678</span><a name="line.3678"></a>
+<span class="sourceLineNo">3679</span>  public HbckChore getHbckChore() {<a name="line.3679"></a>
+<span class="sourceLineNo">3680</span>    return this.hbckChore;<a name="line.3680"></a>
+<span class="sourceLineNo">3681</span>  }<a name="line.3681"></a>
+<span class="sourceLineNo">3682</span><a name="line.3682"></a>
+<span class="sourceLineNo">3683</span>  @Override<a name="line.3683"></a>
+<span class="sourceLineNo">3684</span>  public String getClusterId() {<a name="line.3684"></a>
+<span class="sourceLineNo">3685</span>    if (activeMaster) {<a name="line.3685"></a>
+<span class="sourceLineNo">3686</span>      return super.getClusterId();<a name="line.3686"></a>
+<span class="sourceLineNo">3687</span>    }<a name="line.3687"></a>
+<span class="sourceLineNo">3688</span>    return cachedClusterId.getFromCacheOrFetch();<a name="line.3688"></a>
+<span class="sourceLineNo">3689</span>  }<a name="line.3689"></a>
+<span class="sourceLineNo">3690</span><a name="line.3690"></a>
+<span class="sourceLineNo">3691</span>  public Optional&lt;ServerName&gt; getActiveMaster() {<a name="line.3691"></a>
+<span class="sourceLineNo">3692</span>    return activeMasterManager.getActiveMasterServerName();<a name="line.3692"></a>
+<span class="sourceLineNo">3693</span>  }<a name="line.3693"></a>
+<span class="sourceLineNo">3694</span><a name="line.3694"></a>
+<span class="sourceLineNo">3695</span>  @Override<a name="line.3695"></a>
+<span class="sourceLineNo">3696</span>  public void runReplicationBarrierCleaner() {<a name="line.3696"></a>
+<span class="sourceLineNo">3697</span>    ReplicationBarrierCleaner rbc = this.replicationBarrierCleaner;<a name="line.3697"></a>
+<span class="sourceLineNo">3698</span>    if (rbc != null) {<a name="line.3698"></a>
+<span class="sourceLineNo">3699</span>      rbc.chore();<a name="line.3699"></a>
+<span class="sourceLineNo">3700</span>    }<a name="line.3700"></a>
+<span class="sourceLineNo">3701</span>  }<a name="line.3701"></a>
+<span class="sourceLineNo">3702</span><a name="line.3702"></a>
+<span class="sourceLineNo">3703</span>  public MetaRegionLocationCache getMetaRegionLocationCache() {<a name="line.3703"></a>
+<span class="sourceLineNo">3704</span>    return this.metaRegionLocationCache;<a name="line.3704"></a>
+<span class="sourceLineNo">3705</span>  }<a name="line.3705"></a>
+<span class="sourceLineNo">3706</span><a name="line.3706"></a>
+<span class="sourceLineNo">3707</span>  @Override<a name="line.3707"></a>
+<span class="sourceLineNo">3708</span>  public RSGroupInfoManager getRSGroupInfoManager() {<a name="line.3708"></a>
+<span class="sourceLineNo">3709</span>    return rsGroupInfoManager;<a name="line.3709"></a>
+<span class="sourceLineNo">3710</span>  }<a name="line.3710"></a>
+<span class="sourceLineNo">3711</span><a name="line.3711"></a>
+<span class="sourceLineNo">3712</span>  /**<a name="line.3712"></a>
+<span class="sourceLineNo">3713</span>   * Get the compaction state of the table<a name="line.3713"></a>
+<span class="sourceLineNo">3714</span>   *<a name="line.3714"></a>
+<span class="sourceLineNo">3715</span>   * @param tableName The table name<a name="line.3715"></a>
+<span class="sourceLineNo">3716</span>   * @return CompactionState Compaction state of the table<a name="line.3716"></a>
+<span class="sourceLineNo">3717</span>   */<a name="line.3717"></a>
+<span class="sourceLineNo">3718</span>  public CompactionState getCompactionState(final TableName tableName) {<a name="line.3718"></a>
+<span class="sourceLineNo">3719</span>    CompactionState compactionState = CompactionState.NONE;<a name="line.3719"></a>
+<span class="sourceLineNo">3720</span>    try {<a name="line.3720"></a>
+<span class="sourceLineNo">3721</span>      List&lt;RegionInfo&gt; regions =<a name="line.3721"></a>
+<span class="sourceLineNo">3722</span>        assignmentManager.getRegionStates().getRegionsOfTable(tableName);<a name="line.3722"></a>
+<span class="sourceLineNo">3723</span>      for (RegionInfo regionInfo : regions) {<a name="line.3723"></a>
+<span class="sourceLineNo">3724</span>        ServerName serverName =<a name="line.3724"></a>
+<span class="sourceLineNo">3725</span>          assignmentManager.getRegionStates().getRegionServerOfRegion(regionInfo);<a name="line.3725"></a>
+<span class="sourceLineNo">3726</span>        if (serverName == null) {<a name="line.3726"></a>
+<span class="sourceLineNo">3727</span>          continue;<a name="line.3727"></a>
+<span class="sourceLineNo">3728</span>        }<a name="line.3728"></a>
+<span class="sourceLineNo">3729</span>        ServerMetrics sl = serverManager.getLoad(serverName);<a name="line.3729"></a>
+<span class="sourceLineNo">3730</span>        if (sl == null) {<a name="line.3730"></a>
+<span class="sourceLineNo">3731</span>          continue;<a name="line.3731"></a>
+<span class="sourceLineNo">3732</span>        }<a name="line.3732"></a>
+<span class="sourceLineNo">3733</span>        RegionMetrics regionMetrics = sl.getRegionMetrics().get(regionInfo.getRegionName());<a name="line.3733"></a>
+<span class="sourceLineNo">3734</span>        if (regionMetrics.getCompactionState() == CompactionState.MAJOR) {<a name="line.3734"></a>
+<span class="sourceLineNo">3735</span>          if (compactionState == CompactionState.MINOR) {<a name="line.3735"></a>
+<span class="sourceLineNo">3736</span>            compactionState = CompactionState.MAJOR_AND_MINOR;<a name="line.3736"></a>
+<span class="sourceLineNo">3737</span>          } else {<a name="line.3737"></a>
+<span class="sourceLineNo">3738</span>            compactionState = CompactionState.MAJOR;<a name="line.3738"></a>
+<span class="sourceLineNo">3739</span>          }<a name="line.3739"></a>
+<span class="sourceLineNo">3740</span>        } else if (regionMetrics.getCompactionState() == CompactionState.MINOR) {<a name="line.3740"></a>
+<span class="sourceLineNo">3741</span>          if (compactionState == CompactionState.MAJOR) {<a name="line.3741"></a>
+<span class="sourceLineNo">3742</span>            compactionState = CompactionState.MAJOR_AND_MINOR;<a name="line.3742"></a>
+<span class="sourceLineNo">3743</span>          } else {<a name="line.3743"></a>
+<span class="sourceLineNo">3744</span>            compactionState = CompactionState.MINOR;<a name="line.3744"></a>
+<span class="sourceLineNo">3745</span>          }<a name="line.3745"></a>
+<span class="sourceLineNo">3746</span>        }<a name="line.3746"></a>
+<span class="sourceLineNo">3747</span>      }<a name="line.3747"></a>
+<span class="sourceLineNo">3748</span>    } catch (Exception e) {<a name="line.3748"></a>
+<span class="sourceLineNo">3749</span>      compactionState = null;<a name="line.3749"></a>
+<span class="sourceLineNo">3750</span>      LOG.error("Exception when get compaction state for " + tableName.getNameAsString(), e);<a name="line.3750"></a>
+<span class="sourceLineNo">3751</span>    }<a name="line.3751"></a>
+<span class="sourceLineNo">3752</span>    return compactionState;<a name="line.3752"></a>
+<span class="sourceLineNo">3753</span>  }<a name="line.3753"></a>
+<span class="sourceLineNo">3754</span><a name="line.3754"></a>
+<span class="sourceLineNo">3755</span>  @Override<a name="line.3755"></a>
+<span class="sourceLineNo">3756</span>  public MetaLocationSyncer getMetaLocationSyncer() {<a name="line.3756"></a>
+<span class="sourceLineNo">3757</span>    return metaLocationSyncer;<a name="line.3757"></a>
+<span class="sourceLineNo">3758</span>  }<a name="line.3758"></a>
+<span class="sourceLineNo">3759</span>}<a name="line.3759"></a>
 
 
 
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.html
index c373d4b..ec4b786 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/HMaster.html
@@ -3629,135 +3629,142 @@
 <span class="sourceLineNo">3621</span>      List&lt;ReplicationLoadSource&gt; replicationLoadSources =<a name="line.3621"></a>
 <span class="sourceLineNo">3622</span>          getServerManager().getLoad(serverName).getReplicationLoadSourceList();<a name="line.3622"></a>
 <span class="sourceLineNo">3623</span>      for (ReplicationLoadSource replicationLoadSource : replicationLoadSources) {<a name="line.3623"></a>
-<span class="sourceLineNo">3624</span>        replicationLoadSourceMap.get(replicationLoadSource.getPeerID())<a name="line.3624"></a>
-<span class="sourceLineNo">3625</span>            .add(new Pair&lt;&gt;(serverName, replicationLoadSource));<a name="line.3625"></a>
-<span class="sourceLineNo">3626</span>      }<a name="line.3626"></a>
-<span class="sourceLineNo">3627</span>    }<a name="line.3627"></a>
-<span class="sourceLineNo">3628</span>    for (List&lt;Pair&lt;ServerName, ReplicationLoadSource&gt;&gt; loads : replicationLoadSourceMap.values()) {<a name="line.3628"></a>
-<span class="sourceLineNo">3629</span>      if (loads.size() &gt; 0) {<a name="line.3629"></a>
-<span class="sourceLineNo">3630</span>        loads.sort(Comparator.comparingLong(load -&gt; (-1) * load.getSecond().getReplicationLag()));<a name="line.3630"></a>
-<span class="sourceLineNo">3631</span>      }<a name="line.3631"></a>
-<span class="sourceLineNo">3632</span>    }<a name="line.3632"></a>
-<span class="sourceLineNo">3633</span>    return replicationLoadSourceMap;<a name="line.3633"></a>
-<span class="sourceLineNo">3634</span>  }<a name="line.3634"></a>
-<span class="sourceLineNo">3635</span><a name="line.3635"></a>
-<span class="sourceLineNo">3636</span>  /**<a name="line.3636"></a>
-<span class="sourceLineNo">3637</span>   * This method modifies the master's configuration in order to inject replication-related features<a name="line.3637"></a>
-<span class="sourceLineNo">3638</span>   */<a name="line.3638"></a>
-<span class="sourceLineNo">3639</span>  @VisibleForTesting<a name="line.3639"></a>
-<span class="sourceLineNo">3640</span>  public static void decorateMasterConfiguration(Configuration conf) {<a name="line.3640"></a>
-<span class="sourceLineNo">3641</span>    String plugins = conf.get(HBASE_MASTER_LOGCLEANER_PLUGINS);<a name="line.3641"></a>
-<span class="sourceLineNo">3642</span>    String cleanerClass = ReplicationLogCleaner.class.getCanonicalName();<a name="line.3642"></a>
-<span class="sourceLineNo">3643</span>    if (plugins == null || !plugins.contains(cleanerClass)) {<a name="line.3643"></a>
-<span class="sourceLineNo">3644</span>      conf.set(HBASE_MASTER_LOGCLEANER_PLUGINS, plugins + "," + cleanerClass);<a name="line.3644"></a>
-<span class="sourceLineNo">3645</span>    }<a name="line.3645"></a>
-<span class="sourceLineNo">3646</span>    if (ReplicationUtils.isReplicationForBulkLoadDataEnabled(conf)) {<a name="line.3646"></a>
-<span class="sourceLineNo">3647</span>      plugins = conf.get(HFileCleaner.MASTER_HFILE_CLEANER_PLUGINS);<a name="line.3647"></a>
-<span class="sourceLineNo">3648</span>      cleanerClass = ReplicationHFileCleaner.class.getCanonicalName();<a name="line.3648"></a>
-<span class="sourceLineNo">3649</span>      if (!plugins.contains(cleanerClass)) {<a name="line.3649"></a>
-<span class="sourceLineNo">3650</span>        conf.set(HFileCleaner.MASTER_HFILE_CLEANER_PLUGINS, plugins + "," + cleanerClass);<a name="line.3650"></a>
-<span class="sourceLineNo">3651</span>      }<a name="line.3651"></a>
+<span class="sourceLineNo">3624</span>        List&lt;Pair&lt;ServerName, ReplicationLoadSource&gt;&gt; replicationLoadSourceList =<a name="line.3624"></a>
+<span class="sourceLineNo">3625</span>          replicationLoadSourceMap.get(replicationLoadSource.getPeerID());<a name="line.3625"></a>
+<span class="sourceLineNo">3626</span>        if (replicationLoadSourceList == null) {<a name="line.3626"></a>
+<span class="sourceLineNo">3627</span>          LOG.debug("{} does not exist, but it exists "<a name="line.3627"></a>
+<span class="sourceLineNo">3628</span>            + "in znode(/hbase/replication/rs). when the rs restarts, peerId is deleted, so "<a name="line.3628"></a>
+<span class="sourceLineNo">3629</span>            + "we just need to ignore it", replicationLoadSource.getPeerID());<a name="line.3629"></a>
+<span class="sourceLineNo">3630</span>          continue;<a name="line.3630"></a>
+<span class="sourceLineNo">3631</span>        }<a name="line.3631"></a>
+<span class="sourceLineNo">3632</span>        replicationLoadSourceList.add(new Pair&lt;&gt;(serverName, replicationLoadSource));<a name="line.3632"></a>
+<span class="sourceLineNo">3633</span>      }<a name="line.3633"></a>
+<span class="sourceLineNo">3634</span>    }<a name="line.3634"></a>
+<span class="sourceLineNo">3635</span>    for (List&lt;Pair&lt;ServerName, ReplicationLoadSource&gt;&gt; loads : replicationLoadSourceMap.values()) {<a name="line.3635"></a>
+<span class="sourceLineNo">3636</span>      if (loads.size() &gt; 0) {<a name="line.3636"></a>
+<span class="sourceLineNo">3637</span>        loads.sort(Comparator.comparingLong(load -&gt; (-1) * load.getSecond().getReplicationLag()));<a name="line.3637"></a>
+<span class="sourceLineNo">3638</span>      }<a name="line.3638"></a>
+<span class="sourceLineNo">3639</span>    }<a name="line.3639"></a>
+<span class="sourceLineNo">3640</span>    return replicationLoadSourceMap;<a name="line.3640"></a>
+<span class="sourceLineNo">3641</span>  }<a name="line.3641"></a>
+<span class="sourceLineNo">3642</span><a name="line.3642"></a>
+<span class="sourceLineNo">3643</span>  /**<a name="line.3643"></a>
+<span class="sourceLineNo">3644</span>   * This method modifies the master's configuration in order to inject replication-related features<a name="line.3644"></a>
+<span class="sourceLineNo">3645</span>   */<a name="line.3645"></a>
+<span class="sourceLineNo">3646</span>  @VisibleForTesting<a name="line.3646"></a>
+<span class="sourceLineNo">3647</span>  public static void decorateMasterConfiguration(Configuration conf) {<a name="line.3647"></a>
+<span class="sourceLineNo">3648</span>    String plugins = conf.get(HBASE_MASTER_LOGCLEANER_PLUGINS);<a name="line.3648"></a>
+<span class="sourceLineNo">3649</span>    String cleanerClass = ReplicationLogCleaner.class.getCanonicalName();<a name="line.3649"></a>
+<span class="sourceLineNo">3650</span>    if (plugins == null || !plugins.contains(cleanerClass)) {<a name="line.3650"></a>
+<span class="sourceLineNo">3651</span>      conf.set(HBASE_MASTER_LOGCLEANER_PLUGINS, plugins + "," + cleanerClass);<a name="line.3651"></a>
 <span class="sourceLineNo">3652</span>    }<a name="line.3652"></a>
-<span class="sourceLineNo">3653</span>  }<a name="line.3653"></a>
-<span class="sourceLineNo">3654</span><a name="line.3654"></a>
-<span class="sourceLineNo">3655</span>  public SnapshotQuotaObserverChore getSnapshotQuotaObserverChore() {<a name="line.3655"></a>
-<span class="sourceLineNo">3656</span>    return this.snapshotQuotaChore;<a name="line.3656"></a>
-<span class="sourceLineNo">3657</span>  }<a name="line.3657"></a>
-<span class="sourceLineNo">3658</span><a name="line.3658"></a>
-<span class="sourceLineNo">3659</span>  @Override<a name="line.3659"></a>
-<span class="sourceLineNo">3660</span>  public SyncReplicationReplayWALManager getSyncReplicationReplayWALManager() {<a name="line.3660"></a>
-<span class="sourceLineNo">3661</span>    return this.syncReplicationReplayWALManager;<a name="line.3661"></a>
-<span class="sourceLineNo">3662</span>  }<a name="line.3662"></a>
-<span class="sourceLineNo">3663</span><a name="line.3663"></a>
-<span class="sourceLineNo">3664</span>  @Override<a name="line.3664"></a>
-<span class="sourceLineNo">3665</span>  public Map&lt;String, ReplicationStatus&gt; getWalGroupsReplicationStatus() {<a name="line.3665"></a>
-<span class="sourceLineNo">3666</span>    if (!this.isOnline() || !LoadBalancer.isMasterCanHostUserRegions(conf)) {<a name="line.3666"></a>
-<span class="sourceLineNo">3667</span>      return new HashMap&lt;&gt;();<a name="line.3667"></a>
-<span class="sourceLineNo">3668</span>    }<a name="line.3668"></a>
-<span class="sourceLineNo">3669</span>    return super.getWalGroupsReplicationStatus();<a name="line.3669"></a>
-<span class="sourceLineNo">3670</span>  }<a name="line.3670"></a>
-<span class="sourceLineNo">3671</span><a name="line.3671"></a>
-<span class="sourceLineNo">3672</span>  public HbckChore getHbckChore() {<a name="line.3672"></a>
-<span class="sourceLineNo">3673</span>    return this.hbckChore;<a name="line.3673"></a>
-<span class="sourceLineNo">3674</span>  }<a name="line.3674"></a>
-<span class="sourceLineNo">3675</span><a name="line.3675"></a>
-<span class="sourceLineNo">3676</span>  @Override<a name="line.3676"></a>
-<span class="sourceLineNo">3677</span>  public String getClusterId() {<a name="line.3677"></a>
-<span class="sourceLineNo">3678</span>    if (activeMaster) {<a name="line.3678"></a>
-<span class="sourceLineNo">3679</span>      return super.getClusterId();<a name="line.3679"></a>
-<span class="sourceLineNo">3680</span>    }<a name="line.3680"></a>
-<span class="sourceLineNo">3681</span>    return cachedClusterId.getFromCacheOrFetch();<a name="line.3681"></a>
-<span class="sourceLineNo">3682</span>  }<a name="line.3682"></a>
-<span class="sourceLineNo">3683</span><a name="line.3683"></a>
-<span class="sourceLineNo">3684</span>  public Optional&lt;ServerName&gt; getActiveMaster() {<a name="line.3684"></a>
-<span class="sourceLineNo">3685</span>    return activeMasterManager.getActiveMasterServerName();<a name="line.3685"></a>
-<span class="sourceLineNo">3686</span>  }<a name="line.3686"></a>
-<span class="sourceLineNo">3687</span><a name="line.3687"></a>
-<span class="sourceLineNo">3688</span>  @Override<a name="line.3688"></a>
-<span class="sourceLineNo">3689</span>  public void runReplicationBarrierCleaner() {<a name="line.3689"></a>
-<span class="sourceLineNo">3690</span>    ReplicationBarrierCleaner rbc = this.replicationBarrierCleaner;<a name="line.3690"></a>
-<span class="sourceLineNo">3691</span>    if (rbc != null) {<a name="line.3691"></a>
-<span class="sourceLineNo">3692</span>      rbc.chore();<a name="line.3692"></a>
-<span class="sourceLineNo">3693</span>    }<a name="line.3693"></a>
-<span class="sourceLineNo">3694</span>  }<a name="line.3694"></a>
-<span class="sourceLineNo">3695</span><a name="line.3695"></a>
-<span class="sourceLineNo">3696</span>  public MetaRegionLocationCache getMetaRegionLocationCache() {<a name="line.3696"></a>
-<span class="sourceLineNo">3697</span>    return this.metaRegionLocationCache;<a name="line.3697"></a>
-<span class="sourceLineNo">3698</span>  }<a name="line.3698"></a>
-<span class="sourceLineNo">3699</span><a name="line.3699"></a>
-<span class="sourceLineNo">3700</span>  @Override<a name="line.3700"></a>
-<span class="sourceLineNo">3701</span>  public RSGroupInfoManager getRSGroupInfoManager() {<a name="line.3701"></a>
-<span class="sourceLineNo">3702</span>    return rsGroupInfoManager;<a name="line.3702"></a>
-<span class="sourceLineNo">3703</span>  }<a name="line.3703"></a>
-<span class="sourceLineNo">3704</span><a name="line.3704"></a>
-<span class="sourceLineNo">3705</span>  /**<a name="line.3705"></a>
-<span class="sourceLineNo">3706</span>   * Get the compaction state of the table<a name="line.3706"></a>
-<span class="sourceLineNo">3707</span>   *<a name="line.3707"></a>
-<span class="sourceLineNo">3708</span>   * @param tableName The table name<a name="line.3708"></a>
-<span class="sourceLineNo">3709</span>   * @return CompactionState Compaction state of the table<a name="line.3709"></a>
-<span class="sourceLineNo">3710</span>   */<a name="line.3710"></a>
-<span class="sourceLineNo">3711</span>  public CompactionState getCompactionState(final TableName tableName) {<a name="line.3711"></a>
-<span class="sourceLineNo">3712</span>    CompactionState compactionState = CompactionState.NONE;<a name="line.3712"></a>
-<span class="sourceLineNo">3713</span>    try {<a name="line.3713"></a>
-<span class="sourceLineNo">3714</span>      List&lt;RegionInfo&gt; regions =<a name="line.3714"></a>
-<span class="sourceLineNo">3715</span>        assignmentManager.getRegionStates().getRegionsOfTable(tableName);<a name="line.3715"></a>
-<span class="sourceLineNo">3716</span>      for (RegionInfo regionInfo : regions) {<a name="line.3716"></a>
-<span class="sourceLineNo">3717</span>        ServerName serverName =<a name="line.3717"></a>
-<span class="sourceLineNo">3718</span>          assignmentManager.getRegionStates().getRegionServerOfRegion(regionInfo);<a name="line.3718"></a>
-<span class="sourceLineNo">3719</span>        if (serverName == null) {<a name="line.3719"></a>
-<span class="sourceLineNo">3720</span>          continue;<a name="line.3720"></a>
-<span class="sourceLineNo">3721</span>        }<a name="line.3721"></a>
-<span class="sourceLineNo">3722</span>        ServerMetrics sl = serverManager.getLoad(serverName);<a name="line.3722"></a>
-<span class="sourceLineNo">3723</span>        if (sl == null) {<a name="line.3723"></a>
-<span class="sourceLineNo">3724</span>          continue;<a name="line.3724"></a>
-<span class="sourceLineNo">3725</span>        }<a name="line.3725"></a>
-<span class="sourceLineNo">3726</span>        RegionMetrics regionMetrics = sl.getRegionMetrics().get(regionInfo.getRegionName());<a name="line.3726"></a>
-<span class="sourceLineNo">3727</span>        if (regionMetrics.getCompactionState() == CompactionState.MAJOR) {<a name="line.3727"></a>
-<span class="sourceLineNo">3728</span>          if (compactionState == CompactionState.MINOR) {<a name="line.3728"></a>
-<span class="sourceLineNo">3729</span>            compactionState = CompactionState.MAJOR_AND_MINOR;<a name="line.3729"></a>
-<span class="sourceLineNo">3730</span>          } else {<a name="line.3730"></a>
-<span class="sourceLineNo">3731</span>            compactionState = CompactionState.MAJOR;<a name="line.3731"></a>
-<span class="sourceLineNo">3732</span>          }<a name="line.3732"></a>
-<span class="sourceLineNo">3733</span>        } else if (regionMetrics.getCompactionState() == CompactionState.MINOR) {<a name="line.3733"></a>
-<span class="sourceLineNo">3734</span>          if (compactionState == CompactionState.MAJOR) {<a name="line.3734"></a>
-<span class="sourceLineNo">3735</span>            compactionState = CompactionState.MAJOR_AND_MINOR;<a name="line.3735"></a>
-<span class="sourceLineNo">3736</span>          } else {<a name="line.3736"></a>
-<span class="sourceLineNo">3737</span>            compactionState = CompactionState.MINOR;<a name="line.3737"></a>
-<span class="sourceLineNo">3738</span>          }<a name="line.3738"></a>
-<span class="sourceLineNo">3739</span>        }<a name="line.3739"></a>
-<span class="sourceLineNo">3740</span>      }<a name="line.3740"></a>
-<span class="sourceLineNo">3741</span>    } catch (Exception e) {<a name="line.3741"></a>
-<span class="sourceLineNo">3742</span>      compactionState = null;<a name="line.3742"></a>
-<span class="sourceLineNo">3743</span>      LOG.error("Exception when get compaction state for " + tableName.getNameAsString(), e);<a name="line.3743"></a>
-<span class="sourceLineNo">3744</span>    }<a name="line.3744"></a>
-<span class="sourceLineNo">3745</span>    return compactionState;<a name="line.3745"></a>
-<span class="sourceLineNo">3746</span>  }<a name="line.3746"></a>
-<span class="sourceLineNo">3747</span><a name="line.3747"></a>
-<span class="sourceLineNo">3748</span>  @Override<a name="line.3748"></a>
-<span class="sourceLineNo">3749</span>  public MetaLocationSyncer getMetaLocationSyncer() {<a name="line.3749"></a>
-<span class="sourceLineNo">3750</span>    return metaLocationSyncer;<a name="line.3750"></a>
-<span class="sourceLineNo">3751</span>  }<a name="line.3751"></a>
-<span class="sourceLineNo">3752</span>}<a name="line.3752"></a>
+<span class="sourceLineNo">3653</span>    if (ReplicationUtils.isReplicationForBulkLoadDataEnabled(conf)) {<a name="line.3653"></a>
+<span class="sourceLineNo">3654</span>      plugins = conf.get(HFileCleaner.MASTER_HFILE_CLEANER_PLUGINS);<a name="line.3654"></a>
+<span class="sourceLineNo">3655</span>      cleanerClass = ReplicationHFileCleaner.class.getCanonicalName();<a name="line.3655"></a>
+<span class="sourceLineNo">3656</span>      if (!plugins.contains(cleanerClass)) {<a name="line.3656"></a>
+<span class="sourceLineNo">3657</span>        conf.set(HFileCleaner.MASTER_HFILE_CLEANER_PLUGINS, plugins + "," + cleanerClass);<a name="line.3657"></a>
+<span class="sourceLineNo">3658</span>      }<a name="line.3658"></a>
+<span class="sourceLineNo">3659</span>    }<a name="line.3659"></a>
+<span class="sourceLineNo">3660</span>  }<a name="line.3660"></a>
+<span class="sourceLineNo">3661</span><a name="line.3661"></a>
+<span class="sourceLineNo">3662</span>  public SnapshotQuotaObserverChore getSnapshotQuotaObserverChore() {<a name="line.3662"></a>
+<span class="sourceLineNo">3663</span>    return this.snapshotQuotaChore;<a name="line.3663"></a>
+<span class="sourceLineNo">3664</span>  }<a name="line.3664"></a>
+<span class="sourceLineNo">3665</span><a name="line.3665"></a>
+<span class="sourceLineNo">3666</span>  @Override<a name="line.3666"></a>
+<span class="sourceLineNo">3667</span>  public SyncReplicationReplayWALManager getSyncReplicationReplayWALManager() {<a name="line.3667"></a>
+<span class="sourceLineNo">3668</span>    return this.syncReplicationReplayWALManager;<a name="line.3668"></a>
+<span class="sourceLineNo">3669</span>  }<a name="line.3669"></a>
+<span class="sourceLineNo">3670</span><a name="line.3670"></a>
+<span class="sourceLineNo">3671</span>  @Override<a name="line.3671"></a>
+<span class="sourceLineNo">3672</span>  public Map&lt;String, ReplicationStatus&gt; getWalGroupsReplicationStatus() {<a name="line.3672"></a>
+<span class="sourceLineNo">3673</span>    if (!this.isOnline() || !LoadBalancer.isMasterCanHostUserRegions(conf)) {<a name="line.3673"></a>
+<span class="sourceLineNo">3674</span>      return new HashMap&lt;&gt;();<a name="line.3674"></a>
+<span class="sourceLineNo">3675</span>    }<a name="line.3675"></a>
+<span class="sourceLineNo">3676</span>    return super.getWalGroupsReplicationStatus();<a name="line.3676"></a>
+<span class="sourceLineNo">3677</span>  }<a name="line.3677"></a>
+<span class="sourceLineNo">3678</span><a name="line.3678"></a>
+<span class="sourceLineNo">3679</span>  public HbckChore getHbckChore() {<a name="line.3679"></a>
+<span class="sourceLineNo">3680</span>    return this.hbckChore;<a name="line.3680"></a>
+<span class="sourceLineNo">3681</span>  }<a name="line.3681"></a>
+<span class="sourceLineNo">3682</span><a name="line.3682"></a>
+<span class="sourceLineNo">3683</span>  @Override<a name="line.3683"></a>
+<span class="sourceLineNo">3684</span>  public String getClusterId() {<a name="line.3684"></a>
+<span class="sourceLineNo">3685</span>    if (activeMaster) {<a name="line.3685"></a>
+<span class="sourceLineNo">3686</span>      return super.getClusterId();<a name="line.3686"></a>
+<span class="sourceLineNo">3687</span>    }<a name="line.3687"></a>
+<span class="sourceLineNo">3688</span>    return cachedClusterId.getFromCacheOrFetch();<a name="line.3688"></a>
+<span class="sourceLineNo">3689</span>  }<a name="line.3689"></a>
+<span class="sourceLineNo">3690</span><a name="line.3690"></a>
+<span class="sourceLineNo">3691</span>  public Optional&lt;ServerName&gt; getActiveMaster() {<a name="line.3691"></a>
+<span class="sourceLineNo">3692</span>    return activeMasterManager.getActiveMasterServerName();<a name="line.3692"></a>
+<span class="sourceLineNo">3693</span>  }<a name="line.3693"></a>
+<span class="sourceLineNo">3694</span><a name="line.3694"></a>
+<span class="sourceLineNo">3695</span>  @Override<a name="line.3695"></a>
+<span class="sourceLineNo">3696</span>  public void runReplicationBarrierCleaner() {<a name="line.3696"></a>
+<span class="sourceLineNo">3697</span>    ReplicationBarrierCleaner rbc = this.replicationBarrierCleaner;<a name="line.3697"></a>
+<span class="sourceLineNo">3698</span>    if (rbc != null) {<a name="line.3698"></a>
+<span class="sourceLineNo">3699</span>      rbc.chore();<a name="line.3699"></a>
+<span class="sourceLineNo">3700</span>    }<a name="line.3700"></a>
+<span class="sourceLineNo">3701</span>  }<a name="line.3701"></a>
+<span class="sourceLineNo">3702</span><a name="line.3702"></a>
+<span class="sourceLineNo">3703</span>  public MetaRegionLocationCache getMetaRegionLocationCache() {<a name="line.3703"></a>
+<span class="sourceLineNo">3704</span>    return this.metaRegionLocationCache;<a name="line.3704"></a>
+<span class="sourceLineNo">3705</span>  }<a name="line.3705"></a>
+<span class="sourceLineNo">3706</span><a name="line.3706"></a>
+<span class="sourceLineNo">3707</span>  @Override<a name="line.3707"></a>
+<span class="sourceLineNo">3708</span>  public RSGroupInfoManager getRSGroupInfoManager() {<a name="line.3708"></a>
+<span class="sourceLineNo">3709</span>    return rsGroupInfoManager;<a name="line.3709"></a>
+<span class="sourceLineNo">3710</span>  }<a name="line.3710"></a>
+<span class="sourceLineNo">3711</span><a name="line.3711"></a>
+<span class="sourceLineNo">3712</span>  /**<a name="line.3712"></a>
+<span class="sourceLineNo">3713</span>   * Get the compaction state of the table<a name="line.3713"></a>
+<span class="sourceLineNo">3714</span>   *<a name="line.3714"></a>
+<span class="sourceLineNo">3715</span>   * @param tableName The table name<a name="line.3715"></a>
+<span class="sourceLineNo">3716</span>   * @return CompactionState Compaction state of the table<a name="line.3716"></a>
+<span class="sourceLineNo">3717</span>   */<a name="line.3717"></a>
+<span class="sourceLineNo">3718</span>  public CompactionState getCompactionState(final TableName tableName) {<a name="line.3718"></a>
+<span class="sourceLineNo">3719</span>    CompactionState compactionState = CompactionState.NONE;<a name="line.3719"></a>
+<span class="sourceLineNo">3720</span>    try {<a name="line.3720"></a>
+<span class="sourceLineNo">3721</span>      List&lt;RegionInfo&gt; regions =<a name="line.3721"></a>
+<span class="sourceLineNo">3722</span>        assignmentManager.getRegionStates().getRegionsOfTable(tableName);<a name="line.3722"></a>
+<span class="sourceLineNo">3723</span>      for (RegionInfo regionInfo : regions) {<a name="line.3723"></a>
+<span class="sourceLineNo">3724</span>        ServerName serverName =<a name="line.3724"></a>
+<span class="sourceLineNo">3725</span>          assignmentManager.getRegionStates().getRegionServerOfRegion(regionInfo);<a name="line.3725"></a>
+<span class="sourceLineNo">3726</span>        if (serverName == null) {<a name="line.3726"></a>
+<span class="sourceLineNo">3727</span>          continue;<a name="line.3727"></a>
+<span class="sourceLineNo">3728</span>        }<a name="line.3728"></a>
+<span class="sourceLineNo">3729</span>        ServerMetrics sl = serverManager.getLoad(serverName);<a name="line.3729"></a>
+<span class="sourceLineNo">3730</span>        if (sl == null) {<a name="line.3730"></a>
+<span class="sourceLineNo">3731</span>          continue;<a name="line.3731"></a>
+<span class="sourceLineNo">3732</span>        }<a name="line.3732"></a>
+<span class="sourceLineNo">3733</span>        RegionMetrics regionMetrics = sl.getRegionMetrics().get(regionInfo.getRegionName());<a name="line.3733"></a>
+<span class="sourceLineNo">3734</span>        if (regionMetrics.getCompactionState() == CompactionState.MAJOR) {<a name="line.3734"></a>
+<span class="sourceLineNo">3735</span>          if (compactionState == CompactionState.MINOR) {<a name="line.3735"></a>
+<span class="sourceLineNo">3736</span>            compactionState = CompactionState.MAJOR_AND_MINOR;<a name="line.3736"></a>
+<span class="sourceLineNo">3737</span>          } else {<a name="line.3737"></a>
+<span class="sourceLineNo">3738</span>            compactionState = CompactionState.MAJOR;<a name="line.3738"></a>
+<span class="sourceLineNo">3739</span>          }<a name="line.3739"></a>
+<span class="sourceLineNo">3740</span>        } else if (regionMetrics.getCompactionState() == CompactionState.MINOR) {<a name="line.3740"></a>
+<span class="sourceLineNo">3741</span>          if (compactionState == CompactionState.MAJOR) {<a name="line.3741"></a>
+<span class="sourceLineNo">3742</span>            compactionState = CompactionState.MAJOR_AND_MINOR;<a name="line.3742"></a>
+<span class="sourceLineNo">3743</span>          } else {<a name="line.3743"></a>
+<span class="sourceLineNo">3744</span>            compactionState = CompactionState.MINOR;<a name="line.3744"></a>
+<span class="sourceLineNo">3745</span>          }<a name="line.3745"></a>
+<span class="sourceLineNo">3746</span>        }<a name="line.3746"></a>
+<span class="sourceLineNo">3747</span>      }<a name="line.3747"></a>
+<span class="sourceLineNo">3748</span>    } catch (Exception e) {<a name="line.3748"></a>
+<span class="sourceLineNo">3749</span>      compactionState = null;<a name="line.3749"></a>
+<span class="sourceLineNo">3750</span>      LOG.error("Exception when get compaction state for " + tableName.getNameAsString(), e);<a name="line.3750"></a>
+<span class="sourceLineNo">3751</span>    }<a name="line.3751"></a>
+<span class="sourceLineNo">3752</span>    return compactionState;<a name="line.3752"></a>
+<span class="sourceLineNo">3753</span>  }<a name="line.3753"></a>
+<span class="sourceLineNo">3754</span><a name="line.3754"></a>
+<span class="sourceLineNo">3755</span>  @Override<a name="line.3755"></a>
+<span class="sourceLineNo">3756</span>  public MetaLocationSyncer getMetaLocationSyncer() {<a name="line.3756"></a>
+<span class="sourceLineNo">3757</span>    return metaLocationSyncer;<a name="line.3757"></a>
+<span class="sourceLineNo">3758</span>  }<a name="line.3758"></a>
+<span class="sourceLineNo">3759</span>}<a name="line.3759"></a>
 
 
 
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.BulkHFileVisitor.html b/devapidocs/src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.BulkHFileVisitor.html
index 75d55eb..901d886 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.BulkHFileVisitor.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.BulkHFileVisitor.html
@@ -624,508 +624,526 @@
 <span class="sourceLineNo">616</span>  }<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>   * Attempt to assign the given load queue item into its target region group. If the hfile boundary<a name="line.619"></a>
-<span class="sourceLineNo">620</span>   * no longer fits into a region, physically splits the hfile such that the new bottom half will<a name="line.620"></a>
-<span class="sourceLineNo">621</span>   * fit and returns the list of LQI's corresponding to the resultant hfiles.<a name="line.621"></a>
-<span class="sourceLineNo">622</span>   * &lt;p/&gt;<a name="line.622"></a>
-<span class="sourceLineNo">623</span>   * protected for testing<a name="line.623"></a>
-<span class="sourceLineNo">624</span>   * @throws IOException if an IO failure is encountered<a name="line.624"></a>
-<span class="sourceLineNo">625</span>   */<a name="line.625"></a>
-<span class="sourceLineNo">626</span>  @VisibleForTesting<a name="line.626"></a>
-<span class="sourceLineNo">627</span>  protected Pair&lt;List&lt;LoadQueueItem&gt;, String&gt; groupOrSplit(AsyncClusterConnection conn,<a name="line.627"></a>
-<span class="sourceLineNo">628</span>      TableName tableName, Multimap&lt;ByteBuffer, LoadQueueItem&gt; regionGroups, LoadQueueItem item,<a name="line.628"></a>
-<span class="sourceLineNo">629</span>      List&lt;Pair&lt;byte[], byte[]&gt;&gt; startEndKeys) throws IOException {<a name="line.629"></a>
-<span class="sourceLineNo">630</span>    Path hfilePath = item.getFilePath();<a name="line.630"></a>
-<span class="sourceLineNo">631</span>    Optional&lt;byte[]&gt; first, last;<a name="line.631"></a>
-<span class="sourceLineNo">632</span>    try (HFile.Reader hfr = HFile.createReader(hfilePath.getFileSystem(getConf()), hfilePath,<a name="line.632"></a>
-<span class="sourceLineNo">633</span>      CacheConfig.DISABLED, true, getConf())) {<a name="line.633"></a>
-<span class="sourceLineNo">634</span>      first = hfr.getFirstRowKey();<a name="line.634"></a>
-<span class="sourceLineNo">635</span>      last = hfr.getLastRowKey();<a name="line.635"></a>
-<span class="sourceLineNo">636</span>    } catch (FileNotFoundException fnfe) {<a name="line.636"></a>
-<span class="sourceLineNo">637</span>      LOG.debug("encountered", fnfe);<a name="line.637"></a>
-<span class="sourceLineNo">638</span>      return new Pair&lt;&gt;(null, hfilePath.getName());<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    }<a name="line.639"></a>
-<span class="sourceLineNo">640</span><a name="line.640"></a>
-<span class="sourceLineNo">641</span>    LOG.info("Trying to load hfile=" + hfilePath + " first=" + first.map(Bytes::toStringBinary) +<a name="line.641"></a>
-<span class="sourceLineNo">642</span>      " last=" + last.map(Bytes::toStringBinary));<a name="line.642"></a>
-<span class="sourceLineNo">643</span>    if (!first.isPresent() || !last.isPresent()) {<a name="line.643"></a>
-<span class="sourceLineNo">644</span>      assert !first.isPresent() &amp;&amp; !last.isPresent();<a name="line.644"></a>
-<span class="sourceLineNo">645</span>      // TODO what if this is due to a bad HFile?<a name="line.645"></a>
-<span class="sourceLineNo">646</span>      LOG.info("hfile " + hfilePath + " has no entries, skipping");<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      return null;<a name="line.647"></a>
-<span class="sourceLineNo">648</span>    }<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    if (Bytes.compareTo(first.get(), last.get()) &gt; 0) {<a name="line.649"></a>
-<span class="sourceLineNo">650</span>      throw new IllegalArgumentException("Invalid range: " + Bytes.toStringBinary(first.get()) +<a name="line.650"></a>
-<span class="sourceLineNo">651</span>        " &gt; " + Bytes.toStringBinary(last.get()));<a name="line.651"></a>
-<span class="sourceLineNo">652</span>    }<a name="line.652"></a>
-<span class="sourceLineNo">653</span>    int idx =<a name="line.653"></a>
-<span class="sourceLineNo">654</span>      Collections.binarySearch(startEndKeys, Pair.newPair(first.get(), HConstants.EMPTY_END_ROW),<a name="line.654"></a>
-<span class="sourceLineNo">655</span>        (p1, p2) -&gt; Bytes.compareTo(p1.getFirst(), p2.getFirst()));<a name="line.655"></a>
-<span class="sourceLineNo">656</span>    if (idx &lt; 0) {<a name="line.656"></a>
-<span class="sourceLineNo">657</span>      // not on boundary, returns -(insertion index). Calculate region it<a name="line.657"></a>
-<span class="sourceLineNo">658</span>      // would be in.<a name="line.658"></a>
-<span class="sourceLineNo">659</span>      idx = -(idx + 1) - 1;<a name="line.659"></a>
-<span class="sourceLineNo">660</span>    }<a name="line.660"></a>
-<span class="sourceLineNo">661</span>    int indexForCallable = idx;<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>     * we can consider there is a region hole in following conditions. 1) if idx &lt; 0,then first<a name="line.664"></a>
-<span class="sourceLineNo">665</span>     * region info is lost. 2) if the endkey of a region is not equal to the startkey of the next<a name="line.665"></a>
-<span class="sourceLineNo">666</span>     * region. 3) if the endkey of the last region is not empty.<a name="line.666"></a>
-<span class="sourceLineNo">667</span>     */<a name="line.667"></a>
-<span class="sourceLineNo">668</span>    if (indexForCallable &lt; 0) {<a name="line.668"></a>
-<span class="sourceLineNo">669</span>      throw new IOException("The first region info for table " + tableName +<a name="line.669"></a>
-<span class="sourceLineNo">670</span>        " can't be found in hbase:meta.Please use hbck tool to fix it first.");<a name="line.670"></a>
-<span class="sourceLineNo">671</span>    } else if ((indexForCallable == startEndKeys.size() - 1) &amp;&amp;<a name="line.671"></a>
-<span class="sourceLineNo">672</span>      !Bytes.equals(startEndKeys.get(indexForCallable).getSecond(), HConstants.EMPTY_BYTE_ARRAY)) {<a name="line.672"></a>
-<span class="sourceLineNo">673</span>      throw new IOException("The last region info for table " + tableName +<a name="line.673"></a>
-<span class="sourceLineNo">674</span>        " can't be found in hbase:meta.Please use hbck tool to fix it first.");<a name="line.674"></a>
-<span class="sourceLineNo">675</span>    } else if (indexForCallable + 1 &lt; startEndKeys.size() &amp;&amp;<a name="line.675"></a>
-<span class="sourceLineNo">676</span>      !(Bytes.compareTo(startEndKeys.get(indexForCallable).getSecond(),<a name="line.676"></a>
-<span class="sourceLineNo">677</span>        startEndKeys.get(indexForCallable + 1).getFirst()) == 0)) {<a name="line.677"></a>
-<span class="sourceLineNo">678</span>      throw new IOException("The endkey of one region for table " + tableName +<a name="line.678"></a>
-<span class="sourceLineNo">679</span>        " is not equal to the startkey of the next region in hbase:meta." +<a name="line.679"></a>
-<span class="sourceLineNo">680</span>        "Please use hbck tool to fix it first.");<a name="line.680"></a>
-<span class="sourceLineNo">681</span>    }<a name="line.681"></a>
-<span class="sourceLineNo">682</span><a name="line.682"></a>
-<span class="sourceLineNo">683</span>    boolean lastKeyInRange = Bytes.compareTo(last.get(), startEndKeys.get(idx).getSecond()) &lt; 0 ||<a name="line.683"></a>
-<span class="sourceLineNo">684</span>      Bytes.equals(startEndKeys.get(idx).getSecond(), HConstants.EMPTY_BYTE_ARRAY);<a name="line.684"></a>
-<span class="sourceLineNo">685</span>    if (!lastKeyInRange) {<a name="line.685"></a>
-<span class="sourceLineNo">686</span>      Pair&lt;byte[], byte[]&gt; startEndKey = startEndKeys.get(indexForCallable);<a name="line.686"></a>
-<span class="sourceLineNo">687</span>      List&lt;LoadQueueItem&gt; lqis =<a name="line.687"></a>
-<span class="sourceLineNo">688</span>        splitStoreFile(item, FutureUtils.get(conn.getAdmin().getDescriptor(tableName)),<a name="line.688"></a>
-<span class="sourceLineNo">689</span>            startEndKey.getSecond());<a name="line.689"></a>
-<span class="sourceLineNo">690</span>      return new Pair&lt;&gt;(lqis, null);<a name="line.690"></a>
+<span class="sourceLineNo">619</span>   * @param startEndKeys the start/end keys of regions belong to this table, the list in ascending<a name="line.619"></a>
+<span class="sourceLineNo">620</span>   *          order by start key<a name="line.620"></a>
+<span class="sourceLineNo">621</span>   * @param key the key need to find which region belong to<a name="line.621"></a>
+<span class="sourceLineNo">622</span>   * @return region index<a name="line.622"></a>
+<span class="sourceLineNo">623</span>   */<a name="line.623"></a>
+<span class="sourceLineNo">624</span>  private int getRegionIndex(List&lt;Pair&lt;byte[], byte[]&gt;&gt; startEndKeys, byte[] key) {<a name="line.624"></a>
+<span class="sourceLineNo">625</span>    int idx = Collections.binarySearch(startEndKeys, Pair.newPair(key, HConstants.EMPTY_END_ROW),<a name="line.625"></a>
+<span class="sourceLineNo">626</span>      (p1, p2) -&gt; Bytes.compareTo(p1.getFirst(), p2.getFirst()));<a name="line.626"></a>
+<span class="sourceLineNo">627</span>    if (idx &lt; 0) {<a name="line.627"></a>
+<span class="sourceLineNo">628</span>      // not on boundary, returns -(insertion index). Calculate region it<a name="line.628"></a>
+<span class="sourceLineNo">629</span>      // would be in.<a name="line.629"></a>
+<span class="sourceLineNo">630</span>      idx = -(idx + 1) - 1;<a name="line.630"></a>
+<span class="sourceLineNo">631</span>    }<a name="line.631"></a>
+<span class="sourceLineNo">632</span>    return idx;<a name="line.632"></a>
+<span class="sourceLineNo">633</span>  }<a name="line.633"></a>
+<span class="sourceLineNo">634</span><a name="line.634"></a>
+<span class="sourceLineNo">635</span>  /**<a name="line.635"></a>
+<span class="sourceLineNo">636</span>   * we can consider there is a region hole or overlap in following conditions. 1) if idx &lt; 0,then<a name="line.636"></a>
+<span class="sourceLineNo">637</span>   * first region info is lost. 2) if the endkey of a region is not equal to the startkey of the<a name="line.637"></a>
+<span class="sourceLineNo">638</span>   * next region. 3) if the endkey of the last region is not empty.<a name="line.638"></a>
+<span class="sourceLineNo">639</span>   */<a name="line.639"></a>
+<span class="sourceLineNo">640</span>  private void checkRegionIndexValid(int idx, List&lt;Pair&lt;byte[], byte[]&gt;&gt; startEndKeys,<a name="line.640"></a>
+<span class="sourceLineNo">641</span>      TableName tableName) throws IOException {<a name="line.641"></a>
+<span class="sourceLineNo">642</span>    if (idx &lt; 0) {<a name="line.642"></a>
+<span class="sourceLineNo">643</span>      throw new IOException("The first region info for table " + tableName<a name="line.643"></a>
+<span class="sourceLineNo">644</span>          + " can't be found in hbase:meta.Please use hbck tool to fix it first.");<a name="line.644"></a>
+<span class="sourceLineNo">645</span>    } else if ((idx == startEndKeys.size() - 1)<a name="line.645"></a>
+<span class="sourceLineNo">646</span>        &amp;&amp; !Bytes.equals(startEndKeys.get(idx).getSecond(), HConstants.EMPTY_BYTE_ARRAY)) {<a name="line.646"></a>
+<span class="sourceLineNo">647</span>      throw new IOException("The last region info for table " + tableName<a name="line.647"></a>
+<span class="sourceLineNo">648</span>              + " can't be found in hbase:meta.Please use hbck tool to fix it first.");<a name="line.648"></a>
+<span class="sourceLineNo">649</span>    } else if (idx + 1 &lt; startEndKeys.size() &amp;&amp; !(Bytes.compareTo(startEndKeys.get(idx).getSecond(),<a name="line.649"></a>
+<span class="sourceLineNo">650</span>        startEndKeys.get(idx + 1).getFirst()) == 0)) {<a name="line.650"></a>
+<span class="sourceLineNo">651</span>      throw new IOException("The endkey of one region for table " + tableName<a name="line.651"></a>
+<span class="sourceLineNo">652</span>              + " is not equal to the startkey of the next region in hbase:meta."<a name="line.652"></a>
+<span class="sourceLineNo">653</span>              + "Please use hbck tool to fix it first.");<a name="line.653"></a>
+<span class="sourceLineNo">654</span>    }<a name="line.654"></a>
+<span class="sourceLineNo">655</span>  }<a name="line.655"></a>
+<span class="sourceLineNo">656</span><a name="line.656"></a>
+<span class="sourceLineNo">657</span>  /**<a name="line.657"></a>
+<span class="sourceLineNo">658</span>   * Attempt to assign the given load queue item into its target region group. If the hfile boundary<a name="line.658"></a>
+<span class="sourceLineNo">659</span>   * no longer fits into a region, physically splits the hfile such that the new bottom half will<a name="line.659"></a>
+<span class="sourceLineNo">660</span>   * fit and returns the list of LQI's corresponding to the resultant hfiles.<a name="line.660"></a>
+<span class="sourceLineNo">661</span>   * &lt;p/&gt;<a name="line.661"></a>
+<span class="sourceLineNo">662</span>   * protected for testing<a name="line.662"></a>
+<span class="sourceLineNo">663</span>   * @throws IOException if an IO failure is encountered<a name="line.663"></a>
+<span class="sourceLineNo">664</span>   */<a name="line.664"></a>
+<span class="sourceLineNo">665</span>  @VisibleForTesting<a name="line.665"></a>
+<span class="sourceLineNo">666</span>  protected Pair&lt;List&lt;LoadQueueItem&gt;, String&gt; groupOrSplit(AsyncClusterConnection conn,<a name="line.666"></a>
+<span class="sourceLineNo">667</span>      TableName tableName, Multimap&lt;ByteBuffer, LoadQueueItem&gt; regionGroups, LoadQueueItem item,<a name="line.667"></a>
+<span class="sourceLineNo">668</span>      List&lt;Pair&lt;byte[], byte[]&gt;&gt; startEndKeys) throws IOException {<a name="line.668"></a>
+<span class="sourceLineNo">669</span>    Path hfilePath = item.getFilePath();<a name="line.669"></a>
+<span class="sourceLineNo">670</span>    Optional&lt;byte[]&gt; first, last;<a name="line.670"></a>
+<span class="sourceLineNo">671</span>    try (HFile.Reader hfr = HFile.createReader(hfilePath.getFileSystem(getConf()), hfilePath,<a name="line.671"></a>
+<span class="sourceLineNo">672</span>      CacheConfig.DISABLED, true, getConf())) {<a name="line.672"></a>
+<span class="sourceLineNo">673</span>      first = hfr.getFirstRowKey();<a name="line.673"></a>
+<span class="sourceLineNo">674</span>      last = hfr.getLastRowKey();<a name="line.674"></a>
+<span class="sourceLineNo">675</span>    } catch (FileNotFoundException fnfe) {<a name="line.675"></a>
+<span class="sourceLineNo">676</span>      LOG.debug("encountered", fnfe);<a name="line.676"></a>
+<span class="sourceLineNo">677</span>      return new Pair&lt;&gt;(null, hfilePath.getName());<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>    LOG.info("Trying to load hfile=" + hfilePath + " first=" + first.map(Bytes::toStringBinary) +<a name="line.680"></a>
+<span class="sourceLineNo">681</span>      " last=" + last.map(Bytes::toStringBinary));<a name="line.681"></a>
+<span class="sourceLineNo">682</span>    if (!first.isPresent() || !last.isPresent()) {<a name="line.682"></a>
+<span class="sourceLineNo">683</span>      assert !first.isPresent() &amp;&amp; !last.isPresent();<a name="line.683"></a>
+<span class="sourceLineNo">684</span>      // TODO what if this is due to a bad HFile?<a name="line.684"></a>
+<span class="sourceLineNo">685</span>      LOG.info("hfile " + hfilePath + " has no entries, skipping");<a name="line.685"></a>
+<span class="sourceLineNo">686</span>      return null;<a name="line.686"></a>
+<span class="sourceLineNo">687</span>    }<a name="line.687"></a>
+<span class="sourceLineNo">688</span>    if (Bytes.compareTo(first.get(), last.get()) &gt; 0) {<a name="line.688"></a>
+<span class="sourceLineNo">689</span>      throw new IllegalArgumentException("Invalid range: " + Bytes.toStringBinary(first.get())<a name="line.689"></a>
+<span class="sourceLineNo">690</span>          + " &gt; " + Bytes.toStringBinary(last.get()));<a name="line.690"></a>
 <span class="sourceLineNo">691</span>    }<a name="line.691"></a>
-<span class="sourceLineNo">692</span><a name="line.692"></a>
-<span class="sourceLineNo">693</span>    // group regions.<a name="line.693"></a>
-<span class="sourceLineNo">694</span>    regionGroups.put(ByteBuffer.wrap(startEndKeys.get(idx).getFirst()), item);<a name="line.694"></a>
-<span class="sourceLineNo">695</span>    return null;<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>  /**<a name="line.698"></a>
-<span class="sourceLineNo">699</span>   * Split a storefile into a top and bottom half, maintaining the metadata, recreating bloom<a name="line.699"></a>
-<span class="sourceLineNo">700</span>   * filters, etc.<a name="line.700"></a>
-<span class="sourceLineNo">701</span>   */<a name="line.701"></a>
-<span class="sourceLineNo">702</span>  @VisibleForTesting<a name="line.702"></a>
-<span class="sourceLineNo">703</span>  static void splitStoreFile(Configuration conf, Path inFile, ColumnFamilyDescriptor familyDesc,<a name="line.703"></a>
-<span class="sourceLineNo">704</span>      byte[] splitKey, Path bottomOut, Path topOut) throws IOException {<a name="line.704"></a>
-<span class="sourceLineNo">705</span>    // Open reader with no block cache, and not in-memory<a name="line.705"></a>
-<span class="sourceLineNo">706</span>    Reference topReference = Reference.createTopReference(splitKey);<a name="line.706"></a>
-<span class="sourceLineNo">707</span>    Reference bottomReference = Reference.createBottomReference(splitKey);<a name="line.707"></a>
-<span class="sourceLineNo">708</span><a name="line.708"></a>
-<span class="sourceLineNo">709</span>    copyHFileHalf(conf, inFile, topOut, topReference, familyDesc);<a name="line.709"></a>
-<span class="sourceLineNo">710</span>    copyHFileHalf(conf, inFile, bottomOut, bottomReference, familyDesc);<a name="line.710"></a>
-<span class="sourceLineNo">711</span>  }<a name="line.711"></a>
-<span class="sourceLineNo">712</span><a name="line.712"></a>
-<span class="sourceLineNo">713</span>  /**<a name="line.713"></a>
-<span class="sourceLineNo">714</span>   * Copy half of an HFile into a new HFile.<a name="line.714"></a>
-<span class="sourceLineNo">715</span>   */<a name="line.715"></a>
-<span class="sourceLineNo">716</span>  private static void copyHFileHalf(Configuration conf, Path inFile, Path outFile,<a name="line.716"></a>
-<span class="sourceLineNo">717</span>      Reference reference, ColumnFamilyDescriptor familyDescriptor) throws IOException {<a name="line.717"></a>
-<span class="sourceLineNo">718</span>    FileSystem fs = inFile.getFileSystem(conf);<a name="line.718"></a>
-<span class="sourceLineNo">719</span>    CacheConfig cacheConf = CacheConfig.DISABLED;<a name="line.719"></a>
-<span class="sourceLineNo">720</span>    HalfStoreFileReader halfReader = null;<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    StoreFileWriter halfWriter = null;<a name="line.721"></a>
-<span class="sourceLineNo">722</span>    try {<a name="line.722"></a>
-<span class="sourceLineNo">723</span>      ReaderContext context = new ReaderContextBuilder()<a name="line.723"></a>
-<span class="sourceLineNo">724</span>          .withFileSystemAndPath(fs, inFile).build();<a name="line.724"></a>
-<span class="sourceLineNo">725</span>      HFileInfo hfile = new HFileInfo(context, conf);<a name="line.725"></a>
-<span class="sourceLineNo">726</span>      halfReader = new HalfStoreFileReader(context, hfile, cacheConf, reference,<a name="line.726"></a>
-<span class="sourceLineNo">727</span>        new AtomicInteger(0), conf);<a name="line.727"></a>
-<span class="sourceLineNo">728</span>      hfile.initMetaAndIndex(halfReader.getHFileReader());<a name="line.728"></a>
-<span class="sourceLineNo">729</span>      Map&lt;byte[], byte[]&gt; fileInfo = halfReader.loadFileInfo();<a name="line.729"></a>
+<span class="sourceLineNo">692</span>    int firstKeyRegionIdx = getRegionIndex(startEndKeys, first.get());<a name="line.692"></a>
+<span class="sourceLineNo">693</span>    checkRegionIndexValid(firstKeyRegionIdx, startEndKeys, tableName);<a name="line.693"></a>
+<span class="sourceLineNo">694</span>    boolean lastKeyInRange =<a name="line.694"></a>
+<span class="sourceLineNo">695</span>        Bytes.compareTo(last.get(), startEndKeys.get(firstKeyRegionIdx).getSecond()) &lt; 0 || Bytes<a name="line.695"></a>
+<span class="sourceLineNo">696</span>            .equals(startEndKeys.get(firstKeyRegionIdx).getSecond(), HConstants.EMPTY_BYTE_ARRAY);<a name="line.696"></a>
+<span class="sourceLineNo">697</span>    if (!lastKeyInRange) {<a name="line.697"></a>
+<span class="sourceLineNo">698</span>      int lastKeyRegionIdx = getRegionIndex(startEndKeys, last.get());<a name="line.698"></a>
+<span class="sourceLineNo">699</span>      int splitIdx = (firstKeyRegionIdx + lastKeyRegionIdx) / 2;<a name="line.699"></a>
+<span class="sourceLineNo">700</span>      // make sure the splitPoint is valid in case region overlap occur, maybe the splitPoint bigger<a name="line.700"></a>
+<span class="sourceLineNo">701</span>      // than hfile.endkey w/o this check<a name="line.701"></a>
+<span class="sourceLineNo">702</span>      if (splitIdx != firstKeyRegionIdx) {<a name="line.702"></a>
+<span class="sourceLineNo">703</span>        checkRegionIndexValid(splitIdx, startEndKeys, tableName);<a name="line.703"></a>
+<span class="sourceLineNo">704</span>      }<a name="line.704"></a>
+<span class="sourceLineNo">705</span>      byte[] splitPoint = startEndKeys.get(splitIdx).getSecond();<a name="line.705"></a>
+<span class="sourceLineNo">706</span>      List&lt;LoadQueueItem&gt; lqis = splitStoreFile(item,<a name="line.706"></a>
+<span class="sourceLineNo">707</span>        FutureUtils.get(conn.getAdmin().getDescriptor(tableName)), splitPoint);<a name="line.707"></a>
+<span class="sourceLineNo">708</span>      return new Pair&lt;&gt;(lqis, null);<a name="line.708"></a>
+<span class="sourceLineNo">709</span>    }<a name="line.709"></a>
+<span class="sourceLineNo">710</span><a name="line.710"></a>
+<span class="sourceLineNo">711</span>    // group regions.<a name="line.711"></a>
+<span class="sourceLineNo">712</span>    regionGroups.put(ByteBuffer.wrap(startEndKeys.get(firstKeyRegionIdx).getFirst()), item);<a name="line.712"></a>
+<span class="sourceLineNo">713</span>    return null;<a name="line.713"></a>
+<span class="sourceLineNo">714</span>  }<a name="line.714"></a>
+<span class="sourceLineNo">715</span><a name="line.715"></a>
+<span class="sourceLineNo">716</span>  /**<a name="line.716"></a>
+<span class="sourceLineNo">717</span>   * Split a storefile into a top and bottom half, maintaining the metadata, recreating bloom<a name="line.717"></a>
+<span class="sourceLineNo">718</span>   * filters, etc.<a name="line.718"></a>
+<span class="sourceLineNo">719</span>   */<a name="line.719"></a>
+<span class="sourceLineNo">720</span>  @VisibleForTesting<a name="line.720"></a>
+<span class="sourceLineNo">721</span>  static void splitStoreFile(Configuration conf, Path inFile, ColumnFamilyDescriptor familyDesc,<a name="line.721"></a>
+<span class="sourceLineNo">722</span>      byte[] splitKey, Path bottomOut, Path topOut) throws IOException {<a name="line.722"></a>
+<span class="sourceLineNo">723</span>    // Open reader with no block cache, and not in-memory<a name="line.723"></a>
+<span class="sourceLineNo">724</span>    Reference topReference = Reference.createTopReference(splitKey);<a name="line.724"></a>
+<span class="sourceLineNo">725</span>    Reference bottomReference = Reference.createBottomReference(splitKey);<a name="line.725"></a>
+<span class="sourceLineNo">726</span><a name="line.726"></a>
+<span class="sourceLineNo">727</span>    copyHFileHalf(conf, inFile, topOut, topReference, familyDesc);<a name="line.727"></a>
+<span class="sourceLineNo">728</span>    copyHFileHalf(conf, inFile, bottomOut, bottomReference, familyDesc);<a name="line.728"></a>
+<span class="sourceLineNo">729</span>  }<a name="line.729"></a>
 <span class="sourceLineNo">730</span><a name="line.730"></a>
-<span class="sourceLineNo">731</span>      int blocksize = familyDescriptor.getBlocksize();<a name="line.731"></a>
-<span class="sourceLineNo">732</span>      Algorithm compression = familyDescriptor.getCompressionType();<a name="line.732"></a>
-<span class="sourceLineNo">733</span>      BloomType bloomFilterType = familyDescriptor.getBloomFilterType();<a name="line.733"></a>
-<span class="sourceLineNo">734</span>      HFileContext hFileContext = new HFileContextBuilder().withCompression(compression)<a name="line.734"></a>
-<span class="sourceLineNo">735</span>        .withChecksumType(HStore.getChecksumType(conf))<a name="line.735"></a>
-<span class="sourceLineNo">736</span>        .withBytesPerCheckSum(HStore.getBytesPerChecksum(conf)).withBlockSize(blocksize)<a name="line.736"></a>
-<span class="sourceLineNo">737</span>        .withDataBlockEncoding(familyDescriptor.getDataBlockEncoding()).withIncludesTags(true)<a name="line.737"></a>
-<span class="sourceLineNo">738</span>        .build();<a name="line.738"></a>
-<span class="sourceLineNo">739</span>      halfWriter = new StoreFileWriter.Builder(conf, cacheConf, fs).withFilePath(outFile)<a name="line.739"></a>
-<span class="sourceLineNo">740</span>        .withBloomType(bloomFilterType).withFileContext(hFileContext).build();<a name="line.740"></a>
-<span class="sourceLineNo">741</span>      HFileScanner scanner = halfReader.getScanner(false, false, false);<a name="line.741"></a>
-<span class="sourceLineNo">742</span>      scanner.seekTo();<a name="line.742"></a>
-<span class="sourceLineNo">743</span>      do {<a name="line.743"></a>
-<span class="sourceLineNo">744</span>        halfWriter.append(scanner.getCell());<a name="line.744"></a>
-<span class="sourceLineNo">745</span>      } while (scanner.next());<a name="line.745"></a>
-<span class="sourceLineNo">746</span><a name="line.746"></a>
-<span class="sourceLineNo">747</span>      for (Map.Entry&lt;byte[], byte[]&gt; entry : fileInfo.entrySet()) {<a name="line.747"></a>
-<span class="sourceLineNo">748</span>        if (shouldCopyHFileMetaKey(entry.getKey())) {<a name="line.748"></a>
-<span class="sourceLineNo">749</span>          halfWriter.appendFileInfo(entry.getKey(), entry.getValue());<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>    } finally {<a name="line.752"></a>
-<span class="sourceLineNo">753</span>      if (halfReader != null) {<a name="line.753"></a>
-<span class="sourceLineNo">754</span>        try {<a name="line.754"></a>
-<span class="sourceLineNo">755</span>          halfReader.close(cacheConf.shouldEvictOnClose());<a name="line.755"></a>
-<span class="sourceLineNo">756</span>        } catch (IOException e) {<a name="line.756"></a>
-<span class="sourceLineNo">757</span>          LOG.warn("failed to close hfile reader for " + inFile, e);<a name="line.757"></a>
-<span class="sourceLineNo">758</span>        }<a name="line.758"></a>
-<span class="sourceLineNo">759</span>      }<a name="line.759"></a>
-<span class="sourceLineNo">760</span>      if (halfWriter != null) {<a name="line.760"></a>
-<span class="sourceLineNo">761</span>        halfWriter.close();<a name="line.761"></a>
-<span class="sourceLineNo">762</span>      }<a name="line.762"></a>
-<span class="sourceLineNo">763</span>    }<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>  /**<a name="line.766"></a>
-<span class="sourceLineNo">767</span>   * Infers region boundaries for a new table.<a name="line.767"></a>
-<span class="sourceLineNo">768</span>   * &lt;p/&gt;<a name="line.768"></a>
-<span class="sourceLineNo">769</span>   * Parameter: &lt;br/&gt;<a name="line.769"></a>
-<span class="sourceLineNo">770</span>   * bdryMap is a map between keys to an integer belonging to {+1, -1}<a name="line.770"></a>
-<span class="sourceLineNo">771</span>   * &lt;ul&gt;<a name="line.771"></a>
-<span class="sourceLineNo">772</span>   * &lt;li&gt;If a key is a start key of a file, then it maps to +1&lt;/li&gt;<a name="line.772"></a>
-<span class="sourceLineNo">773</span>   * &lt;li&gt;If a key is an end key of a file, then it maps to -1&lt;/li&gt;<a name="line.773"></a>
-<span class="sourceLineNo">774</span>   * &lt;/ul&gt;<a name="line.774"></a>
-<span class="sourceLineNo">775</span>   * &lt;p&gt;<a name="line.775"></a>
-<span class="sourceLineNo">776</span>   * Algo:&lt;br/&gt;<a name="line.776"></a>
-<span class="sourceLineNo">777</span>   * &lt;ol&gt;<a name="line.777"></a>
-<span class="sourceLineNo">778</span>   * &lt;li&gt;Poll on the keys in order:<a name="line.778"></a>
-<span class="sourceLineNo">779</span>   * &lt;ol type="a"&gt;<a name="line.779"></a>
-<span class="sourceLineNo">780</span>   * &lt;li&gt;Keep adding the mapped values to these keys (runningSum)&lt;/li&gt;<a name="line.780"></a>
-<span class="sourceLineNo">781</span>   * &lt;li&gt;Each time runningSum reaches 0, add the start Key from when the runningSum had started to a<a name="line.781"></a>
-<span class="sourceLineNo">782</span>   * boundary list.&lt;/li&gt;<a name="line.782"></a>
-<span class="sourceLineNo">783</span>   * &lt;/ol&gt;<a name="line.783"></a>
-<span class="sourceLineNo">784</span>   * &lt;/li&gt;<a name="line.784"></a>
-<span class="sourceLineNo">785</span>   * &lt;li&gt;Return the boundary list.&lt;/li&gt;<a name="line.785"></a>
-<span class="sourceLineNo">786</span>   * &lt;/ol&gt;<a name="line.786"></a>
-<span class="sourceLineNo">787</span>   */<a name="line.787"></a>
-<span class="sourceLineNo">788</span>  public static byte[][] inferBoundaries(SortedMap&lt;byte[], Integer&gt; bdryMap) {<a name="line.788"></a>
-<span class="sourceLineNo">789</span>    List&lt;byte[]&gt; keysArray = new ArrayList&lt;&gt;();<a name="line.789"></a>
-<span class="sourceLineNo">790</span>    int runningValue = 0;<a name="line.790"></a>
-<span class="sourceLineNo">791</span>    byte[] currStartKey = null;<a name="line.791"></a>
-<span class="sourceLineNo">792</span>    boolean firstBoundary = true;<a name="line.792"></a>
-<span class="sourceLineNo">793</span><a name="line.793"></a>
-<span class="sourceLineNo">794</span>    for (Map.Entry&lt;byte[], Integer&gt; item : bdryMap.entrySet()) {<a name="line.794"></a>
-<span class="sourceLineNo">795</span>      if (runningValue == 0) {<a name="line.795"></a>
-<span class="sourceLineNo">796</span>        currStartKey = item.getKey();<a name="line.796"></a>
-<span class="sourceLineNo">797</span>      }<a name="line.797"></a>
-<span class="sourceLineNo">798</span>      runningValue += item.getValue();<a name="line.798"></a>
-<span class="sourceLineNo">799</span>      if (runningValue == 0) {<a name="line.799"></a>
-<span class="sourceLineNo">800</span>        if (!firstBoundary) {<a name="line.800"></a>
-<span class="sourceLineNo">801</span>          keysArray.add(currStartKey);<a name="line.801"></a>
-<span class="sourceLineNo">802</span>        }<a name="line.802"></a>
-<span class="sourceLineNo">803</span>        firstBoundary = false;<a name="line.803"></a>
-<span class="sourceLineNo">804</span>      }<a name="line.804"></a>
-<span class="sourceLineNo">805</span>    }<a name="line.805"></a>
-<span class="sourceLineNo">806</span><a name="line.806"></a>
-<span class="sourceLineNo">807</span>    return keysArray.toArray(new byte[0][]);<a name="line.807"></a>
-<span class="sourceLineNo">808</span>  }<a name="line.808"></a>
-<span class="sourceLineNo">809</span><a name="line.809"></a>
-<span class="sourceLineNo">810</span>  /**<a name="line.810"></a>
-<span class="sourceLineNo">811</span>   * If the table is created for the first time, then "completebulkload" reads the files twice. More<a name="line.811"></a>
-<span class="sourceLineNo">812</span>   * modifications necessary if we want to avoid doing it.<a name="line.812"></a>
-<span class="sourceLineNo">813</span>   */<a name="line.813"></a>
-<span class="sourceLineNo">814</span>  private void createTable(TableName tableName, Path hfofDir, AsyncAdmin admin) throws IOException {<a name="line.814"></a>
-<span class="sourceLineNo">815</span>    final FileSystem fs = hfofDir.getFileSystem(getConf());<a name="line.815"></a>
-<span class="sourceLineNo">816</span><a name="line.816"></a>
-<span class="sourceLineNo">817</span>    // Add column families<a name="line.817"></a>
-<span class="sourceLineNo">818</span>    // Build a set of keys<a name="line.818"></a>
-<span class="sourceLineNo">819</span>    List&lt;ColumnFamilyDescriptorBuilder&gt; familyBuilders = new ArrayList&lt;&gt;();<a name="line.819"></a>
-<span class="sourceLineNo">820</span>    SortedMap&lt;byte[], Integer&gt; map = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.820"></a>
-<span class="sourceLineNo">821</span>    visitBulkHFiles(fs, hfofDir, new BulkHFileVisitor&lt;ColumnFamilyDescriptorBuilder&gt;() {<a name="line.821"></a>
-<span class="sourceLineNo">822</span>      @Override<a name="line.822"></a>
-<span class="sourceLineNo">823</span>      public ColumnFamilyDescriptorBuilder bulkFamily(byte[] familyName) {<a name="line.823"></a>
-<span class="sourceLineNo">824</span>        ColumnFamilyDescriptorBuilder builder =<a name="line.824"></a>
-<span class="sourceLineNo">825</span>          ColumnFamilyDescriptorBuilder.newBuilder(familyName);<a name="line.825"></a>
-<span class="sourceLineNo">826</span>        familyBuilders.add(builder);<a name="line.826"></a>
-<span class="sourceLineNo">827</span>        return builder;<a name="line.827"></a>
-<span class="sourceLineNo">828</span>      }<a name="line.828"></a>
-<span class="sourceLineNo">829</span><a name="line.829"></a>
-<span class="sourceLineNo">830</span>      @Override<a name="line.830"></a>
-<span class="sourceLineNo">831</span>      public void bulkHFile(ColumnFamilyDescriptorBuilder builder, FileStatus hfileStatus)<a name="line.831"></a>
-<span class="sourceLineNo">832</span>          throws IOException {<a name="line.832"></a>
-<span class="sourceLineNo">833</span>        Path hfile = hfileStatus.getPath();<a name="line.833"></a>
-<span class="sourceLineNo">834</span>        try (HFile.Reader reader =<a name="line.834"></a>
-<span class="sourceLineNo">835</span>          HFile.createReader(fs, hfile, CacheConfig.DISABLED, true, getConf())) {<a name="line.835"></a>
-<span class="sourceLineNo">836</span>          if (builder.getCompressionType() != reader.getFileContext().getCompression()) {<a name="line.836"></a>
-<span class="sourceLineNo">837</span>            builder.setCompressionType(reader.getFileContext().getCompression());<a name="line.837"></a>
-<span class="sourceLineNo">838</span>            LOG.info("Setting compression " + reader.getFileContext().getCompression().name() +<a name="line.838"></a>
-<span class="sourceLineNo">839</span>              " for family " + builder.getNameAsString());<a name="line.839"></a>
-<span class="sourceLineNo">840</span>          }<a name="line.840"></a>
-<span class="sourceLineNo">841</span>          byte[] first = reader.getFirstRowKey().get();<a name="line.841"></a>
-<span class="sourceLineNo">842</span>          byte[] last = reader.getLastRowKey().get();<a name="line.842"></a>
-<span class="sourceLineNo">843</span><a name="line.843"></a>
-<span class="sourceLineNo">844</span>          LOG.info("Trying to figure out region boundaries hfile=" + hfile + " first=" +<a name="line.844"></a>
-<span class="sourceLineNo">845</span>            Bytes.toStringBinary(first) + " last=" + Bytes.toStringBinary(last));<a name="line.845"></a>
-<span class="sourceLineNo">846</span><a name="line.846"></a>
-<span class="sourceLineNo">847</span>          // To eventually infer start key-end key boundaries<a name="line.847"></a>
-<span class="sourceLineNo">848</span>          Integer value = map.getOrDefault(first, 0);<a name="line.848"></a>
-<span class="sourceLineNo">849</span>          map.put(first, value + 1);<a name="line.849"></a>
-<span class="sourceLineNo">850</span><a name="line.850"></a>
-<span class="sourceLineNo">851</span>          value = map.containsKey(last) ? map.get(last) : 0;<a name="line.851"></a>
-<span class="sourceLineNo">852</span>          map.put(last, value - 1);<a name="line.852"></a>
-<span class="sourceLineNo">853</span>        }<a name="line.853"></a>
-<span class="sourceLineNo">854</span>      }<a name="line.854"></a>
-<span class="sourceLineNo">855</span>    }, true);<a name="line.855"></a>
-<span class="sourceLineNo">856</span><a name="line.856"></a>
-<span class="sourceLineNo">857</span>    byte[][] keys = inferBoundaries(map);<a name="line.857"></a>
-<span class="sourceLineNo">858</span>    TableDescriptorBuilder tdBuilder = TableDescriptorBuilder.newBuilder(tableName);<a name="line.858"></a>
-<span class="sourceLineNo">859</span>    familyBuilders.stream().map(ColumnFamilyDescriptorBuilder::build)<a name="line.859"></a>
-<span class="sourceLineNo">860</span>      .forEachOrdered(tdBuilder::setColumnFamily);<a name="line.860"></a>
-<span class="sourceLineNo">861</span>    FutureUtils.get(admin.createTable(tdBuilder.build(), keys));<a name="line.861"></a>
-<span class="sourceLineNo">862</span><a name="line.862"></a>
-<span class="sourceLineNo">863</span>    LOG.info("Table " + tableName + " is available!!");<a name="line.863"></a>
-<span class="sourceLineNo">864</span>  }<a name="line.864"></a>
-<span class="sourceLineNo">865</span><a name="line.865"></a>
-<span class="sourceLineNo">866</span>  private Map&lt;LoadQueueItem, ByteBuffer&gt; performBulkLoad(AsyncClusterConnection conn,<a name="line.866"></a>
-<span class="sourceLineNo">867</span>      TableName tableName, Deque&lt;LoadQueueItem&gt; queue, ExecutorService pool, boolean copyFile)<a name="line.867"></a>
-<span class="sourceLineNo">868</span>      throws IOException {<a name="line.868"></a>
-<span class="sourceLineNo">869</span>    int count = 0;<a name="line.869"></a>
-<span class="sourceLineNo">870</span><a name="line.870"></a>
-<span class="sourceLineNo">871</span>    fsDelegationToken.acquireDelegationToken(queue.peek().getFilePath().getFileSystem(getConf()));<a name="line.871"></a>
-<span class="sourceLineNo">872</span>    bulkToken = FutureUtils.get(conn.prepareBulkLoad(tableName));<a name="line.872"></a>
-<span class="sourceLineNo">873</span>    Pair&lt;Multimap&lt;ByteBuffer, LoadQueueItem&gt;, Set&lt;String&gt;&gt; pair = null;<a name="line.873"></a>
+<span class="sourceLineNo">731</span>  /**<a name="line.731"></a>
+<span class="sourceLineNo">732</span>   * Copy half of an HFile into a new HFile.<a name="line.732"></a>
+<span class="sourceLineNo">733</span>   */<a name="line.733"></a>
+<span class="sourceLineNo">734</span>  private static void copyHFileHalf(Configuration conf, Path inFile, Path outFile,<a name="line.734"></a>
+<span class="sourceLineNo">735</span>      Reference reference, ColumnFamilyDescriptor familyDescriptor) throws IOException {<a name="line.735"></a>
+<span class="sourceLineNo">736</span>    FileSystem fs = inFile.getFileSystem(conf);<a name="line.736"></a>
+<span class="sourceLineNo">737</span>    CacheConfig cacheConf = CacheConfig.DISABLED;<a name="line.737"></a>
+<span class="sourceLineNo">738</span>    HalfStoreFileReader halfReader = null;<a name="line.738"></a>
+<span class="sourceLineNo">739</span>    StoreFileWriter halfWriter = null;<a name="line.739"></a>
+<span class="sourceLineNo">740</span>    try {<a name="line.740"></a>
+<span class="sourceLineNo">741</span>      ReaderContext context = new ReaderContextBuilder()<a name="line.741"></a>
+<span class="sourceLineNo">742</span>          .withFileSystemAndPath(fs, inFile).build();<a name="line.742"></a>
+<span class="sourceLineNo">743</span>      HFileInfo hfile = new HFileInfo(context, conf);<a name="line.743"></a>
+<span class="sourceLineNo">744</span>      halfReader = new HalfStoreFileReader(context, hfile, cacheConf, reference,<a name="line.744"></a>
+<span class="sourceLineNo">745</span>        new AtomicInteger(0), conf);<a name="line.745"></a>
+<span class="sourceLineNo">746</span>      hfile.initMetaAndIndex(halfReader.getHFileReader());<a name="line.746"></a>
+<span class="sourceLineNo">747</span>      Map&lt;byte[], byte[]&gt; fileInfo = halfReader.loadFileInfo();<a name="line.747"></a>
+<span class="sourceLineNo">748</span><a name="line.748"></a>
+<span class="sourceLineNo">749</span>      int blocksize = familyDescriptor.getBlocksize();<a name="line.749"></a>
+<span class="sourceLineNo">750</span>      Algorithm compression = familyDescriptor.getCompressionType();<a name="line.750"></a>
+<span class="sourceLineNo">751</span>      BloomType bloomFilterType = familyDescriptor.getBloomFilterType();<a name="line.751"></a>
+<span class="sourceLineNo">752</span>      HFileContext hFileContext = new HFileContextBuilder().withCompression(compression)<a name="line.752"></a>
+<span class="sourceLineNo">753</span>        .withChecksumType(HStore.getChecksumType(conf))<a name="line.753"></a>
+<span class="sourceLineNo">754</span>        .withBytesPerCheckSum(HStore.getBytesPerChecksum(conf)).withBlockSize(blocksize)<a name="line.754"></a>
+<span class="sourceLineNo">755</span>        .withDataBlockEncoding(familyDescriptor.getDataBlockEncoding()).withIncludesTags(true)<a name="line.755"></a>
+<span class="sourceLineNo">756</span>        .build();<a name="line.756"></a>
+<span class="sourceLineNo">757</span>      halfWriter = new StoreFileWriter.Builder(conf, cacheConf, fs).withFilePath(outFile)<a name="line.757"></a>
+<span class="sourceLineNo">758</span>        .withBloomType(bloomFilterType).withFileContext(hFileContext).build();<a name="line.758"></a>
+<span class="sourceLineNo">759</span>      HFileScanner scanner = halfReader.getScanner(false, false, false);<a name="line.759"></a>
+<span class="sourceLineNo">760</span>      scanner.seekTo();<a name="line.760"></a>
+<span class="sourceLineNo">761</span>      do {<a name="line.761"></a>
+<span class="sourceLineNo">762</span>        halfWriter.append(scanner.getCell());<a name="line.762"></a>
+<span class="sourceLineNo">763</span>      } while (scanner.next());<a name="line.763"></a>
+<span class="sourceLineNo">764</span><a name="line.764"></a>
+<span class="sourceLineNo">765</span>      for (Map.Entry&lt;byte[], byte[]&gt; entry : fileInfo.entrySet()) {<a name="line.765"></a>
+<span class="sourceLineNo">766</span>        if (shouldCopyHFileMetaKey(entry.getKey())) {<a name="line.766"></a>
+<span class="sourceLineNo">767</span>          halfWriter.appendFileInfo(entry.getKey(), entry.getValue());<a name="line.767"></a>
+<span class="sourceLineNo">768</span>        }<a name="line.768"></a>
+<span class="sourceLineNo">769</span>      }<a name="line.769"></a>
+<span class="sourceLineNo">770</span>    } finally {<a name="line.770"></a>
+<span class="sourceLineNo">771</span>      if (halfReader != null) {<a name="line.771"></a>
+<span class="sourceLineNo">772</span>        try {<a name="line.772"></a>
+<span class="sourceLineNo">773</span>          halfReader.close(cacheConf.shouldEvictOnClose());<a name="line.773"></a>
+<span class="sourceLineNo">774</span>        } catch (IOException e) {<a name="line.774"></a>
+<span class="sourceLineNo">775</span>          LOG.warn("failed to close hfile reader for " + inFile, e);<a name="line.775"></a>
+<span class="sourceLineNo">776</span>        }<a name="line.776"></a>
+<span class="sourceLineNo">777</span>      }<a name="line.777"></a>
+<span class="sourceLineNo">778</span>      if (halfWriter != null) {<a name="line.778"></a>
+<span class="sourceLineNo">779</span>        halfWriter.close();<a name="line.779"></a>
+<span class="sourceLineNo">780</span>      }<a name="line.780"></a>
+<span class="sourceLineNo">781</span>    }<a name="line.781"></a>
+<span class="sourceLineNo">782</span>  }<a name="line.782"></a>
+<span class="sourceLineNo">783</span><a name="line.783"></a>
+<span class="sourceLineNo">784</span>  /**<a name="line.784"></a>
+<span class="sourceLineNo">785</span>   * Infers region boundaries for a new table.<a name="line.785"></a>
+<span class="sourceLineNo">786</span>   * &lt;p/&gt;<a name="line.786"></a>
+<span class="sourceLineNo">787</span>   * Parameter: &lt;br/&gt;<a name="line.787"></a>
+<span class="sourceLineNo">788</span>   * bdryMap is a map between keys to an integer belonging to {+1, -1}<a name="line.788"></a>
+<span class="sourceLineNo">789</span>   * &lt;ul&gt;<a name="line.789"></a>
+<span class="sourceLineNo">790</span>   * &lt;li&gt;If a key is a start key of a file, then it maps to +1&lt;/li&gt;<a name="line.790"></a>
+<span class="sourceLineNo">791</span>   * &lt;li&gt;If a key is an end key of a file, then it maps to -1&lt;/li&gt;<a name="line.791"></a>
+<span class="sourceLineNo">792</span>   * &lt;/ul&gt;<a name="line.792"></a>
+<span class="sourceLineNo">793</span>   * &lt;p&gt;<a name="line.793"></a>
+<span class="sourceLineNo">794</span>   * Algo:&lt;br/&gt;<a name="line.794"></a>
+<span class="sourceLineNo">795</span>   * &lt;ol&gt;<a name="line.795"></a>
+<span class="sourceLineNo">796</span>   * &lt;li&gt;Poll on the keys in order:<a name="line.796"></a>
+<span class="sourceLineNo">797</span>   * &lt;ol type="a"&gt;<a name="line.797"></a>
+<span class="sourceLineNo">798</span>   * &lt;li&gt;Keep adding the mapped values to these keys (runningSum)&lt;/li&gt;<a name="line.798"></a>
+<span class="sourceLineNo">799</span>   * &lt;li&gt;Each time runningSum reaches 0, add the start Key from when the runningSum had started to a<a name="line.799"></a>
+<span class="sourceLineNo">800</span>   * boundary list.&lt;/li&gt;<a name="line.800"></a>
+<span class="sourceLineNo">801</span>   * &lt;/ol&gt;<a name="line.801"></a>
+<span class="sourceLineNo">802</span>   * &lt;/li&gt;<a name="line.802"></a>
+<span class="sourceLineNo">803</span>   * &lt;li&gt;Return the boundary list.&lt;/li&gt;<a name="line.803"></a>
+<span class="sourceLineNo">804</span>   * &lt;/ol&gt;<a name="line.804"></a>
+<span class="sourceLineNo">805</span>   */<a name="line.805"></a>
+<span class="sourceLineNo">806</span>  public static byte[][] inferBoundaries(SortedMap&lt;byte[], Integer&gt; bdryMap) {<a name="line.806"></a>
+<span class="sourceLineNo">807</span>    List&lt;byte[]&gt; keysArray = new ArrayList&lt;&gt;();<a name="line.807"></a>
+<span class="sourceLineNo">808</span>    int runningValue = 0;<a name="line.808"></a>
+<span class="sourceLineNo">809</span>    byte[] currStartKey = null;<a name="line.809"></a>
+<span class="sourceLineNo">810</span>    boolean firstBoundary = true;<a name="line.810"></a>
+<span class="sourceLineNo">811</span><a name="line.811"></a>
+<span class="sourceLineNo">812</span>    for (Map.Entry&lt;byte[], Integer&gt; item : bdryMap.entrySet()) {<a name="line.812"></a>
+<span class="sourceLineNo">813</span>      if (runningValue == 0) {<a name="line.813"></a>
+<span class="sourceLineNo">814</span>        currStartKey = item.getKey();<a name="line.814"></a>
+<span class="sourceLineNo">815</span>      }<a name="line.815"></a>
+<span class="sourceLineNo">816</span>      runningValue += item.getValue();<a name="line.816"></a>
+<span class="sourceLineNo">817</span>      if (runningValue == 0) {<a name="line.817"></a>
+<span class="sourceLineNo">818</span>        if (!firstBoundary) {<a name="line.818"></a>
+<span class="sourceLineNo">819</span>          keysArray.add(currStartKey);<a name="line.819"></a>
+<span class="sourceLineNo">820</span>        }<a name="line.820"></a>
+<span class="sourceLineNo">821</span>        firstBoundary = false;<a name="line.821"></a>
+<span class="sourceLineNo">822</span>      }<a name="line.822"></a>
+<span class="sourceLineNo">823</span>    }<a name="line.823"></a>
+<span class="sourceLineNo">824</span><a name="line.824"></a>
+<span class="sourceLineNo">825</span>    return keysArray.toArray(new byte[0][]);<a name="line.825"></a>
+<span class="sourceLineNo">826</span>  }<a name="line.826"></a>
+<span class="sourceLineNo">827</span><a name="line.827"></a>
+<span class="sourceLineNo">828</span>  /**<a name="line.828"></a>
+<span class="sourceLineNo">829</span>   * If the table is created for the first time, then "completebulkload" reads the files twice. More<a name="line.829"></a>
+<span class="sourceLineNo">830</span>   * modifications necessary if we want to avoid doing it.<a name="line.830"></a>
+<span class="sourceLineNo">831</span>   */<a name="line.831"></a>
+<span class="sourceLineNo">832</span>  private void createTable(TableName tableName, Path hfofDir, AsyncAdmin admin) throws IOException {<a name="line.832"></a>
+<span class="sourceLineNo">833</span>    final FileSystem fs = hfofDir.getFileSystem(getConf());<a name="line.833"></a>
+<span class="sourceLineNo">834</span><a name="line.834"></a>
+<span class="sourceLineNo">835</span>    // Add column families<a name="line.835"></a>
+<span class="sourceLineNo">836</span>    // Build a set of keys<a name="line.836"></a>
+<span class="sourceLineNo">837</span>    List&lt;ColumnFamilyDescriptorBuilder&gt; familyBuilders = new ArrayList&lt;&gt;();<a name="line.837"></a>
+<span class="sourceLineNo">838</span>    SortedMap&lt;byte[], Integer&gt; map = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.838"></a>
+<span class="sourceLineNo">839</span>    visitBulkHFiles(fs, hfofDir, new BulkHFileVisitor&lt;ColumnFamilyDescriptorBuilder&gt;() {<a name="line.839"></a>
+<span class="sourceLineNo">840</span>      @Override<a name="line.840"></a>
+<span class="sourceLineNo">841</span>      public ColumnFamilyDescriptorBuilder bulkFamily(byte[] familyName) {<a name="line.841"></a>
+<span class="sourceLineNo">842</span>        ColumnFamilyDescriptorBuilder builder =<a name="line.842"></a>
+<span class="sourceLineNo">843</span>          ColumnFamilyDescriptorBuilder.newBuilder(familyName);<a name="line.843"></a>
+<span class="sourceLineNo">844</span>        familyBuilders.add(builder);<a name="line.844"></a>
+<span class="sourceLineNo">845</span>        return builder;<a name="line.845"></a>
+<span class="sourceLineNo">846</span>      }<a name="line.846"></a>
+<span class="sourceLineNo">847</span><a name="line.847"></a>
+<span class="sourceLineNo">848</span>      @Override<a name="line.848"></a>
+<span class="sourceLineNo">849</span>      public void bulkHFile(ColumnFamilyDescriptorBuilder builder, FileStatus hfileStatus)<a name="line.849"></a>
+<span class="sourceLineNo">850</span>          throws IOException {<a name="line.850"></a>
+<span class="sourceLineNo">851</span>        Path hfile = hfileStatus.getPath();<a name="line.851"></a>
+<span class="sourceLineNo">852</span>        try (HFile.Reader reader =<a name="line.852"></a>
+<span class="sourceLineNo">853</span>          HFile.createReader(fs, hfile, CacheConfig.DISABLED, true, getConf())) {<a name="line.853"></a>
+<span class="sourceLineNo">854</span>          if (builder.getCompressionType() != reader.getFileContext().getCompression()) {<a name="line.854"></a>
+<span class="sourceLineNo">855</span>            builder.setCompressionType(reader.getFileContext().getCompression());<a name="line.855"></a>
+<span class="sourceLineNo">856</span>            LOG.info("Setting compression " + reader.getFileContext().getCompression().name() +<a name="line.856"></a>
+<span class="sourceLineNo">857</span>              " for family " + builder.getNameAsString());<a name="line.857"></a>
+<span class="sourceLineNo">858</span>          }<a name="line.858"></a>
+<span class="sourceLineNo">859</span>          byte[] first = reader.getFirstRowKey().get();<a name="line.859"></a>
+<span class="sourceLineNo">860</span>          byte[] last = reader.getLastRowKey().get();<a name="line.860"></a>
+<span class="sourceLineNo">861</span><a name="line.861"></a>
+<span class="sourceLineNo">862</span>          LOG.info("Trying to figure out region boundaries hfile=" + hfile + " first=" +<a name="line.862"></a>
+<span class="sourceLineNo">863</span>            Bytes.toStringBinary(first) + " last=" + Bytes.toStringBinary(last));<a name="line.863"></a>
+<span class="sourceLineNo">864</span><a name="line.864"></a>
+<span class="sourceLineNo">865</span>          // To eventually infer start key-end key boundaries<a name="line.865"></a>
+<span class="sourceLineNo">866</span>          Integer value = map.getOrDefault(first, 0);<a name="line.866"></a>
+<span class="sourceLineNo">867</span>          map.put(first, value + 1);<a name="line.867"></a>
+<span class="sourceLineNo">868</span><a name="line.868"></a>
+<span class="sourceLineNo">869</span>          value = map.containsKey(last) ? map.get(last) : 0;<a name="line.869"></a>
+<span class="sourceLineNo">870</span>          map.put(last, value - 1);<a name="line.870"></a>
+<span class="sourceLineNo">871</span>        }<a name="line.871"></a>
+<span class="sourceLineNo">872</span>      }<a name="line.872"></a>
+<span class="sourceLineNo">873</span>    }, true);<a name="line.873"></a>
 <span class="sourceLineNo">874</span><a name="line.874"></a>
-<span class="sourceLineNo">875</span>    Map&lt;LoadQueueItem, ByteBuffer&gt; item2RegionMap = new HashMap&lt;&gt;();<a name="line.875"></a>
-<span class="sourceLineNo">876</span>    // Assumes that region splits can happen while this occurs.<a name="line.876"></a>
-<span class="sourceLineNo">877</span>    while (!queue.isEmpty()) {<a name="line.877"></a>
-<span class="sourceLineNo">878</span>      // need to reload split keys each iteration.<a name="line.878"></a>
-<span class="sourceLineNo">879</span>      final List&lt;Pair&lt;byte[], byte[]&gt;&gt; startEndKeys =<a name="line.879"></a>
-<span class="sourceLineNo">880</span>        FutureUtils.get(conn.getRegionLocator(tableName).getStartEndKeys());<a name="line.880"></a>
-<span class="sourceLineNo">881</span>      if (count != 0) {<a name="line.881"></a>
-<span class="sourceLineNo">882</span>        LOG.info("Split occurred while grouping HFiles, retry attempt " + count + " with " +<a name="line.882"></a>
-<span class="sourceLineNo">883</span>          queue.size() + " files remaining to group or split");<a name="line.883"></a>
-<span class="sourceLineNo">884</span>      }<a name="line.884"></a>
-<span class="sourceLineNo">885</span><a name="line.885"></a>
-<span class="sourceLineNo">886</span>      int maxRetries = getConf().getInt(HConstants.BULKLOAD_MAX_RETRIES_NUMBER, 10);<a name="line.886"></a>
-<span class="sourceLineNo">887</span>      maxRetries = Math.max(maxRetries, startEndKeys.size() + 1);<a name="line.887"></a>
-<span class="sourceLineNo">888</span>      if (maxRetries != 0 &amp;&amp; count &gt;= maxRetries) {<a name="line.888"></a>
-<span class="sourceLineNo">889</span>        throw new IOException(<a name="line.889"></a>
-<span class="sourceLineNo">890</span>          "Retry attempted " + count + " times without completing, bailing out");<a name="line.890"></a>
-<span class="sourceLineNo">891</span>      }<a name="line.891"></a>
-<span class="sourceLineNo">892</span>      count++;<a name="line.892"></a>
-<span class="sourceLineNo">893</span><a name="line.893"></a>
-<span class="sourceLineNo">894</span>      // Using ByteBuffer for byte[] equality semantics<a name="line.894"></a>
-<span class="sourceLineNo">895</span>      pair = groupOrSplitPhase(conn, tableName, pool, queue, startEndKeys);<a name="line.895"></a>
-<span class="sourceLineNo">896</span>      Multimap&lt;ByteBuffer, LoadQueueItem&gt; regionGroups = pair.getFirst();<a name="line.896"></a>
-<span class="sourceLineNo">897</span><a name="line.897"></a>
-<span class="sourceLineNo">898</span>      if (!checkHFilesCountPerRegionPerFamily(regionGroups)) {<a name="line.898"></a>
-<span class="sourceLineNo">899</span>        // Error is logged inside checkHFilesCountPerRegionPerFamily.<a name="line.899"></a>
-<span class="sourceLineNo">900</span>        throw new IOException("Trying to load more than " + maxFilesPerRegionPerFamily +<a name="line.900"></a>
-<span class="sourceLineNo">901</span>          " hfiles to one family of one region");<a name="line.901"></a>
+<span class="sourceLineNo">875</span>    byte[][] keys = inferBoundaries(map);<a name="line.875"></a>
+<span class="sourceLineNo">876</span>    TableDescriptorBuilder tdBuilder = TableDescriptorBuilder.newBuilder(tableName);<a name="line.876"></a>
+<span class="sourceLineNo">877</span>    familyBuilders.stream().map(ColumnFamilyDescriptorBuilder::build)<a name="line.877"></a>
+<span class="sourceLineNo">878</span>      .forEachOrdered(tdBuilder::setColumnFamily);<a name="line.878"></a>
+<span class="sourceLineNo">879</span>    FutureUtils.get(admin.createTable(tdBuilder.build(), keys));<a name="line.879"></a>
+<span class="sourceLineNo">880</span><a name="line.880"></a>
+<span class="sourceLineNo">881</span>    LOG.info("Table " + tableName + " is available!!");<a name="line.881"></a>
+<span class="sourceLineNo">882</span>  }<a name="line.882"></a>
+<span class="sourceLineNo">883</span><a name="line.883"></a>
+<span class="sourceLineNo">884</span>  private Map&lt;LoadQueueItem, ByteBuffer&gt; performBulkLoad(AsyncClusterConnection conn,<a name="line.884"></a>
+<span class="sourceLineNo">885</span>      TableName tableName, Deque&lt;LoadQueueItem&gt; queue, ExecutorService pool, boolean copyFile)<a name="line.885"></a>
+<span class="sourceLineNo">886</span>      throws IOException {<a name="line.886"></a>
+<span class="sourceLineNo">887</span>    int count = 0;<a name="line.887"></a>
+<span class="sourceLineNo">888</span><a name="line.888"></a>
+<span class="sourceLineNo">889</span>    fsDelegationToken.acquireDelegationToken(queue.peek().getFilePath().getFileSystem(getConf()));<a name="line.889"></a>
+<span class="sourceLineNo">890</span>    bulkToken = FutureUtils.get(conn.prepareBulkLoad(tableName));<a name="line.890"></a>
+<span class="sourceLineNo">891</span>    Pair&lt;Multimap&lt;ByteBuffer, LoadQueueItem&gt;, Set&lt;String&gt;&gt; pair = null;<a name="line.891"></a>
+<span class="sourceLineNo">892</span><a name="line.892"></a>
+<span class="sourceLineNo">893</span>    Map&lt;LoadQueueItem, ByteBuffer&gt; item2RegionMap = new HashMap&lt;&gt;();<a name="line.893"></a>
+<span class="sourceLineNo">894</span>    // Assumes that region splits can happen while this occurs.<a name="line.894"></a>
+<span class="sourceLineNo">895</span>    while (!queue.isEmpty()) {<a name="line.895"></a>
+<span class="sourceLineNo">896</span>      // need to reload split keys each iteration.<a name="line.896"></a>
+<span class="sourceLineNo">897</span>      final List&lt;Pair&lt;byte[], byte[]&gt;&gt; startEndKeys =<a name="line.897"></a>
+<span class="sourceLineNo">898</span>        FutureUtils.get(conn.getRegionLocator(tableName).getStartEndKeys());<a name="line.898"></a>
+<span class="sourceLineNo">899</span>      if (count != 0) {<a name="line.899"></a>
+<span class="sourceLineNo">900</span>        LOG.info("Split occurred while grouping HFiles, retry attempt " + count + " with " +<a name="line.900"></a>
+<span class="sourceLineNo">901</span>          queue.size() + " files remaining to group or split");<a name="line.901"></a>
 <span class="sourceLineNo">902</span>      }<a name="line.902"></a>
 <span class="sourceLineNo">903</span><a name="line.903"></a>
-<span class="sourceLineNo">904</span>      bulkLoadPhase(conn, tableName, queue, regionGroups, copyFile, item2RegionMap);<a name="line.904"></a>
-<span class="sourceLineNo">905</span><a name="line.905"></a>
-<span class="sourceLineNo">906</span>      // NOTE: The next iteration's split / group could happen in parallel to<a name="line.906"></a>
-<span class="sourceLineNo">907</span>      // atomic bulkloads assuming that there are splits and no merges, and<a name="line.907"></a>
-<span class="sourceLineNo">908</span>      // that we can atomically pull out the groups we want to retry.<a name="line.908"></a>
-<span class="sourceLineNo">909</span>    }<a name="line.909"></a>
-<span class="sourceLineNo">910</span><a name="line.910"></a>
-<span class="sourceLineNo">911</span>    return item2RegionMap;<a name="line.911"></a>
-<span class="sourceLineNo">912</span>  }<a name="line.912"></a>
-<span class="sourceLineNo">913</span><a name="line.913"></a>
-<span class="sourceLineNo">914</span>  private void cleanup(AsyncClusterConnection conn, TableName tableName, Deque&lt;LoadQueueItem&gt; queue,<a name="line.914"></a>
-<span class="sourceLineNo">915</span>      ExecutorService pool) throws IOException {<a name="line.915"></a>
-<span class="sourceLineNo">916</span>    fsDelegationToken.releaseDelegationToken();<a name="line.916"></a>
-<span class="sourceLineNo">917</span>    if (bulkToken != null) {<a name="line.917"></a>
-<span class="sourceLineNo">918</span>      conn.cleanupBulkLoad(tableName, bulkToken);<a name="line.918"></a>
-<span class="sourceLineNo">919</span>    }<a name="line.919"></a>
-<span class="sourceLineNo">920</span>    if (pool != null) {<a name="line.920"></a>
-<span class="sourceLineNo">921</span>      pool.shutdown();<a name="line.921"></a>
-<span class="sourceLineNo">922</span>    }<a name="line.922"></a>
-<span class="sourceLineNo">923</span>    if (!queue.isEmpty()) {<a name="line.923"></a>
-<span class="sourceLineNo">924</span>      StringBuilder err = new StringBuilder();<a name="line.924"></a>
-<span class="sourceLineNo">925</span>      err.append("-------------------------------------------------\n");<a name="line.925"></a>
-<span class="sourceLineNo">926</span>      err.append("Bulk load aborted with some files not yet loaded:\n");<a name="line.926"></a>
-<span class="sourceLineNo">927</span>      err.append("-------------------------------------------------\n");<a name="line.927"></a>
-<span class="sourceLineNo">928</span>      for (LoadQueueItem q : queue) {<a name="line.928"></a>
-<span class="sourceLineNo">929</span>        err.append("  ").append(q.getFilePath()).append('\n');<a name="line.929"></a>
-<span class="sourceLineNo">930</span>      }<a name="line.930"></a>
-<span class="sourceLineNo">931</span>      LOG.error(err.toString());<a name="line.931"></a>
-<span class="sourceLineNo">932</span>    }<a name="line.932"></a>
-<span class="sourceLineNo">933</span>  }<a name="line.933"></a>
-<span class="sourceLineNo">934</span><a name="line.934"></a>
-<span class="sourceLineNo">935</span>  /**<a name="line.935"></a>
-<span class="sourceLineNo">936</span>   * Perform a bulk load of the given map of families to hfiles into the given pre-existing table.<a name="line.936"></a>
-<span class="sourceLineNo">937</span>   * This method is not threadsafe.<a name="line.937"></a>
-<span class="sourceLineNo">938</span>   * @param map map of family to List of hfiles<a name="line.938"></a>
-<span class="sourceLineNo">939</span>   * @param tableName table to load the hfiles<a name="line.939"></a>
-<span class="sourceLineNo">940</span>   * @param silence true to ignore unmatched column families<a name="line.940"></a>
-<span class="sourceLineNo">941</span>   * @param copyFile always copy hfiles if true<a name="line.941"></a>
-<span class="sourceLineNo">942</span>   */<a name="line.942"></a>
-<span class="sourceLineNo">943</span>  private Map&lt;LoadQueueItem, ByteBuffer&gt; doBulkLoad(AsyncClusterConnection conn,<a name="line.943"></a>
-<span class="sourceLineNo">944</span>      TableName tableName, Map&lt;byte[], List&lt;Path&gt;&gt; map, boolean silence, boolean copyFile)<a name="line.944"></a>
-<span class="sourceLineNo">945</span>      throws IOException {<a name="line.945"></a>
-<span class="sourceLineNo">946</span>    tableExists(conn, tableName);<a name="line.946"></a>
-<span class="sourceLineNo">947</span>    // LQI queue does not need to be threadsafe -- all operations on this queue<a name="line.947"></a>
-<span class="sourceLineNo">948</span>    // happen in this thread<a name="line.948"></a>
-<span class="sourceLineNo">949</span>    Deque&lt;LoadQueueItem&gt; queue = new ArrayDeque&lt;&gt;();<a name="line.949"></a>
-<span class="sourceLineNo">950</span>    ExecutorService pool = null;<a name="line.950"></a>
-<span class="sourceLineNo">951</span>    try {<a name="line.951"></a>
-<span class="sourceLineNo">952</span>      prepareHFileQueue(conn, tableName, map, queue, silence);<a name="line.952"></a>
-<span class="sourceLineNo">953</span>      if (queue.isEmpty()) {<a name="line.953"></a>
-<span class="sourceLineNo">954</span>        LOG.warn("Bulk load operation did not get any files to load");<a name="line.954"></a>
-<span class="sourceLineNo">955</span>        return Collections.emptyMap();<a name="line.955"></a>
-<span class="sourceLineNo">956</span>      }<a name="line.956"></a>
-<span class="sourceLineNo">957</span>      pool = createExecutorService();<a name="line.957"></a>
-<span class="sourceLineNo">958</span>      return performBulkLoad(conn, tableName, queue, pool, copyFile);<a name="line.958"></a>
-<span class="sourceLineNo">959</span>    } finally {<a name="line.959"></a>
-<span class="sourceLineNo">960</span>      cleanup(conn, tableName, queue, pool);<a name="line.960"></a>
-<span class="sourceLineNo">961</span>    }<a name="line.961"></a>
-<span class="sourceLineNo">962</span>  }<a name="line.962"></a>
-<span class="sourceLineNo">963</span><a name="line.963"></a>
-<span class="sourceLineNo">964</span>  /**<a name="line.964"></a>
-<span class="sourceLineNo">965</span>   * Perform a bulk load of the given directory into the given pre-existing table. This method is<a name="line.965"></a>
-<span class="sourceLineNo">966</span>   * not threadsafe.<a name="line.966"></a>
-<span class="sourceLineNo">967</span>   * @param tableName table to load the hfiles<a name="line.967"></a>
-<span class="sourceLineNo">968</span>   * @param hfofDir the directory that was provided as the output path of a job using<a name="line.968"></a>
-<span class="sourceLineNo">969</span>   *          HFileOutputFormat<a name="line.969"></a>
-<span class="sourceLineNo">970</span>   * @param silence true to ignore unmatched column families<a name="line.970"></a>
-<span class="sourceLineNo">971</span>   * @param copyFile always copy hfiles if true<a name="line.971"></a>
-<span class="sourceLineNo">972</span>   */<a name="line.972"></a>
-<span class="sourceLineNo">973</span>  private Map&lt;LoadQueueItem, ByteBuffer&gt; doBulkLoad(AsyncClusterConnection conn,<a name="line.973"></a>
-<span class="sourceLineNo">974</span>      TableName tableName, Path hfofDir, boolean silence, boolean copyFile)<a name="line.974"></a>
-<span class="sourceLineNo">975</span>      throws IOException {<a name="line.975"></a>
-<span class="sourceLineNo">976</span>    tableExists(conn, tableName);<a name="line.976"></a>
-<span class="sourceLineNo">977</span><a name="line.977"></a>
-<span class="sourceLineNo">978</span>    /*<a name="line.978"></a>
-<span class="sourceLineNo">979</span>     * Checking hfile format is a time-consuming operation, we should have an option to skip this<a name="line.979"></a>
-<span class="sourceLineNo">980</span>     * step when bulkloading millions of HFiles. See HBASE-13985.<a name="line.980"></a>
-<span class="sourceLineNo">981</span>     */<a name="line.981"></a>
-<span class="sourceLineNo">982</span>    boolean validateHFile = getConf().getBoolean(VALIDATE_HFILES, true);<a name="line.982"></a>
-<span class="sourceLineNo">983</span>    if (!validateHFile) {<a name="line.983"></a>
-<span class="sourceLineNo">984</span>      LOG.warn("You are skipping HFiles validation, it might cause some data loss if files " +<a name="line.984"></a>
-<span class="sourceLineNo">985</span>        "are not correct. If you fail to read data from your table after using this " +<a name="line.985"></a>
-<span class="sourceLineNo">986</span>        "option, consider removing the files and bulkload again without this option. " +<a name="line.986"></a>
-<span class="sourceLineNo">987</span>        "See HBASE-13985");<a name="line.987"></a>
-<span class="sourceLineNo">988</span>    }<a name="line.988"></a>
-<span class="sourceLineNo">989</span>    // LQI queue does not need to be threadsafe -- all operations on this queue<a name="line.989"></a>
-<span class="sourceLineNo">990</span>    // happen in this thread<a name="line.990"></a>
-<span class="sourceLineNo">991</span>    Deque&lt;LoadQueueItem&gt; queue = new ArrayDeque&lt;&gt;();<a name="line.991"></a>
-<span class="sourceLineNo">992</span>    ExecutorService pool = null;<a name="line.992"></a>
-<span class="sourceLineNo">993</span>    try {<a name="line.993"></a>
-<span class="sourceLineNo">994</span>      prepareHFileQueue(getConf(), conn, tableName, hfofDir, queue, validateHFile, silence);<a name="line.994"></a>
+<span class="sourceLineNo">904</span>      int maxRetries = getConf().getInt(HConstants.BULKLOAD_MAX_RETRIES_NUMBER, 10);<a name="line.904"></a>
+<span class="sourceLineNo">905</span>      maxRetries = Math.max(maxRetries, startEndKeys.size() + 1);<a name="line.905"></a>
+<span class="sourceLineNo">906</span>      if (maxRetries != 0 &amp;&amp; count &gt;= maxRetries) {<a name="line.906"></a>
+<span class="sourceLineNo">907</span>        throw new IOException(<a name="line.907"></a>
+<span class="sourceLineNo">908</span>          "Retry attempted " + count + " times without completing, bailing out");<a name="line.908"></a>
+<span class="sourceLineNo">909</span>      }<a name="line.909"></a>
+<span class="sourceLineNo">910</span>      count++;<a name="line.910"></a>
+<span class="sourceLineNo">911</span><a name="line.911"></a>
+<span class="sourceLineNo">912</span>      // Using ByteBuffer for byte[] equality semantics<a name="line.912"></a>
+<span class="sourceLineNo">913</span>      pair = groupOrSplitPhase(conn, tableName, pool, queue, startEndKeys);<a name="line.913"></a>
+<span class="sourceLineNo">914</span>      Multimap&lt;ByteBuffer, LoadQueueItem&gt; regionGroups = pair.getFirst();<a name="line.914"></a>
+<span class="sourceLineNo">915</span><a name="line.915"></a>
+<span class="sourceLineNo">916</span>      if (!checkHFilesCountPerRegionPerFamily(regionGroups)) {<a name="line.916"></a>
+<span class="sourceLineNo">917</span>        // Error is logged inside checkHFilesCountPerRegionPerFamily.<a name="line.917"></a>
+<span class="sourceLineNo">918</span>        throw new IOException("Trying to load more than " + maxFilesPerRegionPerFamily +<a name="line.918"></a>
+<span class="sourceLineNo">919</span>          " hfiles to one family of one region");<a name="line.919"></a>
+<span class="sourceLineNo">920</span>      }<a name="line.920"></a>
+<span class="sourceLineNo">921</span><a name="line.921"></a>
+<span class="sourceLineNo">922</span>      bulkLoadPhase(conn, tableName, queue, regionGroups, copyFile, item2RegionMap);<a name="line.922"></a>
+<span class="sourceLineNo">923</span><a name="line.923"></a>
+<span class="sourceLineNo">924</span>      // NOTE: The next iteration's split / group could happen in parallel to<a name="line.924"></a>
+<span class="sourceLineNo">925</span>      // atomic bulkloads assuming that there are splits and no merges, and<a name="line.925"></a>
+<span class="sourceLineNo">926</span>      // that we can atomically pull out the groups we want to retry.<a name="line.926"></a>
+<span class="sourceLineNo">927</span>    }<a name="line.927"></a>
+<span class="sourceLineNo">928</span><a name="line.928"></a>
+<span class="sourceLineNo">929</span>    return item2RegionMap;<a name="line.929"></a>
+<span class="sourceLineNo">930</span>  }<a name="line.930"></a>
+<span class="sourceLineNo">931</span><a name="line.931"></a>
+<span class="sourceLineNo">932</span>  private void cleanup(AsyncClusterConnection conn, TableName tableName, Deque&lt;LoadQueueItem&gt; queue,<a name="line.932"></a>
+<span class="sourceLineNo">933</span>      ExecutorService pool) throws IOException {<a name="line.933"></a>
+<span class="sourceLineNo">934</span>    fsDelegationToken.releaseDelegationToken();<a name="line.934"></a>
+<span class="sourceLineNo">935</span>    if (bulkToken != null) {<a name="line.935"></a>
+<span class="sourceLineNo">936</span>      conn.cleanupBulkLoad(tableName, bulkToken);<a name="line.936"></a>
+<span class="sourceLineNo">937</span>    }<a name="line.937"></a>
+<span class="sourceLineNo">938</span>    if (pool != null) {<a name="line.938"></a>
+<span class="sourceLineNo">939</span>      pool.shutdown();<a name="line.939"></a>
+<span class="sourceLineNo">940</span>    }<a name="line.940"></a>
+<span class="sourceLineNo">941</span>    if (!queue.isEmpty()) {<a name="line.941"></a>
+<span class="sourceLineNo">942</span>      StringBuilder err = new StringBuilder();<a name="line.942"></a>
+<span class="sourceLineNo">943</span>      err.append("-------------------------------------------------\n");<a name="line.943"></a>
+<span class="sourceLineNo">944</span>      err.append("Bulk load aborted with some files not yet loaded:\n");<a name="line.944"></a>
+<span class="sourceLineNo">945</span>      err.append("-------------------------------------------------\n");<a name="line.945"></a>
+<span class="sourceLineNo">946</span>      for (LoadQueueItem q : queue) {<a name="line.946"></a>
+<span class="sourceLineNo">947</span>        err.append("  ").append(q.getFilePath()).append('\n');<a name="line.947"></a>
+<span class="sourceLineNo">948</span>      }<a name="line.948"></a>
+<span class="sourceLineNo">949</span>      LOG.error(err.toString());<a name="line.949"></a>
+<span class="sourceLineNo">950</span>    }<a name="line.950"></a>
+<span class="sourceLineNo">951</span>  }<a name="line.951"></a>
+<span class="sourceLineNo">952</span><a name="line.952"></a>
+<span class="sourceLineNo">953</span>  /**<a name="line.953"></a>
+<span class="sourceLineNo">954</span>   * Perform a bulk load of the given map of families to hfiles into the given pre-existing table.<a name="line.954"></a>
+<span class="sourceLineNo">955</span>   * This method is not threadsafe.<a name="line.955"></a>
+<span class="sourceLineNo">956</span>   * @param map map of family to List of hfiles<a name="line.956"></a>
+<span class="sourceLineNo">957</span>   * @param tableName table to load the hfiles<a name="line.957"></a>
+<span class="sourceLineNo">958</span>   * @param silence true to ignore unmatched column families<a name="line.958"></a>
+<span class="sourceLineNo">959</span>   * @param copyFile always copy hfiles if true<a name="line.959"></a>
+<span class="sourceLineNo">960</span>   */<a name="line.960"></a>
+<span class="sourceLineNo">961</span>  private Map&lt;LoadQueueItem, ByteBuffer&gt; doBulkLoad(AsyncClusterConnection conn,<a name="line.961"></a>
+<span class="sourceLineNo">962</span>      TableName tableName, Map&lt;byte[], List&lt;Path&gt;&gt; map, boolean silence, boolean copyFile)<a name="line.962"></a>
+<span class="sourceLineNo">963</span>      throws IOException {<a name="line.963"></a>
+<span class="sourceLineNo">964</span>    tableExists(conn, tableName);<a name="line.964"></a>
+<span class="sourceLineNo">965</span>    // LQI queue does not need to be threadsafe -- all operations on this queue<a name="line.965"></a>
+<span class="sourceLineNo">966</span>    // happen in this thread<a name="line.966"></a>
+<span class="sourceLineNo">967</span>    Deque&lt;LoadQueueItem&gt; queue = new ArrayDeque&lt;&gt;();<a name="line.967"></a>
+<span class="sourceLineNo">968</span>    ExecutorService pool = null;<a name="line.968"></a>
+<span class="sourceLineNo">969</span>    try {<a name="line.969"></a>
+<span class="sourceLineNo">970</span>      prepareHFileQueue(conn, tableName, map, queue, silence);<a name="line.970"></a>
+<span class="sourceLineNo">971</span>      if (queue.isEmpty()) {<a name="line.971"></a>
+<span class="sourceLineNo">972</span>        LOG.warn("Bulk load operation did not get any files to load");<a name="line.972"></a>
+<span class="sourceLineNo">973</span>        return Collections.emptyMap();<a name="line.973"></a>
+<span class="sourceLineNo">974</span>      }<a name="line.974"></a>
+<span class="sourceLineNo">975</span>      pool = createExecutorService();<a name="line.975"></a>
+<span class="sourceLineNo">976</span>      return performBulkLoad(conn, tableName, queue, pool, copyFile);<a name="line.976"></a>
+<span class="sourceLineNo">977</span>    } finally {<a name="line.977"></a>
+<span class="sourceLineNo">978</span>      cleanup(conn, tableName, queue, pool);<a name="line.978"></a>
+<span class="sourceLineNo">979</span>    }<a name="line.979"></a>
+<span class="sourceLineNo">980</span>  }<a name="line.980"></a>
+<span class="sourceLineNo">981</span><a name="line.981"></a>
+<span class="sourceLineNo">982</span>  /**<a name="line.982"></a>
+<span class="sourceLineNo">983</span>   * Perform a bulk load of the given directory into the given pre-existing table. This method is<a name="line.983"></a>
+<span class="sourceLineNo">984</span>   * not threadsafe.<a name="line.984"></a>
+<span class="sourceLineNo">985</span>   * @param tableName table to load the hfiles<a name="line.985"></a>
+<span class="sourceLineNo">986</span>   * @param hfofDir the directory that was provided as the output path of a job using<a name="line.986"></a>
+<span class="sourceLineNo">987</span>   *          HFileOutputFormat<a name="line.987"></a>
+<span class="sourceLineNo">988</span>   * @param silence true to ignore unmatched column families<a name="line.988"></a>
+<span class="sourceLineNo">989</span>   * @param copyFile always copy hfiles if true<a name="line.989"></a>
+<span class="sourceLineNo">990</span>   */<a name="line.990"></a>
+<span class="sourceLineNo">991</span>  private Map&lt;LoadQueueItem, ByteBuffer&gt; doBulkLoad(AsyncClusterConnection conn,<a name="line.991"></a>
+<span class="sourceLineNo">992</span>      TableName tableName, Path hfofDir, boolean silence, boolean copyFile)<a name="line.992"></a>
+<span class="sourceLineNo">993</span>      throws IOException {<a name="line.993"></a>
+<span class="sourceLineNo">994</span>    tableExists(conn, tableName);<a name="line.994"></a>
 <span class="sourceLineNo">995</span><a name="line.995"></a>
-<span class="sourceLineNo">996</span>      if (queue.isEmpty()) {<a name="line.996"></a>
-<span class="sourceLineNo">997</span>        LOG.warn(<a name="line.997"></a>
-<span class="sourceLineNo">998</span>          "Bulk load operation did not find any files to load in directory {}. " +<a name="line.998"></a>
-<span class="sourceLineNo">999</span>          "Does it contain files in subdirectories that correspond to column family names?",<a name="line.999"></a>
-<span class="sourceLineNo">1000</span>          (hfofDir != null ? hfofDir.toUri().toString() : ""));<a name="line.1000"></a>
-<span class="sourceLineNo">1001</span>        return Collections.emptyMap();<a name="line.1001"></a>
-<span class="sourceLineNo">1002</span>      }<a name="line.1002"></a>
-<span class="sourceLineNo">1003</span>      pool = createExecutorService();<a name="line.1003"></a>
-<span class="sourceLineNo">1004</span>      return performBulkLoad(conn, tableName, queue, pool, copyFile);<a name="line.1004"></a>
-<span class="sourceLineNo">1005</span>    } finally {<a name="line.1005"></a>
-<span class="sourceLineNo">1006</span>      cleanup(conn, tableName, queue, pool);<a name="line.1006"></a>
-<span class="sourceLineNo">1007</span>    }<a name="line.1007"></a>
-<span class="sourceLineNo">1008</span>  }<a name="line.1008"></a>
-<span class="sourceLineNo">1009</span><a name="line.1009"></a>
-<span class="sourceLineNo">1010</span>  @Override<a name="line.1010"></a>
-<span class="sourceLineNo">1011</span>  public Map&lt;LoadQueueItem, ByteBuffer&gt; bulkLoad(TableName tableName,<a name="line.1011"></a>
-<span class="sourceLineNo">1012</span>      Map&lt;byte[], List&lt;Path&gt;&gt; family2Files) throws IOException {<a name="line.1012"></a>
-<span class="sourceLineNo">1013</span>    try (AsyncClusterConnection conn = ClusterConnectionFactory.<a name="line.1013"></a>
-<span class="sourceLineNo">1014</span>        createAsyncClusterConnection(getConf(), null, userProvider.getCurrent())) {<a name="line.1014"></a>
-<span class="sourceLineNo">1015</span>      return doBulkLoad(conn, tableName, family2Files, isSilence(), isAlwaysCopyFiles());<a name="line.1015"></a>
-<span class="sourceLineNo">1016</span>    }<a name="line.1016"></a>
-<span class="sourceLineNo">1017</span>  }<a name="line.1017"></a>
-<span class="sourceLineNo">1018</span><a name="line.1018"></a>
-<span class="sourceLineNo">1019</span>  @Override<a name="line.1019"></a>
-<span class="sourceLineNo">1020</span>  public Map&lt;LoadQueueItem, ByteBuffer&gt; bulkLoad(TableName tableName, Path dir)<a name="line.1020"></a>
-<span class="sourceLineNo">1021</span>      throws IOException {<a name="line.1021"></a>
-<span class="sourceLineNo">1022</span>    try (AsyncClusterConnection conn = ClusterConnectionFactory<a name="line.1022"></a>
-<span class="sourceLineNo">1023</span>      .createAsyncClusterConnection(getConf(), null, userProvider.getCurrent())) {<a name="line.1023"></a>
-<span class="sourceLineNo">1024</span>      AsyncAdmin admin = conn.getAdmin();<a name="line.1024"></a>
-<span class="sourceLineNo">1025</span>      if (!FutureUtils.get(admin.tableExists(tableName))) {<a name="line.1025"></a>
-<span class="sourceLineNo">1026</span>        if (isCreateTable()) {<a name="line.1026"></a>
-<span class="sourceLineNo">1027</span>          createTable(tableName, dir, admin);<a name="line.1027"></a>
-<span class="sourceLineNo">1028</span>        } else {<a name="line.1028"></a>
-<span class="sourceLineNo">1029</span>          throwAndLogTableNotFoundException(tableName);<a name="line.1029"></a>
-<span class="sourceLineNo">1030</span>        }<a name="line.1030"></a>
-<span class="sourceLineNo">1031</span>      }<a name="line.1031"></a>
-<span class="sourceLineNo">1032</span>      return doBulkLoad(conn, tableName, dir, isSilence(), isAlwaysCopyFiles());<a name="line.1032"></a>
-<span class="sourceLineNo">1033</span>    }<a name="line.1033"></a>
-<span class="sourceLineNo">1034</span>  }<a name="line.1034"></a>
-<span class="sourceLineNo">1035</span><a name="line.1035"></a>
-<span class="sourceLineNo">1036</span>  /**<a name="line.1036"></a>
-<span class="sourceLineNo">1037</span>   * @throws TableNotFoundException if table does not exist.<a name="line.1037"></a>
-<span class="sourceLineNo">1038</span>   */<a name="line.1038"></a>
-<span class="sourceLineNo">1039</span>  private void tableExists(AsyncClusterConnection conn, TableName tableName) throws IOException {<a name="line.1039"></a>
-<span class="sourceLineNo">1040</span>    if (!FutureUtils.get(conn.getAdmin().tableExists(tableName))) {<a name="line.1040"></a>
-<span class="sourceLineNo">1041</span>      throwAndLogTableNotFoundException(tableName);<a name="line.1041"></a>
-<span class="sourceLineNo">1042</span>    }<a name="line.1042"></a>
-<span class="sourceLineNo">1043</span>  }<a name="line.1043"></a>
-<span class="sourceLineNo">1044</span><a name="line.1044"></a>
-<span class="sourceLineNo">1045</span>  private void throwAndLogTableNotFoundException(TableName tn) throws TableNotFoundException {<a name="line.1045"></a>
-<span class="sourceLineNo">1046</span>    String errorMsg = format("Table '%s' does not exist.", tn);<a name="line.1046"></a>
-<span class="sourceLineNo">1047</span>    LOG.error(errorMsg);<a name="line.1047"></a>
-<span class="sourceLineNo">1048</span>    throw new TableNotFoundException(errorMsg);<a name="line.1048"></a>
-<span class="sourceLineNo">1049</span>  }<a name="line.1049"></a>
-<span class="sourceLineNo">1050</span><a name="line.1050"></a>
-<span class="sourceLineNo">1051</span>  public void setBulkToken(String bulkToken) {<a name="line.1051"></a>
-<span class="sourceLineNo">1052</span>    this.bulkToken = bulkToken;<a name="line.1052"></a>
-<span class="sourceLineNo">1053</span>  }<a name="line.1053"></a>
-<span class="sourceLineNo">1054</span><a name="line.1054"></a>
-<span class="sourceLineNo">1055</span>  public void setClusterIds(List&lt;String&gt; clusterIds) {<a name="line.1055"></a>
-<span class="sourceLineNo">1056</span>    this.clusterIds = clusterIds;<a name="line.1056"></a>
-<span class="sourceLineNo">1057</span>  }<a name="line.1057"></a>
-<span class="sourceLineNo">1058</span><a name="line.1058"></a>
-<span class="sourceLineNo">1059</span>  private void usage() {<a name="line.1059"></a>
-<span class="sourceLineNo">1060</span>    System.err.println("Usage: " + "bin/hbase completebulkload [OPTIONS] "<a name="line.1060"></a>
-<span class="sourceLineNo">1061</span>        + "&lt;/PATH/TO/HFILEOUTPUTFORMAT-OUTPUT&gt; &lt;TABLENAME&gt;\n"<a name="line.1061"></a>
-<span class="sourceLineNo">1062</span>        + "Loads directory of hfiles -- a region dir or product of HFileOutputFormat -- "<a name="line.1062"></a>
-<span class="sourceLineNo">1063</span>        + "into an hbase table.\n"<a name="line.1063"></a>
-<span class="sourceLineNo">1064</span>        + "OPTIONS (for other -D options, see source code):\n"<a name="line.1064"></a>
-<span class="sourceLineNo">1065</span>        + " -D" + CREATE_TABLE_CONF_KEY + "=no whether to create table; when 'no', target "<a name="line.1065"></a>
-<span class="sourceLineNo">1066</span>        + "table must exist.\n"<a name="line.1066"></a>
-<span class="sourceLineNo">1067</span>        + " -D" + IGNORE_UNMATCHED_CF_CONF_KEY + "=yes to ignore unmatched column families.\n"<a name="line.1067"></a>
-<span class="sourceLineNo">1068</span>        + " -loadTable for when directory of files to load has a depth of 3; target table must "<a name="line.1068"></a>
-<span class="sourceLineNo">1069</span>        + "exist;\n"<a name="line.1069"></a>
-<span class="sourceLineNo">1070</span>        + " must be last of the options on command line.\n"<a name="line.1070"></a>
-<span class="sourceLineNo">1071</span>        + "See http://hbase.apache.org/book.html#arch.bulk.load.complete.strays for "<a name="line.1071"></a>
-<span class="sourceLineNo">1072</span>        + "documentation.\n");<a name="line.1072"></a>
-<span class="sourceLineNo">1073</span>  }<a name="line.1073"></a>
-<span class="sourceLineNo">1074</span><a name="line.1074"></a>
-<span class="sourceLineNo">1075</span>  @Override<a name="line.1075"></a>
-<span class="sourceLineNo">1076</span>  public int run(String[] args) throws Exception {<a name="line.1076"></a>
-<span class="sourceLineNo">1077</span>    if (args.length != 2 &amp;&amp; args.length != 3) {<a name="line.1077"></a>
-<span class="sourceLineNo">1078</span>      usage();<a name="line.1078"></a>
-<span class="sourceLineNo">1079</span>      return -1;<a name="line.1079"></a>
-<span class="sourceLineNo">1080</span>    }<a name="line.1080"></a>
-<span class="sourceLineNo">1081</span>    // Re-initialize to apply -D options from the command line parameters<a name="line.1081"></a>
-<span class="sourceLineNo">1082</span>    initialize();<a name="line.1082"></a>
-<span class="sourceLineNo">1083</span>    Path dirPath = new Path(args[0]);<a name="line.1083"></a>
-<span class="sourceLineNo">1084</span>    TableName tableName = TableName.valueOf(args[1]);<a name="line.1084"></a>
-<span class="sourceLineNo">1085</span>    if (args.length == 2) {<a name="line.1085"></a>
-<span class="sourceLineNo">1086</span>      return !bulkLoad(tableName, dirPath).isEmpty() ? 0 : -1;<a name="line.1086"></a>
-<span class="sourceLineNo">1087</span>    } else {<a name="line.1087"></a>
-<span class="sourceLineNo">1088</span>      Map&lt;byte[], List&lt;Path&gt;&gt; family2Files = Maps.newHashMap();<a name="line.1088"></a>
-<span class="sourceLineNo">1089</span>      FileSystem fs = FileSystem.get(getConf());<a name="line.1089"></a>
-<span class="sourceLineNo">1090</span>      for (FileStatus regionDir : fs.listStatus(dirPath)) {<a name="line.1090"></a>
-<span class="sourceLineNo">1091</span>        FSVisitor.visitRegionStoreFiles(fs, regionDir.getPath(), (region, family, hfileName) -&gt; {<a name="line.1091"></a>
-<span class="sourceLineNo">1092</span>          Path path = new Path(regionDir.getPath(), new Path(family, hfileName));<a name="line.1092"></a>
-<span class="sourceLineNo">1093</span>          byte[] familyName = Bytes.toBytes(family);<a name="line.1093"></a>
-<span class="sourceLineNo">1094</span>          if (family2Files.containsKey(familyName)) {<a name="line.1094"></a>
-<span class="sourceLineNo">1095</span>            family2Files.get(familyName).add(path);<a name="line.1095"></a>
-<span class="sourceLineNo">1096</span>          } else {<a name="line.1096"></a>
-<span class="sourceLineNo">1097</span>            family2Files.put(familyName, Lists.newArrayList(path));<a name="line.1097"></a>
-<span class="sourceLineNo">1098</span>          }<a name="line.1098"></a>
-<span class="sourceLineNo">1099</span>        });<a name="line.1099"></a>
-<span class="sourceLineNo">1100</span>      }<a name="line.1100"></a>
-<span class="sourceLineNo">1101</span>      return !bulkLoad(tableName, family2Files).isEmpty() ? 0 : -1;<a name="line.1101"></a>
-<span class="sourceLineNo">1102</span>    }<a name="line.1102"></a>
-<span class="sourceLineNo">1103</span>  }<a name="line.1103"></a>
-<span class="sourceLineNo">1104</span><a name="line.1104"></a>
-<span class="sourceLineNo">1105</span>  public static void main(String[] args) throws Exception {<a name="line.1105"></a>
-<span class="sourceLineNo">1106</span>    Configuration conf = HBaseConfiguration.create();<a name="line.1106"></a>
-<span class="sourceLineNo">1107</span>    int ret = ToolRunner.run(conf, new BulkLoadHFilesTool(conf), args);<a name="line.1107"></a>
-<span class="sourceLineNo">1108</span>    System.exit(ret);<a name="line.1108"></a>
-<span class="sourceLineNo">1109</span>  }<a name="line.1109"></a>
-<span class="sourceLineNo">1110</span><a name="line.1110"></a>
-<span class="sourceLineNo">1111</span>  @Override<a name="line.1111"></a>
-<span class="sourceLineNo">1112</span>  public void disableReplication(){<a name="line.1112"></a>
-<span class="sourceLineNo">1113</span>    this.replicate = false;<a name="line.1113"></a>
-<span class="sourceLineNo">1114</span>  }<a name="line.1114"></a>
-<span class="sourceLineNo">1115</span><a name="line.1115"></a>
-<span class="sourceLineNo">1116</span>  @Override<a name="line.1116"></a>
-<span class="sourceLineNo">1117</span>  public boolean isReplicationDisabled(){<a name="line.1117"></a>
-<span class="sourceLineNo">1118</span>    return !this.replicate;<a name="line.1118"></a>
-<span class="sourceLineNo">1119</span>  }<a name="line.1119"></a>
-<span class="sourceLineNo">1120</span>}<a name="line.1120"></a>
+<span class="sourceLineNo">996</span>    /*<a name="line.996"></a>
+<span class="sourceLineNo">997</span>     * Checking hfile format is a time-consuming operation, we should have an option to skip this<a name="line.997"></a>
+<span class="sourceLineNo">998</span>     * step when bulkloading millions of HFiles. See HBASE-13985.<a name="line.998"></a>
+<span class="sourceLineNo">999</span>     */<a name="line.999"></a>
+<span class="sourceLineNo">1000</span>    boolean validateHFile = getConf().getBoolean(VALIDATE_HFILES, true);<a name="line.1000"></a>
+<span class="sourceLineNo">1001</span>    if (!validateHFile) {<a name="line.1001"></a>
+<span class="sourceLineNo">1002</span>      LOG.warn("You are skipping HFiles validation, it might cause some data loss if files " +<a name="line.1002"></a>
+<span class="sourceLineNo">1003</span>        "are not correct. If you fail to read data from your table after using this " +<a name="line.1003"></a>
+<span class="sourceLineNo">1004</span>        "option, consider removing the files and bulkload again without this option. " +<a name="line.1004"></a>
+<span class="sourceLineNo">1005</span>        "See HBASE-13985");<a name="line.1005"></a>
+<span class="sourceLineNo">1006</span>    }<a name="line.1006"></a>
+<span class="sourceLineNo">1007</span>    // LQI queue does not need to be threadsafe -- all operations on this queue<a name="line.1007"></a>
+<span class="sourceLineNo">1008</span>    // happen in this thread<a name="line.1008"></a>
+<span class="sourceLineNo">1009</span>    Deque&lt;LoadQueueItem&gt; queue = new ArrayDeque&lt;&gt;();<a name="line.1009"></a>
+<span class="sourceLineNo">1010</span>    ExecutorService pool = null;<a name="line.1010"></a>
+<span class="sourceLineNo">1011</span>    try {<a name="line.1011"></a>
+<span class="sourceLineNo">1012</span>      prepareHFileQueue(getConf(), conn, tableName, hfofDir, queue, validateHFile, silence);<a name="line.1012"></a>
+<span class="sourceLineNo">1013</span><a name="line.1013"></a>
+<span class="sourceLineNo">1014</span>      if (queue.isEmpty()) {<a name="line.1014"></a>
+<span class="sourceLineNo">1015</span>        LOG.warn(<a name="line.1015"></a>
+<span class="sourceLineNo">1016</span>          "Bulk load operation did not find any files to load in directory {}. " +<a name="line.1016"></a>
+<span class="sourceLineNo">1017</span>          "Does it contain files in subdirectories that correspond to column family names?",<a name="line.1017"></a>
+<span class="sourceLineNo">1018</span>          (hfofDir != null ? hfofDir.toUri().toString() : ""));<a name="line.1018"></a>
+<span class="sourceLineNo">1019</span>        return Collections.emptyMap();<a name="line.1019"></a>
+<span class="sourceLineNo">1020</span>      }<a name="line.1020"></a>
+<span class="sourceLineNo">1021</span>      pool = createExecutorService();<a name="line.1021"></a>
+<span class="sourceLineNo">1022</span>      return performBulkLoad(conn, tableName, queue, pool, copyFile);<a name="line.1022"></a>
+<span class="sourceLineNo">1023</span>    } finally {<a name="line.1023"></a>
+<span class="sourceLineNo">1024</span>      cleanup(conn, tableName, queue, pool);<a name="line.1024"></a>
+<span class="sourceLineNo">1025</span>    }<a name="line.1025"></a>
+<span class="sourceLineNo">1026</span>  }<a name="line.1026"></a>
+<span class="sourceLineNo">1027</span><a name="line.1027"></a>
+<span class="sourceLineNo">1028</span>  @Override<a name="line.1028"></a>
+<span class="sourceLineNo">1029</span>  public Map&lt;LoadQueueItem, ByteBuffer&gt; bulkLoad(TableName tableName,<a name="line.1029"></a>
+<span class="sourceLineNo">1030</span>      Map&lt;byte[], List&lt;Path&gt;&gt; family2Files) throws IOException {<a name="line.1030"></a>
+<span class="sourceLineNo">1031</span>    try (AsyncClusterConnection conn = ClusterConnectionFactory.<a name="line.1031"></a>
+<span class="sourceLineNo">1032</span>        createAsyncClusterConnection(getConf(), null, userProvider.getCurrent())) {<a name="line.1032"></a>
+<span class="sourceLineNo">1033</span>      return doBulkLoad(conn, tableName, family2Files, isSilence(), isAlwaysCopyFiles());<a name="line.1033"></a>
+<span class="sourceLineNo">1034</span>    }<a name="line.1034"></a>
+<span class="sourceLineNo">1035</span>  }<a name="line.1035"></a>
+<span class="sourceLineNo">1036</span><a name="line.1036"></a>
+<span class="sourceLineNo">1037</span>  @Override<a name="line.1037"></a>
+<span class="sourceLineNo">1038</span>  public Map&lt;LoadQueueItem, ByteBuffer&gt; bulkLoad(TableName tableName, Path dir)<a name="line.1038"></a>
+<span class="sourceLineNo">1039</span>      throws IOException {<a name="line.1039"></a>
+<span class="sourceLineNo">1040</span>    try (AsyncClusterConnection conn = ClusterConnectionFactory<a name="line.1040"></a>
+<span class="sourceLineNo">1041</span>      .createAsyncClusterConnection(getConf(), null, userProvider.getCurrent())) {<a name="line.1041"></a>
+<span class="sourceLineNo">1042</span>      AsyncAdmin admin = conn.getAdmin();<a name="line.1042"></a>
+<span class="sourceLineNo">1043</span>      if (!FutureUtils.get(admin.tableExists(tableName))) {<a name="line.1043"></a>
+<span class="sourceLineNo">1044</span>        if (isCreateTable()) {<a name="line.1044"></a>
+<span class="sourceLineNo">1045</span>          createTable(tableName, dir, admin);<a name="line.1045"></a>
+<span class="sourceLineNo">1046</span>        } else {<a name="line.1046"></a>
+<span class="sourceLineNo">1047</span>          throwAndLogTableNotFoundException(tableName);<a name="line.1047"></a>
+<span class="sourceLineNo">1048</span>        }<a name="line.1048"></a>
+<span class="sourceLineNo">1049</span>      }<a name="line.1049"></a>
+<span class="sourceLineNo">1050</span>      return doBulkLoad(conn, tableName, dir, isSilence(), isAlwaysCopyFiles());<a name="line.1050"></a>
+<span class="sourceLineNo">1051</span>    }<a name="line.1051"></a>
+<span class="sourceLineNo">1052</span>  }<a name="line.1052"></a>
+<span class="sourceLineNo">1053</span><a name="line.1053"></a>
+<span class="sourceLineNo">1054</span>  /**<a name="line.1054"></a>
+<span class="sourceLineNo">1055</span>   * @throws TableNotFoundException if table does not exist.<a name="line.1055"></a>
+<span class="sourceLineNo">1056</span>   */<a name="line.1056"></a>
+<span class="sourceLineNo">1057</span>  private void tableExists(AsyncClusterConnection conn, TableName tableName) throws IOException {<a name="line.1057"></a>
+<span class="sourceLineNo">1058</span>    if (!FutureUtils.get(conn.getAdmin().tableExists(tableName))) {<a name="line.1058"></a>
+<span class="sourceLineNo">1059</span>      throwAndLogTableNotFoundException(tableName);<a name="line.1059"></a>
+<span class="sourceLineNo">1060</span>    }<a name="line.1060"></a>
+<span class="sourceLineNo">1061</span>  }<a name="line.1061"></a>
+<span class="sourceLineNo">1062</span><a name="line.1062"></a>
+<span class="sourceLineNo">1063</span>  private void throwAndLogTableNotFoundException(TableName tn) throws TableNotFoundException {<a name="line.1063"></a>
+<span class="sourceLineNo">1064</span>    String errorMsg = format("Table '%s' does not exist.", tn);<a name="line.1064"></a>
+<span class="sourceLineNo">1065</span>    LOG.error(errorMsg);<a name="line.1065"></a>
+<span class="sourceLineNo">1066</span>    throw new TableNotFoundException(errorMsg);<a name="line.1066"></a>
+<span class="sourceLineNo">1067</span>  }<a name="line.1067"></a>
+<span class="sourceLineNo">1068</span><a name="line.1068"></a>
+<span class="sourceLineNo">1069</span>  public void setBulkToken(String bulkToken) {<a name="line.1069"></a>
+<span class="sourceLineNo">1070</span>    this.bulkToken = bulkToken;<a name="line.1070"></a>
+<span class="sourceLineNo">1071</span>  }<a name="line.1071"></a>
+<span class="sourceLineNo">1072</span><a name="line.1072"></a>
+<span class="sourceLineNo">1073</span>  public void setClusterIds(List&lt;String&gt; clusterIds) {<a name="line.1073"></a>
+<span class="sourceLineNo">1074</span>    this.clusterIds = clusterIds;<a name="line.1074"></a>
+<span class="sourceLineNo">1075</span>  }<a name="line.1075"></a>
+<span class="sourceLineNo">1076</span><a name="line.1076"></a>
+<span class="sourceLineNo">1077</span>  private void usage() {<a name="line.1077"></a>
+<span class="sourceLineNo">1078</span>    System.err.println("Usage: " + "bin/hbase completebulkload [OPTIONS] "<a name="line.1078"></a>
+<span class="sourceLineNo">1079</span>        + "&lt;/PATH/TO/HFILEOUTPUTFORMAT-OUTPUT&gt; &lt;TABLENAME&gt;\n"<a name="line.1079"></a>
+<span class="sourceLineNo">1080</span>        + "Loads directory of hfiles -- a region dir or product of HFileOutputFormat -- "<a name="line.1080"></a>
+<span class="sourceLineNo">1081</span>        + "into an hbase table.\n"<a name="line.1081"></a>
+<span class="sourceLineNo">1082</span>        + "OPTIONS (for other -D options, see source code):\n"<a name="line.1082"></a>
+<span class="sourceLineNo">1083</span>        + " -D" + CREATE_TABLE_CONF_KEY + "=no whether to create table; when 'no', target "<a name="line.1083"></a>
+<span class="sourceLineNo">1084</span>        + "table must exist.\n"<a name="line.1084"></a>
+<span class="sourceLineNo">1085</span>        + " -D" + IGNORE_UNMATCHED_CF_CONF_KEY + "=yes to ignore unmatched column families.\n"<a name="line.1085"></a>
+<span class="sourceLineNo">1086</span>        + " -loadTable for when directory of files to load has a depth of 3; target table must "<a name="line.1086"></a>
+<span class="sourceLineNo">1087</span>        + "exist;\n"<a name="line.1087"></a>
+<span class="sourceLineNo">1088</span>        + " must be last of the options on command line.\n"<a name="line.1088"></a>
+<span class="sourceLineNo">1089</span>        + "See http://hbase.apache.org/book.html#arch.bulk.load.complete.strays for "<a name="line.1089"></a>
+<span class="sourceLineNo">1090</span>        + "documentation.\n");<a name="line.1090"></a>
+<span class="sourceLineNo">1091</span>  }<a name="line.1091"></a>
+<span class="sourceLineNo">1092</span><a name="line.1092"></a>
+<span class="sourceLineNo">1093</span>  @Override<a name="line.1093"></a>
+<span class="sourceLineNo">1094</span>  public int run(String[] args) throws Exception {<a name="line.1094"></a>
+<span class="sourceLineNo">1095</span>    if (args.length != 2 &amp;&amp; args.length != 3) {<a name="line.1095"></a>
+<span class="sourceLineNo">1096</span>      usage();<a name="line.1096"></a>
+<span class="sourceLineNo">1097</span>      return -1;<a name="line.1097"></a>
+<span class="sourceLineNo">1098</span>    }<a name="line.1098"></a>
+<span class="sourceLineNo">1099</span>    // Re-initialize to apply -D options from the command line parameters<a name="line.1099"></a>
+<span class="sourceLineNo">1100</span>    initialize();<a name="line.1100"></a>
+<span class="sourceLineNo">1101</span>    Path dirPath = new Path(args[0]);<a name="line.1101"></a>
+<span class="sourceLineNo">1102</span>    TableName tableName = TableName.valueOf(args[1]);<a name="line.1102"></a>
+<span class="sourceLineNo">1103</span>    if (args.length == 2) {<a name="line.1103"></a>
+<span class="sourceLineNo">1104</span>      return !bulkLoad(tableName, dirPath).isEmpty() ? 0 : -1;<a name="line.1104"></a>
+<span class="sourceLineNo">1105</span>    } else {<a name="line.1105"></a>
+<span class="sourceLineNo">1106</span>      Map&lt;byte[], List&lt;Path&gt;&gt; family2Files = Maps.newHashMap();<a name="line.1106"></a>
+<span class="sourceLineNo">1107</span>      FileSystem fs = FileSystem.get(getConf());<a name="line.1107"></a>
+<span class="sourceLineNo">1108</span>      for (FileStatus regionDir : fs.listStatus(dirPath)) {<a name="line.1108"></a>
+<span class="sourceLineNo">1109</span>        FSVisitor.visitRegionStoreFiles(fs, regionDir.getPath(), (region, family, hfileName) -&gt; {<a name="line.1109"></a>
+<span class="sourceLineNo">1110</span>          Path path = new Path(regionDir.getPath(), new Path(family, hfileName));<a name="line.1110"></a>
+<span class="sourceLineNo">1111</span>          byte[] familyName = Bytes.toBytes(family);<a name="line.1111"></a>
+<span class="sourceLineNo">1112</span>          if (family2Files.containsKey(familyName)) {<a name="line.1112"></a>
+<span class="sourceLineNo">1113</span>            family2Files.get(familyName).add(path);<a name="line.1113"></a>
+<span class="sourceLineNo">1114</span>          } else {<a name="line.1114"></a>
+<span class="sourceLineNo">1115</span>            family2Files.put(familyName, Lists.newArrayList(path));<a name="line.1115"></a>
+<span class="sourceLineNo">1116</span>          }<a name="line.1116"></a>
+<span class="sourceLineNo">1117</span>        });<a name="line.1117"></a>
+<span class="sourceLineNo">1118</span>      }<a name="line.1118"></a>
+<span class="sourceLineNo">1119</span>      return !bulkLoad(tableName, family2Files).isEmpty() ? 0 : -1;<a name="line.1119"></a>
+<span class="sourceLineNo">1120</span>    }<a name="line.1120"></a>
+<span class="sourceLineNo">1121</span>  }<a name="line.1121"></a>
+<span class="sourceLineNo">1122</span><a name="line.1122"></a>
+<span class="sourceLineNo">1123</span>  public static void main(String[] args) throws Exception {<a name="line.1123"></a>
+<span class="sourceLineNo">1124</span>    Configuration conf = HBaseConfiguration.create();<a name="line.1124"></a>
+<span class="sourceLineNo">1125</span>    int ret = ToolRunner.run(conf, new BulkLoadHFilesTool(conf), args);<a name="line.1125"></a>
+<span class="sourceLineNo">1126</span>    System.exit(ret);<a name="line.1126"></a>
+<span class="sourceLineNo">1127</span>  }<a name="line.1127"></a>
+<span class="sourceLineNo">1128</span><a name="line.1128"></a>
+<span class="sourceLineNo">1129</span>  @Override<a name="line.1129"></a>
+<span class="sourceLineNo">1130</span>  public void disableReplication(){<a name="line.1130"></a>
+<span class="sourceLineNo">1131</span>    this.replicate = false;<a name="line.1131"></a>
+<span class="sourceLineNo">1132</span>  }<a name="line.1132"></a>
+<span class="sourceLineNo">1133</span><a name="line.1133"></a>
+<span class="sourceLineNo">1134</span>  @Override<a name="line.1134"></a>
+<span class="sourceLineNo">1135</span>  public boolean isReplicationDisabled(){<a name="line.1135"></a>
+<span class="sourceLineNo">1136</span>    return !this.replicate;<a name="line.1136"></a>
+<span class="sourceLineNo">1137</span>  }<a name="line.1137"></a>
+<span class="sourceLineNo">1138</span>}<a name="line.1138"></a>
 
 
 
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html b/devapidocs/src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html
index 75d55eb..901d886 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/tool/BulkLoadHFilesTool.html
@@ -624,508 +624,526 @@
 <span class="sourceLineNo">616</span>  }<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>   * Attempt to assign the given load queue item into its target region group. If the hfile boundary<a name="line.619"></a>
-<span class="sourceLineNo">620</span>   * no longer fits into a region, physically splits the hfile such that the new bottom half will<a name="line.620"></a>
-<span class="sourceLineNo">621</span>   * fit and returns the list of LQI's corresponding to the resultant hfiles.<a name="line.621"></a>
-<span class="sourceLineNo">622</span>   * &lt;p/&gt;<a name="line.622"></a>
-<span class="sourceLineNo">623</span>   * protected for testing<a name="line.623"></a>
-<span class="sourceLineNo">624</span>   * @throws IOException if an IO failure is encountered<a name="line.624"></a>
-<span class="sourceLineNo">625</span>   */<a name="line.625"></a>
-<span class="sourceLineNo">626</span>  @VisibleForTesting<a name="line.626"></a>
-<span class="sourceLineNo">627</span>  protected Pair&lt;List&lt;LoadQueueItem&gt;, String&gt; groupOrSplit(AsyncClusterConnection conn,<a name="line.627"></a>
-<span class="sourceLineNo">628</span>      TableName tableName, Multimap&lt;ByteBuffer, LoadQueueItem&gt; regionGroups, LoadQueueItem item,<a name="line.628"></a>
-<span class="sourceLineNo">629</span>      List&lt;Pair&lt;byte[], byte[]&gt;&gt; startEndKeys) throws IOException {<a name="line.629"></a>
-<span class="sourceLineNo">630</span>    Path hfilePath = item.getFilePath();<a name="line.630"></a>
-<span class="sourceLineNo">631</span>    Optional&lt;byte[]&gt; first, last;<a name="line.631"></a>
-<span class="sourceLineNo">632</span>    try (HFile.Reader hfr = HFile.createReader(hfilePath.getFileSystem(getConf()), hfilePath,<a name="line.632"></a>
-<span class="sourceLineNo">633</span>      CacheConfig.DISABLED, true, getConf())) {<a name="line.633"></a>
-<span class="sourceLineNo">634</span>      first = hfr.getFirstRowKey();<a name="line.634"></a>
-<span class="sourceLineNo">635</span>      last = hfr.getLastRowKey();<a name="line.635"></a>
-<span class="sourceLineNo">636</span>    } catch (FileNotFoundException fnfe) {<a name="line.636"></a>
-<span class="sourceLineNo">637</span>      LOG.debug("encountered", fnfe);<a name="line.637"></a>
-<span class="sourceLineNo">638</span>      return new Pair&lt;&gt;(null, hfilePath.getName());<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    }<a name="line.639"></a>
-<span class="sourceLineNo">640</span><a name="line.640"></a>
-<span class="sourceLineNo">641</span>    LOG.info("Trying to load hfile=" + hfilePath + " first=" + first.map(Bytes::toStringBinary) +<a name="line.641"></a>
-<span class="sourceLineNo">642</span>      " last=" + last.map(Bytes::toStringBinary));<a name="line.642"></a>
-<span class="sourceLineNo">643</span>    if (!first.isPresent() || !last.isPresent()) {<a name="line.643"></a>
-<span class="sourceLineNo">644</span>      assert !first.isPresent() &amp;&amp; !last.isPresent();<a name="line.644"></a>
-<span class="sourceLineNo">645</span>      // TODO what if this is due to a bad HFile?<a name="line.645"></a>
-<span class="sourceLineNo">646</span>      LOG.info("hfile " + hfilePath + " has no entries, skipping");<a name="line.646"></a>
-<span class="sourceLineNo">647</span>      return null;<a name="line.647"></a>
-<span class="sourceLineNo">648</span>    }<a name="line.648"></a>
-<span class="sourceLineNo">649</span>    if (Bytes.compareTo(first.get(), last.get()) &gt; 0) {<a name="line.649"></a>
-<span class="sourceLineNo">650</span>      throw new IllegalArgumentException("Invalid range: " + Bytes.toStringBinary(first.get()) +<a name="line.650"></a>
-<span class="sourceLineNo">651</span>        " &gt; " + Bytes.toStringBinary(last.get()));<a name="line.651"></a>
-<span class="sourceLineNo">652</span>    }<a name="line.652"></a>
-<span class="sourceLineNo">653</span>    int idx =<a name="line.653"></a>
-<span class="sourceLineNo">654</span>      Collections.binarySearch(startEndKeys, Pair.newPair(first.get(), HConstants.EMPTY_END_ROW),<a name="line.654"></a>
-<span class="sourceLineNo">655</span>        (p1, p2) -&gt; Bytes.compareTo(p1.getFirst(), p2.getFirst()));<a name="line.655"></a>
-<span class="sourceLineNo">656</span>    if (idx &lt; 0) {<a name="line.656"></a>
-<span class="sourceLineNo">657</span>      // not on boundary, returns -(insertion index). Calculate region it<a name="line.657"></a>
-<span class="sourceLineNo">658</span>      // would be in.<a name="line.658"></a>
-<span class="sourceLineNo">659</span>      idx = -(idx + 1) - 1;<a name="line.659"></a>
-<span class="sourceLineNo">660</span>    }<a name="line.660"></a>
-<span class="sourceLineNo">661</span>    int indexForCallable = idx;<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>     * we can consider there is a region hole in following conditions. 1) if idx &lt; 0,then first<a name="line.664"></a>
-<span class="sourceLineNo">665</span>     * region info is lost. 2) if the endkey of a region is not equal to the startkey of the next<a name="line.665"></a>
-<span class="sourceLineNo">666</span>     * region. 3) if the endkey of the last region is not empty.<a name="line.666"></a>
-<span class="sourceLineNo">667</span>     */<a name="line.667"></a>
-<span class="sourceLineNo">668</span>    if (indexForCallable &lt; 0) {<a name="line.668"></a>
-<span class="sourceLineNo">669</span>      throw new IOException("The first region info for table " + tableName +<a name="line.669"></a>
-<span class="sourceLineNo">670</span>        " can't be found in hbase:meta.Please use hbck tool to fix it first.");<a name="line.670"></a>
-<span class="sourceLineNo">671</span>    } else if ((indexForCallable == startEndKeys.size() - 1) &amp;&amp;<a name="line.671"></a>
-<span class="sourceLineNo">672</span>      !Bytes.equals(startEndKeys.get(indexForCallable).getSecond(), HConstants.EMPTY_BYTE_ARRAY)) {<a name="line.672"></a>
-<span class="sourceLineNo">673</span>      throw new IOException("The last region info for table " + tableName +<a name="line.673"></a>
-<span class="sourceLineNo">674</span>        " can't be found in hbase:meta.Please use hbck tool to fix it first.");<a name="line.674"></a>
-<span class="sourceLineNo">675</span>    } else if (indexForCallable + 1 &lt; startEndKeys.size() &amp;&amp;<a name="line.675"></a>
-<span class="sourceLineNo">676</span>      !(Bytes.compareTo(startEndKeys.get(indexForCallable).getSecond(),<a name="line.676"></a>
-<span class="sourceLineNo">677</span>        startEndKeys.get(indexForCallable + 1).getFirst()) == 0)) {<a name="line.677"></a>
-<span class="sourceLineNo">678</span>      throw new IOException("The endkey of one region for table " + tableName +<a name="line.678"></a>
-<span class="sourceLineNo">679</span>        " is not equal to the startkey of the next region in hbase:meta." +<a name="line.679"></a>
-<span class="sourceLineNo">680</span>        "Please use hbck tool to fix it first.");<a name="line.680"></a>
-<span class="sourceLineNo">681</span>    }<a name="line.681"></a>
-<span class="sourceLineNo">682</span><a name="line.682"></a>
-<span class="sourceLineNo">683</span>    boolean lastKeyInRange = Bytes.compareTo(last.get(), startEndKeys.get(idx).getSecond()) &lt; 0 ||<a name="line.683"></a>
-<span class="sourceLineNo">684</span>      Bytes.equals(startEndKeys.get(idx).getSecond(), HConstants.EMPTY_BYTE_ARRAY);<a name="line.684"></a>
-<span class="sourceLineNo">685</span>    if (!lastKeyInRange) {<a name="line.685"></a>
-<span class="sourceLineNo">686</span>      Pair&lt;byte[], byte[]&gt; startEndKey = startEndKeys.get(indexForCallable);<a name="line.686"></a>
-<span class="sourceLineNo">687</span>      List&lt;LoadQueueItem&gt; lqis =<a name="line.687"></a>
-<span class="sourceLineNo">688</span>        splitStoreFile(item, FutureUtils.get(conn.getAdmin().getDescriptor(tableName)),<a name="line.688"></a>
-<span class="sourceLineNo">689</span>            startEndKey.getSecond());<a name="line.689"></a>
-<span class="sourceLineNo">690</span>      return new Pair&lt;&gt;(lqis, null);<a name="line.690"></a>
+<span class="sourceLineNo">619</span>   * @param startEndKeys the start/end keys of regions belong to this table, the list in ascending<a name="line.619"></a>
+<span class="sourceLineNo">620</span>   *          order by start key<a name="line.620"></a>
+<span class="sourceLineNo">621</span>   * @param key the key need to find which region belong to<a name="line.621"></a>
+<span class="sourceLineNo">622</span>   * @return region index<a name="line.622"></a>
+<span class="sourceLineNo">623</span>   */<a name="line.623"></a>
+<span class="sourceLineNo">624</span>  private int getRegionIndex(List&lt;Pair&lt;byte[], byte[]&gt;&gt; startEndKeys, byte[] key) {<a name="line.624"></a>
+<span class="sourceLineNo">625</span>    int idx = Collections.binarySearch(startEndKeys, Pair.newPair(key, HConstants.EMPTY_END_ROW),<a name="line.625"></a>
+<span class="sourceLineNo">626</span>      (p1, p2) -&gt; Bytes.compareTo(p1.getFirst(), p2.getFirst()));<a name="line.626"></a>
+<span class="sourceLineNo">627</span>    if (idx &lt; 0) {<a name="line.627"></a>
+<span class="sourceLineNo">628</span>      // not on boundary, returns -(insertion index). Calculate region it<a name="line.628"></a>
+<span class="sourceLineNo">629</span>      // would be in.<a name="line.629"></a>
+<span class="sourceLineNo">630</span>      idx = -(idx + 1) - 1;<a name="line.630"></a>
+<span class="sourceLineNo">631</span>    }<a name="line.631"></a>
+<span class="sourceLineNo">632</span>    return idx;<a name="line.632"></a>
+<span class="sourceLineNo">633</span>  }<a name="line.633"></a>
+<span class="sourceLineNo">634</span><a name="line.634"></a>
+<span class="sourceLineNo">635</span>  /**<a name="line.635"></a>
+<span class="sourceLineNo">636</span>   * we can consider there is a region hole or overlap in following conditions. 1) if idx &lt; 0,then<a name="line.636"></a>
+<span class="sourceLineNo">637</span>   * first region info is lost. 2) if the endkey of a region is not equal to the startkey of the<a name="line.637"></a>
+<span class="sourceLineNo">638</span>   * next region. 3) if the endkey of the last region is not empty.<a name="line.638"></a>
+<span class="sourceLineNo">639</span>   */<a name="line.639"></a>
+<span class="sourceLineNo">640</span>  private void checkRegionIndexValid(int idx, List&lt;Pair&lt;byte[], byte[]&gt;&gt; startEndKeys,<a name="line.640"></a>
+<span class="sourceLineNo">641</span>      TableName tableName) throws IOException {<a name="line.641"></a>
+<span class="sourceLineNo">642</span>    if (idx &lt; 0) {<a name="line.642"></a>
+<span class="sourceLineNo">643</span>      throw new IOException("The first region info for table " + tableName<a name="line.643"></a>
+<span class="sourceLineNo">644</span>          + " can't be found in hbase:meta.Please use hbck tool to fix it first.");<a name="line.644"></a>
+<span class="sourceLineNo">645</span>    } else if ((idx == startEndKeys.size() - 1)<a name="line.645"></a>
+<span class="sourceLineNo">646</span>        &amp;&amp; !Bytes.equals(startEndKeys.get(idx).getSecond(), HConstants.EMPTY_BYTE_ARRAY)) {<a name="line.646"></a>
+<span class="sourceLineNo">647</span>      throw new IOException("The last region info for table " + tableName<a name="line.647"></a>
+<span class="sourceLineNo">648</span>              + " can't be found in hbase:meta.Please use hbck tool to fix it first.");<a name="line.648"></a>
+<span class="sourceLineNo">649</span>    } else if (idx + 1 &lt; startEndKeys.size() &amp;&amp; !(Bytes.compareTo(startEndKeys.get(idx).getSecond(),<a name="line.649"></a>
+<span class="sourceLineNo">650</span>        startEndKeys.get(idx + 1).getFirst()) == 0)) {<a name="line.650"></a>
+<span class="sourceLineNo">651</span>      throw new IOException("The endkey of one region for table " + tableName<a name="line.651"></a>
+<span class="sourceLineNo">652</span>              + " is not equal to the startkey of the next region in hbase:meta."<a name="line.652"></a>
+<span class="sourceLineNo">653</span>              + "Please use hbck tool to fix it first.");<a name="line.653"></a>
+<span class="sourceLineNo">654</span>    }<a name="line.654"></a>
+<span class="sourceLineNo">655</span>  }<a name="line.655"></a>
+<span class="sourceLineNo">656</span><a name="line.656"></a>
+<span class="sourceLineNo">657</span>  /**<a name="line.657"></a>
+<span class="sourceLineNo">658</span>   * Attempt to assign the given load queue item into its target region group. If the hfile boundary<a name="line.658"></a>
+<span class="sourceLineNo">659</span>   * no longer fits into a region, physically splits the hfile such that the new bottom half will<a name="line.659"></a>
+<span class="sourceLineNo">660</span>   * fit and returns the list of LQI's corresponding to the resultant hfiles.<a name="line.660"></a>
+<span class="sourceLineNo">661</span>   * &lt;p/&gt;<a name="line.661"></a>
+<span class="sourceLineNo">662</span>   * protected for testing<a name="line.662"></a>
+<span class="sourceLineNo">663</span>   * @throws IOException if an IO failure is encountered<a name="line.663"></a>
+<span class="sourceLineNo">664</span>   */<a name="line.664"></a>
+<span class="sourceLineNo">665</span>  @VisibleForTesting<a name="line.665"></a>
+<span class="sourceLineNo">666</span>  protected Pair&lt;List&lt;LoadQueueItem&gt;, String&gt; groupOrSplit(AsyncClusterConnection conn,<a name="line.666"></a>
+<span class="sourceLineNo">667</span>      TableName tableName, Multimap&lt;ByteBuffer, LoadQueueItem&gt; regionGroups, LoadQueueItem item,<a name="line.667"></a>
+<span class="sourceLineNo">668</span>      List&lt;Pair&lt;byte[], byte[]&gt;&gt; startEndKeys) throws IOException {<a name="line.668"></a>
+<span class="sourceLineNo">669</span>    Path hfilePath = item.getFilePath();<a name="line.669"></a>
+<span class="sourceLineNo">670</span>    Optional&lt;byte[]&gt; first, last;<a name="line.670"></a>
+<span class="sourceLineNo">671</span>    try (HFile.Reader hfr = HFile.createReader(hfilePath.getFileSystem(getConf()), hfilePath,<a name="line.671"></a>
+<span class="sourceLineNo">672</span>      CacheConfig.DISABLED, true, getConf())) {<a name="line.672"></a>
+<span class="sourceLineNo">673</span>      first = hfr.getFirstRowKey();<a name="line.673"></a>
+<span class="sourceLineNo">674</span>      last = hfr.getLastRowKey();<a name="line.674"></a>
+<span class="sourceLineNo">675</span>    } catch (FileNotFoundException fnfe) {<a name="line.675"></a>
+<span class="sourceLineNo">676</span>      LOG.debug("encountered", fnfe);<a name="line.676"></a>
+<span class="sourceLineNo">677</span>      return new Pair&lt;&gt;(null, hfilePath.getName());<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>    LOG.info("Trying to load hfile=" + hfilePath + " first=" + first.map(Bytes::toStringBinary) +<a name="line.680"></a>
+<span class="sourceLineNo">681</span>      " last=" + last.map(Bytes::toStringBinary));<a name="line.681"></a>
+<span class="sourceLineNo">682</span>    if (!first.isPresent() || !last.isPresent()) {<a name="line.682"></a>
+<span class="sourceLineNo">683</span>      assert !first.isPresent() &amp;&amp; !last.isPresent();<a name="line.683"></a>
+<span class="sourceLineNo">684</span>      // TODO what if this is due to a bad HFile?<a name="line.684"></a>
+<span class="sourceLineNo">685</span>      LOG.info("hfile " + hfilePath + " has no entries, skipping");<a name="line.685"></a>
+<span class="sourceLineNo">686</span>      return null;<a name="line.686"></a>
+<span class="sourceLineNo">687</span>    }<a name="line.687"></a>
+<span class="sourceLineNo">688</span>    if (Bytes.compareTo(first.get(), last.get()) &gt; 0) {<a name="line.688"></a>
+<span class="sourceLineNo">689</span>      throw new IllegalArgumentException("Invalid range: " + Bytes.toStringBinary(first.get())<a name="line.689"></a>
+<span class="sourceLineNo">690</span>          + " &gt; " + Bytes.toStringBinary(last.get()));<a name="line.690"></a>
 <span class="sourceLineNo">691</span>    }<a name="line.691"></a>
-<span class="sourceLineNo">692</span><a name="line.692"></a>
-<span class="sourceLineNo">693</span>    // group regions.<a name="line.693"></a>
-<span class="sourceLineNo">694</span>    regionGroups.put(ByteBuffer.wrap(startEndKeys.get(idx).getFirst()), item);<a name="line.694"></a>
-<span class="sourceLineNo">695</span>    return null;<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>  /**<a name="line.698"></a>
-<span class="sourceLineNo">699</span>   * Split a storefile into a top and bottom half, maintaining the metadata, recreating bloom<a name="line.699"></a>
-<span class="sourceLineNo">700</span>   * filters, etc.<a name="line.700"></a>
-<span class="sourceLineNo">701</span>   */<a name="line.701"></a>
-<span class="sourceLineNo">702</span>  @VisibleForTesting<a name="line.702"></a>
-<span class="sourceLineNo">703</span>  static void splitStoreFile(Configuration conf, Path inFile, ColumnFamilyDescriptor familyDesc,<a name="line.703"></a>
-<span class="sourceLineNo">704</span>      byte[] splitKey, Path bottomOut, Path topOut) throws IOException {<a name="line.704"></a>
-<span class="sourceLineNo">705</span>    // Open reader with no block cache, and not in-memory<a name="line.705"></a>
-<span class="sourceLineNo">706</span>    Reference topReference = Reference.createTopReference(splitKey);<a name="line.706"></a>
-<span class="sourceLineNo">707</span>    Reference bottomReference = Reference.createBottomReference(splitKey);<a name="line.707"></a>
-<span class="sourceLineNo">708</span><a name="line.708"></a>
-<span class="sourceLineNo">709</span>    copyHFileHalf(conf, inFile, topOut, topReference, familyDesc);<a name="line.709"></a>
-<span class="sourceLineNo">710</span>    copyHFileHalf(conf, inFile, bottomOut, bottomReference, familyDesc);<a name="line.710"></a>
-<span class="sourceLineNo">711</span>  }<a name="line.711"></a>
-<span class="sourceLineNo">712</span><a name="line.712"></a>
-<span class="sourceLineNo">713</span>  /**<a name="line.713"></a>
-<span class="sourceLineNo">714</span>   * Copy half of an HFile into a new HFile.<a name="line.714"></a>
-<span class="sourceLineNo">715</span>   */<a name="line.715"></a>
-<span class="sourceLineNo">716</span>  private static void copyHFileHalf(Configuration conf, Path inFile, Path outFile,<a name="line.716"></a>
-<span class="sourceLineNo">717</span>      Reference reference, ColumnFamilyDescriptor familyDescriptor) throws IOException {<a name="line.717"></a>
-<span class="sourceLineNo">718</span>    FileSystem fs = inFile.getFileSystem(conf);<a name="line.718"></a>
-<span class="sourceLineNo">719</span>    CacheConfig cacheConf = CacheConfig.DISABLED;<a name="line.719"></a>
-<span class="sourceLineNo">720</span>    HalfStoreFileReader halfReader = null;<a name="line.720"></a>
-<span class="sourceLineNo">721</span>    StoreFileWriter halfWriter = null;<a name="line.721"></a>
-<span class="sourceLineNo">722</span>    try {<a name="line.722"></a>
-<span class="sourceLineNo">723</span>      ReaderContext context = new ReaderContextBuilder()<a name="line.723"></a>
-<span class="sourceLineNo">724</span>          .withFileSystemAndPath(fs, inFile).build();<a name="line.724"></a>
-<span class="sourceLineNo">725</span>      HFileInfo hfile = new HFileInfo(context, conf);<a name="line.725"></a>
-<span class="sourceLineNo">726</span>      halfReader = new HalfStoreFileReader(context, hfile, cacheConf, reference,<a name="line.726"></a>
-<span class="sourceLineNo">727</span>        new AtomicInteger(0), conf);<a name="line.727"></a>
-<span class="sourceLineNo">728</span>      hfile.initMetaAndIndex(halfReader.getHFileReader());<a name="line.728"></a>
-<span class="sourceLineNo">729</span>      Map&lt;byte[], byte[]&gt; fileInfo = halfReader.loadFileInfo();<a name="line.729"></a>
+<span class="sourceLineNo">692</span>    int firstKeyRegionIdx = getRegionIndex(startEndKeys, first.get());<a name="line.692"></a>
+<span class="sourceLineNo">693</span>    checkRegionIndexValid(firstKeyRegionIdx, startEndKeys, tableName);<a name="line.693"></a>
+<span class="sourceLineNo">694</span>    boolean lastKeyInRange =<a name="line.694"></a>
+<span class="sourceLineNo">695</span>        Bytes.compareTo(last.get(), startEndKeys.get(firstKeyRegionIdx).getSecond()) &lt; 0 || Bytes<a name="line.695"></a>
+<span class="sourceLineNo">696</span>            .equals(startEndKeys.get(firstKeyRegionIdx).getSecond(), HConstants.EMPTY_BYTE_ARRAY);<a name="line.696"></a>
+<span class="sourceLineNo">697</span>    if (!lastKeyInRange) {<a name="line.697"></a>
+<span class="sourceLineNo">698</span>      int lastKeyRegionIdx = getRegionIndex(startEndKeys, last.get());<a name="line.698"></a>
+<span class="sourceLineNo">699</span>      int splitIdx = (firstKeyRegionIdx + lastKeyRegionIdx) / 2;<a name="line.699"></a>
+<span class="sourceLineNo">700</span>      // make sure the splitPoint is valid in case region overlap occur, maybe the splitPoint bigger<a name="line.700"></a>
+<span class="sourceLineNo">701</span>      // than hfile.endkey w/o this check<a name="line.701"></a>
+<span class="sourceLineNo">702</span>      if (splitIdx != firstKeyRegionIdx) {<a name="line.702"></a>
+<span class="sourceLineNo">703</span>        checkRegionIndexValid(splitIdx, startEndKeys, tableName);<a name="line.703"></a>
+<span class="sourceLineNo">704</span>      }<a name="line.704"></a>
+<span class="sourceLineNo">705</span>      byte[] splitPoint = startEndKeys.get(splitIdx).getSecond();<a name="line.705"></a>
+<span class="sourceLineNo">706</span>      List&lt;LoadQueueItem&gt; lqis = splitStoreFile(item,<a name="line.706"></a>
+<span class="sourceLineNo">707</span>        FutureUtils.get(conn.getAdmin().getDescriptor(tableName)), splitPoint);<a name="line.707"></a>
+<span class="sourceLineNo">708</span>      return new Pair&lt;&gt;(lqis, null);<a name="line.708"></a>
+<span class="sourceLineNo">709</span>    }<a name="line.709"></a>
+<span class="sourceLineNo">710</span><a name="line.710"></a>
+<span class="sourceLineNo">711</span>    // group regions.<a name="line.711"></a>
+<span class="sourceLineNo">712</span>    regionGroups.put(ByteBuffer.wrap(startEndKeys.get(firstKeyRegionIdx).getFirst()), item);<a name="line.712"></a>
+<span class="sourceLineNo">713</span>    return null;<a name="line.713"></a>
+<span class="sourceLineNo">714</span>  }<a name="line.714"></a>
+<span class="sourceLineNo">715</span><a name="line.715"></a>
+<span class="sourceLineNo">716</span>  /**<a name="line.716"></a>
+<span class="sourceLineNo">717</span>   * Split a storefile into a top and bottom half, maintaining the metadata, recreating bloom<a name="line.717"></a>
+<span class="sourceLineNo">718</span>   * filters, etc.<a name="line.718"></a>
+<span class="sourceLineNo">719</span>   */<a name="line.719"></a>
+<span class="sourceLineNo">720</span>  @VisibleForTesting<a name="line.720"></a>
+<span class="sourceLineNo">721</span>  static void splitStoreFile(Configuration conf, Path inFile, ColumnFamilyDescriptor familyDesc,<a name="line.721"></a>
+<span class="sourceLineNo">722</span>      byte[] splitKey, Path bottomOut, Path topOut) throws IOException {<a name="line.722"></a>
+<span class="sourceLineNo">723</span>    // Open reader with no block cache, and not in-memory<a name="line.723"></a>
+<span class="sourceLineNo">724</span>    Reference topReference = Reference.createTopReference(splitKey);<a name="line.724"></a>
+<span class="sourceLineNo">725</span>    Reference bottomReference = Reference.createBottomReference(splitKey);<a name="line.725"></a>
+<span class="sourceLineNo">726</span><a name="line.726"></a>
+<span class="sourceLineNo">727</span>    copyHFileHalf(conf, inFile, topOut, topReference, familyDesc);<a name="line.727"></a>
+<span class="sourceLineNo">728</span>    copyHFileHalf(conf, inFile, bottomOut, bottomReference, familyDesc);<a name="line.728"></a>
+<span class="sourceLineNo">729</span>  }<a name="line.729"></a>
 <span class="sourceLineNo">730</span><a name="line.730"></a>
-<span class="sourceLineNo">731</span>      int blocksize = familyDescriptor.getBlocksize();<a name="line.731"></a>
-<span class="sourceLineNo">732</span>      Algorithm compression = familyDescriptor.getCompressionType();<a name="line.732"></a>
-<span class="sourceLineNo">733</span>      BloomType bloomFilterType = familyDescriptor.getBloomFilterType();<a name="line.733"></a>
-<span class="sourceLineNo">734</span>      HFileContext hFileContext = new HFileContextBuilder().withCompression(compression)<a name="line.734"></a>
-<span class="sourceLineNo">735</span>        .withChecksumType(HStore.getChecksumType(conf))<a name="line.735"></a>
-<span class="sourceLineNo">736</span>        .withBytesPerCheckSum(HStore.getBytesPerChecksum(conf)).withBlockSize(blocksize)<a name="line.736"></a>
-<span class="sourceLineNo">737</span>        .withDataBlockEncoding(familyDescriptor.getDataBlockEncoding()).withIncludesTags(true)<a name="line.737"></a>
-<span class="sourceLineNo">738</span>        .build();<a name="line.738"></a>
-<span class="sourceLineNo">739</span>      halfWriter = new StoreFileWriter.Builder(conf, cacheConf, fs).withFilePath(outFile)<a name="line.739"></a>
-<span class="sourceLineNo">740</span>        .withBloomType(bloomFilterType).withFileContext(hFileContext).build();<a name="line.740"></a>
-<span class="sourceLineNo">741</span>      HFileScanner scanner = halfReader.getScanner(false, false, false);<a name="line.741"></a>
-<span class="sourceLineNo">742</span>      scanner.seekTo();<a name="line.742"></a>
-<span class="sourceLineNo">743</span>      do {<a name="line.743"></a>
-<span class="sourceLineNo">744</span>        halfWriter.append(scanner.getCell());<a name="line.744"></a>
-<span class="sourceLineNo">745</span>      } while (scanner.next());<a name="line.745"></a>
-<span class="sourceLineNo">746</span><a name="line.746"></a>
-<span class="sourceLineNo">747</span>      for (Map.Entry&lt;byte[], byte[]&gt; entry : fileInfo.entrySet()) {<a name="line.747"></a>
-<span class="sourceLineNo">748</span>        if (shouldCopyHFileMetaKey(entry.getKey())) {<a name="line.748"></a>
-<span class="sourceLineNo">749</span>          halfWriter.appendFileInfo(entry.getKey(), entry.getValue());<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>    } finally {<a name="line.752"></a>
-<span class="sourceLineNo">753</span>      if (halfReader != null) {<a name="line.753"></a>
-<span class="sourceLineNo">754</span>        try {<a name="line.754"></a>
-<span class="sourceLineNo">755</span>          halfReader.close(cacheConf.shouldEvictOnClose());<a name="line.755"></a>
-<span class="sourceLineNo">756</span>        } catch (IOException e) {<a name="line.756"></a>
-<span class="sourceLineNo">757</span>          LOG.warn("failed to close hfile reader for " + inFile, e);<a name="line.757"></a>
-<span class="sourceLineNo">758</span>        }<a name="line.758"></a>
-<span class="sourceLineNo">759</span>      }<a name="line.759"></a>
-<span class="sourceLineNo">760</span>      if (halfWriter != null) {<a name="line.760"></a>
-<span class="sourceLineNo">761</span>        halfWriter.close();<a name="line.761"></a>
-<span class="sourceLineNo">762</span>      }<a name="line.762"></a>
-<span class="sourceLineNo">763</span>    }<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>  /**<a name="line.766"></a>
-<span class="sourceLineNo">767</span>   * Infers region boundaries for a new table.<a name="line.767"></a>
-<span class="sourceLineNo">768</span>   * &lt;p/&gt;<a name="line.768"></a>
-<span class="sourceLineNo">769</span>   * Parameter: &lt;br/&gt;<a name="line.769"></a>
-<span class="sourceLineNo">770</span>   * bdryMap is a map between keys to an integer belonging to {+1, -1}<a name="line.770"></a>
-<span class="sourceLineNo">771</span>   * &lt;ul&gt;<a name="line.771"></a>
-<span class="sourceLineNo">772</span>   * &lt;li&gt;If a key is a start key of a file, then it maps to +1&lt;/li&gt;<a name="line.772"></a>
-<span class="sourceLineNo">773</span>   * &lt;li&gt;If a key is an end key of a file, then it maps to -1&lt;/li&gt;<a name="line.773"></a>
-<span class="sourceLineNo">774</span>   * &lt;/ul&gt;<a name="line.774"></a>
-<span class="sourceLineNo">775</span>   * &lt;p&gt;<a name="line.775"></a>
-<span class="sourceLineNo">776</span>   * Algo:&lt;br/&gt;<a name="line.776"></a>
-<span class="sourceLineNo">777</span>   * &lt;ol&gt;<a name="line.777"></a>
-<span class="sourceLineNo">778</span>   * &lt;li&gt;Poll on the keys in order:<a name="line.778"></a>
-<span class="sourceLineNo">779</span>   * &lt;ol type="a"&gt;<a name="line.779"></a>
-<span class="sourceLineNo">780</span>   * &lt;li&gt;Keep adding the mapped values to these keys (runningSum)&lt;/li&gt;<a name="line.780"></a>
-<span class="sourceLineNo">781</span>   * &lt;li&gt;Each time runningSum reaches 0, add the start Key from when the runningSum had started to a<a name="line.781"></a>
-<span class="sourceLineNo">782</span>   * boundary list.&lt;/li&gt;<a name="line.782"></a>
-<span class="sourceLineNo">783</span>   * &lt;/ol&gt;<a name="line.783"></a>
-<span class="sourceLineNo">784</span>   * &lt;/li&gt;<a name="line.784"></a>
-<span class="sourceLineNo">785</span>   * &lt;li&gt;Return the boundary list.&lt;/li&gt;<a name="line.785"></a>
-<span class="sourceLineNo">786</span>   * &lt;/ol&gt;<a name="line.786"></a>
-<span class="sourceLineNo">787</span>   */<a name="line.787"></a>
-<span class="sourceLineNo">788</span>  public static byte[][] inferBoundaries(SortedMap&lt;byte[], Integer&gt; bdryMap) {<a name="line.788"></a>
-<span class="sourceLineNo">789</span>    List&lt;byte[]&gt; keysArray = new ArrayList&lt;&gt;();<a name="line.789"></a>
-<span class="sourceLineNo">790</span>    int runningValue = 0;<a name="line.790"></a>
-<span class="sourceLineNo">791</span>    byte[] currStartKey = null;<a name="line.791"></a>
-<span class="sourceLineNo">792</span>    boolean firstBoundary = true;<a name="line.792"></a>
-<span class="sourceLineNo">793</span><a name="line.793"></a>
-<span class="sourceLineNo">794</span>    for (Map.Entry&lt;byte[], Integer&gt; item : bdryMap.entrySet()) {<a name="line.794"></a>
-<span class="sourceLineNo">795</span>      if (runningValue == 0) {<a name="line.795"></a>
-<span class="sourceLineNo">796</span>        currStartKey = item.getKey();<a name="line.796"></a>
-<span class="sourceLineNo">797</span>      }<a name="line.797"></a>
-<span class="sourceLineNo">798</span>      runningValue += item.getValue();<a name="line.798"></a>
-<span class="sourceLineNo">799</span>      if (runningValue == 0) {<a name="line.799"></a>
-<span class="sourceLineNo">800</span>        if (!firstBoundary) {<a name="line.800"></a>
-<span class="sourceLineNo">801</span>          keysArray.add(currStartKey);<a name="line.801"></a>
-<span class="sourceLineNo">802</span>        }<a name="line.802"></a>
-<span class="sourceLineNo">803</span>        firstBoundary = false;<a name="line.803"></a>
-<span class="sourceLineNo">804</span>      }<a name="line.804"></a>
-<span class="sourceLineNo">805</span>    }<a name="line.805"></a>
-<span class="sourceLineNo">806</span><a name="line.806"></a>
-<span class="sourceLineNo">807</span>    return keysArray.toArray(new byte[0][]);<a name="line.807"></a>
-<span class="sourceLineNo">808</span>  }<a name="line.808"></a>
-<span class="sourceLineNo">809</span><a name="line.809"></a>
-<span class="sourceLineNo">810</span>  /**<a name="line.810"></a>
-<span class="sourceLineNo">811</span>   * If the table is created for the first time, then "completebulkload" reads the files twice. More<a name="line.811"></a>
-<span class="sourceLineNo">812</span>   * modifications necessary if we want to avoid doing it.<a name="line.812"></a>
-<span class="sourceLineNo">813</span>   */<a name="line.813"></a>
-<span class="sourceLineNo">814</span>  private void createTable(TableName tableName, Path hfofDir, AsyncAdmin admin) throws IOException {<a name="line.814"></a>
-<span class="sourceLineNo">815</span>    final FileSystem fs = hfofDir.getFileSystem(getConf());<a name="line.815"></a>
-<span class="sourceLineNo">816</span><a name="line.816"></a>
-<span class="sourceLineNo">817</span>    // Add column families<a name="line.817"></a>
-<span class="sourceLineNo">818</span>    // Build a set of keys<a name="line.818"></a>
-<span class="sourceLineNo">819</span>    List&lt;ColumnFamilyDescriptorBuilder&gt; familyBuilders = new ArrayList&lt;&gt;();<a name="line.819"></a>
-<span class="sourceLineNo">820</span>    SortedMap&lt;byte[], Integer&gt; map = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.820"></a>
-<span class="sourceLineNo">821</span>    visitBulkHFiles(fs, hfofDir, new BulkHFileVisitor&lt;ColumnFamilyDescriptorBuilder&gt;() {<a name="line.821"></a>
-<span class="sourceLineNo">822</span>      @Override<a name="line.822"></a>
-<span class="sourceLineNo">823</span>      public ColumnFamilyDescriptorBuilder bulkFamily(byte[] familyName) {<a name="line.823"></a>
-<span class="sourceLineNo">824</span>        ColumnFamilyDescriptorBuilder builder =<a name="line.824"></a>
-<span class="sourceLineNo">825</span>          ColumnFamilyDescriptorBuilder.newBuilder(familyName);<a name="line.825"></a>
-<span class="sourceLineNo">826</span>        familyBuilders.add(builder);<a name="line.826"></a>
-<span class="sourceLineNo">827</span>        return builder;<a name="line.827"></a>
-<span class="sourceLineNo">828</span>      }<a name="line.828"></a>
-<span class="sourceLineNo">829</span><a name="line.829"></a>
-<span class="sourceLineNo">830</span>      @Override<a name="line.830"></a>
-<span class="sourceLineNo">831</span>      public void bulkHFile(ColumnFamilyDescriptorBuilder builder, FileStatus hfileStatus)<a name="line.831"></a>
-<span class="sourceLineNo">832</span>          throws IOException {<a name="line.832"></a>
-<span class="sourceLineNo">833</span>        Path hfile = hfileStatus.getPath();<a name="line.833"></a>
-<span class="sourceLineNo">834</span>        try (HFile.Reader reader =<a name="line.834"></a>
-<span class="sourceLineNo">835</span>          HFile.createReader(fs, hfile, CacheConfig.DISABLED, true, getConf())) {<a name="line.835"></a>
-<span class="sourceLineNo">836</span>          if (builder.getCompressionType() != reader.getFileContext().getCompression()) {<a name="line.836"></a>
-<span class="sourceLineNo">837</span>            builder.setCompressionType(reader.getFileContext().getCompression());<a name="line.837"></a>
-<span class="sourceLineNo">838</span>            LOG.info("Setting compression " + reader.getFileContext().getCompression().name() +<a name="line.838"></a>
-<span class="sourceLineNo">839</span>              " for family " + builder.getNameAsString());<a name="line.839"></a>
-<span class="sourceLineNo">840</span>          }<a name="line.840"></a>
-<span class="sourceLineNo">841</span>          byte[] first = reader.getFirstRowKey().get();<a name="line.841"></a>
-<span class="sourceLineNo">842</span>          byte[] last = reader.getLastRowKey().get();<a name="line.842"></a>
-<span class="sourceLineNo">843</span><a name="line.843"></a>
-<span class="sourceLineNo">844</span>          LOG.info("Trying to figure out region boundaries hfile=" + hfile + " first=" +<a name="line.844"></a>
-<span class="sourceLineNo">845</span>            Bytes.toStringBinary(first) + " last=" + Bytes.toStringBinary(last));<a name="line.845"></a>
-<span class="sourceLineNo">846</span><a name="line.846"></a>
-<span class="sourceLineNo">847</span>          // To eventually infer start key-end key boundaries<a name="line.847"></a>
-<span class="sourceLineNo">848</span>          Integer value = map.getOrDefault(first, 0);<a name="line.848"></a>
-<span class="sourceLineNo">849</span>          map.put(first, value + 1);<a name="line.849"></a>
-<span class="sourceLineNo">850</span><a name="line.850"></a>
-<span class="sourceLineNo">851</span>          value = map.containsKey(last) ? map.get(last) : 0;<a name="line.851"></a>
-<span class="sourceLineNo">852</span>          map.put(last, value - 1);<a name="line.852"></a>
-<span class="sourceLineNo">853</span>        }<a name="line.853"></a>
-<span class="sourceLineNo">854</span>      }<a name="line.854"></a>
-<span class="sourceLineNo">855</span>    }, true);<a name="line.855"></a>
-<span class="sourceLineNo">856</span><a name="line.856"></a>
-<span class="sourceLineNo">857</span>    byte[][] keys = inferBoundaries(map);<a name="line.857"></a>
-<span class="sourceLineNo">858</span>    TableDescriptorBuilder tdBuilder = TableDescriptorBuilder.newBuilder(tableName);<a name="line.858"></a>
-<span class="sourceLineNo">859</span>    familyBuilders.stream().map(ColumnFamilyDescriptorBuilder::build)<a name="line.859"></a>
-<span class="sourceLineNo">860</span>      .forEachOrdered(tdBuilder::setColumnFamily);<a name="line.860"></a>
-<span class="sourceLineNo">861</span>    FutureUtils.get(admin.createTable(tdBuilder.build(), keys));<a name="line.861"></a>
-<span class="sourceLineNo">862</span><a name="line.862"></a>
-<span class="sourceLineNo">863</span>    LOG.info("Table " + tableName + " is available!!");<a name="line.863"></a>
-<span class="sourceLineNo">864</span>  }<a name="line.864"></a>
-<span class="sourceLineNo">865</span><a name="line.865"></a>
-<span class="sourceLineNo">866</span>  private Map&lt;LoadQueueItem, ByteBuffer&gt; performBulkLoad(AsyncClusterConnection conn,<a name="line.866"></a>
-<span class="sourceLineNo">867</span>      TableName tableName, Deque&lt;LoadQueueItem&gt; queue, ExecutorService pool, boolean copyFile)<a name="line.867"></a>
-<span class="sourceLineNo">868</span>      throws IOException {<a name="line.868"></a>
-<span class="sourceLineNo">869</span>    int count = 0;<a name="line.869"></a>
-<span class="sourceLineNo">870</span><a name="line.870"></a>
-<span class="sourceLineNo">871</span>    fsDelegationToken.acquireDelegationToken(queue.peek().getFilePath().getFileSystem(getConf()));<a name="line.871"></a>
-<span class="sourceLineNo">872</span>    bulkToken = FutureUtils.get(conn.prepareBulkLoad(tableName));<a name="line.872"></a>
-<span class="sourceLineNo">873</span>    Pair&lt;Multimap&lt;ByteBuffer, LoadQueueItem&gt;, Set&lt;String&gt;&gt; pair = null;<a name="line.873"></a>
+<span class="sourceLineNo">731</span>  /**<a name="line.731"></a>
+<span class="sourceLineNo">732</span>   * Copy half of an HFile into a new HFile.<a name="line.732"></a>
+<span class="sourceLineNo">733</span>   */<a name="line.733"></a>
+<span class="sourceLineNo">734</span>  private static void copyHFileHalf(Configuration conf, Path inFile, Path outFile,<a name="line.734"></a>
+<span class="sourceLineNo">735</span>      Reference reference, ColumnFamilyDescriptor familyDescriptor) throws IOException {<a name="line.735"></a>
+<span class="sourceLineNo">736</span>    FileSystem fs = inFile.getFileSystem(conf);<a name="line.736"></a>
+<span class="sourceLineNo">737</span>    CacheConfig cacheConf = CacheConfig.DISABLED;<a name="line.737"></a>
+<span class="sourceLineNo">738</span>    HalfStoreFileReader halfReader = null;<a name="line.738"></a>
+<span class="sourceLineNo">739</span>    StoreFileWriter halfWriter = null;<a name="line.739"></a>
+<span class="sourceLineNo">740</span>    try {<a name="line.740"></a>
+<span class="sourceLineNo">741</span>      ReaderContext context = new ReaderContextBuilder()<a name="line.741"></a>
+<span class="sourceLineNo">742</span>          .withFileSystemAndPath(fs, inFile).build();<a name="line.742"></a>
+<span class="sourceLineNo">743</span>      HFileInfo hfile = new HFileInfo(context, conf);<a name="line.743"></a>
+<span class="sourceLineNo">744</span>      halfReader = new HalfStoreFileReader(context, hfile, cacheConf, reference,<a name="line.744"></a>
+<span class="sourceLineNo">745</span>        new AtomicInteger(0), conf);<a name="line.745"></a>
+<span class="sourceLineNo">746</span>      hfile.initMetaAndIndex(halfReader.getHFileReader());<a name="line.746"></a>
+<span class="sourceLineNo">747</span>      Map&lt;byte[], byte[]&gt; fileInfo = halfReader.loadFileInfo();<a name="line.747"></a>
+<span class="sourceLineNo">748</span><a name="line.748"></a>
+<span class="sourceLineNo">749</span>      int blocksize = familyDescriptor.getBlocksize();<a name="line.749"></a>
+<span class="sourceLineNo">750</span>      Algorithm compression = familyDescriptor.getCompressionType();<a name="line.750"></a>
+<span class="sourceLineNo">751</span>      BloomType bloomFilterType = familyDescriptor.getBloomFilterType();<a name="line.751"></a>
+<span class="sourceLineNo">752</span>      HFileContext hFileContext = new HFileContextBuilder().withCompression(compression)<a name="line.752"></a>
+<span class="sourceLineNo">753</span>        .withChecksumType(HStore.getChecksumType(conf))<a name="line.753"></a>
+<span class="sourceLineNo">754</span>        .withBytesPerCheckSum(HStore.getBytesPerChecksum(conf)).withBlockSize(blocksize)<a name="line.754"></a>
+<span class="sourceLineNo">755</span>        .withDataBlockEncoding(familyDescriptor.getDataBlockEncoding()).withIncludesTags(true)<a name="line.755"></a>
+<span class="sourceLineNo">756</span>        .build();<a name="line.756"></a>
+<span class="sourceLineNo">757</span>      halfWriter = new StoreFileWriter.Builder(conf, cacheConf, fs).withFilePath(outFile)<a name="line.757"></a>
+<span class="sourceLineNo">758</span>        .withBloomType(bloomFilterType).withFileContext(hFileContext).build();<a name="line.758"></a>
+<span class="sourceLineNo">759</span>      HFileScanner scanner = halfReader.getScanner(false, false, false);<a name="line.759"></a>
+<span class="sourceLineNo">760</span>      scanner.seekTo();<a name="line.760"></a>
+<span class="sourceLineNo">761</span>      do {<a name="line.761"></a>
+<span class="sourceLineNo">762</span>        halfWriter.append(scanner.getCell());<a name="line.762"></a>
+<span class="sourceLineNo">763</span>      } while (scanner.next());<a name="line.763"></a>
+<span class="sourceLineNo">764</span><a name="line.764"></a>
+<span class="sourceLineNo">765</span>      for (Map.Entry&lt;byte[], byte[]&gt; entry : fileInfo.entrySet()) {<a name="line.765"></a>
+<span class="sourceLineNo">766</span>        if (shouldCopyHFileMetaKey(entry.getKey())) {<a name="line.766"></a>
+<span class="sourceLineNo">767</span>          halfWriter.appendFileInfo(entry.getKey(), entry.getValue());<a name="line.767"></a>
+<span class="sourceLineNo">768</span>        }<a name="line.768"></a>
+<span class="sourceLineNo">769</span>      }<a name="line.769"></a>
+<span class="sourceLineNo">770</span>    } finally {<a name="line.770"></a>
+<span class="sourceLineNo">771</span>      if (halfReader != null) {<a name="line.771"></a>
+<span class="sourceLineNo">772</span>        try {<a name="line.772"></a>
+<span class="sourceLineNo">773</span>          halfReader.close(cacheConf.shouldEvictOnClose());<a name="line.773"></a>
+<span class="sourceLineNo">774</span>        } catch (IOException e) {<a name="line.774"></a>
+<span class="sourceLineNo">775</span>          LOG.warn("failed to close hfile reader for " + inFile, e);<a name="line.775"></a>
+<span class="sourceLineNo">776</span>        }<a name="line.776"></a>
+<span class="sourceLineNo">777</span>      }<a name="line.777"></a>
+<span class="sourceLineNo">778</span>      if (halfWriter != null) {<a name="line.778"></a>
+<span class="sourceLineNo">779</span>        halfWriter.close();<a name="line.779"></a>
+<span class="sourceLineNo">780</span>      }<a name="line.780"></a>
+<span class="sourceLineNo">781</span>    }<a name="line.781"></a>
+<span class="sourceLineNo">782</span>  }<a name="line.782"></a>
+<span class="sourceLineNo">783</span><a name="line.783"></a>
+<span class="sourceLineNo">784</span>  /**<a name="line.784"></a>
+<span class="sourceLineNo">785</span>   * Infers region boundaries for a new table.<a name="line.785"></a>
+<span class="sourceLineNo">786</span>   * &lt;p/&gt;<a name="line.786"></a>
+<span class="sourceLineNo">787</span>   * Parameter: &lt;br/&gt;<a name="line.787"></a>
+<span class="sourceLineNo">788</span>   * bdryMap is a map between keys to an integer belonging to {+1, -1}<a name="line.788"></a>
+<span class="sourceLineNo">789</span>   * &lt;ul&gt;<a name="line.789"></a>
+<span class="sourceLineNo">790</span>   * &lt;li&gt;If a key is a start key of a file, then it maps to +1&lt;/li&gt;<a name="line.790"></a>
+<span class="sourceLineNo">791</span>   * &lt;li&gt;If a key is an end key of a file, then it maps to -1&lt;/li&gt;<a name="line.791"></a>
+<span class="sourceLineNo">792</span>   * &lt;/ul&gt;<a name="line.792"></a>
+<span class="sourceLineNo">793</span>   * &lt;p&gt;<a name="line.793"></a>
+<span class="sourceLineNo">794</span>   * Algo:&lt;br/&gt;<a name="line.794"></a>
+<span class="sourceLineNo">795</span>   * &lt;ol&gt;<a name="line.795"></a>
+<span class="sourceLineNo">796</span>   * &lt;li&gt;Poll on the keys in order:<a name="line.796"></a>
+<span class="sourceLineNo">797</span>   * &lt;ol type="a"&gt;<a name="line.797"></a>
+<span class="sourceLineNo">798</span>   * &lt;li&gt;Keep adding the mapped values to these keys (runningSum)&lt;/li&gt;<a name="line.798"></a>
+<span class="sourceLineNo">799</span>   * &lt;li&gt;Each time runningSum reaches 0, add the start Key from when the runningSum had started to a<a name="line.799"></a>
+<span class="sourceLineNo">800</span>   * boundary list.&lt;/li&gt;<a name="line.800"></a>
+<span class="sourceLineNo">801</span>   * &lt;/ol&gt;<a name="line.801"></a>
+<span class="sourceLineNo">802</span>   * &lt;/li&gt;<a name="line.802"></a>
+<span class="sourceLineNo">803</span>   * &lt;li&gt;Return the boundary list.&lt;/li&gt;<a name="line.803"></a>
+<span class="sourceLineNo">804</span>   * &lt;/ol&gt;<a name="line.804"></a>
+<span class="sourceLineNo">805</span>   */<a name="line.805"></a>
+<span class="sourceLineNo">806</span>  public static byte[][] inferBoundaries(SortedMap&lt;byte[], Integer&gt; bdryMap) {<a name="line.806"></a>
+<span class="sourceLineNo">807</span>    List&lt;byte[]&gt; keysArray = new ArrayList&lt;&gt;();<a name="line.807"></a>
+<span class="sourceLineNo">808</span>    int runningValue = 0;<a name="line.808"></a>
+<span class="sourceLineNo">809</span>    byte[] currStartKey = null;<a name="line.809"></a>
+<span class="sourceLineNo">810</span>    boolean firstBoundary = true;<a name="line.810"></a>
+<span class="sourceLineNo">811</span><a name="line.811"></a>
+<span class="sourceLineNo">812</span>    for (Map.Entry&lt;byte[], Integer&gt; item : bdryMap.entrySet()) {<a name="line.812"></a>
+<span class="sourceLineNo">813</span>      if (runningValue == 0) {<a name="line.813"></a>
+<span class="sourceLineNo">814</span>        currStartKey = item.getKey();<a name="line.814"></a>
+<span class="sourceLineNo">815</span>      }<a name="line.815"></a>
+<span class="sourceLineNo">816</span>      runningValue += item.getValue();<a name="line.816"></a>
+<span class="sourceLineNo">817</span>      if (runningValue == 0) {<a name="line.817"></a>
+<span class="sourceLineNo">818</span>        if (!firstBoundary) {<a name="line.818"></a>
+<span class="sourceLineNo">819</span>          keysArray.add(currStartKey);<a name="line.819"></a>
+<span class="sourceLineNo">820</span>        }<a name="line.820"></a>
+<span class="sourceLineNo">821</span>        firstBoundary = false;<a name="line.821"></a>
+<span class="sourceLineNo">822</span>      }<a name="line.822"></a>
+<span class="sourceLineNo">823</span>    }<a name="line.823"></a>
+<span class="sourceLineNo">824</span><a name="line.824"></a>
+<span class="sourceLineNo">825</span>    return keysArray.toArray(new byte[0][]);<a name="line.825"></a>
+<span class="sourceLineNo">826</span>  }<a name="line.826"></a>
+<span class="sourceLineNo">827</span><a name="line.827"></a>
+<span class="sourceLineNo">828</span>  /**<a name="line.828"></a>
+<span class="sourceLineNo">829</span>   * If the table is created for the first time, then "completebulkload" reads the files twice. More<a name="line.829"></a>
+<span class="sourceLineNo">830</span>   * modifications necessary if we want to avoid doing it.<a name="line.830"></a>
+<span class="sourceLineNo">831</span>   */<a name="line.831"></a>
+<span class="sourceLineNo">832</span>  private void createTable(TableName tableName, Path hfofDir, AsyncAdmin admin) throws IOException {<a name="line.832"></a>
+<span class="sourceLineNo">833</span>    final FileSystem fs = hfofDir.getFileSystem(getConf());<a name="line.833"></a>
+<span class="sourceLineNo">834</span><a name="line.834"></a>
+<span class="sourceLineNo">835</span>    // Add column families<a name="line.835"></a>
+<span class="sourceLineNo">836</span>    // Build a set of keys<a name="line.836"></a>
+<span class="sourceLineNo">837</span>    List&lt;ColumnFamilyDescriptorBuilder&gt; familyBuilders = new ArrayList&lt;&gt;();<a name="line.837"></a>
+<span class="sourceLineNo">838</span>    SortedMap&lt;byte[], Integer&gt; map = new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.838"></a>
+<span class="sourceLineNo">839</span>    visitBulkHFiles(fs, hfofDir, new BulkHFileVisitor&lt;ColumnFamilyDescriptorBuilder&gt;() {<a name="line.839"></a>
+<span class="sourceLineNo">840</span>      @Override<a name="line.840"></a>
+<span class="sourceLineNo">841</span>      public ColumnFamilyDescriptorBuilder bulkFamily(byte[] familyName) {<a name="line.841"></a>
+<span class="sourceLineNo">842</span>        ColumnFamilyDescriptorBuilder builder =<a name="line.842"></a>
+<span class="sourceLineNo">843</span>          ColumnFamilyDescriptorBuilder.newBuilder(familyName);<a name="line.843"></a>
+<span class="sourceLineNo">844</span>        familyBuilders.add(builder);<a name="line.844"></a>
+<span class="sourceLineNo">845</span>        return builder;<a name="line.845"></a>
+<span class="sourceLineNo">846</span>      }<a name="line.846"></a>
+<span class="sourceLineNo">847</span><a name="line.847"></a>
+<span class="sourceLineNo">848</span>      @Override<a name="line.848"></a>
+<span class="sourceLineNo">849</span>      public void bulkHFile(ColumnFamilyDescriptorBuilder builder, FileStatus hfileStatus)<a name="line.849"></a>
+<span class="sourceLineNo">850</span>          throws IOException {<a name="line.850"></a>
+<span class="sourceLineNo">851</span>        Path hfile = hfileStatus.getPath();<a name="line.851"></a>
+<span class="sourceLineNo">852</span>        try (HFile.Reader reader =<a name="line.852"></a>
+<span class="sourceLineNo">853</span>          HFile.createReader(fs, hfile, CacheConfig.DISABLED, true, getConf())) {<a name="line.853"></a>
+<span class="sourceLineNo">854</span>          if (builder.getCompressionType() != reader.getFileContext().getCompression()) {<a name="line.854"></a>
+<span class="sourceLineNo">855</span>            builder.setCompressionType(reader.getFileContext().getCompression());<a name="line.855"></a>
+<span class="sourceLineNo">856</span>            LOG.info("Setting compression " + reader.getFileContext().getCompression().name() +<a name="line.856"></a>
+<span class="sourceLineNo">857</span>              " for family " + builder.getNameAsString());<a name="line.857"></a>
+<span class="sourceLineNo">858</span>          }<a name="line.858"></a>
+<span class="sourceLineNo">859</span>          byte[] first = reader.getFirstRowKey().get();<a name="line.859"></a>
+<span class="sourceLineNo">860</span>          byte[] last = reader.getLastRowKey().get();<a name="line.860"></a>
+<span class="sourceLineNo">861</span><a name="line.861"></a>
+<span class="sourceLineNo">862</span>          LOG.info("Trying to figure out region boundaries hfile=" + hfile + " first=" +<a name="line.862"></a>
+<span class="sourceLineNo">863</span>            Bytes.toStringBinary(first) + " last=" + Bytes.toStringBinary(last));<a name="line.863"></a>
+<span class="sourceLineNo">864</span><a name="line.864"></a>
+<span class="sourceLineNo">865</span>          // To eventually infer start key-end key boundaries<a name="line.865"></a>
+<span class="sourceLineNo">866</span>          Integer value = map.getOrDefault(first, 0);<a name="line.866"></a>
+<span class="sourceLineNo">867</span>          map.put(first, value + 1);<a name="line.867"></a>
+<span class="sourceLineNo">868</span><a name="line.868"></a>
+<span class="sourceLineNo">869</span>          value = map.containsKey(last) ? map.get(last) : 0;<a name="line.869"></a>
+<span class="sourceLineNo">870</span>          map.put(last, value - 1);<a name="line.870"></a>
+<span class="sourceLineNo">871</span>        }<a name="line.871"></a>
+<span class="sourceLineNo">872</span>      }<a name="line.872"></a>
+<span class="sourceLineNo">873</span>    }, true);<a name="line.873"></a>
 <span class="sourceLineNo">874</span><a name="line.874"></a>
-<span class="sourceLineNo">875</span>    Map&lt;LoadQueueItem, ByteBuffer&gt; item2RegionMap = new HashMap&lt;&gt;();<a name="line.875"></a>
-<span class="sourceLineNo">876</span>    // Assumes that region splits can happen while this occurs.<a name="line.876"></a>
-<span class="sourceLineNo">877</span>    while (!queue.isEmpty()) {<a name="line.877"></a>
-<span class="sourceLineNo">878</span>      // need to reload split keys each iteration.<a name="line.878"></a>
-<span class="sourceLineNo">879</span>      final List&lt;Pair&lt;byte[], byte[]&gt;&gt; startEndKeys =<a name="line.879"></a>
-<span class="sourceLineNo">880</span>        FutureUtils.get(conn.getRegionLocator(tableName).getStartEndKeys());<a name="line.880"></a>
-<span class="sourceLineNo">881</span>      if (count != 0) {<a name="line.881"></a>
-<span class="sourceLineNo">882</span>        LOG.info("Split occurred while grouping HFiles, retry attempt " + count + " with " +<a name="line.882"></a>
-<span class="sourceLineNo">883</span>          queue.size() + " files remaining to group or split");<a name="line.883"></a>
-<span class="sourceLineNo">884</span>      }<a name="line.884"></a>
-<span class="sourceLineNo">885</span><a name="line.885"></a>
-<span class="sourceLineNo">886</span>      int maxRetries = getConf().getInt(HConstants.BULKLOAD_MAX_RETRIES_NUMBER, 10);<a name="line.886"></a>
-<span class="sourceLineNo">887</span>      maxRetries = Math.max(maxRetries, startEndKeys.size() + 1);<a name="line.887"></a>
-<span class="sourceLineNo">888</span>      if (maxRetries != 0 &amp;&amp; count &gt;= maxRetries) {<a name="line.888"></a>
-<span class="sourceLineNo">889</span>        throw new IOException(<a name="line.889"></a>
-<span class="sourceLineNo">890</span>          "Retry attempted " + count + " times without completing, bailing out");<a name="line.890"></a>
-<span class="sourceLineNo">891</span>      }<a name="line.891"></a>
-<span class="sourceLineNo">892</span>      count++;<a name="line.892"></a>
-<span class="sourceLineNo">893</span><a name="line.893"></a>
-<span class="sourceLineNo">894</span>      // Using ByteBuffer for byte[] equality semantics<a name="line.894"></a>
-<span class="sourceLineNo">895</span>      pair = groupOrSplitPhase(conn, tableName, pool, queue, startEndKeys);<a name="line.895"></a>
-<span class="sourceLineNo">896</span>      Multimap&lt;ByteBuffer, LoadQueueItem&gt; regionGroups = pair.getFirst();<a name="line.896"></a>
-<span class="sourceLineNo">897</span><a name="line.897"></a>
-<span class="sourceLineNo">898</span>      if (!checkHFilesCountPerRegionPerFamily(regionGroups)) {<a name="line.898"></a>
-<span class="sourceLineNo">899</span>        // Error is logged inside checkHFilesCountPerRegionPerFamily.<a name="line.899"></a>
-<span class="sourceLineNo">900</span>        throw new IOException("Trying to load more than " + maxFilesPerRegionPerFamily +<a name="line.900"></a>
-<span class="sourceLineNo">901</span>          " hfiles to one family of one region");<a name="line.901"></a>
+<span class="sourceLineNo">875</span>    byte[][] keys = inferBoundaries(map);<a name="line.875"></a>
+<span class="sourceLineNo">876</span>    TableDescriptorBuilder tdBuilder = TableDescriptorBuilder.newBuilder(tableName);<a name="line.876"></a>
+<span class="sourceLineNo">877</span>    familyBuilders.stream().map(ColumnFamilyDescriptorBuilder::build)<a name="line.877"></a>
+<span class="sourceLineNo">878</span>      .forEachOrdered(tdBuilder::setColumnFamily);<a name="line.878"></a>
+<span class="sourceLineNo">879</span>    FutureUtils.get(admin.createTable(tdBuilder.build(), keys));<a name="line.879"></a>
+<span class="sourceLineNo">880</span><a name="line.880"></a>
+<span class="sourceLineNo">881</span>    LOG.info("Table " + tableName + " is available!!");<a name="line.881"></a>
+<span class="sourceLineNo">882</span>  }<a name="line.882"></a>
+<span class="sourceLineNo">883</span><a name="line.883"></a>
+<span class="sourceLineNo">884</span>  private Map&lt;LoadQueueItem, ByteBuffer&gt; performBulkLoad(AsyncClusterConnection conn,<a name="line.884"></a>
+<span class="sourceLineNo">885</span>      TableName tableName, Deque&lt;LoadQueueItem&gt; queue, ExecutorService pool, boolean copyFile)<a name="line.885"></a>
+<span class="sourceLineNo">886</span>      throws IOException {<a name="line.886"></a>
+<span class="sourceLineNo">887</span>    int count = 0;<a name="line.887"></a>
+<span class="sourceLineNo">888</span><a name="line.888"></a>
+<span class="sourceLineNo">889</span>    fsDelegationToken.acquireDelegationToken(queue.peek().getFilePath().getFileSystem(getConf()));<a name="line.889"></a>
+<span class="sourceLineNo">890</span>    bulkToken = FutureUtils.get(conn.prepareBulkLoad(tableName));<a name="line.890"></a>
+<span class="sourceLineNo">891</span>    Pair&lt;Multimap&lt;ByteBuffer, LoadQueueItem&gt;, Set&lt;String&gt;&gt; pair = null;<a name="line.891"></a>
+<span class="sourceLineNo">892</span><a name="line.892"></a>
+<span class="sourceLineNo">893</span>    Map&lt;LoadQueueItem, ByteBuffer&gt; item2RegionMap = new HashMap&lt;&gt;();<a name="line.893"></a>
+<span class="sourceLineNo">894</span>    // Assumes that region splits can happen while this occurs.<a name="line.894"></a>
+<span class="sourceLineNo">895</span>    while (!queue.isEmpty()) {<a name="line.895"></a>
+<span class="sourceLineNo">896</span>      // need to reload split keys each iteration.<a name="line.896"></a>
+<span class="sourceLineNo">897</span>      final List&lt;Pair&lt;byte[], byte[]&gt;&gt; startEndKeys =<a name="line.897"></a>
+<span class="sourceLineNo">898</span>        FutureUtils.get(conn.getRegionLocator(tableName).getStartEndKeys());<a name="line.898"></a>
+<span class="sourceLineNo">899</span>      if (count != 0) {<a name="line.899"></a>
+<span class="sourceLineNo">900</span>        LOG.info("Split occurred while grouping HFiles, retry attempt " + count + " with " +<a name="line.900"></a>
+<span class="sourceLineNo">901</span>          queue.size() + " files remaining to group or split");<a name="line.901"></a>
 <span class="sourceLineNo">902</span>      }<a name="line.902"></a>
 <span class="sourceLineNo">903</span><a name="line.903"></a>
-<span class="sourceLineNo">904</span>      bulkLoadPhase(conn, tableName, queue, regionGroups, copyFile, item2RegionMap);<a name="line.904"></a>
-<span class="sourceLineNo">905</span><a name="line.905"></a>
-<span class="sourceLineNo">906</span>      // NOTE: The next iteration's split / group could happen in parallel to<a name="line.906"></a>
-<span class="sourceLineNo">907</span>      // atomic bulkloads assuming that there are splits and no merges, and<a name="line.907"></a>
-<span class="sourceLineNo">908</span>      // that we can atomically pull out the groups we want to retry.<a name="line.908"></a>
-<span class="sourceLineNo">909</span>    }<a name="line.909"></a>
-<span class="sourceLineNo">910</span><a name="line.910"></a>
-<span class="sourceLineNo">911</span>    return item2RegionMap;<a name="line.911"></a>
-<span class="sourceLineNo">912</span>  }<a name="line.912"></a>
-<span class="sourceLineNo">913</span><a name="line.913"></a>
-<span class="sourceLineNo">914</span>  private void cleanup(AsyncClusterConnection conn, TableName tableName, Deque&lt;LoadQueueItem&gt; queue,<a name="line.914"></a>
-<span class="sourceLineNo">915</span>      ExecutorService pool) throws IOException {<a name="line.915"></a>
-<span class="sourceLineNo">916</span>    fsDelegationToken.releaseDelegationToken();<a name="line.916"></a>
-<span class="sourceLineNo">917</span>    if (bulkToken != null) {<a name="line.917"></a>
-<span class="sourceLineNo">918</span>      conn.cleanupBulkLoad(tableName, bulkToken);<a name="line.918"></a>
-<span class="sourceLineNo">919</span>    }<a name="line.919"></a>
-<span class="sourceLineNo">920</span>    if (pool != null) {<a name="line.920"></a>
-<span class="sourceLineNo">921</span>      pool.shutdown();<a name="line.921"></a>
-<span class="sourceLineNo">922</span>    }<a name="line.922"></a>
-<span class="sourceLineNo">923</span>    if (!queue.isEmpty()) {<a name="line.923"></a>
-<span class="sourceLineNo">924</span>      StringBuilder err = new StringBuilder();<a name="line.924"></a>
-<span class="sourceLineNo">925</span>      err.append("-------------------------------------------------\n");<a name="line.925"></a>
-<span class="sourceLineNo">926</span>      err.append("Bulk load aborted with some files not yet loaded:\n");<a name="line.926"></a>
-<span class="sourceLineNo">927</span>      err.append("-------------------------------------------------\n");<a name="line.927"></a>
-<span class="sourceLineNo">928</span>      for (LoadQueueItem q : queue) {<a name="line.928"></a>
-<span class="sourceLineNo">929</span>        err.append("  ").append(q.getFilePath()).append('\n');<a name="line.929"></a>
-<span class="sourceLineNo">930</span>      }<a name="line.930"></a>
-<span class="sourceLineNo">931</span>      LOG.error(err.toString());<a name="line.931"></a>
-<span class="sourceLineNo">932</span>    }<a name="line.932"></a>
-<span class="sourceLineNo">933</span>  }<a name="line.933"></a>
-<span class="sourceLineNo">934</span><a name="line.934"></a>
-<span class="sourceLineNo">935</span>  /**<a name="line.935"></a>
-<span class="sourceLineNo">936</span>   * Perform a bulk load of the given map of families to hfiles into the given pre-existing table.<a name="line.936"></a>
-<span class="sourceLineNo">937</span>   * This method is not threadsafe.<a name="line.937"></a>
-<span class="sourceLineNo">938</span>   * @param map map of family to List of hfiles<a name="line.938"></a>
-<span class="sourceLineNo">939</span>   * @param tableName table to load the hfiles<a name="line.939"></a>
-<span class="sourceLineNo">940</span>   * @param silence true to ignore unmatched column families<a name="line.940"></a>
-<span class="sourceLineNo">941</span>   * @param copyFile always copy hfiles if true<a name="line.941"></a>
-<span class="sourceLineNo">942</span>   */<a name="line.942"></a>
-<span class="sourceLineNo">943</span>  private Map&lt;LoadQueueItem, ByteBuffer&gt; doBulkLoad(AsyncClusterConnection conn,<a name="line.943"></a>
-<span class="sourceLineNo">944</span>      TableName tableName, Map&lt;byte[], List&lt;Path&gt;&gt; map, boolean silence, boolean copyFile)<a name="line.944"></a>
-<span class="sourceLineNo">945</span>      throws IOException {<a name="line.945"></a>
-<span class="sourceLineNo">946</span>    tableExists(conn, tableName);<a name="line.946"></a>
-<span class="sourceLineNo">947</span>    // LQI queue does not need to be threadsafe -- all operations on this queue<a name="line.947"></a>
-<span class="sourceLineNo">948</span>    // happen in this thread<a name="line.948"></a>
-<span class="sourceLineNo">949</span>    Deque&lt;LoadQueueItem&gt; queue = new ArrayDeque&lt;&gt;();<a name="line.949"></a>
-<span class="sourceLineNo">950</span>    ExecutorService pool = null;<a name="line.950"></a>
-<span class="sourceLineNo">951</span>    try {<a name="line.951"></a>
-<span class="sourceLineNo">952</span>      prepareHFileQueue(conn, tableName, map, queue, silence);<a name="line.952"></a>
-<span class="sourceLineNo">953</span>      if (queue.isEmpty()) {<a name="line.953"></a>
-<span class="sourceLineNo">954</span>        LOG.warn("Bulk load operation did not get any files to load");<a name="line.954"></a>
-<span class="sourceLineNo">955</span>        return Collections.emptyMap();<a name="line.955"></a>
-<span class="sourceLineNo">956</span>      }<a name="line.956"></a>
-<span class="sourceLineNo">957</span>      pool = createExecutorService();<a name="line.957"></a>
-<span class="sourceLineNo">958</span>      return performBulkLoad(conn, tableName, queue, pool, copyFile);<a name="line.958"></a>
-<span class="sourceLineNo">959</span>    } finally {<a name="line.959"></a>
-<span class="sourceLineNo">960</span>      cleanup(conn, tableName, queue, pool);<a name="line.960"></a>
-<span class="sourceLineNo">961</span>    }<a name="line.961"></a>
-<span class="sourceLineNo">962</span>  }<a name="line.962"></a>
-<span class="sourceLineNo">963</span><a name="line.963"></a>
-<span class="sourceLineNo">964</span>  /**<a name="line.964"></a>
-<span class="sourceLineNo">965</span>   * Perform a bulk load of the given directory into the given pre-existing table. This method is<a name="line.965"></a>
-<span class="sourceLineNo">966</span>   * not threadsafe.<a name="line.966"></a>
-<span class="sourceLineNo">967</span>   * @param tableName table to load the hfiles<a name="line.967"></a>
-<span class="sourceLineNo">968</span>   * @param hfofDir the directory that was provided as the output path of a job using<a name="line.968"></a>
-<span class="sourceLineNo">969</span>   *          HFileOutputFormat<a name="line.969"></a>
-<span class="sourceLineNo">970</span>   * @param silence true to ignore unmatched column families<a name="line.970"></a>
-<span class="sourceLineNo">971</span>   * @param copyFile always copy hfiles if true<a name="line.971"></a>
-<span class="sourceLineNo">972</span>   */<a name="line.972"></a>
-<span class="sourceLineNo">973</span>  private Map&lt;LoadQueueItem, ByteBuffer&gt; doBulkLoad(AsyncClusterConnection conn,<a name="line.973"></a>
-<span class="sourceLineNo">974</span>      TableName tableName, Path hfofDir, boolean silence, boolean copyFile)<a name="line.974"></a>
-<span class="sourceLineNo">975</span>      throws IOException {<a name="line.975"></a>
-<span class="sourceLineNo">976</span>    tableExists(conn, tableName);<a name="line.976"></a>
-<span class="sourceLineNo">977</span><a name="line.977"></a>
-<span class="sourceLineNo">978</span>    /*<a name="line.978"></a>
-<span class="sourceLineNo">979</span>     * Checking hfile format is a time-consuming operation, we should have an option to skip this<a name="line.979"></a>
-<span class="sourceLineNo">980</span>     * step when bulkloading millions of HFiles. See HBASE-13985.<a name="line.980"></a>
-<span class="sourceLineNo">981</span>     */<a name="line.981"></a>
-<span class="sourceLineNo">982</span>    boolean validateHFile = getConf().getBoolean(VALIDATE_HFILES, true);<a name="line.982"></a>
-<span class="sourceLineNo">983</span>    if (!validateHFile) {<a name="line.983"></a>
-<span class="sourceLineNo">984</span>      LOG.warn("You are skipping HFiles validation, it might cause some data loss if files " +<a name="line.984"></a>
-<span class="sourceLineNo">985</span>        "are not correct. If you fail to read data from your table after using this " +<a name="line.985"></a>
-<span class="sourceLineNo">986</span>        "option, consider removing the files and bulkload again without this option. " +<a name="line.986"></a>
-<span class="sourceLineNo">987</span>        "See HBASE-13985");<a name="line.987"></a>
-<span class="sourceLineNo">988</span>    }<a name="line.988"></a>
-<span class="sourceLineNo">989</span>    // LQI queue does not need to be threadsafe -- all operations on this queue<a name="line.989"></a>
-<span class="sourceLineNo">990</span>    // happen in this thread<a name="line.990"></a>
-<span class="sourceLineNo">991</span>    Deque&lt;LoadQueueItem&gt; queue = new ArrayDeque&lt;&gt;();<a name="line.991"></a>
-<span class="sourceLineNo">992</span>    ExecutorService pool = null;<a name="line.992"></a>
-<span class="sourceLineNo">993</span>    try {<a name="line.993"></a>
-<span class="sourceLineNo">994</span>      prepareHFileQueue(getConf(), conn, tableName, hfofDir, queue, validateHFile, silence);<a name="line.994"></a>
+<span class="sourceLineNo">904</span>      int maxRetries = getConf().getInt(HConstants.BULKLOAD_MAX_RETRIES_NUMBER, 10);<a name="line.904"></a>
+<span class="sourceLineNo">905</span>      maxRetries = Math.max(maxRetries, startEndKeys.size() + 1);<a name="line.905"></a>
+<span class="sourceLineNo">906</span>      if (maxRetries != 0 &amp;&amp; count &gt;= maxRetries) {<a name="line.906"></a>
+<span class="sourceLineNo">907</span>        throw new IOException(<a name="line.907"></a>
+<span class="sourceLineNo">908</span>          "Retry attempted " + count + " times without completing, bailing out");<a name="line.908"></a>
+<span class="sourceLineNo">909</span>      }<a name="line.909"></a>
+<span class="sourceLineNo">910</span>      count++;<a name="line.910"></a>
+<span class="sourceLineNo">911</span><a name="line.911"></a>
+<span class="sourceLineNo">912</span>      // Using ByteBuffer for byte[] equality semantics<a name="line.912"></a>
+<span class="sourceLineNo">913</span>      pair = groupOrSplitPhase(conn, tableName, pool, queue, startEndKeys);<a name="line.913"></a>
+<span class="sourceLineNo">914</span>      Multimap&lt;ByteBuffer, LoadQueueItem&gt; regionGroups = pair.getFirst();<a name="line.914"></a>
+<span class="sourceLineNo">915</span><a name="line.915"></a>
+<span class="sourceLineNo">916</span>      if (!checkHFilesCountPerRegionPerFamily(regionGroups)) {<a name="line.916"></a>
+<span class="sourceLineNo">917</span>        // Error is logged inside checkHFilesCountPerRegionPerFamily.<a name="line.917"></a>
+<span class="sourceLineNo">918</span>        throw new IOException("Trying to load more than " + maxFilesPerRegionPerFamily +<a name="line.918"></a>
+<span class="sourceLineNo">919</span>          " hfiles to one family of one region");<a name="line.919"></a>
+<span class="sourceLineNo">920</span>      }<a name="line.920"></a>
+<span class="sourceLineNo">921</span><a name="line.921"></a>
+<span class="sourceLineNo">922</span>      bulkLoadPhase(conn, tableName, queue, regionGroups, copyFile, item2RegionMap);<a name="line.922"></a>
+<span class="sourceLineNo">923</span><a name="line.923"></a>
+<span class="sourceLineNo">924</span>      // NOTE: The next iteration's split / group could happen in parallel to<a name="line.924"></a>
+<span class="sourceLineNo">925</span>      // atomic bulkloads assuming that there are splits and no merges, and<a name="line.925"></a>
+<span class="sourceLineNo">926</span>      // that we can atomically pull out the groups we want to retry.<a name="line.926"></a>
+<span class="sourceLineNo">927</span>    }<a name="line.927"></a>
+<span class="sourceLineNo">928</span><a name="line.928"></a>
+<span class="sourceLineNo">929</span>    return item2RegionMap;<a name="line.929"></a>
+<span class="sourceLineNo">930</span>  }<a name="line.930"></a>
+<span class="sourceLineNo">931</span><a name="line.931"></a>
+<span class="sourceLineNo">932</span>  private void cleanup(AsyncClusterConnection conn, TableName tableName, Deque&lt;LoadQueueItem&gt; queue,<a name="line.932"></a>
+<span class="sourceLineNo">933</span>      ExecutorService pool) throws IOException {<a name="line.933"></a>
+<span class="sourceLineNo">934</span>    fsDelegationToken.releaseDelegationToken();<a name="line.934"></a>
+<span class="sourceLineNo">935</span>    if (bulkToken != null) {<a name="line.935"></a>
+<span class="sourceLineNo">936</span>      conn.cleanupBulkLoad(tableName, bulkToken);<a name="line.936"></a>
+<span class="sourceLineNo">937</span>    }<a name="line.937"></a>
+<span class="sourceLineNo">938</span>    if (pool != null) {<a name="line.938"></a>
+<span class="sourceLineNo">939</span>      pool.shutdown();<a name="line.939"></a>
+<span class="sourceLineNo">940</span>    }<a name="line.940"></a>
+<span class="sourceLineNo">941</span>    if (!queue.isEmpty()) {<a name="line.941"></a>
+<span class="sourceLineNo">942</span>      StringBuilder err = new StringBuilder();<a name="line.942"></a>
+<span class="sourceLineNo">943</span>      err.append("-------------------------------------------------\n");<a name="line.943"></a>
+<span class="sourceLineNo">944</span>      err.append("Bulk load aborted with some files not yet loaded:\n");<a name="line.944"></a>
+<span class="sourceLineNo">945</span>      err.append("-------------------------------------------------\n");<a name="line.945"></a>
+<span class="sourceLineNo">946</span>      for (LoadQueueItem q : queue) {<a name="line.946"></a>
+<span class="sourceLineNo">947</span>        err.append("  ").append(q.getFilePath()).append('\n');<a name="line.947"></a>
+<span class="sourceLineNo">948</span>      }<a name="line.948"></a>
+<span class="sourceLineNo">949</span>      LOG.error(err.toString());<a name="line.949"></a>
+<span class="sourceLineNo">950</span>    }<a name="line.950"></a>
+<span class="sourceLineNo">951</span>  }<a name="line.951"></a>
+<span class="sourceLineNo">952</span><a name="line.952"></a>
+<span class="sourceLineNo">953</span>  /**<a name="line.953"></a>
+<span class="sourceLineNo">954</span>   * Perform a bulk load of the given map of families to hfiles into the given pre-existing table.<a name="line.954"></a>
+<span class="sourceLineNo">955</span>   * This method is not threadsafe.<a name="line.955"></a>
+<span class="sourceLineNo">956</span>   * @param map map of family to List of hfiles<a name="line.956"></a>
+<span class="sourceLineNo">957</span>   * @param tableName table to load the hfiles<a name="line.957"></a>
+<span class="sourceLineNo">958</span>   * @param silence true to ignore unmatched column families<a name="line.958"></a>
+<span class="sourceLineNo">959</span>   * @param copyFile always copy hfiles if true<a name="line.959"></a>
+<span class="sourceLineNo">960</span>   */<a name="line.960"></a>
+<span class="sourceLineNo">961</span>  private Map&lt;LoadQueueItem, ByteBuffer&gt; doBulkLoad(AsyncClusterConnection conn,<a name="line.961"></a>
+<span class="sourceLineNo">962</span>      TableName tableName, Map&lt;byte[], List&lt;Path&gt;&gt; map, boolean silence, boolean copyFile)<a name="line.962"></a>
+<span class="sourceLineNo">963</span>      throws IOException {<a name="line.963"></a>
+<span class="sourceLineNo">964</span>    tableExists(conn, tableName);<a name="line.964"></a>
+<span class="sourceLineNo">965</span>    // LQI queue does not need to be threadsafe -- all operations on this queue<a name="line.965"></a>
+<span class="sourceLineNo">966</span>    // happen in this thread<a name="line.966"></a>
+<span class="sourceLineNo">967</span>    Deque&lt;LoadQueueItem&gt; queue = new ArrayDeque&lt;&gt;();<a name="line.967"></a>
+<span class="sourceLineNo">968</span>    ExecutorService pool = null;<a name="line.968"></a>
+<span class="sourceLineNo">969</span>    try {<a name="line.969"></a>
+<span class="sourceLineNo">970</span>      prepareHFileQueue(conn, tableName, map, queue, silence);<a name="line.970"></a>
+<span class="sourceLineNo">971</span>      if (queue.isEmpty()) {<a name="line.971"></a>
+<span class="sourceLineNo">972</span>        LOG.warn("Bulk load operation did not get any files to load");<a name="line.972"></a>
+<span class="sourceLineNo">973</span>        return Collections.emptyMap();<a name="line.973"></a>
+<span class="sourceLineNo">974</span>      }<a name="line.974"></a>
+<span class="sourceLineNo">975</span>      pool = createExecutorService();<a name="line.975"></a>
+<span class="sourceLineNo">976</span>      return performBulkLoad(conn, tableName, queue, pool, copyFile);<a name="line.976"></a>
+<span class="sourceLineNo">977</span>    } finally {<a name="line.977"></a>
+<span class="sourceLineNo">978</span>      cleanup(conn, tableName, queue, pool);<a name="line.978"></a>
+<span class="sourceLineNo">979</span>    }<a name="line.979"></a>
+<span class="sourceLineNo">980</span>  }<a name="line.980"></a>
+<span class="sourceLineNo">981</span><a name="line.981"></a>
+<span class="sourceLineNo">982</span>  /**<a name="line.982"></a>
+<span class="sourceLineNo">983</span>   * Perform a bulk load of the given directory into the given pre-existing table. This method is<a name="line.983"></a>
+<span class="sourceLineNo">984</span>   * not threadsafe.<a name="line.984"></a>
+<span class="sourceLineNo">985</span>   * @param tableName table to load the hfiles<a name="line.985"></a>
+<span class="sourceLineNo">986</span>   * @param hfofDir the directory that was provided as the output path of a job using<a name="line.986"></a>
+<span class="sourceLineNo">987</span>   *          HFileOutputFormat<a name="line.987"></a>
+<span class="sourceLineNo">988</span>   * @param silence true to ignore unmatched column families<a name="line.988"></a>
+<span class="sourceLineNo">989</span>   * @param copyFile always copy hfiles if true<a name="line.989"></a>
+<span class="sourceLineNo">990</span>   */<a name="line.990"></a>
+<span class="sourceLineNo">991</span>  private Map&lt;LoadQueueItem, ByteBuffer&gt; doBulkLoad(AsyncClusterConnection conn,<a name="line.991"></a>
+<span class="sourceLineNo">992</span>      TableName tableName, Path hfofDir, boolean silence, boolean copyFile)<a name="line.992"></a>
+<span class="sourceLineNo">993</span>      throws IOException {<a name="line.993"></a>
+<span class="sourceLineNo">994</span>    tableExists(conn, tableName);<a name="line.994"></a>
 <span class="sourceLineNo">995</span><a name="line.995"></a>
-<span class="sourceLineNo">996</span>      if (queue.isEmpty()) {<a name="line.996"></a>
-<span class="sourceLineNo">997</span>        LOG.warn(<a name="line.997"></a>
-<span class="sourceLineNo">998</span>          "Bulk load operation did not find any files to load in directory {}. " +<a name="line.998"></a>
-<span class="sourceLineNo">999</span>          "Does it contain files in subdirectories that correspond to column family names?",<a name="line.999"></a>
-<span class="sourceLineNo">1000</span>          (hfofDir != null ? hfofDir.toUri().toString() : ""));<a name="line.1000"></a>
-<span class="sourceLineNo">1001</span>        return Collections.emptyMap();<a name="line.1001"></a>
-<span class="sourceLineNo">1002</span>      }<a name="line.1002"></a>
-<span class="sourceLineNo">1003</span>      pool = createExecutorService();<a name="line.1003"></a>
-<span class="sourceLineNo">1004</span>      return performBulkLoad(conn, tableName, queue, pool, copyFile);<a name="line.1004"></a>
-<span class="sourceLineNo">1005</span>    } finally {<a name="line.1005"></a>
-<span class="sourceLineNo">1006</span>      cleanup(conn, tableName, queue, pool);<a name="line.1006"></a>
-<span class="sourceLineNo">1007</span>    }<a name="line.1007"></a>
-<span class="sourceLineNo">1008</span>  }<a name="line.1008"></a>
-<span class="sourceLineNo">1009</span><a name="line.1009"></a>
-<span class="sourceLineNo">1010</span>  @Override<a name="line.1010"></a>
-<span class="sourceLineNo">1011</span>  public Map&lt;LoadQueueItem, ByteBuffer&gt; bulkLoad(TableName tableName,<a name="line.1011"></a>
-<span class="sourceLineNo">1012</span>      Map&lt;byte[], List&lt;Path&gt;&gt; family2Files) throws IOException {<a name="line.1012"></a>
-<span class="sourceLineNo">1013</span>    try (AsyncClusterConnection conn = ClusterConnectionFactory.<a name="line.1013"></a>
-<span class="sourceLineNo">1014</span>        createAsyncClusterConnection(getConf(), null, userProvider.getCurrent())) {<a name="line.1014"></a>
-<span class="sourceLineNo">1015</span>      return doBulkLoad(conn, tableName, family2Files, isSilence(), isAlwaysCopyFiles());<a name="line.1015"></a>
-<span class="sourceLineNo">1016</span>    }<a name="line.1016"></a>
-<span class="sourceLineNo">1017</span>  }<a name="line.1017"></a>
-<span class="sourceLineNo">1018</span><a name="line.1018"></a>
-<span class="sourceLineNo">1019</span>  @Override<a name="line.1019"></a>
-<span class="sourceLineNo">1020</span>  public Map&lt;LoadQueueItem, ByteBuffer&gt; bulkLoad(TableName tableName, Path dir)<a name="line.1020"></a>
-<span class="sourceLineNo">1021</span>      throws IOException {<a name="line.1021"></a>
-<span class="sourceLineNo">1022</span>    try (AsyncClusterConnection conn = ClusterConnectionFactory<a name="line.1022"></a>
-<span class="sourceLineNo">1023</span>      .createAsyncClusterConnection(getConf(), null, userProvider.getCurrent())) {<a name="line.1023"></a>
-<span class="sourceLineNo">1024</span>      AsyncAdmin admin = conn.getAdmin();<a name="line.1024"></a>
-<span class="sourceLineNo">1025</span>      if (!FutureUtils.get(admin.tableExists(tableName))) {<a name="line.1025"></a>
-<span class="sourceLineNo">1026</span>        if (isCreateTable()) {<a name="line.1026"></a>
-<span class="sourceLineNo">1027</span>          createTable(tableName, dir, admin);<a name="line.1027"></a>
-<span class="sourceLineNo">1028</span>        } else {<a name="line.1028"></a>
-<span class="sourceLineNo">1029</span>          throwAndLogTableNotFoundException(tableName);<a name="line.1029"></a>
-<span class="sourceLineNo">1030</span>        }<a name="line.1030"></a>
-<span class="sourceLineNo">1031</span>      }<a name="line.1031"></a>
-<span class="sourceLineNo">1032</span>      return doBulkLoad(conn, tableName, dir, isSilence(), isAlwaysCopyFiles());<a name="line.1032"></a>
-<span class="sourceLineNo">1033</span>    }<a name="line.1033"></a>
-<span class="sourceLineNo">1034</span>  }<a name="line.1034"></a>
-<span class="sourceLineNo">1035</span><a name="line.1035"></a>
-<span class="sourceLineNo">1036</span>  /**<a name="line.1036"></a>
-<span class="sourceLineNo">1037</span>   * @throws TableNotFoundException if table does not exist.<a name="line.1037"></a>
-<span class="sourceLineNo">1038</span>   */<a name="line.1038"></a>
-<span class="sourceLineNo">1039</span>  private void tableExists(AsyncClusterConnection conn, TableName tableName) throws IOException {<a name="line.1039"></a>
-<span class="sourceLineNo">1040</span>    if (!FutureUtils.get(conn.getAdmin().tableExists(tableName))) {<a name="line.1040"></a>
-<span class="sourceLineNo">1041</span>      throwAndLogTableNotFoundException(tableName);<a name="line.1041"></a>
-<span class="sourceLineNo">1042</span>    }<a name="line.1042"></a>
-<span class="sourceLineNo">1043</span>  }<a name="line.1043"></a>
-<span class="sourceLineNo">1044</span><a name="line.1044"></a>
-<span class="sourceLineNo">1045</span>  private void throwAndLogTableNotFoundException(TableName tn) throws TableNotFoundException {<a name="line.1045"></a>
-<span class="sourceLineNo">1046</span>    String errorMsg = format("Table '%s' does not exist.", tn);<a name="line.1046"></a>
-<span class="sourceLineNo">1047</span>    LOG.error(errorMsg);<a name="line.1047"></a>
-<span class="sourceLineNo">1048</span>    throw new TableNotFoundException(errorMsg);<a name="line.1048"></a>
-<span class="sourceLineNo">1049</span>  }<a name="line.1049"></a>
-<span class="sourceLineNo">1050</span><a name="line.1050"></a>
-<span class="sourceLineNo">1051</span>  public void setBulkToken(String bulkToken) {<a name="line.1051"></a>
-<span class="sourceLineNo">1052</span>    this.bulkToken = bulkToken;<a name="line.1052"></a>
-<span class="sourceLineNo">1053</span>  }<a name="line.1053"></a>
-<span class="sourceLineNo">1054</span><a name="line.1054"></a>
-<span class="sourceLineNo">1055</span>  public void setClusterIds(List&lt;String&gt; clusterIds) {<a name="line.1055"></a>
-<span class="sourceLineNo">1056</span>    this.clusterIds = clusterIds;<a name="line.1056"></a>
-<span class="sourceLineNo">1057</span>  }<a name="line.1057"></a>
-<span class="sourceLineNo">1058</span><a name="line.1058"></a>
-<span class="sourceLineNo">1059</span>  private void usage() {<a name="line.1059"></a>
-<span class="sourceLineNo">1060</span>    System.err.println("Usage: " + "bin/hbase completebulkload [OPTIONS] "<a name="line.1060"></a>
-<span class="sourceLineNo">1061</span>        + "&lt;/PATH/TO/HFILEOUTPUTFORMAT-OUTPUT&gt; &lt;TABLENAME&gt;\n"<a name="line.1061"></a>
-<span class="sourceLineNo">1062</span>        + "Loads directory of hfiles -- a region dir or product of HFileOutputFormat -- "<a name="line.1062"></a>
-<span class="sourceLineNo">1063</span>        + "into an hbase table.\n"<a name="line.1063"></a>
-<span class="sourceLineNo">1064</span>        + "OPTIONS (for other -D options, see source code):\n"<a name="line.1064"></a>
-<span class="sourceLineNo">1065</span>        + " -D" + CREATE_TABLE_CONF_KEY + "=no whether to create table; when 'no', target "<a name="line.1065"></a>
-<span class="sourceLineNo">1066</span>        + "table must exist.\n"<a name="line.1066"></a>
-<span class="sourceLineNo">1067</span>        + " -D" + IGNORE_UNMATCHED_CF_CONF_KEY + "=yes to ignore unmatched column families.\n"<a name="line.1067"></a>
-<span class="sourceLineNo">1068</span>        + " -loadTable for when directory of files to load has a depth of 3; target table must "<a name="line.1068"></a>
-<span class="sourceLineNo">1069</span>        + "exist;\n"<a name="line.1069"></a>
-<span class="sourceLineNo">1070</span>        + " must be last of the options on command line.\n"<a name="line.1070"></a>
-<span class="sourceLineNo">1071</span>        + "See http://hbase.apache.org/book.html#arch.bulk.load.complete.strays for "<a name="line.1071"></a>
-<span class="sourceLineNo">1072</span>        + "documentation.\n");<a name="line.1072"></a>
-<span class="sourceLineNo">1073</span>  }<a name="line.1073"></a>
-<span class="sourceLineNo">1074</span><a name="line.1074"></a>
-<span class="sourceLineNo">1075</span>  @Override<a name="line.1075"></a>
-<span class="sourceLineNo">1076</span>  public int run(String[] args) throws Exception {<a name="line.1076"></a>
-<span class="sourceLineNo">1077</span>    if (args.length != 2 &amp;&amp; args.length != 3) {<a name="line.1077"></a>
-<span class="sourceLineNo">1078</span>      usage();<a name="line.1078"></a>
-<span class="sourceLineNo">1079</span>      return -1;<a name="line.1079"></a>
-<span class="sourceLineNo">1080</span>    }<a name="line.1080"></a>
-<span class="sourceLineNo">1081</span>    // Re-initialize to apply -D options from the command line parameters<a name="line.1081"></a>
-<span class="sourceLineNo">1082</span>    initialize();<a name="line.1082"></a>
-<span class="sourceLineNo">1083</span>    Path dirPath = new Path(args[0]);<a name="line.1083"></a>
-<span class="sourceLineNo">1084</span>    TableName tableName = TableName.valueOf(args[1]);<a name="line.1084"></a>
-<span class="sourceLineNo">1085</span>    if (args.length == 2) {<a name="line.1085"></a>
-<span class="sourceLineNo">1086</span>      return !bulkLoad(tableName, dirPath).isEmpty() ? 0 : -1;<a name="line.1086"></a>
-<span class="sourceLineNo">1087</span>    } else {<a name="line.1087"></a>
-<span class="sourceLineNo">1088</span>      Map&lt;byte[], List&lt;Path&gt;&gt; family2Files = Maps.newHashMap();<a name="line.1088"></a>
-<span class="sourceLineNo">1089</span>      FileSystem fs = FileSystem.get(getConf());<a name="line.1089"></a>
-<span class="sourceLineNo">1090</span>      for (FileStatus regionDir : fs.listStatus(dirPath)) {<a name="line.1090"></a>
-<span class="sourceLineNo">1091</span>        FSVisitor.visitRegionStoreFiles(fs, regionDir.getPath(), (region, family, hfileName) -&gt; {<a name="line.1091"></a>
-<span class="sourceLineNo">1092</span>          Path path = new Path(regionDir.getPath(), new Path(family, hfileName));<a name="line.1092"></a>
-<span class="sourceLineNo">1093</span>          byte[] familyName = Bytes.toBytes(family);<a name="line.1093"></a>
-<span class="sourceLineNo">1094</span>          if (family2Files.containsKey(familyName)) {<a name="line.1094"></a>
-<span class="sourceLineNo">1095</span>            family2Files.get(familyName).add(path);<a name="line.1095"></a>
-<span class="sourceLineNo">1096</span>          } else {<a name="line.1096"></a>
-<span class="sourceLineNo">1097</span>            family2Files.put(familyName, Lists.newArrayList(path));<a name="line.1097"></a>
-<span class="sourceLineNo">1098</span>          }<a name="line.1098"></a>
-<span class="sourceLineNo">1099</span>        });<a name="line.1099"></a>
-<span class="sourceLineNo">1100</span>      }<a name="line.1100"></a>
-<span class="sourceLineNo">1101</span>      return !bulkLoad(tableName, family2Files).isEmpty() ? 0 : -1;<a name="line.1101"></a>
-<span class="sourceLineNo">1102</span>    }<a name="line.1102"></a>
-<span class="sourceLineNo">1103</span>  }<a name="line.1103"></a>
-<span class="sourceLineNo">1104</span><a name="line.1104"></a>
-<span class="sourceLineNo">1105</span>  public static void main(String[] args) throws Exception {<a name="line.1105"></a>
-<span class="sourceLineNo">1106</span>    Configuration conf = HBaseConfiguration.create();<a name="line.1106"></a>
-<span class="sourceLineNo">1107</span>    int ret = ToolRunner.run(conf, new BulkLoadHFilesTool(conf), args);<a name="line.1107"></a>
-<span class="sourceLineNo">1108</span>    System.exit(ret);<a name="line.1108"></a>
-<span class="sourceLineNo">1109</span>  }<a name="line.1109"></a>
-<span class="sourceLineNo">1110</span><a name="line.1110"></a>
-<span class="sourceLineNo">1111</span>  @Override<a name="line.1111"></a>
-<span class="sourceLineNo">1112</span>  public void disableReplication(){<a name="line.1112"></a>
-<span class="sourceLineNo">1113</span>    this.replicate = false;<a name="line.1113"></a>
-<span class="sourceLineNo">1114</span>  }<a name="line.1114"></a>
-<span class="sourceLineNo">1115</span><a name="line.1115"></a>
-<span class="sourceLineNo">1116</span>  @Override<a name="line.1116"></a>
-<span class="sourceLineNo">1117</span>  public boolean isReplicationDisabled(){<a name="line.1117"></a>
-<span class="sourceLineNo">1118</span>    return !this.replicate;<a name="line.1118"></a>
-<span class="sourceLineNo">1119</span>  }<a name="line.1119"></a>
-<span class="sourceLineNo">1120</span>}<a name="line.1120"></a>
+<span class="sourceLineNo">996</span>    /*<a name="line.996"></a>
+<span class="sourceLineNo">997</span>     * Checking hfile format is a time-consuming operation, we should have an option to skip this<a name="line.997"></a>
+<span class="sourceLineNo">998</span>     * step when bulkloading millions of HFiles. See HBASE-13985.<a name="line.998"></a>
+<span class="sourceLineNo">999</span>     */<a name="line.999"></a>
+<span class="sourceLineNo">1000</span>    boolean validateHFile = getConf().getBoolean(VALIDATE_HFILES, true);<a name="line.1000"></a>
+<span class="sourceLineNo">1001</span>    if (!validateHFile) {<a name="line.1001"></a>
+<span class="sourceLineNo">1002</span>      LOG.warn("You are skipping HFiles validation, it might cause some data loss if files " +<a name="line.1002"></a>
+<span class="sourceLineNo">1003</span>        "are not correct. If you fail to read data from your table after using this " +<a name="line.1003"></a>
+<span class="sourceLineNo">1004</span>        "option, consider removing the files and bulkload again without this option. " +<a name="line.1004"></a>
+<span class="sourceLineNo">1005</span>        "See HBASE-13985");<a name="line.1005"></a>
+<span class="sourceLineNo">1006</span>    }<a name="line.1006"></a>
+<span class="sourceLineNo">1007</span>    // LQI queue does not need to be threadsafe -- all operations on this queue<a name="line.1007"></a>
+<span class="sourceLineNo">1008</span>    // happen in this thread<a name="line.1008"></a>
+<span class="sourceLineNo">1009</span>    Deque&lt;LoadQueueItem&gt; queue = new ArrayDeque&lt;&gt;();<a name="line.1009"></a>
+<span class="sourceLineNo">1010</span>    ExecutorService pool = null;<a name="line.1010"></a>
+<span class="sourceLineNo">1011</span>    try {<a name="line.1011"></a>
+<span class="sourceLineNo">1012</span>      prepareHFileQueue(getConf(), conn, tableName, hfofDir, queue, validateHFile, silence);<a name="line.1012"></a>
+<span class="sourceLineNo">1013</span><a name="line.1013"></a>
+<span class="sourceLineNo">1014</span>      if (queue.isEmpty()) {<a name="line.1014"></a>
+<span class="sourceLineNo">1015</span>        LOG.warn(<a name="line.1015"></a>
+<span class="sourceLineNo">1016</span>          "Bulk load operation did not find any files to load in directory {}. " +<a name="line.1016"></a>
+<span class="sourceLineNo">1017</span>          "Does it contain files in subdirectories that correspond to column family names?",<a name="line.1017"></a>
+<span class="sourceLineNo">1018</span>          (hfofDir != null ? hfofDir.toUri().toString() : ""));<a name="line.1018"></a>
+<span class="sourceLineNo">1019</span>        return Collections.emptyMap();<a name="line.1019"></a>
+<span class="sourceLineNo">1020</span>      }<a name="line.1020"></a>
+<span class="sourceLineNo">1021</span>      pool = createExecutorService();<a name="line.1021"></a>
+<span class="sourceLineNo">1022</span>      return performBulkLoad(conn, tableName, queue, pool, copyFile);<a name="line.1022"></a>
+<span class="sourceLineNo">1023</span>    } finally {<a name="line.1023"></a>
+<span class="sourceLineNo">1024</span>      cleanup(conn, tableName, queue, pool);<a name="line.1024"></a>
+<span class="sourceLineNo">1025</span>    }<a name="line.1025"></a>
+<span class="sourceLineNo">1026</span>  }<a name="line.1026"></a>
+<span class="sourceLineNo">1027</span><a name="line.1027"></a>
+<span class="sourceLineNo">1028</span>  @Override<a name="line.1028"></a>
+<span class="sourceLineNo">1029</span>  public Map&lt;LoadQueueItem, ByteBuffer&gt; bulkLoad(TableName tableName,<a name="line.1029"></a>
+<span class="sourceLineNo">1030</span>      Map&lt;byte[], List&lt;Path&gt;&gt; family2Files) throws IOException {<a name="line.1030"></a>
+<span class="sourceLineNo">1031</span>    try (AsyncClusterConnection conn = ClusterConnectionFactory.<a name="line.1031"></a>
+<span class="sourceLineNo">1032</span>        createAsyncClusterConnection(getConf(), null, userProvider.getCurrent())) {<a name="line.1032"></a>
+<span class="sourceLineNo">1033</span>      return doBulkLoad(conn, tableName, family2Files, isSilence(), isAlwaysCopyFiles());<a name="line.1033"></a>
+<span class="sourceLineNo">1034</span>    }<a name="line.1034"></a>
+<span class="sourceLineNo">1035</span>  }<a name="line.1035"></a>
+<span class="sourceLineNo">1036</span><a name="line.1036"></a>
+<span class="sourceLineNo">1037</span>  @Override<a name="line.1037"></a>
+<span class="sourceLineNo">1038</span>  public Map&lt;LoadQueueItem, ByteBuffer&gt; bulkLoad(TableName tableName, Path dir)<a name="line.1038"></a>
+<span class="sourceLineNo">1039</span>      throws IOException {<a name="line.1039"></a>
+<span class="sourceLineNo">1040</span>    try (AsyncClusterConnection conn = ClusterConnectionFactory<a name="line.1040"></a>
+<span class="sourceLineNo">1041</span>      .createAsyncClusterConnection(getConf(), null, userProvider.getCurrent())) {<a name="line.1041"></a>
+<span class="sourceLineNo">1042</span>      AsyncAdmin admin = conn.getAdmin();<a name="line.1042"></a>
+<span class="sourceLineNo">1043</span>      if (!FutureUtils.get(admin.tableExists(tableName))) {<a name="line.1043"></a>
+<span class="sourceLineNo">1044</span>        if (isCreateTable()) {<a name="line.1044"></a>
+<span class="sourceLineNo">1045</span>          createTable(tableName, dir, admin);<a name="line.1045"></a>
+<span class="sourceLineNo">1046</span>        } else {<a name="line.1046"></a>
+<span class="sourceLineNo">1047</span>          throwAndLogTableNotFoundException(tableName);<a name="line.1047"></a>
+<span class="sourceLineNo">1048</span>        }<a name="line.1048"></a>
+<span class="sourceLineNo">1049</span>      }<a name="line.1049"></a>
+<span class="sourceLineNo">1050</span>      return doBulkLoad(conn, tableName, dir, isSilence(), isAlwaysCopyFiles());<a name="line.1050"></a>
+<span class="sourceLineNo">1051</span>    }<a name="line.1051"></a>
+<span class="sourceLineNo">1052</span>  }<a name="line.1052"></a>
+<span class="sourceLineNo">1053</span><a name="line.1053"></a>
+<span class="sourceLineNo">1054</span>  /**<a name="line.1054"></a>
+<span class="sourceLineNo">1055</span>   * @throws TableNotFoundException if table does not exist.<a name="line.1055"></a>
+<span class="sourceLineNo">1056</span>   */<a name="line.1056"></a>
+<span class="sourceLineNo">1057</span>  private void tableExists(AsyncClusterConnection conn, TableName tableName) throws IOException {<a name="line.1057"></a>
+<span class="sourceLineNo">1058</span>    if (!FutureUtils.get(conn.getAdmin().tableExists(tableName))) {<a name="line.1058"></a>
+<span class="sourceLineNo">1059</span>      throwAndLogTableNotFoundException(tableName);<a name="line.1059"></a>
+<span class="sourceLineNo">1060</span>    }<a name="line.1060"></a>
+<span class="sourceLineNo">1061</span>  }<a name="line.1061"></a>
+<span class="sourceLineNo">1062</span><a name="line.1062"></a>
+<span class="sourceLineNo">1063</span>  private void throwAndLogTableNotFoundException(TableName tn) throws TableNotFoundException {<a name="line.1063"></a>
+<span class="sourceLineNo">1064</span>    String errorMsg = format("Table '%s' does not exist.", tn);<a name="line.1064"></a>
+<span class="sourceLineNo">1065</span>    LOG.error(errorMsg);<a name="line.1065"></a>
+<span class="sourceLineNo">1066</span>    throw new TableNotFoundException(errorMsg);<a name="line.1066"></a>
+<span class="sourceLineNo">1067</span>  }<a name="line.1067"></a>
+<span class="sourceLineNo">1068</span><a name="line.1068"></a>
+<span class="sourceLineNo">1069</span>  public void setBulkToken(String bulkToken) {<a name="line.1069"></a>
+<span class="sourceLineNo">1070</span>    this.bulkToken = bulkToken;<a name="line.1070"></a>
+<span class="sourceLineNo">1071</span>  }<a name="line.1071"></a>
+<span class="sourceLineNo">1072</span><a name="line.1072"></a>
+<span class="sourceLineNo">1073</span>  public void setClusterIds(List&lt;String&gt; clusterIds) {<a name="line.1073"></a>
+<span class="sourceLineNo">1074</span>    this.clusterIds = clusterIds;<a name="line.1074"></a>
+<span class="sourceLineNo">1075</span>  }<a name="line.1075"></a>
+<span class="sourceLineNo">1076</span><a name="line.1076"></a>
+<span class="sourceLineNo">1077</span>  private void usage() {<a name="line.1077"></a>
+<span class="sourceLineNo">1078</span>    System.err.println("Usage: " + "bin/hbase completebulkload [OPTIONS] "<a name="line.1078"></a>
+<span class="sourceLineNo">1079</span>        + "&lt;/PATH/TO/HFILEOUTPUTFORMAT-OUTPUT&gt; &lt;TABLENAME&gt;\n"<a name="line.1079"></a>
+<span class="sourceLineNo">1080</span>        + "Loads directory of hfiles -- a region dir or product of HFileOutputFormat -- "<a name="line.1080"></a>
+<span class="sourceLineNo">1081</span>        + "into an hbase table.\n"<a name="line.1081"></a>
+<span class="sourceLineNo">1082</span>        + "OPTIONS (for other -D options, see source code):\n"<a name="line.1082"></a>
+<span class="sourceLineNo">1083</span>        + " -D" + CREATE_TABLE_CONF_KEY + "=no whether to create table; when 'no', target "<a name="line.1083"></a>
+<span class="sourceLineNo">1084</span>        + "table must exist.\n"<a name="line.1084"></a>
+<span class="sourceLineNo">1085</span>        + " -D" + IGNORE_UNMATCHED_CF_CONF_KEY + "=yes to ignore unmatched column families.\n"<a name="line.1085"></a>
+<span class="sourceLineNo">1086</span>        + " -loadTable for when directory of files to load has a depth of 3; target table must "<a name="line.1086"></a>
+<span class="sourceLineNo">1087</span>        + "exist;\n"<a name="line.1087"></a>
+<span class="sourceLineNo">1088</span>        + " must be last of the options on command line.\n"<a name="line.1088"></a>
+<span class="sourceLineNo">1089</span>        + "See http://hbase.apache.org/book.html#arch.bulk.load.complete.strays for "<a name="line.1089"></a>
+<span class="sourceLineNo">1090</span>        + "documentation.\n");<a name="line.1090"></a>
+<span class="sourceLineNo">1091</span>  }<a name="line.1091"></a>
+<span class="sourceLineNo">1092</span><a name="line.1092"></a>
+<span class="sourceLineNo">1093</span>  @Override<a name="line.1093"></a>
+<span class="sourceLineNo">1094</span>  public int run(String[] args) throws Exception {<a name="line.1094"></a>
+<span class="sourceLineNo">1095</span>    if (args.length != 2 &amp;&amp; args.length != 3) {<a name="line.1095"></a>
+<span class="sourceLineNo">1096</span>      usage();<a name="line.1096"></a>
+<span class="sourceLineNo">1097</span>      return -1;<a name="line.1097"></a>
+<span class="sourceLineNo">1098</span>    }<a name="line.1098"></a>
+<span class="sourceLineNo">1099</span>    // Re-initialize to apply -D options from the command line parameters<a name="line.1099"></a>
+<span class="sourceLineNo">1100</span>    initialize();<a name="line.1100"></a>
+<span class="sourceLineNo">1101</span>    Path dirPath = new Path(args[0]);<a name="line.1101"></a>
+<span class="sourceLineNo">1102</span>    TableName tableName = TableName.valueOf(args[1]);<a name="line.1102"></a>
+<span class="sourceLineNo">1103</span>    if (args.length == 2) {<a name="line.1103"></a>
+<span class="sourceLineNo">1104</span>      return !bulkLoad(tableName, dirPath).isEmpty() ? 0 : -1;<a name="line.1104"></a>
+<span class="sourceLineNo">1105</span>    } else {<a name="line.1105"></a>
+<span class="sourceLineNo">1106</span>      Map&lt;byte[], List&lt;Path&gt;&gt; family2Files = Maps.newHashMap();<a name="line.1106"></a>
+<span class="sourceLineNo">1107</span>      FileSystem fs = FileSystem.get(getConf());<a name="line.1107"></a>
+<span class="sourceLineNo">1108</span>      for (FileStatus regionDir : fs.listStatus(dirPath)) {<a name="line.1108"></a>
+<span class="sourceLineNo">1109</span>        FSVisitor.visitRegionStoreFiles(fs, regionDir.getPath(), (region, family, hfileName) -&gt; {<a name="line.1109"></a>
+<span class="sourceLineNo">1110</span>          Path path = new Path(regionDir.getPath(), new Path(family, hfileName));<a name="line.1110"></a>
+<span class="sourceLineNo">1111</span>          byte[] familyName = Bytes.toBytes(family);<a name="line.1111"></a>
+<span class="sourceLineNo">1112</span>          if (family2Files.containsKey(familyName)) {<a name="line.1112"></a>
+<span class="sourceLineNo">1113</span>            family2Files.get(familyName).add(path);<a name="line.1113"></a>
+<span class="sourceLineNo">1114</span>          } else {<a name="line.1114"></a>
+<span class="sourceLineNo">1115</span>            family2Files.put(familyName, Lists.newArrayList(path));<a name="line.1115"></a>
+<span class="sourceLineNo">1116</span>          }<a name="line.1116"></a>
+<span class="sourceLineNo">1117</span>        });<a name="line.1117"></a>
+<span class="sourceLineNo">1118</span>      }<a name="line.1118"></a>
+<span class="sourceLineNo">1119</span>      return !bulkLoad(tableName, family2Files).isEmpty() ? 0 : -1;<a name="line.1119"></a>
+<span class="sourceLineNo">1120</span>    }<a name="line.1120"></a>
+<span class="sourceLineNo">1121</span>  }<a name="line.1121"></a>
+<span class="sourceLineNo">1122</span><a name="line.1122"></a>
+<span class="sourceLineNo">1123</span>  public static void main(String[] args) throws Exception {<a name="line.1123"></a>
+<span class="sourceLineNo">1124</span>    Configuration conf = HBaseConfiguration.create();<a name="line.1124"></a>
+<span class="sourceLineNo">1125</span>    int ret = ToolRunner.run(conf, new BulkLoadHFilesTool(conf), args);<a name="line.1125"></a>
+<span class="sourceLineNo">1126</span>    System.exit(ret);<a name="line.1126"></a>
+<span class="sourceLineNo">1127</span>  }<a name="line.1127"></a>
+<span class="sourceLineNo">1128</span><a name="line.1128"></a>
+<span class="sourceLineNo">1129</span>  @Override<a name="line.1129"></a>
+<span class="sourceLineNo">1130</span>  public void disableReplication(){<a name="line.1130"></a>
+<span class="sourceLineNo">1131</span>    this.replicate = false;<a name="line.1131"></a>
+<span class="sourceLineNo">1132</span>  }<a name="line.1132"></a>
+<span class="sourceLineNo">1133</span><a name="line.1133"></a>
+<span class="sourceLineNo">1134</span>  @Override<a name="line.1134"></a>
+<span class="sourceLineNo">1135</span>  public boolean isReplicationDisabled(){<a name="line.1135"></a>
+<span class="sourceLineNo">1136</span>    return !this.replicate;<a name="line.1136"></a>
+<span class="sourceLineNo">1137</span>  }<a name="line.1137"></a>
+<span class="sourceLineNo">1138</span>}<a name="line.1138"></a>
 
 
 
diff --git a/downloads.html b/downloads.html
index 93b20e4..c907a0e 100644
--- a/downloads.html
+++ b/downloads.html
@@ -433,7 +433,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 fce3d7b..29b5af8 100644
--- a/export_control.html
+++ b/export_control.html
@@ -197,7 +197,7 @@ for more details.</p>
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 ed9b706..5837d94 100644
--- a/index.html
+++ b/index.html
@@ -275,7 +275,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 425e6a9..547fc80 100644
--- a/issue-tracking.html
+++ b/issue-tracking.html
@@ -169,7 +169,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 1b900fd..1da0b2f 100644
--- a/mail-lists.html
+++ b/mail-lists.html
@@ -229,7 +229,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 878338d..cb1cc79 100644
--- a/metrics.html
+++ b/metrics.html
@@ -325,7 +325,7 @@ export HBASE_REGIONSERVER_OPTS=&quot;$HBASE_JMX_OPTS -Dcom.sun.management.jmxrem
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 f2e1037..b75efb6 100644
--- a/old_news.html
+++ b/old_news.html
@@ -316,7 +316,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 05af9be..ed82a76 100644
--- a/plugin-management.html
+++ b/plugin-management.html
@@ -321,7 +321,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 13ab8a2..72f8755 100644
--- a/plugins.html
+++ b/plugins.html
@@ -248,7 +248,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 8f2b0cb..6d76257 100644
--- a/poweredbyhbase.html
+++ b/poweredbyhbase.html
@@ -650,7 +650,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 4d88a6a..3801b73 100644
--- a/project-info.html
+++ b/project-info.html
@@ -210,7 +210,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 bc1f48c..415185f 100644
--- a/project-reports.html
+++ b/project-reports.html
@@ -186,7 +186,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 f5fc1f7..fab01f6 100644
--- a/project-summary.html
+++ b/project-summary.html
@@ -212,7 +212,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 3e63b6d..16e86ad 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 &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 d56a097..2bf5c29 100644
--- a/replication.html
+++ b/replication.html
@@ -169,7 +169,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 bef8169..95fce03 100644
--- a/resources.html
+++ b/resources.html
@@ -197,7 +197,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 cb752c2..bce4034 100644
--- a/source-repository.html
+++ b/source-repository.html
@@ -180,7 +180,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 a72ad26..b74bd7c 100644
--- a/sponsors.html
+++ b/sponsors.html
@@ -199,7 +199,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 d3142ab..8696e74 100644
--- a/supportingprojects.html
+++ b/supportingprojects.html
@@ -390,7 +390,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 c7c9ce9..49909b0 100644
--- a/team-list.html
+++ b/team-list.html
@@ -707,7 +707,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-21</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-11-23</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 1f922d5..18cfeec 100644
--- a/testdevapidocs/index-all.html
+++ b/testdevapidocs/index-all.html
@@ -56157,6 +56157,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/filter/TestParseFilter.html#testCorrectFilterString--">testCorrectFilterString()</a></span> - Method in class org.apache.hadoop.hbase.filter.<a href="org/apache/hadoop/hbase/filter/TestParseFilter.html" title="class in org.apache.hadoop.hbase.filter">TestParseFilter</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#testCorrectSplitPoint--">testCorrectSplitPoint()</a></span> - Method in class org.apache.hadoop.hbase.tool.<a href="org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html" title="class in org.apache.hadoop.hbase.tool">TestBulkLoadHFilesSplitRecovery</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/io/hfile/TestHFile.html#testCorrupt0LengthHFile--">testCorrupt0LengthHFile()</a></span> - Method in class org.apache.hadoop.hbase.io.hfile.<a href="org/apache/hadoop/hbase/io/hfile/TestHFile.html" title="class in org.apache.hadoop.hbase.io.hfile">TestHFile</a></dt>
 <dd>
 <div class="block">Create 0-length hfile and show that it fails</div>
@@ -59837,6 +59839,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/ipc/TestConnectionId.html#testGetServiceName--">testGetServiceName()</a></span> - Method in class org.apache.hadoop.hbase.ipc.<a href="org/apache/hadoop/hbase/ipc/TestConnectionId.html" title="class in org.apache.hadoop.hbase.ipc">TestConnectionId</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#testGetSetRegionServerGroup--">testGetSetRegionServerGroup()</a></span> - Method in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html" title="class in org.apache.hadoop.hbase.client">TestTableDescriptorBuilder</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#testGetSetRemoveCP--">testGetSetRemoveCP()</a></span> - Method in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html" title="class in org.apache.hadoop.hbase.client">TestTableDescriptorBuilder</a></dt>
 <dd>
 <div class="block">Test cps in the table description.</div>
@@ -73483,6 +73487,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/quotas/TestClusterScopeQuotaThrottle.html#testTableClusterScopeQuota--">testTableClusterScopeQuota()</a></span> - Method in class org.apache.hadoop.hbase.quotas.<a href="org/apache/hadoop/hbase/quotas/TestClusterScopeQuotaThrottle.html" title="class in org.apache.hadoop.hbase.quotas">TestClusterScopeQuotaThrottle</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.html#testTableConstraint--">testTableConstraint()</a></span> - Method in class org.apache.hadoop.hbase.rsgroup.<a href="org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.html" title="class in org.apache.hadoop.hbase.rsgroup">TestRSGroupsAdmin1</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/security/access/TestAccessController.html#testTableCreate--">testTableCreate()</a></span> - Method in class org.apache.hadoop.hbase.security.access.<a href="org/apache/hadoop/hbase/security/access/TestAccessController.html" title="class in org.apache.hadoop.hbase.security.access">TestAccessController</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/security/access/TestAccessController3.html#testTableCreate--">testTableCreate()</a></span> - Method in class org.apache.hadoop.hbase.security.access.<a href="org/apache/hadoop/hbase/security/access/TestAccessController3.html" title="class in org.apache.hadoop.hbase.security.access">TestAccessController3</a></dt>
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 93d1d32..93a914e 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>&lt;E&gt; (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>&lt;T&gt;, 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/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>
+<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>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html b/testdevapidocs/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html
index 9c2cdc6..afe7dc9 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10};
 var tabs = {65535:["t0","All 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/client/TestTableDescriptorBuilder.html#line.46">TestTableDescriptorBuilder</a>
+<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.48">TestTableDescriptorBuilder</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">Test setting values in the descriptor.</div>
 </li>
@@ -208,55 +208,59 @@ 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/client/TestTableDescriptorBuilder.html#testGetSetRegionServerGroup--">testGetSetRegionServerGroup</a></span>()</code>&nbsp;</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/client/TestTableDescriptorBuilder.html#testGetSetRemoveCP--">testGetSetRemoveCP</a></span>()</code>
 <div class="block">Test cps in the table description.</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/client/TestTableDescriptorBuilder.html#testIllegalTableNames--">testIllegalTableNames</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#testIllegalTableNamesRegex--">testIllegalTableNamesRegex</a></span>()</code>&nbsp;</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/client/TestTableDescriptorBuilder.html#testLegalTableNames--">testLegalTableNames</a></span>()</code>&nbsp;</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/client/TestTableDescriptorBuilder.html#testLegalTableNamesRegex--">testLegalTableNamesRegex</a></span>()</code>&nbsp;</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/client/TestTableDescriptorBuilder.html#testModifyFamily--">testModifyFamily</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#testModifyInexistentFamily--">testModifyInexistentFamily</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i13" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#testPb--">testPb</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i14" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#testPriority--">testPriority</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#testRemoveString--">testRemoveString</a></span>()</code>
 <div class="block">Test that we add and remove strings from settings properly.</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#testSetListRemoveCP--">testSetListRemoveCP</a></span>()</code>
 <div class="block">Test cps in the table description.</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#testStringCustomizedValues--">testStringCustomizedValues</a></span>()</code>&nbsp;</td>
 </tr>
@@ -288,7 +292,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&nbsp;<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/TestTableDescriptorBuilder.html#line.48">CLASS_RULE</a></pre>
+<pre>public static final&nbsp;<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/TestTableDescriptorBuilder.html#line.50">CLASS_RULE</a></pre>
 </li>
 </ul>
 <a name="LOG">
@@ -297,7 +301,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>LOG</h4>
-<pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.51">LOG</a></pre>
+<pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.53">LOG</a></pre>
 </li>
 </ul>
 <a name="name">
@@ -306,7 +310,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&nbsp;org.junit.rules.TestName <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.54">name</a></pre>
+<pre>public&nbsp;org.junit.rules.TestName <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.56">name</a></pre>
 </li>
 </ul>
 <a name="legalTableNames">
@@ -315,7 +319,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>legalTableNames</h4>
-<pre><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/client/TestTableDescriptorBuilder.html#line.162">legalTableNames</a></pre>
+<pre><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/client/TestTableDescriptorBuilder.html#line.164">legalTableNames</a></pre>
 </li>
 </ul>
 <a name="illegalTableNames">
@@ -324,7 +328,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>illegalTableNames</h4>
-<pre><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/client/TestTableDescriptorBuilder.html#line.166">illegalTableNames</a></pre>
+<pre><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/client/TestTableDescriptorBuilder.html#line.168">illegalTableNames</a></pre>
 </li>
 </ul>
 </li>
@@ -341,7 +345,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TestTableDescriptorBuilder</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.46">TestTableDescriptorBuilder</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.48">TestTableDescriptorBuilder</a>()</pre>
 </li>
 </ul>
 </li>
@@ -358,7 +362,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testAddCoprocessorTwice</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.57">testAddCoprocessorTwice</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.59">testAddCoprocessorTwice</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>
@@ -372,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>testPb</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.64">testPb</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.66">testPb</a>()
             throws org.apache.hadoop.hbase.exceptions.DeserializationException,
                    <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>
@@ -388,7 +392,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testGetSetRemoveCP</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.84">testGetSetRemoveCP</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.86">testGetSetRemoveCP</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 cps in the table description.</div>
 <dl>
@@ -403,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>testSetListRemoveCP</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.106">testSetListRemoveCP</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.108">testSetListRemoveCP</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 cps in the table description.</div>
 <dl>
@@ -418,7 +422,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testRemoveString</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.152">testRemoveString</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.154">testRemoveString</a>()</pre>
 <div class="block">Test that we add and remove strings from settings properly.</div>
 </li>
 </ul>
@@ -428,7 +432,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testLegalTableNames</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.171">testLegalTableNames</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.173">testLegalTableNames</a>()</pre>
 </li>
 </ul>
 <a name="testIllegalTableNames--">
@@ -437,7 +441,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testIllegalTableNames</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.178">testIllegalTableNames</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.180">testIllegalTableNames</a>()</pre>
 </li>
 </ul>
 <a name="testLegalTableNamesRegex--">
@@ -446,7 +450,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testLegalTableNamesRegex</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.190">testLegalTableNamesRegex</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.192">testLegalTableNamesRegex</a>()</pre>
 </li>
 </ul>
 <a name="testIllegalTableNamesRegex--">
@@ -455,7 +459,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testIllegalTableNamesRegex</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.199">testIllegalTableNamesRegex</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.201">testIllegalTableNamesRegex</a>()</pre>
 </li>
 </ul>
 <a name="testGetMaxFileSize--">
@@ -464,7 +468,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testGetMaxFileSize</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.210">testGetMaxFileSize</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.212">testGetMaxFileSize</a>()</pre>
 <div class="block">Test default value handling for maxFileSize</div>
 </li>
 </ul>
@@ -474,7 +478,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testGetMemStoreFlushSize</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.223">testGetMemStoreFlushSize</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.225">testGetMemStoreFlushSize</a>()</pre>
 <div class="block">Test default value handling for memStoreFlushSize</div>
 </li>
 </ul>
@@ -484,7 +488,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testClassMethodsAreBuilderStyle</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.233">testClassMethodsAreBuilderStyle</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.235">testClassMethodsAreBuilderStyle</a>()</pre>
 </li>
 </ul>
 <a name="testModifyFamily--">
@@ -493,7 +497,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testModifyFamily</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.238">testModifyFamily</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.240">testModifyFamily</a>()</pre>
 </li>
 </ul>
 <a name="testModifyInexistentFamily--">
@@ -502,7 +506,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testModifyInexistentFamily</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.255">testModifyInexistentFamily</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.257">testModifyInexistentFamily</a>()</pre>
 </li>
 </ul>
 <a name="testAddDuplicateFamilies--">
@@ -511,7 +515,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testAddDuplicateFamilies</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.262">testAddDuplicateFamilies</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.264">testAddDuplicateFamilies</a>()</pre>
 </li>
 </ul>
 <a name="testPriority--">
@@ -520,16 +524,25 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testPriority</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.275">testPriority</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.277">testPriority</a>()</pre>
 </li>
 </ul>
 <a name="testStringCustomizedValues--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>testStringCustomizedValues</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.282">testStringCustomizedValues</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.284">testStringCustomizedValues</a>()</pre>
+</li>
+</ul>
+<a name="testGetSetRegionServerGroup--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>testGetSetRegionServerGroup</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html#line.298">testGetSetRegionServerGroup</a>()</pre>
 </li>
 </ul>
 </li>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
index d4d7436..f32920e 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
@@ -165,8 +165,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>&lt;E&gt; (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>&lt;T&gt;, 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.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.CacheOnWriteType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">TestCacheOnWrite.CacheOnWriteType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TagUsage.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">TagUsage</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.io.hfile.<a href="../../../../../../org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.CacheOnWriteType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">TestCacheOnWrite.CacheOnWriteType</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
index 68d28b1..554418f 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -653,18 +653,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>&lt;E&gt; (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>&lt;T&gt;, 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/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/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/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/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/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/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.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/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/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/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/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/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/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/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/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/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/ClusterManager.ServiceType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClusterManager.ServiceType</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index 11555ca..342236e 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -242,9 +242,9 @@
 <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>&lt;E&gt; (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>&lt;T&gt;, 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/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/TestProcedureBypass.StuckStateMachineState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestProcedureBypass.StuckStateMachineState</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>
+<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>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index ca2cd00..0322dff 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -720,12 +720,12 @@
 <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>&lt;E&gt; (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>&lt;T&gt;, 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/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/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/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/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/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/TestCompactionState.StateSource.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestCompactionState.StateSource</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>
+<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/TestRegionServerReadRequestMetrics.Metric.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestRegionServerReadRequestMetrics.Metric</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.html b/testdevapidocs/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.html
index 28c294c..ce9f827 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":9,"i3":9,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10};
+var methods = {"i0":10,"i1":10,"i2":9,"i3":9,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":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";
@@ -258,10 +258,14 @@ extends <a href="../../../../../org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase
 </tr>
 <tr id="i15" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.html#testTableMoveTruncateAndDrop--">testTableMoveTruncateAndDrop</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.html#testTableConstraint--">testTableConstraint</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i16" class="altColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.html#testTableMoveTruncateAndDrop--">testTableMoveTruncateAndDrop</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i17" class="rowColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.html#testValidGroupNames--">testValidGroupNames</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
@@ -565,7 +569,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase
 <a name="testRenameRSGroupConstraints--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>testRenameRSGroupConstraints</h4>
 <pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.html#line.540">testRenameRSGroupConstraints</a>()
@@ -576,6 +580,20 @@ extends <a href="../../../../../org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase
 </dl>
 </li>
 </ul>
+<a name="testTableConstraint--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>testTableConstraint</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.html#line.591">testTableConstraint</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>
 </li>
 </ul>
 </li>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html b/testdevapidocs/org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html
index 2682014..63f37b8 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":9,"i4":10,"i5":9,"i6":9,"i7":10,"i8":9,"i9":10,"i10":9,"i11":9,"i12":10,"i13":10,"i14":9,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":9};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":9,"i4":10,"i5":9,"i6":9,"i7":10,"i8":9,"i9":10,"i10":9,"i11":9,"i12":10,"i13":10,"i14":9,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -300,17 +300,21 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 </tr>
 <tr id="i16" class="altColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#testCorrectSplitPoint--">testCorrectSplitPoint</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i17" class="rowColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#testGroupOrSplitFailure--">testGroupOrSplitFailure</a></span>()</code>
 <div class="block">This simulates an remote exception which should cause LIHF to exit with an exception.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i18" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#testGroupOrSplitPresplit--">testGroupOrSplitPresplit</a></span>()</code>
 <div class="block">This test splits a table and attempts to bulk load.</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#testRetryOnIOException--">testRetryOnIOException</a></span>()</code>
 <div class="block">Test that shows that exception thrown from the RS side will result in the expected number of
@@ -318,26 +322,26 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
  $<code>BulkLoadHFiles.RETRY_ON_IO_EXCEPTION</code> is set</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#testSplitTmpFileCleanUp--">testSplitTmpFileCleanUp</a></span>()</code>
 <div class="block">This test creates a table with many small regions.</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#testSplitWhileBulkLoadPhase--">testSplitWhileBulkLoadPhase</a></span>()</code>
 <div class="block">This test exercises the path where there is a split after initial validation but before the
  atomic bulk load call.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#testSplitWhileBulkLoadPhaseWithoutItemMap--">testSplitWhileBulkLoadPhaseWithoutItemMap</a></span>()</code>
 <div class="block">We are testing a split after initial validation but before the atomic bulk load call.</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code>(package private) static byte[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#value-int-">value</a></span>(int&nbsp;i)</code>&nbsp;</td>
 </tr>
@@ -741,13 +745,27 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 </dl>
 </li>
 </ul>
+<a name="testCorrectSplitPoint--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testCorrectSplitPoint</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#line.411">testCorrectSplitPoint</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="testSplitTmpFileCleanUp--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>testSplitTmpFileCleanUp</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#line.415">testSplitTmpFileCleanUp</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#line.442">testSplitTmpFileCleanUp</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 creates a table with many small regions. The bulk load files would be splitted
  multiple times before all of them can be loaded successfully.</div>
@@ -763,7 +781,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testGroupOrSplitFailure</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#line.444">testGroupOrSplitFailure</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#line.471">testGroupOrSplitFailure</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 simulates an remote exception which should cause LIHF to exit with an exception.</div>
 <dl>
@@ -778,7 +796,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testSplitWhileBulkLoadPhaseWithoutItemMap</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#line.476">testSplitWhileBulkLoadPhaseWithoutItemMap</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#line.503">testSplitWhileBulkLoadPhaseWithoutItemMap</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">We are testing a split after initial validation but before the atomic bulk load call.
  We cannot use presplitting to test this path, so we actually inject a
@@ -796,7 +814,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>assertExpectedTable</h4>
-<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#line.521">assertExpectedTable</a>(org.apache.hadoop.hbase.client.Connection&nbsp;connection,
+<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#line.548">assertExpectedTable</a>(org.apache.hadoop.hbase.client.Connection&nbsp;connection,
                          org.apache.hadoop.hbase.TableName&nbsp;table,
                          int&nbsp;count,
                          int&nbsp;value)
diff --git a/testdevapidocs/org/apache/hadoop/hbase/tool/TestSecureBulkLoadHFilesSplitRecovery.html b/testdevapidocs/org/apache/hadoop/hbase/tool/TestSecureBulkLoadHFilesSplitRecovery.html
index 2edea61..5a6d172 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/tool/TestSecureBulkLoadHFilesSplitRecovery.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/tool/TestSecureBulkLoadHFilesSplitRecovery.html
@@ -201,7 +201,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/tool/TestBulkLoadHFilesS
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.hadoop.hbase.tool.<a href="../../../../../org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html" title="class in org.apache.hadoop.hbase.tool">TestBulkLoadHFilesSplitRecovery</a></h3>
-<code><a href="../../../../../org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#assertExpectedTable-org.apache.hadoop.hbase.client.Connection-org.apache.hadoop.hbase.TableName-int-int-">assertExpectedTable</a>, <a href="../../../../../org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#assertExpectedTable-org.apache.hadoop.hbase.TableName-int-int-">assertExpectedTable</a>, <a href="../../../../../org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.h [...]
+<code><a href="../../../../../org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#assertExpectedTable-org.apache.hadoop.hbase.client.Connection-org.apache.hadoop.hbase.TableName-int-int-">assertExpectedTable</a>, <a href="../../../../../org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html#assertExpectedTable-org.apache.hadoop.hbase.TableName-int-int-">assertExpectedTable</a>, <a href="../../../../../org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.h [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
index b47f20a..a00f520 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
@@ -165,9 +165,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>&lt;E&gt; (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>&lt;T&gt;, 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/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>
 <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/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>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html
index d80dcbf..c44f2ac 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html
@@ -27,279 +27,291 @@
 <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.regex.Pattern;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.TableName;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.testclassification.MiscTests;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.util.BuilderStyleTest;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.junit.ClassRule;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.junit.Rule;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.junit.Test;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.junit.experimental.categories.Category;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.junit.rules.TestName;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.slf4j.Logger;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.slf4j.LoggerFactory;<a name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span>/**<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * Test setting values in the descriptor.<a name="line.43"></a>
-<span class="sourceLineNo">044</span> */<a name="line.44"></a>
-<span class="sourceLineNo">045</span>@Category({ MiscTests.class, SmallTests.class })<a name="line.45"></a>
-<span class="sourceLineNo">046</span>public class TestTableDescriptorBuilder {<a name="line.46"></a>
-<span class="sourceLineNo">047</span>  @ClassRule<a name="line.47"></a>
-<span class="sourceLineNo">048</span>  public static final HBaseClassTestRule CLASS_RULE =<a name="line.48"></a>
-<span class="sourceLineNo">049</span>    HBaseClassTestRule.forClass(TestTableDescriptorBuilder.class);<a name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span>  private static final Logger LOG = LoggerFactory.getLogger(TestTableDescriptorBuilder.class);<a name="line.51"></a>
+<span class="sourceLineNo">022</span>import static org.junit.Assert.assertNull;<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.regex.Pattern;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.TableName;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.rsgroup.RSGroupInfo;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.testclassification.MiscTests;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.util.BuilderStyleTest;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.junit.ClassRule;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.junit.Rule;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.junit.Test;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.junit.experimental.categories.Category;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.junit.rules.TestName;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.slf4j.Logger;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.slf4j.LoggerFactory;<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span>/**<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * Test setting values in the descriptor.<a name="line.45"></a>
+<span class="sourceLineNo">046</span> */<a name="line.46"></a>
+<span class="sourceLineNo">047</span>@Category({ MiscTests.class, SmallTests.class })<a name="line.47"></a>
+<span class="sourceLineNo">048</span>public class TestTableDescriptorBuilder {<a name="line.48"></a>
+<span class="sourceLineNo">049</span>  @ClassRule<a name="line.49"></a>
+<span class="sourceLineNo">050</span>  public static final HBaseClassTestRule CLASS_RULE =<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    HBaseClassTestRule.forClass(TestTableDescriptorBuilder.class);<a name="line.51"></a>
 <span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span>  @Rule<a name="line.53"></a>
-<span class="sourceLineNo">054</span>  public TestName name = new TestName();<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span>  @Test(expected = IOException.class)<a name="line.56"></a>
-<span class="sourceLineNo">057</span>  public void testAddCoprocessorTwice() throws IOException {<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    String cpName = "a.b.c.d";<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    TableDescriptorBuilder.newBuilder(TableName.META_TABLE_NAME).setCoprocessor(cpName)<a name="line.59"></a>
-<span class="sourceLineNo">060</span>      .setCoprocessor(cpName).build();<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>  @Test<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  public void testPb() throws DeserializationException, IOException {<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    final int v = 123;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    TableDescriptor htd =<a name="line.66"></a>
-<span class="sourceLineNo">067</span>      TableDescriptorBuilder.newBuilder(TableName.META_TABLE_NAME).setMaxFileSize(v)<a name="line.67"></a>
-<span class="sourceLineNo">068</span>        .setDurability(Durability.ASYNC_WAL).setReadOnly(true).setRegionReplication(2).build();<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>    byte[] bytes = TableDescriptorBuilder.toByteArray(htd);<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    TableDescriptor deserializedHtd = TableDescriptorBuilder.parseFrom(bytes);<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    assertEquals(htd, deserializedHtd);<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    assertEquals(v, deserializedHtd.getMaxFileSize());<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    assertTrue(deserializedHtd.isReadOnly());<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    assertEquals(Durability.ASYNC_WAL, deserializedHtd.getDurability());<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    assertEquals(2, deserializedHtd.getRegionReplication());<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>  /**<a name="line.79"></a>
-<span class="sourceLineNo">080</span>   * Test cps in the table description.<a name="line.80"></a>
-<span class="sourceLineNo">081</span>   * @throws Exception if setting a coprocessor fails<a name="line.81"></a>
-<span class="sourceLineNo">082</span>   */<a name="line.82"></a>
-<span class="sourceLineNo">083</span>  @Test<a name="line.83"></a>
-<span class="sourceLineNo">084</span>  public void testGetSetRemoveCP() throws Exception {<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    // simple CP<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    String className = "org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver";<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    TableDescriptor desc = TableDescriptorBuilder<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      .newBuilder(TableName.valueOf(name.getMethodName())).setCoprocessor(className) // add and<a name="line.88"></a>
-<span class="sourceLineNo">089</span>                                                                                     // check that<a name="line.89"></a>
-<span class="sourceLineNo">090</span>                                                                                     // it is<a name="line.90"></a>
-<span class="sourceLineNo">091</span>                                                                                     // present<a name="line.91"></a>
-<span class="sourceLineNo">092</span>      .build();<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    assertTrue(desc.hasCoprocessor(className));<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    desc = TableDescriptorBuilder.newBuilder(desc).removeCoprocessor(className) // remove it and<a name="line.94"></a>
-<span class="sourceLineNo">095</span>                                                                                // check that it is<a name="line.95"></a>
-<span class="sourceLineNo">096</span>                                                                                // gone<a name="line.96"></a>
-<span class="sourceLineNo">097</span>      .build();<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    assertFalse(desc.hasCoprocessor(className));<a name="line.98"></a>
-<span class="sourceLineNo">099</span>  }<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 cps in the table description.<a name="line.102"></a>
-<span class="sourceLineNo">103</span>   * @throws Exception if setting a coprocessor fails<a name="line.103"></a>
-<span class="sourceLineNo">104</span>   */<a name="line.104"></a>
-<span class="sourceLineNo">105</span>  @Test<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  public void testSetListRemoveCP() throws Exception {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    TableDescriptor desc =<a name="line.107"></a>
-<span class="sourceLineNo">108</span>      TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName())).build();<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    // Check that any coprocessor is present.<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    assertTrue(desc.getCoprocessorDescriptors().isEmpty());<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span>    // simple CP<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    String className1 = "org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver";<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    String className2 = "org.apache.hadoop.hbase.coprocessor.SampleRegionWALObserver";<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    // Add the 1 coprocessor and check if present.<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    desc = TableDescriptorBuilder.newBuilder(desc).setCoprocessor(className1).build();<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    assertTrue(desc.getCoprocessorDescriptors().size() == 1);<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    assertTrue(desc.getCoprocessorDescriptors().stream().map(CoprocessorDescriptor::getClassName)<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      .anyMatch(name -&gt; name.equals(className1)));<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    // Add the 2nd coprocessor and check if present.<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    // remove it and check that it is gone<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    desc = TableDescriptorBuilder.newBuilder(desc)<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>      .setCoprocessor(className2).build();<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    assertTrue(desc.getCoprocessorDescriptors().size() == 2);<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    assertTrue(desc.getCoprocessorDescriptors().stream().map(CoprocessorDescriptor::getClassName)<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      .anyMatch(name -&gt; name.equals(className2)));<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    // Remove one and check<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    desc = TableDescriptorBuilder.newBuilder(desc)<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span>      .removeCoprocessor(className1).build();<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    assertTrue(desc.getCoprocessorDescriptors().size() == 1);<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    assertFalse(desc.getCoprocessorDescriptors().stream().map(CoprocessorDescriptor::getClassName)<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      .anyMatch(name -&gt; name.equals(className1)));<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    assertTrue(desc.getCoprocessorDescriptors().stream().map(CoprocessorDescriptor::getClassName)<a name="line.135"></a>
-<span class="sourceLineNo">136</span>      .anyMatch(name -&gt; name.equals(className2)));<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    // Remove the last and check<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    desc = TableDescriptorBuilder.newBuilder(desc)<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span>      .removeCoprocessor(className2).build();<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    assertTrue(desc.getCoprocessorDescriptors().isEmpty());<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    assertFalse(desc.getCoprocessorDescriptors().stream().map(CoprocessorDescriptor::getClassName)<a name="line.142"></a>
-<span class="sourceLineNo">143</span>      .anyMatch(name -&gt; name.equals(className1)));<a name="line.143"></a>
+<span class="sourceLineNo">053</span>  private static final Logger LOG = LoggerFactory.getLogger(TestTableDescriptorBuilder.class);<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>  @Rule<a name="line.55"></a>
+<span class="sourceLineNo">056</span>  public TestName name = new TestName();<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>  @Test(expected = IOException.class)<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  public void testAddCoprocessorTwice() throws IOException {<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    String cpName = "a.b.c.d";<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    TableDescriptorBuilder.newBuilder(TableName.META_TABLE_NAME).setCoprocessor(cpName)<a name="line.61"></a>
+<span class="sourceLineNo">062</span>      .setCoprocessor(cpName).build();<a name="line.62"></a>
+<span class="sourceLineNo">063</span>  }<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 testPb() throws DeserializationException, IOException {<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    final int v = 123;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    TableDescriptor htd =<a name="line.68"></a>
+<span class="sourceLineNo">069</span>      TableDescriptorBuilder.newBuilder(TableName.META_TABLE_NAME).setMaxFileSize(v)<a name="line.69"></a>
+<span class="sourceLineNo">070</span>        .setDurability(Durability.ASYNC_WAL).setReadOnly(true).setRegionReplication(2).build();<a name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span>    byte[] bytes = TableDescriptorBuilder.toByteArray(htd);<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    TableDescriptor deserializedHtd = TableDescriptorBuilder.parseFrom(bytes);<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    assertEquals(htd, deserializedHtd);<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    assertEquals(v, deserializedHtd.getMaxFileSize());<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    assertTrue(deserializedHtd.isReadOnly());<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    assertEquals(Durability.ASYNC_WAL, deserializedHtd.getDurability());<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    assertEquals(2, deserializedHtd.getRegionReplication());<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>  /**<a name="line.81"></a>
+<span class="sourceLineNo">082</span>   * Test cps in the table description.<a name="line.82"></a>
+<span class="sourceLineNo">083</span>   * @throws Exception if setting a coprocessor fails<a name="line.83"></a>
+<span class="sourceLineNo">084</span>   */<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  @Test<a name="line.85"></a>
+<span class="sourceLineNo">086</span>  public void testGetSetRemoveCP() throws Exception {<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    // simple CP<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    String className = "org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver";<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    TableDescriptor desc = TableDescriptorBuilder<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      .newBuilder(TableName.valueOf(name.getMethodName())).setCoprocessor(className) // add and<a name="line.90"></a>
+<span class="sourceLineNo">091</span>                                                                                     // check that<a name="line.91"></a>
+<span class="sourceLineNo">092</span>                                                                                     // it is<a name="line.92"></a>
+<span class="sourceLineNo">093</span>                                                                                     // present<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      .build();<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    assertTrue(desc.hasCoprocessor(className));<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    desc = TableDescriptorBuilder.newBuilder(desc).removeCoprocessor(className) // remove it and<a name="line.96"></a>
+<span class="sourceLineNo">097</span>                                                                                // check that it is<a name="line.97"></a>
+<span class="sourceLineNo">098</span>                                                                                // gone<a name="line.98"></a>
+<span class="sourceLineNo">099</span>      .build();<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    assertFalse(desc.hasCoprocessor(className));<a name="line.100"></a>
+<span class="sourceLineNo">101</span>  }<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span>  /**<a name="line.103"></a>
+<span class="sourceLineNo">104</span>   * Test cps in the table description.<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   * @throws Exception if setting a coprocessor fails<a name="line.105"></a>
+<span class="sourceLineNo">106</span>   */<a name="line.106"></a>
+<span class="sourceLineNo">107</span>  @Test<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  public void testSetListRemoveCP() throws Exception {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    TableDescriptor desc =<a name="line.109"></a>
+<span class="sourceLineNo">110</span>      TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName())).build();<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    // Check that any coprocessor is present.<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    assertTrue(desc.getCoprocessorDescriptors().isEmpty());<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span>    // simple CP<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    String className1 = "org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver";<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    String className2 = "org.apache.hadoop.hbase.coprocessor.SampleRegionWALObserver";<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    // Add the 1 coprocessor and check if present.<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    desc = TableDescriptorBuilder.newBuilder(desc).setCoprocessor(className1).build();<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    assertTrue(desc.getCoprocessorDescriptors().size() == 1);<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    assertTrue(desc.getCoprocessorDescriptors().stream().map(CoprocessorDescriptor::getClassName)<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      .anyMatch(name -&gt; name.equals(className1)));<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    // Add the 2nd coprocessor and check if present.<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    // remove it and check that it is gone<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    desc = TableDescriptorBuilder.newBuilder(desc)<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span>      .setCoprocessor(className2).build();<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    assertTrue(desc.getCoprocessorDescriptors().size() == 2);<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    assertTrue(desc.getCoprocessorDescriptors().stream().map(CoprocessorDescriptor::getClassName)<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      .anyMatch(name -&gt; name.equals(className2)));<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    // Remove one and check<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    desc = TableDescriptorBuilder.newBuilder(desc)<a name="line.131"></a>
+<span class="sourceLineNo">132</span><a name="line.132"></a>
+<span class="sourceLineNo">133</span>      .removeCoprocessor(className1).build();<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    assertTrue(desc.getCoprocessorDescriptors().size() == 1);<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    assertFalse(desc.getCoprocessorDescriptors().stream().map(CoprocessorDescriptor::getClassName)<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      .anyMatch(name -&gt; name.equals(className1)));<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    assertTrue(desc.getCoprocessorDescriptors().stream().map(CoprocessorDescriptor::getClassName)<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      .anyMatch(name -&gt; name.equals(className2)));<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    // Remove the last and check<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    desc = TableDescriptorBuilder.newBuilder(desc)<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span>      .removeCoprocessor(className2).build();<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    assertTrue(desc.getCoprocessorDescriptors().isEmpty());<a name="line.143"></a>
 <span class="sourceLineNo">144</span>    assertFalse(desc.getCoprocessorDescriptors().stream().map(CoprocessorDescriptor::getClassName)<a name="line.144"></a>
-<span class="sourceLineNo">145</span>      .anyMatch(name -&gt; name.equals(className2)));<a name="line.145"></a>
-<span class="sourceLineNo">146</span>  }<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>   * Test that we add and remove strings from settings properly.<a name="line.149"></a>
-<span class="sourceLineNo">150</span>   */<a name="line.150"></a>
-<span class="sourceLineNo">151</span>  @Test<a name="line.151"></a>
-<span class="sourceLineNo">152</span>  public void testRemoveString() {<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    byte[] key = Bytes.toBytes("Some");<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    byte[] value = Bytes.toBytes("value");<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    TableDescriptor desc = TableDescriptorBuilder<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      .newBuilder(TableName.valueOf(name.getMethodName())).setValue(key, value).build();<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    assertTrue(Bytes.equals(value, desc.getValue(key)));<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    desc = TableDescriptorBuilder.newBuilder(desc).removeValue(key).build();<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    assertTrue(desc.getValue(key) == null);<a name="line.159"></a>
-<span class="sourceLineNo">160</span>  }<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span>  String[] legalTableNames = { "foo", "with-dash_under.dot", "_under_start_ok",<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    "with-dash.with_underscore", "02-01-2012.my_table_01-02", "xyz._mytable_", "9_9_0.table_02",<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    "dot1.dot2.table", "new.-mytable", "with-dash.with.dot", "legal..t2", "legal..legal.t2",<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    "trailingdots..", "trailing.dots...", "ns:mytable", "ns:_mytable_", "ns:my_table_01-02" };<a name="line.165"></a>
-<span class="sourceLineNo">166</span>  String[] illegalTableNames = { ".dot_start_illegal", "-dash_start_illegal", "spaces not ok",<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    "-dash-.start_illegal", "new.table with space", "01 .table", "ns:-illegaldash",<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    "new:.illegaldot", "new:illegalcolon1:", "new:illegalcolon1:2" };<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span>  @Test<a name="line.170"></a>
-<span class="sourceLineNo">171</span>  public void testLegalTableNames() {<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    for (String tn : legalTableNames) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      TableName.isLegalFullyQualifiedTableName(Bytes.toBytes(tn));<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    }<a name="line.174"></a>
-<span class="sourceLineNo">175</span>  }<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span>  @Test<a name="line.177"></a>
-<span class="sourceLineNo">178</span>  public void testIllegalTableNames() {<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    for (String tn : illegalTableNames) {<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      try {<a name="line.180"></a>
-<span class="sourceLineNo">181</span>        TableName.isLegalFullyQualifiedTableName(Bytes.toBytes(tn));<a name="line.181"></a>
-<span class="sourceLineNo">182</span>        fail("invalid tablename " + tn + " should have failed");<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      } catch (Exception e) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span>        // expected<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><a name="line.188"></a>
-<span class="sourceLineNo">189</span>  @Test<a name="line.189"></a>
-<span class="sourceLineNo">190</span>  public void testLegalTableNamesRegex() {<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    for (String tn : legalTableNames) {<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      TableName tName = TableName.valueOf(tn);<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      assertTrue("Testing: '" + tn + "'",<a name="line.193"></a>
-<span class="sourceLineNo">194</span>        Pattern.matches(TableName.VALID_USER_TABLE_REGEX, tName.getNameAsString()));<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    }<a name="line.195"></a>
-<span class="sourceLineNo">196</span>  }<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span>  @Test<a name="line.198"></a>
-<span class="sourceLineNo">199</span>  public void testIllegalTableNamesRegex() {<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    for (String tn : illegalTableNames) {<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      LOG.info("Testing: '" + tn + "'");<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      assertFalse(Pattern.matches(TableName.VALID_USER_TABLE_REGEX, tn));<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    }<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>  /**<a name="line.206"></a>
-<span class="sourceLineNo">207</span>   * Test default value handling for maxFileSize<a name="line.207"></a>
-<span class="sourceLineNo">208</span>   */<a name="line.208"></a>
-<span class="sourceLineNo">209</span>  @Test<a name="line.209"></a>
-<span class="sourceLineNo">210</span>  public void testGetMaxFileSize() {<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    TableDescriptor desc =<a name="line.211"></a>
-<span class="sourceLineNo">212</span>      TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName())).build();<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    assertEquals(-1, desc.getMaxFileSize());<a name="line.213"></a>
-<span class="sourceLineNo">214</span>    desc = TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName()))<a name="line.214"></a>
-<span class="sourceLineNo">215</span>      .setMaxFileSize(1111L).build();<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    assertEquals(1111L, desc.getMaxFileSize());<a name="line.216"></a>
-<span class="sourceLineNo">217</span>  }<a name="line.217"></a>
-<span class="sourceLineNo">218</span><a name="line.218"></a>
-<span class="sourceLineNo">219</span>  /**<a name="line.219"></a>
-<span class="sourceLineNo">220</span>   * Test default value handling for memStoreFlushSize<a name="line.220"></a>
-<span class="sourceLineNo">221</span>   */<a name="line.221"></a>
-<span class="sourceLineNo">222</span>  @Test<a name="line.222"></a>
-<span class="sourceLineNo">223</span>  public void testGetMemStoreFlushSize() {<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    TableDescriptor desc =<a name="line.224"></a>
-<span class="sourceLineNo">225</span>      TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName())).build();<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    assertEquals(-1, desc.getMemStoreFlushSize());<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    desc = TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName()))<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      .setMemStoreFlushSize(1111L).build();<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    assertEquals(1111L, desc.getMemStoreFlushSize());<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 testClassMethodsAreBuilderStyle() {<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    BuilderStyleTest.assertClassesAreBuilderStyle(TableDescriptorBuilder.class);<a name="line.234"></a>
-<span class="sourceLineNo">235</span>  }<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span>  @Test<a name="line.237"></a>
-<span class="sourceLineNo">238</span>  public void testModifyFamily() {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    byte[] familyName = Bytes.toBytes("cf");<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    ColumnFamilyDescriptor hcd = ColumnFamilyDescriptorBuilder.newBuilder(familyName)<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      .setBlocksize(1000).setDFSReplication((short) 3).build();<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    TableDescriptor htd = TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName()))<a name="line.242"></a>
-<span class="sourceLineNo">243</span>      .setColumnFamily(hcd).build();<a name="line.243"></a>
-<span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span>    assertEquals(1000, htd.getColumnFamily(familyName).getBlocksize());<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    assertEquals(3, htd.getColumnFamily(familyName).getDFSReplication());<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    hcd = ColumnFamilyDescriptorBuilder.newBuilder(familyName).setBlocksize(2000)<a name="line.247"></a>
-<span class="sourceLineNo">248</span>      .setDFSReplication((short) 1).build();<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    htd = TableDescriptorBuilder.newBuilder(htd).modifyColumnFamily(hcd).build();<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    assertEquals(2000, htd.getColumnFamily(familyName).getBlocksize());<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    assertEquals(1, htd.getColumnFamily(familyName).getDFSReplication());<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>  @Test(expected = IllegalArgumentException.class)<a name="line.254"></a>
-<span class="sourceLineNo">255</span>  public void testModifyInexistentFamily() {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    byte[] familyName = Bytes.toBytes("cf");<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName()))<a name="line.257"></a>
-<span class="sourceLineNo">258</span>      .modifyColumnFamily(ColumnFamilyDescriptorBuilder.of(familyName)).build();<a name="line.258"></a>
-<span class="sourceLineNo">259</span>  }<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span>  @Test(expected = IllegalArgumentException.class)<a name="line.261"></a>
-<span class="sourceLineNo">262</span>  public void testAddDuplicateFamilies() {<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    byte[] familyName = Bytes.toBytes("cf");<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    ColumnFamilyDescriptor hcd =<a name="line.264"></a>
-<span class="sourceLineNo">265</span>      ColumnFamilyDescriptorBuilder.newBuilder(familyName).setBlocksize(1000).build();<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    TableDescriptor htd = TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName()))<a name="line.266"></a>
-<span class="sourceLineNo">267</span>      .setColumnFamily(hcd).build();<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    assertEquals(1000, htd.getColumnFamily(familyName).getBlocksize());<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    hcd = ColumnFamilyDescriptorBuilder.newBuilder(familyName).setBlocksize(2000).build();<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    // add duplicate column<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    TableDescriptorBuilder.newBuilder(htd).setColumnFamily(hcd).build();<a name="line.271"></a>
-<span class="sourceLineNo">272</span>  }<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span>  @Test<a name="line.274"></a>
-<span class="sourceLineNo">275</span>  public void testPriority() {<a name="line.275"></a>
-<span class="sourceLineNo">276</span>    TableDescriptor htd = TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName()))<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      .setPriority(42).build();<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    assertEquals(42, htd.getPriority());<a name="line.278"></a>
-<span class="sourceLineNo">279</span>  }<a name="line.279"></a>
-<span class="sourceLineNo">280</span><a name="line.280"></a>
-<span class="sourceLineNo">281</span>  @Test<a name="line.281"></a>
-<span class="sourceLineNo">282</span>  public void testStringCustomizedValues() {<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    byte[] familyName = Bytes.toBytes("cf");<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    ColumnFamilyDescriptor hcd =<a name="line.284"></a>
-<span class="sourceLineNo">285</span>      ColumnFamilyDescriptorBuilder.newBuilder(familyName).setBlocksize(1000).build();<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    TableDescriptor htd = TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName()))<a name="line.286"></a>
-<span class="sourceLineNo">287</span>      .setColumnFamily(hcd).setDurability(Durability.ASYNC_WAL).build();<a name="line.287"></a>
-<span class="sourceLineNo">288</span><a name="line.288"></a>
-<span class="sourceLineNo">289</span>    assertEquals(<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      "'testStringCustomizedValues', " +<a name="line.290"></a>
-<span class="sourceLineNo">291</span>        "{TABLE_ATTRIBUTES =&gt; {DURABILITY =&gt; 'ASYNC_WAL'}}, {NAME =&gt; 'cf', BLOCKSIZE =&gt; '1000'}",<a name="line.291"></a>
-<span class="sourceLineNo">292</span>      htd.toStringCustomizedValues());<a name="line.292"></a>
-<span class="sourceLineNo">293</span>  }<a name="line.293"></a>
-<span class="sourceLineNo">294</span>}<a name="line.294"></a>
+<span class="sourceLineNo">145</span>      .anyMatch(name -&gt; name.equals(className1)));<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    assertFalse(desc.getCoprocessorDescriptors().stream().map(CoprocessorDescriptor::getClassName)<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      .anyMatch(name -&gt; name.equals(className2)));<a name="line.147"></a>
+<span class="sourceLineNo">148</span>  }<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span>  /**<a name="line.150"></a>
+<span class="sourceLineNo">151</span>   * Test that we add and remove strings from settings properly.<a name="line.151"></a>
+<span class="sourceLineNo">152</span>   */<a name="line.152"></a>
+<span class="sourceLineNo">153</span>  @Test<a name="line.153"></a>
+<span class="sourceLineNo">154</span>  public void testRemoveString() {<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    byte[] key = Bytes.toBytes("Some");<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    byte[] value = Bytes.toBytes("value");<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    TableDescriptor desc = TableDescriptorBuilder<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      .newBuilder(TableName.valueOf(name.getMethodName())).setValue(key, value).build();<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    assertTrue(Bytes.equals(value, desc.getValue(key)));<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    desc = TableDescriptorBuilder.newBuilder(desc).removeValue(key).build();<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    assertTrue(desc.getValue(key) == null);<a name="line.161"></a>
+<span class="sourceLineNo">162</span>  }<a name="line.162"></a>
+<span class="sourceLineNo">163</span><a name="line.163"></a>
+<span class="sourceLineNo">164</span>  String[] legalTableNames = { "foo", "with-dash_under.dot", "_under_start_ok",<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    "with-dash.with_underscore", "02-01-2012.my_table_01-02", "xyz._mytable_", "9_9_0.table_02",<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    "dot1.dot2.table", "new.-mytable", "with-dash.with.dot", "legal..t2", "legal..legal.t2",<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    "trailingdots..", "trailing.dots...", "ns:mytable", "ns:_mytable_", "ns:my_table_01-02" };<a name="line.167"></a>
+<span class="sourceLineNo">168</span>  String[] illegalTableNames = { ".dot_start_illegal", "-dash_start_illegal", "spaces not ok",<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    "-dash-.start_illegal", "new.table with space", "01 .table", "ns:-illegaldash",<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    "new:.illegaldot", "new:illegalcolon1:", "new:illegalcolon1:2" };<a name="line.170"></a>
+<span class="sourceLineNo">171</span><a name="line.171"></a>
+<span class="sourceLineNo">172</span>  @Test<a name="line.172"></a>
+<span class="sourceLineNo">173</span>  public void testLegalTableNames() {<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    for (String tn : legalTableNames) {<a name="line.174"></a>
+<span class="sourceLineNo">175</span>      TableName.isLegalFullyQualifiedTableName(Bytes.toBytes(tn));<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><a name="line.178"></a>
+<span class="sourceLineNo">179</span>  @Test<a name="line.179"></a>
+<span class="sourceLineNo">180</span>  public void testIllegalTableNames() {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    for (String tn : illegalTableNames) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      try {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>        TableName.isLegalFullyQualifiedTableName(Bytes.toBytes(tn));<a name="line.183"></a>
+<span class="sourceLineNo">184</span>        fail("invalid tablename " + tn + " should have failed");<a name="line.184"></a>
+<span class="sourceLineNo">185</span>      } catch (Exception e) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>        // expected<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>  }<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span>  @Test<a name="line.191"></a>
+<span class="sourceLineNo">192</span>  public void testLegalTableNamesRegex() {<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    for (String tn : legalTableNames) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span>      TableName tName = TableName.valueOf(tn);<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      assertTrue("Testing: '" + tn + "'",<a name="line.195"></a>
+<span class="sourceLineNo">196</span>        Pattern.matches(TableName.VALID_USER_TABLE_REGEX, tName.getNameAsString()));<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    }<a name="line.197"></a>
+<span class="sourceLineNo">198</span>  }<a name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span>  @Test<a name="line.200"></a>
+<span class="sourceLineNo">201</span>  public void testIllegalTableNamesRegex() {<a name="line.201"></a>
+<span class="sourceLineNo">202</span>    for (String tn : illegalTableNames) {<a name="line.202"></a>
+<span class="sourceLineNo">203</span>      LOG.info("Testing: '" + tn + "'");<a name="line.203"></a>
+<span class="sourceLineNo">204</span>      assertFalse(Pattern.matches(TableName.VALID_USER_TABLE_REGEX, tn));<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>  /**<a name="line.208"></a>
+<span class="sourceLineNo">209</span>   * Test default value handling for maxFileSize<a name="line.209"></a>
+<span class="sourceLineNo">210</span>   */<a name="line.210"></a>
+<span class="sourceLineNo">211</span>  @Test<a name="line.211"></a>
+<span class="sourceLineNo">212</span>  public void testGetMaxFileSize() {<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    TableDescriptor desc =<a name="line.213"></a>
+<span class="sourceLineNo">214</span>      TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName())).build();<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    assertEquals(-1, desc.getMaxFileSize());<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    desc = TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName()))<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      .setMaxFileSize(1111L).build();<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    assertEquals(1111L, desc.getMaxFileSize());<a name="line.218"></a>
+<span class="sourceLineNo">219</span>  }<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>   * Test default value handling for memStoreFlushSize<a name="line.222"></a>
+<span class="sourceLineNo">223</span>   */<a name="line.223"></a>
+<span class="sourceLineNo">224</span>  @Test<a name="line.224"></a>
+<span class="sourceLineNo">225</span>  public void testGetMemStoreFlushSize() {<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    TableDescriptor desc =<a name="line.226"></a>
+<span class="sourceLineNo">227</span>      TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName())).build();<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    assertEquals(-1, desc.getMemStoreFlushSize());<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    desc = TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName()))<a name="line.229"></a>
+<span class="sourceLineNo">230</span>      .setMemStoreFlushSize(1111L).build();<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    assertEquals(1111L, desc.getMemStoreFlushSize());<a name="line.231"></a>
+<span class="sourceLineNo">232</span>  }<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span>  @Test<a name="line.234"></a>
+<span class="sourceLineNo">235</span>  public void testClassMethodsAreBuilderStyle() {<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    BuilderStyleTest.assertClassesAreBuilderStyle(TableDescriptorBuilder.class);<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>  @Test<a name="line.239"></a>
+<span class="sourceLineNo">240</span>  public void testModifyFamily() {<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    byte[] familyName = Bytes.toBytes("cf");<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    ColumnFamilyDescriptor hcd = ColumnFamilyDescriptorBuilder.newBuilder(familyName)<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      .setBlocksize(1000).setDFSReplication((short) 3).build();<a name="line.243"></a>
+<span class="sourceLineNo">244</span>    TableDescriptor htd = TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName()))<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      .setColumnFamily(hcd).build();<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span>    assertEquals(1000, htd.getColumnFamily(familyName).getBlocksize());<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    assertEquals(3, htd.getColumnFamily(familyName).getDFSReplication());<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    hcd = ColumnFamilyDescriptorBuilder.newBuilder(familyName).setBlocksize(2000)<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      .setDFSReplication((short) 1).build();<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    htd = TableDescriptorBuilder.newBuilder(htd).modifyColumnFamily(hcd).build();<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    assertEquals(2000, htd.getColumnFamily(familyName).getBlocksize());<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    assertEquals(1, htd.getColumnFamily(familyName).getDFSReplication());<a name="line.253"></a>
+<span class="sourceLineNo">254</span>  }<a name="line.254"></a>
+<span class="sourceLineNo">255</span><a name="line.255"></a>
+<span class="sourceLineNo">256</span>  @Test(expected = IllegalArgumentException.class)<a name="line.256"></a>
+<span class="sourceLineNo">257</span>  public void testModifyInexistentFamily() {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    byte[] familyName = Bytes.toBytes("cf");<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName()))<a name="line.259"></a>
+<span class="sourceLineNo">260</span>      .modifyColumnFamily(ColumnFamilyDescriptorBuilder.of(familyName)).build();<a name="line.260"></a>
+<span class="sourceLineNo">261</span>  }<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span>  @Test(expected = IllegalArgumentException.class)<a name="line.263"></a>
+<span class="sourceLineNo">264</span>  public void testAddDuplicateFamilies() {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    byte[] familyName = Bytes.toBytes("cf");<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    ColumnFamilyDescriptor hcd =<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      ColumnFamilyDescriptorBuilder.newBuilder(familyName).setBlocksize(1000).build();<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    TableDescriptor htd = TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName()))<a name="line.268"></a>
+<span class="sourceLineNo">269</span>      .setColumnFamily(hcd).build();<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    assertEquals(1000, htd.getColumnFamily(familyName).getBlocksize());<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    hcd = ColumnFamilyDescriptorBuilder.newBuilder(familyName).setBlocksize(2000).build();<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    // add duplicate column<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    TableDescriptorBuilder.newBuilder(htd).setColumnFamily(hcd).build();<a name="line.273"></a>
+<span class="sourceLineNo">274</span>  }<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span>  @Test<a name="line.276"></a>
+<span class="sourceLineNo">277</span>  public void testPriority() {<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    TableDescriptor htd = TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName()))<a name="line.278"></a>
+<span class="sourceLineNo">279</span>      .setPriority(42).build();<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    assertEquals(42, htd.getPriority());<a name="line.280"></a>
+<span class="sourceLineNo">281</span>  }<a name="line.281"></a>
+<span class="sourceLineNo">282</span><a name="line.282"></a>
+<span class="sourceLineNo">283</span>  @Test<a name="line.283"></a>
+<span class="sourceLineNo">284</span>  public void testStringCustomizedValues() {<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    byte[] familyName = Bytes.toBytes("cf");<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    ColumnFamilyDescriptor hcd =<a name="line.286"></a>
+<span class="sourceLineNo">287</span>      ColumnFamilyDescriptorBuilder.newBuilder(familyName).setBlocksize(1000).build();<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    TableDescriptor htd = TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName()))<a name="line.288"></a>
+<span class="sourceLineNo">289</span>      .setColumnFamily(hcd).setDurability(Durability.ASYNC_WAL).build();<a name="line.289"></a>
+<span class="sourceLineNo">290</span><a name="line.290"></a>
+<span class="sourceLineNo">291</span>    assertEquals(<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      "'testStringCustomizedValues', " +<a name="line.292"></a>
+<span class="sourceLineNo">293</span>        "{TABLE_ATTRIBUTES =&gt; {DURABILITY =&gt; 'ASYNC_WAL'}}, {NAME =&gt; 'cf', BLOCKSIZE =&gt; '1000'}",<a name="line.293"></a>
+<span class="sourceLineNo">294</span>      htd.toStringCustomizedValues());<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>  @Test<a name="line.297"></a>
+<span class="sourceLineNo">298</span>  public void testGetSetRegionServerGroup() {<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    String groupName = name.getMethodName();<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    TableDescriptor htd = TableDescriptorBuilder.newBuilder(TableName.valueOf(name.getMethodName()))<a name="line.300"></a>
+<span class="sourceLineNo">301</span>        .setRegionServerGroup(groupName).build();<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    assertEquals(htd.getValue(RSGroupInfo.TABLE_DESC_PROP_GROUP), groupName);<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    htd = TableDescriptorBuilder.newBuilder(htd).setRegionServerGroup(null).build();<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    assertNull(htd.getValue(RSGroupInfo.TABLE_DESC_PROP_GROUP));<a name="line.304"></a>
+<span class="sourceLineNo">305</span>  }<a name="line.305"></a>
+<span class="sourceLineNo">306</span>}<a name="line.306"></a>
 
 
 
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.html
index 93d7a02..7a9a3aa 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/rsgroup/TestRSGroupsAdmin1.html
@@ -594,7 +594,42 @@
 <span class="sourceLineNo">586</span>    }<a name="line.586"></a>
 <span class="sourceLineNo">587</span><a name="line.587"></a>
 <span class="sourceLineNo">588</span>  }<a name="line.588"></a>
-<span class="sourceLineNo">589</span>}<a name="line.589"></a>
+<span class="sourceLineNo">589</span><a name="line.589"></a>
+<span class="sourceLineNo">590</span>  @Test<a name="line.590"></a>
+<span class="sourceLineNo">591</span>  public void testTableConstraint() throws Exception {<a name="line.591"></a>
+<span class="sourceLineNo">592</span>    String prefix = name.getMethodName();<a name="line.592"></a>
+<span class="sourceLineNo">593</span>    String ns = prefix + "_ns";<a name="line.593"></a>
+<span class="sourceLineNo">594</span>    TableName tableName = TableName.valueOf(ns + ":" + "t");<a name="line.594"></a>
+<span class="sourceLineNo">595</span>    String nsGroup = prefix + "_nsg";<a name="line.595"></a>
+<span class="sourceLineNo">596</span>    String tableGroup = prefix + "_tg";<a name="line.596"></a>
+<span class="sourceLineNo">597</span>    addGroup(nsGroup, 1);<a name="line.597"></a>
+<span class="sourceLineNo">598</span>    addGroup(tableGroup, 1);<a name="line.598"></a>
+<span class="sourceLineNo">599</span>    ADMIN.createNamespace(NamespaceDescriptor.create(ns).build());<a name="line.599"></a>
+<span class="sourceLineNo">600</span>    TEST_UTIL.createTable(tableName, "C");<a name="line.600"></a>
+<span class="sourceLineNo">601</span>    TEST_UTIL.waitTableAvailable(tableName);<a name="line.601"></a>
+<span class="sourceLineNo">602</span>    assertEquals(ADMIN.getRSGroup(tableName).getName(), RSGroupInfo.DEFAULT_GROUP);<a name="line.602"></a>
+<span class="sourceLineNo">603</span>    // set table's rsgroup<a name="line.603"></a>
+<span class="sourceLineNo">604</span>    TableDescriptor td = TableDescriptorBuilder.newBuilder(ADMIN.getDescriptor(tableName))<a name="line.604"></a>
+<span class="sourceLineNo">605</span>        .setRegionServerGroup(tableGroup).build();<a name="line.605"></a>
+<span class="sourceLineNo">606</span>    ADMIN.modifyTable(td);<a name="line.606"></a>
+<span class="sourceLineNo">607</span>    TEST_UTIL.waitUntilNoRegionsInTransition();<a name="line.607"></a>
+<span class="sourceLineNo">608</span>    assertEquals(ADMIN.getRSGroup(tableName).getName(), tableGroup);<a name="line.608"></a>
+<span class="sourceLineNo">609</span>    // set namespace's rsgroup<a name="line.609"></a>
+<span class="sourceLineNo">610</span>    NamespaceDescriptor nd = NamespaceDescriptor.create(ADMIN.getNamespaceDescriptor(ns))<a name="line.610"></a>
+<span class="sourceLineNo">611</span>        .addConfiguration(RSGroupInfo.NAMESPACE_DESC_PROP_GROUP, nsGroup).build();<a name="line.611"></a>
+<span class="sourceLineNo">612</span>    ADMIN.modifyNamespace(nd);<a name="line.612"></a>
+<span class="sourceLineNo">613</span>    assertEquals(ADMIN.getRSGroup(tableName).getName(), tableGroup);<a name="line.613"></a>
+<span class="sourceLineNo">614</span>    // clear table's rsgroup<a name="line.614"></a>
+<span class="sourceLineNo">615</span>    td = TableDescriptorBuilder.newBuilder(ADMIN.getDescriptor(tableName))<a name="line.615"></a>
+<span class="sourceLineNo">616</span>        .setRegionServerGroup(null).build();<a name="line.616"></a>
+<span class="sourceLineNo">617</span>    ADMIN.modifyTable(td);<a name="line.617"></a>
+<span class="sourceLineNo">618</span>    TEST_UTIL.waitUntilNoRegionsInTransition();<a name="line.618"></a>
+<span class="sourceLineNo">619</span>    assertEquals(ADMIN.getRSGroup(tableName).getName(), nsGroup);<a name="line.619"></a>
+<span class="sourceLineNo">620</span><a name="line.620"></a>
+<span class="sourceLineNo">621</span>    TEST_UTIL.deleteTable(tableName);<a name="line.621"></a>
+<span class="sourceLineNo">622</span>    ADMIN.deleteNamespace(ns);<a name="line.622"></a>
+<span class="sourceLineNo">623</span>  }<a name="line.623"></a>
+<span class="sourceLineNo">624</span>}<a name="line.624"></a>
 
 
 
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html
index 4d8921d..de301a5 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/tool/TestBulkLoadHFilesSplitRecovery.html
@@ -415,134 +415,161 @@
 <span class="sourceLineNo">407</span>    assertEquals(20, countedLqis.get());<a name="line.407"></a>
 <span class="sourceLineNo">408</span>  }<a name="line.408"></a>
 <span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span>  /**<a name="line.410"></a>
-<span class="sourceLineNo">411</span>   * This test creates a table with many small regions. The bulk load files would be splitted<a name="line.411"></a>
-<span class="sourceLineNo">412</span>   * multiple times before all of them can be loaded successfully.<a name="line.412"></a>
-<span class="sourceLineNo">413</span>   */<a name="line.413"></a>
-<span class="sourceLineNo">414</span>  @Test<a name="line.414"></a>
-<span class="sourceLineNo">415</span>  public void testSplitTmpFileCleanUp() throws Exception {<a name="line.415"></a>
-<span class="sourceLineNo">416</span>    final TableName table = TableName.valueOf(name.getMethodName());<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    byte[][] SPLIT_KEYS = new byte[][] { Bytes.toBytes("row_00000010"),<a name="line.417"></a>
-<span class="sourceLineNo">418</span>      Bytes.toBytes("row_00000020"), Bytes.toBytes("row_00000030"), Bytes.toBytes("row_00000040"),<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      Bytes.toBytes("row_00000050") };<a name="line.419"></a>
-<span class="sourceLineNo">420</span>    setupTableWithSplitkeys(table, 10, SPLIT_KEYS);<a name="line.420"></a>
+<span class="sourceLineNo">410</span>  @Test<a name="line.410"></a>
+<span class="sourceLineNo">411</span>  public void testCorrectSplitPoint() throws Exception {<a name="line.411"></a>
+<span class="sourceLineNo">412</span>    final TableName table = TableName.valueOf(name.getMethodName());<a name="line.412"></a>
+<span class="sourceLineNo">413</span>    byte[][] SPLIT_KEYS = new byte[][] { Bytes.toBytes("row_00000010"),<a name="line.413"></a>
+<span class="sourceLineNo">414</span>        Bytes.toBytes("row_00000020"), Bytes.toBytes("row_00000030"), Bytes.toBytes("row_00000040"),<a name="line.414"></a>
+<span class="sourceLineNo">415</span>        Bytes.toBytes("row_00000050"), Bytes.toBytes("row_00000060"),<a name="line.415"></a>
+<span class="sourceLineNo">416</span>        Bytes.toBytes("row_00000070") };<a name="line.416"></a>
+<span class="sourceLineNo">417</span>    setupTableWithSplitkeys(table, NUM_CFS, SPLIT_KEYS);<a name="line.417"></a>
+<span class="sourceLineNo">418</span><a name="line.418"></a>
+<span class="sourceLineNo">419</span>    final AtomicInteger bulkloadRpcTimes = new AtomicInteger();<a name="line.419"></a>
+<span class="sourceLineNo">420</span>    BulkLoadHFilesTool loader = new BulkLoadHFilesTool(util.getConfiguration()) {<a name="line.420"></a>
 <span class="sourceLineNo">421</span><a name="line.421"></a>
-<span class="sourceLineNo">422</span>    BulkLoadHFiles loader = BulkLoadHFiles.create(util.getConfiguration());<a name="line.422"></a>
-<span class="sourceLineNo">423</span><a name="line.423"></a>
-<span class="sourceLineNo">424</span>    // create HFiles<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    Path dir = buildBulkFiles(table, 2);<a name="line.425"></a>
-<span class="sourceLineNo">426</span>    loader.bulkLoad(table, dir);<a name="line.426"></a>
-<span class="sourceLineNo">427</span>    // family path<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    Path tmpPath = new Path(dir, family(0));<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    // TMP_DIR under family path<a name="line.429"></a>
-<span class="sourceLineNo">430</span>    tmpPath = new Path(tmpPath, BulkLoadHFilesTool.TMP_DIR);<a name="line.430"></a>
-<span class="sourceLineNo">431</span>    FileSystem fs = dir.getFileSystem(util.getConfiguration());<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    // HFiles have been splitted, there is TMP_DIR<a name="line.432"></a>
-<span class="sourceLineNo">433</span>    assertTrue(fs.exists(tmpPath));<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    // TMP_DIR should have been cleaned-up<a name="line.434"></a>
-<span class="sourceLineNo">435</span>    assertNull(BulkLoadHFilesTool.TMP_DIR + " should be empty.",<a name="line.435"></a>
-<span class="sourceLineNo">436</span>      CommonFSUtils.listStatus(fs, tmpPath));<a name="line.436"></a>
-<span class="sourceLineNo">437</span>    assertExpectedTable(util.getConnection(), table, ROWCOUNT, 2);<a name="line.437"></a>
-<span class="sourceLineNo">438</span>  }<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span>  /**<a name="line.440"></a>
-<span class="sourceLineNo">441</span>   * This simulates an remote exception which should cause LIHF to exit with an exception.<a name="line.441"></a>
-<span class="sourceLineNo">442</span>   */<a name="line.442"></a>
-<span class="sourceLineNo">443</span>  @Test(expected = IOException.class)<a name="line.443"></a>
-<span class="sourceLineNo">444</span>  public void testGroupOrSplitFailure() throws Exception {<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.445"></a>
-<span class="sourceLineNo">446</span>    setupTable(util.getConnection(), tableName, 10);<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    BulkLoadHFilesTool loader = new BulkLoadHFilesTool(util.getConfiguration()) {<a name="line.447"></a>
+<span class="sourceLineNo">422</span>      @Override<a name="line.422"></a>
+<span class="sourceLineNo">423</span>      protected void bulkLoadPhase(AsyncClusterConnection conn, TableName tableName,<a name="line.423"></a>
+<span class="sourceLineNo">424</span>          Deque&lt;LoadQueueItem&gt; queue, Multimap&lt;ByteBuffer, LoadQueueItem&gt; regionGroups,<a name="line.424"></a>
+<span class="sourceLineNo">425</span>          boolean copyFiles, Map&lt;LoadQueueItem, ByteBuffer&gt; item2RegionMap) throws IOException {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>        bulkloadRpcTimes.addAndGet(1);<a name="line.426"></a>
+<span class="sourceLineNo">427</span>        super.bulkLoadPhase(conn, tableName, queue, regionGroups, copyFiles, item2RegionMap);<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>    Path dir = buildBulkFiles(table, 1);<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    loader.bulkLoad(table, dir);<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    // before HBASE-25281 we need invoke bulkload rpc 8 times<a name="line.433"></a>
+<span class="sourceLineNo">434</span>    assertEquals(4, bulkloadRpcTimes.get());<a name="line.434"></a>
+<span class="sourceLineNo">435</span>  }<a name="line.435"></a>
+<span class="sourceLineNo">436</span><a name="line.436"></a>
+<span class="sourceLineNo">437</span>  /**<a name="line.437"></a>
+<span class="sourceLineNo">438</span>   * This test creates a table with many small regions. The bulk load files would be splitted<a name="line.438"></a>
+<span class="sourceLineNo">439</span>   * multiple times before all of them can be loaded successfully.<a name="line.439"></a>
+<span class="sourceLineNo">440</span>   */<a name="line.440"></a>
+<span class="sourceLineNo">441</span>  @Test<a name="line.441"></a>
+<span class="sourceLineNo">442</span>  public void testSplitTmpFileCleanUp() throws Exception {<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    final TableName table = TableName.valueOf(name.getMethodName());<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    byte[][] SPLIT_KEYS = new byte[][] { Bytes.toBytes("row_00000010"),<a name="line.444"></a>
+<span class="sourceLineNo">445</span>      Bytes.toBytes("row_00000020"), Bytes.toBytes("row_00000030"), Bytes.toBytes("row_00000040"),<a name="line.445"></a>
+<span class="sourceLineNo">446</span>      Bytes.toBytes("row_00000050") };<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    setupTableWithSplitkeys(table, 10, SPLIT_KEYS);<a name="line.447"></a>
 <span class="sourceLineNo">448</span><a name="line.448"></a>
-<span class="sourceLineNo">449</span>      private int i = 0;<a name="line.449"></a>
+<span class="sourceLineNo">449</span>    BulkLoadHFiles loader = BulkLoadHFiles.create(util.getConfiguration());<a name="line.449"></a>
 <span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span>      @Override<a name="line.451"></a>
-<span class="sourceLineNo">452</span>      protected Pair&lt;List&lt;LoadQueueItem&gt;, String&gt; groupOrSplit(AsyncClusterConnection conn,<a name="line.452"></a>
-<span class="sourceLineNo">453</span>          TableName tableName, Multimap&lt;ByteBuffer, LoadQueueItem&gt; regionGroups, LoadQueueItem item,<a name="line.453"></a>
-<span class="sourceLineNo">454</span>          List&lt;Pair&lt;byte[], byte[]&gt;&gt; startEndKeys) throws IOException {<a name="line.454"></a>
-<span class="sourceLineNo">455</span>        i++;<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span>        if (i == 5) {<a name="line.457"></a>
-<span class="sourceLineNo">458</span>          throw new IOException("failure");<a name="line.458"></a>
-<span class="sourceLineNo">459</span>        }<a name="line.459"></a>
-<span class="sourceLineNo">460</span>        return super.groupOrSplit(conn, tableName, regionGroups, item, startEndKeys);<a name="line.460"></a>
-<span class="sourceLineNo">461</span>      }<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>    // create HFiles for different column families<a name="line.464"></a>
-<span class="sourceLineNo">465</span>    Path dir = buildBulkFiles(tableName, 1);<a name="line.465"></a>
-<span class="sourceLineNo">466</span>    loader.bulkLoad(tableName, dir);<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>   * We are testing a split after initial validation but before the atomic bulk load call.<a name="line.470"></a>
-<span class="sourceLineNo">471</span>   * We cannot use presplitting to test this path, so we actually inject a<a name="line.471"></a>
-<span class="sourceLineNo">472</span>   * split just before the atomic region load. However, we will pass null item2RegionMap<a name="line.472"></a>
-<span class="sourceLineNo">473</span>   * and that should not affect the bulk load behavior.<a name="line.473"></a>
-<span class="sourceLineNo">474</span>   */<a name="line.474"></a>
-<span class="sourceLineNo">475</span>  @Test<a name="line.475"></a>
-<span class="sourceLineNo">476</span>  public void testSplitWhileBulkLoadPhaseWithoutItemMap() throws Exception {<a name="line.476"></a>
-<span class="sourceLineNo">477</span>    final TableName table = TableName.valueOf(name.getMethodName());<a name="line.477"></a>
-<span class="sourceLineNo">478</span>    setupTable(util.getConnection(), table, 10);<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    populateTable(util.getConnection(), table, 1);<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    assertExpectedTable(table, ROWCOUNT, 1);<a name="line.480"></a>
-<span class="sourceLineNo">481</span><a name="line.481"></a>
-<span class="sourceLineNo">482</span>    // Now let's cause trouble. This will occur after checks and cause bulk<a name="line.482"></a>
-<span class="sourceLineNo">483</span>    // files to fail when attempt to atomically import. This is recoverable.<a name="line.483"></a>
-<span class="sourceLineNo">484</span>    final AtomicInteger attemptedCalls = new AtomicInteger();<a name="line.484"></a>
-<span class="sourceLineNo">485</span>    BulkLoadHFilesTool loader = new BulkLoadHFilesTool(util.getConfiguration()) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span><a name="line.486"></a>
-<span class="sourceLineNo">487</span>      @Override<a name="line.487"></a>
-<span class="sourceLineNo">488</span>      protected void bulkLoadPhase(final AsyncClusterConnection conn, final TableName tableName,<a name="line.488"></a>
-<span class="sourceLineNo">489</span>        final Deque&lt;LoadQueueItem&gt; queue, final Multimap&lt;ByteBuffer, LoadQueueItem&gt; regionGroups,<a name="line.489"></a>
-<span class="sourceLineNo">490</span>        final boolean copyFiles,<a name="line.490"></a>
-<span class="sourceLineNo">491</span>        final Map&lt;LoadQueueItem, ByteBuffer&gt; item2RegionMap) throws IOException {<a name="line.491"></a>
-<span class="sourceLineNo">492</span><a name="line.492"></a>
-<span class="sourceLineNo">493</span>        int i = attemptedCalls.incrementAndGet();<a name="line.493"></a>
-<span class="sourceLineNo">494</span>        if (i == 1) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span>          // On first attempt force a split.<a name="line.495"></a>
-<span class="sourceLineNo">496</span>          forceSplit(table);<a name="line.496"></a>
-<span class="sourceLineNo">497</span>        }<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span>        // Passing item2RegionMap null<a name="line.499"></a>
-<span class="sourceLineNo">500</span>        // In the absence of LoadQueueItem, bulk load should work as expected<a name="line.500"></a>
-<span class="sourceLineNo">501</span>        super.bulkLoadPhase(conn, tableName, queue, regionGroups, copyFiles, null);<a name="line.501"></a>
-<span class="sourceLineNo">502</span>      }<a name="line.502"></a>
-<span class="sourceLineNo">503</span><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>    // create HFiles for different column families<a name="line.506"></a>
-<span class="sourceLineNo">507</span>    Path dir = buildBulkFiles(table, 2);<a name="line.507"></a>
-<span class="sourceLineNo">508</span>    loader.bulkLoad(table, dir);<a name="line.508"></a>
-<span class="sourceLineNo">509</span><a name="line.509"></a>
-<span class="sourceLineNo">510</span>    // check that data was loaded<a name="line.510"></a>
-<span class="sourceLineNo">511</span>    // The three expected attempts are 1) failure because need to split, 2)<a name="line.511"></a>
-<span class="sourceLineNo">512</span>    // load of split top 3) load of split bottom<a name="line.512"></a>
-<span class="sourceLineNo">513</span>    assertEquals(3, attemptedCalls.get());<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    assertExpectedTable(table, ROWCOUNT, 2);<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>  /**<a name="line.518"></a>
-<span class="sourceLineNo">519</span>   * Checks that all columns have the expected value and that there is the expected number of rows.<a name="line.519"></a>
-<span class="sourceLineNo">520</span>   */<a name="line.520"></a>
-<span class="sourceLineNo">521</span>  void assertExpectedTable(final Connection connection, TableName table, int count, int value)<a name="line.521"></a>
-<span class="sourceLineNo">522</span>      throws IOException {<a name="line.522"></a>
-<span class="sourceLineNo">523</span>    TableDescriptor htd = util.getAdmin().getDescriptor(table);<a name="line.523"></a>
-<span class="sourceLineNo">524</span>    assertNotNull(htd);<a name="line.524"></a>
-<span class="sourceLineNo">525</span>    try (Table t = connection.getTable(table); ResultScanner sr = t.getScanner(new Scan())) {<a name="line.525"></a>
-<span class="sourceLineNo">526</span>      int i = 0;<a name="line.526"></a>
-<span class="sourceLineNo">527</span>      for (Result r; (r = sr.next()) != null;) {<a name="line.527"></a>
-<span class="sourceLineNo">528</span>        r.getNoVersionMap().values().stream().flatMap(m -&gt; m.values().stream())<a name="line.528"></a>
-<span class="sourceLineNo">529</span>          .forEach(v -&gt; assertArrayEquals(value(value), v));<a name="line.529"></a>
-<span class="sourceLineNo">530</span>        i++;<a name="line.530"></a>
-<span class="sourceLineNo">531</span>      }<a name="line.531"></a>
-<span class="sourceLineNo">532</span>      assertEquals(count, i);<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    } catch (IOException e) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>      fail("Failed due to exception");<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>}<a name="line.537"></a>
+<span class="sourceLineNo">451</span>    // create HFiles<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    Path dir = buildBulkFiles(table, 2);<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    loader.bulkLoad(table, dir);<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    // family path<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    Path tmpPath = new Path(dir, family(0));<a name="line.455"></a>
+<span class="sourceLineNo">456</span>    // TMP_DIR under family path<a name="line.456"></a>
+<span class="sourceLineNo">457</span>    tmpPath = new Path(tmpPath, BulkLoadHFilesTool.TMP_DIR);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    FileSystem fs = dir.getFileSystem(util.getConfiguration());<a name="line.458"></a>
+<span class="sourceLineNo">459</span>    // HFiles have been splitted, there is TMP_DIR<a name="line.459"></a>
+<span class="sourceLineNo">460</span>    assertTrue(fs.exists(tmpPath));<a name="line.460"></a>
+<span class="sourceLineNo">461</span>    // TMP_DIR should have been cleaned-up<a name="line.461"></a>
+<span class="sourceLineNo">462</span>    assertNull(BulkLoadHFilesTool.TMP_DIR + " should be empty.",<a name="line.462"></a>
+<span class="sourceLineNo">463</span>      CommonFSUtils.listStatus(fs, tmpPath));<a name="line.463"></a>
+<span class="sourceLineNo">464</span>    assertExpectedTable(util.getConnection(), table, ROWCOUNT, 2);<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>   * This simulates an remote exception which should cause LIHF to exit with an exception.<a name="line.468"></a>
+<span class="sourceLineNo">469</span>   */<a name="line.469"></a>
+<span class="sourceLineNo">470</span>  @Test(expected = IOException.class)<a name="line.470"></a>
+<span class="sourceLineNo">471</span>  public void testGroupOrSplitFailure() throws Exception {<a name="line.471"></a>
+<span class="sourceLineNo">472</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    setupTable(util.getConnection(), tableName, 10);<a name="line.473"></a>
+<span class="sourceLineNo">474</span>    BulkLoadHFilesTool loader = new BulkLoadHFilesTool(util.getConfiguration()) {<a name="line.474"></a>
+<span class="sourceLineNo">475</span><a name="line.475"></a>
+<span class="sourceLineNo">476</span>      private int i = 0;<a name="line.476"></a>
+<span class="sourceLineNo">477</span><a name="line.477"></a>
+<span class="sourceLineNo">478</span>      @Override<a name="line.478"></a>
+<span class="sourceLineNo">479</span>      protected Pair&lt;List&lt;LoadQueueItem&gt;, String&gt; groupOrSplit(AsyncClusterConnection conn,<a name="line.479"></a>
+<span class="sourceLineNo">480</span>          TableName tableName, Multimap&lt;ByteBuffer, LoadQueueItem&gt; regionGroups, LoadQueueItem item,<a name="line.480"></a>
+<span class="sourceLineNo">481</span>          List&lt;Pair&lt;byte[], byte[]&gt;&gt; startEndKeys) throws IOException {<a name="line.481"></a>
+<span class="sourceLineNo">482</span>        i++;<a name="line.482"></a>
+<span class="sourceLineNo">483</span><a name="line.483"></a>
+<span class="sourceLineNo">484</span>        if (i == 5) {<a name="line.484"></a>
+<span class="sourceLineNo">485</span>          throw new IOException("failure");<a name="line.485"></a>
+<span class="sourceLineNo">486</span>        }<a name="line.486"></a>
+<span class="sourceLineNo">487</span>        return super.groupOrSplit(conn, tableName, regionGroups, item, startEndKeys);<a name="line.487"></a>
+<span class="sourceLineNo">488</span>      }<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>    // create HFiles for different column families<a name="line.491"></a>
+<span class="sourceLineNo">492</span>    Path dir = buildBulkFiles(tableName, 1);<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    loader.bulkLoad(tableName, dir);<a name="line.493"></a>
+<span class="sourceLineNo">494</span>  }<a name="line.494"></a>
+<span class="sourceLineNo">495</span><a name="line.495"></a>
+<span class="sourceLineNo">496</span>  /**<a name="line.496"></a>
+<span class="sourceLineNo">497</span>   * We are testing a split after initial validation but before the atomic bulk load call.<a name="line.497"></a>
+<span class="sourceLineNo">498</span>   * We cannot use presplitting to test this path, so we actually inject a<a name="line.498"></a>
+<span class="sourceLineNo">499</span>   * split just before the atomic region load. However, we will pass null item2RegionMap<a name="line.499"></a>
+<span class="sourceLineNo">500</span>   * and that should not affect the bulk load behavior.<a name="line.500"></a>
+<span class="sourceLineNo">501</span>   */<a name="line.501"></a>
+<span class="sourceLineNo">502</span>  @Test<a name="line.502"></a>
+<span class="sourceLineNo">503</span>  public void testSplitWhileBulkLoadPhaseWithoutItemMap() throws Exception {<a name="line.503"></a>
+<span class="sourceLineNo">504</span>    final TableName table = TableName.valueOf(name.getMethodName());<a name="line.504"></a>
+<span class="sourceLineNo">505</span>    setupTable(util.getConnection(), table, 10);<a name="line.505"></a>
+<span class="sourceLineNo">506</span>    populateTable(util.getConnection(), table, 1);<a name="line.506"></a>
+<span class="sourceLineNo">507</span>    assertExpectedTable(table, ROWCOUNT, 1);<a name="line.507"></a>
+<span class="sourceLineNo">508</span><a name="line.508"></a>
+<span class="sourceLineNo">509</span>    // Now let's cause trouble. This will occur after checks and cause bulk<a name="line.509"></a>
+<span class="sourceLineNo">510</span>    // files to fail when attempt to atomically import. This is recoverable.<a name="line.510"></a>
+<span class="sourceLineNo">511</span>    final AtomicInteger attemptedCalls = new AtomicInteger();<a name="line.511"></a>
+<span class="sourceLineNo">512</span>    BulkLoadHFilesTool loader = new BulkLoadHFilesTool(util.getConfiguration()) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span><a name="line.513"></a>
+<span class="sourceLineNo">514</span>      @Override<a name="line.514"></a>
+<span class="sourceLineNo">515</span>      protected void bulkLoadPhase(final AsyncClusterConnection conn, final TableName tableName,<a name="line.515"></a>
+<span class="sourceLineNo">516</span>        final Deque&lt;LoadQueueItem&gt; queue, final Multimap&lt;ByteBuffer, LoadQueueItem&gt; regionGroups,<a name="line.516"></a>
+<span class="sourceLineNo">517</span>        final boolean copyFiles,<a name="line.517"></a>
+<span class="sourceLineNo">518</span>        final Map&lt;LoadQueueItem, ByteBuffer&gt; item2RegionMap) throws IOException {<a name="line.518"></a>
+<span class="sourceLineNo">519</span><a name="line.519"></a>
+<span class="sourceLineNo">520</span>        int i = attemptedCalls.incrementAndGet();<a name="line.520"></a>
+<span class="sourceLineNo">521</span>        if (i == 1) {<a name="line.521"></a>
+<span class="sourceLineNo">522</span>          // On first attempt force a split.<a name="line.522"></a>
+<span class="sourceLineNo">523</span>          forceSplit(table);<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>        // Passing item2RegionMap null<a name="line.526"></a>
+<span class="sourceLineNo">527</span>        // In the absence of LoadQueueItem, bulk load should work as expected<a name="line.527"></a>
+<span class="sourceLineNo">528</span>        super.bulkLoadPhase(conn, tableName, queue, regionGroups, copyFiles, null);<a name="line.528"></a>
+<span class="sourceLineNo">529</span>      }<a name="line.529"></a>
+<span class="sourceLineNo">530</span><a name="line.530"></a>
+<span class="sourceLineNo">531</span>    };<a name="line.531"></a>
+<span class="sourceLineNo">532</span><a name="line.532"></a>
+<span class="sourceLineNo">533</span>    // create HFiles for different column families<a name="line.533"></a>
+<span class="sourceLineNo">534</span>    Path dir = buildBulkFiles(table, 2);<a name="line.534"></a>
+<span class="sourceLineNo">535</span>    loader.bulkLoad(table, dir);<a name="line.535"></a>
+<span class="sourceLineNo">536</span><a name="line.536"></a>
+<span class="sourceLineNo">537</span>    // check that data was loaded<a name="line.537"></a>
+<span class="sourceLineNo">538</span>    // The three expected attempts are 1) failure because need to split, 2)<a name="line.538"></a>
+<span class="sourceLineNo">539</span>    // load of split top 3) load of split bottom<a name="line.539"></a>
+<span class="sourceLineNo">540</span>    assertEquals(3, attemptedCalls.get());<a name="line.540"></a>
+<span class="sourceLineNo">541</span>    assertExpectedTable(table, ROWCOUNT, 2);<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><a name="line.544"></a>
+<span class="sourceLineNo">545</span>  /**<a name="line.545"></a>
+<span class="sourceLineNo">546</span>   * Checks that all columns have the expected value and that there is the expected number of rows.<a name="line.546"></a>
+<span class="sourceLineNo">547</span>   */<a name="line.547"></a>
+<span class="sourceLineNo">548</span>  void assertExpectedTable(final Connection connection, TableName table, int count, int value)<a name="line.548"></a>
+<span class="sourceLineNo">549</span>      throws IOException {<a name="line.549"></a>
+<span class="sourceLineNo">550</span>    TableDescriptor htd = util.getAdmin().getDescriptor(table);<a name="line.550"></a>
+<span class="sourceLineNo">551</span>    assertNotNull(htd);<a name="line.551"></a>
+<span class="sourceLineNo">552</span>    try (Table t = connection.getTable(table); ResultScanner sr = t.getScanner(new Scan())) {<a name="line.552"></a>
+<span class="sourceLineNo">553</span>      int i = 0;<a name="line.553"></a>
+<span class="sourceLineNo">554</span>      for (Result r; (r = sr.next()) != null;) {<a name="line.554"></a>
+<span class="sourceLineNo">555</span>        r.getNoVersionMap().values().stream().flatMap(m -&gt; m.values().stream())<a name="line.555"></a>
+<span class="sourceLineNo">556</span>          .forEach(v -&gt; assertArrayEquals(value(value), v));<a name="line.556"></a>
+<span class="sourceLineNo">557</span>        i++;<a name="line.557"></a>
+<span class="sourceLineNo">558</span>      }<a name="line.558"></a>
+<span class="sourceLineNo">559</span>      assertEquals(count, i);<a name="line.559"></a>
+<span class="sourceLineNo">560</span>    } catch (IOException e) {<a name="line.560"></a>
+<span class="sourceLineNo">561</span>      fail("Failed due to exception");<a name="line.561"></a>
+<span class="sourceLineNo">562</span>    }<a name="line.562"></a>
+<span class="sourceLineNo">563</span>  }<a name="line.563"></a>
+<span class="sourceLineNo">564</span>}<a name="line.564"></a>