You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2020/05/26 14:53:16 UTC

[hbase-site] branch asf-site updated: Published site at 852150a23f3e198e12f2948bdf732d2709cd7511.

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 8a8216b  Published site at 852150a23f3e198e12f2948bdf732d2709cd7511.
8a8216b is described below

commit 8a8216bae4604867952cc0ff35df766a6a8a79af
Author: jenkins <bu...@apache.org>
AuthorDate: Tue May 26 14:52:24 2020 +0000

    Published site at 852150a23f3e198e12f2948bdf732d2709cd7511.
---
 acid-semantics.html                                |    2 +-
 apache_hbase_reference_guide.pdf                   |    4 +-
 book.html                                          |    2 +-
 bulk-loads.html                                    |    2 +-
 checkstyle-aggregate.html                          |    2 +-
 coc.html                                           |    2 +-
 dependencies.html                                  |    2 +-
 dependency-convergence.html                        |    2 +-
 dependency-info.html                               |    2 +-
 dependency-management.html                         |    2 +-
 devapidocs/constant-values.html                    |   32 +-
 devapidocs/index-all.html                          |   10 +-
 .../apache/hadoop/hbase/backup/package-tree.html   |    4 +-
 .../apache/hadoop/hbase/client/package-tree.html   |   20 +-
 .../hadoop/hbase/coprocessor/package-tree.html     |    2 +-
 .../apache/hadoop/hbase/executor/package-tree.html |    2 +-
 .../apache/hadoop/hbase/filter/package-tree.html   |    8 +-
 .../org/apache/hadoop/hbase/http/package-tree.html |    2 +-
 .../apache/hadoop/hbase/io/hfile/package-tree.html |    8 +-
 .../org/apache/hadoop/hbase/ipc/package-tree.html  |    2 +-
 .../hadoop/hbase/mapreduce/package-tree.html       |    2 +-
 .../hbase/master/class-use/MasterServices.html     |    4 +
 .../normalizer/AbstractRegionNormalizer.html       |   79 +-
 .../hbase/master/normalizer/MergeNormalizer.html   |   50 +-
 .../SimpleRegionNormalizer.PlanComparator.html     |    6 +-
 .../master/normalizer/SimpleRegionNormalizer.html  |   29 +-
 .../apache/hadoop/hbase/master/package-tree.html   |    4 +-
 .../hbase/master/procedure/package-tree.html       |    6 +-
 .../org/apache/hadoop/hbase/package-tree.html      |   18 +-
 .../hbase/procedure2/store/wal/package-tree.html   |    2 +-
 .../apache/hadoop/hbase/quotas/package-tree.html   |    6 +-
 .../regionserver/HStore.StoreFlusherImpl.html      |   34 +-
 .../apache/hadoop/hbase/regionserver/HStore.html   |  142 +-
 .../hadoop/hbase/regionserver/package-tree.html    |   14 +-
 .../regionserver/querymatcher/package-tree.html    |    2 +-
 .../hadoop/hbase/replication/package-tree.html     |    2 +-
 .../hadoop/hbase/rest/model/package-tree.html      |    2 +-
 .../hadoop/hbase/security/access/package-tree.html |    8 +-
 .../apache/hadoop/hbase/security/package-tree.html |    2 +-
 .../apache/hadoop/hbase/thrift/package-tree.html   |    2 +-
 .../org/apache/hadoop/hbase/util/package-tree.html |    8 +-
 .../org/apache/hadoop/hbase/wal/package-tree.html  |    2 +-
 .../src-html/org/apache/hadoop/hbase/Version.html  |    4 +-
 .../normalizer/AbstractRegionNormalizer.html       |  436 +++---
 .../hbase/master/normalizer/MergeNormalizer.html   |   22 +-
 .../SimpleRegionNormalizer.PlanComparator.html     |  175 ++-
 .../master/normalizer/SimpleRegionNormalizer.html  |  175 ++-
 .../regionserver/HStore.StoreFlusherImpl.html      | 1463 ++++++++++----------
 .../apache/hadoop/hbase/regionserver/HStore.html   | 1463 ++++++++++----------
 downloads.html                                     |   18 +-
 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                      |    2 +
 .../hadoop/hbase/chaos/actions/package-tree.html   |    2 +-
 .../apache/hadoop/hbase/io/hfile/package-tree.html |    2 +-
 .../normalizer/TestSimpleRegionNormalizer.html     |   74 +-
 .../org/apache/hadoop/hbase/package-tree.html      |   12 +-
 .../hadoop/hbase/procedure2/package-tree.html      |    4 +-
 .../hadoop/hbase/regionserver/package-tree.html    |    4 +-
 .../org/apache/hadoop/hbase/test/package-tree.html |    4 +-
 .../org/apache/hadoop/hbase/wal/package-tree.html  |    4 +-
 .../normalizer/TestSimpleRegionNormalizer.html     | 1125 +++++++--------
 79 files changed, 2851 insertions(+), 2712 deletions(-)

diff --git a/acid-semantics.html b/acid-semantics.html
index f68639b..d706492 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 6382d4a..22af5f6 100644
--- a/apache_hbase_reference_guide.pdf
+++ b/apache_hbase_reference_guide.pdf
@@ -5,8 +5,8 @@
 /Author (Apache HBase Team)
 /Creator (Asciidoctor PDF 1.5.0.rc.2, based on Prawn 2.2.2)
 /Producer (Apache HBase Team)
-/ModDate (D:20200525143355+00'00')
-/CreationDate (D:20200525144509+00'00')
+/ModDate (D:20200526143335+00'00')
+/CreationDate (D:20200526144826+00'00')
 >>
 endobj
 2 0 obj
diff --git a/book.html b/book.html
index 6149dc8..ed5fd68 100644
--- a/book.html
+++ b/book.html
@@ -45348,7 +45348,7 @@ org/apache/hadoop/hbase/security/access/AccessControlClient.revoke:(Lorg/apache/
 <div id="footer">
 <div id="footer-text">
 Version 3.0.0-SNAPSHOT<br>
-Last updated 2020-05-25 14:33:55 UTC
+Last updated 2020-05-26 14:33:35 UTC
 </div>
 </div>
 <script type="text/x-mathjax-config">
diff --git a/bulk-loads.html b/bulk-loads.html
index fb0f247..3b975b7 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 a6c126c..0825fed 100644
--- a/checkstyle-aggregate.html
+++ b/checkstyle-aggregate.html
@@ -79305,7 +79305,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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 5e6c955..cce27dc 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 f1ea11b..d074f25 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 da4a052..ece4bcd 100644
--- a/dependency-convergence.html
+++ b/dependency-convergence.html
@@ -788,7 +788,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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 b6f4461..c671a4b 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 f1a799f..5b545a2 100644
--- a/dependency-management.html
+++ b/dependency-management.html
@@ -1096,7 +1096,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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/devapidocs/constant-values.html b/devapidocs/constant-values.html
index 1292f54..447372c 100644
--- a/devapidocs/constant-values.html
+++ b/devapidocs/constant-values.html
@@ -4172,14 +4172,14 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
 <td><code><a href="org/apache/hadoop/hbase/Version.html#date">date</a></code></td>
-<td class="colLast"><code>"Mon May 25 14:41:26 UTC 2020"</code></td>
+<td class="colLast"><code>"Tue May 26 14:41:30 UTC 2020"</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="org.apache.hadoop.hbase.Version.revision">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&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></code></td>
 <td><code><a href="org/apache/hadoop/hbase/Version.html#revision">revision</a></code></td>
-<td class="colLast"><code>"285e59af258d9e840cf8e5d7169eb3b813558401"</code></td>
+<td class="colLast"><code>"852150a23f3e198e12f2948bdf732d2709cd7511"</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="org.apache.hadoop.hbase.Version.srcChecksum">
@@ -16926,6 +16926,34 @@
 <ul class="blockList">
 <li class="blockList">
 <table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
+<caption><span>org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html" title="class in org.apache.hadoop.hbase.master.normalizer">AbstractRegionNormalizer</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th scope="col">Constant Field</th>
+<th class="colLast" scope="col">Value</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><a name="org.apache.hadoop.hbase.master.normalizer.AbstractRegionNormalizer.HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_DEFAULT">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&nbsp;int</code></td>
+<td><code><a href="org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_DEFAULT">HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_DEFAULT</a></code></td>
+<td class="colLast"><code>3</code></td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><a name="org.apache.hadoop.hbase.master.normalizer.AbstractRegionNormalizer.HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_KEY">
+<!--   -->
+</a><code>public&nbsp;static&nbsp;final&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></code></td>
+<td><code><a href="org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_KEY">HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_KEY</a></code></td>
+<td class="colLast"><code>"hbase.normalizer.min.region.count"</code></td>
+</tr>
+</tbody>
+</table>
+</li>
+</ul>
+<ul class="blockList">
+<li class="blockList">
+<table class="constantsSummary" border="0" cellpadding="3" cellspacing="0" summary="Constant Field Values table, listing constant fields, and values">
 <caption><span>org.apache.hadoop.hbase.master.procedure.<a href="org/apache/hadoop/hbase/master/procedure/MasterProcedureConstants.html" title="class in org.apache.hadoop.hbase.master.procedure">MasterProcedureConstants</a></span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
diff --git a/devapidocs/index-all.html b/devapidocs/index-all.html
index 8e686bd..c9718c8 100644
--- a/devapidocs/index-all.html
+++ b/devapidocs/index-all.html
@@ -59207,6 +59207,10 @@
 <dd>
 <div class="block">Directories that are not HBase table directories</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_DEFAULT">HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_DEFAULT</a></span> - Static variable in class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html" title="class in org.apache.hadoop.hbase.master.normalizer">AbstractRegionNormalizer</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_KEY">HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_KEY</a></span> - Static variable in class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html" title="class in org.apache.hadoop.hbase.master.normalizer">AbstractRegionNormalizer</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/regionserver/CompactSplit.html#HBASE_REGION_SERVER_ENABLE_COMPACTION">HBASE_REGION_SERVER_ENABLE_COMPACTION</a></span> - Static variable in class org.apache.hadoop.hbase.regionserver.<a href="org/apache/hadoop/hbase/regionserver/CompactSplit.html" title="class in org.apache.hadoop.hbase.regionserver">CompactSplit</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/HConstants.html#HBASE_REGION_SPLIT_POLICY_KEY">HBASE_REGION_SPLIT_POLICY_KEY</a></span> - Static variable in class org.apache.hadoop.hbase.<a href="org/apache/hadoop/hbase/HConstants.html" title="class in org.apache.hadoop.hbase">HConstants</a></dt>
@@ -79000,9 +79004,7 @@
 &nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html#minRegionAge">minRegionAge</a></span> - Variable in class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html" title="class in org.apache.hadoop.hbase.master.normalizer">MergeNormalizer</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html#minRegionCount">minRegionCount</a></span> - Variable in class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html" title="class in org.apache.hadoop.hbase.master.normalizer">MergeNormalizer</a></dt>
-<dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#minRegionCount">minRegionCount</a></span> - Variable in class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html" title="class in org.apache.hadoop.hbase.master.normalizer">SimpleRegionNormalizer</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#minRegionCount">minRegionCount</a></span> - Variable in class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html" title="class in org.apache.hadoop.hbase.master.normalizer">AbstractRegionNormalizer</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/AssignmentVerificationReport.html#minRegionsOnRS">minRegionsOnRS</a></span> - Variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/AssignmentVerificationReport.html" title="class in org.apache.hadoop.hbase.master">AssignmentVerificationReport</a></dt>
 <dd>&nbsp;</dd>
@@ -108405,6 +108407,8 @@ service.</div>
 <dd>
 <div class="block">Set the master service.</div>
 </dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html#setMasterServices-org.apache.hadoop.hbase.master.MasterServices-">setMasterServices(MasterServices)</a></span> - Method in class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html" title="class in org.apache.hadoop.hbase.master.normalizer">MergeNormalizer</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/RegionNormalizer.html#setMasterServices-org.apache.hadoop.hbase.master.MasterServices-">setMasterServices(MasterServices)</a></span> - Method in interface org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/RegionNormalizer.html" title="interface in org.apache.hadoop.hbase.master.normalizer">RegionNormalizer</a></dt>
 <dd>
 <div class="block">Set the master service.</div>
diff --git a/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html b/devapidocs/org/apache/hadoop/hbase/backup/package-tree.html
index 45c4b6a..e98b5a1 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/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>
 <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>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
index ff2746b..6f0b7ac 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/package-tree.html
@@ -434,22 +434,22 @@
 <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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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.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>
 </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 db38cd2..46638ef 100644
--- a/devapidocs/org/apache/hadoop/hbase/coprocessor/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/coprocessor/package-tree.html
@@ -197,8 +197,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 67ed7c1..18898b8 100644
--- a/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/filter/package-tree.html
@@ -190,13 +190,13 @@
 <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.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/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/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.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/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/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/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/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.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/FuzzyRowFilter.SatisfiesCode.html" title="enum in org.apache.hadoop.hbase.filter"><span class="typeNameLink">FuzzyRowFilter.SatisfiesCode</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 8d9078c..325483e 100644
--- a/devapidocs/org/apache/hadoop/hbase/http/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/http/package-tree.html
@@ -140,8 +140,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.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.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/ProfileServlet.Output.html" title="enum in org.apache.hadoop.hbase.http"><span class="typeNameLink">ProfileServlet.Output</span></a></li>
 </ul>
 </li>
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 3a15102..c9958e2 100644
--- a/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/io/hfile/package-tree.html
@@ -305,12 +305,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/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/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>
 <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/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/BlockType.html" title="enum in org.apache.hadoop.hbase.io.hfile"><span class="typeNameLink">BlockType</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 33d69d6..1896f86 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/BufferCallBeforeInitHandler.BufferCallAction.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">BufferCallBeforeInitHandler.BufferCallAction</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/CallEvent.Type.html" title="enum in org.apache.hadoop.hbase.ipc"><span class="typeNameLink">CallEvent.Type</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 1684038..d7ec268 100644
--- a/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/mapreduce/package-tree.html
@@ -297,9 +297,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.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/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/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/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/RowCounter.RowCounterMapper.Counters.html" title="enum in org.apache.hadoop.hbase.mapreduce"><span class="typeNameLink">RowCounter.RowCounterMapper.Counters</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/master/class-use/MasterServices.html b/devapidocs/org/apache/hadoop/hbase/master/class-use/MasterServices.html
index cd48cb1..235b9e1 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/class-use/MasterServices.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/class-use/MasterServices.html
@@ -691,6 +691,10 @@
 <div class="block">Set the master service.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><span class="typeNameLabel">MergeNormalizer.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html#setMasterServices-org.apache.hadoop.hbase.master.MasterServices-">setMasterServices</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a>&nbsp;masterServices)</code>&nbsp;</td>
+</tr>
 </tbody>
 </table>
 </li>
diff --git a/devapidocs/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html b/devapidocs/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html
index 1fb3b9e..2532fbd 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html
@@ -118,7 +118,7 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>@InterfaceAudience.Private
-public abstract class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.43">AbstractRegionNormalizer</a>
+public abstract class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.44">AbstractRegionNormalizer</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
 implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/RegionNormalizer.html" title="interface in org.apache.hadoop.hbase.master.normalizer">RegionNormalizer</a></pre>
 </li>
@@ -140,6 +140,14 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <th class="colLast" scope="col">Field and Description</th>
 </tr>
 <tr class="altColor">
+<td class="colFirst"><code>static int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_DEFAULT">HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_DEFAULT</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <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/master/normalizer/AbstractRegionNormalizer.html#HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_KEY">HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_KEY</a></span></code>&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><code>private static org.slf4j.Logger</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#LOG">LOG</a></span></code>&nbsp;</td>
 </tr>
@@ -151,6 +159,10 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <td class="colFirst"><code>protected <a href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#masterServices">masterServices</a></span></code>&nbsp;</td>
 </tr>
+<tr class="rowColor">
+<td class="colFirst"><code>protected int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#minRegionCount">minRegionCount</a></span></code>&nbsp;</td>
+</tr>
 </table>
 </li>
 </ul>
@@ -272,7 +284,33 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <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/master/normalizer/AbstractRegionNormalizer.html#line.44">LOG</a></pre>
+<pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.45">LOG</a></pre>
+</li>
+</ul>
+<a name="HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_KEY">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_KEY</h4>
+<pre>public static final&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> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.47">HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_KEY</a></pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../constant-values.html#org.apache.hadoop.hbase.master.normalizer.AbstractRegionNormalizer.HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_KEY">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+<a name="HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_DEFAULT">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_DEFAULT</h4>
+<pre>public static final&nbsp;int <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.49">HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_DEFAULT</a></pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../constant-values.html#org.apache.hadoop.hbase.master.normalizer.AbstractRegionNormalizer.HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_DEFAULT">Constant Field Values</a></dd>
+</dl>
 </li>
 </ul>
 <a name="masterServices">
@@ -281,16 +319,25 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <ul class="blockList">
 <li class="blockList">
 <h4>masterServices</h4>
-<pre>protected&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.45">masterServices</a></pre>
+<pre>protected&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.51">masterServices</a></pre>
 </li>
 </ul>
 <a name="masterRpcServices">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>masterRpcServices</h4>
-<pre>protected&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.html" title="class in org.apache.hadoop.hbase.master">MasterRpcServices</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.46">masterRpcServices</a></pre>
+<pre>protected&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.html" title="class in org.apache.hadoop.hbase.master">MasterRpcServices</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.52">masterRpcServices</a></pre>
+</li>
+</ul>
+<a name="minRegionCount">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>minRegionCount</h4>
+<pre>protected&nbsp;int <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.53">minRegionCount</a></pre>
 </li>
 </ul>
 </li>
@@ -307,7 +354,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <ul class="blockListLast">
 <li class="blockList">
 <h4>AbstractRegionNormalizer</h4>
-<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.43">AbstractRegionNormalizer</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.44">AbstractRegionNormalizer</a>()</pre>
 </li>
 </ul>
 </li>
@@ -324,7 +371,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <ul class="blockList">
 <li class="blockList">
 <h4>setMasterServices</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.53">setMasterServices</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a>&nbsp;masterServices)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.60">setMasterServices</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a>&nbsp;masterServices)</pre>
 <div class="block">Set the master service.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -340,7 +387,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <ul class="blockList">
 <li class="blockList">
 <h4>setMasterRpcServices</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.58">setMasterRpcServices</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.html" title="class in org.apache.hadoop.hbase.master">MasterRpcServices</a>&nbsp;masterRpcServices)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.68">setMasterRpcServices</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/MasterRpcServices.html" title="class in org.apache.hadoop.hbase.master">MasterRpcServices</a>&nbsp;masterRpcServices)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/RegionNormalizer.html#setMasterRpcServices-org.apache.hadoop.hbase.master.MasterRpcServices-">RegionNormalizer</a></code></span></div>
 <div class="block">Set the master RPC service. Must be called before first call to
  <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/RegionNormalizer.html#computePlanForTable-org.apache.hadoop.hbase.TableName-"><code>RegionNormalizer.computePlanForTable(TableName)</code></a>.</div>
@@ -358,7 +405,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <ul class="blockList">
 <li class="blockList">
 <h4>getRegionSize</h4>
-<pre>protected&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.66">getRegionSize</a>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;hri)</pre>
+<pre>protected&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.76">getRegionSize</a>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;hri)</pre>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>hri</code> - regioninfo</dd>
@@ -373,7 +420,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <ul class="blockList">
 <li class="blockList">
 <h4>isMergeEnabled</h4>
-<pre>protected&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.78">isMergeEnabled</a>()</pre>
+<pre>protected&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.88">isMergeEnabled</a>()</pre>
 </li>
 </ul>
 <a name="isSplitEnabled--">
@@ -382,7 +429,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <ul class="blockList">
 <li class="blockList">
 <h4>isSplitEnabled</h4>
-<pre>protected&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.91">isSplitEnabled</a>()</pre>
+<pre>protected&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.101">isSplitEnabled</a>()</pre>
 </li>
 </ul>
 <a name="getAverageRegionSize-java.util.List-">
@@ -391,7 +438,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <ul class="blockList">
 <li class="blockList">
 <h4>getAverageRegionSize</h4>
-<pre>protected&nbsp;double&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.110">getAverageRegionSize</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/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&gt;&nbsp;tableRegions)</pre>
+<pre>protected&nbsp;double&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.120">getAverageRegionSize</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/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&gt;&nbsp;tableRegions)</pre>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>tableRegions</code> - regions of table to normalize</dd>
@@ -408,7 +455,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <ul class="blockList">
 <li class="blockList">
 <h4>skipForMerge</h4>
-<pre>private static&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.155">skipForMerge</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/RegionState.html" title="class in org.apache.hadoop.hbase.master">RegionState</a>&nbsp;state)</pre>
+<pre>private static&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.165">skipForMerge</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/RegionState.html" title="class in org.apache.hadoop.hbase.master">RegionState</a>&nbsp;state)</pre>
 <div class="block">Determine if a region in <a href="../../../../../../org/apache/hadoop/hbase/master/RegionState.html" title="class in org.apache.hadoop.hbase.master"><code>RegionState</code></a> should be considered for a merge operation.</div>
 </li>
 </ul>
@@ -418,7 +465,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <ul class="blockList">
 <li class="blockList">
 <h4>getMergeNormalizationPlan</h4>
-<pre>protected&nbsp;<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/master/normalizer/NormalizationPlan.html" title="interface in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.165">getMergeNormalizationPlan< [...]
+<pre>protected&nbsp;<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/master/normalizer/NormalizationPlan.html" title="interface in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.175">getMergeNormalizationPlan< [...]
 <div class="block">Computes the merge plans that should be executed for this table to converge average region
  towards target average or target region count</div>
 <dl>
@@ -435,7 +482,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <ul class="blockList">
 <li class="blockList">
 <h4>skipForSplit</h4>
-<pre>private static&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.207">skipForSplit</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/RegionState.html" title="class in org.apache.hadoop.hbase.master">RegionState</a>&nbsp;state)</pre>
+<pre>private static&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.217">skipForSplit</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/RegionState.html" title="class in org.apache.hadoop.hbase.master">RegionState</a>&nbsp;state)</pre>
 <div class="block">Determine if a region in <a href="../../../../../../org/apache/hadoop/hbase/master/RegionState.html" title="class in org.apache.hadoop.hbase.master"><code>RegionState</code></a> should be considered for a split operation.</div>
 </li>
 </ul>
@@ -445,7 +492,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getSplitNormalizationPlan</h4>
-<pre>protected&nbsp;<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/master/normalizer/NormalizationPlan.html" title="interface in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.217">getSplitNormalizationPlan< [...]
+<pre>protected&nbsp;<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/master/normalizer/NormalizationPlan.html" title="interface in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#line.227">getSplitNormalizationPlan< [...]
 <div class="block">Computes the split plans that should be executed for this table to converge average region size
  towards target average or target region count</div>
 <dl>
diff --git a/devapidocs/org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html b/devapidocs/org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html
index c4c78bb..497a2d6 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10};
+var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -173,10 +173,6 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/Abs
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html#minRegionAge">minRegionAge</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><code>private int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html#minRegionCount">minRegionCount</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>private static long[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html#skippedCount">skippedCount</a></span></code>&nbsp;</td>
 </tr>
@@ -186,7 +182,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/Abs
 <!--   -->
 </a>
 <h3>Fields inherited from class&nbsp;org.apache.hadoop.hbase.master.normalizer.<a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html" title="class in org.apache.hadoop.hbase.master.normalizer">AbstractRegionNormalizer</a></h3>
-<code><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#masterRpcServices">masterRpcServices</a>, <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#masterServices">masterServices</a></code></li>
+<code><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_DEFAULT">HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_DEFAULT</a>, <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_KEY">HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_KEY</a>, <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNorma [...]
 </ul>
 </li>
 </ul>
@@ -242,6 +238,12 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/Abs
 </td>
 </tr>
 <tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html#setMasterServices-org.apache.hadoop.hbase.master.MasterServices-">setMasterServices</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a>&nbsp;masterServices)</code>
+<div class="block">Set the master service.</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code>private boolean</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html#shouldNormalize-org.apache.hadoop.hbase.TableName-">shouldNormalize</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;table)</code>&nbsp;</td>
 </tr>
@@ -251,7 +253,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/Abs
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.hadoop.hbase.master.normalizer.<a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html" title="class in org.apache.hadoop.hbase.master.normalizer">AbstractRegionNormalizer</a></h3>
-<code><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#getAverageRegionSize-java.util.List-">getAverageRegionSize</a>, <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#getMergeNormalizationPlan-org.apache.hadoop.hbase.TableName-">getMergeNormalizationPlan</a>, <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#getRegionSize-org.apache.hadoop. [...]
+<code><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#getAverageRegionSize-java.util.List-">getAverageRegionSize</a>, <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#getMergeNormalizationPlan-org.apache.hadoop.hbase.TableName-">getMergeNormalizationPlan</a>, <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#getRegionSize-org.apache.hadoop. [...]
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
@@ -283,22 +285,13 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/Abs
 <pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html#line.64">LOG</a></pre>
 </li>
 </ul>
-<a name="minRegionCount">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>minRegionCount</h4>
-<pre>private&nbsp;int <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html#line.66">minRegionCount</a></pre>
-</li>
-</ul>
 <a name="minRegionAge">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>minRegionAge</h4>
-<pre>private&nbsp;int <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html#line.67">minRegionAge</a></pre>
+<pre>private&nbsp;int <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html#line.66">minRegionAge</a></pre>
 </li>
 </ul>
 <a name="skippedCount">
@@ -307,7 +300,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/Abs
 <ul class="blockListLast">
 <li class="blockList">
 <h4>skippedCount</h4>
-<pre>private static&nbsp;long[] <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html#line.68">skippedCount</a></pre>
+<pre>private static&nbsp;long[] <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html#line.67">skippedCount</a></pre>
 </li>
 </ul>
 </li>
@@ -324,7 +317,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/Abs
 <ul class="blockListLast">
 <li class="blockList">
 <h4>MergeNormalizer</h4>
-<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html#line.70">MergeNormalizer</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html#line.63">MergeNormalizer</a>()</pre>
 </li>
 </ul>
 </li>
@@ -335,6 +328,25 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/Abs
 <!--   -->
 </a>
 <h3>Method Detail</h3>
+<a name="setMasterServices-org.apache.hadoop.hbase.master.MasterServices-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setMasterServices</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html#line.70">setMasterServices</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a>&nbsp;masterServices)</pre>
+<div class="block"><span class="descfrmTypeLabel">Description copied from class:&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#setMasterServices-org.apache.hadoop.hbase.master.MasterServices-">AbstractRegionNormalizer</a></code></span></div>
+<div class="block">Set the master service.</div>
+<dl>
+<dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
+<dd><code><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/RegionNormalizer.html#setMasterServices-org.apache.hadoop.hbase.master.MasterServices-">setMasterServices</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/RegionNormalizer.html" title="interface in org.apache.hadoop.hbase.master.normalizer">RegionNormalizer</a></code></dd>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#setMasterServices-org.apache.hadoop.hbase.master.MasterServices-">setMasterServices</a></code>&nbsp;in class&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html" title="class in org.apache.hadoop.hbase.master.normalizer">AbstractRegionNormalizer</a></code></dd>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>masterServices</code> - inject instance of MasterServices</dd>
+</dl>
+</li>
+</ul>
 <a name="planSkipped-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.master.normalizer.NormalizationPlan.PlanType-">
 <!--   -->
 </a>
diff --git a/devapidocs/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.PlanComparator.html b/devapidocs/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.PlanComparator.html
index e9d97a6..0ceb3f8 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.PlanComparator.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.PlanComparator.html
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>static class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.74">SimpleRegionNormalizer.PlanComparator</a>
+<pre>static class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.69">SimpleRegionNormalizer.PlanComparator</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
 implements <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Comparator.html?is-external=true" title="class or interface in java.util">Comparator</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.html" title="interface in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan</a>&gt;</pre>
 <div class="block">Comparator class that gives higher priority to region Split plan.</div>
@@ -196,7 +196,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Comparat
 <ul class="blockListLast">
 <li class="blockList">
 <h4>PlanComparator</h4>
-<pre><a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.PlanComparator.html#line.74">PlanComparator</a>()</pre>
+<pre><a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.PlanComparator.html#line.69">PlanComparator</a>()</pre>
 </li>
 </ul>
 </li>
@@ -213,7 +213,7 @@ implements <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Comparat
 <ul class="blockListLast">
 <li class="blockList">
 <h4>compare</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.PlanComparator.html#line.76">compare</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.html" title="interface in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan</a>&nbsp;plan1,
+<pre>public&nbsp;int&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.PlanComparator.html#line.71">compare</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.html" title="interface in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan</a>&nbsp;plan1,
                    <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.html" title="interface in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan</a>&nbsp;plan2)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
diff --git a/devapidocs/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html b/devapidocs/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html
index 11170c4..66f69a8 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html
@@ -179,14 +179,10 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/Abs
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#LOG">LOG</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>private int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#minRegionCount">minRegionCount</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><code>private <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Comparator.html?is-external=true" title="class or interface in java.util">Comparator</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.html" title="interface in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan</a>&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#planComparator">planComparator</a></span></code>&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private static long[]</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#skippedCount">skippedCount</a></span></code>&nbsp;</td>
 </tr>
@@ -196,7 +192,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/Abs
 <!--   -->
 </a>
 <h3>Fields inherited from class&nbsp;org.apache.hadoop.hbase.master.normalizer.<a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html" title="class in org.apache.hadoop.hbase.master.normalizer">AbstractRegionNormalizer</a></h3>
-<code><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#masterRpcServices">masterRpcServices</a>, <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#masterServices">masterServices</a></code></li>
+<code><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_DEFAULT">HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_DEFAULT</a>, <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html#HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_KEY">HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_KEY</a>, <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/AbstractRegionNorma [...]
 </ul>
 </li>
 </ul>
@@ -285,22 +281,13 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/Abs
 <pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.53">LOG</a></pre>
 </li>
 </ul>
-<a name="minRegionCount">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>minRegionCount</h4>
-<pre>private&nbsp;int <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.54">minRegionCount</a></pre>
-</li>
-</ul>
 <a name="skippedCount">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>skippedCount</h4>
-<pre>private static&nbsp;long[] <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.55">skippedCount</a></pre>
+<pre>private static&nbsp;long[] <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.54">skippedCount</a></pre>
 </li>
 </ul>
 <a name="planComparator">
@@ -309,7 +296,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/Abs
 <ul class="blockListLast">
 <li class="blockList">
 <h4>planComparator</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Comparator.html?is-external=true" title="class or interface in java.util">Comparator</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.html" title="interface in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.91">planComparator</a></pre>
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Comparator.html?is-external=true" title="class or interface in java.util">Comparator</a>&lt;<a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.html" title="interface in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.86">planComparator</a></pre>
 </li>
 </ul>
 </li>
@@ -326,7 +313,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/Abs
 <ul class="blockListLast">
 <li class="blockList">
 <h4>SimpleRegionNormalizer</h4>
-<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.57">SimpleRegionNormalizer</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.51">SimpleRegionNormalizer</a>()</pre>
 </li>
 </ul>
 </li>
@@ -343,7 +330,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/Abs
 <ul class="blockList">
 <li class="blockList">
 <h4>planSkipped</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.62">planSkipped</a>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;hri,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.57">planSkipped</a>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;hri,
                         <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.PlanType.html" title="enum in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan.PlanType</a>&nbsp;type)</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/RegionNormalizer.html#planSkipped-org.apache.hadoop.hbase.client.RegionInfo-org.apache.hadoop.hbase.master.normalizer.NormalizationPlan.PlanType-">RegionNormalizer</a></code></span></div>
 <div class="block">Notification for the case where plan couldn't be executed due to constraint violation, such as
@@ -361,7 +348,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/Abs
 <ul class="blockList">
 <li class="blockList">
 <h4>getSkippedCount</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.67">getSkippedCount</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.PlanType.html" title="enum in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan.PlanType</a>&nbsp;type)</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.62">getSkippedCount</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.PlanType.html" title="enum in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan.PlanType</a>&nbsp;type)</pre>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>type</code> - type of plan for which skipped count is to be returned</dd>
@@ -376,7 +363,7 @@ extends <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/Abs
 <ul class="blockListLast">
 <li class="blockList">
 <h4>computePlanForTable</h4>
-<pre>public&nbsp;<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/master/normalizer/NormalizationPlan.html" title="interface in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.100">computePlanForTable</a>(<a href [...]
+<pre>public&nbsp;<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/master/normalizer/NormalizationPlan.html" title="interface in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.95">computePlanForTable</a>(<a href= [...]
                                             throws <a href="../../../../../../org/apache/hadoop/hbase/HBaseIOException.html" title="class in org.apache.hadoop.hbase">HBaseIOException</a></pre>
 <div class="block">Computes next most "urgent" normalization action on the table. Action may be either a split, or
  a merge, or no action.</div>
diff --git a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
index 755ce7d..93466e1 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/package-tree.html
@@ -355,13 +355,13 @@
 <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/SplitLogManager.TerminationStatus.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">SplitLogManager.TerminationStatus</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/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/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/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/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/RegionState.State.html" title="enum in org.apache.hadoop.hbase.master"><span class="typeNameLink">RegionState.State</span></a></li>
 </ul>
 </li>
 </ul>
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 4e9bb87..382b1e5 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/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/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/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/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>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/package-tree.html b/devapidocs/org/apache/hadoop/hbase/package-tree.html
index 39f5929..9eaff4f 100644
--- a/devapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -429,19 +429,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/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/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/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/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/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/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/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/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/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/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/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/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/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/MetaTableAccessor.QueryType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">MetaTableAccessor.QueryType</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/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/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/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/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/Coprocessor.State.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">Coprocessor.State</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/procedure2/store/wal/package-tree.html b/devapidocs/org/apache/hadoop/hbase/procedure2/store/wal/package-tree.html
index 7b64815..2525a0e 100644
--- a/devapidocs/org/apache/hadoop/hbase/procedure2/store/wal/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/procedure2/store/wal/package-tree.html
@@ -133,8 +133,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.procedure2.store.wal.<a href="../../../../../../../org/apache/hadoop/hbase/procedure2/store/wal/ProcedureStoreTracker.DeleteState.html" title="enum in org.apache.hadoop.hbase.procedure2.store.wal"><span class="typeNameLink">ProcedureStoreTracker.DeleteState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.store.wal.<a href="../../../../../../../org/apache/hadoop/hbase/procedure2/store/wal/WALProcedureStore.PushType.html" title="enum in org.apache.hadoop.hbase.procedure2.store.wal"><span class="typeNameLink">WALProcedureStore.PushType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.store.wal.<a href="../../../../../../../org/apache/hadoop/hbase/procedure2/store/wal/ProcedureStoreTracker.DeleteState.html" title="enum in org.apache.hadoop.hbase.procedure2.store.wal"><span class="typeNameLink">ProcedureStoreTracker.DeleteState</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 43be839..c3e98ad 100644
--- a/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/quotas/package-tree.html
@@ -240,12 +240,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.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/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/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/QuotaType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">QuotaType</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/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/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/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/QuotaType.html" title="enum in org.apache.hadoop.hbase.quotas"><span class="typeNameLink">QuotaType</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html b/devapidocs/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html
index a2492c7..638ca4d 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>private final class <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2375">HStore.StoreFlusherImpl</a>
+<pre>private final class <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2370">HStore.StoreFlusherImpl</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a>
 implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlushContext.html" title="interface in org.apache.hadoop.hbase.regionserver">StoreFlushContext</a></pre>
 </li>
@@ -279,7 +279,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlu
 <ul class="blockList">
 <li class="blockList">
 <h4>tracker</h4>
-<pre>private final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/FlushLifeCycleTracker.html" title="interface in org.apache.hadoop.hbase.regionserver">FlushLifeCycleTracker</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2377">tracker</a></pre>
+<pre>private final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/FlushLifeCycleTracker.html" title="interface in org.apache.hadoop.hbase.regionserver">FlushLifeCycleTracker</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2372">tracker</a></pre>
 </li>
 </ul>
 <a name="cacheFlushSeqNum">
@@ -288,7 +288,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlu
 <ul class="blockList">
 <li class="blockList">
 <h4>cacheFlushSeqNum</h4>
-<pre>private final&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2378">cacheFlushSeqNum</a></pre>
+<pre>private final&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2373">cacheFlushSeqNum</a></pre>
 </li>
 </ul>
 <a name="snapshot">
@@ -297,7 +297,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlu
 <ul class="blockList">
 <li class="blockList">
 <h4>snapshot</h4>
-<pre>private&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2379">snapshot</a></pre>
+<pre>private&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSnapshot.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSnapshot</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2374">snapshot</a></pre>
 </li>
 </ul>
 <a name="tempFiles">
@@ -306,7 +306,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlu
 <ul class="blockList">
 <li class="blockList">
 <h4>tempFiles</h4>
-<pre>private&nbsp;<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; <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2380">tempFiles</a></pre>
+<pre>private&nbsp;<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; <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2375">tempFiles</a></pre>
 </li>
 </ul>
 <a name="committedFiles">
@@ -315,7 +315,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlu
 <ul class="blockList">
 <li class="blockList">
 <h4>committedFiles</h4>
-<pre>private&nbsp;<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; <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2381">committedFiles</a></pre>
+<pre>private&nbsp;<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; <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2376">committedFiles</a></pre>
 </li>
 </ul>
 <a name="cacheFlushCount">
@@ -324,7 +324,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlu
 <ul class="blockList">
 <li class="blockList">
 <h4>cacheFlushCount</h4>
-<pre>private&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2382">cacheFlushCount</a></pre>
+<pre>private&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2377">cacheFlushCount</a></pre>
 </li>
 </ul>
 <a name="cacheFlushSize">
@@ -333,7 +333,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlu
 <ul class="blockList">
 <li class="blockList">
 <h4>cacheFlushSize</h4>
-<pre>private&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2383">cacheFlushSize</a></pre>
+<pre>private&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2378">cacheFlushSize</a></pre>
 </li>
 </ul>
 <a name="outputFileSize">
@@ -342,7 +342,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlu
 <ul class="blockListLast">
 <li class="blockList">
 <h4>outputFileSize</h4>
-<pre>private&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2384">outputFileSize</a></pre>
+<pre>private&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2379">outputFileSize</a></pre>
 </li>
 </ul>
 </li>
@@ -359,7 +359,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlu
 <ul class="blockListLast">
 <li class="blockList">
 <h4>StoreFlusherImpl</h4>
-<pre>private&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2386">StoreFlusherImpl</a>(long&nbsp;cacheFlushSeqNum,
+<pre>private&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2381">StoreFlusherImpl</a>(long&nbsp;cacheFlushSeqNum,
                          <a href="../../../../../org/apache/hadoop/hbase/regionserver/FlushLifeCycleTracker.html" title="interface in org.apache.hadoop.hbase.regionserver">FlushLifeCycleTracker</a>&nbsp;tracker)</pre>
 </li>
 </ul>
@@ -377,7 +377,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlu
 <ul class="blockList">
 <li class="blockList">
 <h4>prepare</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSize.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSize</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2396">prepare</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSize.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSize</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2391">prepare</a>()</pre>
 <div class="block">This is not thread safe. The caller should have a lock on the region or the store.
  If necessary, the lock can be added with the patch provided in HBASE-10087</div>
 <dl>
@@ -394,7 +394,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlu
 <ul class="blockList">
 <li class="blockList">
 <h4>flushCache</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2406">flushCache</a>(<a href="../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a>&nbsp;status)
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2401">flushCache</a>(<a href="../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a>&nbsp;status)
                 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/regionserver/StoreFlushContext.html#flushCache-org.apache.hadoop.hbase.monitoring.MonitoredTask-">StoreFlushContext</a></code></span></div>
 <div class="block">Flush the cache (create the new store file)
@@ -415,7 +415,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlu
 <ul class="blockList">
 <li class="blockList">
 <h4>commit</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2415">commit</a>(<a href="../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a>&nbsp;status)
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2410">commit</a>(<a href="../../../../../org/apache/hadoop/hbase/monitoring/MonitoredTask.html" title="interface in org.apache.hadoop.hbase.monitoring">MonitoredTask</a>&nbsp;status)
                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/regionserver/StoreFlushContext.html#commit-org.apache.hadoop.hbase.monitoring.MonitoredTask-">StoreFlushContext</a></code></span></div>
 <div class="block">Commit the flush - add the store file to the store and clear the
@@ -440,7 +440,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlu
 <ul class="blockList">
 <li class="blockList">
 <h4>getOutputFileSize</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2458">getOutputFileSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2453">getOutputFileSize</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlushContext.html#getOutputFileSize--">getOutputFileSize</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlushContext.html" title="interface in org.apache.hadoop.hbase.regionserver">StoreFlushContext</a></code></dd>
@@ -455,7 +455,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlu
 <ul class="blockList">
 <li class="blockList">
 <h4>getCommittedFiles</h4>
-<pre>public&nbsp;<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;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2463">getCommittedFiles</a>()</pre>
+<pre>public&nbsp;<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;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2458">getCommittedFiles</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlushContext.html#getCommittedFiles--">StoreFlushContext</a></code></span></div>
 <div class="block">Returns the newly committed files from the flush. Called only if commit returns true</div>
 <dl>
@@ -472,7 +472,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlu
 <ul class="blockList">
 <li class="blockList">
 <h4>replayFlush</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2475">replayFlush</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;fileNames,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2470">replayFlush</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;fileNames,
                         boolean&nbsp;dropMemstoreSnapshot)
                  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">Similar to commit, but called in secondary region replicas for replaying the
@@ -495,7 +495,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlu
 <ul class="blockListLast">
 <li class="blockList">
 <h4>abort</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2506">abort</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html#line.2501">abort</a>()
            throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Abort the snapshot preparation. Drops the snapshot if any.</div>
 <dl>
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/HStore.html b/devapidocs/org/apache/hadoop/hbase/regionserver/HStore.html
index 9a28446..f16675c 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/HStore.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/HStore.html
@@ -1787,7 +1787,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.ht
 <ul class="blockList">
 <li class="blockList">
 <h4>FIXED_OVERHEAD</h4>
-<pre>public static final&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2535">FIXED_OVERHEAD</a></pre>
+<pre>public static final&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2530">FIXED_OVERHEAD</a></pre>
 </li>
 </ul>
 <a name="DEEP_OVERHEAD">
@@ -1796,7 +1796,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.ht
 <ul class="blockListLast">
 <li class="blockList">
 <h4>DEEP_OVERHEAD</h4>
-<pre>public static final&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2539">DEEP_OVERHEAD</a></pre>
+<pre>public static final&nbsp;long <a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2534">DEEP_OVERHEAD</a></pre>
 </li>
 </ul>
 </li>
@@ -3239,7 +3239,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getSplitPoint</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;byte[]&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2080">getSplitPoint</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;byte[]&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2075">getSplitPoint</a>()</pre>
 <div class="block">Determines if Store should be split.</div>
 </li>
 </ul>
@@ -3249,7 +3249,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getLastCompactSize</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2100">getLastCompactSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2095">getLastCompactSize</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getLastCompactSize--">getLastCompactSize</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3264,7 +3264,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getSize</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2105">getSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2100">getSize</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getSize--">getSize</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3279,7 +3279,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>triggerMajorCompaction</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2109">triggerMajorCompaction</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2104">triggerMajorCompaction</a>()</pre>
 </li>
 </ul>
 <a name="getScanner-org.apache.hadoop.hbase.client.Scan-java.util.NavigableSet-long-">
@@ -3288,7 +3288,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getScanner</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2125">getScanner</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan,
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2120">getScanner</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan,
                                   <a href="https://docs.oracle.com/javase/8/docs/api/java/util/NavigableSet.html?is-external=true" title="class or interface in java.util">NavigableSet</a>&lt;byte[]&gt;&nbsp;targetCols,
                                   long&nbsp;readPt)
                            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>
@@ -3311,7 +3311,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>createScanner</h4>
-<pre>protected&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2142">createScanner</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan,
+<pre>protected&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/KeyValueScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2137">createScanner</a>(<a href="../../../../../org/apache/hadoop/hbase/client/Scan.html" title="class in org.apache.hadoop.hbase.client">Scan</a>&nbsp;scan,
                                         <a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanInfo.html" title="class in org.apache.hadoop.hbase.regionserver">ScanInfo</a>&nbsp;scanInfo,
                                         <a href="https://docs.oracle.com/javase/8/docs/api/java/util/NavigableSet.html?is-external=true" title="class or interface in java.util">NavigableSet</a>&lt;byte[]&gt;&nbsp;targetCols,
                                         long&nbsp;readPt)
@@ -3328,7 +3328,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>recreateScanners</h4>
-<pre>public&nbsp;<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/regionserver/KeyValueScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2163">recreateScanners</a>(<a href="https://docs.oracle.com/javase/8/docs/api [...]
+<pre>public&nbsp;<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/regionserver/KeyValueScanner.html" title="interface in org.apache.hadoop.hbase.regionserver">KeyValueScanner</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2158">recreateScanners</a>(<a href="https://docs.oracle.com/javase/8/docs/api [...]
                                               boolean&nbsp;cacheBlocks,
                                               boolean&nbsp;usePread,
                                               boolean&nbsp;isCompaction,
@@ -3367,7 +3367,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>toString</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/regionserver/HStore.html#line.2197">toString</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/regionserver/HStore.html#line.2192">toString</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#toString--" title="class or interface in java.lang">toString</a></code>&nbsp;in class&nbsp;<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></code></dd>
@@ -3380,7 +3380,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getStorefilesCount</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2202">getStorefilesCount</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2197">getStorefilesCount</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getStorefilesCount--">getStorefilesCount</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3395,7 +3395,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getCompactedFilesCount</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2207">getCompactedFilesCount</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2202">getCompactedFilesCount</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getCompactedFilesCount--">getCompactedFilesCount</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3410,7 +3410,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getStoreFileAgeStream</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/stream/LongStream.html?is-external=true" title="class or interface in java.util.stream">LongStream</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2211">getStoreFileAgeStream</a>()</pre>
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/stream/LongStream.html?is-external=true" title="class or interface in java.util.stream">LongStream</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2206">getStoreFileAgeStream</a>()</pre>
 </li>
 </ul>
 <a name="getMaxStoreFileAge--">
@@ -3419,7 +3419,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getMaxStoreFileAge</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/OptionalLong.html?is-external=true" title="class or interface in java.util">OptionalLong</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2224">getMaxStoreFileAge</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/OptionalLong.html?is-external=true" title="class or interface in java.util">OptionalLong</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2219">getMaxStoreFileAge</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getMaxStoreFileAge--">getMaxStoreFileAge</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3434,7 +3434,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getMinStoreFileAge</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/OptionalLong.html?is-external=true" title="class or interface in java.util">OptionalLong</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2229">getMinStoreFileAge</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/OptionalLong.html?is-external=true" title="class or interface in java.util">OptionalLong</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2224">getMinStoreFileAge</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getMinStoreFileAge--">getMinStoreFileAge</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3449,7 +3449,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getAvgStoreFileAge</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/OptionalDouble.html?is-external=true" title="class or interface in java.util">OptionalDouble</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2234">getAvgStoreFileAge</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/OptionalDouble.html?is-external=true" title="class or interface in java.util">OptionalDouble</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2229">getAvgStoreFileAge</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getAvgStoreFileAge--">getAvgStoreFileAge</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3464,7 +3464,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getNumReferenceFiles</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2239">getNumReferenceFiles</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2234">getNumReferenceFiles</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getNumReferenceFiles--">getNumReferenceFiles</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3479,7 +3479,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getNumHFiles</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2245">getNumHFiles</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2240">getNumHFiles</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getNumHFiles--">getNumHFiles</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3494,7 +3494,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getStoreSizeUncompressed</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2251">getStoreSizeUncompressed</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2246">getStoreSizeUncompressed</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getStoreSizeUncompressed--">getStoreSizeUncompressed</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3509,7 +3509,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getStorefilesSize</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2256">getStorefilesSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2251">getStorefilesSize</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getStorefilesSize--">getStorefilesSize</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3524,7 +3524,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getHFilesSize</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2262">getHFilesSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2257">getHFilesSize</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getHFilesSize--">getHFilesSize</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3539,7 +3539,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getTotalUncompressedBytes</h4>
-<pre>private&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2268">getTotalUncompressedBytes</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/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">HStoreFile</a>&gt;&nbsp;files)</pre>
+<pre>private&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2263">getTotalUncompressedBytes</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/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">HStoreFile</a>&gt;&nbsp;files)</pre>
 </li>
 </ul>
 <a name="getStorefilesSize-java.util.Collection-java.util.function.Predicate-">
@@ -3548,7 +3548,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getStorefilesSize</h4>
-<pre>private&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2274">getStorefilesSize</a>(<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/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">HStoreFile</a>&gt;&nbsp;files,
+<pre>private&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2269">getStorefilesSize</a>(<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/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">HStoreFile</a>&gt;&nbsp;files,
                                <a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/Predicate.html?is-external=true" title="class or interface in java.util.function">Predicate</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">HStoreFile</a>&gt;&nbsp;predicate)</pre>
 </li>
 </ul>
@@ -3558,7 +3558,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getStorefileFieldSize</h4>
-<pre>private&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2279">getStorefileFieldSize</a>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">HStoreFile</a>&nbsp;file,
+<pre>private&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2274">getStorefileFieldSize</a>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">HStoreFile</a>&nbsp;file,
                                    <a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/ToLongFunction.html?is-external=true" title="class or interface in java.util.function">ToLongFunction</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFileReader.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFileReader</a>&gt;&nbsp;f)</pre>
 </li>
 </ul>
@@ -3568,7 +3568,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getStorefilesFieldSize</h4>
-<pre>private&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2290">getStorefilesFieldSize</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/ToLongFunction.html?is-external=true" title="class or interface in java.util.function">ToLongFunction</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFileReader.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFileReader</a>&gt;&nbsp [...]
+<pre>private&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2285">getStorefilesFieldSize</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/ToLongFunction.html?is-external=true" title="class or interface in java.util.function">ToLongFunction</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFileReader.html" title="class in org.apache.hadoop.hbase.regionserver">StoreFileReader</a>&gt;&nbsp [...]
 </li>
 </ul>
 <a name="getStorefilesRootLevelIndexSize--">
@@ -3577,7 +3577,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getStorefilesRootLevelIndexSize</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2296">getStorefilesRootLevelIndexSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2291">getStorefilesRootLevelIndexSize</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getStorefilesRootLevelIndexSize--">getStorefilesRootLevelIndexSize</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3592,7 +3592,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getTotalStaticIndexSize</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2301">getTotalStaticIndexSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2296">getTotalStaticIndexSize</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getTotalStaticIndexSize--">Store</a></code></span></div>
 <div class="block">Returns the total size of all index blocks in the data block indexes, including the root level,
  intermediate levels, and the leaf level for multi-level indexes, or just the root level for
@@ -3611,7 +3611,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getTotalStaticBloomSize</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2306">getTotalStaticBloomSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2301">getTotalStaticBloomSize</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getTotalStaticBloomSize--">Store</a></code></span></div>
 <div class="block">Returns the total byte size of all Bloom filter bit arrays. For compound Bloom filters even the
  Bloom blocks currently not loaded into the block cache are counted.</div>
@@ -3629,7 +3629,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getMemStoreSize</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSize.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSize</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2311">getMemStoreSize</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSize.html" title="class in org.apache.hadoop.hbase.regionserver">MemStoreSize</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2306">getMemStoreSize</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getMemStoreSize--">getMemStoreSize</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3644,7 +3644,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getCompactPriority</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2316">getCompactPriority</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2311">getCompactPriority</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getCompactPriority--">getCompactPriority</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3657,7 +3657,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>throttleCompaction</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2324">throttleCompaction</a>(long&nbsp;compactionSize)</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2319">throttleCompaction</a>(long&nbsp;compactionSize)</pre>
 </li>
 </ul>
 <a name="getHRegion--">
@@ -3666,7 +3666,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getHRegion</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html" title="class in org.apache.hadoop.hbase.regionserver">HRegion</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2328">getHRegion</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/HRegion.html" title="class in org.apache.hadoop.hbase.regionserver">HRegion</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2323">getHRegion</a>()</pre>
 </li>
 </ul>
 <a name="getCoprocessorHost--">
@@ -3675,7 +3675,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getCoprocessorHost</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.html" title="class in org.apache.hadoop.hbase.regionserver">RegionCoprocessorHost</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2332">getCoprocessorHost</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/RegionCoprocessorHost.html" title="class in org.apache.hadoop.hbase.regionserver">RegionCoprocessorHost</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2327">getCoprocessorHost</a>()</pre>
 </li>
 </ul>
 <a name="getRegionInfo--">
@@ -3684,7 +3684,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getRegionInfo</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2337">getRegionInfo</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2332">getRegionInfo</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getRegionInfo--">getRegionInfo</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3699,7 +3699,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>areWritesEnabled</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2342">areWritesEnabled</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2337">areWritesEnabled</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#areWritesEnabled--">areWritesEnabled</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3712,7 +3712,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getSmallestReadPoint</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2347">getSmallestReadPoint</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2342">getSmallestReadPoint</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getSmallestReadPoint--">getSmallestReadPoint</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3729,7 +3729,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>upsert</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2361">upsert</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html?is-external=true" title="class or interface in java.lang">Iterable</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&gt;&nbsp;cells,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2356">upsert</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Iterable.html?is-external=true" title="class or interface in java.lang">Iterable</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/Cell.html" title="interface in org.apache.hadoop.hbase">Cell</a>&gt;&nbsp;cells,
                    long&nbsp;readpoint,
                    <a href="../../../../../org/apache/hadoop/hbase/regionserver/MemStoreSizing.html" title="interface in org.apache.hadoop.hbase.regionserver">MemStoreSizing</a>&nbsp;memstoreSizing)
             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>
@@ -3754,7 +3754,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>createFlushContext</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlushContext.html" title="interface in org.apache.hadoop.hbase.regionserver">StoreFlushContext</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2371">createFlushContext</a>(long&nbsp;cacheFlushId,
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFlushContext.html" title="interface in org.apache.hadoop.hbase.regionserver">StoreFlushContext</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2366">createFlushContext</a>(long&nbsp;cacheFlushId,
                                             <a href="../../../../../org/apache/hadoop/hbase/regionserver/FlushLifeCycleTracker.html" title="interface in org.apache.hadoop.hbase.regionserver">FlushLifeCycleTracker</a>&nbsp;tracker)</pre>
 </li>
 </ul>
@@ -3764,7 +3764,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>needsCompaction</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2518">needsCompaction</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2513">needsCompaction</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#needsCompaction--">Store</a></code></span></div>
 <div class="block">See if there's too much store files in this store</div>
 <dl>
@@ -3782,7 +3782,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getCacheConfig</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2531">getCacheConfig</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/io/hfile/CacheConfig.html" title="class in org.apache.hadoop.hbase.io.hfile">CacheConfig</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2526">getCacheConfig</a>()</pre>
 <div class="block">Used for tests.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -3796,7 +3796,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>heapSize</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2546">heapSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2541">heapSize</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/io/HeapSize.html#heapSize--">heapSize</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/io/HeapSize.html" title="interface in org.apache.hadoop.hbase.io">HeapSize</a></code></dd>
@@ -3812,7 +3812,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getComparator</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/CellComparator.html" title="interface in org.apache.hadoop.hbase">CellComparator</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2552">getComparator</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/CellComparator.html" title="interface in org.apache.hadoop.hbase">CellComparator</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2547">getComparator</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getComparator--">getComparator</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3825,7 +3825,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getScanInfo</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanInfo.html" title="class in org.apache.hadoop.hbase.regionserver">ScanInfo</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2556">getScanInfo</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanInfo.html" title="class in org.apache.hadoop.hbase.regionserver">ScanInfo</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2551">getScanInfo</a>()</pre>
 </li>
 </ul>
 <a name="setScanInfo-org.apache.hadoop.hbase.regionserver.ScanInfo-">
@@ -3834,7 +3834,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>setScanInfo</h4>
-<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2564">setScanInfo</a>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanInfo.html" title="class in org.apache.hadoop.hbase.regionserver">ScanInfo</a>&nbsp;scanInfo)</pre>
+<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2559">setScanInfo</a>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/ScanInfo.html" title="class in org.apache.hadoop.hbase.regionserver">ScanInfo</a>&nbsp;scanInfo)</pre>
 <div class="block">Set scan info, used by test</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -3848,7 +3848,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>hasTooManyStoreFiles</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2569">hasTooManyStoreFiles</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2564">hasTooManyStoreFiles</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#hasTooManyStoreFiles--">hasTooManyStoreFiles</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3863,7 +3863,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getFlushedCellsCount</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2574">getFlushedCellsCount</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2569">getFlushedCellsCount</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getFlushedCellsCount--">getFlushedCellsCount</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3878,7 +3878,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getFlushedCellsSize</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2579">getFlushedCellsSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2574">getFlushedCellsSize</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getFlushedCellsSize--">getFlushedCellsSize</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3893,7 +3893,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getFlushedOutputFileSize</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2584">getFlushedOutputFileSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2579">getFlushedOutputFileSize</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getFlushedOutputFileSize--">getFlushedOutputFileSize</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3908,7 +3908,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getCompactedCellsCount</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2589">getCompactedCellsCount</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2584">getCompactedCellsCount</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getCompactedCellsCount--">getCompactedCellsCount</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3923,7 +3923,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getCompactedCellsSize</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2594">getCompactedCellsSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2589">getCompactedCellsSize</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getCompactedCellsSize--">getCompactedCellsSize</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3938,7 +3938,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getMajorCompactedCellsCount</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2599">getMajorCompactedCellsCount</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2594">getMajorCompactedCellsCount</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getMajorCompactedCellsCount--">getMajorCompactedCellsCount</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3953,7 +3953,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getMajorCompactedCellsSize</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2604">getMajorCompactedCellsSize</a>()</pre>
+<pre>public&nbsp;long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2599">getMajorCompactedCellsSize</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getMajorCompactedCellsSize--">getMajorCompactedCellsSize</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -3968,7 +3968,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getStoreEngine</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreEngine.html" title="class in org.apache.hadoop.hbase.regionserver">StoreEngine</a>&lt;?,?,?,?&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2613">getStoreEngine</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreEngine.html" title="class in org.apache.hadoop.hbase.regionserver">StoreEngine</a>&lt;?,?,?,?&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2608">getStoreEngine</a>()</pre>
 <div class="block">Returns the StoreEngine that is backing this concrete implementation of Store.</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -3982,7 +3982,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getOffPeakHours</h4>
-<pre>protected&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/OffPeakHours.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">OffPeakHours</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2617">getOffPeakHours</a>()</pre>
+<pre>protected&nbsp;<a href="../../../../../org/apache/hadoop/hbase/regionserver/compactions/OffPeakHours.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">OffPeakHours</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2612">getOffPeakHours</a>()</pre>
 </li>
 </ul>
 <a name="onConfigurationChange-org.apache.hadoop.conf.Configuration-">
@@ -3991,7 +3991,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>onConfigurationChange</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2625">onConfigurationChange</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2620">onConfigurationChange</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)</pre>
 <div class="block">This method would be called by the <a href="../../../../../org/apache/hadoop/hbase/conf/ConfigurationManager.html" title="class in org.apache.hadoop.hbase.conf"><code>ConfigurationManager</code></a>
  object when the <code>Configuration</code> object is reloaded from disk.</div>
 <dl>
@@ -4006,7 +4006,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>registerChildren</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2637">registerChildren</a>(<a href="../../../../../org/apache/hadoop/hbase/conf/ConfigurationManager.html" title="class in org.apache.hadoop.hbase.conf">ConfigurationManager</a>&nbsp;manager)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2632">registerChildren</a>(<a href="../../../../../org/apache/hadoop/hbase/conf/ConfigurationManager.html" title="class in org.apache.hadoop.hbase.conf">ConfigurationManager</a>&nbsp;manager)</pre>
 <div class="block">Needs to be called to register the children to the manager.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -4022,7 +4022,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>deregisterChildren</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2645">deregisterChildren</a>(<a href="../../../../../org/apache/hadoop/hbase/conf/ConfigurationManager.html" title="class in org.apache.hadoop.hbase.conf">ConfigurationManager</a>&nbsp;manager)</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2640">deregisterChildren</a>(<a href="../../../../../org/apache/hadoop/hbase/conf/ConfigurationManager.html" title="class in org.apache.hadoop.hbase.conf">ConfigurationManager</a>&nbsp;manager)</pre>
 <div class="block">Needs to be called to deregister the children from the manager.</div>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
@@ -4038,7 +4038,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getCompactionPressure</h4>
-<pre>public&nbsp;double&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2650">getCompactionPressure</a>()</pre>
+<pre>public&nbsp;double&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2645">getCompactionPressure</a>()</pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getCompactionPressure--">Store</a></code></span></div>
 <div class="block">This value can represent the degree of emergency of compaction for this store. It should be
  greater than or equal to 0.0, any value greater than 1.0 means we have too many store files.
@@ -4065,7 +4065,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>isPrimaryReplicaStore</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2655">isPrimaryReplicaStore</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2650">isPrimaryReplicaStore</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#isPrimaryReplicaStore--">isPrimaryReplicaStore</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -4078,7 +4078,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>preSnapshotOperation</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2663">preSnapshotOperation</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2658">preSnapshotOperation</a>()</pre>
 <div class="block">Sets the store up for a region level snapshot operation.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -4092,7 +4092,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>postSnapshotOperation</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2671">postSnapshotOperation</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2666">postSnapshotOperation</a>()</pre>
 <div class="block">Perform tasks needed after the completion of snapshot operation.</div>
 <dl>
 <dt><span class="seeLabel">See Also:</span></dt>
@@ -4106,7 +4106,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>closeAndArchiveCompactedFiles</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2678">closeAndArchiveCompactedFiles</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2673">closeAndArchiveCompactedFiles</a>()
                                    throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block">Closes and archives the compacted files under this store</div>
 <dl>
@@ -4121,7 +4121,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>removeCompactedfiles</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2708">removeCompactedfiles</a>(<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/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">HStoreFile</a>&gt;&nbsp;compactedfiles)
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2703">removeCompactedfiles</a>(<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/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">HStoreFile</a>&gt;&nbsp;compactedfiles)
                            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">Archives and removes the compacted files</div>
 <dl>
@@ -4138,7 +4138,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getStoreFileSize</h4>
-<pre>long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2796">getStoreFileSize</a>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">HStoreFile</a>&nbsp;file)</pre>
+<pre>long&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2791">getStoreFileSize</a>(<a href="../../../../../org/apache/hadoop/hbase/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">HStoreFile</a>&nbsp;file)</pre>
 <div class="block">Computes the length of a store file without succumbing to any errors along the way. If an
  error is encountered, the implementation returns <code>0</code> instead of the actual size.</div>
 <dl>
@@ -4155,7 +4155,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>preFlushSeqIDEstimation</h4>
-<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2814">preFlushSeqIDEstimation</a>()</pre>
+<pre>public&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true" title="class or interface in java.lang">Long</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2809">preFlushSeqIDEstimation</a>()</pre>
 </li>
 </ul>
 <a name="isSloppyMemStore--">
@@ -4164,7 +4164,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>isSloppyMemStore</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2819">isSloppyMemStore</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2814">isSloppyMemStore</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#isSloppyMemStore--">isSloppyMemStore</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -4179,7 +4179,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>clearCompactedfiles</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2823">clearCompactedfiles</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/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">HStoreFile</a>&gt;&nbsp;filesToRemove)
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2818">clearCompactedfiles</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/regionserver/HStoreFile.html" title="class in org.apache.hadoop.hbase.regionserver">HStoreFile</a>&gt;&nbsp;filesToRemove)
                           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>
@@ -4193,7 +4193,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>reportArchivedFilesForQuota</h4>
-<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2833">reportArchivedFilesForQuota</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;? extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" title="interface in org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;&nbsp;archivedFiles,
+<pre>void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2828">reportArchivedFilesForQuota</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;? extends <a href="../../../../../org/apache/hadoop/hbase/regionserver/StoreFile.html" title="interface in org.apache.hadoop.hbase.regionserver">StoreFile</a>&gt;&nbsp;archivedFiles,
                                  <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/Long.html?is-external=true" title="class or interface in java.lang">Long</a>&gt;&nbsp;fileSizes)</pre>
 </li>
 </ul>
@@ -4203,7 +4203,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getCurrentParallelPutCount</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2861">getCurrentParallelPutCount</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2856">getCurrentParallelPutCount</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html#getCurrentParallelPutCount--">getCurrentParallelPutCount</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/regionserver/Store.html" title="interface in org.apache.hadoop.hbase.regionserver">Store</a></code></dd>
@@ -4216,7 +4216,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockList">
 <li class="blockList">
 <h4>getStoreRefCount</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2865">getStoreRefCount</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2860">getStoreRefCount</a>()</pre>
 </li>
 </ul>
 <a name="getMaxCompactedStoreFileRefCount--">
@@ -4225,7 +4225,7 @@ public static&nbsp;org.apache.hadoop.fs.Path&nbsp;<a href="../../../../../src-ht
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getMaxCompactedStoreFileRefCount</h4>
-<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2875">getMaxCompactedStoreFileRefCount</a>()</pre>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/regionserver/HStore.html#line.2870">getMaxCompactedStoreFileRefCount</a>()</pre>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
 <dd>get maximum ref count of storeFile among all compacted HStore Files
diff --git a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index ab8ea7a..32d854f 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -735,20 +735,20 @@
 <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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/BloomType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">BloomType</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 eff67df..7f09712 100644
--- a/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/regionserver/querymatcher/package-tree.html
@@ -130,9 +130,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.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>
 <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>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/replication/package-tree.html b/devapidocs/org/apache/hadoop/hbase/replication/package-tree.html
index 732dfb2..581ff15 100644
--- a/devapidocs/org/apache/hadoop/hbase/replication/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/replication/package-tree.html
@@ -166,8 +166,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.<a href="../../../../../org/apache/hadoop/hbase/replication/ReplicationPeer.PeerState.html" title="enum in org.apache.hadoop.hbase.replication"><span class="typeNameLink">ReplicationPeer.PeerState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.replication.<a href="../../../../../org/apache/hadoop/hbase/replication/SyncReplicationState.html" title="enum in org.apache.hadoop.hbase.replication"><span class="typeNameLink">SyncReplicationState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.replication.<a href="../../../../../org/apache/hadoop/hbase/replication/ReplicationPeer.PeerState.html" title="enum in org.apache.hadoop.hbase.replication"><span class="typeNameLink">ReplicationPeer.PeerState</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html b/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html
index b47c8cc..795500d 100644
--- a/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/rest/model/package-tree.html
@@ -110,8 +110,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.rest.model.<a href="../../../../../../org/apache/hadoop/hbase/rest/model/ScannerModel.FilterModel.ByteArrayComparableModel.ComparatorType.html" title="enum in org.apache.hadoop.hbase.rest.model"><span class="typeNameLink">ScannerModel.FilterModel.ByteArrayComparableModel.ComparatorType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.rest.model.<a href="../../../../../../org/apache/hadoop/hbase/rest/model/ScannerModel.FilterModel.FilterType.html" title="enum in org.apache.hadoop.hbase.rest.model"><span class="typeNameLink">ScannerModel.FilterModel.FilterType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.rest.model.<a href="../../../../../../org/apache/hadoop/hbase/rest/model/ScannerModel.FilterModel.ByteArrayComparableModel.ComparatorType.html" title="enum in org.apache.hadoop.hbase.rest.model"><span class="typeNameLink">ScannerModel.FilterModel.ByteArrayComparableModel.ComparatorType</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 4fdb278..b39b1ae 100644
--- a/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/security/access/package-tree.html
@@ -162,12 +162,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.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>
-<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/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/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.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.Action.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">Permission.Action</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/SnapshotScannerHDFSAclHelper.HDFSAclOperation.OperationType.html" title="enum in org.apache.hadoop.hbase.security.access"><span class="typeNameLink">SnapshotScannerHDFSAclHelper.HDFSAclOperation.OperationType</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/security/package-tree.html b/devapidocs/org/apache/hadoop/hbase/security/package-tree.html
index 76d4bcb..c793825 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/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>
 <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>
 </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 d0028c4..460375c 100644
--- a/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/thrift/package-tree.html
@@ -211,8 +211,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.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/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/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>
 </ul>
 </li>
diff --git a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
index 8e5ac40..7509140 100644
--- a/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/util/package-tree.html
@@ -552,15 +552,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/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/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/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/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/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/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/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/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/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>
 <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/ChecksumType.html" title="enum in org.apache.hadoop.hbase.util"><span class="typeNameLink">ChecksumType</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html b/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
index d78cc8b..f2c94bd 100644
--- a/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
+++ b/devapidocs/org/apache/hadoop/hbase/wal/package-tree.html
@@ -199,8 +199,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.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/WALFactory.Providers.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">WALFactory.Providers</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/RegionGroupingProvider.Strategies.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">RegionGroupingProvider.Strategies</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/WALFactory.Providers.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">WALFactory.Providers</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
index dd2bfff..5c63b30 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
@@ -18,9 +18,9 @@
 <span class="sourceLineNo">010</span>  justification="Intentional; to be modified in test")<a name="line.10"></a>
 <span class="sourceLineNo">011</span>public class Version {<a name="line.11"></a>
 <span class="sourceLineNo">012</span>  public static final String version = new String("3.0.0-SNAPSHOT");<a name="line.12"></a>
-<span class="sourceLineNo">013</span>  public static final String revision = "285e59af258d9e840cf8e5d7169eb3b813558401";<a name="line.13"></a>
+<span class="sourceLineNo">013</span>  public static final String revision = "852150a23f3e198e12f2948bdf732d2709cd7511";<a name="line.13"></a>
 <span class="sourceLineNo">014</span>  public static final String user = "jenkins";<a name="line.14"></a>
-<span class="sourceLineNo">015</span>  public static final String date = "Mon May 25 14:41:26 UTC 2020";<a name="line.15"></a>
+<span class="sourceLineNo">015</span>  public static final String date = "Tue May 26 14:41:30 UTC 2020";<a name="line.15"></a>
 <span class="sourceLineNo">016</span>  public static final String url = "git://jenkins-websites-he-de.apache.org/home/jenkins/jenkins-slave/workspace/hbase_generate_website/hbase";<a name="line.16"></a>
 <span class="sourceLineNo">017</span>  public static final String srcChecksum = "(stdin)=";<a name="line.17"></a>
 <span class="sourceLineNo">018</span>}<a name="line.18"></a>
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html
index bfcd3bf..a2d424e 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/AbstractRegionNormalizer.html
@@ -30,221 +30,231 @@
 <span class="sourceLineNo">022</span>import java.util.ArrayList;<a name="line.22"></a>
 <span class="sourceLineNo">023</span>import java.util.List;<a name="line.23"></a>
 <span class="sourceLineNo">024</span>import java.util.Objects;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.RegionMetrics;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.ServerName;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.Size;<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.client.MasterSwitchType;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.master.MasterRpcServices;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.master.RegionState;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.master.assignment.RegionStates;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.slf4j.Logger;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.slf4j.LoggerFactory;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.shaded.protobuf.RequestConverter;<a name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span>@InterfaceAudience.Private<a name="line.42"></a>
-<span class="sourceLineNo">043</span>public abstract class AbstractRegionNormalizer implements RegionNormalizer {<a name="line.43"></a>
-<span class="sourceLineNo">044</span>  private static final Logger LOG = LoggerFactory.getLogger(AbstractRegionNormalizer.class);<a name="line.44"></a>
-<span class="sourceLineNo">045</span>  protected MasterServices masterServices;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>  protected MasterRpcServices masterRpcServices;<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>  /**<a name="line.48"></a>
-<span class="sourceLineNo">049</span>   * Set the master service.<a name="line.49"></a>
-<span class="sourceLineNo">050</span>   * @param masterServices inject instance of MasterServices<a name="line.50"></a>
-<span class="sourceLineNo">051</span>   */<a name="line.51"></a>
-<span class="sourceLineNo">052</span>  @Override<a name="line.52"></a>
-<span class="sourceLineNo">053</span>  public void setMasterServices(MasterServices masterServices) {<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    this.masterServices = masterServices;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>  }<a name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span>  @Override<a name="line.57"></a>
-<span class="sourceLineNo">058</span>  public void setMasterRpcServices(MasterRpcServices masterRpcServices) {<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    this.masterRpcServices = masterRpcServices;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>  }<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>   * @param hri regioninfo<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   * @return size of region in MB and if region is not found than -1<a name="line.64"></a>
-<span class="sourceLineNo">065</span>   */<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  protected long getRegionSize(RegionInfo hri) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    ServerName sn =<a name="line.67"></a>
-<span class="sourceLineNo">068</span>        masterServices.getAssignmentManager().getRegionStates().getRegionServerOfRegion(hri);<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    RegionMetrics regionLoad =<a name="line.69"></a>
-<span class="sourceLineNo">070</span>        masterServices.getServerManager().getLoad(sn).getRegionMetrics().get(hri.getRegionName());<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    if (regionLoad == null) {<a name="line.71"></a>
-<span class="sourceLineNo">072</span>      LOG.debug("{} was not found in RegionsLoad", hri.getRegionNameAsString());<a name="line.72"></a>
-<span class="sourceLineNo">073</span>      return -1;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    }<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    return (long) regionLoad.getStoreFileSize().get(Size.Unit.MEGABYTE);<a name="line.75"></a>
-<span class="sourceLineNo">076</span>  }<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span>  protected boolean isMergeEnabled() {<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    boolean mergeEnabled = true;<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    try {<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      mergeEnabled = masterRpcServices<a name="line.81"></a>
-<span class="sourceLineNo">082</span>          .isSplitOrMergeEnabled(null,<a name="line.82"></a>
-<span class="sourceLineNo">083</span>            RequestConverter.buildIsSplitOrMergeEnabledRequest(MasterSwitchType.MERGE))<a name="line.83"></a>
-<span class="sourceLineNo">084</span>          .getEnabled();<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    } catch (ServiceException e) {<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      LOG.warn("Unable to determine whether merge is enabled", e);<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    }<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    return mergeEnabled;<a name="line.88"></a>
-<span class="sourceLineNo">089</span>  }<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span>  protected boolean isSplitEnabled() {<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    boolean splitEnabled = true;<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    try {<a name="line.93"></a>
-<span class="sourceLineNo">094</span>      splitEnabled = masterRpcServices<a name="line.94"></a>
-<span class="sourceLineNo">095</span>          .isSplitOrMergeEnabled(null,<a name="line.95"></a>
-<span class="sourceLineNo">096</span>            RequestConverter.buildIsSplitOrMergeEnabledRequest(MasterSwitchType.SPLIT))<a name="line.96"></a>
-<span class="sourceLineNo">097</span>          .getEnabled();<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    } catch (ServiceException se) {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>      LOG.warn("Unable to determine whether split is enabled", se);<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    }<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    return splitEnabled;<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>  /**<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   * @param tableRegions regions of table to normalize<a name="line.105"></a>
-<span class="sourceLineNo">106</span>   * @return average region size depending on<a name="line.106"></a>
-<span class="sourceLineNo">107</span>   * @see org.apache.hadoop.hbase.client.TableDescriptor#getNormalizerTargetRegionCount()<a name="line.107"></a>
-<span class="sourceLineNo">108</span>   * Also make sure tableRegions contains regions of the same table<a name="line.108"></a>
-<span class="sourceLineNo">109</span>   */<a name="line.109"></a>
-<span class="sourceLineNo">110</span>  protected double getAverageRegionSize(List&lt;RegionInfo&gt; tableRegions) {<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    long totalSizeMb = 0;<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    int actualRegionCnt = 0;<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    for (RegionInfo hri : tableRegions) {<a name="line.113"></a>
-<span class="sourceLineNo">114</span>      long regionSize = getRegionSize(hri);<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      // don't consider regions that are in bytes for averaging the size.<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      if (regionSize &gt; 0) {<a name="line.116"></a>
-<span class="sourceLineNo">117</span>        actualRegionCnt++;<a name="line.117"></a>
-<span class="sourceLineNo">118</span>        totalSizeMb += regionSize;<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      }<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    }<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    TableName table = tableRegions.get(0).getTable();<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    int targetRegionCount = -1;<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    long targetRegionSize = -1;<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    try {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      TableDescriptor tableDescriptor = masterServices.getTableDescriptors().get(table);<a name="line.125"></a>
-<span class="sourceLineNo">126</span>      if (tableDescriptor != null) {<a name="line.126"></a>
-<span class="sourceLineNo">127</span>        targetRegionCount = tableDescriptor.getNormalizerTargetRegionCount();<a name="line.127"></a>
-<span class="sourceLineNo">128</span>        targetRegionSize = tableDescriptor.getNormalizerTargetRegionSize();<a name="line.128"></a>
-<span class="sourceLineNo">129</span>        LOG.debug("Table {}:  target region count is {}, target region size is {}", table,<a name="line.129"></a>
-<span class="sourceLineNo">130</span>          targetRegionCount, targetRegionSize);<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      }<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    } catch (IOException e) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      LOG.warn(<a name="line.133"></a>
-<span class="sourceLineNo">134</span>        "cannot get the target number and target size of table {}, they will be default value -1.",<a name="line.134"></a>
-<span class="sourceLineNo">135</span>        table, e);<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    }<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span>    double avgRegionSize;<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    if (targetRegionSize &gt; 0) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      avgRegionSize = targetRegionSize;<a name="line.140"></a>
-<span class="sourceLineNo">141</span>    } else if (targetRegionCount &gt; 0) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      avgRegionSize = totalSizeMb / (double) targetRegionCount;<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    } else {<a name="line.143"></a>
-<span class="sourceLineNo">144</span>      avgRegionSize = actualRegionCnt == 0 ? 0 : totalSizeMb / (double) actualRegionCnt;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    }<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span>    LOG.debug("Table {}, total aggregated regions size: {} and average region size {}", table,<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      totalSizeMb, avgRegionSize);<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    return avgRegionSize;<a name="line.149"></a>
-<span class="sourceLineNo">150</span>  }<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>  /**<a name="line.152"></a>
-<span class="sourceLineNo">153</span>   * Determine if a region in {@link RegionState} should be considered for a merge operation.<a name="line.153"></a>
-<span class="sourceLineNo">154</span>   */<a name="line.154"></a>
-<span class="sourceLineNo">155</span>  private static boolean skipForMerge(final RegionState state) {<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    return state == null || !Objects.equals(state.getState(), RegionState.State.OPEN);<a name="line.156"></a>
-<span class="sourceLineNo">157</span>  }<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span>  /**<a name="line.159"></a>
-<span class="sourceLineNo">160</span>   * Computes the merge plans that should be executed for this table to converge average region<a name="line.160"></a>
-<span class="sourceLineNo">161</span>   * towards target average or target region count<a name="line.161"></a>
-<span class="sourceLineNo">162</span>   * @param table table to normalize<a name="line.162"></a>
-<span class="sourceLineNo">163</span>   * @return list of merge normalization plans<a name="line.163"></a>
+<span class="sourceLineNo">025</span><a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.RegionMetrics;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.ServerName;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.Size;<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.client.MasterSwitchType;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.master.MasterRpcServices;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.master.RegionState;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.master.assignment.RegionStates;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.slf4j.Logger;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.slf4j.LoggerFactory;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.shaded.protobuf.RequestConverter;<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span>@InterfaceAudience.Private<a name="line.43"></a>
+<span class="sourceLineNo">044</span>public abstract class AbstractRegionNormalizer implements RegionNormalizer {<a name="line.44"></a>
+<span class="sourceLineNo">045</span>  private static final Logger LOG = LoggerFactory.getLogger(AbstractRegionNormalizer.class);<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>  public static final String HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_KEY =<a name="line.47"></a>
+<span class="sourceLineNo">048</span>      "hbase.normalizer.min.region.count";<a name="line.48"></a>
+<span class="sourceLineNo">049</span>  public static final int HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_DEFAULT = 3;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>  protected MasterServices masterServices;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>  protected MasterRpcServices masterRpcServices;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>  protected int minRegionCount;<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>  /**<a name="line.55"></a>
+<span class="sourceLineNo">056</span>   * Set the master service.<a name="line.56"></a>
+<span class="sourceLineNo">057</span>   * @param masterServices inject instance of MasterServices<a name="line.57"></a>
+<span class="sourceLineNo">058</span>   */<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  @Override<a name="line.59"></a>
+<span class="sourceLineNo">060</span>  public void setMasterServices(MasterServices masterServices) {<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    this.masterServices = masterServices;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    minRegionCount = masterServices.getConfiguration().getInt(<a name="line.62"></a>
+<span class="sourceLineNo">063</span>        HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_KEY,<a name="line.63"></a>
+<span class="sourceLineNo">064</span>        HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_DEFAULT);<a name="line.64"></a>
+<span class="sourceLineNo">065</span>  }<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span>  @Override<a name="line.67"></a>
+<span class="sourceLineNo">068</span>  public void setMasterRpcServices(MasterRpcServices masterRpcServices) {<a name="line.68"></a>
+<span class="sourceLineNo">069</span>    this.masterRpcServices = masterRpcServices;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  }<a name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span>  /**<a name="line.72"></a>
+<span class="sourceLineNo">073</span>   * @param hri regioninfo<a name="line.73"></a>
+<span class="sourceLineNo">074</span>   * @return size of region in MB and if region is not found than -1<a name="line.74"></a>
+<span class="sourceLineNo">075</span>   */<a name="line.75"></a>
+<span class="sourceLineNo">076</span>  protected long getRegionSize(RegionInfo hri) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    ServerName sn =<a name="line.77"></a>
+<span class="sourceLineNo">078</span>        masterServices.getAssignmentManager().getRegionStates().getRegionServerOfRegion(hri);<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    RegionMetrics regionLoad =<a name="line.79"></a>
+<span class="sourceLineNo">080</span>        masterServices.getServerManager().getLoad(sn).getRegionMetrics().get(hri.getRegionName());<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    if (regionLoad == null) {<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      LOG.debug("{} was not found in RegionsLoad", hri.getRegionNameAsString());<a name="line.82"></a>
+<span class="sourceLineNo">083</span>      return -1;<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    }<a name="line.84"></a>
+<span class="sourceLineNo">085</span>    return (long) regionLoad.getStoreFileSize().get(Size.Unit.MEGABYTE);<a name="line.85"></a>
+<span class="sourceLineNo">086</span>  }<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span>  protected boolean isMergeEnabled() {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    boolean mergeEnabled = true;<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    try {<a name="line.90"></a>
+<span class="sourceLineNo">091</span>      mergeEnabled = masterRpcServices<a name="line.91"></a>
+<span class="sourceLineNo">092</span>          .isSplitOrMergeEnabled(null,<a name="line.92"></a>
+<span class="sourceLineNo">093</span>            RequestConverter.buildIsSplitOrMergeEnabledRequest(MasterSwitchType.MERGE))<a name="line.93"></a>
+<span class="sourceLineNo">094</span>          .getEnabled();<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    } catch (ServiceException e) {<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      LOG.warn("Unable to determine whether merge is enabled", e);<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    }<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    return mergeEnabled;<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>  protected boolean isSplitEnabled() {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    boolean splitEnabled = true;<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    try {<a name="line.103"></a>
+<span class="sourceLineNo">104</span>      splitEnabled = masterRpcServices<a name="line.104"></a>
+<span class="sourceLineNo">105</span>          .isSplitOrMergeEnabled(null,<a name="line.105"></a>
+<span class="sourceLineNo">106</span>            RequestConverter.buildIsSplitOrMergeEnabledRequest(MasterSwitchType.SPLIT))<a name="line.106"></a>
+<span class="sourceLineNo">107</span>          .getEnabled();<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    } catch (ServiceException se) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      LOG.warn("Unable to determine whether split is enabled", se);<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    }<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    return splitEnabled;<a name="line.111"></a>
+<span class="sourceLineNo">112</span>  }<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span>  /**<a name="line.114"></a>
+<span class="sourceLineNo">115</span>   * @param tableRegions regions of table to normalize<a name="line.115"></a>
+<span class="sourceLineNo">116</span>   * @return average region size depending on<a name="line.116"></a>
+<span class="sourceLineNo">117</span>   * @see org.apache.hadoop.hbase.client.TableDescriptor#getNormalizerTargetRegionCount()<a name="line.117"></a>
+<span class="sourceLineNo">118</span>   * Also make sure tableRegions contains regions of the same table<a name="line.118"></a>
+<span class="sourceLineNo">119</span>   */<a name="line.119"></a>
+<span class="sourceLineNo">120</span>  protected double getAverageRegionSize(List&lt;RegionInfo&gt; tableRegions) {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    long totalSizeMb = 0;<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    int actualRegionCnt = 0;<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    for (RegionInfo hri : tableRegions) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span>      long regionSize = getRegionSize(hri);<a name="line.124"></a>
+<span class="sourceLineNo">125</span>      // don't consider regions that are in bytes for averaging the size.<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      if (regionSize &gt; 0) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>        actualRegionCnt++;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>        totalSizeMb += regionSize;<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      }<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    }<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    TableName table = tableRegions.get(0).getTable();<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    int targetRegionCount = -1;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    long targetRegionSize = -1;<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    try {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      TableDescriptor tableDescriptor = masterServices.getTableDescriptors().get(table);<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      if (tableDescriptor != null) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>        targetRegionCount = tableDescriptor.getNormalizerTargetRegionCount();<a name="line.137"></a>
+<span class="sourceLineNo">138</span>        targetRegionSize = tableDescriptor.getNormalizerTargetRegionSize();<a name="line.138"></a>
+<span class="sourceLineNo">139</span>        LOG.debug("Table {}:  target region count is {}, target region size is {}", table,<a name="line.139"></a>
+<span class="sourceLineNo">140</span>          targetRegionCount, targetRegionSize);<a name="line.140"></a>
+<span class="sourceLineNo">141</span>      }<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    } catch (IOException e) {<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      LOG.warn(<a name="line.143"></a>
+<span class="sourceLineNo">144</span>        "cannot get the target number and target size of table {}, they will be default value -1.",<a name="line.144"></a>
+<span class="sourceLineNo">145</span>        table, e);<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>    double avgRegionSize;<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    if (targetRegionSize &gt; 0) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      avgRegionSize = targetRegionSize;<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    } else if (targetRegionCount &gt; 0) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      avgRegionSize = totalSizeMb / (double) targetRegionCount;<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    } else {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>      avgRegionSize = actualRegionCnt == 0 ? 0 : totalSizeMb / (double) actualRegionCnt;<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    }<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span>    LOG.debug("Table {}, total aggregated regions size: {} and average region size {}", table,<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      totalSizeMb, avgRegionSize);<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    return avgRegionSize;<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>  /**<a name="line.162"></a>
+<span class="sourceLineNo">163</span>   * Determine if a region in {@link RegionState} should be considered for a merge operation.<a name="line.163"></a>
 <span class="sourceLineNo">164</span>   */<a name="line.164"></a>
-<span class="sourceLineNo">165</span>  protected List&lt;NormalizationPlan&gt; getMergeNormalizationPlan(TableName table) {<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    final RegionStates regionStates = masterServices.getAssignmentManager().getRegionStates();<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    final List&lt;RegionInfo&gt; tableRegions = regionStates.getRegionsOfTable(table);<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    final double avgRegionSize = getAverageRegionSize(tableRegions);<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    LOG.debug("Table {}, average region size: {}. Computing normalization plan for table: {}, "<a name="line.169"></a>
-<span class="sourceLineNo">170</span>        + "number of regions: {}",<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      table, avgRegionSize, table, tableRegions.size());<a name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span>    // The list of regionInfo from getRegionsOfTable() is ordered by regionName.<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    // regionName does not necessary guarantee the order by STARTKEY (let's say 'aa1', 'aa1!',<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    // in order by regionName, it will be 'aa1!' followed by 'aa1').<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    // This could result in normalizer merging non-adjacent regions into one and creates overlaps.<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    // In order to avoid that, sort the list by RegionInfo.COMPARATOR.<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    tableRegions.sort(RegionInfo.COMPARATOR);<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    final List&lt;NormalizationPlan&gt; plans = new ArrayList&lt;&gt;();<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    for (int candidateIdx = 0; candidateIdx &lt; tableRegions.size() - 1; candidateIdx++) {<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      final RegionInfo hri = tableRegions.get(candidateIdx);<a name="line.181"></a>
-<span class="sourceLineNo">182</span>      final RegionInfo hri2 = tableRegions.get(candidateIdx + 1);<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      if (skipForMerge(regionStates.getRegionState(hri))) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span>        continue;<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      }<a name="line.185"></a>
-<span class="sourceLineNo">186</span>      if (skipForMerge(regionStates.getRegionState(hri2))) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>        continue;<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      }<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      final long regionSize = getRegionSize(hri);<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      final long regionSize2 = getRegionSize(hri2);<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span>      if (regionSize &gt;= 0 &amp;&amp; regionSize2 &gt;= 0 &amp;&amp; regionSize + regionSize2 &lt; avgRegionSize) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>        // at least one of the two regions should be older than MIN_REGION_DURATION days<a name="line.193"></a>
-<span class="sourceLineNo">194</span>        plans.add(new MergeNormalizationPlan(hri, hri2));<a name="line.194"></a>
-<span class="sourceLineNo">195</span>        candidateIdx++;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      } else {<a name="line.196"></a>
-<span class="sourceLineNo">197</span>        LOG.debug("Skipping region {} of table {} with size {}", hri.getRegionNameAsString(), table,<a name="line.197"></a>
-<span class="sourceLineNo">198</span>          regionSize);<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      }<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    return plans;<a name="line.201"></a>
-<span class="sourceLineNo">202</span>  }<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span>  /**<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   * Determine if a region in {@link RegionState} should be considered for a split operation.<a name="line.205"></a>
-<span class="sourceLineNo">206</span>   */<a name="line.206"></a>
-<span class="sourceLineNo">207</span>  private static boolean skipForSplit(final RegionState state) {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    return state == null || !Objects.equals(state.getState(), RegionState.State.OPEN);<a name="line.208"></a>
-<span class="sourceLineNo">209</span>  }<a name="line.209"></a>
-<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span>  /**<a name="line.211"></a>
-<span class="sourceLineNo">212</span>   * Computes the split plans that should be executed for this table to converge average region size<a name="line.212"></a>
-<span class="sourceLineNo">213</span>   * towards target average or target region count<a name="line.213"></a>
-<span class="sourceLineNo">214</span>   * @param table table to normalize<a name="line.214"></a>
-<span class="sourceLineNo">215</span>   * @return list of split normalization plans<a name="line.215"></a>
+<span class="sourceLineNo">165</span>  private static boolean skipForMerge(final RegionState state) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    return state == null || !Objects.equals(state.getState(), RegionState.State.OPEN);<a name="line.166"></a>
+<span class="sourceLineNo">167</span>  }<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span>  /**<a name="line.169"></a>
+<span class="sourceLineNo">170</span>   * Computes the merge plans that should be executed for this table to converge average region<a name="line.170"></a>
+<span class="sourceLineNo">171</span>   * towards target average or target region count<a name="line.171"></a>
+<span class="sourceLineNo">172</span>   * @param table table to normalize<a name="line.172"></a>
+<span class="sourceLineNo">173</span>   * @return list of merge normalization plans<a name="line.173"></a>
+<span class="sourceLineNo">174</span>   */<a name="line.174"></a>
+<span class="sourceLineNo">175</span>  protected List&lt;NormalizationPlan&gt; getMergeNormalizationPlan(TableName table) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    final RegionStates regionStates = masterServices.getAssignmentManager().getRegionStates();<a name="line.176"></a>
+<span class="sourceLineNo">177</span>    final List&lt;RegionInfo&gt; tableRegions = regionStates.getRegionsOfTable(table);<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    final double avgRegionSize = getAverageRegionSize(tableRegions);<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    LOG.debug("Table {}, average region size: {}. Computing normalization plan for table: {}, "<a name="line.179"></a>
+<span class="sourceLineNo">180</span>        + "number of regions: {}",<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      table, avgRegionSize, table, tableRegions.size());<a name="line.181"></a>
+<span class="sourceLineNo">182</span><a name="line.182"></a>
+<span class="sourceLineNo">183</span>    // The list of regionInfo from getRegionsOfTable() is ordered by regionName.<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    // regionName does not necessary guarantee the order by STARTKEY (let's say 'aa1', 'aa1!',<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    // in order by regionName, it will be 'aa1!' followed by 'aa1').<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    // This could result in normalizer merging non-adjacent regions into one and creates overlaps.<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    // In order to avoid that, sort the list by RegionInfo.COMPARATOR.<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    tableRegions.sort(RegionInfo.COMPARATOR);<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    final List&lt;NormalizationPlan&gt; plans = new ArrayList&lt;&gt;();<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    for (int candidateIdx = 0; candidateIdx &lt; tableRegions.size() - 1; candidateIdx++) {<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      final RegionInfo hri = tableRegions.get(candidateIdx);<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      final RegionInfo hri2 = tableRegions.get(candidateIdx + 1);<a name="line.192"></a>
+<span class="sourceLineNo">193</span>      if (skipForMerge(regionStates.getRegionState(hri))) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span>        continue;<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      }<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      if (skipForMerge(regionStates.getRegionState(hri2))) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span>        continue;<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      }<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      final long regionSize = getRegionSize(hri);<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      final long regionSize2 = getRegionSize(hri2);<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span>      if (regionSize &gt;= 0 &amp;&amp; regionSize2 &gt;= 0 &amp;&amp; regionSize + regionSize2 &lt; avgRegionSize) {<a name="line.202"></a>
+<span class="sourceLineNo">203</span>        // at least one of the two regions should be older than MIN_REGION_DURATION days<a name="line.203"></a>
+<span class="sourceLineNo">204</span>        plans.add(new MergeNormalizationPlan(hri, hri2));<a name="line.204"></a>
+<span class="sourceLineNo">205</span>        candidateIdx++;<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      } else {<a name="line.206"></a>
+<span class="sourceLineNo">207</span>        LOG.debug("Skipping region {} of table {} with size {}", hri.getRegionNameAsString(), table,<a name="line.207"></a>
+<span class="sourceLineNo">208</span>          regionSize);<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      }<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    }<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    return plans;<a name="line.211"></a>
+<span class="sourceLineNo">212</span>  }<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span>  /**<a name="line.214"></a>
+<span class="sourceLineNo">215</span>   * Determine if a region in {@link RegionState} should be considered for a split operation.<a name="line.215"></a>
 <span class="sourceLineNo">216</span>   */<a name="line.216"></a>
-<span class="sourceLineNo">217</span>  protected List&lt;NormalizationPlan&gt; getSplitNormalizationPlan(TableName table) {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    final RegionStates regionStates = masterServices.getAssignmentManager().getRegionStates();<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    final List&lt;RegionInfo&gt; tableRegions = regionStates.getRegionsOfTable(table);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    final double avgRegionSize = getAverageRegionSize(tableRegions);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    LOG.debug("Table {}, average region size: {}", table, avgRegionSize);<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span>    final List&lt;NormalizationPlan&gt; plans = new ArrayList&lt;&gt;();<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    for (final RegionInfo hri : tableRegions) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>      if (skipForSplit(regionStates.getRegionState(hri))) {<a name="line.225"></a>
-<span class="sourceLineNo">226</span>        continue;<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      }<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      long regionSize = getRegionSize(hri);<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      // if the region is &gt; 2 times larger than average, we split it, split<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      // is more high priority normalization action than merge.<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      if (regionSize &gt; 2 * avgRegionSize) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span>        LOG.info("Table {}, large region {} has size {}, more than twice avg size {}, splitting",<a name="line.232"></a>
-<span class="sourceLineNo">233</span>          table, hri.getRegionNameAsString(), regionSize, avgRegionSize);<a name="line.233"></a>
-<span class="sourceLineNo">234</span>        plans.add(new SplitNormalizationPlan(hri, null));<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>    return plans;<a name="line.237"></a>
-<span class="sourceLineNo">238</span>  }<a name="line.238"></a>
-<span class="sourceLineNo">239</span>}<a name="line.239"></a>
+<span class="sourceLineNo">217</span>  private static boolean skipForSplit(final RegionState state) {<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    return state == null || !Objects.equals(state.getState(), RegionState.State.OPEN);<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>   * Computes the split plans that should be executed for this table to converge average region size<a name="line.222"></a>
+<span class="sourceLineNo">223</span>   * towards target average or target region count<a name="line.223"></a>
+<span class="sourceLineNo">224</span>   * @param table table to normalize<a name="line.224"></a>
+<span class="sourceLineNo">225</span>   * @return list of split normalization plans<a name="line.225"></a>
+<span class="sourceLineNo">226</span>   */<a name="line.226"></a>
+<span class="sourceLineNo">227</span>  protected List&lt;NormalizationPlan&gt; getSplitNormalizationPlan(TableName table) {<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    final RegionStates regionStates = masterServices.getAssignmentManager().getRegionStates();<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    final List&lt;RegionInfo&gt; tableRegions = regionStates.getRegionsOfTable(table);<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    final double avgRegionSize = getAverageRegionSize(tableRegions);<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    LOG.debug("Table {}, average region size: {}", table, avgRegionSize);<a name="line.231"></a>
+<span class="sourceLineNo">232</span><a name="line.232"></a>
+<span class="sourceLineNo">233</span>    final List&lt;NormalizationPlan&gt; plans = new ArrayList&lt;&gt;();<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    for (final RegionInfo hri : tableRegions) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      if (skipForSplit(regionStates.getRegionState(hri))) {<a name="line.235"></a>
+<span class="sourceLineNo">236</span>        continue;<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      }<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      long regionSize = getRegionSize(hri);<a name="line.238"></a>
+<span class="sourceLineNo">239</span>      // if the region is &gt; 2 times larger than average, we split it, split<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      // is more high priority normalization action than merge.<a name="line.240"></a>
+<span class="sourceLineNo">241</span>      if (regionSize &gt; 2 * avgRegionSize) {<a name="line.241"></a>
+<span class="sourceLineNo">242</span>        LOG.info("Table {}, large region {} has size {}, more than twice avg size {}, splitting",<a name="line.242"></a>
+<span class="sourceLineNo">243</span>          table, hri.getRegionNameAsString(), regionSize, avgRegionSize);<a name="line.243"></a>
+<span class="sourceLineNo">244</span>        plans.add(new SplitNormalizationPlan(hri, null));<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      }<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    }<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    return plans;<a name="line.247"></a>
+<span class="sourceLineNo">248</span>  }<a name="line.248"></a>
+<span class="sourceLineNo">249</span>}<a name="line.249"></a>
 
 
 
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html
index e5ab174..2aa4821 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizer.html
@@ -31,10 +31,10 @@
 <span class="sourceLineNo">023</span>import java.util.List;<a name="line.23"></a>
 <span class="sourceLineNo">024</span>import java.util.concurrent.TimeUnit;<a name="line.24"></a>
 <span class="sourceLineNo">025</span>import org.apache.hadoop.conf.Configuration;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.HBaseIOException;<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.client.RegionInfo;<a name="line.29"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.HBaseIOException;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.TableName;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.29"></a>
 <span class="sourceLineNo">030</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.30"></a>
 <span class="sourceLineNo">031</span>import org.slf4j.Logger;<a name="line.31"></a>
 <span class="sourceLineNo">032</span>import org.slf4j.LoggerFactory;<a name="line.32"></a>
@@ -71,13 +71,13 @@
 <span class="sourceLineNo">063</span>public class MergeNormalizer extends AbstractRegionNormalizer {<a name="line.63"></a>
 <span class="sourceLineNo">064</span>  private static final Logger LOG = LoggerFactory.getLogger(MergeNormalizer.class);<a name="line.64"></a>
 <span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>  private int minRegionCount;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  private int minRegionAge;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>  private static long[] skippedCount = new long[NormalizationPlan.PlanType.values().length];<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>  public MergeNormalizer() {<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    Configuration conf = HBaseConfiguration.create();<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    minRegionCount = conf.getInt("hbase.normalizer.min.region.count", 3);<a name="line.72"></a>
+<span class="sourceLineNo">066</span>  private int minRegionAge;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>  private static long[] skippedCount = new long[NormalizationPlan.PlanType.values().length];<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span>  @Override<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  public void setMasterServices(MasterServices masterServices) {<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    super.setMasterServices(masterServices);<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    Configuration conf = masterServices.getConfiguration();<a name="line.72"></a>
 <span class="sourceLineNo">073</span>    minRegionAge = conf.getInt("hbase.normalizer.min.region.merge.age", 3);<a name="line.73"></a>
 <span class="sourceLineNo">074</span>  }<a name="line.74"></a>
 <span class="sourceLineNo">075</span><a name="line.75"></a>
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.PlanComparator.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.PlanComparator.html
index bc64e05..60cafb3 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.PlanComparator.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.PlanComparator.html
@@ -30,7 +30,7 @@
 <span class="sourceLineNo">022</span>import java.util.Collections;<a name="line.22"></a>
 <span class="sourceLineNo">023</span>import java.util.Comparator;<a name="line.23"></a>
 <span class="sourceLineNo">024</span>import java.util.List;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.25"></a>
+<span class="sourceLineNo">025</span><a name="line.25"></a>
 <span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.HBaseIOException;<a name="line.26"></a>
 <span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.TableName;<a name="line.27"></a>
 <span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.28"></a>
@@ -59,99 +59,96 @@
 <span class="sourceLineNo">051</span>public class SimpleRegionNormalizer extends AbstractRegionNormalizer {<a name="line.51"></a>
 <span class="sourceLineNo">052</span><a name="line.52"></a>
 <span class="sourceLineNo">053</span>  private static final Logger LOG = LoggerFactory.getLogger(SimpleRegionNormalizer.class);<a name="line.53"></a>
-<span class="sourceLineNo">054</span>  private int minRegionCount;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>  private static long[] skippedCount = new long[NormalizationPlan.PlanType.values().length];<a name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span>  public SimpleRegionNormalizer() {<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    minRegionCount = HBaseConfiguration.create().getInt("hbase.normalizer.min.region.count", 3);<a name="line.58"></a>
+<span class="sourceLineNo">054</span>  private static long[] skippedCount = new long[NormalizationPlan.PlanType.values().length];<a name="line.54"></a>
+<span class="sourceLineNo">055</span><a name="line.55"></a>
+<span class="sourceLineNo">056</span>  @Override<a name="line.56"></a>
+<span class="sourceLineNo">057</span>  public void planSkipped(RegionInfo hri, PlanType type) {<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    skippedCount[type.ordinal()]++;<a name="line.58"></a>
 <span class="sourceLineNo">059</span>  }<a name="line.59"></a>
 <span class="sourceLineNo">060</span><a name="line.60"></a>
 <span class="sourceLineNo">061</span>  @Override<a name="line.61"></a>
-<span class="sourceLineNo">062</span>  public void planSkipped(RegionInfo hri, PlanType type) {<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    skippedCount[type.ordinal()]++;<a name="line.63"></a>
+<span class="sourceLineNo">062</span>  public long getSkippedCount(NormalizationPlan.PlanType type) {<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    return skippedCount[type.ordinal()];<a name="line.63"></a>
 <span class="sourceLineNo">064</span>  }<a name="line.64"></a>
 <span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>  @Override<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  public long getSkippedCount(NormalizationPlan.PlanType type) {<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    return skippedCount[type.ordinal()];<a name="line.68"></a>
-<span class="sourceLineNo">069</span>  }<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span>  /**<a name="line.71"></a>
-<span class="sourceLineNo">072</span>   * Comparator class that gives higher priority to region Split plan.<a name="line.72"></a>
-<span class="sourceLineNo">073</span>   */<a name="line.73"></a>
-<span class="sourceLineNo">074</span>  static class PlanComparator implements Comparator&lt;NormalizationPlan&gt; {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    @Override<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    public int compare(NormalizationPlan plan1, NormalizationPlan plan2) {<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      boolean plan1IsSplit = plan1 instanceof SplitNormalizationPlan;<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      boolean plan2IsSplit = plan2 instanceof SplitNormalizationPlan;<a name="line.78"></a>
-<span class="sourceLineNo">079</span>      if (plan1IsSplit &amp;&amp; plan2IsSplit) {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>        return 0;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      } else if (plan1IsSplit) {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>        return -1;<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      } else if (plan2IsSplit) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span>        return 1;<a name="line.84"></a>
-<span class="sourceLineNo">085</span>      } else {<a name="line.85"></a>
-<span class="sourceLineNo">086</span>        return 0;<a name="line.86"></a>
-<span class="sourceLineNo">087</span>      }<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    }<a name="line.88"></a>
-<span class="sourceLineNo">089</span>  }<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span>  private Comparator&lt;NormalizationPlan&gt; planComparator = new PlanComparator();<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span>  /**<a name="line.93"></a>
-<span class="sourceLineNo">094</span>   * Computes next most "urgent" normalization action on the table. Action may be either a split, or<a name="line.94"></a>
-<span class="sourceLineNo">095</span>   * a merge, or no action.<a name="line.95"></a>
-<span class="sourceLineNo">096</span>   * @param table table to normalize<a name="line.96"></a>
-<span class="sourceLineNo">097</span>   * @return normalization plan to execute<a name="line.97"></a>
-<span class="sourceLineNo">098</span>   */<a name="line.98"></a>
-<span class="sourceLineNo">099</span>  @Override<a name="line.99"></a>
-<span class="sourceLineNo">100</span>  public List&lt;NormalizationPlan&gt; computePlanForTable(TableName table) throws HBaseIOException {<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    if (table == null || table.isSystemTable()) {<a name="line.101"></a>
-<span class="sourceLineNo">102</span>      LOG.debug("Normalization of system table {} isn't allowed", table);<a name="line.102"></a>
-<span class="sourceLineNo">103</span>      return null;<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    }<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    boolean splitEnabled = isSplitEnabled();<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    boolean mergeEnabled = isMergeEnabled();<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    if (!mergeEnabled &amp;&amp; !splitEnabled) {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>      LOG.debug("Both split and merge are disabled for table: {}", table);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      return null;<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    }<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    List&lt;NormalizationPlan&gt; plans = new ArrayList&lt;&gt;();<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    List&lt;RegionInfo&gt; tableRegions =<a name="line.112"></a>
-<span class="sourceLineNo">113</span>        masterServices.getAssignmentManager().getRegionStates().getRegionsOfTable(table);<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span>    if (tableRegions == null || tableRegions.size() &lt; minRegionCount) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      int nrRegions = tableRegions == null ? 0 : tableRegions.size();<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      LOG.debug("Table {} has {} regions, required min number of regions for normalizer to run is "<a name="line.117"></a>
-<span class="sourceLineNo">118</span>          + "{}, not running normalizer",<a name="line.118"></a>
-<span class="sourceLineNo">119</span>        table, nrRegions, minRegionCount);<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      return null;<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    }<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span>    LOG.debug("Computing normalization plan for table:  {}, number of regions: {}", table,<a name="line.123"></a>
-<span class="sourceLineNo">124</span>      tableRegions.size());<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>    if (splitEnabled) {<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      List&lt;NormalizationPlan&gt; splitPlans = getSplitNormalizationPlan(table);<a name="line.127"></a>
-<span class="sourceLineNo">128</span>      if (splitPlans != null) {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>        plans.addAll(splitPlans);<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      }<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span>    if (mergeEnabled) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      List&lt;NormalizationPlan&gt; mergePlans = getMergeNormalizationPlan(table);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      if (mergePlans != null) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>        plans.addAll(mergePlans);<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      }<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    if (plans.isEmpty()) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      LOG.debug("No normalization needed, regions look good for table: {}", table);<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      return null;<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    }<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    Collections.sort(plans, planComparator);<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    return plans;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>  }<a name="line.145"></a>
-<span class="sourceLineNo">146</span>}<a name="line.146"></a>
+<span class="sourceLineNo">066</span>  /**<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   * Comparator class that gives higher priority to region Split plan.<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  static class PlanComparator implements Comparator&lt;NormalizationPlan&gt; {<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    @Override<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    public int compare(NormalizationPlan plan1, NormalizationPlan plan2) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      boolean plan1IsSplit = plan1 instanceof SplitNormalizationPlan;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>      boolean plan2IsSplit = plan2 instanceof SplitNormalizationPlan;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      if (plan1IsSplit &amp;&amp; plan2IsSplit) {<a name="line.74"></a>
+<span class="sourceLineNo">075</span>        return 0;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      } else if (plan1IsSplit) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>        return -1;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>      } else if (plan2IsSplit) {<a name="line.78"></a>
+<span class="sourceLineNo">079</span>        return 1;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      } else {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>        return 0;<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      }<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    }<a name="line.83"></a>
+<span class="sourceLineNo">084</span>  }<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span>  private Comparator&lt;NormalizationPlan&gt; planComparator = new PlanComparator();<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span>  /**<a name="line.88"></a>
+<span class="sourceLineNo">089</span>   * Computes next most "urgent" normalization action on the table. Action may be either a split, or<a name="line.89"></a>
+<span class="sourceLineNo">090</span>   * a merge, or no action.<a name="line.90"></a>
+<span class="sourceLineNo">091</span>   * @param table table to normalize<a name="line.91"></a>
+<span class="sourceLineNo">092</span>   * @return normalization plan to execute<a name="line.92"></a>
+<span class="sourceLineNo">093</span>   */<a name="line.93"></a>
+<span class="sourceLineNo">094</span>  @Override<a name="line.94"></a>
+<span class="sourceLineNo">095</span>  public List&lt;NormalizationPlan&gt; computePlanForTable(TableName table) throws HBaseIOException {<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    if (table == null || table.isSystemTable()) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      LOG.debug("Normalization of system table {} isn't allowed", table);<a name="line.97"></a>
+<span class="sourceLineNo">098</span>      return null;<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    }<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    boolean splitEnabled = isSplitEnabled();<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    boolean mergeEnabled = isMergeEnabled();<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    if (!mergeEnabled &amp;&amp; !splitEnabled) {<a name="line.102"></a>
+<span class="sourceLineNo">103</span>      LOG.debug("Both split and merge are disabled for table: {}", table);<a name="line.103"></a>
+<span class="sourceLineNo">104</span>      return null;<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    }<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    List&lt;NormalizationPlan&gt; plans = new ArrayList&lt;&gt;();<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    List&lt;RegionInfo&gt; tableRegions =<a name="line.107"></a>
+<span class="sourceLineNo">108</span>        masterServices.getAssignmentManager().getRegionStates().getRegionsOfTable(table);<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span>    if (tableRegions == null) {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>      return null;<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    }<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span>    LOG.debug("Computing normalization plan for table:  {}, number of regions: {}", table,<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      tableRegions.size());<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span>    if (splitEnabled) {<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      List&lt;NormalizationPlan&gt; splitPlans = getSplitNormalizationPlan(table);<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      if (splitPlans != null) {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>        plans.addAll(splitPlans);<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      }<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    }<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span>    if (mergeEnabled) {<a name="line.124"></a>
+<span class="sourceLineNo">125</span>      if (tableRegions.size() &lt; minRegionCount) {<a name="line.125"></a>
+<span class="sourceLineNo">126</span>        LOG.debug("Table {} has {} regions, required min number of regions for normalizer to run" +<a name="line.126"></a>
+<span class="sourceLineNo">127</span>                " is {}, not running normalizer",<a name="line.127"></a>
+<span class="sourceLineNo">128</span>            table, tableRegions.size(), minRegionCount);<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      } else {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>        List&lt;NormalizationPlan&gt; mergePlans = getMergeNormalizationPlan(table);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>        if (mergePlans != null) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>          plans.addAll(mergePlans);<a name="line.132"></a>
+<span class="sourceLineNo">133</span>        }<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      }<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    }<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    if (plans.isEmpty()) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>      LOG.debug("No normalization needed, regions look good for table: {}", table);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      return null;<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    }<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    Collections.sort(plans, planComparator);<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    return plans;<a name="line.141"></a>
+<span class="sourceLineNo">142</span>  }<a name="line.142"></a>
+<span class="sourceLineNo">143</span>}<a name="line.143"></a>
 
 
 
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html
index bc64e05..60cafb3 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html
@@ -30,7 +30,7 @@
 <span class="sourceLineNo">022</span>import java.util.Collections;<a name="line.22"></a>
 <span class="sourceLineNo">023</span>import java.util.Comparator;<a name="line.23"></a>
 <span class="sourceLineNo">024</span>import java.util.List;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.25"></a>
+<span class="sourceLineNo">025</span><a name="line.25"></a>
 <span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.HBaseIOException;<a name="line.26"></a>
 <span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.TableName;<a name="line.27"></a>
 <span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.28"></a>
@@ -59,99 +59,96 @@
 <span class="sourceLineNo">051</span>public class SimpleRegionNormalizer extends AbstractRegionNormalizer {<a name="line.51"></a>
 <span class="sourceLineNo">052</span><a name="line.52"></a>
 <span class="sourceLineNo">053</span>  private static final Logger LOG = LoggerFactory.getLogger(SimpleRegionNormalizer.class);<a name="line.53"></a>
-<span class="sourceLineNo">054</span>  private int minRegionCount;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>  private static long[] skippedCount = new long[NormalizationPlan.PlanType.values().length];<a name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span>  public SimpleRegionNormalizer() {<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    minRegionCount = HBaseConfiguration.create().getInt("hbase.normalizer.min.region.count", 3);<a name="line.58"></a>
+<span class="sourceLineNo">054</span>  private static long[] skippedCount = new long[NormalizationPlan.PlanType.values().length];<a name="line.54"></a>
+<span class="sourceLineNo">055</span><a name="line.55"></a>
+<span class="sourceLineNo">056</span>  @Override<a name="line.56"></a>
+<span class="sourceLineNo">057</span>  public void planSkipped(RegionInfo hri, PlanType type) {<a name="line.57"></a>
+<span class="sourceLineNo">058</span>    skippedCount[type.ordinal()]++;<a name="line.58"></a>
 <span class="sourceLineNo">059</span>  }<a name="line.59"></a>
 <span class="sourceLineNo">060</span><a name="line.60"></a>
 <span class="sourceLineNo">061</span>  @Override<a name="line.61"></a>
-<span class="sourceLineNo">062</span>  public void planSkipped(RegionInfo hri, PlanType type) {<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    skippedCount[type.ordinal()]++;<a name="line.63"></a>
+<span class="sourceLineNo">062</span>  public long getSkippedCount(NormalizationPlan.PlanType type) {<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    return skippedCount[type.ordinal()];<a name="line.63"></a>
 <span class="sourceLineNo">064</span>  }<a name="line.64"></a>
 <span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>  @Override<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  public long getSkippedCount(NormalizationPlan.PlanType type) {<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    return skippedCount[type.ordinal()];<a name="line.68"></a>
-<span class="sourceLineNo">069</span>  }<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span>  /**<a name="line.71"></a>
-<span class="sourceLineNo">072</span>   * Comparator class that gives higher priority to region Split plan.<a name="line.72"></a>
-<span class="sourceLineNo">073</span>   */<a name="line.73"></a>
-<span class="sourceLineNo">074</span>  static class PlanComparator implements Comparator&lt;NormalizationPlan&gt; {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>    @Override<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    public int compare(NormalizationPlan plan1, NormalizationPlan plan2) {<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      boolean plan1IsSplit = plan1 instanceof SplitNormalizationPlan;<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      boolean plan2IsSplit = plan2 instanceof SplitNormalizationPlan;<a name="line.78"></a>
-<span class="sourceLineNo">079</span>      if (plan1IsSplit &amp;&amp; plan2IsSplit) {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>        return 0;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      } else if (plan1IsSplit) {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>        return -1;<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      } else if (plan2IsSplit) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span>        return 1;<a name="line.84"></a>
-<span class="sourceLineNo">085</span>      } else {<a name="line.85"></a>
-<span class="sourceLineNo">086</span>        return 0;<a name="line.86"></a>
-<span class="sourceLineNo">087</span>      }<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    }<a name="line.88"></a>
-<span class="sourceLineNo">089</span>  }<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span>  private Comparator&lt;NormalizationPlan&gt; planComparator = new PlanComparator();<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span>  /**<a name="line.93"></a>
-<span class="sourceLineNo">094</span>   * Computes next most "urgent" normalization action on the table. Action may be either a split, or<a name="line.94"></a>
-<span class="sourceLineNo">095</span>   * a merge, or no action.<a name="line.95"></a>
-<span class="sourceLineNo">096</span>   * @param table table to normalize<a name="line.96"></a>
-<span class="sourceLineNo">097</span>   * @return normalization plan to execute<a name="line.97"></a>
-<span class="sourceLineNo">098</span>   */<a name="line.98"></a>
-<span class="sourceLineNo">099</span>  @Override<a name="line.99"></a>
-<span class="sourceLineNo">100</span>  public List&lt;NormalizationPlan&gt; computePlanForTable(TableName table) throws HBaseIOException {<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    if (table == null || table.isSystemTable()) {<a name="line.101"></a>
-<span class="sourceLineNo">102</span>      LOG.debug("Normalization of system table {} isn't allowed", table);<a name="line.102"></a>
-<span class="sourceLineNo">103</span>      return null;<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    }<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    boolean splitEnabled = isSplitEnabled();<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    boolean mergeEnabled = isMergeEnabled();<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    if (!mergeEnabled &amp;&amp; !splitEnabled) {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>      LOG.debug("Both split and merge are disabled for table: {}", table);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      return null;<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    }<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    List&lt;NormalizationPlan&gt; plans = new ArrayList&lt;&gt;();<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    List&lt;RegionInfo&gt; tableRegions =<a name="line.112"></a>
-<span class="sourceLineNo">113</span>        masterServices.getAssignmentManager().getRegionStates().getRegionsOfTable(table);<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span>    if (tableRegions == null || tableRegions.size() &lt; minRegionCount) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      int nrRegions = tableRegions == null ? 0 : tableRegions.size();<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      LOG.debug("Table {} has {} regions, required min number of regions for normalizer to run is "<a name="line.117"></a>
-<span class="sourceLineNo">118</span>          + "{}, not running normalizer",<a name="line.118"></a>
-<span class="sourceLineNo">119</span>        table, nrRegions, minRegionCount);<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      return null;<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    }<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span>    LOG.debug("Computing normalization plan for table:  {}, number of regions: {}", table,<a name="line.123"></a>
-<span class="sourceLineNo">124</span>      tableRegions.size());<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>    if (splitEnabled) {<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      List&lt;NormalizationPlan&gt; splitPlans = getSplitNormalizationPlan(table);<a name="line.127"></a>
-<span class="sourceLineNo">128</span>      if (splitPlans != null) {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>        plans.addAll(splitPlans);<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      }<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    }<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span>    if (mergeEnabled) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      List&lt;NormalizationPlan&gt; mergePlans = getMergeNormalizationPlan(table);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      if (mergePlans != null) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>        plans.addAll(mergePlans);<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      }<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    if (plans.isEmpty()) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      LOG.debug("No normalization needed, regions look good for table: {}", table);<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      return null;<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    }<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    Collections.sort(plans, planComparator);<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    return plans;<a name="line.144"></a>
-<span class="sourceLineNo">145</span>  }<a name="line.145"></a>
-<span class="sourceLineNo">146</span>}<a name="line.146"></a>
+<span class="sourceLineNo">066</span>  /**<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   * Comparator class that gives higher priority to region Split plan.<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  static class PlanComparator implements Comparator&lt;NormalizationPlan&gt; {<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    @Override<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    public int compare(NormalizationPlan plan1, NormalizationPlan plan2) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      boolean plan1IsSplit = plan1 instanceof SplitNormalizationPlan;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>      boolean plan2IsSplit = plan2 instanceof SplitNormalizationPlan;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      if (plan1IsSplit &amp;&amp; plan2IsSplit) {<a name="line.74"></a>
+<span class="sourceLineNo">075</span>        return 0;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      } else if (plan1IsSplit) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>        return -1;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>      } else if (plan2IsSplit) {<a name="line.78"></a>
+<span class="sourceLineNo">079</span>        return 1;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>      } else {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>        return 0;<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      }<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    }<a name="line.83"></a>
+<span class="sourceLineNo">084</span>  }<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span>  private Comparator&lt;NormalizationPlan&gt; planComparator = new PlanComparator();<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span>  /**<a name="line.88"></a>
+<span class="sourceLineNo">089</span>   * Computes next most "urgent" normalization action on the table. Action may be either a split, or<a name="line.89"></a>
+<span class="sourceLineNo">090</span>   * a merge, or no action.<a name="line.90"></a>
+<span class="sourceLineNo">091</span>   * @param table table to normalize<a name="line.91"></a>
+<span class="sourceLineNo">092</span>   * @return normalization plan to execute<a name="line.92"></a>
+<span class="sourceLineNo">093</span>   */<a name="line.93"></a>
+<span class="sourceLineNo">094</span>  @Override<a name="line.94"></a>
+<span class="sourceLineNo">095</span>  public List&lt;NormalizationPlan&gt; computePlanForTable(TableName table) throws HBaseIOException {<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    if (table == null || table.isSystemTable()) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      LOG.debug("Normalization of system table {} isn't allowed", table);<a name="line.97"></a>
+<span class="sourceLineNo">098</span>      return null;<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    }<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    boolean splitEnabled = isSplitEnabled();<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    boolean mergeEnabled = isMergeEnabled();<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    if (!mergeEnabled &amp;&amp; !splitEnabled) {<a name="line.102"></a>
+<span class="sourceLineNo">103</span>      LOG.debug("Both split and merge are disabled for table: {}", table);<a name="line.103"></a>
+<span class="sourceLineNo">104</span>      return null;<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    }<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    List&lt;NormalizationPlan&gt; plans = new ArrayList&lt;&gt;();<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    List&lt;RegionInfo&gt; tableRegions =<a name="line.107"></a>
+<span class="sourceLineNo">108</span>        masterServices.getAssignmentManager().getRegionStates().getRegionsOfTable(table);<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span>    if (tableRegions == null) {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>      return null;<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    }<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span>    LOG.debug("Computing normalization plan for table:  {}, number of regions: {}", table,<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      tableRegions.size());<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span>    if (splitEnabled) {<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      List&lt;NormalizationPlan&gt; splitPlans = getSplitNormalizationPlan(table);<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      if (splitPlans != null) {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>        plans.addAll(splitPlans);<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      }<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    }<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span>    if (mergeEnabled) {<a name="line.124"></a>
+<span class="sourceLineNo">125</span>      if (tableRegions.size() &lt; minRegionCount) {<a name="line.125"></a>
+<span class="sourceLineNo">126</span>        LOG.debug("Table {} has {} regions, required min number of regions for normalizer to run" +<a name="line.126"></a>
+<span class="sourceLineNo">127</span>                " is {}, not running normalizer",<a name="line.127"></a>
+<span class="sourceLineNo">128</span>            table, tableRegions.size(), minRegionCount);<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      } else {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>        List&lt;NormalizationPlan&gt; mergePlans = getMergeNormalizationPlan(table);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>        if (mergePlans != null) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span>          plans.addAll(mergePlans);<a name="line.132"></a>
+<span class="sourceLineNo">133</span>        }<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      }<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    }<a name="line.135"></a>
+<span class="sourceLineNo">136</span>    if (plans.isEmpty()) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>      LOG.debug("No normalization needed, regions look good for table: {}", table);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      return null;<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    }<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    Collections.sort(plans, planComparator);<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    return plans;<a name="line.141"></a>
+<span class="sourceLineNo">142</span>  }<a name="line.142"></a>
+<span class="sourceLineNo">143</span>}<a name="line.143"></a>
 
 
 
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html
index 9ac0eeb..2895138 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.StoreFlusherImpl.html
@@ -2069,830 +2069,825 @@
 <span class="sourceLineNo">2061</span><a name="line.2061"></a>
 <span class="sourceLineNo">2062</span>  @Override<a name="line.2062"></a>
 <span class="sourceLineNo">2063</span>  public boolean canSplit() {<a name="line.2063"></a>
-<span class="sourceLineNo">2064</span>    this.lock.readLock().lock();<a name="line.2064"></a>
-<span class="sourceLineNo">2065</span>    try {<a name="line.2065"></a>
-<span class="sourceLineNo">2066</span>      // Not split-able if we find a reference store file present in the store.<a name="line.2066"></a>
-<span class="sourceLineNo">2067</span>      boolean result = !hasReferences();<a name="line.2067"></a>
-<span class="sourceLineNo">2068</span>      if (!result) {<a name="line.2068"></a>
-<span class="sourceLineNo">2069</span>        LOG.trace("Not splittable; has references: {}", this);<a name="line.2069"></a>
-<span class="sourceLineNo">2070</span>      }<a name="line.2070"></a>
-<span class="sourceLineNo">2071</span>      return result;<a name="line.2071"></a>
-<span class="sourceLineNo">2072</span>    } finally {<a name="line.2072"></a>
-<span class="sourceLineNo">2073</span>      this.lock.readLock().unlock();<a name="line.2073"></a>
-<span class="sourceLineNo">2074</span>    }<a name="line.2074"></a>
-<span class="sourceLineNo">2075</span>  }<a name="line.2075"></a>
-<span class="sourceLineNo">2076</span><a name="line.2076"></a>
-<span class="sourceLineNo">2077</span>  /**<a name="line.2077"></a>
-<span class="sourceLineNo">2078</span>   * Determines if Store should be split.<a name="line.2078"></a>
-<span class="sourceLineNo">2079</span>   */<a name="line.2079"></a>
-<span class="sourceLineNo">2080</span>  public Optional&lt;byte[]&gt; getSplitPoint() {<a name="line.2080"></a>
-<span class="sourceLineNo">2081</span>    this.lock.readLock().lock();<a name="line.2081"></a>
-<span class="sourceLineNo">2082</span>    try {<a name="line.2082"></a>
-<span class="sourceLineNo">2083</span>      // Should already be enforced by the split policy!<a name="line.2083"></a>
-<span class="sourceLineNo">2084</span>      assert !this.getRegionInfo().isMetaRegion();<a name="line.2084"></a>
-<span class="sourceLineNo">2085</span>      // Not split-able if we find a reference store file present in the store.<a name="line.2085"></a>
-<span class="sourceLineNo">2086</span>      if (hasReferences()) {<a name="line.2086"></a>
-<span class="sourceLineNo">2087</span>        LOG.trace("Not splittable; has references: {}", this);<a name="line.2087"></a>
-<span class="sourceLineNo">2088</span>        return Optional.empty();<a name="line.2088"></a>
-<span class="sourceLineNo">2089</span>      }<a name="line.2089"></a>
-<span class="sourceLineNo">2090</span>      return this.storeEngine.getStoreFileManager().getSplitPoint();<a name="line.2090"></a>
-<span class="sourceLineNo">2091</span>    } catch(IOException e) {<a name="line.2091"></a>
-<span class="sourceLineNo">2092</span>      LOG.warn("Failed getting store size for {}", this, e);<a name="line.2092"></a>
-<span class="sourceLineNo">2093</span>    } finally {<a name="line.2093"></a>
-<span class="sourceLineNo">2094</span>      this.lock.readLock().unlock();<a name="line.2094"></a>
-<span class="sourceLineNo">2095</span>    }<a name="line.2095"></a>
-<span class="sourceLineNo">2096</span>    return Optional.empty();<a name="line.2096"></a>
+<span class="sourceLineNo">2064</span>    // Not split-able if we find a reference store file present in the store.<a name="line.2064"></a>
+<span class="sourceLineNo">2065</span>    boolean result = !hasReferences();<a name="line.2065"></a>
+<span class="sourceLineNo">2066</span>    if (!result) {<a name="line.2066"></a>
+<span class="sourceLineNo">2067</span>      LOG.trace("Not splittable; has references: {}", this);<a name="line.2067"></a>
+<span class="sourceLineNo">2068</span>    }<a name="line.2068"></a>
+<span class="sourceLineNo">2069</span>    return result;<a name="line.2069"></a>
+<span class="sourceLineNo">2070</span>  }<a name="line.2070"></a>
+<span class="sourceLineNo">2071</span><a name="line.2071"></a>
+<span class="sourceLineNo">2072</span>  /**<a name="line.2072"></a>
+<span class="sourceLineNo">2073</span>   * Determines if Store should be split.<a name="line.2073"></a>
+<span class="sourceLineNo">2074</span>   */<a name="line.2074"></a>
+<span class="sourceLineNo">2075</span>  public Optional&lt;byte[]&gt; getSplitPoint() {<a name="line.2075"></a>
+<span class="sourceLineNo">2076</span>    this.lock.readLock().lock();<a name="line.2076"></a>
+<span class="sourceLineNo">2077</span>    try {<a name="line.2077"></a>
+<span class="sourceLineNo">2078</span>      // Should already be enforced by the split policy!<a name="line.2078"></a>
+<span class="sourceLineNo">2079</span>      assert !this.getRegionInfo().isMetaRegion();<a name="line.2079"></a>
+<span class="sourceLineNo">2080</span>      // Not split-able if we find a reference store file present in the store.<a name="line.2080"></a>
+<span class="sourceLineNo">2081</span>      if (hasReferences()) {<a name="line.2081"></a>
+<span class="sourceLineNo">2082</span>        LOG.trace("Not splittable; has references: {}", this);<a name="line.2082"></a>
+<span class="sourceLineNo">2083</span>        return Optional.empty();<a name="line.2083"></a>
+<span class="sourceLineNo">2084</span>      }<a name="line.2084"></a>
+<span class="sourceLineNo">2085</span>      return this.storeEngine.getStoreFileManager().getSplitPoint();<a name="line.2085"></a>
+<span class="sourceLineNo">2086</span>    } catch(IOException e) {<a name="line.2086"></a>
+<span class="sourceLineNo">2087</span>      LOG.warn("Failed getting store size for {}", this, e);<a name="line.2087"></a>
+<span class="sourceLineNo">2088</span>    } finally {<a name="line.2088"></a>
+<span class="sourceLineNo">2089</span>      this.lock.readLock().unlock();<a name="line.2089"></a>
+<span class="sourceLineNo">2090</span>    }<a name="line.2090"></a>
+<span class="sourceLineNo">2091</span>    return Optional.empty();<a name="line.2091"></a>
+<span class="sourceLineNo">2092</span>  }<a name="line.2092"></a>
+<span class="sourceLineNo">2093</span><a name="line.2093"></a>
+<span class="sourceLineNo">2094</span>  @Override<a name="line.2094"></a>
+<span class="sourceLineNo">2095</span>  public long getLastCompactSize() {<a name="line.2095"></a>
+<span class="sourceLineNo">2096</span>    return this.lastCompactSize;<a name="line.2096"></a>
 <span class="sourceLineNo">2097</span>  }<a name="line.2097"></a>
 <span class="sourceLineNo">2098</span><a name="line.2098"></a>
 <span class="sourceLineNo">2099</span>  @Override<a name="line.2099"></a>
-<span class="sourceLineNo">2100</span>  public long getLastCompactSize() {<a name="line.2100"></a>
-<span class="sourceLineNo">2101</span>    return this.lastCompactSize;<a name="line.2101"></a>
+<span class="sourceLineNo">2100</span>  public long getSize() {<a name="line.2100"></a>
+<span class="sourceLineNo">2101</span>    return storeSize.get();<a name="line.2101"></a>
 <span class="sourceLineNo">2102</span>  }<a name="line.2102"></a>
 <span class="sourceLineNo">2103</span><a name="line.2103"></a>
-<span class="sourceLineNo">2104</span>  @Override<a name="line.2104"></a>
-<span class="sourceLineNo">2105</span>  public long getSize() {<a name="line.2105"></a>
-<span class="sourceLineNo">2106</span>    return storeSize.get();<a name="line.2106"></a>
-<span class="sourceLineNo">2107</span>  }<a name="line.2107"></a>
-<span class="sourceLineNo">2108</span><a name="line.2108"></a>
-<span class="sourceLineNo">2109</span>  public void triggerMajorCompaction() {<a name="line.2109"></a>
-<span class="sourceLineNo">2110</span>    this.forceMajor = true;<a name="line.2110"></a>
-<span class="sourceLineNo">2111</span>  }<a name="line.2111"></a>
-<span class="sourceLineNo">2112</span><a name="line.2112"></a>
-<span class="sourceLineNo">2113</span>  //////////////////////////////////////////////////////////////////////////////<a name="line.2113"></a>
-<span class="sourceLineNo">2114</span>  // File administration<a name="line.2114"></a>
-<span class="sourceLineNo">2115</span>  //////////////////////////////////////////////////////////////////////////////<a name="line.2115"></a>
-<span class="sourceLineNo">2116</span><a name="line.2116"></a>
-<span class="sourceLineNo">2117</span>  /**<a name="line.2117"></a>
-<span class="sourceLineNo">2118</span>   * Return a scanner for both the memstore and the HStore files. Assumes we are not in a<a name="line.2118"></a>
-<span class="sourceLineNo">2119</span>   * compaction.<a name="line.2119"></a>
-<span class="sourceLineNo">2120</span>   * @param scan Scan to apply when scanning the stores<a name="line.2120"></a>
-<span class="sourceLineNo">2121</span>   * @param targetCols columns to scan<a name="line.2121"></a>
-<span class="sourceLineNo">2122</span>   * @return a scanner over the current key values<a name="line.2122"></a>
-<span class="sourceLineNo">2123</span>   * @throws IOException on failure<a name="line.2123"></a>
-<span class="sourceLineNo">2124</span>   */<a name="line.2124"></a>
-<span class="sourceLineNo">2125</span>  public KeyValueScanner getScanner(Scan scan, final NavigableSet&lt;byte[]&gt; targetCols, long readPt)<a name="line.2125"></a>
-<span class="sourceLineNo">2126</span>      throws IOException {<a name="line.2126"></a>
-<span class="sourceLineNo">2127</span>    lock.readLock().lock();<a name="line.2127"></a>
-<span class="sourceLineNo">2128</span>    try {<a name="line.2128"></a>
-<span class="sourceLineNo">2129</span>      ScanInfo scanInfo;<a name="line.2129"></a>
-<span class="sourceLineNo">2130</span>      if (this.getCoprocessorHost() != null) {<a name="line.2130"></a>
-<span class="sourceLineNo">2131</span>        scanInfo = this.getCoprocessorHost().preStoreScannerOpen(this, scan);<a name="line.2131"></a>
-<span class="sourceLineNo">2132</span>      } else {<a name="line.2132"></a>
-<span class="sourceLineNo">2133</span>        scanInfo = getScanInfo();<a name="line.2133"></a>
-<span class="sourceLineNo">2134</span>      }<a name="line.2134"></a>
-<span class="sourceLineNo">2135</span>      return createScanner(scan, scanInfo, targetCols, readPt);<a name="line.2135"></a>
-<span class="sourceLineNo">2136</span>    } finally {<a name="line.2136"></a>
-<span class="sourceLineNo">2137</span>      lock.readLock().unlock();<a name="line.2137"></a>
-<span class="sourceLineNo">2138</span>    }<a name="line.2138"></a>
-<span class="sourceLineNo">2139</span>  }<a name="line.2139"></a>
-<span class="sourceLineNo">2140</span><a name="line.2140"></a>
-<span class="sourceLineNo">2141</span>  // HMobStore will override this method to return its own implementation.<a name="line.2141"></a>
-<span class="sourceLineNo">2142</span>  protected KeyValueScanner createScanner(Scan scan, ScanInfo scanInfo,<a name="line.2142"></a>
-<span class="sourceLineNo">2143</span>      NavigableSet&lt;byte[]&gt; targetCols, long readPt) throws IOException {<a name="line.2143"></a>
-<span class="sourceLineNo">2144</span>    return scan.isReversed() ? new ReversedStoreScanner(this, scanInfo, scan, targetCols, readPt)<a name="line.2144"></a>
-<span class="sourceLineNo">2145</span>        : new StoreScanner(this, scanInfo, scan, targetCols, readPt);<a name="line.2145"></a>
-<span class="sourceLineNo">2146</span>  }<a name="line.2146"></a>
-<span class="sourceLineNo">2147</span><a name="line.2147"></a>
-<span class="sourceLineNo">2148</span>  /**<a name="line.2148"></a>
-<span class="sourceLineNo">2149</span>   * Recreates the scanners on the current list of active store file scanners<a name="line.2149"></a>
-<span class="sourceLineNo">2150</span>   * @param currentFileScanners the current set of active store file scanners<a name="line.2150"></a>
-<span class="sourceLineNo">2151</span>   * @param cacheBlocks cache the blocks or not<a name="line.2151"></a>
-<span class="sourceLineNo">2152</span>   * @param usePread use pread or not<a name="line.2152"></a>
-<span class="sourceLineNo">2153</span>   * @param isCompaction is the scanner for compaction<a name="line.2153"></a>
-<span class="sourceLineNo">2154</span>   * @param matcher the scan query matcher<a name="line.2154"></a>
-<span class="sourceLineNo">2155</span>   * @param startRow the scan's start row<a name="line.2155"></a>
-<span class="sourceLineNo">2156</span>   * @param includeStartRow should the scan include the start row<a name="line.2156"></a>
-<span class="sourceLineNo">2157</span>   * @param stopRow the scan's stop row<a name="line.2157"></a>
-<span class="sourceLineNo">2158</span>   * @param includeStopRow should the scan include the stop row<a name="line.2158"></a>
-<span class="sourceLineNo">2159</span>   * @param readPt the read point of the current scane<a name="line.2159"></a>
-<span class="sourceLineNo">2160</span>   * @param includeMemstoreScanner whether the current scanner should include memstorescanner<a name="line.2160"></a>
-<span class="sourceLineNo">2161</span>   * @return list of scanners recreated on the current Scanners<a name="line.2161"></a>
-<span class="sourceLineNo">2162</span>   */<a name="line.2162"></a>
-<span class="sourceLineNo">2163</span>  public List&lt;KeyValueScanner&gt; recreateScanners(List&lt;KeyValueScanner&gt; currentFileScanners,<a name="line.2163"></a>
-<span class="sourceLineNo">2164</span>      boolean cacheBlocks, boolean usePread, boolean isCompaction, ScanQueryMatcher matcher,<a name="line.2164"></a>
-<span class="sourceLineNo">2165</span>      byte[] startRow, boolean includeStartRow, byte[] stopRow, boolean includeStopRow, long readPt,<a name="line.2165"></a>
-<span class="sourceLineNo">2166</span>      boolean includeMemstoreScanner) throws IOException {<a name="line.2166"></a>
-<span class="sourceLineNo">2167</span>    this.lock.readLock().lock();<a name="line.2167"></a>
-<span class="sourceLineNo">2168</span>    try {<a name="line.2168"></a>
-<span class="sourceLineNo">2169</span>      Map&lt;String, HStoreFile&gt; name2File =<a name="line.2169"></a>
-<span class="sourceLineNo">2170</span>          new HashMap&lt;&gt;(getStorefilesCount() + getCompactedFilesCount());<a name="line.2170"></a>
-<span class="sourceLineNo">2171</span>      for (HStoreFile file : getStorefiles()) {<a name="line.2171"></a>
-<span class="sourceLineNo">2172</span>        name2File.put(file.getFileInfo().getActiveFileName(), file);<a name="line.2172"></a>
-<span class="sourceLineNo">2173</span>      }<a name="line.2173"></a>
-<span class="sourceLineNo">2174</span>      Collection&lt;HStoreFile&gt; compactedFiles = getCompactedFiles();<a name="line.2174"></a>
-<span class="sourceLineNo">2175</span>      for (HStoreFile file : IterableUtils.emptyIfNull(compactedFiles)) {<a name="line.2175"></a>
-<span class="sourceLineNo">2176</span>        name2File.put(file.getFileInfo().getActiveFileName(), file);<a name="line.2176"></a>
-<span class="sourceLineNo">2177</span>      }<a name="line.2177"></a>
-<span class="sourceLineNo">2178</span>      List&lt;HStoreFile&gt; filesToReopen = new ArrayList&lt;&gt;();<a name="line.2178"></a>
-<span class="sourceLineNo">2179</span>      for (KeyValueScanner kvs : currentFileScanners) {<a name="line.2179"></a>
-<span class="sourceLineNo">2180</span>        assert kvs.isFileScanner();<a name="line.2180"></a>
-<span class="sourceLineNo">2181</span>        if (kvs.peek() == null) {<a name="line.2181"></a>
-<span class="sourceLineNo">2182</span>          continue;<a name="line.2182"></a>
-<span class="sourceLineNo">2183</span>        }<a name="line.2183"></a>
-<span class="sourceLineNo">2184</span>        filesToReopen.add(name2File.get(kvs.getFilePath().getName()));<a name="line.2184"></a>
-<span class="sourceLineNo">2185</span>      }<a name="line.2185"></a>
-<span class="sourceLineNo">2186</span>      if (filesToReopen.isEmpty()) {<a name="line.2186"></a>
-<span class="sourceLineNo">2187</span>        return null;<a name="line.2187"></a>
-<span class="sourceLineNo">2188</span>      }<a name="line.2188"></a>
-<span class="sourceLineNo">2189</span>      return getScanners(filesToReopen, cacheBlocks, false, false, matcher, startRow,<a name="line.2189"></a>
-<span class="sourceLineNo">2190</span>        includeStartRow, stopRow, includeStopRow, readPt, false);<a name="line.2190"></a>
-<span class="sourceLineNo">2191</span>    } finally {<a name="line.2191"></a>
-<span class="sourceLineNo">2192</span>      this.lock.readLock().unlock();<a name="line.2192"></a>
-<span class="sourceLineNo">2193</span>    }<a name="line.2193"></a>
+<span class="sourceLineNo">2104</span>  public void triggerMajorCompaction() {<a name="line.2104"></a>
+<span class="sourceLineNo">2105</span>    this.forceMajor = true;<a name="line.2105"></a>
+<span class="sourceLineNo">2106</span>  }<a name="line.2106"></a>
+<span class="sourceLineNo">2107</span><a name="line.2107"></a>
+<span class="sourceLineNo">2108</span>  //////////////////////////////////////////////////////////////////////////////<a name="line.2108"></a>
+<span class="sourceLineNo">2109</span>  // File administration<a name="line.2109"></a>
+<span class="sourceLineNo">2110</span>  //////////////////////////////////////////////////////////////////////////////<a name="line.2110"></a>
+<span class="sourceLineNo">2111</span><a name="line.2111"></a>
+<span class="sourceLineNo">2112</span>  /**<a name="line.2112"></a>
+<span class="sourceLineNo">2113</span>   * Return a scanner for both the memstore and the HStore files. Assumes we are not in a<a name="line.2113"></a>
+<span class="sourceLineNo">2114</span>   * compaction.<a name="line.2114"></a>
+<span class="sourceLineNo">2115</span>   * @param scan Scan to apply when scanning the stores<a name="line.2115"></a>
+<span class="sourceLineNo">2116</span>   * @param targetCols columns to scan<a name="line.2116"></a>
+<span class="sourceLineNo">2117</span>   * @return a scanner over the current key values<a name="line.2117"></a>
+<span class="sourceLineNo">2118</span>   * @throws IOException on failure<a name="line.2118"></a>
+<span class="sourceLineNo">2119</span>   */<a name="line.2119"></a>
+<span class="sourceLineNo">2120</span>  public KeyValueScanner getScanner(Scan scan, final NavigableSet&lt;byte[]&gt; targetCols, long readPt)<a name="line.2120"></a>
+<span class="sourceLineNo">2121</span>      throws IOException {<a name="line.2121"></a>
+<span class="sourceLineNo">2122</span>    lock.readLock().lock();<a name="line.2122"></a>
+<span class="sourceLineNo">2123</span>    try {<a name="line.2123"></a>
+<span class="sourceLineNo">2124</span>      ScanInfo scanInfo;<a name="line.2124"></a>
+<span class="sourceLineNo">2125</span>      if (this.getCoprocessorHost() != null) {<a name="line.2125"></a>
+<span class="sourceLineNo">2126</span>        scanInfo = this.getCoprocessorHost().preStoreScannerOpen(this, scan);<a name="line.2126"></a>
+<span class="sourceLineNo">2127</span>      } else {<a name="line.2127"></a>
+<span class="sourceLineNo">2128</span>        scanInfo = getScanInfo();<a name="line.2128"></a>
+<span class="sourceLineNo">2129</span>      }<a name="line.2129"></a>
+<span class="sourceLineNo">2130</span>      return createScanner(scan, scanInfo, targetCols, readPt);<a name="line.2130"></a>
+<span class="sourceLineNo">2131</span>    } finally {<a name="line.2131"></a>
+<span class="sourceLineNo">2132</span>      lock.readLock().unlock();<a name="line.2132"></a>
+<span class="sourceLineNo">2133</span>    }<a name="line.2133"></a>
+<span class="sourceLineNo">2134</span>  }<a name="line.2134"></a>
+<span class="sourceLineNo">2135</span><a name="line.2135"></a>
+<span class="sourceLineNo">2136</span>  // HMobStore will override this method to return its own implementation.<a name="line.2136"></a>
+<span class="sourceLineNo">2137</span>  protected KeyValueScanner createScanner(Scan scan, ScanInfo scanInfo,<a name="line.2137"></a>
+<span class="sourceLineNo">2138</span>      NavigableSet&lt;byte[]&gt; targetCols, long readPt) throws IOException {<a name="line.2138"></a>
+<span class="sourceLineNo">2139</span>    return scan.isReversed() ? new ReversedStoreScanner(this, scanInfo, scan, targetCols, readPt)<a name="line.2139"></a>
+<span class="sourceLineNo">2140</span>        : new StoreScanner(this, scanInfo, scan, targetCols, readPt);<a name="line.2140"></a>
+<span class="sourceLineNo">2141</span>  }<a name="line.2141"></a>
+<span class="sourceLineNo">2142</span><a name="line.2142"></a>
+<span class="sourceLineNo">2143</span>  /**<a name="line.2143"></a>
+<span class="sourceLineNo">2144</span>   * Recreates the scanners on the current list of active store file scanners<a name="line.2144"></a>
+<span class="sourceLineNo">2145</span>   * @param currentFileScanners the current set of active store file scanners<a name="line.2145"></a>
+<span class="sourceLineNo">2146</span>   * @param cacheBlocks cache the blocks or not<a name="line.2146"></a>
+<span class="sourceLineNo">2147</span>   * @param usePread use pread or not<a name="line.2147"></a>
+<span class="sourceLineNo">2148</span>   * @param isCompaction is the scanner for compaction<a name="line.2148"></a>
+<span class="sourceLineNo">2149</span>   * @param matcher the scan query matcher<a name="line.2149"></a>
+<span class="sourceLineNo">2150</span>   * @param startRow the scan's start row<a name="line.2150"></a>
+<span class="sourceLineNo">2151</span>   * @param includeStartRow should the scan include the start row<a name="line.2151"></a>
+<span class="sourceLineNo">2152</span>   * @param stopRow the scan's stop row<a name="line.2152"></a>
+<span class="sourceLineNo">2153</span>   * @param includeStopRow should the scan include the stop row<a name="line.2153"></a>
+<span class="sourceLineNo">2154</span>   * @param readPt the read point of the current scane<a name="line.2154"></a>
+<span class="sourceLineNo">2155</span>   * @param includeMemstoreScanner whether the current scanner should include memstorescanner<a name="line.2155"></a>
+<span class="sourceLineNo">2156</span>   * @return list of scanners recreated on the current Scanners<a name="line.2156"></a>
+<span class="sourceLineNo">2157</span>   */<a name="line.2157"></a>
+<span class="sourceLineNo">2158</span>  public List&lt;KeyValueScanner&gt; recreateScanners(List&lt;KeyValueScanner&gt; currentFileScanners,<a name="line.2158"></a>
+<span class="sourceLineNo">2159</span>      boolean cacheBlocks, boolean usePread, boolean isCompaction, ScanQueryMatcher matcher,<a name="line.2159"></a>
+<span class="sourceLineNo">2160</span>      byte[] startRow, boolean includeStartRow, byte[] stopRow, boolean includeStopRow, long readPt,<a name="line.2160"></a>
+<span class="sourceLineNo">2161</span>      boolean includeMemstoreScanner) throws IOException {<a name="line.2161"></a>
+<span class="sourceLineNo">2162</span>    this.lock.readLock().lock();<a name="line.2162"></a>
+<span class="sourceLineNo">2163</span>    try {<a name="line.2163"></a>
+<span class="sourceLineNo">2164</span>      Map&lt;String, HStoreFile&gt; name2File =<a name="line.2164"></a>
+<span class="sourceLineNo">2165</span>          new HashMap&lt;&gt;(getStorefilesCount() + getCompactedFilesCount());<a name="line.2165"></a>
+<span class="sourceLineNo">2166</span>      for (HStoreFile file : getStorefiles()) {<a name="line.2166"></a>
+<span class="sourceLineNo">2167</span>        name2File.put(file.getFileInfo().getActiveFileName(), file);<a name="line.2167"></a>
+<span class="sourceLineNo">2168</span>      }<a name="line.2168"></a>
+<span class="sourceLineNo">2169</span>      Collection&lt;HStoreFile&gt; compactedFiles = getCompactedFiles();<a name="line.2169"></a>
+<span class="sourceLineNo">2170</span>      for (HStoreFile file : IterableUtils.emptyIfNull(compactedFiles)) {<a name="line.2170"></a>
+<span class="sourceLineNo">2171</span>        name2File.put(file.getFileInfo().getActiveFileName(), file);<a name="line.2171"></a>
+<span class="sourceLineNo">2172</span>      }<a name="line.2172"></a>
+<span class="sourceLineNo">2173</span>      List&lt;HStoreFile&gt; filesToReopen = new ArrayList&lt;&gt;();<a name="line.2173"></a>
+<span class="sourceLineNo">2174</span>      for (KeyValueScanner kvs : currentFileScanners) {<a name="line.2174"></a>
+<span class="sourceLineNo">2175</span>        assert kvs.isFileScanner();<a name="line.2175"></a>
+<span class="sourceLineNo">2176</span>        if (kvs.peek() == null) {<a name="line.2176"></a>
+<span class="sourceLineNo">2177</span>          continue;<a name="line.2177"></a>
+<span class="sourceLineNo">2178</span>        }<a name="line.2178"></a>
+<span class="sourceLineNo">2179</span>        filesToReopen.add(name2File.get(kvs.getFilePath().getName()));<a name="line.2179"></a>
+<span class="sourceLineNo">2180</span>      }<a name="line.2180"></a>
+<span class="sourceLineNo">2181</span>      if (filesToReopen.isEmpty()) {<a name="line.2181"></a>
+<span class="sourceLineNo">2182</span>        return null;<a name="line.2182"></a>
+<span class="sourceLineNo">2183</span>      }<a name="line.2183"></a>
+<span class="sourceLineNo">2184</span>      return getScanners(filesToReopen, cacheBlocks, false, false, matcher, startRow,<a name="line.2184"></a>
+<span class="sourceLineNo">2185</span>        includeStartRow, stopRow, includeStopRow, readPt, false);<a name="line.2185"></a>
+<span class="sourceLineNo">2186</span>    } finally {<a name="line.2186"></a>
+<span class="sourceLineNo">2187</span>      this.lock.readLock().unlock();<a name="line.2187"></a>
+<span class="sourceLineNo">2188</span>    }<a name="line.2188"></a>
+<span class="sourceLineNo">2189</span>  }<a name="line.2189"></a>
+<span class="sourceLineNo">2190</span><a name="line.2190"></a>
+<span class="sourceLineNo">2191</span>  @Override<a name="line.2191"></a>
+<span class="sourceLineNo">2192</span>  public String toString() {<a name="line.2192"></a>
+<span class="sourceLineNo">2193</span>    return this.getColumnFamilyName();<a name="line.2193"></a>
 <span class="sourceLineNo">2194</span>  }<a name="line.2194"></a>
 <span class="sourceLineNo">2195</span><a name="line.2195"></a>
 <span class="sourceLineNo">2196</span>  @Override<a name="line.2196"></a>
-<span class="sourceLineNo">2197</span>  public String toString() {<a name="line.2197"></a>
-<span class="sourceLineNo">2198</span>    return this.getColumnFamilyName();<a name="line.2198"></a>
+<span class="sourceLineNo">2197</span>  public int getStorefilesCount() {<a name="line.2197"></a>
+<span class="sourceLineNo">2198</span>    return this.storeEngine.getStoreFileManager().getStorefileCount();<a name="line.2198"></a>
 <span class="sourceLineNo">2199</span>  }<a name="line.2199"></a>
 <span class="sourceLineNo">2200</span><a name="line.2200"></a>
 <span class="sourceLineNo">2201</span>  @Override<a name="line.2201"></a>
-<span class="sourceLineNo">2202</span>  public int getStorefilesCount() {<a name="line.2202"></a>
-<span class="sourceLineNo">2203</span>    return this.storeEngine.getStoreFileManager().getStorefileCount();<a name="line.2203"></a>
+<span class="sourceLineNo">2202</span>  public int getCompactedFilesCount() {<a name="line.2202"></a>
+<span class="sourceLineNo">2203</span>    return this.storeEngine.getStoreFileManager().getCompactedFilesCount();<a name="line.2203"></a>
 <span class="sourceLineNo">2204</span>  }<a name="line.2204"></a>
 <span class="sourceLineNo">2205</span><a name="line.2205"></a>
-<span class="sourceLineNo">2206</span>  @Override<a name="line.2206"></a>
-<span class="sourceLineNo">2207</span>  public int getCompactedFilesCount() {<a name="line.2207"></a>
-<span class="sourceLineNo">2208</span>    return this.storeEngine.getStoreFileManager().getCompactedFilesCount();<a name="line.2208"></a>
-<span class="sourceLineNo">2209</span>  }<a name="line.2209"></a>
-<span class="sourceLineNo">2210</span><a name="line.2210"></a>
-<span class="sourceLineNo">2211</span>  private LongStream getStoreFileAgeStream() {<a name="line.2211"></a>
-<span class="sourceLineNo">2212</span>    return this.storeEngine.getStoreFileManager().getStorefiles().stream().filter(sf -&gt; {<a name="line.2212"></a>
-<span class="sourceLineNo">2213</span>      if (sf.getReader() == null) {<a name="line.2213"></a>
-<span class="sourceLineNo">2214</span>        LOG.warn("StoreFile {} has a null Reader", sf);<a name="line.2214"></a>
-<span class="sourceLineNo">2215</span>        return false;<a name="line.2215"></a>
-<span class="sourceLineNo">2216</span>      } else {<a name="line.2216"></a>
-<span class="sourceLineNo">2217</span>        return true;<a name="line.2217"></a>
-<span class="sourceLineNo">2218</span>      }<a name="line.2218"></a>
-<span class="sourceLineNo">2219</span>    }).filter(HStoreFile::isHFile).mapToLong(sf -&gt; sf.getFileInfo().getCreatedTimestamp())<a name="line.2219"></a>
-<span class="sourceLineNo">2220</span>        .map(t -&gt; EnvironmentEdgeManager.currentTime() - t);<a name="line.2220"></a>
+<span class="sourceLineNo">2206</span>  private LongStream getStoreFileAgeStream() {<a name="line.2206"></a>
+<span class="sourceLineNo">2207</span>    return this.storeEngine.getStoreFileManager().getStorefiles().stream().filter(sf -&gt; {<a name="line.2207"></a>
+<span class="sourceLineNo">2208</span>      if (sf.getReader() == null) {<a name="line.2208"></a>
+<span class="sourceLineNo">2209</span>        LOG.warn("StoreFile {} has a null Reader", sf);<a name="line.2209"></a>
+<span class="sourceLineNo">2210</span>        return false;<a name="line.2210"></a>
+<span class="sourceLineNo">2211</span>      } else {<a name="line.2211"></a>
+<span class="sourceLineNo">2212</span>        return true;<a name="line.2212"></a>
+<span class="sourceLineNo">2213</span>      }<a name="line.2213"></a>
+<span class="sourceLineNo">2214</span>    }).filter(HStoreFile::isHFile).mapToLong(sf -&gt; sf.getFileInfo().getCreatedTimestamp())<a name="line.2214"></a>
+<span class="sourceLineNo">2215</span>        .map(t -&gt; EnvironmentEdgeManager.currentTime() - t);<a name="line.2215"></a>
+<span class="sourceLineNo">2216</span>  }<a name="line.2216"></a>
+<span class="sourceLineNo">2217</span><a name="line.2217"></a>
+<span class="sourceLineNo">2218</span>  @Override<a name="line.2218"></a>
+<span class="sourceLineNo">2219</span>  public OptionalLong getMaxStoreFileAge() {<a name="line.2219"></a>
+<span class="sourceLineNo">2220</span>    return getStoreFileAgeStream().max();<a name="line.2220"></a>
 <span class="sourceLineNo">2221</span>  }<a name="line.2221"></a>
 <span class="sourceLineNo">2222</span><a name="line.2222"></a>
 <span class="sourceLineNo">2223</span>  @Override<a name="line.2223"></a>
-<span class="sourceLineNo">2224</span>  public OptionalLong getMaxStoreFileAge() {<a name="line.2224"></a>
-<span class="sourceLineNo">2225</span>    return getStoreFileAgeStream().max();<a name="line.2225"></a>
+<span class="sourceLineNo">2224</span>  public OptionalLong getMinStoreFileAge() {<a name="line.2224"></a>
+<span class="sourceLineNo">2225</span>    return getStoreFileAgeStream().min();<a name="line.2225"></a>
 <span class="sourceLineNo">2226</span>  }<a name="line.2226"></a>
 <span class="sourceLineNo">2227</span><a name="line.2227"></a>
 <span class="sourceLineNo">2228</span>  @Override<a name="line.2228"></a>
-<span class="sourceLineNo">2229</span>  public OptionalLong getMinStoreFileAge() {<a name="line.2229"></a>
-<span class="sourceLineNo">2230</span>    return getStoreFileAgeStream().min();<a name="line.2230"></a>
+<span class="sourceLineNo">2229</span>  public OptionalDouble getAvgStoreFileAge() {<a name="line.2229"></a>
+<span class="sourceLineNo">2230</span>    return getStoreFileAgeStream().average();<a name="line.2230"></a>
 <span class="sourceLineNo">2231</span>  }<a name="line.2231"></a>
 <span class="sourceLineNo">2232</span><a name="line.2232"></a>
 <span class="sourceLineNo">2233</span>  @Override<a name="line.2233"></a>
-<span class="sourceLineNo">2234</span>  public OptionalDouble getAvgStoreFileAge() {<a name="line.2234"></a>
-<span class="sourceLineNo">2235</span>    return getStoreFileAgeStream().average();<a name="line.2235"></a>
-<span class="sourceLineNo">2236</span>  }<a name="line.2236"></a>
-<span class="sourceLineNo">2237</span><a name="line.2237"></a>
-<span class="sourceLineNo">2238</span>  @Override<a name="line.2238"></a>
-<span class="sourceLineNo">2239</span>  public long getNumReferenceFiles() {<a name="line.2239"></a>
-<span class="sourceLineNo">2240</span>    return this.storeEngine.getStoreFileManager().getStorefiles().stream()<a name="line.2240"></a>
-<span class="sourceLineNo">2241</span>        .filter(HStoreFile::isReference).count();<a name="line.2241"></a>
-<span class="sourceLineNo">2242</span>  }<a name="line.2242"></a>
-<span class="sourceLineNo">2243</span><a name="line.2243"></a>
-<span class="sourceLineNo">2244</span>  @Override<a name="line.2244"></a>
-<span class="sourceLineNo">2245</span>  public long getNumHFiles() {<a name="line.2245"></a>
-<span class="sourceLineNo">2246</span>    return this.storeEngine.getStoreFileManager().getStorefiles().stream()<a name="line.2246"></a>
-<span class="sourceLineNo">2247</span>        .filter(HStoreFile::isHFile).count();<a name="line.2247"></a>
+<span class="sourceLineNo">2234</span>  public long getNumReferenceFiles() {<a name="line.2234"></a>
+<span class="sourceLineNo">2235</span>    return this.storeEngine.getStoreFileManager().getStorefiles().stream()<a name="line.2235"></a>
+<span class="sourceLineNo">2236</span>        .filter(HStoreFile::isReference).count();<a name="line.2236"></a>
+<span class="sourceLineNo">2237</span>  }<a name="line.2237"></a>
+<span class="sourceLineNo">2238</span><a name="line.2238"></a>
+<span class="sourceLineNo">2239</span>  @Override<a name="line.2239"></a>
+<span class="sourceLineNo">2240</span>  public long getNumHFiles() {<a name="line.2240"></a>
+<span class="sourceLineNo">2241</span>    return this.storeEngine.getStoreFileManager().getStorefiles().stream()<a name="line.2241"></a>
+<span class="sourceLineNo">2242</span>        .filter(HStoreFile::isHFile).count();<a name="line.2242"></a>
+<span class="sourceLineNo">2243</span>  }<a name="line.2243"></a>
+<span class="sourceLineNo">2244</span><a name="line.2244"></a>
+<span class="sourceLineNo">2245</span>  @Override<a name="line.2245"></a>
+<span class="sourceLineNo">2246</span>  public long getStoreSizeUncompressed() {<a name="line.2246"></a>
+<span class="sourceLineNo">2247</span>    return this.totalUncompressedBytes.get();<a name="line.2247"></a>
 <span class="sourceLineNo">2248</span>  }<a name="line.2248"></a>
 <span class="sourceLineNo">2249</span><a name="line.2249"></a>
 <span class="sourceLineNo">2250</span>  @Override<a name="line.2250"></a>
-<span class="sourceLineNo">2251</span>  public long getStoreSizeUncompressed() {<a name="line.2251"></a>
-<span class="sourceLineNo">2252</span>    return this.totalUncompressedBytes.get();<a name="line.2252"></a>
-<span class="sourceLineNo">2253</span>  }<a name="line.2253"></a>
-<span class="sourceLineNo">2254</span><a name="line.2254"></a>
-<span class="sourceLineNo">2255</span>  @Override<a name="line.2255"></a>
-<span class="sourceLineNo">2256</span>  public long getStorefilesSize() {<a name="line.2256"></a>
-<span class="sourceLineNo">2257</span>    // Include all StoreFiles<a name="line.2257"></a>
-<span class="sourceLineNo">2258</span>    return getStorefilesSize(this.storeEngine.getStoreFileManager().getStorefiles(), sf -&gt; true);<a name="line.2258"></a>
-<span class="sourceLineNo">2259</span>  }<a name="line.2259"></a>
-<span class="sourceLineNo">2260</span><a name="line.2260"></a>
-<span class="sourceLineNo">2261</span>  @Override<a name="line.2261"></a>
-<span class="sourceLineNo">2262</span>  public long getHFilesSize() {<a name="line.2262"></a>
-<span class="sourceLineNo">2263</span>    // Include only StoreFiles which are HFiles<a name="line.2263"></a>
-<span class="sourceLineNo">2264</span>    return getStorefilesSize(this.storeEngine.getStoreFileManager().getStorefiles(),<a name="line.2264"></a>
-<span class="sourceLineNo">2265</span>      HStoreFile::isHFile);<a name="line.2265"></a>
-<span class="sourceLineNo">2266</span>  }<a name="line.2266"></a>
-<span class="sourceLineNo">2267</span><a name="line.2267"></a>
-<span class="sourceLineNo">2268</span>  private long getTotalUncompressedBytes(List&lt;HStoreFile&gt; files) {<a name="line.2268"></a>
-<span class="sourceLineNo">2269</span>    return files.stream()<a name="line.2269"></a>
-<span class="sourceLineNo">2270</span>      .mapToLong(file -&gt; getStorefileFieldSize(file, StoreFileReader::getTotalUncompressedBytes))<a name="line.2270"></a>
-<span class="sourceLineNo">2271</span>      .sum();<a name="line.2271"></a>
+<span class="sourceLineNo">2251</span>  public long getStorefilesSize() {<a name="line.2251"></a>
+<span class="sourceLineNo">2252</span>    // Include all StoreFiles<a name="line.2252"></a>
+<span class="sourceLineNo">2253</span>    return getStorefilesSize(this.storeEngine.getStoreFileManager().getStorefiles(), sf -&gt; true);<a name="line.2253"></a>
+<span class="sourceLineNo">2254</span>  }<a name="line.2254"></a>
+<span class="sourceLineNo">2255</span><a name="line.2255"></a>
+<span class="sourceLineNo">2256</span>  @Override<a name="line.2256"></a>
+<span class="sourceLineNo">2257</span>  public long getHFilesSize() {<a name="line.2257"></a>
+<span class="sourceLineNo">2258</span>    // Include only StoreFiles which are HFiles<a name="line.2258"></a>
+<span class="sourceLineNo">2259</span>    return getStorefilesSize(this.storeEngine.getStoreFileManager().getStorefiles(),<a name="line.2259"></a>
+<span class="sourceLineNo">2260</span>      HStoreFile::isHFile);<a name="line.2260"></a>
+<span class="sourceLineNo">2261</span>  }<a name="line.2261"></a>
+<span class="sourceLineNo">2262</span><a name="line.2262"></a>
+<span class="sourceLineNo">2263</span>  private long getTotalUncompressedBytes(List&lt;HStoreFile&gt; files) {<a name="line.2263"></a>
+<span class="sourceLineNo">2264</span>    return files.stream()<a name="line.2264"></a>
+<span class="sourceLineNo">2265</span>      .mapToLong(file -&gt; getStorefileFieldSize(file, StoreFileReader::getTotalUncompressedBytes))<a name="line.2265"></a>
+<span class="sourceLineNo">2266</span>      .sum();<a name="line.2266"></a>
+<span class="sourceLineNo">2267</span>  }<a name="line.2267"></a>
+<span class="sourceLineNo">2268</span><a name="line.2268"></a>
+<span class="sourceLineNo">2269</span>  private long getStorefilesSize(Collection&lt;HStoreFile&gt; files, Predicate&lt;HStoreFile&gt; predicate) {<a name="line.2269"></a>
+<span class="sourceLineNo">2270</span>    return files.stream().filter(predicate)<a name="line.2270"></a>
+<span class="sourceLineNo">2271</span>      .mapToLong(file -&gt; getStorefileFieldSize(file, StoreFileReader::length)).sum();<a name="line.2271"></a>
 <span class="sourceLineNo">2272</span>  }<a name="line.2272"></a>
 <span class="sourceLineNo">2273</span><a name="line.2273"></a>
-<span class="sourceLineNo">2274</span>  private long getStorefilesSize(Collection&lt;HStoreFile&gt; files, Predicate&lt;HStoreFile&gt; predicate) {<a name="line.2274"></a>
-<span class="sourceLineNo">2275</span>    return files.stream().filter(predicate)<a name="line.2275"></a>
-<span class="sourceLineNo">2276</span>      .mapToLong(file -&gt; getStorefileFieldSize(file, StoreFileReader::length)).sum();<a name="line.2276"></a>
-<span class="sourceLineNo">2277</span>  }<a name="line.2277"></a>
-<span class="sourceLineNo">2278</span><a name="line.2278"></a>
-<span class="sourceLineNo">2279</span>  private long getStorefileFieldSize(HStoreFile file, ToLongFunction&lt;StoreFileReader&gt; f) {<a name="line.2279"></a>
-<span class="sourceLineNo">2280</span>    if (file == null) {<a name="line.2280"></a>
-<span class="sourceLineNo">2281</span>      return 0L;<a name="line.2281"></a>
-<span class="sourceLineNo">2282</span>    }<a name="line.2282"></a>
-<span class="sourceLineNo">2283</span>    StoreFileReader reader = file.getReader();<a name="line.2283"></a>
-<span class="sourceLineNo">2284</span>    if (reader == null) {<a name="line.2284"></a>
-<span class="sourceLineNo">2285</span>      return 0L;<a name="line.2285"></a>
-<span class="sourceLineNo">2286</span>    }<a name="line.2286"></a>
-<span class="sourceLineNo">2287</span>    return f.applyAsLong(reader);<a name="line.2287"></a>
+<span class="sourceLineNo">2274</span>  private long getStorefileFieldSize(HStoreFile file, ToLongFunction&lt;StoreFileReader&gt; f) {<a name="line.2274"></a>
+<span class="sourceLineNo">2275</span>    if (file == null) {<a name="line.2275"></a>
+<span class="sourceLineNo">2276</span>      return 0L;<a name="line.2276"></a>
+<span class="sourceLineNo">2277</span>    }<a name="line.2277"></a>
+<span class="sourceLineNo">2278</span>    StoreFileReader reader = file.getReader();<a name="line.2278"></a>
+<span class="sourceLineNo">2279</span>    if (reader == null) {<a name="line.2279"></a>
+<span class="sourceLineNo">2280</span>      return 0L;<a name="line.2280"></a>
+<span class="sourceLineNo">2281</span>    }<a name="line.2281"></a>
+<span class="sourceLineNo">2282</span>    return f.applyAsLong(reader);<a name="line.2282"></a>
+<span class="sourceLineNo">2283</span>  }<a name="line.2283"></a>
+<span class="sourceLineNo">2284</span><a name="line.2284"></a>
+<span class="sourceLineNo">2285</span>  private long getStorefilesFieldSize(ToLongFunction&lt;StoreFileReader&gt; f) {<a name="line.2285"></a>
+<span class="sourceLineNo">2286</span>    return this.storeEngine.getStoreFileManager().getStorefiles().stream()<a name="line.2286"></a>
+<span class="sourceLineNo">2287</span>      .mapToLong(file -&gt; getStorefileFieldSize(file, f)).sum();<a name="line.2287"></a>
 <span class="sourceLineNo">2288</span>  }<a name="line.2288"></a>
 <span class="sourceLineNo">2289</span><a name="line.2289"></a>
-<span class="sourceLineNo">2290</span>  private long getStorefilesFieldSize(ToLongFunction&lt;StoreFileReader&gt; f) {<a name="line.2290"></a>
-<span class="sourceLineNo">2291</span>    return this.storeEngine.getStoreFileManager().getStorefiles().stream()<a name="line.2291"></a>
-<span class="sourceLineNo">2292</span>      .mapToLong(file -&gt; getStorefileFieldSize(file, f)).sum();<a name="line.2292"></a>
+<span class="sourceLineNo">2290</span>  @Override<a name="line.2290"></a>
+<span class="sourceLineNo">2291</span>  public long getStorefilesRootLevelIndexSize() {<a name="line.2291"></a>
+<span class="sourceLineNo">2292</span>    return getStorefilesFieldSize(StoreFileReader::indexSize);<a name="line.2292"></a>
 <span class="sourceLineNo">2293</span>  }<a name="line.2293"></a>
 <span class="sourceLineNo">2294</span><a name="line.2294"></a>
 <span class="sourceLineNo">2295</span>  @Override<a name="line.2295"></a>
-<span class="sourceLineNo">2296</span>  public long getStorefilesRootLevelIndexSize() {<a name="line.2296"></a>
-<span class="sourceLineNo">2297</span>    return getStorefilesFieldSize(StoreFileReader::indexSize);<a name="line.2297"></a>
+<span class="sourceLineNo">2296</span>  public long getTotalStaticIndexSize() {<a name="line.2296"></a>
+<span class="sourceLineNo">2297</span>    return getStorefilesFieldSize(StoreFileReader::getUncompressedDataIndexSize);<a name="line.2297"></a>
 <span class="sourceLineNo">2298</span>  }<a name="line.2298"></a>
 <span class="sourceLineNo">2299</span><a name="line.2299"></a>
 <span class="sourceLineNo">2300</span>  @Override<a name="line.2300"></a>
-<span class="sourceLineNo">2301</span>  public long getTotalStaticIndexSize() {<a name="line.2301"></a>
-<span class="sourceLineNo">2302</span>    return getStorefilesFieldSize(StoreFileReader::getUncompressedDataIndexSize);<a name="line.2302"></a>
+<span class="sourceLineNo">2301</span>  public long getTotalStaticBloomSize() {<a name="line.2301"></a>
+<span class="sourceLineNo">2302</span>    return getStorefilesFieldSize(StoreFileReader::getTotalBloomSize);<a name="line.2302"></a>
 <span class="sourceLineNo">2303</span>  }<a name="line.2303"></a>
 <span class="sourceLineNo">2304</span><a name="line.2304"></a>
 <span class="sourceLineNo">2305</span>  @Override<a name="line.2305"></a>
-<span class="sourceLineNo">2306</span>  public long getTotalStaticBloomSize() {<a name="line.2306"></a>
-<span class="sourceLineNo">2307</span>    return getStorefilesFieldSize(StoreFileReader::getTotalBloomSize);<a name="line.2307"></a>
+<span class="sourceLineNo">2306</span>  public MemStoreSize getMemStoreSize() {<a name="line.2306"></a>
+<span class="sourceLineNo">2307</span>    return this.memstore.size();<a name="line.2307"></a>
 <span class="sourceLineNo">2308</span>  }<a name="line.2308"></a>
 <span class="sourceLineNo">2309</span><a name="line.2309"></a>
 <span class="sourceLineNo">2310</span>  @Override<a name="line.2310"></a>
-<span class="sourceLineNo">2311</span>  public MemStoreSize getMemStoreSize() {<a name="line.2311"></a>
-<span class="sourceLineNo">2312</span>    return this.memstore.size();<a name="line.2312"></a>
-<span class="sourceLineNo">2313</span>  }<a name="line.2313"></a>
-<span class="sourceLineNo">2314</span><a name="line.2314"></a>
-<span class="sourceLineNo">2315</span>  @Override<a name="line.2315"></a>
-<span class="sourceLineNo">2316</span>  public int getCompactPriority() {<a name="line.2316"></a>
-<span class="sourceLineNo">2317</span>    int priority = this.storeEngine.getStoreFileManager().getStoreCompactionPriority();<a name="line.2317"></a>
-<span class="sourceLineNo">2318</span>    if (priority == PRIORITY_USER) {<a name="line.2318"></a>
-<span class="sourceLineNo">2319</span>      LOG.warn("Compaction priority is USER despite there being no user compaction");<a name="line.2319"></a>
-<span class="sourceLineNo">2320</span>    }<a name="line.2320"></a>
-<span class="sourceLineNo">2321</span>    return priority;<a name="line.2321"></a>
-<span class="sourceLineNo">2322</span>  }<a name="line.2322"></a>
-<span class="sourceLineNo">2323</span><a name="line.2323"></a>
-<span class="sourceLineNo">2324</span>  public boolean throttleCompaction(long compactionSize) {<a name="line.2324"></a>
-<span class="sourceLineNo">2325</span>    return storeEngine.getCompactionPolicy().throttleCompaction(compactionSize);<a name="line.2325"></a>
-<span class="sourceLineNo">2326</span>  }<a name="line.2326"></a>
-<span class="sourceLineNo">2327</span><a name="line.2327"></a>
-<span class="sourceLineNo">2328</span>  public HRegion getHRegion() {<a name="line.2328"></a>
-<span class="sourceLineNo">2329</span>    return this.region;<a name="line.2329"></a>
-<span class="sourceLineNo">2330</span>  }<a name="line.2330"></a>
-<span class="sourceLineNo">2331</span><a name="line.2331"></a>
-<span class="sourceLineNo">2332</span>  public RegionCoprocessorHost getCoprocessorHost() {<a name="line.2332"></a>
-<span class="sourceLineNo">2333</span>    return this.region.getCoprocessorHost();<a name="line.2333"></a>
+<span class="sourceLineNo">2311</span>  public int getCompactPriority() {<a name="line.2311"></a>
+<span class="sourceLineNo">2312</span>    int priority = this.storeEngine.getStoreFileManager().getStoreCompactionPriority();<a name="line.2312"></a>
+<span class="sourceLineNo">2313</span>    if (priority == PRIORITY_USER) {<a name="line.2313"></a>
+<span class="sourceLineNo">2314</span>      LOG.warn("Compaction priority is USER despite there being no user compaction");<a name="line.2314"></a>
+<span class="sourceLineNo">2315</span>    }<a name="line.2315"></a>
+<span class="sourceLineNo">2316</span>    return priority;<a name="line.2316"></a>
+<span class="sourceLineNo">2317</span>  }<a name="line.2317"></a>
+<span class="sourceLineNo">2318</span><a name="line.2318"></a>
+<span class="sourceLineNo">2319</span>  public boolean throttleCompaction(long compactionSize) {<a name="line.2319"></a>
+<span class="sourceLineNo">2320</span>    return storeEngine.getCompactionPolicy().throttleCompaction(compactionSize);<a name="line.2320"></a>
+<span class="sourceLineNo">2321</span>  }<a name="line.2321"></a>
+<span class="sourceLineNo">2322</span><a name="line.2322"></a>
+<span class="sourceLineNo">2323</span>  public HRegion getHRegion() {<a name="line.2323"></a>
+<span class="sourceLineNo">2324</span>    return this.region;<a name="line.2324"></a>
+<span class="sourceLineNo">2325</span>  }<a name="line.2325"></a>
+<span class="sourceLineNo">2326</span><a name="line.2326"></a>
+<span class="sourceLineNo">2327</span>  public RegionCoprocessorHost getCoprocessorHost() {<a name="line.2327"></a>
+<span class="sourceLineNo">2328</span>    return this.region.getCoprocessorHost();<a name="line.2328"></a>
+<span class="sourceLineNo">2329</span>  }<a name="line.2329"></a>
+<span class="sourceLineNo">2330</span><a name="line.2330"></a>
+<span class="sourceLineNo">2331</span>  @Override<a name="line.2331"></a>
+<span class="sourceLineNo">2332</span>  public RegionInfo getRegionInfo() {<a name="line.2332"></a>
+<span class="sourceLineNo">2333</span>    return this.fs.getRegionInfo();<a name="line.2333"></a>
 <span class="sourceLineNo">2334</span>  }<a name="line.2334"></a>
 <span class="sourceLineNo">2335</span><a name="line.2335"></a>
 <span class="sourceLineNo">2336</span>  @Override<a name="line.2336"></a>
-<span class="sourceLineNo">2337</span>  public RegionInfo getRegionInfo() {<a name="line.2337"></a>
-<span class="sourceLineNo">2338</span>    return this.fs.getRegionInfo();<a name="line.2338"></a>
+<span class="sourceLineNo">2337</span>  public boolean areWritesEnabled() {<a name="line.2337"></a>
+<span class="sourceLineNo">2338</span>    return this.region.areWritesEnabled();<a name="line.2338"></a>
 <span class="sourceLineNo">2339</span>  }<a name="line.2339"></a>
 <span class="sourceLineNo">2340</span><a name="line.2340"></a>
 <span class="sourceLineNo">2341</span>  @Override<a name="line.2341"></a>
-<span class="sourceLineNo">2342</span>  public boolean areWritesEnabled() {<a name="line.2342"></a>
-<span class="sourceLineNo">2343</span>    return this.region.areWritesEnabled();<a name="line.2343"></a>
+<span class="sourceLineNo">2342</span>  public long getSmallestReadPoint() {<a name="line.2342"></a>
+<span class="sourceLineNo">2343</span>    return this.region.getSmallestReadPoint();<a name="line.2343"></a>
 <span class="sourceLineNo">2344</span>  }<a name="line.2344"></a>
 <span class="sourceLineNo">2345</span><a name="line.2345"></a>
-<span class="sourceLineNo">2346</span>  @Override<a name="line.2346"></a>
-<span class="sourceLineNo">2347</span>  public long getSmallestReadPoint() {<a name="line.2347"></a>
-<span class="sourceLineNo">2348</span>    return this.region.getSmallestReadPoint();<a name="line.2348"></a>
-<span class="sourceLineNo">2349</span>  }<a name="line.2349"></a>
-<span class="sourceLineNo">2350</span><a name="line.2350"></a>
-<span class="sourceLineNo">2351</span>  /**<a name="line.2351"></a>
-<span class="sourceLineNo">2352</span>   * Adds or replaces the specified KeyValues.<a name="line.2352"></a>
-<span class="sourceLineNo">2353</span>   * &lt;p&gt;<a name="line.2353"></a>
-<span class="sourceLineNo">2354</span>   * For each KeyValue specified, if a cell with the same row, family, and qualifier exists in<a name="line.2354"></a>
-<span class="sourceLineNo">2355</span>   * MemStore, it will be replaced. Otherwise, it will just be inserted to MemStore.<a name="line.2355"></a>
-<span class="sourceLineNo">2356</span>   * &lt;p&gt;<a name="line.2356"></a>
-<span class="sourceLineNo">2357</span>   * This operation is atomic on each KeyValue (row/family/qualifier) but not necessarily atomic<a name="line.2357"></a>
-<span class="sourceLineNo">2358</span>   * across all of them.<a name="line.2358"></a>
-<span class="sourceLineNo">2359</span>   * @param readpoint readpoint below which we can safely remove duplicate KVs<a name="line.2359"></a>
-<span class="sourceLineNo">2360</span>   */<a name="line.2360"></a>
-<span class="sourceLineNo">2361</span>  public void upsert(Iterable&lt;Cell&gt; cells, long readpoint, MemStoreSizing memstoreSizing)<a name="line.2361"></a>
-<span class="sourceLineNo">2362</span>      throws IOException {<a name="line.2362"></a>
-<span class="sourceLineNo">2363</span>    this.lock.readLock().lock();<a name="line.2363"></a>
-<span class="sourceLineNo">2364</span>    try {<a name="line.2364"></a>
-<span class="sourceLineNo">2365</span>      this.memstore.upsert(cells, readpoint, memstoreSizing);<a name="line.2365"></a>
-<span class="sourceLineNo">2366</span>    } finally {<a name="line.2366"></a>
-<span class="sourceLineNo">2367</span>      this.lock.readLock().unlock();<a name="line.2367"></a>
-<span class="sourceLineNo">2368</span>    }<a name="line.2368"></a>
-<span class="sourceLineNo">2369</span>  }<a name="line.2369"></a>
-<span class="sourceLineNo">2370</span><a name="line.2370"></a>
-<span class="sourceLineNo">2371</span>  public StoreFlushContext createFlushContext(long cacheFlushId, FlushLifeCycleTracker tracker) {<a name="line.2371"></a>
-<span class="sourceLineNo">2372</span>    return new StoreFlusherImpl(cacheFlushId, tracker);<a name="line.2372"></a>
-<span class="sourceLineNo">2373</span>  }<a name="line.2373"></a>
-<span class="sourceLineNo">2374</span><a name="line.2374"></a>
-<span class="sourceLineNo">2375</span>  private final class StoreFlusherImpl implements StoreFlushContext {<a name="line.2375"></a>
-<span class="sourceLineNo">2376</span><a name="line.2376"></a>
-<span class="sourceLineNo">2377</span>    private final FlushLifeCycleTracker tracker;<a name="line.2377"></a>
-<span class="sourceLineNo">2378</span>    private final long cacheFlushSeqNum;<a name="line.2378"></a>
-<span class="sourceLineNo">2379</span>    private MemStoreSnapshot snapshot;<a name="line.2379"></a>
-<span class="sourceLineNo">2380</span>    private List&lt;Path&gt; tempFiles;<a name="line.2380"></a>
-<span class="sourceLineNo">2381</span>    private List&lt;Path&gt; committedFiles;<a name="line.2381"></a>
-<span class="sourceLineNo">2382</span>    private long cacheFlushCount;<a name="line.2382"></a>
-<span class="sourceLineNo">2383</span>    private long cacheFlushSize;<a name="line.2383"></a>
-<span class="sourceLineNo">2384</span>    private long outputFileSize;<a name="line.2384"></a>
+<span class="sourceLineNo">2346</span>  /**<a name="line.2346"></a>
+<span class="sourceLineNo">2347</span>   * Adds or replaces the specified KeyValues.<a name="line.2347"></a>
+<span class="sourceLineNo">2348</span>   * &lt;p&gt;<a name="line.2348"></a>
+<span class="sourceLineNo">2349</span>   * For each KeyValue specified, if a cell with the same row, family, and qualifier exists in<a name="line.2349"></a>
+<span class="sourceLineNo">2350</span>   * MemStore, it will be replaced. Otherwise, it will just be inserted to MemStore.<a name="line.2350"></a>
+<span class="sourceLineNo">2351</span>   * &lt;p&gt;<a name="line.2351"></a>
+<span class="sourceLineNo">2352</span>   * This operation is atomic on each KeyValue (row/family/qualifier) but not necessarily atomic<a name="line.2352"></a>
+<span class="sourceLineNo">2353</span>   * across all of them.<a name="line.2353"></a>
+<span class="sourceLineNo">2354</span>   * @param readpoint readpoint below which we can safely remove duplicate KVs<a name="line.2354"></a>
+<span class="sourceLineNo">2355</span>   */<a name="line.2355"></a>
+<span class="sourceLineNo">2356</span>  public void upsert(Iterable&lt;Cell&gt; cells, long readpoint, MemStoreSizing memstoreSizing)<a name="line.2356"></a>
+<span class="sourceLineNo">2357</span>      throws IOException {<a name="line.2357"></a>
+<span class="sourceLineNo">2358</span>    this.lock.readLock().lock();<a name="line.2358"></a>
+<span class="sourceLineNo">2359</span>    try {<a name="line.2359"></a>
+<span class="sourceLineNo">2360</span>      this.memstore.upsert(cells, readpoint, memstoreSizing);<a name="line.2360"></a>
+<span class="sourceLineNo">2361</span>    } finally {<a name="line.2361"></a>
+<span class="sourceLineNo">2362</span>      this.lock.readLock().unlock();<a name="line.2362"></a>
+<span class="sourceLineNo">2363</span>    }<a name="line.2363"></a>
+<span class="sourceLineNo">2364</span>  }<a name="line.2364"></a>
+<span class="sourceLineNo">2365</span><a name="line.2365"></a>
+<span class="sourceLineNo">2366</span>  public StoreFlushContext createFlushContext(long cacheFlushId, FlushLifeCycleTracker tracker) {<a name="line.2366"></a>
+<span class="sourceLineNo">2367</span>    return new StoreFlusherImpl(cacheFlushId, tracker);<a name="line.2367"></a>
+<span class="sourceLineNo">2368</span>  }<a name="line.2368"></a>
+<span class="sourceLineNo">2369</span><a name="line.2369"></a>
+<span class="sourceLineNo">2370</span>  private final class StoreFlusherImpl implements StoreFlushContext {<a name="line.2370"></a>
+<span class="sourceLineNo">2371</span><a name="line.2371"></a>
+<span class="sourceLineNo">2372</span>    private final FlushLifeCycleTracker tracker;<a name="line.2372"></a>
+<span class="sourceLineNo">2373</span>    private final long cacheFlushSeqNum;<a name="line.2373"></a>
+<span class="sourceLineNo">2374</span>    private MemStoreSnapshot snapshot;<a name="line.2374"></a>
+<span class="sourceLineNo">2375</span>    private List&lt;Path&gt; tempFiles;<a name="line.2375"></a>
+<span class="sourceLineNo">2376</span>    private List&lt;Path&gt; committedFiles;<a name="line.2376"></a>
+<span class="sourceLineNo">2377</span>    private long cacheFlushCount;<a name="line.2377"></a>
+<span class="sourceLineNo">2378</span>    private long cacheFlushSize;<a name="line.2378"></a>
+<span class="sourceLineNo">2379</span>    private long outputFileSize;<a name="line.2379"></a>
+<span class="sourceLineNo">2380</span><a name="line.2380"></a>
+<span class="sourceLineNo">2381</span>    private StoreFlusherImpl(long cacheFlushSeqNum, FlushLifeCycleTracker tracker) {<a name="line.2381"></a>
+<span class="sourceLineNo">2382</span>      this.cacheFlushSeqNum = cacheFlushSeqNum;<a name="line.2382"></a>
+<span class="sourceLineNo">2383</span>      this.tracker = tracker;<a name="line.2383"></a>
+<span class="sourceLineNo">2384</span>    }<a name="line.2384"></a>
 <span class="sourceLineNo">2385</span><a name="line.2385"></a>
-<span class="sourceLineNo">2386</span>    private StoreFlusherImpl(long cacheFlushSeqNum, FlushLifeCycleTracker tracker) {<a name="line.2386"></a>
-<span class="sourceLineNo">2387</span>      this.cacheFlushSeqNum = cacheFlushSeqNum;<a name="line.2387"></a>
-<span class="sourceLineNo">2388</span>      this.tracker = tracker;<a name="line.2388"></a>
-<span class="sourceLineNo">2389</span>    }<a name="line.2389"></a>
-<span class="sourceLineNo">2390</span><a name="line.2390"></a>
-<span class="sourceLineNo">2391</span>    /**<a name="line.2391"></a>
-<span class="sourceLineNo">2392</span>     * This is not thread safe. The caller should have a lock on the region or the store.<a name="line.2392"></a>
-<span class="sourceLineNo">2393</span>     * If necessary, the lock can be added with the patch provided in HBASE-10087<a name="line.2393"></a>
-<span class="sourceLineNo">2394</span>     */<a name="line.2394"></a>
-<span class="sourceLineNo">2395</span>    @Override<a name="line.2395"></a>
-<span class="sourceLineNo">2396</span>    public MemStoreSize prepare() {<a name="line.2396"></a>
-<span class="sourceLineNo">2397</span>      // passing the current sequence number of the wal - to allow bookkeeping in the memstore<a name="line.2397"></a>
-<span class="sourceLineNo">2398</span>      this.snapshot = memstore.snapshot();<a name="line.2398"></a>
-<span class="sourceLineNo">2399</span>      this.cacheFlushCount = snapshot.getCellsCount();<a name="line.2399"></a>
-<span class="sourceLineNo">2400</span>      this.cacheFlushSize = snapshot.getDataSize();<a name="line.2400"></a>
-<span class="sourceLineNo">2401</span>      committedFiles = new ArrayList&lt;&gt;(1);<a name="line.2401"></a>
-<span class="sourceLineNo">2402</span>      return snapshot.getMemStoreSize();<a name="line.2402"></a>
-<span class="sourceLineNo">2403</span>    }<a name="line.2403"></a>
-<span class="sourceLineNo">2404</span><a name="line.2404"></a>
-<span class="sourceLineNo">2405</span>    @Override<a name="line.2405"></a>
-<span class="sourceLineNo">2406</span>    public void flushCache(MonitoredTask status) throws IOException {<a name="line.2406"></a>
-<span class="sourceLineNo">2407</span>      RegionServerServices rsService = region.getRegionServerServices();<a name="line.2407"></a>
-<span class="sourceLineNo">2408</span>      ThroughputController throughputController =<a name="line.2408"></a>
-<span class="sourceLineNo">2409</span>          rsService == null ? null : rsService.getFlushThroughputController();<a name="line.2409"></a>
-<span class="sourceLineNo">2410</span>      tempFiles =<a name="line.2410"></a>
-<span class="sourceLineNo">2411</span>          HStore.this.flushCache(cacheFlushSeqNum, snapshot, status, throughputController, tracker);<a name="line.2411"></a>
-<span class="sourceLineNo">2412</span>    }<a name="line.2412"></a>
-<span class="sourceLineNo">2413</span><a name="line.2413"></a>
-<span class="sourceLineNo">2414</span>    @Override<a name="line.2414"></a>
-<span class="sourceLineNo">2415</span>    public boolean commit(MonitoredTask status) throws IOException {<a name="line.2415"></a>
-<span class="sourceLineNo">2416</span>      if (CollectionUtils.isEmpty(this.tempFiles)) {<a name="line.2416"></a>
-<span class="sourceLineNo">2417</span>        return false;<a name="line.2417"></a>
-<span class="sourceLineNo">2418</span>      }<a name="line.2418"></a>
-<span class="sourceLineNo">2419</span>      List&lt;HStoreFile&gt; storeFiles = new ArrayList&lt;&gt;(this.tempFiles.size());<a name="line.2419"></a>
-<span class="sourceLineNo">2420</span>      for (Path storeFilePath : tempFiles) {<a name="line.2420"></a>
-<span class="sourceLineNo">2421</span>        try {<a name="line.2421"></a>
-<span class="sourceLineNo">2422</span>          HStoreFile sf = HStore.this.commitFile(storeFilePath, cacheFlushSeqNum, status);<a name="line.2422"></a>
-<span class="sourceLineNo">2423</span>          outputFileSize += sf.getReader().length();<a name="line.2423"></a>
-<span class="sourceLineNo">2424</span>          storeFiles.add(sf);<a name="line.2424"></a>
-<span class="sourceLineNo">2425</span>        } catch (IOException ex) {<a name="line.2425"></a>
-<span class="sourceLineNo">2426</span>          LOG.error("Failed to commit store file {}", storeFilePath, ex);<a name="line.2426"></a>
-<span class="sourceLineNo">2427</span>          // Try to delete the files we have committed before.<a name="line.2427"></a>
-<span class="sourceLineNo">2428</span>          for (HStoreFile sf : storeFiles) {<a name="line.2428"></a>
-<span class="sourceLineNo">2429</span>            Path pathToDelete = sf.getPath();<a name="line.2429"></a>
-<span class="sourceLineNo">2430</span>            try {<a name="line.2430"></a>
-<span class="sourceLineNo">2431</span>              sf.deleteStoreFile();<a name="line.2431"></a>
-<span class="sourceLineNo">2432</span>            } catch (IOException deleteEx) {<a name="line.2432"></a>
-<span class="sourceLineNo">2433</span>              LOG.error(HBaseMarkers.FATAL, "Failed to delete store file we committed, "<a name="line.2433"></a>
-<span class="sourceLineNo">2434</span>                  + "halting {}", pathToDelete, ex);<a name="line.2434"></a>
-<span class="sourceLineNo">2435</span>              Runtime.getRuntime().halt(1);<a name="line.2435"></a>
-<span class="sourceLineNo">2436</span>            }<a name="line.2436"></a>
-<span class="sourceLineNo">2437</span>          }<a name="line.2437"></a>
-<span class="sourceLineNo">2438</span>          throw new IOException("Failed to commit the flush", ex);<a name="line.2438"></a>
-<span class="sourceLineNo">2439</span>        }<a name="line.2439"></a>
-<span class="sourceLineNo">2440</span>      }<a name="line.2440"></a>
-<span class="sourceLineNo">2441</span><a name="line.2441"></a>
-<span class="sourceLineNo">2442</span>      for (HStoreFile sf : storeFiles) {<a name="line.2442"></a>
-<span class="sourceLineNo">2443</span>        if (HStore.this.getCoprocessorHost() != null) {<a name="line.2443"></a>
-<span class="sourceLineNo">2444</span>          HStore.this.getCoprocessorHost().postFlush(HStore.this, sf, tracker);<a name="line.2444"></a>
-<span class="sourceLineNo">2445</span>        }<a name="line.2445"></a>
-<span class="sourceLineNo">2446</span>        committedFiles.add(sf.getPath());<a name="line.2446"></a>
-<span class="sourceLineNo">2447</span>      }<a name="line.2447"></a>
-<span class="sourceLineNo">2448</span><a name="line.2448"></a>
-<span class="sourceLineNo">2449</span>      HStore.this.flushedCellsCount.addAndGet(cacheFlushCount);<a name="line.2449"></a>
-<span class="sourceLineNo">2450</span>      HStore.this.flushedCellsSize.addAndGet(cacheFlushSize);<a name="line.2450"></a>
-<span class="sourceLineNo">2451</span>      HStore.this.flushedOutputFileSize.addAndGet(outputFileSize);<a name="line.2451"></a>
-<span class="sourceLineNo">2452</span><a name="line.2452"></a>
-<span class="sourceLineNo">2453</span>      // Add new file to store files.  Clear snapshot too while we have the Store write lock.<a name="line.2453"></a>
-<span class="sourceLineNo">2454</span>      return HStore.this.updateStorefiles(storeFiles, snapshot.getId());<a name="line.2454"></a>
+<span class="sourceLineNo">2386</span>    /**<a name="line.2386"></a>
+<span class="sourceLineNo">2387</span>     * This is not thread safe. The caller should have a lock on the region or the store.<a name="line.2387"></a>
+<span class="sourceLineNo">2388</span>     * If necessary, the lock can be added with the patch provided in HBASE-10087<a name="line.2388"></a>
+<span class="sourceLineNo">2389</span>     */<a name="line.2389"></a>
+<span class="sourceLineNo">2390</span>    @Override<a name="line.2390"></a>
+<span class="sourceLineNo">2391</span>    public MemStoreSize prepare() {<a name="line.2391"></a>
+<span class="sourceLineNo">2392</span>      // passing the current sequence number of the wal - to allow bookkeeping in the memstore<a name="line.2392"></a>
+<span class="sourceLineNo">2393</span>      this.snapshot = memstore.snapshot();<a name="line.2393"></a>
+<span class="sourceLineNo">2394</span>      this.cacheFlushCount = snapshot.getCellsCount();<a name="line.2394"></a>
+<span class="sourceLineNo">2395</span>      this.cacheFlushSize = snapshot.getDataSize();<a name="line.2395"></a>
+<span class="sourceLineNo">2396</span>      committedFiles = new ArrayList&lt;&gt;(1);<a name="line.2396"></a>
+<span class="sourceLineNo">2397</span>      return snapshot.getMemStoreSize();<a name="line.2397"></a>
+<span class="sourceLineNo">2398</span>    }<a name="line.2398"></a>
+<span class="sourceLineNo">2399</span><a name="line.2399"></a>
+<span class="sourceLineNo">2400</span>    @Override<a name="line.2400"></a>
+<span class="sourceLineNo">2401</span>    public void flushCache(MonitoredTask status) throws IOException {<a name="line.2401"></a>
+<span class="sourceLineNo">2402</span>      RegionServerServices rsService = region.getRegionServerServices();<a name="line.2402"></a>
+<span class="sourceLineNo">2403</span>      ThroughputController throughputController =<a name="line.2403"></a>
+<span class="sourceLineNo">2404</span>          rsService == null ? null : rsService.getFlushThroughputController();<a name="line.2404"></a>
+<span class="sourceLineNo">2405</span>      tempFiles =<a name="line.2405"></a>
+<span class="sourceLineNo">2406</span>          HStore.this.flushCache(cacheFlushSeqNum, snapshot, status, throughputController, tracker);<a name="line.2406"></a>
+<span class="sourceLineNo">2407</span>    }<a name="line.2407"></a>
+<span class="sourceLineNo">2408</span><a name="line.2408"></a>
+<span class="sourceLineNo">2409</span>    @Override<a name="line.2409"></a>
+<span class="sourceLineNo">2410</span>    public boolean commit(MonitoredTask status) throws IOException {<a name="line.2410"></a>
+<span class="sourceLineNo">2411</span>      if (CollectionUtils.isEmpty(this.tempFiles)) {<a name="line.2411"></a>
+<span class="sourceLineNo">2412</span>        return false;<a name="line.2412"></a>
+<span class="sourceLineNo">2413</span>      }<a name="line.2413"></a>
+<span class="sourceLineNo">2414</span>      List&lt;HStoreFile&gt; storeFiles = new ArrayList&lt;&gt;(this.tempFiles.size());<a name="line.2414"></a>
+<span class="sourceLineNo">2415</span>      for (Path storeFilePath : tempFiles) {<a name="line.2415"></a>
+<span class="sourceLineNo">2416</span>        try {<a name="line.2416"></a>
+<span class="sourceLineNo">2417</span>          HStoreFile sf = HStore.this.commitFile(storeFilePath, cacheFlushSeqNum, status);<a name="line.2417"></a>
+<span class="sourceLineNo">2418</span>          outputFileSize += sf.getReader().length();<a name="line.2418"></a>
+<span class="sourceLineNo">2419</span>          storeFiles.add(sf);<a name="line.2419"></a>
+<span class="sourceLineNo">2420</span>        } catch (IOException ex) {<a name="line.2420"></a>
+<span class="sourceLineNo">2421</span>          LOG.error("Failed to commit store file {}", storeFilePath, ex);<a name="line.2421"></a>
+<span class="sourceLineNo">2422</span>          // Try to delete the files we have committed before.<a name="line.2422"></a>
+<span class="sourceLineNo">2423</span>          for (HStoreFile sf : storeFiles) {<a name="line.2423"></a>
+<span class="sourceLineNo">2424</span>            Path pathToDelete = sf.getPath();<a name="line.2424"></a>
+<span class="sourceLineNo">2425</span>            try {<a name="line.2425"></a>
+<span class="sourceLineNo">2426</span>              sf.deleteStoreFile();<a name="line.2426"></a>
+<span class="sourceLineNo">2427</span>            } catch (IOException deleteEx) {<a name="line.2427"></a>
+<span class="sourceLineNo">2428</span>              LOG.error(HBaseMarkers.FATAL, "Failed to delete store file we committed, "<a name="line.2428"></a>
+<span class="sourceLineNo">2429</span>                  + "halting {}", pathToDelete, ex);<a name="line.2429"></a>
+<span class="sourceLineNo">2430</span>              Runtime.getRuntime().halt(1);<a name="line.2430"></a>
+<span class="sourceLineNo">2431</span>            }<a name="line.2431"></a>
+<span class="sourceLineNo">2432</span>          }<a name="line.2432"></a>
+<span class="sourceLineNo">2433</span>          throw new IOException("Failed to commit the flush", ex);<a name="line.2433"></a>
+<span class="sourceLineNo">2434</span>        }<a name="line.2434"></a>
+<span class="sourceLineNo">2435</span>      }<a name="line.2435"></a>
+<span class="sourceLineNo">2436</span><a name="line.2436"></a>
+<span class="sourceLineNo">2437</span>      for (HStoreFile sf : storeFiles) {<a name="line.2437"></a>
+<span class="sourceLineNo">2438</span>        if (HStore.this.getCoprocessorHost() != null) {<a name="line.2438"></a>
+<span class="sourceLineNo">2439</span>          HStore.this.getCoprocessorHost().postFlush(HStore.this, sf, tracker);<a name="line.2439"></a>
+<span class="sourceLineNo">2440</span>        }<a name="line.2440"></a>
+<span class="sourceLineNo">2441</span>        committedFiles.add(sf.getPath());<a name="line.2441"></a>
+<span class="sourceLineNo">2442</span>      }<a name="line.2442"></a>
+<span class="sourceLineNo">2443</span><a name="line.2443"></a>
+<span class="sourceLineNo">2444</span>      HStore.this.flushedCellsCount.addAndGet(cacheFlushCount);<a name="line.2444"></a>
+<span class="sourceLineNo">2445</span>      HStore.this.flushedCellsSize.addAndGet(cacheFlushSize);<a name="line.2445"></a>
+<span class="sourceLineNo">2446</span>      HStore.this.flushedOutputFileSize.addAndGet(outputFileSize);<a name="line.2446"></a>
+<span class="sourceLineNo">2447</span><a name="line.2447"></a>
+<span class="sourceLineNo">2448</span>      // Add new file to store files.  Clear snapshot too while we have the Store write lock.<a name="line.2448"></a>
+<span class="sourceLineNo">2449</span>      return HStore.this.updateStorefiles(storeFiles, snapshot.getId());<a name="line.2449"></a>
+<span class="sourceLineNo">2450</span>    }<a name="line.2450"></a>
+<span class="sourceLineNo">2451</span><a name="line.2451"></a>
+<span class="sourceLineNo">2452</span>    @Override<a name="line.2452"></a>
+<span class="sourceLineNo">2453</span>    public long getOutputFileSize() {<a name="line.2453"></a>
+<span class="sourceLineNo">2454</span>      return outputFileSize;<a name="line.2454"></a>
 <span class="sourceLineNo">2455</span>    }<a name="line.2455"></a>
 <span class="sourceLineNo">2456</span><a name="line.2456"></a>
 <span class="sourceLineNo">2457</span>    @Override<a name="line.2457"></a>
-<span class="sourceLineNo">2458</span>    public long getOutputFileSize() {<a name="line.2458"></a>
-<span class="sourceLineNo">2459</span>      return outputFileSize;<a name="line.2459"></a>
+<span class="sourceLineNo">2458</span>    public List&lt;Path&gt; getCommittedFiles() {<a name="line.2458"></a>
+<span class="sourceLineNo">2459</span>      return committedFiles;<a name="line.2459"></a>
 <span class="sourceLineNo">2460</span>    }<a name="line.2460"></a>
 <span class="sourceLineNo">2461</span><a name="line.2461"></a>
-<span class="sourceLineNo">2462</span>    @Override<a name="line.2462"></a>
-<span class="sourceLineNo">2463</span>    public List&lt;Path&gt; getCommittedFiles() {<a name="line.2463"></a>
-<span class="sourceLineNo">2464</span>      return committedFiles;<a name="line.2464"></a>
-<span class="sourceLineNo">2465</span>    }<a name="line.2465"></a>
-<span class="sourceLineNo">2466</span><a name="line.2466"></a>
-<span class="sourceLineNo">2467</span>    /**<a name="line.2467"></a>
-<span class="sourceLineNo">2468</span>     * Similar to commit, but called in secondary region replicas for replaying the<a name="line.2468"></a>
-<span class="sourceLineNo">2469</span>     * flush cache from primary region. Adds the new files to the store, and drops the<a name="line.2469"></a>
-<span class="sourceLineNo">2470</span>     * snapshot depending on dropMemstoreSnapshot argument.<a name="line.2470"></a>
-<span class="sourceLineNo">2471</span>     * @param fileNames names of the flushed files<a name="line.2471"></a>
-<span class="sourceLineNo">2472</span>     * @param dropMemstoreSnapshot whether to drop the prepared memstore snapshot<a name="line.2472"></a>
-<span class="sourceLineNo">2473</span>     */<a name="line.2473"></a>
-<span class="sourceLineNo">2474</span>    @Override<a name="line.2474"></a>
-<span class="sourceLineNo">2475</span>    public void replayFlush(List&lt;String&gt; fileNames, boolean dropMemstoreSnapshot)<a name="line.2475"></a>
-<span class="sourceLineNo">2476</span>        throws IOException {<a name="line.2476"></a>
-<span class="sourceLineNo">2477</span>      List&lt;HStoreFile&gt; storeFiles = new ArrayList&lt;&gt;(fileNames.size());<a name="line.2477"></a>
-<span class="sourceLineNo">2478</span>      for (String file : fileNames) {<a name="line.2478"></a>
-<span class="sourceLineNo">2479</span>        // open the file as a store file (hfile link, etc)<a name="line.2479"></a>
-<span class="sourceLineNo">2480</span>        StoreFileInfo storeFileInfo = fs.getStoreFileInfo(getColumnFamilyName(), file);<a name="line.2480"></a>
-<span class="sourceLineNo">2481</span>        HStoreFile storeFile = createStoreFileAndReader(storeFileInfo);<a name="line.2481"></a>
-<span class="sourceLineNo">2482</span>        storeFiles.add(storeFile);<a name="line.2482"></a>
-<span class="sourceLineNo">2483</span>        HStore.this.storeSize.addAndGet(storeFile.getReader().length());<a name="line.2483"></a>
-<span class="sourceLineNo">2484</span>        HStore.this.totalUncompressedBytes<a name="line.2484"></a>
-<span class="sourceLineNo">2485</span>            .addAndGet(storeFile.getReader().getTotalUncompressedBytes());<a name="line.2485"></a>
-<span class="sourceLineNo">2486</span>        if (LOG.isInfoEnabled()) {<a name="line.2486"></a>
-<span class="sourceLineNo">2487</span>          LOG.info("Region: " + HStore.this.getRegionInfo().getEncodedName() +<a name="line.2487"></a>
-<span class="sourceLineNo">2488</span>            " added " + storeFile + ", entries=" + storeFile.getReader().getEntries() +<a name="line.2488"></a>
-<span class="sourceLineNo">2489</span>              ", sequenceid=" + storeFile.getReader().getSequenceID() + ", filesize="<a name="line.2489"></a>
-<span class="sourceLineNo">2490</span>              + TraditionalBinaryPrefix.long2String(storeFile.getReader().length(), "", 1));<a name="line.2490"></a>
-<span class="sourceLineNo">2491</span>        }<a name="line.2491"></a>
-<span class="sourceLineNo">2492</span>      }<a name="line.2492"></a>
-<span class="sourceLineNo">2493</span><a name="line.2493"></a>
-<span class="sourceLineNo">2494</span>      long snapshotId = -1; // -1 means do not drop<a name="line.2494"></a>
-<span class="sourceLineNo">2495</span>      if (dropMemstoreSnapshot &amp;&amp; snapshot != null) {<a name="line.2495"></a>
-<span class="sourceLineNo">2496</span>        snapshotId = snapshot.getId();<a name="line.2496"></a>
-<span class="sourceLineNo">2497</span>        snapshot.close();<a name="line.2497"></a>
-<span class="sourceLineNo">2498</span>      }<a name="line.2498"></a>
-<span class="sourceLineNo">2499</span>      HStore.this.updateStorefiles(storeFiles, snapshotId);<a name="line.2499"></a>
-<span class="sourceLineNo">2500</span>    }<a name="line.2500"></a>
-<span class="sourceLineNo">2501</span><a name="line.2501"></a>
-<span class="sourceLineNo">2502</span>    /**<a name="line.2502"></a>
-<span class="sourceLineNo">2503</span>     * Abort the snapshot preparation. Drops the snapshot if any.<a name="line.2503"></a>
-<span class="sourceLineNo">2504</span>     */<a name="line.2504"></a>
-<span class="sourceLineNo">2505</span>    @Override<a name="line.2505"></a>
-<span class="sourceLineNo">2506</span>    public void abort() throws IOException {<a name="line.2506"></a>
-<span class="sourceLineNo">2507</span>      if (snapshot != null) {<a name="line.2507"></a>
-<span class="sourceLineNo">2508</span>        //We need to close the snapshot when aborting, otherwise, the segment scanner<a name="line.2508"></a>
-<span class="sourceLineNo">2509</span>        //won't be closed. If we are using MSLAB, the chunk referenced by those scanners<a name="line.2509"></a>
-<span class="sourceLineNo">2510</span>        //can't be released, thus memory leak<a name="line.2510"></a>
-<span class="sourceLineNo">2511</span>        snapshot.close();<a name="line.2511"></a>
-<span class="sourceLineNo">2512</span>        HStore.this.updateStorefiles(Collections.emptyList(), snapshot.getId());<a name="line.2512"></a>
-<span class="sourceLineNo">2513</span>      }<a name="line.2513"></a>
-<span class="sourceLineNo">2514</span>    }<a name="line.2514"></a>
-<span class="sourceLineNo">2515</span>  }<a name="line.2515"></a>
-<span class="sourceLineNo">2516</span><a name="line.2516"></a>
-<span class="sourceLineNo">2517</span>  @Override<a name="line.2517"></a>
-<span class="sourceLineNo">2518</span>  public boolean needsCompaction() {<a name="line.2518"></a>
-<span class="sourceLineNo">2519</span>    List&lt;HStoreFile&gt; filesCompactingClone = null;<a name="line.2519"></a>
-<span class="sourceLineNo">2520</span>    synchronized (filesCompacting) {<a name="line.2520"></a>
-<span class="sourceLineNo">2521</span>      filesCompactingClone = Lists.newArrayList(filesCompacting);<a name="line.2521"></a>
-<span class="sourceLineNo">2522</span>    }<a name="line.2522"></a>
-<span class="sourceLineNo">2523</span>    return this.storeEngine.needsCompaction(filesCompactingClone);<a name="line.2523"></a>
-<span class="sourceLineNo">2524</span>  }<a name="line.2524"></a>
-<span class="sourceLineNo">2525</span><a name="line.2525"></a>
-<span class="sourceLineNo">2526</span>  /**<a name="line.2526"></a>
-<span class="sourceLineNo">2527</span>   * Used for tests.<a name="line.2527"></a>
-<span class="sourceLineNo">2528</span>   * @return cache configuration for this Store.<a name="line.2528"></a>
-<span class="sourceLineNo">2529</span>   */<a name="line.2529"></a>
-<span class="sourceLineNo">2530</span>  @VisibleForTesting<a name="line.2530"></a>
-<span class="sourceLineNo">2531</span>  public CacheConfig getCacheConfig() {<a name="line.2531"></a>
-<span class="sourceLineNo">2532</span>    return this.cacheConf;<a name="line.2532"></a>
-<span class="sourceLineNo">2533</span>  }<a name="line.2533"></a>
-<span class="sourceLineNo">2534</span><a name="line.2534"></a>
-<span class="sourceLineNo">2535</span>  public static final long FIXED_OVERHEAD =<a name="line.2535"></a>
-<span class="sourceLineNo">2536</span>      ClassSize.align(ClassSize.OBJECT + (27 * ClassSize.REFERENCE) + (2 * Bytes.SIZEOF_LONG)<a name="line.2536"></a>
-<span class="sourceLineNo">2537</span>              + (6 * Bytes.SIZEOF_INT) + (2 * Bytes.SIZEOF_BOOLEAN));<a name="line.2537"></a>
-<span class="sourceLineNo">2538</span><a name="line.2538"></a>
-<span class="sourceLineNo">2539</span>  public static final long DEEP_OVERHEAD = ClassSize.align(FIXED_OVERHEAD<a name="line.2539"></a>
-<span class="sourceLineNo">2540</span>      + ClassSize.OBJECT + ClassSize.REENTRANT_LOCK<a name="line.2540"></a>
-<span class="sourceLineNo">2541</span>      + ClassSize.CONCURRENT_SKIPLISTMAP<a name="line.2541"></a>
-<span class="sourceLineNo">2542</span>      + ClassSize.CONCURRENT_SKIPLISTMAP_ENTRY + ClassSize.OBJECT<a name="line.2542"></a>
-<span class="sourceLineNo">2543</span>      + ScanInfo.FIXED_OVERHEAD);<a name="line.2543"></a>
-<span class="sourceLineNo">2544</span><a name="line.2544"></a>
-<span class="sourceLineNo">2545</span>  @Override<a name="line.2545"></a>
-<span class="sourceLineNo">2546</span>  public long heapSize() {<a name="line.2546"></a>
-<span class="sourceLineNo">2547</span>    MemStoreSize memstoreSize = this.memstore.size();<a name="line.2547"></a>
-<span class="sourceLineNo">2548</span>    return DEEP_OVERHEAD + memstoreSize.getHeapSize();<a name="line.2548"></a>
+<span class="sourceLineNo">2462</span>    /**<a name="line.2462"></a>
+<span class="sourceLineNo">2463</span>     * Similar to commit, but called in secondary region replicas for replaying the<a name="line.2463"></a>
+<span class="sourceLineNo">2464</span>     * flush cache from primary region. Adds the new files to the store, and drops the<a name="line.2464"></a>
+<span class="sourceLineNo">2465</span>     * snapshot depending on dropMemstoreSnapshot argument.<a name="line.2465"></a>
+<span class="sourceLineNo">2466</span>     * @param fileNames names of the flushed files<a name="line.2466"></a>
+<span class="sourceLineNo">2467</span>     * @param dropMemstoreSnapshot whether to drop the prepared memstore snapshot<a name="line.2467"></a>
+<span class="sourceLineNo">2468</span>     */<a name="line.2468"></a>
+<span class="sourceLineNo">2469</span>    @Override<a name="line.2469"></a>
+<span class="sourceLineNo">2470</span>    public void replayFlush(List&lt;String&gt; fileNames, boolean dropMemstoreSnapshot)<a name="line.2470"></a>
+<span class="sourceLineNo">2471</span>        throws IOException {<a name="line.2471"></a>
+<span class="sourceLineNo">2472</span>      List&lt;HStoreFile&gt; storeFiles = new ArrayList&lt;&gt;(fileNames.size());<a name="line.2472"></a>
+<span class="sourceLineNo">2473</span>      for (String file : fileNames) {<a name="line.2473"></a>
+<span class="sourceLineNo">2474</span>        // open the file as a store file (hfile link, etc)<a name="line.2474"></a>
+<span class="sourceLineNo">2475</span>        StoreFileInfo storeFileInfo = fs.getStoreFileInfo(getColumnFamilyName(), file);<a name="line.2475"></a>
+<span class="sourceLineNo">2476</span>        HStoreFile storeFile = createStoreFileAndReader(storeFileInfo);<a name="line.2476"></a>
+<span class="sourceLineNo">2477</span>        storeFiles.add(storeFile);<a name="line.2477"></a>
+<span class="sourceLineNo">2478</span>        HStore.this.storeSize.addAndGet(storeFile.getReader().length());<a name="line.2478"></a>
+<span class="sourceLineNo">2479</span>        HStore.this.totalUncompressedBytes<a name="line.2479"></a>
+<span class="sourceLineNo">2480</span>            .addAndGet(storeFile.getReader().getTotalUncompressedBytes());<a name="line.2480"></a>
+<span class="sourceLineNo">2481</span>        if (LOG.isInfoEnabled()) {<a name="line.2481"></a>
+<span class="sourceLineNo">2482</span>          LOG.info("Region: " + HStore.this.getRegionInfo().getEncodedName() +<a name="line.2482"></a>
+<span class="sourceLineNo">2483</span>            " added " + storeFile + ", entries=" + storeFile.getReader().getEntries() +<a name="line.2483"></a>
+<span class="sourceLineNo">2484</span>              ", sequenceid=" + storeFile.getReader().getSequenceID() + ", filesize="<a name="line.2484"></a>
+<span class="sourceLineNo">2485</span>              + TraditionalBinaryPrefix.long2String(storeFile.getReader().length(), "", 1));<a name="line.2485"></a>
+<span class="sourceLineNo">2486</span>        }<a name="line.2486"></a>
+<span class="sourceLineNo">2487</span>      }<a name="line.2487"></a>
+<span class="sourceLineNo">2488</span><a name="line.2488"></a>
+<span class="sourceLineNo">2489</span>      long snapshotId = -1; // -1 means do not drop<a name="line.2489"></a>
+<span class="sourceLineNo">2490</span>      if (dropMemstoreSnapshot &amp;&amp; snapshot != null) {<a name="line.2490"></a>
+<span class="sourceLineNo">2491</span>        snapshotId = snapshot.getId();<a name="line.2491"></a>
+<span class="sourceLineNo">2492</span>        snapshot.close();<a name="line.2492"></a>
+<span class="sourceLineNo">2493</span>      }<a name="line.2493"></a>
+<span class="sourceLineNo">2494</span>      HStore.this.updateStorefiles(storeFiles, snapshotId);<a name="line.2494"></a>
+<span class="sourceLineNo">2495</span>    }<a name="line.2495"></a>
+<span class="sourceLineNo">2496</span><a name="line.2496"></a>
+<span class="sourceLineNo">2497</span>    /**<a name="line.2497"></a>
+<span class="sourceLineNo">2498</span>     * Abort the snapshot preparation. Drops the snapshot if any.<a name="line.2498"></a>
+<span class="sourceLineNo">2499</span>     */<a name="line.2499"></a>
+<span class="sourceLineNo">2500</span>    @Override<a name="line.2500"></a>
+<span class="sourceLineNo">2501</span>    public void abort() throws IOException {<a name="line.2501"></a>
+<span class="sourceLineNo">2502</span>      if (snapshot != null) {<a name="line.2502"></a>
+<span class="sourceLineNo">2503</span>        //We need to close the snapshot when aborting, otherwise, the segment scanner<a name="line.2503"></a>
+<span class="sourceLineNo">2504</span>        //won't be closed. If we are using MSLAB, the chunk referenced by those scanners<a name="line.2504"></a>
+<span class="sourceLineNo">2505</span>        //can't be released, thus memory leak<a name="line.2505"></a>
+<span class="sourceLineNo">2506</span>        snapshot.close();<a name="line.2506"></a>
+<span class="sourceLineNo">2507</span>        HStore.this.updateStorefiles(Collections.emptyList(), snapshot.getId());<a name="line.2507"></a>
+<span class="sourceLineNo">2508</span>      }<a name="line.2508"></a>
+<span class="sourceLineNo">2509</span>    }<a name="line.2509"></a>
+<span class="sourceLineNo">2510</span>  }<a name="line.2510"></a>
+<span class="sourceLineNo">2511</span><a name="line.2511"></a>
+<span class="sourceLineNo">2512</span>  @Override<a name="line.2512"></a>
+<span class="sourceLineNo">2513</span>  public boolean needsCompaction() {<a name="line.2513"></a>
+<span class="sourceLineNo">2514</span>    List&lt;HStoreFile&gt; filesCompactingClone = null;<a name="line.2514"></a>
+<span class="sourceLineNo">2515</span>    synchronized (filesCompacting) {<a name="line.2515"></a>
+<span class="sourceLineNo">2516</span>      filesCompactingClone = Lists.newArrayList(filesCompacting);<a name="line.2516"></a>
+<span class="sourceLineNo">2517</span>    }<a name="line.2517"></a>
+<span class="sourceLineNo">2518</span>    return this.storeEngine.needsCompaction(filesCompactingClone);<a name="line.2518"></a>
+<span class="sourceLineNo">2519</span>  }<a name="line.2519"></a>
+<span class="sourceLineNo">2520</span><a name="line.2520"></a>
+<span class="sourceLineNo">2521</span>  /**<a name="line.2521"></a>
+<span class="sourceLineNo">2522</span>   * Used for tests.<a name="line.2522"></a>
+<span class="sourceLineNo">2523</span>   * @return cache configuration for this Store.<a name="line.2523"></a>
+<span class="sourceLineNo">2524</span>   */<a name="line.2524"></a>
+<span class="sourceLineNo">2525</span>  @VisibleForTesting<a name="line.2525"></a>
+<span class="sourceLineNo">2526</span>  public CacheConfig getCacheConfig() {<a name="line.2526"></a>
+<span class="sourceLineNo">2527</span>    return this.cacheConf;<a name="line.2527"></a>
+<span class="sourceLineNo">2528</span>  }<a name="line.2528"></a>
+<span class="sourceLineNo">2529</span><a name="line.2529"></a>
+<span class="sourceLineNo">2530</span>  public static final long FIXED_OVERHEAD =<a name="line.2530"></a>
+<span class="sourceLineNo">2531</span>      ClassSize.align(ClassSize.OBJECT + (27 * ClassSize.REFERENCE) + (2 * Bytes.SIZEOF_LONG)<a name="line.2531"></a>
+<span class="sourceLineNo">2532</span>              + (6 * Bytes.SIZEOF_INT) + (2 * Bytes.SIZEOF_BOOLEAN));<a name="line.2532"></a>
+<span class="sourceLineNo">2533</span><a name="line.2533"></a>
+<span class="sourceLineNo">2534</span>  public static final long DEEP_OVERHEAD = ClassSize.align(FIXED_OVERHEAD<a name="line.2534"></a>
+<span class="sourceLineNo">2535</span>      + ClassSize.OBJECT + ClassSize.REENTRANT_LOCK<a name="line.2535"></a>
+<span class="sourceLineNo">2536</span>      + ClassSize.CONCURRENT_SKIPLISTMAP<a name="line.2536"></a>
+<span class="sourceLineNo">2537</span>      + ClassSize.CONCURRENT_SKIPLISTMAP_ENTRY + ClassSize.OBJECT<a name="line.2537"></a>
+<span class="sourceLineNo">2538</span>      + ScanInfo.FIXED_OVERHEAD);<a name="line.2538"></a>
+<span class="sourceLineNo">2539</span><a name="line.2539"></a>
+<span class="sourceLineNo">2540</span>  @Override<a name="line.2540"></a>
+<span class="sourceLineNo">2541</span>  public long heapSize() {<a name="line.2541"></a>
+<span class="sourceLineNo">2542</span>    MemStoreSize memstoreSize = this.memstore.size();<a name="line.2542"></a>
+<span class="sourceLineNo">2543</span>    return DEEP_OVERHEAD + memstoreSize.getHeapSize();<a name="line.2543"></a>
+<span class="sourceLineNo">2544</span>  }<a name="line.2544"></a>
+<span class="sourceLineNo">2545</span><a name="line.2545"></a>
+<span class="sourceLineNo">2546</span>  @Override<a name="line.2546"></a>
+<span class="sourceLineNo">2547</span>  public CellComparator getComparator() {<a name="line.2547"></a>
+<span class="sourceLineNo">2548</span>    return comparator;<a name="line.2548"></a>
 <span class="sourceLineNo">2549</span>  }<a name="line.2549"></a>
 <span class="sourceLineNo">2550</span><a name="line.2550"></a>
-<span class="sourceLineNo">2551</span>  @Override<a name="line.2551"></a>
-<span class="sourceLineNo">2552</span>  public CellComparator getComparator() {<a name="line.2552"></a>
-<span class="sourceLineNo">2553</span>    return comparator;<a name="line.2553"></a>
-<span class="sourceLineNo">2554</span>  }<a name="line.2554"></a>
-<span class="sourceLineNo">2555</span><a name="line.2555"></a>
-<span class="sourceLineNo">2556</span>  public ScanInfo getScanInfo() {<a name="line.2556"></a>
-<span class="sourceLineNo">2557</span>    return scanInfo;<a name="line.2557"></a>
-<span class="sourceLineNo">2558</span>  }<a name="line.2558"></a>
-<span class="sourceLineNo">2559</span><a name="line.2559"></a>
-<span class="sourceLineNo">2560</span>  /**<a name="line.2560"></a>
-<span class="sourceLineNo">2561</span>   * Set scan info, used by test<a name="line.2561"></a>
-<span class="sourceLineNo">2562</span>   * @param scanInfo new scan info to use for test<a name="line.2562"></a>
-<span class="sourceLineNo">2563</span>   */<a name="line.2563"></a>
-<span class="sourceLineNo">2564</span>  void setScanInfo(ScanInfo scanInfo) {<a name="line.2564"></a>
-<span class="sourceLineNo">2565</span>    this.scanInfo = scanInfo;<a name="line.2565"></a>
+<span class="sourceLineNo">2551</span>  public ScanInfo getScanInfo() {<a name="line.2551"></a>
+<span class="sourceLineNo">2552</span>    return scanInfo;<a name="line.2552"></a>
+<span class="sourceLineNo">2553</span>  }<a name="line.2553"></a>
+<span class="sourceLineNo">2554</span><a name="line.2554"></a>
+<span class="sourceLineNo">2555</span>  /**<a name="line.2555"></a>
+<span class="sourceLineNo">2556</span>   * Set scan info, used by test<a name="line.2556"></a>
+<span class="sourceLineNo">2557</span>   * @param scanInfo new scan info to use for test<a name="line.2557"></a>
+<span class="sourceLineNo">2558</span>   */<a name="line.2558"></a>
+<span class="sourceLineNo">2559</span>  void setScanInfo(ScanInfo scanInfo) {<a name="line.2559"></a>
+<span class="sourceLineNo">2560</span>    this.scanInfo = scanInfo;<a name="line.2560"></a>
+<span class="sourceLineNo">2561</span>  }<a name="line.2561"></a>
+<span class="sourceLineNo">2562</span><a name="line.2562"></a>
+<span class="sourceLineNo">2563</span>  @Override<a name="line.2563"></a>
+<span class="sourceLineNo">2564</span>  public boolean hasTooManyStoreFiles() {<a name="line.2564"></a>
+<span class="sourceLineNo">2565</span>    return getStorefilesCount() &gt; this.blockingFileCount;<a name="line.2565"></a>
 <span class="sourceLineNo">2566</span>  }<a name="line.2566"></a>
 <span class="sourceLineNo">2567</span><a name="line.2567"></a>
 <span class="sourceLineNo">2568</span>  @Override<a name="line.2568"></a>
-<span class="sourceLineNo">2569</span>  public boolean hasTooManyStoreFiles() {<a name="line.2569"></a>
-<span class="sourceLineNo">2570</span>    return getStorefilesCount() &gt; this.blockingFileCount;<a name="line.2570"></a>
+<span class="sourceLineNo">2569</span>  public long getFlushedCellsCount() {<a name="line.2569"></a>
+<span class="sourceLineNo">2570</span>    return flushedCellsCount.get();<a name="line.2570"></a>
 <span class="sourceLineNo">2571</span>  }<a name="line.2571"></a>
 <span class="sourceLineNo">2572</span><a name="line.2572"></a>
 <span class="sourceLineNo">2573</span>  @Override<a name="line.2573"></a>
-<span class="sourceLineNo">2574</span>  public long getFlushedCellsCount() {<a name="line.2574"></a>
-<span class="sourceLineNo">2575</span>    return flushedCellsCount.get();<a name="line.2575"></a>
+<span class="sourceLineNo">2574</span>  public long getFlushedCellsSize() {<a name="line.2574"></a>
+<span class="sourceLineNo">2575</span>    return flushedCellsSize.get();<a name="line.2575"></a>
 <span class="sourceLineNo">2576</span>  }<a name="line.2576"></a>
 <span class="sourceLineNo">2577</span><a name="line.2577"></a>
 <span class="sourceLineNo">2578</span>  @Override<a name="line.2578"></a>
-<span class="sourceLineNo">2579</span>  public long getFlushedCellsSize() {<a name="line.2579"></a>
-<span class="sourceLineNo">2580</span>    return flushedCellsSize.get();<a name="line.2580"></a>
+<span class="sourceLineNo">2579</span>  public long getFlushedOutputFileSize() {<a name="line.2579"></a>
+<span class="sourceLineNo">2580</span>    return flushedOutputFileSize.get();<a name="line.2580"></a>
 <span class="sourceLineNo">2581</span>  }<a name="line.2581"></a>
 <span class="sourceLineNo">2582</span><a name="line.2582"></a>
 <span class="sourceLineNo">2583</span>  @Override<a name="line.2583"></a>
-<span class="sourceLineNo">2584</span>  public long getFlushedOutputFileSize() {<a name="line.2584"></a>
-<span class="sourceLineNo">2585</span>    return flushedOutputFileSize.get();<a name="line.2585"></a>
+<span class="sourceLineNo">2584</span>  public long getCompactedCellsCount() {<a name="line.2584"></a>
+<span class="sourceLineNo">2585</span>    return compactedCellsCount.get();<a name="line.2585"></a>
 <span class="sourceLineNo">2586</span>  }<a name="line.2586"></a>
 <span class="sourceLineNo">2587</span><a name="line.2587"></a>
 <span class="sourceLineNo">2588</span>  @Override<a name="line.2588"></a>
-<span class="sourceLineNo">2589</span>  public long getCompactedCellsCount() {<a name="line.2589"></a>
-<span class="sourceLineNo">2590</span>    return compactedCellsCount.get();<a name="line.2590"></a>
+<span class="sourceLineNo">2589</span>  public long getCompactedCellsSize() {<a name="line.2589"></a>
+<span class="sourceLineNo">2590</span>    return compactedCellsSize.get();<a name="line.2590"></a>
 <span class="sourceLineNo">2591</span>  }<a name="line.2591"></a>
 <span class="sourceLineNo">2592</span><a name="line.2592"></a>
 <span class="sourceLineNo">2593</span>  @Override<a name="line.2593"></a>
-<span class="sourceLineNo">2594</span>  public long getCompactedCellsSize() {<a name="line.2594"></a>
-<span class="sourceLineNo">2595</span>    return compactedCellsSize.get();<a name="line.2595"></a>
+<span class="sourceLineNo">2594</span>  public long getMajorCompactedCellsCount() {<a name="line.2594"></a>
+<span class="sourceLineNo">2595</span>    return majorCompactedCellsCount.get();<a name="line.2595"></a>
 <span class="sourceLineNo">2596</span>  }<a name="line.2596"></a>
 <span class="sourceLineNo">2597</span><a name="line.2597"></a>
 <span class="sourceLineNo">2598</span>  @Override<a name="line.2598"></a>
-<span class="sourceLineNo">2599</span>  public long getMajorCompactedCellsCount() {<a name="line.2599"></a>
-<span class="sourceLineNo">2600</span>    return majorCompactedCellsCount.get();<a name="line.2600"></a>
+<span class="sourceLineNo">2599</span>  public long getMajorCompactedCellsSize() {<a name="line.2599"></a>
+<span class="sourceLineNo">2600</span>    return majorCompactedCellsSize.get();<a name="line.2600"></a>
 <span class="sourceLineNo">2601</span>  }<a name="line.2601"></a>
 <span class="sourceLineNo">2602</span><a name="line.2602"></a>
-<span class="sourceLineNo">2603</span>  @Override<a name="line.2603"></a>
-<span class="sourceLineNo">2604</span>  public long getMajorCompactedCellsSize() {<a name="line.2604"></a>
-<span class="sourceLineNo">2605</span>    return majorCompactedCellsSize.get();<a name="line.2605"></a>
-<span class="sourceLineNo">2606</span>  }<a name="line.2606"></a>
-<span class="sourceLineNo">2607</span><a name="line.2607"></a>
-<span class="sourceLineNo">2608</span>  /**<a name="line.2608"></a>
-<span class="sourceLineNo">2609</span>   * Returns the StoreEngine that is backing this concrete implementation of Store.<a name="line.2609"></a>
-<span class="sourceLineNo">2610</span>   * @return Returns the {@link StoreEngine} object used internally inside this HStore object.<a name="line.2610"></a>
-<span class="sourceLineNo">2611</span>   */<a name="line.2611"></a>
-<span class="sourceLineNo">2612</span>  @VisibleForTesting<a name="line.2612"></a>
-<span class="sourceLineNo">2613</span>  public StoreEngine&lt;?, ?, ?, ?&gt; getStoreEngine() {<a name="line.2613"></a>
-<span class="sourceLineNo">2614</span>    return this.storeEngine;<a name="line.2614"></a>
-<span class="sourceLineNo">2615</span>  }<a name="line.2615"></a>
-<span class="sourceLineNo">2616</span><a name="line.2616"></a>
-<span class="sourceLineNo">2617</span>  protected OffPeakHours getOffPeakHours() {<a name="line.2617"></a>
-<span class="sourceLineNo">2618</span>    return this.offPeakHours;<a name="line.2618"></a>
-<span class="sourceLineNo">2619</span>  }<a name="line.2619"></a>
-<span class="sourceLineNo">2620</span><a name="line.2620"></a>
-<span class="sourceLineNo">2621</span>  /**<a name="line.2621"></a>
-<span class="sourceLineNo">2622</span>   * {@inheritDoc}<a name="line.2622"></a>
-<span class="sourceLineNo">2623</span>   */<a name="line.2623"></a>
-<span class="sourceLineNo">2624</span>  @Override<a name="line.2624"></a>
-<span class="sourceLineNo">2625</span>  public void onConfigurationChange(Configuration conf) {<a name="line.2625"></a>
-<span class="sourceLineNo">2626</span>    this.conf = new CompoundConfiguration()<a name="line.2626"></a>
-<span class="sourceLineNo">2627</span>            .add(conf)<a name="line.2627"></a>
-<span class="sourceLineNo">2628</span>            .addBytesMap(family.getValues());<a name="line.2628"></a>
-<span class="sourceLineNo">2629</span>    this.storeEngine.compactionPolicy.setConf(conf);<a name="line.2629"></a>
-<span class="sourceLineNo">2630</span>    this.offPeakHours = OffPeakHours.getInstance(conf);<a name="line.2630"></a>
-<span class="sourceLineNo">2631</span>  }<a name="line.2631"></a>
-<span class="sourceLineNo">2632</span><a name="line.2632"></a>
-<span class="sourceLineNo">2633</span>  /**<a name="line.2633"></a>
-<span class="sourceLineNo">2634</span>   * {@inheritDoc}<a name="line.2634"></a>
-<span class="sourceLineNo">2635</span>   */<a name="line.2635"></a>
-<span class="sourceLineNo">2636</span>  @Override<a name="line.2636"></a>
-<span class="sourceLineNo">2637</span>  public void registerChildren(ConfigurationManager manager) {<a name="line.2637"></a>
-<span class="sourceLineNo">2638</span>    // No children to register<a name="line.2638"></a>
-<span class="sourceLineNo">2639</span>  }<a name="line.2639"></a>
-<span class="sourceLineNo">2640</span><a name="line.2640"></a>
-<span class="sourceLineNo">2641</span>  /**<a name="line.2641"></a>
-<span class="sourceLineNo">2642</span>   * {@inheritDoc}<a name="line.2642"></a>
-<span class="sourceLineNo">2643</span>   */<a name="line.2643"></a>
+<span class="sourceLineNo">2603</span>  /**<a name="line.2603"></a>
+<span class="sourceLineNo">2604</span>   * Returns the StoreEngine that is backing this concrete implementation of Store.<a name="line.2604"></a>
+<span class="sourceLineNo">2605</span>   * @return Returns the {@link StoreEngine} object used internally inside this HStore object.<a name="line.2605"></a>
+<span class="sourceLineNo">2606</span>   */<a name="line.2606"></a>
+<span class="sourceLineNo">2607</span>  @VisibleForTesting<a name="line.2607"></a>
+<span class="sourceLineNo">2608</span>  public StoreEngine&lt;?, ?, ?, ?&gt; getStoreEngine() {<a name="line.2608"></a>
+<span class="sourceLineNo">2609</span>    return this.storeEngine;<a name="line.2609"></a>
+<span class="sourceLineNo">2610</span>  }<a name="line.2610"></a>
+<span class="sourceLineNo">2611</span><a name="line.2611"></a>
+<span class="sourceLineNo">2612</span>  protected OffPeakHours getOffPeakHours() {<a name="line.2612"></a>
+<span class="sourceLineNo">2613</span>    return this.offPeakHours;<a name="line.2613"></a>
+<span class="sourceLineNo">2614</span>  }<a name="line.2614"></a>
+<span class="sourceLineNo">2615</span><a name="line.2615"></a>
+<span class="sourceLineNo">2616</span>  /**<a name="line.2616"></a>
+<span class="sourceLineNo">2617</span>   * {@inheritDoc}<a name="line.2617"></a>
+<span class="sourceLineNo">2618</span>   */<a name="line.2618"></a>
+<span class="sourceLineNo">2619</span>  @Override<a name="line.2619"></a>
+<span class="sourceLineNo">2620</span>  public void onConfigurationChange(Configuration conf) {<a name="line.2620"></a>
+<span class="sourceLineNo">2621</span>    this.conf = new CompoundConfiguration()<a name="line.2621"></a>
+<span class="sourceLineNo">2622</span>            .add(conf)<a name="line.2622"></a>
+<span class="sourceLineNo">2623</span>            .addBytesMap(family.getValues());<a name="line.2623"></a>
+<span class="sourceLineNo">2624</span>    this.storeEngine.compactionPolicy.setConf(conf);<a name="line.2624"></a>
+<span class="sourceLineNo">2625</span>    this.offPeakHours = OffPeakHours.getInstance(conf);<a name="line.2625"></a>
+<span class="sourceLineNo">2626</span>  }<a name="line.2626"></a>
+<span class="sourceLineNo">2627</span><a name="line.2627"></a>
+<span class="sourceLineNo">2628</span>  /**<a name="line.2628"></a>
+<span class="sourceLineNo">2629</span>   * {@inheritDoc}<a name="line.2629"></a>
+<span class="sourceLineNo">2630</span>   */<a name="line.2630"></a>
+<span class="sourceLineNo">2631</span>  @Override<a name="line.2631"></a>
+<span class="sourceLineNo">2632</span>  public void registerChildren(ConfigurationManager manager) {<a name="line.2632"></a>
+<span class="sourceLineNo">2633</span>    // No children to register<a name="line.2633"></a>
+<span class="sourceLineNo">2634</span>  }<a name="line.2634"></a>
+<span class="sourceLineNo">2635</span><a name="line.2635"></a>
+<span class="sourceLineNo">2636</span>  /**<a name="line.2636"></a>
+<span class="sourceLineNo">2637</span>   * {@inheritDoc}<a name="line.2637"></a>
+<span class="sourceLineNo">2638</span>   */<a name="line.2638"></a>
+<span class="sourceLineNo">2639</span>  @Override<a name="line.2639"></a>
+<span class="sourceLineNo">2640</span>  public void deregisterChildren(ConfigurationManager manager) {<a name="line.2640"></a>
+<span class="sourceLineNo">2641</span>    // No children to deregister<a name="line.2641"></a>
+<span class="sourceLineNo">2642</span>  }<a name="line.2642"></a>
+<span class="sourceLineNo">2643</span><a name="line.2643"></a>
 <span class="sourceLineNo">2644</span>  @Override<a name="line.2644"></a>
-<span class="sourceLineNo">2645</span>  public void deregisterChildren(ConfigurationManager manager) {<a name="line.2645"></a>
-<span class="sourceLineNo">2646</span>    // No children to deregister<a name="line.2646"></a>
+<span class="sourceLineNo">2645</span>  public double getCompactionPressure() {<a name="line.2645"></a>
+<span class="sourceLineNo">2646</span>    return storeEngine.getStoreFileManager().getCompactionPressure();<a name="line.2646"></a>
 <span class="sourceLineNo">2647</span>  }<a name="line.2647"></a>
 <span class="sourceLineNo">2648</span><a name="line.2648"></a>
 <span class="sourceLineNo">2649</span>  @Override<a name="line.2649"></a>
-<span class="sourceLineNo">2650</span>  public double getCompactionPressure() {<a name="line.2650"></a>
-<span class="sourceLineNo">2651</span>    return storeEngine.getStoreFileManager().getCompactionPressure();<a name="line.2651"></a>
+<span class="sourceLineNo">2650</span>  public boolean isPrimaryReplicaStore() {<a name="line.2650"></a>
+<span class="sourceLineNo">2651</span>    return getRegionInfo().getReplicaId() == RegionInfo.DEFAULT_REPLICA_ID;<a name="line.2651"></a>
 <span class="sourceLineNo">2652</span>  }<a name="line.2652"></a>
 <span class="sourceLineNo">2653</span><a name="line.2653"></a>
-<span class="sourceLineNo">2654</span>  @Override<a name="line.2654"></a>
-<span class="sourceLineNo">2655</span>  public boolean isPrimaryReplicaStore() {<a name="line.2655"></a>
-<span class="sourceLineNo">2656</span>    return getRegionInfo().getReplicaId() == RegionInfo.DEFAULT_REPLICA_ID;<a name="line.2656"></a>
-<span class="sourceLineNo">2657</span>  }<a name="line.2657"></a>
-<span class="sourceLineNo">2658</span><a name="line.2658"></a>
-<span class="sourceLineNo">2659</span>  /**<a name="line.2659"></a>
-<span class="sourceLineNo">2660</span>   * Sets the store up for a region level snapshot operation.<a name="line.2660"></a>
-<span class="sourceLineNo">2661</span>   * @see #postSnapshotOperation()<a name="line.2661"></a>
-<span class="sourceLineNo">2662</span>   */<a name="line.2662"></a>
-<span class="sourceLineNo">2663</span>  public void preSnapshotOperation() {<a name="line.2663"></a>
-<span class="sourceLineNo">2664</span>    archiveLock.lock();<a name="line.2664"></a>
-<span class="sourceLineNo">2665</span>  }<a name="line.2665"></a>
-<span class="sourceLineNo">2666</span><a name="line.2666"></a>
-<span class="sourceLineNo">2667</span>  /**<a name="line.2667"></a>
-<span class="sourceLineNo">2668</span>   * Perform tasks needed after the completion of snapshot operation.<a name="line.2668"></a>
-<span class="sourceLineNo">2669</span>   * @see #preSnapshotOperation()<a name="line.2669"></a>
-<span class="sourceLineNo">2670</span>   */<a name="line.2670"></a>
-<span class="sourceLineNo">2671</span>  public void postSnapshotOperation() {<a name="line.2671"></a>
-<span class="sourceLineNo">2672</span>    archiveLock.unlock();<a name="line.2672"></a>
-<span class="sourceLineNo">2673</span>  }<a name="line.2673"></a>
-<span class="sourceLineNo">2674</span><a name="line.2674"></a>
-<span class="sourceLineNo">2675</span>  /**<a name="line.2675"></a>
-<span class="sourceLineNo">2676</span>   * Closes and archives the compacted files under this store<a name="line.2676"></a>
-<span class="sourceLineNo">2677</span>   */<a name="line.2677"></a>
-<span class="sourceLineNo">2678</span>  public synchronized void closeAndArchiveCompactedFiles() throws IOException {<a name="line.2678"></a>
-<span class="sourceLineNo">2679</span>    // ensure other threads do not attempt to archive the same files on close()<a name="line.2679"></a>
-<span class="sourceLineNo">2680</span>    archiveLock.lock();<a name="line.2680"></a>
-<span class="sourceLineNo">2681</span>    try {<a name="line.2681"></a>
-<span class="sourceLineNo">2682</span>      lock.readLock().lock();<a name="line.2682"></a>
-<span class="sourceLineNo">2683</span>      Collection&lt;HStoreFile&gt; copyCompactedfiles = null;<a name="line.2683"></a>
-<span class="sourceLineNo">2684</span>      try {<a name="line.2684"></a>
-<span class="sourceLineNo">2685</span>        Collection&lt;HStoreFile&gt; compactedfiles =<a name="line.2685"></a>
-<span class="sourceLineNo">2686</span>            this.getStoreEngine().getStoreFileManager().getCompactedfiles();<a name="line.2686"></a>
-<span class="sourceLineNo">2687</span>        if (CollectionUtils.isNotEmpty(compactedfiles)) {<a name="line.2687"></a>
-<span class="sourceLineNo">2688</span>          // Do a copy under read lock<a name="line.2688"></a>
-<span class="sourceLineNo">2689</span>          copyCompactedfiles = new ArrayList&lt;&gt;(compactedfiles);<a name="line.2689"></a>
-<span class="sourceLineNo">2690</span>        } else {<a name="line.2690"></a>
-<span class="sourceLineNo">2691</span>          LOG.trace("No compacted files to archive");<a name="line.2691"></a>
-<span class="sourceLineNo">2692</span>        }<a name="line.2692"></a>
-<span class="sourceLineNo">2693</span>      } finally {<a name="line.2693"></a>
-<span class="sourceLineNo">2694</span>        lock.readLock().unlock();<a name="line.2694"></a>
-<span class="sourceLineNo">2695</span>      }<a name="line.2695"></a>
-<span class="sourceLineNo">2696</span>      if (CollectionUtils.isNotEmpty(copyCompactedfiles)) {<a name="line.2696"></a>
-<span class="sourceLineNo">2697</span>        removeCompactedfiles(copyCompactedfiles);<a name="line.2697"></a>
-<span class="sourceLineNo">2698</span>      }<a name="line.2698"></a>
-<span class="sourceLineNo">2699</span>    } finally {<a name="line.2699"></a>
-<span class="sourceLineNo">2700</span>      archiveLock.unlock();<a name="line.2700"></a>
-<span class="sourceLineNo">2701</span>    }<a name="line.2701"></a>
-<span class="sourceLineNo">2702</span>  }<a name="line.2702"></a>
-<span class="sourceLineNo">2703</span><a name="line.2703"></a>
-<span class="sourceLineNo">2704</span>  /**<a name="line.2704"></a>
-<span class="sourceLineNo">2705</span>   * Archives and removes the compacted files<a name="line.2705"></a>
-<span class="sourceLineNo">2706</span>   * @param compactedfiles The compacted files in this store that are not active in reads<a name="line.2706"></a>
-<span class="sourceLineNo">2707</span>   */<a name="line.2707"></a>
-<span class="sourceLineNo">2708</span>  private void removeCompactedfiles(Collection&lt;HStoreFile&gt; compactedfiles)<a name="line.2708"></a>
-<span class="sourceLineNo">2709</span>      throws IOException {<a name="line.2709"></a>
-<span class="sourceLineNo">2710</span>    final List&lt;HStoreFile&gt; filesToRemove = new ArrayList&lt;&gt;(compactedfiles.size());<a name="line.2710"></a>
-<span class="sourceLineNo">2711</span>    final List&lt;Long&gt; storeFileSizes = new ArrayList&lt;&gt;(compactedfiles.size());<a name="line.2711"></a>
-<span class="sourceLineNo">2712</span>    for (final HStoreFile file : compactedfiles) {<a name="line.2712"></a>
-<span class="sourceLineNo">2713</span>      synchronized (file) {<a name="line.2713"></a>
-<span class="sourceLineNo">2714</span>        try {<a name="line.2714"></a>
-<span class="sourceLineNo">2715</span>          StoreFileReader r = file.getReader();<a name="line.2715"></a>
-<span class="sourceLineNo">2716</span>          if (r == null) {<a name="line.2716"></a>
-<span class="sourceLineNo">2717</span>            LOG.debug("The file {} was closed but still not archived", file);<a name="line.2717"></a>
-<span class="sourceLineNo">2718</span>            // HACK: Temporarily re-open the reader so we can get the size of the file. Ideally,<a name="line.2718"></a>
-<span class="sourceLineNo">2719</span>            // we should know the size of an HStoreFile without having to ask the HStoreFileReader<a name="line.2719"></a>
-<span class="sourceLineNo">2720</span>            // for that.<a name="line.2720"></a>
-<span class="sourceLineNo">2721</span>            long length = getStoreFileSize(file);<a name="line.2721"></a>
-<span class="sourceLineNo">2722</span>            filesToRemove.add(file);<a name="line.2722"></a>
-<span class="sourceLineNo">2723</span>            storeFileSizes.add(length);<a name="line.2723"></a>
-<span class="sourceLineNo">2724</span>            continue;<a name="line.2724"></a>
-<span class="sourceLineNo">2725</span>          }<a name="line.2725"></a>
-<span class="sourceLineNo">2726</span><a name="line.2726"></a>
-<span class="sourceLineNo">2727</span>          if (file.isCompactedAway() &amp;&amp; !file.isReferencedInReads()) {<a name="line.2727"></a>
-<span class="sourceLineNo">2728</span>            // Even if deleting fails we need not bother as any new scanners won't be<a name="line.2728"></a>
-<span class="sourceLineNo">2729</span>            // able to use the compacted file as the status is already compactedAway<a name="line.2729"></a>
-<span class="sourceLineNo">2730</span>            LOG.trace("Closing and archiving the file {}", file);<a name="line.2730"></a>
-<span class="sourceLineNo">2731</span>            // Copy the file size before closing the reader<a name="line.2731"></a>
-<span class="sourceLineNo">2732</span>            final long length = r.length();<a name="line.2732"></a>
-<span class="sourceLineNo">2733</span>            r.close(true);<a name="line.2733"></a>
-<span class="sourceLineNo">2734</span>            // Just close and return<a name="line.2734"></a>
-<span class="sourceLineNo">2735</span>            filesToRemove.add(file);<a name="line.2735"></a>
-<span class="sourceLineNo">2736</span>            // Only add the length if we successfully added the file to `filesToRemove`<a name="line.2736"></a>
-<span class="sourceLineNo">2737</span>            storeFileSizes.add(length);<a name="line.2737"></a>
-<span class="sourceLineNo">2738</span>          } else {<a name="line.2738"></a>
-<span class="sourceLineNo">2739</span>            LOG.info("Can't archive compacted file " + file.getPath()<a name="line.2739"></a>
-<span class="sourceLineNo">2740</span>                + " because of either isCompactedAway=" + file.isCompactedAway()<a name="line.2740"></a>
-<span class="sourceLineNo">2741</span>                + " or file has reference, isReferencedInReads=" + file.isReferencedInReads()<a name="line.2741"></a>
-<span class="sourceLineNo">2742</span>                + ", refCount=" + r.getRefCount() + ", skipping for now.");<a name="line.2742"></a>
-<span class="sourceLineNo">2743</span>          }<a name="line.2743"></a>
-<span class="sourceLineNo">2744</span>        } catch (Exception e) {<a name="line.2744"></a>
-<span class="sourceLineNo">2745</span>          LOG.error("Exception while trying to close the compacted store file {}", file.getPath(),<a name="line.2745"></a>
-<span class="sourceLineNo">2746</span>              e);<a name="line.2746"></a>
-<span class="sourceLineNo">2747</span>        }<a name="line.2747"></a>
-<span class="sourceLineNo">2748</span>      }<a name="line.2748"></a>
-<span class="sourceLineNo">2749</span>    }<a name="line.2749"></a>
-<span class="sourceLineNo">2750</span>    if (this.isPrimaryReplicaStore()) {<a name="line.2750"></a>
-<span class="sourceLineNo">2751</span>      // Only the primary region is allowed to move the file to archive.<a name="line.2751"></a>
-<span class="sourceLineNo">2752</span>      // The secondary region does not move the files to archive. Any active reads from<a name="line.2752"></a>
-<span class="sourceLineNo">2753</span>      // the secondary region will still work because the file as such has active readers on it.<a name="line.2753"></a>
-<span class="sourceLineNo">2754</span>      if (!filesToRemove.isEmpty()) {<a name="line.2754"></a>
-<span class="sourceLineNo">2755</span>        LOG.debug("Moving the files {} to archive", filesToRemove);<a name="line.2755"></a>
-<span class="sourceLineNo">2756</span>        // Only if this is successful it has to be removed<a name="line.2756"></a>
-<span class="sourceLineNo">2757</span>        try {<a name="line.2757"></a>
-<span class="sourceLineNo">2758</span>          this.fs.removeStoreFiles(this.getColumnFamilyDescriptor().getNameAsString(),<a name="line.2758"></a>
-<span class="sourceLineNo">2759</span>            filesToRemove);<a name="line.2759"></a>
-<span class="sourceLineNo">2760</span>        } catch (FailedArchiveException fae) {<a name="line.2760"></a>
-<span class="sourceLineNo">2761</span>          // Even if archiving some files failed, we still need to clear out any of the<a name="line.2761"></a>
-<span class="sourceLineNo">2762</span>          // files which were successfully archived.  Otherwise we will receive a<a name="line.2762"></a>
-<span class="sourceLineNo">2763</span>          // FileNotFoundException when we attempt to re-archive them in the next go around.<a name="line.2763"></a>
-<span class="sourceLineNo">2764</span>          Collection&lt;Path&gt; failedFiles = fae.getFailedFiles();<a name="line.2764"></a>
-<span class="sourceLineNo">2765</span>          Iterator&lt;HStoreFile&gt; iter = filesToRemove.iterator();<a name="line.2765"></a>
-<span class="sourceLineNo">2766</span>          Iterator&lt;Long&gt; sizeIter = storeFileSizes.iterator();<a name="line.2766"></a>
-<span class="sourceLineNo">2767</span>          while (iter.hasNext()) {<a name="line.2767"></a>
-<span class="sourceLineNo">2768</span>            sizeIter.next();<a name="line.2768"></a>
-<span class="sourceLineNo">2769</span>            if (failedFiles.contains(iter.next().getPath())) {<a name="line.2769"></a>
-<span class="sourceLineNo">2770</span>              iter.remove();<a name="line.2770"></a>
-<span class="sourceLineNo">2771</span>              sizeIter.remove();<a name="line.2771"></a>
-<span class="sourceLineNo">2772</span>            }<a name="line.2772"></a>
-<span class="sourceLineNo">2773</span>          }<a name="line.2773"></a>
-<span class="sourceLineNo">2774</span>          if (!filesToRemove.isEmpty()) {<a name="line.2774"></a>
-<span class="sourceLineNo">2775</span>            clearCompactedfiles(filesToRemove);<a name="line.2775"></a>
-<span class="sourceLineNo">2776</span>          }<a name="line.2776"></a>
-<span class="sourceLineNo">2777</span>          throw fae;<a name="line.2777"></a>
-<span class="sourceLineNo">2778</span>        }<a name="line.2778"></a>
-<span class="sourceLineNo">2779</span>      }<a name="line.2779"></a>
-<span class="sourceLineNo">2780</span>    }<a name="line.2780"></a>
-<span class="sourceLineNo">2781</span>    if (!filesToRemove.isEmpty()) {<a name="line.2781"></a>
-<span class="sourceLineNo">2782</span>      // Clear the compactedfiles from the store file manager<a name="line.2782"></a>
-<span class="sourceLineNo">2783</span>      clearCompactedfiles(filesToRemove);<a name="line.2783"></a>
-<span class="sourceLineNo">2784</span>      // Try to send report of this archival to the Master for updating quota usage faster<a name="line.2784"></a>
-<span class="sourceLineNo">2785</span>      reportArchivedFilesForQuota(filesToRemove, storeFileSizes);<a name="line.2785"></a>
-<span class="sourceLineNo">2786</span>    }<a name="line.2786"></a>
-<span class="sourceLineNo">2787</span>  }<a name="line.2787"></a>
-<span class="sourceLineNo">2788</span><a name="line.2788"></a>
-<span class="sourceLineNo">2789</span>  /**<a name="line.2789"></a>
-<span class="sourceLineNo">2790</span>   * Computes the length of a store file without succumbing to any errors along the way. If an<a name="line.2790"></a>
-<span class="sourceLineNo">2791</span>   * error is encountered, the implementation returns {@code 0} instead of the actual size.<a name="line.2791"></a>
-<span class="sourceLineNo">2792</span>   *<a name="line.2792"></a>
-<span class="sourceLineNo">2793</span>   * @param file The file to compute the size of.<a name="line.2793"></a>
-<span class="sourceLineNo">2794</span>   * @return The size in bytes of the provided {@code file}.<a name="line.2794"></a>
-<span class="sourceLineNo">2795</span>   */<a name="line.2795"></a>
-<span class="sourceLineNo">2796</span>  long getStoreFileSize(HStoreFile file) {<a name="line.2796"></a>
-<span class="sourceLineNo">2797</span>    long length = 0;<a name="line.2797"></a>
-<span class="sourceLineNo">2798</span>    try {<a name="line.2798"></a>
-<span class="sourceLineNo">2799</span>      file.initReader();<a name="line.2799"></a>
-<span class="sourceLineNo">2800</span>      length = file.getReader().length();<a name="line.2800"></a>
-<span class="sourceLineNo">2801</span>    } catch (IOException e) {<a name="line.2801"></a>
-<span class="sourceLineNo">2802</span>      LOG.trace("Failed to open reader when trying to compute store file size, ignoring", e);<a name="line.2802"></a>
-<span class="sourceLineNo">2803</span>    } finally {<a name="line.2803"></a>
-<span class="sourceLineNo">2804</span>      try {<a name="line.2804"></a>
-<span class="sourceLineNo">2805</span>        file.closeStoreFile(<a name="line.2805"></a>
-<span class="sourceLineNo">2806</span>            file.getCacheConf() != null ? file.getCacheConf().shouldEvictOnClose() : true);<a name="line.2806"></a>
-<span class="sourceLineNo">2807</span>      } catch (IOException e) {<a name="line.2807"></a>
-<span class="sourceLineNo">2808</span>        LOG.trace("Failed to close reader after computing store file size, ignoring", e);<a name="line.2808"></a>
-<span class="sourceLineNo">2809</span>      }<a name="line.2809"></a>
-<span class="sourceLineNo">2810</span>    }<a name="line.2810"></a>
-<span class="sourceLineNo">2811</span>    return length;<a name="line.2811"></a>
-<span class="sourceLineNo">2812</span>  }<a name="line.2812"></a>
-<span class="sourceLineNo">2813</span><a name="line.2813"></a>
-<span class="sourceLineNo">2814</span>  public Long preFlushSeqIDEstimation() {<a name="line.2814"></a>
-<span class="sourceLineNo">2815</span>    return memstore.preFlushSeqIDEstimation();<a name="line.2815"></a>
+<span class="sourceLineNo">2654</span>  /**<a name="line.2654"></a>
+<span class="sourceLineNo">2655</span>   * Sets the store up for a region level snapshot operation.<a name="line.2655"></a>
+<span class="sourceLineNo">2656</span>   * @see #postSnapshotOperation()<a name="line.2656"></a>
+<span class="sourceLineNo">2657</span>   */<a name="line.2657"></a>
+<span class="sourceLineNo">2658</span>  public void preSnapshotOperation() {<a name="line.2658"></a>
+<span class="sourceLineNo">2659</span>    archiveLock.lock();<a name="line.2659"></a>
+<span class="sourceLineNo">2660</span>  }<a name="line.2660"></a>
+<span class="sourceLineNo">2661</span><a name="line.2661"></a>
+<span class="sourceLineNo">2662</span>  /**<a name="line.2662"></a>
+<span class="sourceLineNo">2663</span>   * Perform tasks needed after the completion of snapshot operation.<a name="line.2663"></a>
+<span class="sourceLineNo">2664</span>   * @see #preSnapshotOperation()<a name="line.2664"></a>
+<span class="sourceLineNo">2665</span>   */<a name="line.2665"></a>
+<span class="sourceLineNo">2666</span>  public void postSnapshotOperation() {<a name="line.2666"></a>
+<span class="sourceLineNo">2667</span>    archiveLock.unlock();<a name="line.2667"></a>
+<span class="sourceLineNo">2668</span>  }<a name="line.2668"></a>
+<span class="sourceLineNo">2669</span><a name="line.2669"></a>
+<span class="sourceLineNo">2670</span>  /**<a name="line.2670"></a>
+<span class="sourceLineNo">2671</span>   * Closes and archives the compacted files under this store<a name="line.2671"></a>
+<span class="sourceLineNo">2672</span>   */<a name="line.2672"></a>
+<span class="sourceLineNo">2673</span>  public synchronized void closeAndArchiveCompactedFiles() throws IOException {<a name="line.2673"></a>
+<span class="sourceLineNo">2674</span>    // ensure other threads do not attempt to archive the same files on close()<a name="line.2674"></a>
+<span class="sourceLineNo">2675</span>    archiveLock.lock();<a name="line.2675"></a>
+<span class="sourceLineNo">2676</span>    try {<a name="line.2676"></a>
+<span class="sourceLineNo">2677</span>      lock.readLock().lock();<a name="line.2677"></a>
+<span class="sourceLineNo">2678</span>      Collection&lt;HStoreFile&gt; copyCompactedfiles = null;<a name="line.2678"></a>
+<span class="sourceLineNo">2679</span>      try {<a name="line.2679"></a>
+<span class="sourceLineNo">2680</span>        Collection&lt;HStoreFile&gt; compactedfiles =<a name="line.2680"></a>
+<span class="sourceLineNo">2681</span>            this.getStoreEngine().getStoreFileManager().getCompactedfiles();<a name="line.2681"></a>
+<span class="sourceLineNo">2682</span>        if (CollectionUtils.isNotEmpty(compactedfiles)) {<a name="line.2682"></a>
+<span class="sourceLineNo">2683</span>          // Do a copy under read lock<a name="line.2683"></a>
+<span class="sourceLineNo">2684</span>          copyCompactedfiles = new ArrayList&lt;&gt;(compactedfiles);<a name="line.2684"></a>
+<span class="sourceLineNo">2685</span>        } else {<a name="line.2685"></a>
+<span class="sourceLineNo">2686</span>          LOG.trace("No compacted files to archive");<a name="line.2686"></a>
+<span class="sourceLineNo">2687</span>        }<a name="line.2687"></a>
+<span class="sourceLineNo">2688</span>      } finally {<a name="line.2688"></a>
+<span class="sourceLineNo">2689</span>        lock.readLock().unlock();<a name="line.2689"></a>
+<span class="sourceLineNo">2690</span>      }<a name="line.2690"></a>
+<span class="sourceLineNo">2691</span>      if (CollectionUtils.isNotEmpty(copyCompactedfiles)) {<a name="line.2691"></a>
+<span class="sourceLineNo">2692</span>        removeCompactedfiles(copyCompactedfiles);<a name="line.2692"></a>
+<span class="sourceLineNo">2693</span>      }<a name="line.2693"></a>
+<span class="sourceLineNo">2694</span>    } finally {<a name="line.2694"></a>
+<span class="sourceLineNo">2695</span>      archiveLock.unlock();<a name="line.2695"></a>
+<span class="sourceLineNo">2696</span>    }<a name="line.2696"></a>
+<span class="sourceLineNo">2697</span>  }<a name="line.2697"></a>
+<span class="sourceLineNo">2698</span><a name="line.2698"></a>
+<span class="sourceLineNo">2699</span>  /**<a name="line.2699"></a>
+<span class="sourceLineNo">2700</span>   * Archives and removes the compacted files<a name="line.2700"></a>
+<span class="sourceLineNo">2701</span>   * @param compactedfiles The compacted files in this store that are not active in reads<a name="line.2701"></a>
+<span class="sourceLineNo">2702</span>   */<a name="line.2702"></a>
+<span class="sourceLineNo">2703</span>  private void removeCompactedfiles(Collection&lt;HStoreFile&gt; compactedfiles)<a name="line.2703"></a>
+<span class="sourceLineNo">2704</span>      throws IOException {<a name="line.2704"></a>
+<span class="sourceLineNo">2705</span>    final List&lt;HStoreFile&gt; filesToRemove = new ArrayList&lt;&gt;(compactedfiles.size());<a name="line.2705"></a>
+<span class="sourceLineNo">2706</span>    final List&lt;Long&gt; storeFileSizes = new ArrayList&lt;&gt;(compactedfiles.size());<a name="line.2706"></a>
+<span class="sourceLineNo">2707</span>    for (final HStoreFile file : compactedfiles) {<a name="line.2707"></a>
+<span class="sourceLineNo">2708</span>      synchronized (file) {<a name="line.2708"></a>
+<span class="sourceLineNo">2709</span>        try {<a name="line.2709"></a>
+<span class="sourceLineNo">2710</span>          StoreFileReader r = file.getReader();<a name="line.2710"></a>
+<span class="sourceLineNo">2711</span>          if (r == null) {<a name="line.2711"></a>
+<span class="sourceLineNo">2712</span>            LOG.debug("The file {} was closed but still not archived", file);<a name="line.2712"></a>
+<span class="sourceLineNo">2713</span>            // HACK: Temporarily re-open the reader so we can get the size of the file. Ideally,<a name="line.2713"></a>
+<span class="sourceLineNo">2714</span>            // we should know the size of an HStoreFile without having to ask the HStoreFileReader<a name="line.2714"></a>
+<span class="sourceLineNo">2715</span>            // for that.<a name="line.2715"></a>
+<span class="sourceLineNo">2716</span>            long length = getStoreFileSize(file);<a name="line.2716"></a>
+<span class="sourceLineNo">2717</span>            filesToRemove.add(file);<a name="line.2717"></a>
+<span class="sourceLineNo">2718</span>            storeFileSizes.add(length);<a name="line.2718"></a>
+<span class="sourceLineNo">2719</span>            continue;<a name="line.2719"></a>
+<span class="sourceLineNo">2720</span>          }<a name="line.2720"></a>
+<span class="sourceLineNo">2721</span><a name="line.2721"></a>
+<span class="sourceLineNo">2722</span>          if (file.isCompactedAway() &amp;&amp; !file.isReferencedInReads()) {<a name="line.2722"></a>
+<span class="sourceLineNo">2723</span>            // Even if deleting fails we need not bother as any new scanners won't be<a name="line.2723"></a>
+<span class="sourceLineNo">2724</span>            // able to use the compacted file as the status is already compactedAway<a name="line.2724"></a>
+<span class="sourceLineNo">2725</span>            LOG.trace("Closing and archiving the file {}", file);<a name="line.2725"></a>
+<span class="sourceLineNo">2726</span>            // Copy the file size before closing the reader<a name="line.2726"></a>
+<span class="sourceLineNo">2727</span>            final long length = r.length();<a name="line.2727"></a>
+<span class="sourceLineNo">2728</span>            r.close(true);<a name="line.2728"></a>
+<span class="sourceLineNo">2729</span>            // Just close and return<a name="line.2729"></a>
+<span class="sourceLineNo">2730</span>            filesToRemove.add(file);<a name="line.2730"></a>
+<span class="sourceLineNo">2731</span>            // Only add the length if we successfully added the file to `filesToRemove`<a name="line.2731"></a>
+<span class="sourceLineNo">2732</span>            storeFileSizes.add(length);<a name="line.2732"></a>
+<span class="sourceLineNo">2733</span>          } else {<a name="line.2733"></a>
+<span class="sourceLineNo">2734</span>            LOG.info("Can't archive compacted file " + file.getPath()<a name="line.2734"></a>
+<span class="sourceLineNo">2735</span>                + " because of either isCompactedAway=" + file.isCompactedAway()<a name="line.2735"></a>
+<span class="sourceLineNo">2736</span>                + " or file has reference, isReferencedInReads=" + file.isReferencedInReads()<a name="line.2736"></a>
+<span class="sourceLineNo">2737</span>                + ", refCount=" + r.getRefCount() + ", skipping for now.");<a name="line.2737"></a>
+<span class="sourceLineNo">2738</span>          }<a name="line.2738"></a>
+<span class="sourceLineNo">2739</span>        } catch (Exception e) {<a name="line.2739"></a>
+<span class="sourceLineNo">2740</span>          LOG.error("Exception while trying to close the compacted store file {}", file.getPath(),<a name="line.2740"></a>
+<span class="sourceLineNo">2741</span>              e);<a name="line.2741"></a>
+<span class="sourceLineNo">2742</span>        }<a name="line.2742"></a>
+<span class="sourceLineNo">2743</span>      }<a name="line.2743"></a>
+<span class="sourceLineNo">2744</span>    }<a name="line.2744"></a>
+<span class="sourceLineNo">2745</span>    if (this.isPrimaryReplicaStore()) {<a name="line.2745"></a>
+<span class="sourceLineNo">2746</span>      // Only the primary region is allowed to move the file to archive.<a name="line.2746"></a>
+<span class="sourceLineNo">2747</span>      // The secondary region does not move the files to archive. Any active reads from<a name="line.2747"></a>
+<span class="sourceLineNo">2748</span>      // the secondary region will still work because the file as such has active readers on it.<a name="line.2748"></a>
+<span class="sourceLineNo">2749</span>      if (!filesToRemove.isEmpty()) {<a name="line.2749"></a>
+<span class="sourceLineNo">2750</span>        LOG.debug("Moving the files {} to archive", filesToRemove);<a name="line.2750"></a>
+<span class="sourceLineNo">2751</span>        // Only if this is successful it has to be removed<a name="line.2751"></a>
+<span class="sourceLineNo">2752</span>        try {<a name="line.2752"></a>
+<span class="sourceLineNo">2753</span>          this.fs.removeStoreFiles(this.getColumnFamilyDescriptor().getNameAsString(),<a name="line.2753"></a>
+<span class="sourceLineNo">2754</span>            filesToRemove);<a name="line.2754"></a>
+<span class="sourceLineNo">2755</span>        } catch (FailedArchiveException fae) {<a name="line.2755"></a>
+<span class="sourceLineNo">2756</span>          // Even if archiving some files failed, we still need to clear out any of the<a name="line.2756"></a>
+<span class="sourceLineNo">2757</span>          // files which were successfully archived.  Otherwise we will receive a<a name="line.2757"></a>
+<span class="sourceLineNo">2758</span>          // FileNotFoundException when we attempt to re-archive them in the next go around.<a name="line.2758"></a>
+<span class="sourceLineNo">2759</span>          Collection&lt;Path&gt; failedFiles = fae.getFailedFiles();<a name="line.2759"></a>
+<span class="sourceLineNo">2760</span>          Iterator&lt;HStoreFile&gt; iter = filesToRemove.iterator();<a name="line.2760"></a>
+<span class="sourceLineNo">2761</span>          Iterator&lt;Long&gt; sizeIter = storeFileSizes.iterator();<a name="line.2761"></a>
+<span class="sourceLineNo">2762</span>          while (iter.hasNext()) {<a name="line.2762"></a>
+<span class="sourceLineNo">2763</span>            sizeIter.next();<a name="line.2763"></a>
+<span class="sourceLineNo">2764</span>            if (failedFiles.contains(iter.next().getPath())) {<a name="line.2764"></a>
+<span class="sourceLineNo">2765</span>              iter.remove();<a name="line.2765"></a>
+<span class="sourceLineNo">2766</span>              sizeIter.remove();<a name="line.2766"></a>
+<span class="sourceLineNo">2767</span>            }<a name="line.2767"></a>
+<span class="sourceLineNo">2768</span>          }<a name="line.2768"></a>
+<span class="sourceLineNo">2769</span>          if (!filesToRemove.isEmpty()) {<a name="line.2769"></a>
+<span class="sourceLineNo">2770</span>            clearCompactedfiles(filesToRemove);<a name="line.2770"></a>
+<span class="sourceLineNo">2771</span>          }<a name="line.2771"></a>
+<span class="sourceLineNo">2772</span>          throw fae;<a name="line.2772"></a>
+<span class="sourceLineNo">2773</span>        }<a name="line.2773"></a>
+<span class="sourceLineNo">2774</span>      }<a name="line.2774"></a>
+<span class="sourceLineNo">2775</span>    }<a name="line.2775"></a>
+<span class="sourceLineNo">2776</span>    if (!filesToRemove.isEmpty()) {<a name="line.2776"></a>
+<span class="sourceLineNo">2777</span>      // Clear the compactedfiles from the store file manager<a name="line.2777"></a>
+<span class="sourceLineNo">2778</span>      clearCompactedfiles(filesToRemove);<a name="line.2778"></a>
+<span class="sourceLineNo">2779</span>      // Try to send report of this archival to the Master for updating quota usage faster<a name="line.2779"></a>
+<span class="sourceLineNo">2780</span>      reportArchivedFilesForQuota(filesToRemove, storeFileSizes);<a name="line.2780"></a>
+<span class="sourceLineNo">2781</span>    }<a name="line.2781"></a>
+<span class="sourceLineNo">2782</span>  }<a name="line.2782"></a>
+<span class="sourceLineNo">2783</span><a name="line.2783"></a>
+<span class="sourceLineNo">2784</span>  /**<a name="line.2784"></a>
+<span class="sourceLineNo">2785</span>   * Computes the length of a store file without succumbing to any errors along the way. If an<a name="line.2785"></a>
+<span class="sourceLineNo">2786</span>   * error is encountered, the implementation returns {@code 0} instead of the actual size.<a name="line.2786"></a>
+<span class="sourceLineNo">2787</span>   *<a name="line.2787"></a>
+<span class="sourceLineNo">2788</span>   * @param file The file to compute the size of.<a name="line.2788"></a>
+<span class="sourceLineNo">2789</span>   * @return The size in bytes of the provided {@code file}.<a name="line.2789"></a>
+<span class="sourceLineNo">2790</span>   */<a name="line.2790"></a>
+<span class="sourceLineNo">2791</span>  long getStoreFileSize(HStoreFile file) {<a name="line.2791"></a>
+<span class="sourceLineNo">2792</span>    long length = 0;<a name="line.2792"></a>
+<span class="sourceLineNo">2793</span>    try {<a name="line.2793"></a>
+<span class="sourceLineNo">2794</span>      file.initReader();<a name="line.2794"></a>
+<span class="sourceLineNo">2795</span>      length = file.getReader().length();<a name="line.2795"></a>
+<span class="sourceLineNo">2796</span>    } catch (IOException e) {<a name="line.2796"></a>
+<span class="sourceLineNo">2797</span>      LOG.trace("Failed to open reader when trying to compute store file size, ignoring", e);<a name="line.2797"></a>
+<span class="sourceLineNo">2798</span>    } finally {<a name="line.2798"></a>
+<span class="sourceLineNo">2799</span>      try {<a name="line.2799"></a>
+<span class="sourceLineNo">2800</span>        file.closeStoreFile(<a name="line.2800"></a>
+<span class="sourceLineNo">2801</span>            file.getCacheConf() != null ? file.getCacheConf().shouldEvictOnClose() : true);<a name="line.2801"></a>
+<span class="sourceLineNo">2802</span>      } catch (IOException e) {<a name="line.2802"></a>
+<span class="sourceLineNo">2803</span>        LOG.trace("Failed to close reader after computing store file size, ignoring", e);<a name="line.2803"></a>
+<span class="sourceLineNo">2804</span>      }<a name="line.2804"></a>
+<span class="sourceLineNo">2805</span>    }<a name="line.2805"></a>
+<span class="sourceLineNo">2806</span>    return length;<a name="line.2806"></a>
+<span class="sourceLineNo">2807</span>  }<a name="line.2807"></a>
+<span class="sourceLineNo">2808</span><a name="line.2808"></a>
+<span class="sourceLineNo">2809</span>  public Long preFlushSeqIDEstimation() {<a name="line.2809"></a>
+<span class="sourceLineNo">2810</span>    return memstore.preFlushSeqIDEstimation();<a name="line.2810"></a>
+<span class="sourceLineNo">2811</span>  }<a name="line.2811"></a>
+<span class="sourceLineNo">2812</span><a name="line.2812"></a>
+<span class="sourceLineNo">2813</span>  @Override<a name="line.2813"></a>
+<span class="sourceLineNo">2814</span>  public boolean isSloppyMemStore() {<a name="line.2814"></a>
+<span class="sourceLineNo">2815</span>    return this.memstore.isSloppy();<a name="line.2815"></a>
 <span class="sourceLineNo">2816</span>  }<a name="line.2816"></a>
 <span class="sourceLineNo">2817</span><a name="line.2817"></a>
-<span class="sourceLineNo">2818</span>  @Override<a name="line.2818"></a>
-<span class="sourceLineNo">2819</span>  public boolean isSloppyMemStore() {<a name="line.2819"></a>
-<span class="sourceLineNo">2820</span>    return this.memstore.isSloppy();<a name="line.2820"></a>
-<span class="sourceLineNo">2821</span>  }<a name="line.2821"></a>
-<span class="sourceLineNo">2822</span><a name="line.2822"></a>
-<span class="sourceLineNo">2823</span>  private void clearCompactedfiles(List&lt;HStoreFile&gt; filesToRemove) throws IOException {<a name="line.2823"></a>
-<span class="sourceLineNo">2824</span>    LOG.trace("Clearing the compacted file {} from this store", filesToRemove);<a name="line.2824"></a>
-<span class="sourceLineNo">2825</span>    try {<a name="line.2825"></a>
-<span class="sourceLineNo">2826</span>      lock.writeLock().lock();<a name="line.2826"></a>
-<span class="sourceLineNo">2827</span>      this.getStoreEngine().getStoreFileManager().removeCompactedFiles(filesToRemove);<a name="line.2827"></a>
-<span class="sourceLineNo">2828</span>    } finally {<a name="line.2828"></a>
-<span class="sourceLineNo">2829</span>      lock.writeLock().unlock();<a name="line.2829"></a>
-<span class="sourceLineNo">2830</span>    }<a name="line.2830"></a>
-<span class="sourceLineNo">2831</span>  }<a name="line.2831"></a>
-<span class="sourceLineNo">2832</span><a name="line.2832"></a>
-<span class="sourceLineNo">2833</span>  void reportArchivedFilesForQuota(List&lt;? extends StoreFile&gt; archivedFiles, List&lt;Long&gt; fileSizes) {<a name="line.2833"></a>
-<span class="sourceLineNo">2834</span>    // Sanity check from the caller<a name="line.2834"></a>
-<span class="sourceLineNo">2835</span>    if (archivedFiles.size() != fileSizes.size()) {<a name="line.2835"></a>
-<span class="sourceLineNo">2836</span>      throw new RuntimeException("Coding error: should never see lists of varying size");<a name="line.2836"></a>
-<span class="sourceLineNo">2837</span>    }<a name="line.2837"></a>
-<span class="sourceLineNo">2838</span>    RegionServerServices rss = this.region.getRegionServerServices();<a name="line.2838"></a>
-<span class="sourceLineNo">2839</span>    if (rss == null) {<a name="line.2839"></a>
-<span class="sourceLineNo">2840</span>      return;<a name="line.2840"></a>
-<span class="sourceLineNo">2841</span>    }<a name="line.2841"></a>
-<span class="sourceLineNo">2842</span>    List&lt;Entry&lt;String,Long&gt;&gt; filesWithSizes = new ArrayList&lt;&gt;(archivedFiles.size());<a name="line.2842"></a>
-<span class="sourceLineNo">2843</span>    Iterator&lt;Long&gt; fileSizeIter = fileSizes.iterator();<a name="line.2843"></a>
-<span class="sourceLineNo">2844</span>    for (StoreFile storeFile : archivedFiles) {<a name="line.2844"></a>
-<span class="sourceLineNo">2845</span>      final long fileSize = fileSizeIter.next();<a name="line.2845"></a>
-<span class="sourceLineNo">2846</span>      if (storeFile.isHFile() &amp;&amp; fileSize != 0) {<a name="line.2846"></a>
-<span class="sourceLineNo">2847</span>        filesWithSizes.add(Maps.immutableEntry(storeFile.getPath().getName(), fileSize));<a name="line.2847"></a>
-<span class="sourceLineNo">2848</span>      }<a name="line.2848"></a>
-<span class="sourceLineNo">2849</span>    }<a name="line.2849"></a>
-<span class="sourceLineNo">2850</span>    if (LOG.isTraceEnabled()) {<a name="line.2850"></a>
-<span class="sourceLineNo">2851</span>      LOG.trace("Files archived: " + archivedFiles + ", reporting the following to the Master: "<a name="line.2851"></a>
-<span class="sourceLineNo">2852</span>          + filesWithSizes);<a name="line.2852"></a>
-<span class="sourceLineNo">2853</span>    }<a name="line.2853"></a>
-<span class="sourceLineNo">2854</span>    boolean success = rss.reportFileArchivalForQuotas(getTableName(), filesWithSizes);<a name="line.2854"></a>
-<span class="sourceLineNo">2855</span>    if (!success) {<a name="line.2855"></a>
-<span class="sourceLineNo">2856</span>      LOG.warn("Failed to report archival of files: " + filesWithSizes);<a name="line.2856"></a>
-<span class="sourceLineNo">2857</span>    }<a name="line.2857"></a>
+<span class="sourceLineNo">2818</span>  private void clearCompactedfiles(List&lt;HStoreFile&gt; filesToRemove) throws IOException {<a name="line.2818"></a>
+<span class="sourceLineNo">2819</span>    LOG.trace("Clearing the compacted file {} from this store", filesToRemove);<a name="line.2819"></a>
+<span class="sourceLineNo">2820</span>    try {<a name="line.2820"></a>
+<span class="sourceLineNo">2821</span>      lock.writeLock().lock();<a name="line.2821"></a>
+<span class="sourceLineNo">2822</span>      this.getStoreEngine().getStoreFileManager().removeCompactedFiles(filesToRemove);<a name="line.2822"></a>
+<span class="sourceLineNo">2823</span>    } finally {<a name="line.2823"></a>
+<span class="sourceLineNo">2824</span>      lock.writeLock().unlock();<a name="line.2824"></a>
+<span class="sourceLineNo">2825</span>    }<a name="line.2825"></a>
+<span class="sourceLineNo">2826</span>  }<a name="line.2826"></a>
+<span class="sourceLineNo">2827</span><a name="line.2827"></a>
+<span class="sourceLineNo">2828</span>  void reportArchivedFilesForQuota(List&lt;? extends StoreFile&gt; archivedFiles, List&lt;Long&gt; fileSizes) {<a name="line.2828"></a>
+<span class="sourceLineNo">2829</span>    // Sanity check from the caller<a name="line.2829"></a>
+<span class="sourceLineNo">2830</span>    if (archivedFiles.size() != fileSizes.size()) {<a name="line.2830"></a>
+<span class="sourceLineNo">2831</span>      throw new RuntimeException("Coding error: should never see lists of varying size");<a name="line.2831"></a>
+<span class="sourceLineNo">2832</span>    }<a name="line.2832"></a>
+<span class="sourceLineNo">2833</span>    RegionServerServices rss = this.region.getRegionServerServices();<a name="line.2833"></a>
+<span class="sourceLineNo">2834</span>    if (rss == null) {<a name="line.2834"></a>
+<span class="sourceLineNo">2835</span>      return;<a name="line.2835"></a>
+<span class="sourceLineNo">2836</span>    }<a name="line.2836"></a>
+<span class="sourceLineNo">2837</span>    List&lt;Entry&lt;String,Long&gt;&gt; filesWithSizes = new ArrayList&lt;&gt;(archivedFiles.size());<a name="line.2837"></a>
+<span class="sourceLineNo">2838</span>    Iterator&lt;Long&gt; fileSizeIter = fileSizes.iterator();<a name="line.2838"></a>
+<span class="sourceLineNo">2839</span>    for (StoreFile storeFile : archivedFiles) {<a name="line.2839"></a>
+<span class="sourceLineNo">2840</span>      final long fileSize = fileSizeIter.next();<a name="line.2840"></a>
+<span class="sourceLineNo">2841</span>      if (storeFile.isHFile() &amp;&amp; fileSize != 0) {<a name="line.2841"></a>
+<span class="sourceLineNo">2842</span>        filesWithSizes.add(Maps.immutableEntry(storeFile.getPath().getName(), fileSize));<a name="line.2842"></a>
+<span class="sourceLineNo">2843</span>      }<a name="line.2843"></a>
+<span class="sourceLineNo">2844</span>    }<a name="line.2844"></a>
+<span class="sourceLineNo">2845</span>    if (LOG.isTraceEnabled()) {<a name="line.2845"></a>
+<span class="sourceLineNo">2846</span>      LOG.trace("Files archived: " + archivedFiles + ", reporting the following to the Master: "<a name="line.2846"></a>
+<span class="sourceLineNo">2847</span>          + filesWithSizes);<a name="line.2847"></a>
+<span class="sourceLineNo">2848</span>    }<a name="line.2848"></a>
+<span class="sourceLineNo">2849</span>    boolean success = rss.reportFileArchivalForQuotas(getTableName(), filesWithSizes);<a name="line.2849"></a>
+<span class="sourceLineNo">2850</span>    if (!success) {<a name="line.2850"></a>
+<span class="sourceLineNo">2851</span>      LOG.warn("Failed to report archival of files: " + filesWithSizes);<a name="line.2851"></a>
+<span class="sourceLineNo">2852</span>    }<a name="line.2852"></a>
+<span class="sourceLineNo">2853</span>  }<a name="line.2853"></a>
+<span class="sourceLineNo">2854</span><a name="line.2854"></a>
+<span class="sourceLineNo">2855</span>  @Override<a name="line.2855"></a>
+<span class="sourceLineNo">2856</span>  public int getCurrentParallelPutCount() {<a name="line.2856"></a>
+<span class="sourceLineNo">2857</span>    return currentParallelPutCount.get();<a name="line.2857"></a>
 <span class="sourceLineNo">2858</span>  }<a name="line.2858"></a>
 <span class="sourceLineNo">2859</span><a name="line.2859"></a>
-<span class="sourceLineNo">2860</span>  @Override<a name="line.2860"></a>
-<span class="sourceLineNo">2861</span>  public int getCurrentParallelPutCount() {<a name="line.2861"></a>
-<span class="sourceLineNo">2862</span>    return currentParallelPutCount.get();<a name="line.2862"></a>
-<span class="sourceLineNo">2863</span>  }<a name="line.2863"></a>
-<span class="sourceLineNo">2864</span><a name="line.2864"></a>
-<span class="sourceLineNo">2865</span>  public int getStoreRefCount() {<a name="line.2865"></a>
-<span class="sourceLineNo">2866</span>    return this.storeEngine.getStoreFileManager().getStorefiles().stream()<a name="line.2866"></a>
-<span class="sourceLineNo">2867</span>      .filter(sf -&gt; sf.getReader() != null).filter(HStoreFile::isHFile)<a name="line.2867"></a>
-<span class="sourceLineNo">2868</span>      .mapToInt(HStoreFile::getRefCount).sum();<a name="line.2868"></a>
-<span class="sourceLineNo">2869</span>  }<a name="line.2869"></a>
-<span class="sourceLineNo">2870</span><a name="line.2870"></a>
-<span class="sourceLineNo">2871</span>  /**<a name="line.2871"></a>
-<span class="sourceLineNo">2872</span>   * @return get maximum ref count of storeFile among all compacted HStore Files<a name="line.2872"></a>
-<span class="sourceLineNo">2873</span>   *   for the HStore<a name="line.2873"></a>
-<span class="sourceLineNo">2874</span>   */<a name="line.2874"></a>
-<span class="sourceLineNo">2875</span>  public int getMaxCompactedStoreFileRefCount() {<a name="line.2875"></a>
-<span class="sourceLineNo">2876</span>    OptionalInt maxCompactedStoreFileRefCount = this.storeEngine.getStoreFileManager()<a name="line.2876"></a>
-<span class="sourceLineNo">2877</span>      .getCompactedfiles()<a name="line.2877"></a>
-<span class="sourceLineNo">2878</span>      .stream()<a name="line.2878"></a>
-<span class="sourceLineNo">2879</span>      .filter(sf -&gt; sf.getReader() != null)<a name="line.2879"></a>
-<span class="sourceLineNo">2880</span>      .filter(HStoreFile::isHFile)<a name="line.2880"></a>
-<span class="sourceLineNo">2881</span>      .mapToInt(HStoreFile::getRefCount)<a name="line.2881"></a>
-<span class="sourceLineNo">2882</span>      .max();<a name="line.2882"></a>
-<span class="sourceLineNo">2883</span>    return maxCompactedStoreFileRefCount.isPresent()<a name="line.2883"></a>
-<span class="sourceLineNo">2884</span>      ? maxCompactedStoreFileRefCount.getAsInt() : 0;<a name="line.2884"></a>
-<span class="sourceLineNo">2885</span>  }<a name="line.2885"></a>
-<span class="sourceLineNo">2886</span><a name="line.2886"></a>
-<span class="sourceLineNo">2887</span>}<a name="line.2887"></a>
+<span class="sourceLineNo">2860</span>  public int getStoreRefCount() {<a name="line.2860"></a>
+<span class="sourceLineNo">2861</span>    return this.storeEngine.getStoreFileManager().getStorefiles().stream()<a name="line.2861"></a>
+<span class="sourceLineNo">2862</span>      .filter(sf -&gt; sf.getReader() != null).filter(HStoreFile::isHFile)<a name="line.2862"></a>
+<span class="sourceLineNo">2863</span>      .mapToInt(HStoreFile::getRefCount).sum();<a name="line.2863"></a>
+<span class="sourceLineNo">2864</span>  }<a name="line.2864"></a>
+<span class="sourceLineNo">2865</span><a name="line.2865"></a>
+<span class="sourceLineNo">2866</span>  /**<a name="line.2866"></a>
+<span class="sourceLineNo">2867</span>   * @return get maximum ref count of storeFile among all compacted HStore Files<a name="line.2867"></a>
+<span class="sourceLineNo">2868</span>   *   for the HStore<a name="line.2868"></a>
+<span class="sourceLineNo">2869</span>   */<a name="line.2869"></a>
+<span class="sourceLineNo">2870</span>  public int getMaxCompactedStoreFileRefCount() {<a name="line.2870"></a>
+<span class="sourceLineNo">2871</span>    OptionalInt maxCompactedStoreFileRefCount = this.storeEngine.getStoreFileManager()<a name="line.2871"></a>
+<span class="sourceLineNo">2872</span>      .getCompactedfiles()<a name="line.2872"></a>
+<span class="sourceLineNo">2873</span>      .stream()<a name="line.2873"></a>
+<span class="sourceLineNo">2874</span>      .filter(sf -&gt; sf.getReader() != null)<a name="line.2874"></a>
+<span class="sourceLineNo">2875</span>      .filter(HStoreFile::isHFile)<a name="line.2875"></a>
+<span class="sourceLineNo">2876</span>      .mapToInt(HStoreFile::getRefCount)<a name="line.2876"></a>
+<span class="sourceLineNo">2877</span>      .max();<a name="line.2877"></a>
+<span class="sourceLineNo">2878</span>    return maxCompactedStoreFileRefCount.isPresent()<a name="line.2878"></a>
+<span class="sourceLineNo">2879</span>      ? maxCompactedStoreFileRefCount.getAsInt() : 0;<a name="line.2879"></a>
+<span class="sourceLineNo">2880</span>  }<a name="line.2880"></a>
+<span class="sourceLineNo">2881</span><a name="line.2881"></a>
+<span class="sourceLineNo">2882</span>}<a name="line.2882"></a>
 
 
 
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.html
index 9ac0eeb..2895138 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/HStore.html
@@ -2069,830 +2069,825 @@
 <span class="sourceLineNo">2061</span><a name="line.2061"></a>
 <span class="sourceLineNo">2062</span>  @Override<a name="line.2062"></a>
 <span class="sourceLineNo">2063</span>  public boolean canSplit() {<a name="line.2063"></a>
-<span class="sourceLineNo">2064</span>    this.lock.readLock().lock();<a name="line.2064"></a>
-<span class="sourceLineNo">2065</span>    try {<a name="line.2065"></a>
-<span class="sourceLineNo">2066</span>      // Not split-able if we find a reference store file present in the store.<a name="line.2066"></a>
-<span class="sourceLineNo">2067</span>      boolean result = !hasReferences();<a name="line.2067"></a>
-<span class="sourceLineNo">2068</span>      if (!result) {<a name="line.2068"></a>
-<span class="sourceLineNo">2069</span>        LOG.trace("Not splittable; has references: {}", this);<a name="line.2069"></a>
-<span class="sourceLineNo">2070</span>      }<a name="line.2070"></a>
-<span class="sourceLineNo">2071</span>      return result;<a name="line.2071"></a>
-<span class="sourceLineNo">2072</span>    } finally {<a name="line.2072"></a>
-<span class="sourceLineNo">2073</span>      this.lock.readLock().unlock();<a name="line.2073"></a>
-<span class="sourceLineNo">2074</span>    }<a name="line.2074"></a>
-<span class="sourceLineNo">2075</span>  }<a name="line.2075"></a>
-<span class="sourceLineNo">2076</span><a name="line.2076"></a>
-<span class="sourceLineNo">2077</span>  /**<a name="line.2077"></a>
-<span class="sourceLineNo">2078</span>   * Determines if Store should be split.<a name="line.2078"></a>
-<span class="sourceLineNo">2079</span>   */<a name="line.2079"></a>
-<span class="sourceLineNo">2080</span>  public Optional&lt;byte[]&gt; getSplitPoint() {<a name="line.2080"></a>
-<span class="sourceLineNo">2081</span>    this.lock.readLock().lock();<a name="line.2081"></a>
-<span class="sourceLineNo">2082</span>    try {<a name="line.2082"></a>
-<span class="sourceLineNo">2083</span>      // Should already be enforced by the split policy!<a name="line.2083"></a>
-<span class="sourceLineNo">2084</span>      assert !this.getRegionInfo().isMetaRegion();<a name="line.2084"></a>
-<span class="sourceLineNo">2085</span>      // Not split-able if we find a reference store file present in the store.<a name="line.2085"></a>
-<span class="sourceLineNo">2086</span>      if (hasReferences()) {<a name="line.2086"></a>
-<span class="sourceLineNo">2087</span>        LOG.trace("Not splittable; has references: {}", this);<a name="line.2087"></a>
-<span class="sourceLineNo">2088</span>        return Optional.empty();<a name="line.2088"></a>
-<span class="sourceLineNo">2089</span>      }<a name="line.2089"></a>
-<span class="sourceLineNo">2090</span>      return this.storeEngine.getStoreFileManager().getSplitPoint();<a name="line.2090"></a>
-<span class="sourceLineNo">2091</span>    } catch(IOException e) {<a name="line.2091"></a>
-<span class="sourceLineNo">2092</span>      LOG.warn("Failed getting store size for {}", this, e);<a name="line.2092"></a>
-<span class="sourceLineNo">2093</span>    } finally {<a name="line.2093"></a>
-<span class="sourceLineNo">2094</span>      this.lock.readLock().unlock();<a name="line.2094"></a>
-<span class="sourceLineNo">2095</span>    }<a name="line.2095"></a>
-<span class="sourceLineNo">2096</span>    return Optional.empty();<a name="line.2096"></a>
+<span class="sourceLineNo">2064</span>    // Not split-able if we find a reference store file present in the store.<a name="line.2064"></a>
+<span class="sourceLineNo">2065</span>    boolean result = !hasReferences();<a name="line.2065"></a>
+<span class="sourceLineNo">2066</span>    if (!result) {<a name="line.2066"></a>
+<span class="sourceLineNo">2067</span>      LOG.trace("Not splittable; has references: {}", this);<a name="line.2067"></a>
+<span class="sourceLineNo">2068</span>    }<a name="line.2068"></a>
+<span class="sourceLineNo">2069</span>    return result;<a name="line.2069"></a>
+<span class="sourceLineNo">2070</span>  }<a name="line.2070"></a>
+<span class="sourceLineNo">2071</span><a name="line.2071"></a>
+<span class="sourceLineNo">2072</span>  /**<a name="line.2072"></a>
+<span class="sourceLineNo">2073</span>   * Determines if Store should be split.<a name="line.2073"></a>
+<span class="sourceLineNo">2074</span>   */<a name="line.2074"></a>
+<span class="sourceLineNo">2075</span>  public Optional&lt;byte[]&gt; getSplitPoint() {<a name="line.2075"></a>
+<span class="sourceLineNo">2076</span>    this.lock.readLock().lock();<a name="line.2076"></a>
+<span class="sourceLineNo">2077</span>    try {<a name="line.2077"></a>
+<span class="sourceLineNo">2078</span>      // Should already be enforced by the split policy!<a name="line.2078"></a>
+<span class="sourceLineNo">2079</span>      assert !this.getRegionInfo().isMetaRegion();<a name="line.2079"></a>
+<span class="sourceLineNo">2080</span>      // Not split-able if we find a reference store file present in the store.<a name="line.2080"></a>
+<span class="sourceLineNo">2081</span>      if (hasReferences()) {<a name="line.2081"></a>
+<span class="sourceLineNo">2082</span>        LOG.trace("Not splittable; has references: {}", this);<a name="line.2082"></a>
+<span class="sourceLineNo">2083</span>        return Optional.empty();<a name="line.2083"></a>
+<span class="sourceLineNo">2084</span>      }<a name="line.2084"></a>
+<span class="sourceLineNo">2085</span>      return this.storeEngine.getStoreFileManager().getSplitPoint();<a name="line.2085"></a>
+<span class="sourceLineNo">2086</span>    } catch(IOException e) {<a name="line.2086"></a>
+<span class="sourceLineNo">2087</span>      LOG.warn("Failed getting store size for {}", this, e);<a name="line.2087"></a>
+<span class="sourceLineNo">2088</span>    } finally {<a name="line.2088"></a>
+<span class="sourceLineNo">2089</span>      this.lock.readLock().unlock();<a name="line.2089"></a>
+<span class="sourceLineNo">2090</span>    }<a name="line.2090"></a>
+<span class="sourceLineNo">2091</span>    return Optional.empty();<a name="line.2091"></a>
+<span class="sourceLineNo">2092</span>  }<a name="line.2092"></a>
+<span class="sourceLineNo">2093</span><a name="line.2093"></a>
+<span class="sourceLineNo">2094</span>  @Override<a name="line.2094"></a>
+<span class="sourceLineNo">2095</span>  public long getLastCompactSize() {<a name="line.2095"></a>
+<span class="sourceLineNo">2096</span>    return this.lastCompactSize;<a name="line.2096"></a>
 <span class="sourceLineNo">2097</span>  }<a name="line.2097"></a>
 <span class="sourceLineNo">2098</span><a name="line.2098"></a>
 <span class="sourceLineNo">2099</span>  @Override<a name="line.2099"></a>
-<span class="sourceLineNo">2100</span>  public long getLastCompactSize() {<a name="line.2100"></a>
-<span class="sourceLineNo">2101</span>    return this.lastCompactSize;<a name="line.2101"></a>
+<span class="sourceLineNo">2100</span>  public long getSize() {<a name="line.2100"></a>
+<span class="sourceLineNo">2101</span>    return storeSize.get();<a name="line.2101"></a>
 <span class="sourceLineNo">2102</span>  }<a name="line.2102"></a>
 <span class="sourceLineNo">2103</span><a name="line.2103"></a>
-<span class="sourceLineNo">2104</span>  @Override<a name="line.2104"></a>
-<span class="sourceLineNo">2105</span>  public long getSize() {<a name="line.2105"></a>
-<span class="sourceLineNo">2106</span>    return storeSize.get();<a name="line.2106"></a>
-<span class="sourceLineNo">2107</span>  }<a name="line.2107"></a>
-<span class="sourceLineNo">2108</span><a name="line.2108"></a>
-<span class="sourceLineNo">2109</span>  public void triggerMajorCompaction() {<a name="line.2109"></a>
-<span class="sourceLineNo">2110</span>    this.forceMajor = true;<a name="line.2110"></a>
-<span class="sourceLineNo">2111</span>  }<a name="line.2111"></a>
-<span class="sourceLineNo">2112</span><a name="line.2112"></a>
-<span class="sourceLineNo">2113</span>  //////////////////////////////////////////////////////////////////////////////<a name="line.2113"></a>
-<span class="sourceLineNo">2114</span>  // File administration<a name="line.2114"></a>
-<span class="sourceLineNo">2115</span>  //////////////////////////////////////////////////////////////////////////////<a name="line.2115"></a>
-<span class="sourceLineNo">2116</span><a name="line.2116"></a>
-<span class="sourceLineNo">2117</span>  /**<a name="line.2117"></a>
-<span class="sourceLineNo">2118</span>   * Return a scanner for both the memstore and the HStore files. Assumes we are not in a<a name="line.2118"></a>
-<span class="sourceLineNo">2119</span>   * compaction.<a name="line.2119"></a>
-<span class="sourceLineNo">2120</span>   * @param scan Scan to apply when scanning the stores<a name="line.2120"></a>
-<span class="sourceLineNo">2121</span>   * @param targetCols columns to scan<a name="line.2121"></a>
-<span class="sourceLineNo">2122</span>   * @return a scanner over the current key values<a name="line.2122"></a>
-<span class="sourceLineNo">2123</span>   * @throws IOException on failure<a name="line.2123"></a>
-<span class="sourceLineNo">2124</span>   */<a name="line.2124"></a>
-<span class="sourceLineNo">2125</span>  public KeyValueScanner getScanner(Scan scan, final NavigableSet&lt;byte[]&gt; targetCols, long readPt)<a name="line.2125"></a>
-<span class="sourceLineNo">2126</span>      throws IOException {<a name="line.2126"></a>
-<span class="sourceLineNo">2127</span>    lock.readLock().lock();<a name="line.2127"></a>
-<span class="sourceLineNo">2128</span>    try {<a name="line.2128"></a>
-<span class="sourceLineNo">2129</span>      ScanInfo scanInfo;<a name="line.2129"></a>
-<span class="sourceLineNo">2130</span>      if (this.getCoprocessorHost() != null) {<a name="line.2130"></a>
-<span class="sourceLineNo">2131</span>        scanInfo = this.getCoprocessorHost().preStoreScannerOpen(this, scan);<a name="line.2131"></a>
-<span class="sourceLineNo">2132</span>      } else {<a name="line.2132"></a>
-<span class="sourceLineNo">2133</span>        scanInfo = getScanInfo();<a name="line.2133"></a>
-<span class="sourceLineNo">2134</span>      }<a name="line.2134"></a>
-<span class="sourceLineNo">2135</span>      return createScanner(scan, scanInfo, targetCols, readPt);<a name="line.2135"></a>
-<span class="sourceLineNo">2136</span>    } finally {<a name="line.2136"></a>
-<span class="sourceLineNo">2137</span>      lock.readLock().unlock();<a name="line.2137"></a>
-<span class="sourceLineNo">2138</span>    }<a name="line.2138"></a>
-<span class="sourceLineNo">2139</span>  }<a name="line.2139"></a>
-<span class="sourceLineNo">2140</span><a name="line.2140"></a>
-<span class="sourceLineNo">2141</span>  // HMobStore will override this method to return its own implementation.<a name="line.2141"></a>
-<span class="sourceLineNo">2142</span>  protected KeyValueScanner createScanner(Scan scan, ScanInfo scanInfo,<a name="line.2142"></a>
-<span class="sourceLineNo">2143</span>      NavigableSet&lt;byte[]&gt; targetCols, long readPt) throws IOException {<a name="line.2143"></a>
-<span class="sourceLineNo">2144</span>    return scan.isReversed() ? new ReversedStoreScanner(this, scanInfo, scan, targetCols, readPt)<a name="line.2144"></a>
-<span class="sourceLineNo">2145</span>        : new StoreScanner(this, scanInfo, scan, targetCols, readPt);<a name="line.2145"></a>
-<span class="sourceLineNo">2146</span>  }<a name="line.2146"></a>
-<span class="sourceLineNo">2147</span><a name="line.2147"></a>
-<span class="sourceLineNo">2148</span>  /**<a name="line.2148"></a>
-<span class="sourceLineNo">2149</span>   * Recreates the scanners on the current list of active store file scanners<a name="line.2149"></a>
-<span class="sourceLineNo">2150</span>   * @param currentFileScanners the current set of active store file scanners<a name="line.2150"></a>
-<span class="sourceLineNo">2151</span>   * @param cacheBlocks cache the blocks or not<a name="line.2151"></a>
-<span class="sourceLineNo">2152</span>   * @param usePread use pread or not<a name="line.2152"></a>
-<span class="sourceLineNo">2153</span>   * @param isCompaction is the scanner for compaction<a name="line.2153"></a>
-<span class="sourceLineNo">2154</span>   * @param matcher the scan query matcher<a name="line.2154"></a>
-<span class="sourceLineNo">2155</span>   * @param startRow the scan's start row<a name="line.2155"></a>
-<span class="sourceLineNo">2156</span>   * @param includeStartRow should the scan include the start row<a name="line.2156"></a>
-<span class="sourceLineNo">2157</span>   * @param stopRow the scan's stop row<a name="line.2157"></a>
-<span class="sourceLineNo">2158</span>   * @param includeStopRow should the scan include the stop row<a name="line.2158"></a>
-<span class="sourceLineNo">2159</span>   * @param readPt the read point of the current scane<a name="line.2159"></a>
-<span class="sourceLineNo">2160</span>   * @param includeMemstoreScanner whether the current scanner should include memstorescanner<a name="line.2160"></a>
-<span class="sourceLineNo">2161</span>   * @return list of scanners recreated on the current Scanners<a name="line.2161"></a>
-<span class="sourceLineNo">2162</span>   */<a name="line.2162"></a>
-<span class="sourceLineNo">2163</span>  public List&lt;KeyValueScanner&gt; recreateScanners(List&lt;KeyValueScanner&gt; currentFileScanners,<a name="line.2163"></a>
-<span class="sourceLineNo">2164</span>      boolean cacheBlocks, boolean usePread, boolean isCompaction, ScanQueryMatcher matcher,<a name="line.2164"></a>
-<span class="sourceLineNo">2165</span>      byte[] startRow, boolean includeStartRow, byte[] stopRow, boolean includeStopRow, long readPt,<a name="line.2165"></a>
-<span class="sourceLineNo">2166</span>      boolean includeMemstoreScanner) throws IOException {<a name="line.2166"></a>
-<span class="sourceLineNo">2167</span>    this.lock.readLock().lock();<a name="line.2167"></a>
-<span class="sourceLineNo">2168</span>    try {<a name="line.2168"></a>
-<span class="sourceLineNo">2169</span>      Map&lt;String, HStoreFile&gt; name2File =<a name="line.2169"></a>
-<span class="sourceLineNo">2170</span>          new HashMap&lt;&gt;(getStorefilesCount() + getCompactedFilesCount());<a name="line.2170"></a>
-<span class="sourceLineNo">2171</span>      for (HStoreFile file : getStorefiles()) {<a name="line.2171"></a>
-<span class="sourceLineNo">2172</span>        name2File.put(file.getFileInfo().getActiveFileName(), file);<a name="line.2172"></a>
-<span class="sourceLineNo">2173</span>      }<a name="line.2173"></a>
-<span class="sourceLineNo">2174</span>      Collection&lt;HStoreFile&gt; compactedFiles = getCompactedFiles();<a name="line.2174"></a>
-<span class="sourceLineNo">2175</span>      for (HStoreFile file : IterableUtils.emptyIfNull(compactedFiles)) {<a name="line.2175"></a>
-<span class="sourceLineNo">2176</span>        name2File.put(file.getFileInfo().getActiveFileName(), file);<a name="line.2176"></a>
-<span class="sourceLineNo">2177</span>      }<a name="line.2177"></a>
-<span class="sourceLineNo">2178</span>      List&lt;HStoreFile&gt; filesToReopen = new ArrayList&lt;&gt;();<a name="line.2178"></a>
-<span class="sourceLineNo">2179</span>      for (KeyValueScanner kvs : currentFileScanners) {<a name="line.2179"></a>
-<span class="sourceLineNo">2180</span>        assert kvs.isFileScanner();<a name="line.2180"></a>
-<span class="sourceLineNo">2181</span>        if (kvs.peek() == null) {<a name="line.2181"></a>
-<span class="sourceLineNo">2182</span>          continue;<a name="line.2182"></a>
-<span class="sourceLineNo">2183</span>        }<a name="line.2183"></a>
-<span class="sourceLineNo">2184</span>        filesToReopen.add(name2File.get(kvs.getFilePath().getName()));<a name="line.2184"></a>
-<span class="sourceLineNo">2185</span>      }<a name="line.2185"></a>
-<span class="sourceLineNo">2186</span>      if (filesToReopen.isEmpty()) {<a name="line.2186"></a>
-<span class="sourceLineNo">2187</span>        return null;<a name="line.2187"></a>
-<span class="sourceLineNo">2188</span>      }<a name="line.2188"></a>
-<span class="sourceLineNo">2189</span>      return getScanners(filesToReopen, cacheBlocks, false, false, matcher, startRow,<a name="line.2189"></a>
-<span class="sourceLineNo">2190</span>        includeStartRow, stopRow, includeStopRow, readPt, false);<a name="line.2190"></a>
-<span class="sourceLineNo">2191</span>    } finally {<a name="line.2191"></a>
-<span class="sourceLineNo">2192</span>      this.lock.readLock().unlock();<a name="line.2192"></a>
-<span class="sourceLineNo">2193</span>    }<a name="line.2193"></a>
+<span class="sourceLineNo">2104</span>  public void triggerMajorCompaction() {<a name="line.2104"></a>
+<span class="sourceLineNo">2105</span>    this.forceMajor = true;<a name="line.2105"></a>
+<span class="sourceLineNo">2106</span>  }<a name="line.2106"></a>
+<span class="sourceLineNo">2107</span><a name="line.2107"></a>
+<span class="sourceLineNo">2108</span>  //////////////////////////////////////////////////////////////////////////////<a name="line.2108"></a>
+<span class="sourceLineNo">2109</span>  // File administration<a name="line.2109"></a>
+<span class="sourceLineNo">2110</span>  //////////////////////////////////////////////////////////////////////////////<a name="line.2110"></a>
+<span class="sourceLineNo">2111</span><a name="line.2111"></a>
+<span class="sourceLineNo">2112</span>  /**<a name="line.2112"></a>
+<span class="sourceLineNo">2113</span>   * Return a scanner for both the memstore and the HStore files. Assumes we are not in a<a name="line.2113"></a>
+<span class="sourceLineNo">2114</span>   * compaction.<a name="line.2114"></a>
+<span class="sourceLineNo">2115</span>   * @param scan Scan to apply when scanning the stores<a name="line.2115"></a>
+<span class="sourceLineNo">2116</span>   * @param targetCols columns to scan<a name="line.2116"></a>
+<span class="sourceLineNo">2117</span>   * @return a scanner over the current key values<a name="line.2117"></a>
+<span class="sourceLineNo">2118</span>   * @throws IOException on failure<a name="line.2118"></a>
+<span class="sourceLineNo">2119</span>   */<a name="line.2119"></a>
+<span class="sourceLineNo">2120</span>  public KeyValueScanner getScanner(Scan scan, final NavigableSet&lt;byte[]&gt; targetCols, long readPt)<a name="line.2120"></a>
+<span class="sourceLineNo">2121</span>      throws IOException {<a name="line.2121"></a>
+<span class="sourceLineNo">2122</span>    lock.readLock().lock();<a name="line.2122"></a>
+<span class="sourceLineNo">2123</span>    try {<a name="line.2123"></a>
+<span class="sourceLineNo">2124</span>      ScanInfo scanInfo;<a name="line.2124"></a>
+<span class="sourceLineNo">2125</span>      if (this.getCoprocessorHost() != null) {<a name="line.2125"></a>
+<span class="sourceLineNo">2126</span>        scanInfo = this.getCoprocessorHost().preStoreScannerOpen(this, scan);<a name="line.2126"></a>
+<span class="sourceLineNo">2127</span>      } else {<a name="line.2127"></a>
+<span class="sourceLineNo">2128</span>        scanInfo = getScanInfo();<a name="line.2128"></a>
+<span class="sourceLineNo">2129</span>      }<a name="line.2129"></a>
+<span class="sourceLineNo">2130</span>      return createScanner(scan, scanInfo, targetCols, readPt);<a name="line.2130"></a>
+<span class="sourceLineNo">2131</span>    } finally {<a name="line.2131"></a>
+<span class="sourceLineNo">2132</span>      lock.readLock().unlock();<a name="line.2132"></a>
+<span class="sourceLineNo">2133</span>    }<a name="line.2133"></a>
+<span class="sourceLineNo">2134</span>  }<a name="line.2134"></a>
+<span class="sourceLineNo">2135</span><a name="line.2135"></a>
+<span class="sourceLineNo">2136</span>  // HMobStore will override this method to return its own implementation.<a name="line.2136"></a>
+<span class="sourceLineNo">2137</span>  protected KeyValueScanner createScanner(Scan scan, ScanInfo scanInfo,<a name="line.2137"></a>
+<span class="sourceLineNo">2138</span>      NavigableSet&lt;byte[]&gt; targetCols, long readPt) throws IOException {<a name="line.2138"></a>
+<span class="sourceLineNo">2139</span>    return scan.isReversed() ? new ReversedStoreScanner(this, scanInfo, scan, targetCols, readPt)<a name="line.2139"></a>
+<span class="sourceLineNo">2140</span>        : new StoreScanner(this, scanInfo, scan, targetCols, readPt);<a name="line.2140"></a>
+<span class="sourceLineNo">2141</span>  }<a name="line.2141"></a>
+<span class="sourceLineNo">2142</span><a name="line.2142"></a>
+<span class="sourceLineNo">2143</span>  /**<a name="line.2143"></a>
+<span class="sourceLineNo">2144</span>   * Recreates the scanners on the current list of active store file scanners<a name="line.2144"></a>
+<span class="sourceLineNo">2145</span>   * @param currentFileScanners the current set of active store file scanners<a name="line.2145"></a>
+<span class="sourceLineNo">2146</span>   * @param cacheBlocks cache the blocks or not<a name="line.2146"></a>
+<span class="sourceLineNo">2147</span>   * @param usePread use pread or not<a name="line.2147"></a>
+<span class="sourceLineNo">2148</span>   * @param isCompaction is the scanner for compaction<a name="line.2148"></a>
+<span class="sourceLineNo">2149</span>   * @param matcher the scan query matcher<a name="line.2149"></a>
+<span class="sourceLineNo">2150</span>   * @param startRow the scan's start row<a name="line.2150"></a>
+<span class="sourceLineNo">2151</span>   * @param includeStartRow should the scan include the start row<a name="line.2151"></a>
+<span class="sourceLineNo">2152</span>   * @param stopRow the scan's stop row<a name="line.2152"></a>
+<span class="sourceLineNo">2153</span>   * @param includeStopRow should the scan include the stop row<a name="line.2153"></a>
+<span class="sourceLineNo">2154</span>   * @param readPt the read point of the current scane<a name="line.2154"></a>
+<span class="sourceLineNo">2155</span>   * @param includeMemstoreScanner whether the current scanner should include memstorescanner<a name="line.2155"></a>
+<span class="sourceLineNo">2156</span>   * @return list of scanners recreated on the current Scanners<a name="line.2156"></a>
+<span class="sourceLineNo">2157</span>   */<a name="line.2157"></a>
+<span class="sourceLineNo">2158</span>  public List&lt;KeyValueScanner&gt; recreateScanners(List&lt;KeyValueScanner&gt; currentFileScanners,<a name="line.2158"></a>
+<span class="sourceLineNo">2159</span>      boolean cacheBlocks, boolean usePread, boolean isCompaction, ScanQueryMatcher matcher,<a name="line.2159"></a>
+<span class="sourceLineNo">2160</span>      byte[] startRow, boolean includeStartRow, byte[] stopRow, boolean includeStopRow, long readPt,<a name="line.2160"></a>
+<span class="sourceLineNo">2161</span>      boolean includeMemstoreScanner) throws IOException {<a name="line.2161"></a>
+<span class="sourceLineNo">2162</span>    this.lock.readLock().lock();<a name="line.2162"></a>
+<span class="sourceLineNo">2163</span>    try {<a name="line.2163"></a>
+<span class="sourceLineNo">2164</span>      Map&lt;String, HStoreFile&gt; name2File =<a name="line.2164"></a>
+<span class="sourceLineNo">2165</span>          new HashMap&lt;&gt;(getStorefilesCount() + getCompactedFilesCount());<a name="line.2165"></a>
+<span class="sourceLineNo">2166</span>      for (HStoreFile file : getStorefiles()) {<a name="line.2166"></a>
+<span class="sourceLineNo">2167</span>        name2File.put(file.getFileInfo().getActiveFileName(), file);<a name="line.2167"></a>
+<span class="sourceLineNo">2168</span>      }<a name="line.2168"></a>
+<span class="sourceLineNo">2169</span>      Collection&lt;HStoreFile&gt; compactedFiles = getCompactedFiles();<a name="line.2169"></a>
+<span class="sourceLineNo">2170</span>      for (HStoreFile file : IterableUtils.emptyIfNull(compactedFiles)) {<a name="line.2170"></a>
+<span class="sourceLineNo">2171</span>        name2File.put(file.getFileInfo().getActiveFileName(), file);<a name="line.2171"></a>
+<span class="sourceLineNo">2172</span>      }<a name="line.2172"></a>
+<span class="sourceLineNo">2173</span>      List&lt;HStoreFile&gt; filesToReopen = new ArrayList&lt;&gt;();<a name="line.2173"></a>
+<span class="sourceLineNo">2174</span>      for (KeyValueScanner kvs : currentFileScanners) {<a name="line.2174"></a>
+<span class="sourceLineNo">2175</span>        assert kvs.isFileScanner();<a name="line.2175"></a>
+<span class="sourceLineNo">2176</span>        if (kvs.peek() == null) {<a name="line.2176"></a>
+<span class="sourceLineNo">2177</span>          continue;<a name="line.2177"></a>
+<span class="sourceLineNo">2178</span>        }<a name="line.2178"></a>
+<span class="sourceLineNo">2179</span>        filesToReopen.add(name2File.get(kvs.getFilePath().getName()));<a name="line.2179"></a>
+<span class="sourceLineNo">2180</span>      }<a name="line.2180"></a>
+<span class="sourceLineNo">2181</span>      if (filesToReopen.isEmpty()) {<a name="line.2181"></a>
+<span class="sourceLineNo">2182</span>        return null;<a name="line.2182"></a>
+<span class="sourceLineNo">2183</span>      }<a name="line.2183"></a>
+<span class="sourceLineNo">2184</span>      return getScanners(filesToReopen, cacheBlocks, false, false, matcher, startRow,<a name="line.2184"></a>
+<span class="sourceLineNo">2185</span>        includeStartRow, stopRow, includeStopRow, readPt, false);<a name="line.2185"></a>
+<span class="sourceLineNo">2186</span>    } finally {<a name="line.2186"></a>
+<span class="sourceLineNo">2187</span>      this.lock.readLock().unlock();<a name="line.2187"></a>
+<span class="sourceLineNo">2188</span>    }<a name="line.2188"></a>
+<span class="sourceLineNo">2189</span>  }<a name="line.2189"></a>
+<span class="sourceLineNo">2190</span><a name="line.2190"></a>
+<span class="sourceLineNo">2191</span>  @Override<a name="line.2191"></a>
+<span class="sourceLineNo">2192</span>  public String toString() {<a name="line.2192"></a>
+<span class="sourceLineNo">2193</span>    return this.getColumnFamilyName();<a name="line.2193"></a>
 <span class="sourceLineNo">2194</span>  }<a name="line.2194"></a>
 <span class="sourceLineNo">2195</span><a name="line.2195"></a>
 <span class="sourceLineNo">2196</span>  @Override<a name="line.2196"></a>
-<span class="sourceLineNo">2197</span>  public String toString() {<a name="line.2197"></a>
-<span class="sourceLineNo">2198</span>    return this.getColumnFamilyName();<a name="line.2198"></a>
+<span class="sourceLineNo">2197</span>  public int getStorefilesCount() {<a name="line.2197"></a>
+<span class="sourceLineNo">2198</span>    return this.storeEngine.getStoreFileManager().getStorefileCount();<a name="line.2198"></a>
 <span class="sourceLineNo">2199</span>  }<a name="line.2199"></a>
 <span class="sourceLineNo">2200</span><a name="line.2200"></a>
 <span class="sourceLineNo">2201</span>  @Override<a name="line.2201"></a>
-<span class="sourceLineNo">2202</span>  public int getStorefilesCount() {<a name="line.2202"></a>
-<span class="sourceLineNo">2203</span>    return this.storeEngine.getStoreFileManager().getStorefileCount();<a name="line.2203"></a>
+<span class="sourceLineNo">2202</span>  public int getCompactedFilesCount() {<a name="line.2202"></a>
+<span class="sourceLineNo">2203</span>    return this.storeEngine.getStoreFileManager().getCompactedFilesCount();<a name="line.2203"></a>
 <span class="sourceLineNo">2204</span>  }<a name="line.2204"></a>
 <span class="sourceLineNo">2205</span><a name="line.2205"></a>
-<span class="sourceLineNo">2206</span>  @Override<a name="line.2206"></a>
-<span class="sourceLineNo">2207</span>  public int getCompactedFilesCount() {<a name="line.2207"></a>
-<span class="sourceLineNo">2208</span>    return this.storeEngine.getStoreFileManager().getCompactedFilesCount();<a name="line.2208"></a>
-<span class="sourceLineNo">2209</span>  }<a name="line.2209"></a>
-<span class="sourceLineNo">2210</span><a name="line.2210"></a>
-<span class="sourceLineNo">2211</span>  private LongStream getStoreFileAgeStream() {<a name="line.2211"></a>
-<span class="sourceLineNo">2212</span>    return this.storeEngine.getStoreFileManager().getStorefiles().stream().filter(sf -&gt; {<a name="line.2212"></a>
-<span class="sourceLineNo">2213</span>      if (sf.getReader() == null) {<a name="line.2213"></a>
-<span class="sourceLineNo">2214</span>        LOG.warn("StoreFile {} has a null Reader", sf);<a name="line.2214"></a>
-<span class="sourceLineNo">2215</span>        return false;<a name="line.2215"></a>
-<span class="sourceLineNo">2216</span>      } else {<a name="line.2216"></a>
-<span class="sourceLineNo">2217</span>        return true;<a name="line.2217"></a>
-<span class="sourceLineNo">2218</span>      }<a name="line.2218"></a>
-<span class="sourceLineNo">2219</span>    }).filter(HStoreFile::isHFile).mapToLong(sf -&gt; sf.getFileInfo().getCreatedTimestamp())<a name="line.2219"></a>
-<span class="sourceLineNo">2220</span>        .map(t -&gt; EnvironmentEdgeManager.currentTime() - t);<a name="line.2220"></a>
+<span class="sourceLineNo">2206</span>  private LongStream getStoreFileAgeStream() {<a name="line.2206"></a>
+<span class="sourceLineNo">2207</span>    return this.storeEngine.getStoreFileManager().getStorefiles().stream().filter(sf -&gt; {<a name="line.2207"></a>
+<span class="sourceLineNo">2208</span>      if (sf.getReader() == null) {<a name="line.2208"></a>
+<span class="sourceLineNo">2209</span>        LOG.warn("StoreFile {} has a null Reader", sf);<a name="line.2209"></a>
+<span class="sourceLineNo">2210</span>        return false;<a name="line.2210"></a>
+<span class="sourceLineNo">2211</span>      } else {<a name="line.2211"></a>
+<span class="sourceLineNo">2212</span>        return true;<a name="line.2212"></a>
+<span class="sourceLineNo">2213</span>      }<a name="line.2213"></a>
+<span class="sourceLineNo">2214</span>    }).filter(HStoreFile::isHFile).mapToLong(sf -&gt; sf.getFileInfo().getCreatedTimestamp())<a name="line.2214"></a>
+<span class="sourceLineNo">2215</span>        .map(t -&gt; EnvironmentEdgeManager.currentTime() - t);<a name="line.2215"></a>
+<span class="sourceLineNo">2216</span>  }<a name="line.2216"></a>
+<span class="sourceLineNo">2217</span><a name="line.2217"></a>
+<span class="sourceLineNo">2218</span>  @Override<a name="line.2218"></a>
+<span class="sourceLineNo">2219</span>  public OptionalLong getMaxStoreFileAge() {<a name="line.2219"></a>
+<span class="sourceLineNo">2220</span>    return getStoreFileAgeStream().max();<a name="line.2220"></a>
 <span class="sourceLineNo">2221</span>  }<a name="line.2221"></a>
 <span class="sourceLineNo">2222</span><a name="line.2222"></a>
 <span class="sourceLineNo">2223</span>  @Override<a name="line.2223"></a>
-<span class="sourceLineNo">2224</span>  public OptionalLong getMaxStoreFileAge() {<a name="line.2224"></a>
-<span class="sourceLineNo">2225</span>    return getStoreFileAgeStream().max();<a name="line.2225"></a>
+<span class="sourceLineNo">2224</span>  public OptionalLong getMinStoreFileAge() {<a name="line.2224"></a>
+<span class="sourceLineNo">2225</span>    return getStoreFileAgeStream().min();<a name="line.2225"></a>
 <span class="sourceLineNo">2226</span>  }<a name="line.2226"></a>
 <span class="sourceLineNo">2227</span><a name="line.2227"></a>
 <span class="sourceLineNo">2228</span>  @Override<a name="line.2228"></a>
-<span class="sourceLineNo">2229</span>  public OptionalLong getMinStoreFileAge() {<a name="line.2229"></a>
-<span class="sourceLineNo">2230</span>    return getStoreFileAgeStream().min();<a name="line.2230"></a>
+<span class="sourceLineNo">2229</span>  public OptionalDouble getAvgStoreFileAge() {<a name="line.2229"></a>
+<span class="sourceLineNo">2230</span>    return getStoreFileAgeStream().average();<a name="line.2230"></a>
 <span class="sourceLineNo">2231</span>  }<a name="line.2231"></a>
 <span class="sourceLineNo">2232</span><a name="line.2232"></a>
 <span class="sourceLineNo">2233</span>  @Override<a name="line.2233"></a>
-<span class="sourceLineNo">2234</span>  public OptionalDouble getAvgStoreFileAge() {<a name="line.2234"></a>
-<span class="sourceLineNo">2235</span>    return getStoreFileAgeStream().average();<a name="line.2235"></a>
-<span class="sourceLineNo">2236</span>  }<a name="line.2236"></a>
-<span class="sourceLineNo">2237</span><a name="line.2237"></a>
-<span class="sourceLineNo">2238</span>  @Override<a name="line.2238"></a>
-<span class="sourceLineNo">2239</span>  public long getNumReferenceFiles() {<a name="line.2239"></a>
-<span class="sourceLineNo">2240</span>    return this.storeEngine.getStoreFileManager().getStorefiles().stream()<a name="line.2240"></a>
-<span class="sourceLineNo">2241</span>        .filter(HStoreFile::isReference).count();<a name="line.2241"></a>
-<span class="sourceLineNo">2242</span>  }<a name="line.2242"></a>
-<span class="sourceLineNo">2243</span><a name="line.2243"></a>
-<span class="sourceLineNo">2244</span>  @Override<a name="line.2244"></a>
-<span class="sourceLineNo">2245</span>  public long getNumHFiles() {<a name="line.2245"></a>
-<span class="sourceLineNo">2246</span>    return this.storeEngine.getStoreFileManager().getStorefiles().stream()<a name="line.2246"></a>
-<span class="sourceLineNo">2247</span>        .filter(HStoreFile::isHFile).count();<a name="line.2247"></a>
+<span class="sourceLineNo">2234</span>  public long getNumReferenceFiles() {<a name="line.2234"></a>
+<span class="sourceLineNo">2235</span>    return this.storeEngine.getStoreFileManager().getStorefiles().stream()<a name="line.2235"></a>
+<span class="sourceLineNo">2236</span>        .filter(HStoreFile::isReference).count();<a name="line.2236"></a>
+<span class="sourceLineNo">2237</span>  }<a name="line.2237"></a>
+<span class="sourceLineNo">2238</span><a name="line.2238"></a>
+<span class="sourceLineNo">2239</span>  @Override<a name="line.2239"></a>
+<span class="sourceLineNo">2240</span>  public long getNumHFiles() {<a name="line.2240"></a>
+<span class="sourceLineNo">2241</span>    return this.storeEngine.getStoreFileManager().getStorefiles().stream()<a name="line.2241"></a>
+<span class="sourceLineNo">2242</span>        .filter(HStoreFile::isHFile).count();<a name="line.2242"></a>
+<span class="sourceLineNo">2243</span>  }<a name="line.2243"></a>
+<span class="sourceLineNo">2244</span><a name="line.2244"></a>
+<span class="sourceLineNo">2245</span>  @Override<a name="line.2245"></a>
+<span class="sourceLineNo">2246</span>  public long getStoreSizeUncompressed() {<a name="line.2246"></a>
+<span class="sourceLineNo">2247</span>    return this.totalUncompressedBytes.get();<a name="line.2247"></a>
 <span class="sourceLineNo">2248</span>  }<a name="line.2248"></a>
 <span class="sourceLineNo">2249</span><a name="line.2249"></a>
 <span class="sourceLineNo">2250</span>  @Override<a name="line.2250"></a>
-<span class="sourceLineNo">2251</span>  public long getStoreSizeUncompressed() {<a name="line.2251"></a>
-<span class="sourceLineNo">2252</span>    return this.totalUncompressedBytes.get();<a name="line.2252"></a>
-<span class="sourceLineNo">2253</span>  }<a name="line.2253"></a>
-<span class="sourceLineNo">2254</span><a name="line.2254"></a>
-<span class="sourceLineNo">2255</span>  @Override<a name="line.2255"></a>
-<span class="sourceLineNo">2256</span>  public long getStorefilesSize() {<a name="line.2256"></a>
-<span class="sourceLineNo">2257</span>    // Include all StoreFiles<a name="line.2257"></a>
-<span class="sourceLineNo">2258</span>    return getStorefilesSize(this.storeEngine.getStoreFileManager().getStorefiles(), sf -&gt; true);<a name="line.2258"></a>
-<span class="sourceLineNo">2259</span>  }<a name="line.2259"></a>
-<span class="sourceLineNo">2260</span><a name="line.2260"></a>
-<span class="sourceLineNo">2261</span>  @Override<a name="line.2261"></a>
-<span class="sourceLineNo">2262</span>  public long getHFilesSize() {<a name="line.2262"></a>
-<span class="sourceLineNo">2263</span>    // Include only StoreFiles which are HFiles<a name="line.2263"></a>
-<span class="sourceLineNo">2264</span>    return getStorefilesSize(this.storeEngine.getStoreFileManager().getStorefiles(),<a name="line.2264"></a>
-<span class="sourceLineNo">2265</span>      HStoreFile::isHFile);<a name="line.2265"></a>
-<span class="sourceLineNo">2266</span>  }<a name="line.2266"></a>
-<span class="sourceLineNo">2267</span><a name="line.2267"></a>
-<span class="sourceLineNo">2268</span>  private long getTotalUncompressedBytes(List&lt;HStoreFile&gt; files) {<a name="line.2268"></a>
-<span class="sourceLineNo">2269</span>    return files.stream()<a name="line.2269"></a>
-<span class="sourceLineNo">2270</span>      .mapToLong(file -&gt; getStorefileFieldSize(file, StoreFileReader::getTotalUncompressedBytes))<a name="line.2270"></a>
-<span class="sourceLineNo">2271</span>      .sum();<a name="line.2271"></a>
+<span class="sourceLineNo">2251</span>  public long getStorefilesSize() {<a name="line.2251"></a>
+<span class="sourceLineNo">2252</span>    // Include all StoreFiles<a name="line.2252"></a>
+<span class="sourceLineNo">2253</span>    return getStorefilesSize(this.storeEngine.getStoreFileManager().getStorefiles(), sf -&gt; true);<a name="line.2253"></a>
+<span class="sourceLineNo">2254</span>  }<a name="line.2254"></a>
+<span class="sourceLineNo">2255</span><a name="line.2255"></a>
+<span class="sourceLineNo">2256</span>  @Override<a name="line.2256"></a>
+<span class="sourceLineNo">2257</span>  public long getHFilesSize() {<a name="line.2257"></a>
+<span class="sourceLineNo">2258</span>    // Include only StoreFiles which are HFiles<a name="line.2258"></a>
+<span class="sourceLineNo">2259</span>    return getStorefilesSize(this.storeEngine.getStoreFileManager().getStorefiles(),<a name="line.2259"></a>
+<span class="sourceLineNo">2260</span>      HStoreFile::isHFile);<a name="line.2260"></a>
+<span class="sourceLineNo">2261</span>  }<a name="line.2261"></a>
+<span class="sourceLineNo">2262</span><a name="line.2262"></a>
+<span class="sourceLineNo">2263</span>  private long getTotalUncompressedBytes(List&lt;HStoreFile&gt; files) {<a name="line.2263"></a>
+<span class="sourceLineNo">2264</span>    return files.stream()<a name="line.2264"></a>
+<span class="sourceLineNo">2265</span>      .mapToLong(file -&gt; getStorefileFieldSize(file, StoreFileReader::getTotalUncompressedBytes))<a name="line.2265"></a>
+<span class="sourceLineNo">2266</span>      .sum();<a name="line.2266"></a>
+<span class="sourceLineNo">2267</span>  }<a name="line.2267"></a>
+<span class="sourceLineNo">2268</span><a name="line.2268"></a>
+<span class="sourceLineNo">2269</span>  private long getStorefilesSize(Collection&lt;HStoreFile&gt; files, Predicate&lt;HStoreFile&gt; predicate) {<a name="line.2269"></a>
+<span class="sourceLineNo">2270</span>    return files.stream().filter(predicate)<a name="line.2270"></a>
+<span class="sourceLineNo">2271</span>      .mapToLong(file -&gt; getStorefileFieldSize(file, StoreFileReader::length)).sum();<a name="line.2271"></a>
 <span class="sourceLineNo">2272</span>  }<a name="line.2272"></a>
 <span class="sourceLineNo">2273</span><a name="line.2273"></a>
-<span class="sourceLineNo">2274</span>  private long getStorefilesSize(Collection&lt;HStoreFile&gt; files, Predicate&lt;HStoreFile&gt; predicate) {<a name="line.2274"></a>
-<span class="sourceLineNo">2275</span>    return files.stream().filter(predicate)<a name="line.2275"></a>
-<span class="sourceLineNo">2276</span>      .mapToLong(file -&gt; getStorefileFieldSize(file, StoreFileReader::length)).sum();<a name="line.2276"></a>
-<span class="sourceLineNo">2277</span>  }<a name="line.2277"></a>
-<span class="sourceLineNo">2278</span><a name="line.2278"></a>
-<span class="sourceLineNo">2279</span>  private long getStorefileFieldSize(HStoreFile file, ToLongFunction&lt;StoreFileReader&gt; f) {<a name="line.2279"></a>
-<span class="sourceLineNo">2280</span>    if (file == null) {<a name="line.2280"></a>
-<span class="sourceLineNo">2281</span>      return 0L;<a name="line.2281"></a>
-<span class="sourceLineNo">2282</span>    }<a name="line.2282"></a>
-<span class="sourceLineNo">2283</span>    StoreFileReader reader = file.getReader();<a name="line.2283"></a>
-<span class="sourceLineNo">2284</span>    if (reader == null) {<a name="line.2284"></a>
-<span class="sourceLineNo">2285</span>      return 0L;<a name="line.2285"></a>
-<span class="sourceLineNo">2286</span>    }<a name="line.2286"></a>
-<span class="sourceLineNo">2287</span>    return f.applyAsLong(reader);<a name="line.2287"></a>
+<span class="sourceLineNo">2274</span>  private long getStorefileFieldSize(HStoreFile file, ToLongFunction&lt;StoreFileReader&gt; f) {<a name="line.2274"></a>
+<span class="sourceLineNo">2275</span>    if (file == null) {<a name="line.2275"></a>
+<span class="sourceLineNo">2276</span>      return 0L;<a name="line.2276"></a>
+<span class="sourceLineNo">2277</span>    }<a name="line.2277"></a>
+<span class="sourceLineNo">2278</span>    StoreFileReader reader = file.getReader();<a name="line.2278"></a>
+<span class="sourceLineNo">2279</span>    if (reader == null) {<a name="line.2279"></a>
+<span class="sourceLineNo">2280</span>      return 0L;<a name="line.2280"></a>
+<span class="sourceLineNo">2281</span>    }<a name="line.2281"></a>
+<span class="sourceLineNo">2282</span>    return f.applyAsLong(reader);<a name="line.2282"></a>
+<span class="sourceLineNo">2283</span>  }<a name="line.2283"></a>
+<span class="sourceLineNo">2284</span><a name="line.2284"></a>
+<span class="sourceLineNo">2285</span>  private long getStorefilesFieldSize(ToLongFunction&lt;StoreFileReader&gt; f) {<a name="line.2285"></a>
+<span class="sourceLineNo">2286</span>    return this.storeEngine.getStoreFileManager().getStorefiles().stream()<a name="line.2286"></a>
+<span class="sourceLineNo">2287</span>      .mapToLong(file -&gt; getStorefileFieldSize(file, f)).sum();<a name="line.2287"></a>
 <span class="sourceLineNo">2288</span>  }<a name="line.2288"></a>
 <span class="sourceLineNo">2289</span><a name="line.2289"></a>
-<span class="sourceLineNo">2290</span>  private long getStorefilesFieldSize(ToLongFunction&lt;StoreFileReader&gt; f) {<a name="line.2290"></a>
-<span class="sourceLineNo">2291</span>    return this.storeEngine.getStoreFileManager().getStorefiles().stream()<a name="line.2291"></a>
-<span class="sourceLineNo">2292</span>      .mapToLong(file -&gt; getStorefileFieldSize(file, f)).sum();<a name="line.2292"></a>
+<span class="sourceLineNo">2290</span>  @Override<a name="line.2290"></a>
+<span class="sourceLineNo">2291</span>  public long getStorefilesRootLevelIndexSize() {<a name="line.2291"></a>
+<span class="sourceLineNo">2292</span>    return getStorefilesFieldSize(StoreFileReader::indexSize);<a name="line.2292"></a>
 <span class="sourceLineNo">2293</span>  }<a name="line.2293"></a>
 <span class="sourceLineNo">2294</span><a name="line.2294"></a>
 <span class="sourceLineNo">2295</span>  @Override<a name="line.2295"></a>
-<span class="sourceLineNo">2296</span>  public long getStorefilesRootLevelIndexSize() {<a name="line.2296"></a>
-<span class="sourceLineNo">2297</span>    return getStorefilesFieldSize(StoreFileReader::indexSize);<a name="line.2297"></a>
+<span class="sourceLineNo">2296</span>  public long getTotalStaticIndexSize() {<a name="line.2296"></a>
+<span class="sourceLineNo">2297</span>    return getStorefilesFieldSize(StoreFileReader::getUncompressedDataIndexSize);<a name="line.2297"></a>
 <span class="sourceLineNo">2298</span>  }<a name="line.2298"></a>
 <span class="sourceLineNo">2299</span><a name="line.2299"></a>
 <span class="sourceLineNo">2300</span>  @Override<a name="line.2300"></a>
-<span class="sourceLineNo">2301</span>  public long getTotalStaticIndexSize() {<a name="line.2301"></a>
-<span class="sourceLineNo">2302</span>    return getStorefilesFieldSize(StoreFileReader::getUncompressedDataIndexSize);<a name="line.2302"></a>
+<span class="sourceLineNo">2301</span>  public long getTotalStaticBloomSize() {<a name="line.2301"></a>
+<span class="sourceLineNo">2302</span>    return getStorefilesFieldSize(StoreFileReader::getTotalBloomSize);<a name="line.2302"></a>
 <span class="sourceLineNo">2303</span>  }<a name="line.2303"></a>
 <span class="sourceLineNo">2304</span><a name="line.2304"></a>
 <span class="sourceLineNo">2305</span>  @Override<a name="line.2305"></a>
-<span class="sourceLineNo">2306</span>  public long getTotalStaticBloomSize() {<a name="line.2306"></a>
-<span class="sourceLineNo">2307</span>    return getStorefilesFieldSize(StoreFileReader::getTotalBloomSize);<a name="line.2307"></a>
+<span class="sourceLineNo">2306</span>  public MemStoreSize getMemStoreSize() {<a name="line.2306"></a>
+<span class="sourceLineNo">2307</span>    return this.memstore.size();<a name="line.2307"></a>
 <span class="sourceLineNo">2308</span>  }<a name="line.2308"></a>
 <span class="sourceLineNo">2309</span><a name="line.2309"></a>
 <span class="sourceLineNo">2310</span>  @Override<a name="line.2310"></a>
-<span class="sourceLineNo">2311</span>  public MemStoreSize getMemStoreSize() {<a name="line.2311"></a>
-<span class="sourceLineNo">2312</span>    return this.memstore.size();<a name="line.2312"></a>
-<span class="sourceLineNo">2313</span>  }<a name="line.2313"></a>
-<span class="sourceLineNo">2314</span><a name="line.2314"></a>
-<span class="sourceLineNo">2315</span>  @Override<a name="line.2315"></a>
-<span class="sourceLineNo">2316</span>  public int getCompactPriority() {<a name="line.2316"></a>
-<span class="sourceLineNo">2317</span>    int priority = this.storeEngine.getStoreFileManager().getStoreCompactionPriority();<a name="line.2317"></a>
-<span class="sourceLineNo">2318</span>    if (priority == PRIORITY_USER) {<a name="line.2318"></a>
-<span class="sourceLineNo">2319</span>      LOG.warn("Compaction priority is USER despite there being no user compaction");<a name="line.2319"></a>
-<span class="sourceLineNo">2320</span>    }<a name="line.2320"></a>
-<span class="sourceLineNo">2321</span>    return priority;<a name="line.2321"></a>
-<span class="sourceLineNo">2322</span>  }<a name="line.2322"></a>
-<span class="sourceLineNo">2323</span><a name="line.2323"></a>
-<span class="sourceLineNo">2324</span>  public boolean throttleCompaction(long compactionSize) {<a name="line.2324"></a>
-<span class="sourceLineNo">2325</span>    return storeEngine.getCompactionPolicy().throttleCompaction(compactionSize);<a name="line.2325"></a>
-<span class="sourceLineNo">2326</span>  }<a name="line.2326"></a>
-<span class="sourceLineNo">2327</span><a name="line.2327"></a>
-<span class="sourceLineNo">2328</span>  public HRegion getHRegion() {<a name="line.2328"></a>
-<span class="sourceLineNo">2329</span>    return this.region;<a name="line.2329"></a>
-<span class="sourceLineNo">2330</span>  }<a name="line.2330"></a>
-<span class="sourceLineNo">2331</span><a name="line.2331"></a>
-<span class="sourceLineNo">2332</span>  public RegionCoprocessorHost getCoprocessorHost() {<a name="line.2332"></a>
-<span class="sourceLineNo">2333</span>    return this.region.getCoprocessorHost();<a name="line.2333"></a>
+<span class="sourceLineNo">2311</span>  public int getCompactPriority() {<a name="line.2311"></a>
+<span class="sourceLineNo">2312</span>    int priority = this.storeEngine.getStoreFileManager().getStoreCompactionPriority();<a name="line.2312"></a>
+<span class="sourceLineNo">2313</span>    if (priority == PRIORITY_USER) {<a name="line.2313"></a>
+<span class="sourceLineNo">2314</span>      LOG.warn("Compaction priority is USER despite there being no user compaction");<a name="line.2314"></a>
+<span class="sourceLineNo">2315</span>    }<a name="line.2315"></a>
+<span class="sourceLineNo">2316</span>    return priority;<a name="line.2316"></a>
+<span class="sourceLineNo">2317</span>  }<a name="line.2317"></a>
+<span class="sourceLineNo">2318</span><a name="line.2318"></a>
+<span class="sourceLineNo">2319</span>  public boolean throttleCompaction(long compactionSize) {<a name="line.2319"></a>
+<span class="sourceLineNo">2320</span>    return storeEngine.getCompactionPolicy().throttleCompaction(compactionSize);<a name="line.2320"></a>
+<span class="sourceLineNo">2321</span>  }<a name="line.2321"></a>
+<span class="sourceLineNo">2322</span><a name="line.2322"></a>
+<span class="sourceLineNo">2323</span>  public HRegion getHRegion() {<a name="line.2323"></a>
+<span class="sourceLineNo">2324</span>    return this.region;<a name="line.2324"></a>
+<span class="sourceLineNo">2325</span>  }<a name="line.2325"></a>
+<span class="sourceLineNo">2326</span><a name="line.2326"></a>
+<span class="sourceLineNo">2327</span>  public RegionCoprocessorHost getCoprocessorHost() {<a name="line.2327"></a>
+<span class="sourceLineNo">2328</span>    return this.region.getCoprocessorHost();<a name="line.2328"></a>
+<span class="sourceLineNo">2329</span>  }<a name="line.2329"></a>
+<span class="sourceLineNo">2330</span><a name="line.2330"></a>
+<span class="sourceLineNo">2331</span>  @Override<a name="line.2331"></a>
+<span class="sourceLineNo">2332</span>  public RegionInfo getRegionInfo() {<a name="line.2332"></a>
+<span class="sourceLineNo">2333</span>    return this.fs.getRegionInfo();<a name="line.2333"></a>
 <span class="sourceLineNo">2334</span>  }<a name="line.2334"></a>
 <span class="sourceLineNo">2335</span><a name="line.2335"></a>
 <span class="sourceLineNo">2336</span>  @Override<a name="line.2336"></a>
-<span class="sourceLineNo">2337</span>  public RegionInfo getRegionInfo() {<a name="line.2337"></a>
-<span class="sourceLineNo">2338</span>    return this.fs.getRegionInfo();<a name="line.2338"></a>
+<span class="sourceLineNo">2337</span>  public boolean areWritesEnabled() {<a name="line.2337"></a>
+<span class="sourceLineNo">2338</span>    return this.region.areWritesEnabled();<a name="line.2338"></a>
 <span class="sourceLineNo">2339</span>  }<a name="line.2339"></a>
 <span class="sourceLineNo">2340</span><a name="line.2340"></a>
 <span class="sourceLineNo">2341</span>  @Override<a name="line.2341"></a>
-<span class="sourceLineNo">2342</span>  public boolean areWritesEnabled() {<a name="line.2342"></a>
-<span class="sourceLineNo">2343</span>    return this.region.areWritesEnabled();<a name="line.2343"></a>
+<span class="sourceLineNo">2342</span>  public long getSmallestReadPoint() {<a name="line.2342"></a>
+<span class="sourceLineNo">2343</span>    return this.region.getSmallestReadPoint();<a name="line.2343"></a>
 <span class="sourceLineNo">2344</span>  }<a name="line.2344"></a>
 <span class="sourceLineNo">2345</span><a name="line.2345"></a>
-<span class="sourceLineNo">2346</span>  @Override<a name="line.2346"></a>
-<span class="sourceLineNo">2347</span>  public long getSmallestReadPoint() {<a name="line.2347"></a>
-<span class="sourceLineNo">2348</span>    return this.region.getSmallestReadPoint();<a name="line.2348"></a>
-<span class="sourceLineNo">2349</span>  }<a name="line.2349"></a>
-<span class="sourceLineNo">2350</span><a name="line.2350"></a>
-<span class="sourceLineNo">2351</span>  /**<a name="line.2351"></a>
-<span class="sourceLineNo">2352</span>   * Adds or replaces the specified KeyValues.<a name="line.2352"></a>
-<span class="sourceLineNo">2353</span>   * &lt;p&gt;<a name="line.2353"></a>
-<span class="sourceLineNo">2354</span>   * For each KeyValue specified, if a cell with the same row, family, and qualifier exists in<a name="line.2354"></a>
-<span class="sourceLineNo">2355</span>   * MemStore, it will be replaced. Otherwise, it will just be inserted to MemStore.<a name="line.2355"></a>
-<span class="sourceLineNo">2356</span>   * &lt;p&gt;<a name="line.2356"></a>
-<span class="sourceLineNo">2357</span>   * This operation is atomic on each KeyValue (row/family/qualifier) but not necessarily atomic<a name="line.2357"></a>
-<span class="sourceLineNo">2358</span>   * across all of them.<a name="line.2358"></a>
-<span class="sourceLineNo">2359</span>   * @param readpoint readpoint below which we can safely remove duplicate KVs<a name="line.2359"></a>
-<span class="sourceLineNo">2360</span>   */<a name="line.2360"></a>
-<span class="sourceLineNo">2361</span>  public void upsert(Iterable&lt;Cell&gt; cells, long readpoint, MemStoreSizing memstoreSizing)<a name="line.2361"></a>
-<span class="sourceLineNo">2362</span>      throws IOException {<a name="line.2362"></a>
-<span class="sourceLineNo">2363</span>    this.lock.readLock().lock();<a name="line.2363"></a>
-<span class="sourceLineNo">2364</span>    try {<a name="line.2364"></a>
-<span class="sourceLineNo">2365</span>      this.memstore.upsert(cells, readpoint, memstoreSizing);<a name="line.2365"></a>
-<span class="sourceLineNo">2366</span>    } finally {<a name="line.2366"></a>
-<span class="sourceLineNo">2367</span>      this.lock.readLock().unlock();<a name="line.2367"></a>
-<span class="sourceLineNo">2368</span>    }<a name="line.2368"></a>
-<span class="sourceLineNo">2369</span>  }<a name="line.2369"></a>
-<span class="sourceLineNo">2370</span><a name="line.2370"></a>
-<span class="sourceLineNo">2371</span>  public StoreFlushContext createFlushContext(long cacheFlushId, FlushLifeCycleTracker tracker) {<a name="line.2371"></a>
-<span class="sourceLineNo">2372</span>    return new StoreFlusherImpl(cacheFlushId, tracker);<a name="line.2372"></a>
-<span class="sourceLineNo">2373</span>  }<a name="line.2373"></a>
-<span class="sourceLineNo">2374</span><a name="line.2374"></a>
-<span class="sourceLineNo">2375</span>  private final class StoreFlusherImpl implements StoreFlushContext {<a name="line.2375"></a>
-<span class="sourceLineNo">2376</span><a name="line.2376"></a>
-<span class="sourceLineNo">2377</span>    private final FlushLifeCycleTracker tracker;<a name="line.2377"></a>
-<span class="sourceLineNo">2378</span>    private final long cacheFlushSeqNum;<a name="line.2378"></a>
-<span class="sourceLineNo">2379</span>    private MemStoreSnapshot snapshot;<a name="line.2379"></a>
-<span class="sourceLineNo">2380</span>    private List&lt;Path&gt; tempFiles;<a name="line.2380"></a>
-<span class="sourceLineNo">2381</span>    private List&lt;Path&gt; committedFiles;<a name="line.2381"></a>
-<span class="sourceLineNo">2382</span>    private long cacheFlushCount;<a name="line.2382"></a>
-<span class="sourceLineNo">2383</span>    private long cacheFlushSize;<a name="line.2383"></a>
-<span class="sourceLineNo">2384</span>    private long outputFileSize;<a name="line.2384"></a>
+<span class="sourceLineNo">2346</span>  /**<a name="line.2346"></a>
+<span class="sourceLineNo">2347</span>   * Adds or replaces the specified KeyValues.<a name="line.2347"></a>
+<span class="sourceLineNo">2348</span>   * &lt;p&gt;<a name="line.2348"></a>
+<span class="sourceLineNo">2349</span>   * For each KeyValue specified, if a cell with the same row, family, and qualifier exists in<a name="line.2349"></a>
+<span class="sourceLineNo">2350</span>   * MemStore, it will be replaced. Otherwise, it will just be inserted to MemStore.<a name="line.2350"></a>
+<span class="sourceLineNo">2351</span>   * &lt;p&gt;<a name="line.2351"></a>
+<span class="sourceLineNo">2352</span>   * This operation is atomic on each KeyValue (row/family/qualifier) but not necessarily atomic<a name="line.2352"></a>
+<span class="sourceLineNo">2353</span>   * across all of them.<a name="line.2353"></a>
+<span class="sourceLineNo">2354</span>   * @param readpoint readpoint below which we can safely remove duplicate KVs<a name="line.2354"></a>
+<span class="sourceLineNo">2355</span>   */<a name="line.2355"></a>
+<span class="sourceLineNo">2356</span>  public void upsert(Iterable&lt;Cell&gt; cells, long readpoint, MemStoreSizing memstoreSizing)<a name="line.2356"></a>
+<span class="sourceLineNo">2357</span>      throws IOException {<a name="line.2357"></a>
+<span class="sourceLineNo">2358</span>    this.lock.readLock().lock();<a name="line.2358"></a>
+<span class="sourceLineNo">2359</span>    try {<a name="line.2359"></a>
+<span class="sourceLineNo">2360</span>      this.memstore.upsert(cells, readpoint, memstoreSizing);<a name="line.2360"></a>
+<span class="sourceLineNo">2361</span>    } finally {<a name="line.2361"></a>
+<span class="sourceLineNo">2362</span>      this.lock.readLock().unlock();<a name="line.2362"></a>
+<span class="sourceLineNo">2363</span>    }<a name="line.2363"></a>
+<span class="sourceLineNo">2364</span>  }<a name="line.2364"></a>
+<span class="sourceLineNo">2365</span><a name="line.2365"></a>
+<span class="sourceLineNo">2366</span>  public StoreFlushContext createFlushContext(long cacheFlushId, FlushLifeCycleTracker tracker) {<a name="line.2366"></a>
+<span class="sourceLineNo">2367</span>    return new StoreFlusherImpl(cacheFlushId, tracker);<a name="line.2367"></a>
+<span class="sourceLineNo">2368</span>  }<a name="line.2368"></a>
+<span class="sourceLineNo">2369</span><a name="line.2369"></a>
+<span class="sourceLineNo">2370</span>  private final class StoreFlusherImpl implements StoreFlushContext {<a name="line.2370"></a>
+<span class="sourceLineNo">2371</span><a name="line.2371"></a>
+<span class="sourceLineNo">2372</span>    private final FlushLifeCycleTracker tracker;<a name="line.2372"></a>
+<span class="sourceLineNo">2373</span>    private final long cacheFlushSeqNum;<a name="line.2373"></a>
+<span class="sourceLineNo">2374</span>    private MemStoreSnapshot snapshot;<a name="line.2374"></a>
+<span class="sourceLineNo">2375</span>    private List&lt;Path&gt; tempFiles;<a name="line.2375"></a>
+<span class="sourceLineNo">2376</span>    private List&lt;Path&gt; committedFiles;<a name="line.2376"></a>
+<span class="sourceLineNo">2377</span>    private long cacheFlushCount;<a name="line.2377"></a>
+<span class="sourceLineNo">2378</span>    private long cacheFlushSize;<a name="line.2378"></a>
+<span class="sourceLineNo">2379</span>    private long outputFileSize;<a name="line.2379"></a>
+<span class="sourceLineNo">2380</span><a name="line.2380"></a>
+<span class="sourceLineNo">2381</span>    private StoreFlusherImpl(long cacheFlushSeqNum, FlushLifeCycleTracker tracker) {<a name="line.2381"></a>
+<span class="sourceLineNo">2382</span>      this.cacheFlushSeqNum = cacheFlushSeqNum;<a name="line.2382"></a>
+<span class="sourceLineNo">2383</span>      this.tracker = tracker;<a name="line.2383"></a>
+<span class="sourceLineNo">2384</span>    }<a name="line.2384"></a>
 <span class="sourceLineNo">2385</span><a name="line.2385"></a>
-<span class="sourceLineNo">2386</span>    private StoreFlusherImpl(long cacheFlushSeqNum, FlushLifeCycleTracker tracker) {<a name="line.2386"></a>
-<span class="sourceLineNo">2387</span>      this.cacheFlushSeqNum = cacheFlushSeqNum;<a name="line.2387"></a>
-<span class="sourceLineNo">2388</span>      this.tracker = tracker;<a name="line.2388"></a>
-<span class="sourceLineNo">2389</span>    }<a name="line.2389"></a>
-<span class="sourceLineNo">2390</span><a name="line.2390"></a>
-<span class="sourceLineNo">2391</span>    /**<a name="line.2391"></a>
-<span class="sourceLineNo">2392</span>     * This is not thread safe. The caller should have a lock on the region or the store.<a name="line.2392"></a>
-<span class="sourceLineNo">2393</span>     * If necessary, the lock can be added with the patch provided in HBASE-10087<a name="line.2393"></a>
-<span class="sourceLineNo">2394</span>     */<a name="line.2394"></a>
-<span class="sourceLineNo">2395</span>    @Override<a name="line.2395"></a>
-<span class="sourceLineNo">2396</span>    public MemStoreSize prepare() {<a name="line.2396"></a>
-<span class="sourceLineNo">2397</span>      // passing the current sequence number of the wal - to allow bookkeeping in the memstore<a name="line.2397"></a>
-<span class="sourceLineNo">2398</span>      this.snapshot = memstore.snapshot();<a name="line.2398"></a>
-<span class="sourceLineNo">2399</span>      this.cacheFlushCount = snapshot.getCellsCount();<a name="line.2399"></a>
-<span class="sourceLineNo">2400</span>      this.cacheFlushSize = snapshot.getDataSize();<a name="line.2400"></a>
-<span class="sourceLineNo">2401</span>      committedFiles = new ArrayList&lt;&gt;(1);<a name="line.2401"></a>
-<span class="sourceLineNo">2402</span>      return snapshot.getMemStoreSize();<a name="line.2402"></a>
-<span class="sourceLineNo">2403</span>    }<a name="line.2403"></a>
-<span class="sourceLineNo">2404</span><a name="line.2404"></a>
-<span class="sourceLineNo">2405</span>    @Override<a name="line.2405"></a>
-<span class="sourceLineNo">2406</span>    public void flushCache(MonitoredTask status) throws IOException {<a name="line.2406"></a>
-<span class="sourceLineNo">2407</span>      RegionServerServices rsService = region.getRegionServerServices();<a name="line.2407"></a>
-<span class="sourceLineNo">2408</span>      ThroughputController throughputController =<a name="line.2408"></a>
-<span class="sourceLineNo">2409</span>          rsService == null ? null : rsService.getFlushThroughputController();<a name="line.2409"></a>
-<span class="sourceLineNo">2410</span>      tempFiles =<a name="line.2410"></a>
-<span class="sourceLineNo">2411</span>          HStore.this.flushCache(cacheFlushSeqNum, snapshot, status, throughputController, tracker);<a name="line.2411"></a>
-<span class="sourceLineNo">2412</span>    }<a name="line.2412"></a>
-<span class="sourceLineNo">2413</span><a name="line.2413"></a>
-<span class="sourceLineNo">2414</span>    @Override<a name="line.2414"></a>
-<span class="sourceLineNo">2415</span>    public boolean commit(MonitoredTask status) throws IOException {<a name="line.2415"></a>
-<span class="sourceLineNo">2416</span>      if (CollectionUtils.isEmpty(this.tempFiles)) {<a name="line.2416"></a>
-<span class="sourceLineNo">2417</span>        return false;<a name="line.2417"></a>
-<span class="sourceLineNo">2418</span>      }<a name="line.2418"></a>
-<span class="sourceLineNo">2419</span>      List&lt;HStoreFile&gt; storeFiles = new ArrayList&lt;&gt;(this.tempFiles.size());<a name="line.2419"></a>
-<span class="sourceLineNo">2420</span>      for (Path storeFilePath : tempFiles) {<a name="line.2420"></a>
-<span class="sourceLineNo">2421</span>        try {<a name="line.2421"></a>
-<span class="sourceLineNo">2422</span>          HStoreFile sf = HStore.this.commitFile(storeFilePath, cacheFlushSeqNum, status);<a name="line.2422"></a>
-<span class="sourceLineNo">2423</span>          outputFileSize += sf.getReader().length();<a name="line.2423"></a>
-<span class="sourceLineNo">2424</span>          storeFiles.add(sf);<a name="line.2424"></a>
-<span class="sourceLineNo">2425</span>        } catch (IOException ex) {<a name="line.2425"></a>
-<span class="sourceLineNo">2426</span>          LOG.error("Failed to commit store file {}", storeFilePath, ex);<a name="line.2426"></a>
-<span class="sourceLineNo">2427</span>          // Try to delete the files we have committed before.<a name="line.2427"></a>
-<span class="sourceLineNo">2428</span>          for (HStoreFile sf : storeFiles) {<a name="line.2428"></a>
-<span class="sourceLineNo">2429</span>            Path pathToDelete = sf.getPath();<a name="line.2429"></a>
-<span class="sourceLineNo">2430</span>            try {<a name="line.2430"></a>
-<span class="sourceLineNo">2431</span>              sf.deleteStoreFile();<a name="line.2431"></a>
-<span class="sourceLineNo">2432</span>            } catch (IOException deleteEx) {<a name="line.2432"></a>
-<span class="sourceLineNo">2433</span>              LOG.error(HBaseMarkers.FATAL, "Failed to delete store file we committed, "<a name="line.2433"></a>
-<span class="sourceLineNo">2434</span>                  + "halting {}", pathToDelete, ex);<a name="line.2434"></a>
-<span class="sourceLineNo">2435</span>              Runtime.getRuntime().halt(1);<a name="line.2435"></a>
-<span class="sourceLineNo">2436</span>            }<a name="line.2436"></a>
-<span class="sourceLineNo">2437</span>          }<a name="line.2437"></a>
-<span class="sourceLineNo">2438</span>          throw new IOException("Failed to commit the flush", ex);<a name="line.2438"></a>
-<span class="sourceLineNo">2439</span>        }<a name="line.2439"></a>
-<span class="sourceLineNo">2440</span>      }<a name="line.2440"></a>
-<span class="sourceLineNo">2441</span><a name="line.2441"></a>
-<span class="sourceLineNo">2442</span>      for (HStoreFile sf : storeFiles) {<a name="line.2442"></a>
-<span class="sourceLineNo">2443</span>        if (HStore.this.getCoprocessorHost() != null) {<a name="line.2443"></a>
-<span class="sourceLineNo">2444</span>          HStore.this.getCoprocessorHost().postFlush(HStore.this, sf, tracker);<a name="line.2444"></a>
-<span class="sourceLineNo">2445</span>        }<a name="line.2445"></a>
-<span class="sourceLineNo">2446</span>        committedFiles.add(sf.getPath());<a name="line.2446"></a>
-<span class="sourceLineNo">2447</span>      }<a name="line.2447"></a>
-<span class="sourceLineNo">2448</span><a name="line.2448"></a>
-<span class="sourceLineNo">2449</span>      HStore.this.flushedCellsCount.addAndGet(cacheFlushCount);<a name="line.2449"></a>
-<span class="sourceLineNo">2450</span>      HStore.this.flushedCellsSize.addAndGet(cacheFlushSize);<a name="line.2450"></a>
-<span class="sourceLineNo">2451</span>      HStore.this.flushedOutputFileSize.addAndGet(outputFileSize);<a name="line.2451"></a>
-<span class="sourceLineNo">2452</span><a name="line.2452"></a>
-<span class="sourceLineNo">2453</span>      // Add new file to store files.  Clear snapshot too while we have the Store write lock.<a name="line.2453"></a>
-<span class="sourceLineNo">2454</span>      return HStore.this.updateStorefiles(storeFiles, snapshot.getId());<a name="line.2454"></a>
+<span class="sourceLineNo">2386</span>    /**<a name="line.2386"></a>
+<span class="sourceLineNo">2387</span>     * This is not thread safe. The caller should have a lock on the region or the store.<a name="line.2387"></a>
+<span class="sourceLineNo">2388</span>     * If necessary, the lock can be added with the patch provided in HBASE-10087<a name="line.2388"></a>
+<span class="sourceLineNo">2389</span>     */<a name="line.2389"></a>
+<span class="sourceLineNo">2390</span>    @Override<a name="line.2390"></a>
+<span class="sourceLineNo">2391</span>    public MemStoreSize prepare() {<a name="line.2391"></a>
+<span class="sourceLineNo">2392</span>      // passing the current sequence number of the wal - to allow bookkeeping in the memstore<a name="line.2392"></a>
+<span class="sourceLineNo">2393</span>      this.snapshot = memstore.snapshot();<a name="line.2393"></a>
+<span class="sourceLineNo">2394</span>      this.cacheFlushCount = snapshot.getCellsCount();<a name="line.2394"></a>
+<span class="sourceLineNo">2395</span>      this.cacheFlushSize = snapshot.getDataSize();<a name="line.2395"></a>
+<span class="sourceLineNo">2396</span>      committedFiles = new ArrayList&lt;&gt;(1);<a name="line.2396"></a>
+<span class="sourceLineNo">2397</span>      return snapshot.getMemStoreSize();<a name="line.2397"></a>
+<span class="sourceLineNo">2398</span>    }<a name="line.2398"></a>
+<span class="sourceLineNo">2399</span><a name="line.2399"></a>
+<span class="sourceLineNo">2400</span>    @Override<a name="line.2400"></a>
+<span class="sourceLineNo">2401</span>    public void flushCache(MonitoredTask status) throws IOException {<a name="line.2401"></a>
+<span class="sourceLineNo">2402</span>      RegionServerServices rsService = region.getRegionServerServices();<a name="line.2402"></a>
+<span class="sourceLineNo">2403</span>      ThroughputController throughputController =<a name="line.2403"></a>
+<span class="sourceLineNo">2404</span>          rsService == null ? null : rsService.getFlushThroughputController();<a name="line.2404"></a>
+<span class="sourceLineNo">2405</span>      tempFiles =<a name="line.2405"></a>
+<span class="sourceLineNo">2406</span>          HStore.this.flushCache(cacheFlushSeqNum, snapshot, status, throughputController, tracker);<a name="line.2406"></a>
+<span class="sourceLineNo">2407</span>    }<a name="line.2407"></a>
+<span class="sourceLineNo">2408</span><a name="line.2408"></a>
+<span class="sourceLineNo">2409</span>    @Override<a name="line.2409"></a>
+<span class="sourceLineNo">2410</span>    public boolean commit(MonitoredTask status) throws IOException {<a name="line.2410"></a>
+<span class="sourceLineNo">2411</span>      if (CollectionUtils.isEmpty(this.tempFiles)) {<a name="line.2411"></a>
+<span class="sourceLineNo">2412</span>        return false;<a name="line.2412"></a>
+<span class="sourceLineNo">2413</span>      }<a name="line.2413"></a>
+<span class="sourceLineNo">2414</span>      List&lt;HStoreFile&gt; storeFiles = new ArrayList&lt;&gt;(this.tempFiles.size());<a name="line.2414"></a>
+<span class="sourceLineNo">2415</span>      for (Path storeFilePath : tempFiles) {<a name="line.2415"></a>
+<span class="sourceLineNo">2416</span>        try {<a name="line.2416"></a>
+<span class="sourceLineNo">2417</span>          HStoreFile sf = HStore.this.commitFile(storeFilePath, cacheFlushSeqNum, status);<a name="line.2417"></a>
+<span class="sourceLineNo">2418</span>          outputFileSize += sf.getReader().length();<a name="line.2418"></a>
+<span class="sourceLineNo">2419</span>          storeFiles.add(sf);<a name="line.2419"></a>
+<span class="sourceLineNo">2420</span>        } catch (IOException ex) {<a name="line.2420"></a>
+<span class="sourceLineNo">2421</span>          LOG.error("Failed to commit store file {}", storeFilePath, ex);<a name="line.2421"></a>
+<span class="sourceLineNo">2422</span>          // Try to delete the files we have committed before.<a name="line.2422"></a>
+<span class="sourceLineNo">2423</span>          for (HStoreFile sf : storeFiles) {<a name="line.2423"></a>
+<span class="sourceLineNo">2424</span>            Path pathToDelete = sf.getPath();<a name="line.2424"></a>
+<span class="sourceLineNo">2425</span>            try {<a name="line.2425"></a>
+<span class="sourceLineNo">2426</span>              sf.deleteStoreFile();<a name="line.2426"></a>
+<span class="sourceLineNo">2427</span>            } catch (IOException deleteEx) {<a name="line.2427"></a>
+<span class="sourceLineNo">2428</span>              LOG.error(HBaseMarkers.FATAL, "Failed to delete store file we committed, "<a name="line.2428"></a>
+<span class="sourceLineNo">2429</span>                  + "halting {}", pathToDelete, ex);<a name="line.2429"></a>
+<span class="sourceLineNo">2430</span>              Runtime.getRuntime().halt(1);<a name="line.2430"></a>
+<span class="sourceLineNo">2431</span>            }<a name="line.2431"></a>
+<span class="sourceLineNo">2432</span>          }<a name="line.2432"></a>
+<span class="sourceLineNo">2433</span>          throw new IOException("Failed to commit the flush", ex);<a name="line.2433"></a>
+<span class="sourceLineNo">2434</span>        }<a name="line.2434"></a>
+<span class="sourceLineNo">2435</span>      }<a name="line.2435"></a>
+<span class="sourceLineNo">2436</span><a name="line.2436"></a>
+<span class="sourceLineNo">2437</span>      for (HStoreFile sf : storeFiles) {<a name="line.2437"></a>
+<span class="sourceLineNo">2438</span>        if (HStore.this.getCoprocessorHost() != null) {<a name="line.2438"></a>
+<span class="sourceLineNo">2439</span>          HStore.this.getCoprocessorHost().postFlush(HStore.this, sf, tracker);<a name="line.2439"></a>
+<span class="sourceLineNo">2440</span>        }<a name="line.2440"></a>
+<span class="sourceLineNo">2441</span>        committedFiles.add(sf.getPath());<a name="line.2441"></a>
+<span class="sourceLineNo">2442</span>      }<a name="line.2442"></a>
+<span class="sourceLineNo">2443</span><a name="line.2443"></a>
+<span class="sourceLineNo">2444</span>      HStore.this.flushedCellsCount.addAndGet(cacheFlushCount);<a name="line.2444"></a>
+<span class="sourceLineNo">2445</span>      HStore.this.flushedCellsSize.addAndGet(cacheFlushSize);<a name="line.2445"></a>
+<span class="sourceLineNo">2446</span>      HStore.this.flushedOutputFileSize.addAndGet(outputFileSize);<a name="line.2446"></a>
+<span class="sourceLineNo">2447</span><a name="line.2447"></a>
+<span class="sourceLineNo">2448</span>      // Add new file to store files.  Clear snapshot too while we have the Store write lock.<a name="line.2448"></a>
+<span class="sourceLineNo">2449</span>      return HStore.this.updateStorefiles(storeFiles, snapshot.getId());<a name="line.2449"></a>
+<span class="sourceLineNo">2450</span>    }<a name="line.2450"></a>
+<span class="sourceLineNo">2451</span><a name="line.2451"></a>
+<span class="sourceLineNo">2452</span>    @Override<a name="line.2452"></a>
+<span class="sourceLineNo">2453</span>    public long getOutputFileSize() {<a name="line.2453"></a>
+<span class="sourceLineNo">2454</span>      return outputFileSize;<a name="line.2454"></a>
 <span class="sourceLineNo">2455</span>    }<a name="line.2455"></a>
 <span class="sourceLineNo">2456</span><a name="line.2456"></a>
 <span class="sourceLineNo">2457</span>    @Override<a name="line.2457"></a>
-<span class="sourceLineNo">2458</span>    public long getOutputFileSize() {<a name="line.2458"></a>
-<span class="sourceLineNo">2459</span>      return outputFileSize;<a name="line.2459"></a>
+<span class="sourceLineNo">2458</span>    public List&lt;Path&gt; getCommittedFiles() {<a name="line.2458"></a>
+<span class="sourceLineNo">2459</span>      return committedFiles;<a name="line.2459"></a>
 <span class="sourceLineNo">2460</span>    }<a name="line.2460"></a>
 <span class="sourceLineNo">2461</span><a name="line.2461"></a>
-<span class="sourceLineNo">2462</span>    @Override<a name="line.2462"></a>
-<span class="sourceLineNo">2463</span>    public List&lt;Path&gt; getCommittedFiles() {<a name="line.2463"></a>
-<span class="sourceLineNo">2464</span>      return committedFiles;<a name="line.2464"></a>
-<span class="sourceLineNo">2465</span>    }<a name="line.2465"></a>
-<span class="sourceLineNo">2466</span><a name="line.2466"></a>
-<span class="sourceLineNo">2467</span>    /**<a name="line.2467"></a>
-<span class="sourceLineNo">2468</span>     * Similar to commit, but called in secondary region replicas for replaying the<a name="line.2468"></a>
-<span class="sourceLineNo">2469</span>     * flush cache from primary region. Adds the new files to the store, and drops the<a name="line.2469"></a>
-<span class="sourceLineNo">2470</span>     * snapshot depending on dropMemstoreSnapshot argument.<a name="line.2470"></a>
-<span class="sourceLineNo">2471</span>     * @param fileNames names of the flushed files<a name="line.2471"></a>
-<span class="sourceLineNo">2472</span>     * @param dropMemstoreSnapshot whether to drop the prepared memstore snapshot<a name="line.2472"></a>
-<span class="sourceLineNo">2473</span>     */<a name="line.2473"></a>
-<span class="sourceLineNo">2474</span>    @Override<a name="line.2474"></a>
-<span class="sourceLineNo">2475</span>    public void replayFlush(List&lt;String&gt; fileNames, boolean dropMemstoreSnapshot)<a name="line.2475"></a>
-<span class="sourceLineNo">2476</span>        throws IOException {<a name="line.2476"></a>
-<span class="sourceLineNo">2477</span>      List&lt;HStoreFile&gt; storeFiles = new ArrayList&lt;&gt;(fileNames.size());<a name="line.2477"></a>
-<span class="sourceLineNo">2478</span>      for (String file : fileNames) {<a name="line.2478"></a>
-<span class="sourceLineNo">2479</span>        // open the file as a store file (hfile link, etc)<a name="line.2479"></a>
-<span class="sourceLineNo">2480</span>        StoreFileInfo storeFileInfo = fs.getStoreFileInfo(getColumnFamilyName(), file);<a name="line.2480"></a>
-<span class="sourceLineNo">2481</span>        HStoreFile storeFile = createStoreFileAndReader(storeFileInfo);<a name="line.2481"></a>
-<span class="sourceLineNo">2482</span>        storeFiles.add(storeFile);<a name="line.2482"></a>
-<span class="sourceLineNo">2483</span>        HStore.this.storeSize.addAndGet(storeFile.getReader().length());<a name="line.2483"></a>
-<span class="sourceLineNo">2484</span>        HStore.this.totalUncompressedBytes<a name="line.2484"></a>
-<span class="sourceLineNo">2485</span>            .addAndGet(storeFile.getReader().getTotalUncompressedBytes());<a name="line.2485"></a>
-<span class="sourceLineNo">2486</span>        if (LOG.isInfoEnabled()) {<a name="line.2486"></a>
-<span class="sourceLineNo">2487</span>          LOG.info("Region: " + HStore.this.getRegionInfo().getEncodedName() +<a name="line.2487"></a>
-<span class="sourceLineNo">2488</span>            " added " + storeFile + ", entries=" + storeFile.getReader().getEntries() +<a name="line.2488"></a>
-<span class="sourceLineNo">2489</span>              ", sequenceid=" + storeFile.getReader().getSequenceID() + ", filesize="<a name="line.2489"></a>
-<span class="sourceLineNo">2490</span>              + TraditionalBinaryPrefix.long2String(storeFile.getReader().length(), "", 1));<a name="line.2490"></a>
-<span class="sourceLineNo">2491</span>        }<a name="line.2491"></a>
-<span class="sourceLineNo">2492</span>      }<a name="line.2492"></a>
-<span class="sourceLineNo">2493</span><a name="line.2493"></a>
-<span class="sourceLineNo">2494</span>      long snapshotId = -1; // -1 means do not drop<a name="line.2494"></a>
-<span class="sourceLineNo">2495</span>      if (dropMemstoreSnapshot &amp;&amp; snapshot != null) {<a name="line.2495"></a>
-<span class="sourceLineNo">2496</span>        snapshotId = snapshot.getId();<a name="line.2496"></a>
-<span class="sourceLineNo">2497</span>        snapshot.close();<a name="line.2497"></a>
-<span class="sourceLineNo">2498</span>      }<a name="line.2498"></a>
-<span class="sourceLineNo">2499</span>      HStore.this.updateStorefiles(storeFiles, snapshotId);<a name="line.2499"></a>
-<span class="sourceLineNo">2500</span>    }<a name="line.2500"></a>
-<span class="sourceLineNo">2501</span><a name="line.2501"></a>
-<span class="sourceLineNo">2502</span>    /**<a name="line.2502"></a>
-<span class="sourceLineNo">2503</span>     * Abort the snapshot preparation. Drops the snapshot if any.<a name="line.2503"></a>
-<span class="sourceLineNo">2504</span>     */<a name="line.2504"></a>
-<span class="sourceLineNo">2505</span>    @Override<a name="line.2505"></a>
-<span class="sourceLineNo">2506</span>    public void abort() throws IOException {<a name="line.2506"></a>
-<span class="sourceLineNo">2507</span>      if (snapshot != null) {<a name="line.2507"></a>
-<span class="sourceLineNo">2508</span>        //We need to close the snapshot when aborting, otherwise, the segment scanner<a name="line.2508"></a>
-<span class="sourceLineNo">2509</span>        //won't be closed. If we are using MSLAB, the chunk referenced by those scanners<a name="line.2509"></a>
-<span class="sourceLineNo">2510</span>        //can't be released, thus memory leak<a name="line.2510"></a>
-<span class="sourceLineNo">2511</span>        snapshot.close();<a name="line.2511"></a>
-<span class="sourceLineNo">2512</span>        HStore.this.updateStorefiles(Collections.emptyList(), snapshot.getId());<a name="line.2512"></a>
-<span class="sourceLineNo">2513</span>      }<a name="line.2513"></a>
-<span class="sourceLineNo">2514</span>    }<a name="line.2514"></a>
-<span class="sourceLineNo">2515</span>  }<a name="line.2515"></a>
-<span class="sourceLineNo">2516</span><a name="line.2516"></a>
-<span class="sourceLineNo">2517</span>  @Override<a name="line.2517"></a>
-<span class="sourceLineNo">2518</span>  public boolean needsCompaction() {<a name="line.2518"></a>
-<span class="sourceLineNo">2519</span>    List&lt;HStoreFile&gt; filesCompactingClone = null;<a name="line.2519"></a>
-<span class="sourceLineNo">2520</span>    synchronized (filesCompacting) {<a name="line.2520"></a>
-<span class="sourceLineNo">2521</span>      filesCompactingClone = Lists.newArrayList(filesCompacting);<a name="line.2521"></a>
-<span class="sourceLineNo">2522</span>    }<a name="line.2522"></a>
-<span class="sourceLineNo">2523</span>    return this.storeEngine.needsCompaction(filesCompactingClone);<a name="line.2523"></a>
-<span class="sourceLineNo">2524</span>  }<a name="line.2524"></a>
-<span class="sourceLineNo">2525</span><a name="line.2525"></a>
-<span class="sourceLineNo">2526</span>  /**<a name="line.2526"></a>
-<span class="sourceLineNo">2527</span>   * Used for tests.<a name="line.2527"></a>
-<span class="sourceLineNo">2528</span>   * @return cache configuration for this Store.<a name="line.2528"></a>
-<span class="sourceLineNo">2529</span>   */<a name="line.2529"></a>
-<span class="sourceLineNo">2530</span>  @VisibleForTesting<a name="line.2530"></a>
-<span class="sourceLineNo">2531</span>  public CacheConfig getCacheConfig() {<a name="line.2531"></a>
-<span class="sourceLineNo">2532</span>    return this.cacheConf;<a name="line.2532"></a>
-<span class="sourceLineNo">2533</span>  }<a name="line.2533"></a>
-<span class="sourceLineNo">2534</span><a name="line.2534"></a>
-<span class="sourceLineNo">2535</span>  public static final long FIXED_OVERHEAD =<a name="line.2535"></a>
-<span class="sourceLineNo">2536</span>      ClassSize.align(ClassSize.OBJECT + (27 * ClassSize.REFERENCE) + (2 * Bytes.SIZEOF_LONG)<a name="line.2536"></a>
-<span class="sourceLineNo">2537</span>              + (6 * Bytes.SIZEOF_INT) + (2 * Bytes.SIZEOF_BOOLEAN));<a name="line.2537"></a>
-<span class="sourceLineNo">2538</span><a name="line.2538"></a>
-<span class="sourceLineNo">2539</span>  public static final long DEEP_OVERHEAD = ClassSize.align(FIXED_OVERHEAD<a name="line.2539"></a>
-<span class="sourceLineNo">2540</span>      + ClassSize.OBJECT + ClassSize.REENTRANT_LOCK<a name="line.2540"></a>
-<span class="sourceLineNo">2541</span>      + ClassSize.CONCURRENT_SKIPLISTMAP<a name="line.2541"></a>
-<span class="sourceLineNo">2542</span>      + ClassSize.CONCURRENT_SKIPLISTMAP_ENTRY + ClassSize.OBJECT<a name="line.2542"></a>
-<span class="sourceLineNo">2543</span>      + ScanInfo.FIXED_OVERHEAD);<a name="line.2543"></a>
-<span class="sourceLineNo">2544</span><a name="line.2544"></a>
-<span class="sourceLineNo">2545</span>  @Override<a name="line.2545"></a>
-<span class="sourceLineNo">2546</span>  public long heapSize() {<a name="line.2546"></a>
-<span class="sourceLineNo">2547</span>    MemStoreSize memstoreSize = this.memstore.size();<a name="line.2547"></a>
-<span class="sourceLineNo">2548</span>    return DEEP_OVERHEAD + memstoreSize.getHeapSize();<a name="line.2548"></a>
+<span class="sourceLineNo">2462</span>    /**<a name="line.2462"></a>
+<span class="sourceLineNo">2463</span>     * Similar to commit, but called in secondary region replicas for replaying the<a name="line.2463"></a>
+<span class="sourceLineNo">2464</span>     * flush cache from primary region. Adds the new files to the store, and drops the<a name="line.2464"></a>
+<span class="sourceLineNo">2465</span>     * snapshot depending on dropMemstoreSnapshot argument.<a name="line.2465"></a>
+<span class="sourceLineNo">2466</span>     * @param fileNames names of the flushed files<a name="line.2466"></a>
+<span class="sourceLineNo">2467</span>     * @param dropMemstoreSnapshot whether to drop the prepared memstore snapshot<a name="line.2467"></a>
+<span class="sourceLineNo">2468</span>     */<a name="line.2468"></a>
+<span class="sourceLineNo">2469</span>    @Override<a name="line.2469"></a>
+<span class="sourceLineNo">2470</span>    public void replayFlush(List&lt;String&gt; fileNames, boolean dropMemstoreSnapshot)<a name="line.2470"></a>
+<span class="sourceLineNo">2471</span>        throws IOException {<a name="line.2471"></a>
+<span class="sourceLineNo">2472</span>      List&lt;HStoreFile&gt; storeFiles = new ArrayList&lt;&gt;(fileNames.size());<a name="line.2472"></a>
+<span class="sourceLineNo">2473</span>      for (String file : fileNames) {<a name="line.2473"></a>
+<span class="sourceLineNo">2474</span>        // open the file as a store file (hfile link, etc)<a name="line.2474"></a>
+<span class="sourceLineNo">2475</span>        StoreFileInfo storeFileInfo = fs.getStoreFileInfo(getColumnFamilyName(), file);<a name="line.2475"></a>
+<span class="sourceLineNo">2476</span>        HStoreFile storeFile = createStoreFileAndReader(storeFileInfo);<a name="line.2476"></a>
+<span class="sourceLineNo">2477</span>        storeFiles.add(storeFile);<a name="line.2477"></a>
+<span class="sourceLineNo">2478</span>        HStore.this.storeSize.addAndGet(storeFile.getReader().length());<a name="line.2478"></a>
+<span class="sourceLineNo">2479</span>        HStore.this.totalUncompressedBytes<a name="line.2479"></a>
+<span class="sourceLineNo">2480</span>            .addAndGet(storeFile.getReader().getTotalUncompressedBytes());<a name="line.2480"></a>
+<span class="sourceLineNo">2481</span>        if (LOG.isInfoEnabled()) {<a name="line.2481"></a>
+<span class="sourceLineNo">2482</span>          LOG.info("Region: " + HStore.this.getRegionInfo().getEncodedName() +<a name="line.2482"></a>
+<span class="sourceLineNo">2483</span>            " added " + storeFile + ", entries=" + storeFile.getReader().getEntries() +<a name="line.2483"></a>
+<span class="sourceLineNo">2484</span>              ", sequenceid=" + storeFile.getReader().getSequenceID() + ", filesize="<a name="line.2484"></a>
+<span class="sourceLineNo">2485</span>              + TraditionalBinaryPrefix.long2String(storeFile.getReader().length(), "", 1));<a name="line.2485"></a>
+<span class="sourceLineNo">2486</span>        }<a name="line.2486"></a>
+<span class="sourceLineNo">2487</span>      }<a name="line.2487"></a>
+<span class="sourceLineNo">2488</span><a name="line.2488"></a>
+<span class="sourceLineNo">2489</span>      long snapshotId = -1; // -1 means do not drop<a name="line.2489"></a>
+<span class="sourceLineNo">2490</span>      if (dropMemstoreSnapshot &amp;&amp; snapshot != null) {<a name="line.2490"></a>
+<span class="sourceLineNo">2491</span>        snapshotId = snapshot.getId();<a name="line.2491"></a>
+<span class="sourceLineNo">2492</span>        snapshot.close();<a name="line.2492"></a>
+<span class="sourceLineNo">2493</span>      }<a name="line.2493"></a>
+<span class="sourceLineNo">2494</span>      HStore.this.updateStorefiles(storeFiles, snapshotId);<a name="line.2494"></a>
+<span class="sourceLineNo">2495</span>    }<a name="line.2495"></a>
+<span class="sourceLineNo">2496</span><a name="line.2496"></a>
+<span class="sourceLineNo">2497</span>    /**<a name="line.2497"></a>
+<span class="sourceLineNo">2498</span>     * Abort the snapshot preparation. Drops the snapshot if any.<a name="line.2498"></a>
+<span class="sourceLineNo">2499</span>     */<a name="line.2499"></a>
+<span class="sourceLineNo">2500</span>    @Override<a name="line.2500"></a>
+<span class="sourceLineNo">2501</span>    public void abort() throws IOException {<a name="line.2501"></a>
+<span class="sourceLineNo">2502</span>      if (snapshot != null) {<a name="line.2502"></a>
+<span class="sourceLineNo">2503</span>        //We need to close the snapshot when aborting, otherwise, the segment scanner<a name="line.2503"></a>
+<span class="sourceLineNo">2504</span>        //won't be closed. If we are using MSLAB, the chunk referenced by those scanners<a name="line.2504"></a>
+<span class="sourceLineNo">2505</span>        //can't be released, thus memory leak<a name="line.2505"></a>
+<span class="sourceLineNo">2506</span>        snapshot.close();<a name="line.2506"></a>
+<span class="sourceLineNo">2507</span>        HStore.this.updateStorefiles(Collections.emptyList(), snapshot.getId());<a name="line.2507"></a>
+<span class="sourceLineNo">2508</span>      }<a name="line.2508"></a>
+<span class="sourceLineNo">2509</span>    }<a name="line.2509"></a>
+<span class="sourceLineNo">2510</span>  }<a name="line.2510"></a>
+<span class="sourceLineNo">2511</span><a name="line.2511"></a>
+<span class="sourceLineNo">2512</span>  @Override<a name="line.2512"></a>
+<span class="sourceLineNo">2513</span>  public boolean needsCompaction() {<a name="line.2513"></a>
+<span class="sourceLineNo">2514</span>    List&lt;HStoreFile&gt; filesCompactingClone = null;<a name="line.2514"></a>
+<span class="sourceLineNo">2515</span>    synchronized (filesCompacting) {<a name="line.2515"></a>
+<span class="sourceLineNo">2516</span>      filesCompactingClone = Lists.newArrayList(filesCompacting);<a name="line.2516"></a>
+<span class="sourceLineNo">2517</span>    }<a name="line.2517"></a>
+<span class="sourceLineNo">2518</span>    return this.storeEngine.needsCompaction(filesCompactingClone);<a name="line.2518"></a>
+<span class="sourceLineNo">2519</span>  }<a name="line.2519"></a>
+<span class="sourceLineNo">2520</span><a name="line.2520"></a>
+<span class="sourceLineNo">2521</span>  /**<a name="line.2521"></a>
+<span class="sourceLineNo">2522</span>   * Used for tests.<a name="line.2522"></a>
+<span class="sourceLineNo">2523</span>   * @return cache configuration for this Store.<a name="line.2523"></a>
+<span class="sourceLineNo">2524</span>   */<a name="line.2524"></a>
+<span class="sourceLineNo">2525</span>  @VisibleForTesting<a name="line.2525"></a>
+<span class="sourceLineNo">2526</span>  public CacheConfig getCacheConfig() {<a name="line.2526"></a>
+<span class="sourceLineNo">2527</span>    return this.cacheConf;<a name="line.2527"></a>
+<span class="sourceLineNo">2528</span>  }<a name="line.2528"></a>
+<span class="sourceLineNo">2529</span><a name="line.2529"></a>
+<span class="sourceLineNo">2530</span>  public static final long FIXED_OVERHEAD =<a name="line.2530"></a>
+<span class="sourceLineNo">2531</span>      ClassSize.align(ClassSize.OBJECT + (27 * ClassSize.REFERENCE) + (2 * Bytes.SIZEOF_LONG)<a name="line.2531"></a>
+<span class="sourceLineNo">2532</span>              + (6 * Bytes.SIZEOF_INT) + (2 * Bytes.SIZEOF_BOOLEAN));<a name="line.2532"></a>
+<span class="sourceLineNo">2533</span><a name="line.2533"></a>
+<span class="sourceLineNo">2534</span>  public static final long DEEP_OVERHEAD = ClassSize.align(FIXED_OVERHEAD<a name="line.2534"></a>
+<span class="sourceLineNo">2535</span>      + ClassSize.OBJECT + ClassSize.REENTRANT_LOCK<a name="line.2535"></a>
+<span class="sourceLineNo">2536</span>      + ClassSize.CONCURRENT_SKIPLISTMAP<a name="line.2536"></a>
+<span class="sourceLineNo">2537</span>      + ClassSize.CONCURRENT_SKIPLISTMAP_ENTRY + ClassSize.OBJECT<a name="line.2537"></a>
+<span class="sourceLineNo">2538</span>      + ScanInfo.FIXED_OVERHEAD);<a name="line.2538"></a>
+<span class="sourceLineNo">2539</span><a name="line.2539"></a>
+<span class="sourceLineNo">2540</span>  @Override<a name="line.2540"></a>
+<span class="sourceLineNo">2541</span>  public long heapSize() {<a name="line.2541"></a>
+<span class="sourceLineNo">2542</span>    MemStoreSize memstoreSize = this.memstore.size();<a name="line.2542"></a>
+<span class="sourceLineNo">2543</span>    return DEEP_OVERHEAD + memstoreSize.getHeapSize();<a name="line.2543"></a>
+<span class="sourceLineNo">2544</span>  }<a name="line.2544"></a>
+<span class="sourceLineNo">2545</span><a name="line.2545"></a>
+<span class="sourceLineNo">2546</span>  @Override<a name="line.2546"></a>
+<span class="sourceLineNo">2547</span>  public CellComparator getComparator() {<a name="line.2547"></a>
+<span class="sourceLineNo">2548</span>    return comparator;<a name="line.2548"></a>
 <span class="sourceLineNo">2549</span>  }<a name="line.2549"></a>
 <span class="sourceLineNo">2550</span><a name="line.2550"></a>
-<span class="sourceLineNo">2551</span>  @Override<a name="line.2551"></a>
-<span class="sourceLineNo">2552</span>  public CellComparator getComparator() {<a name="line.2552"></a>
-<span class="sourceLineNo">2553</span>    return comparator;<a name="line.2553"></a>
-<span class="sourceLineNo">2554</span>  }<a name="line.2554"></a>
-<span class="sourceLineNo">2555</span><a name="line.2555"></a>
-<span class="sourceLineNo">2556</span>  public ScanInfo getScanInfo() {<a name="line.2556"></a>
-<span class="sourceLineNo">2557</span>    return scanInfo;<a name="line.2557"></a>
-<span class="sourceLineNo">2558</span>  }<a name="line.2558"></a>
-<span class="sourceLineNo">2559</span><a name="line.2559"></a>
-<span class="sourceLineNo">2560</span>  /**<a name="line.2560"></a>
-<span class="sourceLineNo">2561</span>   * Set scan info, used by test<a name="line.2561"></a>
-<span class="sourceLineNo">2562</span>   * @param scanInfo new scan info to use for test<a name="line.2562"></a>
-<span class="sourceLineNo">2563</span>   */<a name="line.2563"></a>
-<span class="sourceLineNo">2564</span>  void setScanInfo(ScanInfo scanInfo) {<a name="line.2564"></a>
-<span class="sourceLineNo">2565</span>    this.scanInfo = scanInfo;<a name="line.2565"></a>
+<span class="sourceLineNo">2551</span>  public ScanInfo getScanInfo() {<a name="line.2551"></a>
+<span class="sourceLineNo">2552</span>    return scanInfo;<a name="line.2552"></a>
+<span class="sourceLineNo">2553</span>  }<a name="line.2553"></a>
+<span class="sourceLineNo">2554</span><a name="line.2554"></a>
+<span class="sourceLineNo">2555</span>  /**<a name="line.2555"></a>
+<span class="sourceLineNo">2556</span>   * Set scan info, used by test<a name="line.2556"></a>
+<span class="sourceLineNo">2557</span>   * @param scanInfo new scan info to use for test<a name="line.2557"></a>
+<span class="sourceLineNo">2558</span>   */<a name="line.2558"></a>
+<span class="sourceLineNo">2559</span>  void setScanInfo(ScanInfo scanInfo) {<a name="line.2559"></a>
+<span class="sourceLineNo">2560</span>    this.scanInfo = scanInfo;<a name="line.2560"></a>
+<span class="sourceLineNo">2561</span>  }<a name="line.2561"></a>
+<span class="sourceLineNo">2562</span><a name="line.2562"></a>
+<span class="sourceLineNo">2563</span>  @Override<a name="line.2563"></a>
+<span class="sourceLineNo">2564</span>  public boolean hasTooManyStoreFiles() {<a name="line.2564"></a>
+<span class="sourceLineNo">2565</span>    return getStorefilesCount() &gt; this.blockingFileCount;<a name="line.2565"></a>
 <span class="sourceLineNo">2566</span>  }<a name="line.2566"></a>
 <span class="sourceLineNo">2567</span><a name="line.2567"></a>
 <span class="sourceLineNo">2568</span>  @Override<a name="line.2568"></a>
-<span class="sourceLineNo">2569</span>  public boolean hasTooManyStoreFiles() {<a name="line.2569"></a>
-<span class="sourceLineNo">2570</span>    return getStorefilesCount() &gt; this.blockingFileCount;<a name="line.2570"></a>
+<span class="sourceLineNo">2569</span>  public long getFlushedCellsCount() {<a name="line.2569"></a>
+<span class="sourceLineNo">2570</span>    return flushedCellsCount.get();<a name="line.2570"></a>
 <span class="sourceLineNo">2571</span>  }<a name="line.2571"></a>
 <span class="sourceLineNo">2572</span><a name="line.2572"></a>
 <span class="sourceLineNo">2573</span>  @Override<a name="line.2573"></a>
-<span class="sourceLineNo">2574</span>  public long getFlushedCellsCount() {<a name="line.2574"></a>
-<span class="sourceLineNo">2575</span>    return flushedCellsCount.get();<a name="line.2575"></a>
+<span class="sourceLineNo">2574</span>  public long getFlushedCellsSize() {<a name="line.2574"></a>
+<span class="sourceLineNo">2575</span>    return flushedCellsSize.get();<a name="line.2575"></a>
 <span class="sourceLineNo">2576</span>  }<a name="line.2576"></a>
 <span class="sourceLineNo">2577</span><a name="line.2577"></a>
 <span class="sourceLineNo">2578</span>  @Override<a name="line.2578"></a>
-<span class="sourceLineNo">2579</span>  public long getFlushedCellsSize() {<a name="line.2579"></a>
-<span class="sourceLineNo">2580</span>    return flushedCellsSize.get();<a name="line.2580"></a>
+<span class="sourceLineNo">2579</span>  public long getFlushedOutputFileSize() {<a name="line.2579"></a>
+<span class="sourceLineNo">2580</span>    return flushedOutputFileSize.get();<a name="line.2580"></a>
 <span class="sourceLineNo">2581</span>  }<a name="line.2581"></a>
 <span class="sourceLineNo">2582</span><a name="line.2582"></a>
 <span class="sourceLineNo">2583</span>  @Override<a name="line.2583"></a>
-<span class="sourceLineNo">2584</span>  public long getFlushedOutputFileSize() {<a name="line.2584"></a>
-<span class="sourceLineNo">2585</span>    return flushedOutputFileSize.get();<a name="line.2585"></a>
+<span class="sourceLineNo">2584</span>  public long getCompactedCellsCount() {<a name="line.2584"></a>
+<span class="sourceLineNo">2585</span>    return compactedCellsCount.get();<a name="line.2585"></a>
 <span class="sourceLineNo">2586</span>  }<a name="line.2586"></a>
 <span class="sourceLineNo">2587</span><a name="line.2587"></a>
 <span class="sourceLineNo">2588</span>  @Override<a name="line.2588"></a>
-<span class="sourceLineNo">2589</span>  public long getCompactedCellsCount() {<a name="line.2589"></a>
-<span class="sourceLineNo">2590</span>    return compactedCellsCount.get();<a name="line.2590"></a>
+<span class="sourceLineNo">2589</span>  public long getCompactedCellsSize() {<a name="line.2589"></a>
+<span class="sourceLineNo">2590</span>    return compactedCellsSize.get();<a name="line.2590"></a>
 <span class="sourceLineNo">2591</span>  }<a name="line.2591"></a>
 <span class="sourceLineNo">2592</span><a name="line.2592"></a>
 <span class="sourceLineNo">2593</span>  @Override<a name="line.2593"></a>
-<span class="sourceLineNo">2594</span>  public long getCompactedCellsSize() {<a name="line.2594"></a>
-<span class="sourceLineNo">2595</span>    return compactedCellsSize.get();<a name="line.2595"></a>
+<span class="sourceLineNo">2594</span>  public long getMajorCompactedCellsCount() {<a name="line.2594"></a>
+<span class="sourceLineNo">2595</span>    return majorCompactedCellsCount.get();<a name="line.2595"></a>
 <span class="sourceLineNo">2596</span>  }<a name="line.2596"></a>
 <span class="sourceLineNo">2597</span><a name="line.2597"></a>
 <span class="sourceLineNo">2598</span>  @Override<a name="line.2598"></a>
-<span class="sourceLineNo">2599</span>  public long getMajorCompactedCellsCount() {<a name="line.2599"></a>
-<span class="sourceLineNo">2600</span>    return majorCompactedCellsCount.get();<a name="line.2600"></a>
+<span class="sourceLineNo">2599</span>  public long getMajorCompactedCellsSize() {<a name="line.2599"></a>
+<span class="sourceLineNo">2600</span>    return majorCompactedCellsSize.get();<a name="line.2600"></a>
 <span class="sourceLineNo">2601</span>  }<a name="line.2601"></a>
 <span class="sourceLineNo">2602</span><a name="line.2602"></a>
-<span class="sourceLineNo">2603</span>  @Override<a name="line.2603"></a>
-<span class="sourceLineNo">2604</span>  public long getMajorCompactedCellsSize() {<a name="line.2604"></a>
-<span class="sourceLineNo">2605</span>    return majorCompactedCellsSize.get();<a name="line.2605"></a>
-<span class="sourceLineNo">2606</span>  }<a name="line.2606"></a>
-<span class="sourceLineNo">2607</span><a name="line.2607"></a>
-<span class="sourceLineNo">2608</span>  /**<a name="line.2608"></a>
-<span class="sourceLineNo">2609</span>   * Returns the StoreEngine that is backing this concrete implementation of Store.<a name="line.2609"></a>
-<span class="sourceLineNo">2610</span>   * @return Returns the {@link StoreEngine} object used internally inside this HStore object.<a name="line.2610"></a>
-<span class="sourceLineNo">2611</span>   */<a name="line.2611"></a>
-<span class="sourceLineNo">2612</span>  @VisibleForTesting<a name="line.2612"></a>
-<span class="sourceLineNo">2613</span>  public StoreEngine&lt;?, ?, ?, ?&gt; getStoreEngine() {<a name="line.2613"></a>
-<span class="sourceLineNo">2614</span>    return this.storeEngine;<a name="line.2614"></a>
-<span class="sourceLineNo">2615</span>  }<a name="line.2615"></a>
-<span class="sourceLineNo">2616</span><a name="line.2616"></a>
-<span class="sourceLineNo">2617</span>  protected OffPeakHours getOffPeakHours() {<a name="line.2617"></a>
-<span class="sourceLineNo">2618</span>    return this.offPeakHours;<a name="line.2618"></a>
-<span class="sourceLineNo">2619</span>  }<a name="line.2619"></a>
-<span class="sourceLineNo">2620</span><a name="line.2620"></a>
-<span class="sourceLineNo">2621</span>  /**<a name="line.2621"></a>
-<span class="sourceLineNo">2622</span>   * {@inheritDoc}<a name="line.2622"></a>
-<span class="sourceLineNo">2623</span>   */<a name="line.2623"></a>
-<span class="sourceLineNo">2624</span>  @Override<a name="line.2624"></a>
-<span class="sourceLineNo">2625</span>  public void onConfigurationChange(Configuration conf) {<a name="line.2625"></a>
-<span class="sourceLineNo">2626</span>    this.conf = new CompoundConfiguration()<a name="line.2626"></a>
-<span class="sourceLineNo">2627</span>            .add(conf)<a name="line.2627"></a>
-<span class="sourceLineNo">2628</span>            .addBytesMap(family.getValues());<a name="line.2628"></a>
-<span class="sourceLineNo">2629</span>    this.storeEngine.compactionPolicy.setConf(conf);<a name="line.2629"></a>
-<span class="sourceLineNo">2630</span>    this.offPeakHours = OffPeakHours.getInstance(conf);<a name="line.2630"></a>
-<span class="sourceLineNo">2631</span>  }<a name="line.2631"></a>
-<span class="sourceLineNo">2632</span><a name="line.2632"></a>
-<span class="sourceLineNo">2633</span>  /**<a name="line.2633"></a>
-<span class="sourceLineNo">2634</span>   * {@inheritDoc}<a name="line.2634"></a>
-<span class="sourceLineNo">2635</span>   */<a name="line.2635"></a>
-<span class="sourceLineNo">2636</span>  @Override<a name="line.2636"></a>
-<span class="sourceLineNo">2637</span>  public void registerChildren(ConfigurationManager manager) {<a name="line.2637"></a>
-<span class="sourceLineNo">2638</span>    // No children to register<a name="line.2638"></a>
-<span class="sourceLineNo">2639</span>  }<a name="line.2639"></a>
-<span class="sourceLineNo">2640</span><a name="line.2640"></a>
-<span class="sourceLineNo">2641</span>  /**<a name="line.2641"></a>
-<span class="sourceLineNo">2642</span>   * {@inheritDoc}<a name="line.2642"></a>
-<span class="sourceLineNo">2643</span>   */<a name="line.2643"></a>
+<span class="sourceLineNo">2603</span>  /**<a name="line.2603"></a>
+<span class="sourceLineNo">2604</span>   * Returns the StoreEngine that is backing this concrete implementation of Store.<a name="line.2604"></a>
+<span class="sourceLineNo">2605</span>   * @return Returns the {@link StoreEngine} object used internally inside this HStore object.<a name="line.2605"></a>
+<span class="sourceLineNo">2606</span>   */<a name="line.2606"></a>
+<span class="sourceLineNo">2607</span>  @VisibleForTesting<a name="line.2607"></a>
+<span class="sourceLineNo">2608</span>  public StoreEngine&lt;?, ?, ?, ?&gt; getStoreEngine() {<a name="line.2608"></a>
+<span class="sourceLineNo">2609</span>    return this.storeEngine;<a name="line.2609"></a>
+<span class="sourceLineNo">2610</span>  }<a name="line.2610"></a>
+<span class="sourceLineNo">2611</span><a name="line.2611"></a>
+<span class="sourceLineNo">2612</span>  protected OffPeakHours getOffPeakHours() {<a name="line.2612"></a>
+<span class="sourceLineNo">2613</span>    return this.offPeakHours;<a name="line.2613"></a>
+<span class="sourceLineNo">2614</span>  }<a name="line.2614"></a>
+<span class="sourceLineNo">2615</span><a name="line.2615"></a>
+<span class="sourceLineNo">2616</span>  /**<a name="line.2616"></a>
+<span class="sourceLineNo">2617</span>   * {@inheritDoc}<a name="line.2617"></a>
+<span class="sourceLineNo">2618</span>   */<a name="line.2618"></a>
+<span class="sourceLineNo">2619</span>  @Override<a name="line.2619"></a>
+<span class="sourceLineNo">2620</span>  public void onConfigurationChange(Configuration conf) {<a name="line.2620"></a>
+<span class="sourceLineNo">2621</span>    this.conf = new CompoundConfiguration()<a name="line.2621"></a>
+<span class="sourceLineNo">2622</span>            .add(conf)<a name="line.2622"></a>
+<span class="sourceLineNo">2623</span>            .addBytesMap(family.getValues());<a name="line.2623"></a>
+<span class="sourceLineNo">2624</span>    this.storeEngine.compactionPolicy.setConf(conf);<a name="line.2624"></a>
+<span class="sourceLineNo">2625</span>    this.offPeakHours = OffPeakHours.getInstance(conf);<a name="line.2625"></a>
+<span class="sourceLineNo">2626</span>  }<a name="line.2626"></a>
+<span class="sourceLineNo">2627</span><a name="line.2627"></a>
+<span class="sourceLineNo">2628</span>  /**<a name="line.2628"></a>
+<span class="sourceLineNo">2629</span>   * {@inheritDoc}<a name="line.2629"></a>
+<span class="sourceLineNo">2630</span>   */<a name="line.2630"></a>
+<span class="sourceLineNo">2631</span>  @Override<a name="line.2631"></a>
+<span class="sourceLineNo">2632</span>  public void registerChildren(ConfigurationManager manager) {<a name="line.2632"></a>
+<span class="sourceLineNo">2633</span>    // No children to register<a name="line.2633"></a>
+<span class="sourceLineNo">2634</span>  }<a name="line.2634"></a>
+<span class="sourceLineNo">2635</span><a name="line.2635"></a>
+<span class="sourceLineNo">2636</span>  /**<a name="line.2636"></a>
+<span class="sourceLineNo">2637</span>   * {@inheritDoc}<a name="line.2637"></a>
+<span class="sourceLineNo">2638</span>   */<a name="line.2638"></a>
+<span class="sourceLineNo">2639</span>  @Override<a name="line.2639"></a>
+<span class="sourceLineNo">2640</span>  public void deregisterChildren(ConfigurationManager manager) {<a name="line.2640"></a>
+<span class="sourceLineNo">2641</span>    // No children to deregister<a name="line.2641"></a>
+<span class="sourceLineNo">2642</span>  }<a name="line.2642"></a>
+<span class="sourceLineNo">2643</span><a name="line.2643"></a>
 <span class="sourceLineNo">2644</span>  @Override<a name="line.2644"></a>
-<span class="sourceLineNo">2645</span>  public void deregisterChildren(ConfigurationManager manager) {<a name="line.2645"></a>
-<span class="sourceLineNo">2646</span>    // No children to deregister<a name="line.2646"></a>
+<span class="sourceLineNo">2645</span>  public double getCompactionPressure() {<a name="line.2645"></a>
+<span class="sourceLineNo">2646</span>    return storeEngine.getStoreFileManager().getCompactionPressure();<a name="line.2646"></a>
 <span class="sourceLineNo">2647</span>  }<a name="line.2647"></a>
 <span class="sourceLineNo">2648</span><a name="line.2648"></a>
 <span class="sourceLineNo">2649</span>  @Override<a name="line.2649"></a>
-<span class="sourceLineNo">2650</span>  public double getCompactionPressure() {<a name="line.2650"></a>
-<span class="sourceLineNo">2651</span>    return storeEngine.getStoreFileManager().getCompactionPressure();<a name="line.2651"></a>
+<span class="sourceLineNo">2650</span>  public boolean isPrimaryReplicaStore() {<a name="line.2650"></a>
+<span class="sourceLineNo">2651</span>    return getRegionInfo().getReplicaId() == RegionInfo.DEFAULT_REPLICA_ID;<a name="line.2651"></a>
 <span class="sourceLineNo">2652</span>  }<a name="line.2652"></a>
 <span class="sourceLineNo">2653</span><a name="line.2653"></a>
-<span class="sourceLineNo">2654</span>  @Override<a name="line.2654"></a>
-<span class="sourceLineNo">2655</span>  public boolean isPrimaryReplicaStore() {<a name="line.2655"></a>
-<span class="sourceLineNo">2656</span>    return getRegionInfo().getReplicaId() == RegionInfo.DEFAULT_REPLICA_ID;<a name="line.2656"></a>
-<span class="sourceLineNo">2657</span>  }<a name="line.2657"></a>
-<span class="sourceLineNo">2658</span><a name="line.2658"></a>
-<span class="sourceLineNo">2659</span>  /**<a name="line.2659"></a>
-<span class="sourceLineNo">2660</span>   * Sets the store up for a region level snapshot operation.<a name="line.2660"></a>
-<span class="sourceLineNo">2661</span>   * @see #postSnapshotOperation()<a name="line.2661"></a>
-<span class="sourceLineNo">2662</span>   */<a name="line.2662"></a>
-<span class="sourceLineNo">2663</span>  public void preSnapshotOperation() {<a name="line.2663"></a>
-<span class="sourceLineNo">2664</span>    archiveLock.lock();<a name="line.2664"></a>
-<span class="sourceLineNo">2665</span>  }<a name="line.2665"></a>
-<span class="sourceLineNo">2666</span><a name="line.2666"></a>
-<span class="sourceLineNo">2667</span>  /**<a name="line.2667"></a>
-<span class="sourceLineNo">2668</span>   * Perform tasks needed after the completion of snapshot operation.<a name="line.2668"></a>
-<span class="sourceLineNo">2669</span>   * @see #preSnapshotOperation()<a name="line.2669"></a>
-<span class="sourceLineNo">2670</span>   */<a name="line.2670"></a>
-<span class="sourceLineNo">2671</span>  public void postSnapshotOperation() {<a name="line.2671"></a>
-<span class="sourceLineNo">2672</span>    archiveLock.unlock();<a name="line.2672"></a>
-<span class="sourceLineNo">2673</span>  }<a name="line.2673"></a>
-<span class="sourceLineNo">2674</span><a name="line.2674"></a>
-<span class="sourceLineNo">2675</span>  /**<a name="line.2675"></a>
-<span class="sourceLineNo">2676</span>   * Closes and archives the compacted files under this store<a name="line.2676"></a>
-<span class="sourceLineNo">2677</span>   */<a name="line.2677"></a>
-<span class="sourceLineNo">2678</span>  public synchronized void closeAndArchiveCompactedFiles() throws IOException {<a name="line.2678"></a>
-<span class="sourceLineNo">2679</span>    // ensure other threads do not attempt to archive the same files on close()<a name="line.2679"></a>
-<span class="sourceLineNo">2680</span>    archiveLock.lock();<a name="line.2680"></a>
-<span class="sourceLineNo">2681</span>    try {<a name="line.2681"></a>
-<span class="sourceLineNo">2682</span>      lock.readLock().lock();<a name="line.2682"></a>
-<span class="sourceLineNo">2683</span>      Collection&lt;HStoreFile&gt; copyCompactedfiles = null;<a name="line.2683"></a>
-<span class="sourceLineNo">2684</span>      try {<a name="line.2684"></a>
-<span class="sourceLineNo">2685</span>        Collection&lt;HStoreFile&gt; compactedfiles =<a name="line.2685"></a>
-<span class="sourceLineNo">2686</span>            this.getStoreEngine().getStoreFileManager().getCompactedfiles();<a name="line.2686"></a>
-<span class="sourceLineNo">2687</span>        if (CollectionUtils.isNotEmpty(compactedfiles)) {<a name="line.2687"></a>
-<span class="sourceLineNo">2688</span>          // Do a copy under read lock<a name="line.2688"></a>
-<span class="sourceLineNo">2689</span>          copyCompactedfiles = new ArrayList&lt;&gt;(compactedfiles);<a name="line.2689"></a>
-<span class="sourceLineNo">2690</span>        } else {<a name="line.2690"></a>
-<span class="sourceLineNo">2691</span>          LOG.trace("No compacted files to archive");<a name="line.2691"></a>
-<span class="sourceLineNo">2692</span>        }<a name="line.2692"></a>
-<span class="sourceLineNo">2693</span>      } finally {<a name="line.2693"></a>
-<span class="sourceLineNo">2694</span>        lock.readLock().unlock();<a name="line.2694"></a>
-<span class="sourceLineNo">2695</span>      }<a name="line.2695"></a>
-<span class="sourceLineNo">2696</span>      if (CollectionUtils.isNotEmpty(copyCompactedfiles)) {<a name="line.2696"></a>
-<span class="sourceLineNo">2697</span>        removeCompactedfiles(copyCompactedfiles);<a name="line.2697"></a>
-<span class="sourceLineNo">2698</span>      }<a name="line.2698"></a>
-<span class="sourceLineNo">2699</span>    } finally {<a name="line.2699"></a>
-<span class="sourceLineNo">2700</span>      archiveLock.unlock();<a name="line.2700"></a>
-<span class="sourceLineNo">2701</span>    }<a name="line.2701"></a>
-<span class="sourceLineNo">2702</span>  }<a name="line.2702"></a>
-<span class="sourceLineNo">2703</span><a name="line.2703"></a>
-<span class="sourceLineNo">2704</span>  /**<a name="line.2704"></a>
-<span class="sourceLineNo">2705</span>   * Archives and removes the compacted files<a name="line.2705"></a>
-<span class="sourceLineNo">2706</span>   * @param compactedfiles The compacted files in this store that are not active in reads<a name="line.2706"></a>
-<span class="sourceLineNo">2707</span>   */<a name="line.2707"></a>
-<span class="sourceLineNo">2708</span>  private void removeCompactedfiles(Collection&lt;HStoreFile&gt; compactedfiles)<a name="line.2708"></a>
-<span class="sourceLineNo">2709</span>      throws IOException {<a name="line.2709"></a>
-<span class="sourceLineNo">2710</span>    final List&lt;HStoreFile&gt; filesToRemove = new ArrayList&lt;&gt;(compactedfiles.size());<a name="line.2710"></a>
-<span class="sourceLineNo">2711</span>    final List&lt;Long&gt; storeFileSizes = new ArrayList&lt;&gt;(compactedfiles.size());<a name="line.2711"></a>
-<span class="sourceLineNo">2712</span>    for (final HStoreFile file : compactedfiles) {<a name="line.2712"></a>
-<span class="sourceLineNo">2713</span>      synchronized (file) {<a name="line.2713"></a>
-<span class="sourceLineNo">2714</span>        try {<a name="line.2714"></a>
-<span class="sourceLineNo">2715</span>          StoreFileReader r = file.getReader();<a name="line.2715"></a>
-<span class="sourceLineNo">2716</span>          if (r == null) {<a name="line.2716"></a>
-<span class="sourceLineNo">2717</span>            LOG.debug("The file {} was closed but still not archived", file);<a name="line.2717"></a>
-<span class="sourceLineNo">2718</span>            // HACK: Temporarily re-open the reader so we can get the size of the file. Ideally,<a name="line.2718"></a>
-<span class="sourceLineNo">2719</span>            // we should know the size of an HStoreFile without having to ask the HStoreFileReader<a name="line.2719"></a>
-<span class="sourceLineNo">2720</span>            // for that.<a name="line.2720"></a>
-<span class="sourceLineNo">2721</span>            long length = getStoreFileSize(file);<a name="line.2721"></a>
-<span class="sourceLineNo">2722</span>            filesToRemove.add(file);<a name="line.2722"></a>
-<span class="sourceLineNo">2723</span>            storeFileSizes.add(length);<a name="line.2723"></a>
-<span class="sourceLineNo">2724</span>            continue;<a name="line.2724"></a>
-<span class="sourceLineNo">2725</span>          }<a name="line.2725"></a>
-<span class="sourceLineNo">2726</span><a name="line.2726"></a>
-<span class="sourceLineNo">2727</span>          if (file.isCompactedAway() &amp;&amp; !file.isReferencedInReads()) {<a name="line.2727"></a>
-<span class="sourceLineNo">2728</span>            // Even if deleting fails we need not bother as any new scanners won't be<a name="line.2728"></a>
-<span class="sourceLineNo">2729</span>            // able to use the compacted file as the status is already compactedAway<a name="line.2729"></a>
-<span class="sourceLineNo">2730</span>            LOG.trace("Closing and archiving the file {}", file);<a name="line.2730"></a>
-<span class="sourceLineNo">2731</span>            // Copy the file size before closing the reader<a name="line.2731"></a>
-<span class="sourceLineNo">2732</span>            final long length = r.length();<a name="line.2732"></a>
-<span class="sourceLineNo">2733</span>            r.close(true);<a name="line.2733"></a>
-<span class="sourceLineNo">2734</span>            // Just close and return<a name="line.2734"></a>
-<span class="sourceLineNo">2735</span>            filesToRemove.add(file);<a name="line.2735"></a>
-<span class="sourceLineNo">2736</span>            // Only add the length if we successfully added the file to `filesToRemove`<a name="line.2736"></a>
-<span class="sourceLineNo">2737</span>            storeFileSizes.add(length);<a name="line.2737"></a>
-<span class="sourceLineNo">2738</span>          } else {<a name="line.2738"></a>
-<span class="sourceLineNo">2739</span>            LOG.info("Can't archive compacted file " + file.getPath()<a name="line.2739"></a>
-<span class="sourceLineNo">2740</span>                + " because of either isCompactedAway=" + file.isCompactedAway()<a name="line.2740"></a>
-<span class="sourceLineNo">2741</span>                + " or file has reference, isReferencedInReads=" + file.isReferencedInReads()<a name="line.2741"></a>
-<span class="sourceLineNo">2742</span>                + ", refCount=" + r.getRefCount() + ", skipping for now.");<a name="line.2742"></a>
-<span class="sourceLineNo">2743</span>          }<a name="line.2743"></a>
-<span class="sourceLineNo">2744</span>        } catch (Exception e) {<a name="line.2744"></a>
-<span class="sourceLineNo">2745</span>          LOG.error("Exception while trying to close the compacted store file {}", file.getPath(),<a name="line.2745"></a>
-<span class="sourceLineNo">2746</span>              e);<a name="line.2746"></a>
-<span class="sourceLineNo">2747</span>        }<a name="line.2747"></a>
-<span class="sourceLineNo">2748</span>      }<a name="line.2748"></a>
-<span class="sourceLineNo">2749</span>    }<a name="line.2749"></a>
-<span class="sourceLineNo">2750</span>    if (this.isPrimaryReplicaStore()) {<a name="line.2750"></a>
-<span class="sourceLineNo">2751</span>      // Only the primary region is allowed to move the file to archive.<a name="line.2751"></a>
-<span class="sourceLineNo">2752</span>      // The secondary region does not move the files to archive. Any active reads from<a name="line.2752"></a>
-<span class="sourceLineNo">2753</span>      // the secondary region will still work because the file as such has active readers on it.<a name="line.2753"></a>
-<span class="sourceLineNo">2754</span>      if (!filesToRemove.isEmpty()) {<a name="line.2754"></a>
-<span class="sourceLineNo">2755</span>        LOG.debug("Moving the files {} to archive", filesToRemove);<a name="line.2755"></a>
-<span class="sourceLineNo">2756</span>        // Only if this is successful it has to be removed<a name="line.2756"></a>
-<span class="sourceLineNo">2757</span>        try {<a name="line.2757"></a>
-<span class="sourceLineNo">2758</span>          this.fs.removeStoreFiles(this.getColumnFamilyDescriptor().getNameAsString(),<a name="line.2758"></a>
-<span class="sourceLineNo">2759</span>            filesToRemove);<a name="line.2759"></a>
-<span class="sourceLineNo">2760</span>        } catch (FailedArchiveException fae) {<a name="line.2760"></a>
-<span class="sourceLineNo">2761</span>          // Even if archiving some files failed, we still need to clear out any of the<a name="line.2761"></a>
-<span class="sourceLineNo">2762</span>          // files which were successfully archived.  Otherwise we will receive a<a name="line.2762"></a>
-<span class="sourceLineNo">2763</span>          // FileNotFoundException when we attempt to re-archive them in the next go around.<a name="line.2763"></a>
-<span class="sourceLineNo">2764</span>          Collection&lt;Path&gt; failedFiles = fae.getFailedFiles();<a name="line.2764"></a>
-<span class="sourceLineNo">2765</span>          Iterator&lt;HStoreFile&gt; iter = filesToRemove.iterator();<a name="line.2765"></a>
-<span class="sourceLineNo">2766</span>          Iterator&lt;Long&gt; sizeIter = storeFileSizes.iterator();<a name="line.2766"></a>
-<span class="sourceLineNo">2767</span>          while (iter.hasNext()) {<a name="line.2767"></a>
-<span class="sourceLineNo">2768</span>            sizeIter.next();<a name="line.2768"></a>
-<span class="sourceLineNo">2769</span>            if (failedFiles.contains(iter.next().getPath())) {<a name="line.2769"></a>
-<span class="sourceLineNo">2770</span>              iter.remove();<a name="line.2770"></a>
-<span class="sourceLineNo">2771</span>              sizeIter.remove();<a name="line.2771"></a>
-<span class="sourceLineNo">2772</span>            }<a name="line.2772"></a>
-<span class="sourceLineNo">2773</span>          }<a name="line.2773"></a>
-<span class="sourceLineNo">2774</span>          if (!filesToRemove.isEmpty()) {<a name="line.2774"></a>
-<span class="sourceLineNo">2775</span>            clearCompactedfiles(filesToRemove);<a name="line.2775"></a>
-<span class="sourceLineNo">2776</span>          }<a name="line.2776"></a>
-<span class="sourceLineNo">2777</span>          throw fae;<a name="line.2777"></a>
-<span class="sourceLineNo">2778</span>        }<a name="line.2778"></a>
-<span class="sourceLineNo">2779</span>      }<a name="line.2779"></a>
-<span class="sourceLineNo">2780</span>    }<a name="line.2780"></a>
-<span class="sourceLineNo">2781</span>    if (!filesToRemove.isEmpty()) {<a name="line.2781"></a>
-<span class="sourceLineNo">2782</span>      // Clear the compactedfiles from the store file manager<a name="line.2782"></a>
-<span class="sourceLineNo">2783</span>      clearCompactedfiles(filesToRemove);<a name="line.2783"></a>
-<span class="sourceLineNo">2784</span>      // Try to send report of this archival to the Master for updating quota usage faster<a name="line.2784"></a>
-<span class="sourceLineNo">2785</span>      reportArchivedFilesForQuota(filesToRemove, storeFileSizes);<a name="line.2785"></a>
-<span class="sourceLineNo">2786</span>    }<a name="line.2786"></a>
-<span class="sourceLineNo">2787</span>  }<a name="line.2787"></a>
-<span class="sourceLineNo">2788</span><a name="line.2788"></a>
-<span class="sourceLineNo">2789</span>  /**<a name="line.2789"></a>
-<span class="sourceLineNo">2790</span>   * Computes the length of a store file without succumbing to any errors along the way. If an<a name="line.2790"></a>
-<span class="sourceLineNo">2791</span>   * error is encountered, the implementation returns {@code 0} instead of the actual size.<a name="line.2791"></a>
-<span class="sourceLineNo">2792</span>   *<a name="line.2792"></a>
-<span class="sourceLineNo">2793</span>   * @param file The file to compute the size of.<a name="line.2793"></a>
-<span class="sourceLineNo">2794</span>   * @return The size in bytes of the provided {@code file}.<a name="line.2794"></a>
-<span class="sourceLineNo">2795</span>   */<a name="line.2795"></a>
-<span class="sourceLineNo">2796</span>  long getStoreFileSize(HStoreFile file) {<a name="line.2796"></a>
-<span class="sourceLineNo">2797</span>    long length = 0;<a name="line.2797"></a>
-<span class="sourceLineNo">2798</span>    try {<a name="line.2798"></a>
-<span class="sourceLineNo">2799</span>      file.initReader();<a name="line.2799"></a>
-<span class="sourceLineNo">2800</span>      length = file.getReader().length();<a name="line.2800"></a>
-<span class="sourceLineNo">2801</span>    } catch (IOException e) {<a name="line.2801"></a>
-<span class="sourceLineNo">2802</span>      LOG.trace("Failed to open reader when trying to compute store file size, ignoring", e);<a name="line.2802"></a>
-<span class="sourceLineNo">2803</span>    } finally {<a name="line.2803"></a>
-<span class="sourceLineNo">2804</span>      try {<a name="line.2804"></a>
-<span class="sourceLineNo">2805</span>        file.closeStoreFile(<a name="line.2805"></a>
-<span class="sourceLineNo">2806</span>            file.getCacheConf() != null ? file.getCacheConf().shouldEvictOnClose() : true);<a name="line.2806"></a>
-<span class="sourceLineNo">2807</span>      } catch (IOException e) {<a name="line.2807"></a>
-<span class="sourceLineNo">2808</span>        LOG.trace("Failed to close reader after computing store file size, ignoring", e);<a name="line.2808"></a>
-<span class="sourceLineNo">2809</span>      }<a name="line.2809"></a>
-<span class="sourceLineNo">2810</span>    }<a name="line.2810"></a>
-<span class="sourceLineNo">2811</span>    return length;<a name="line.2811"></a>
-<span class="sourceLineNo">2812</span>  }<a name="line.2812"></a>
-<span class="sourceLineNo">2813</span><a name="line.2813"></a>
-<span class="sourceLineNo">2814</span>  public Long preFlushSeqIDEstimation() {<a name="line.2814"></a>
-<span class="sourceLineNo">2815</span>    return memstore.preFlushSeqIDEstimation();<a name="line.2815"></a>
+<span class="sourceLineNo">2654</span>  /**<a name="line.2654"></a>
+<span class="sourceLineNo">2655</span>   * Sets the store up for a region level snapshot operation.<a name="line.2655"></a>
+<span class="sourceLineNo">2656</span>   * @see #postSnapshotOperation()<a name="line.2656"></a>
+<span class="sourceLineNo">2657</span>   */<a name="line.2657"></a>
+<span class="sourceLineNo">2658</span>  public void preSnapshotOperation() {<a name="line.2658"></a>
+<span class="sourceLineNo">2659</span>    archiveLock.lock();<a name="line.2659"></a>
+<span class="sourceLineNo">2660</span>  }<a name="line.2660"></a>
+<span class="sourceLineNo">2661</span><a name="line.2661"></a>
+<span class="sourceLineNo">2662</span>  /**<a name="line.2662"></a>
+<span class="sourceLineNo">2663</span>   * Perform tasks needed after the completion of snapshot operation.<a name="line.2663"></a>
+<span class="sourceLineNo">2664</span>   * @see #preSnapshotOperation()<a name="line.2664"></a>
+<span class="sourceLineNo">2665</span>   */<a name="line.2665"></a>
+<span class="sourceLineNo">2666</span>  public void postSnapshotOperation() {<a name="line.2666"></a>
+<span class="sourceLineNo">2667</span>    archiveLock.unlock();<a name="line.2667"></a>
+<span class="sourceLineNo">2668</span>  }<a name="line.2668"></a>
+<span class="sourceLineNo">2669</span><a name="line.2669"></a>
+<span class="sourceLineNo">2670</span>  /**<a name="line.2670"></a>
+<span class="sourceLineNo">2671</span>   * Closes and archives the compacted files under this store<a name="line.2671"></a>
+<span class="sourceLineNo">2672</span>   */<a name="line.2672"></a>
+<span class="sourceLineNo">2673</span>  public synchronized void closeAndArchiveCompactedFiles() throws IOException {<a name="line.2673"></a>
+<span class="sourceLineNo">2674</span>    // ensure other threads do not attempt to archive the same files on close()<a name="line.2674"></a>
+<span class="sourceLineNo">2675</span>    archiveLock.lock();<a name="line.2675"></a>
+<span class="sourceLineNo">2676</span>    try {<a name="line.2676"></a>
+<span class="sourceLineNo">2677</span>      lock.readLock().lock();<a name="line.2677"></a>
+<span class="sourceLineNo">2678</span>      Collection&lt;HStoreFile&gt; copyCompactedfiles = null;<a name="line.2678"></a>
+<span class="sourceLineNo">2679</span>      try {<a name="line.2679"></a>
+<span class="sourceLineNo">2680</span>        Collection&lt;HStoreFile&gt; compactedfiles =<a name="line.2680"></a>
+<span class="sourceLineNo">2681</span>            this.getStoreEngine().getStoreFileManager().getCompactedfiles();<a name="line.2681"></a>
+<span class="sourceLineNo">2682</span>        if (CollectionUtils.isNotEmpty(compactedfiles)) {<a name="line.2682"></a>
+<span class="sourceLineNo">2683</span>          // Do a copy under read lock<a name="line.2683"></a>
+<span class="sourceLineNo">2684</span>          copyCompactedfiles = new ArrayList&lt;&gt;(compactedfiles);<a name="line.2684"></a>
+<span class="sourceLineNo">2685</span>        } else {<a name="line.2685"></a>
+<span class="sourceLineNo">2686</span>          LOG.trace("No compacted files to archive");<a name="line.2686"></a>
+<span class="sourceLineNo">2687</span>        }<a name="line.2687"></a>
+<span class="sourceLineNo">2688</span>      } finally {<a name="line.2688"></a>
+<span class="sourceLineNo">2689</span>        lock.readLock().unlock();<a name="line.2689"></a>
+<span class="sourceLineNo">2690</span>      }<a name="line.2690"></a>
+<span class="sourceLineNo">2691</span>      if (CollectionUtils.isNotEmpty(copyCompactedfiles)) {<a name="line.2691"></a>
+<span class="sourceLineNo">2692</span>        removeCompactedfiles(copyCompactedfiles);<a name="line.2692"></a>
+<span class="sourceLineNo">2693</span>      }<a name="line.2693"></a>
+<span class="sourceLineNo">2694</span>    } finally {<a name="line.2694"></a>
+<span class="sourceLineNo">2695</span>      archiveLock.unlock();<a name="line.2695"></a>
+<span class="sourceLineNo">2696</span>    }<a name="line.2696"></a>
+<span class="sourceLineNo">2697</span>  }<a name="line.2697"></a>
+<span class="sourceLineNo">2698</span><a name="line.2698"></a>
+<span class="sourceLineNo">2699</span>  /**<a name="line.2699"></a>
+<span class="sourceLineNo">2700</span>   * Archives and removes the compacted files<a name="line.2700"></a>
+<span class="sourceLineNo">2701</span>   * @param compactedfiles The compacted files in this store that are not active in reads<a name="line.2701"></a>
+<span class="sourceLineNo">2702</span>   */<a name="line.2702"></a>
+<span class="sourceLineNo">2703</span>  private void removeCompactedfiles(Collection&lt;HStoreFile&gt; compactedfiles)<a name="line.2703"></a>
+<span class="sourceLineNo">2704</span>      throws IOException {<a name="line.2704"></a>
+<span class="sourceLineNo">2705</span>    final List&lt;HStoreFile&gt; filesToRemove = new ArrayList&lt;&gt;(compactedfiles.size());<a name="line.2705"></a>
+<span class="sourceLineNo">2706</span>    final List&lt;Long&gt; storeFileSizes = new ArrayList&lt;&gt;(compactedfiles.size());<a name="line.2706"></a>
+<span class="sourceLineNo">2707</span>    for (final HStoreFile file : compactedfiles) {<a name="line.2707"></a>
+<span class="sourceLineNo">2708</span>      synchronized (file) {<a name="line.2708"></a>
+<span class="sourceLineNo">2709</span>        try {<a name="line.2709"></a>
+<span class="sourceLineNo">2710</span>          StoreFileReader r = file.getReader();<a name="line.2710"></a>
+<span class="sourceLineNo">2711</span>          if (r == null) {<a name="line.2711"></a>
+<span class="sourceLineNo">2712</span>            LOG.debug("The file {} was closed but still not archived", file);<a name="line.2712"></a>
+<span class="sourceLineNo">2713</span>            // HACK: Temporarily re-open the reader so we can get the size of the file. Ideally,<a name="line.2713"></a>
+<span class="sourceLineNo">2714</span>            // we should know the size of an HStoreFile without having to ask the HStoreFileReader<a name="line.2714"></a>
+<span class="sourceLineNo">2715</span>            // for that.<a name="line.2715"></a>
+<span class="sourceLineNo">2716</span>            long length = getStoreFileSize(file);<a name="line.2716"></a>
+<span class="sourceLineNo">2717</span>            filesToRemove.add(file);<a name="line.2717"></a>
+<span class="sourceLineNo">2718</span>            storeFileSizes.add(length);<a name="line.2718"></a>
+<span class="sourceLineNo">2719</span>            continue;<a name="line.2719"></a>
+<span class="sourceLineNo">2720</span>          }<a name="line.2720"></a>
+<span class="sourceLineNo">2721</span><a name="line.2721"></a>
+<span class="sourceLineNo">2722</span>          if (file.isCompactedAway() &amp;&amp; !file.isReferencedInReads()) {<a name="line.2722"></a>
+<span class="sourceLineNo">2723</span>            // Even if deleting fails we need not bother as any new scanners won't be<a name="line.2723"></a>
+<span class="sourceLineNo">2724</span>            // able to use the compacted file as the status is already compactedAway<a name="line.2724"></a>
+<span class="sourceLineNo">2725</span>            LOG.trace("Closing and archiving the file {}", file);<a name="line.2725"></a>
+<span class="sourceLineNo">2726</span>            // Copy the file size before closing the reader<a name="line.2726"></a>
+<span class="sourceLineNo">2727</span>            final long length = r.length();<a name="line.2727"></a>
+<span class="sourceLineNo">2728</span>            r.close(true);<a name="line.2728"></a>
+<span class="sourceLineNo">2729</span>            // Just close and return<a name="line.2729"></a>
+<span class="sourceLineNo">2730</span>            filesToRemove.add(file);<a name="line.2730"></a>
+<span class="sourceLineNo">2731</span>            // Only add the length if we successfully added the file to `filesToRemove`<a name="line.2731"></a>
+<span class="sourceLineNo">2732</span>            storeFileSizes.add(length);<a name="line.2732"></a>
+<span class="sourceLineNo">2733</span>          } else {<a name="line.2733"></a>
+<span class="sourceLineNo">2734</span>            LOG.info("Can't archive compacted file " + file.getPath()<a name="line.2734"></a>
+<span class="sourceLineNo">2735</span>                + " because of either isCompactedAway=" + file.isCompactedAway()<a name="line.2735"></a>
+<span class="sourceLineNo">2736</span>                + " or file has reference, isReferencedInReads=" + file.isReferencedInReads()<a name="line.2736"></a>
+<span class="sourceLineNo">2737</span>                + ", refCount=" + r.getRefCount() + ", skipping for now.");<a name="line.2737"></a>
+<span class="sourceLineNo">2738</span>          }<a name="line.2738"></a>
+<span class="sourceLineNo">2739</span>        } catch (Exception e) {<a name="line.2739"></a>
+<span class="sourceLineNo">2740</span>          LOG.error("Exception while trying to close the compacted store file {}", file.getPath(),<a name="line.2740"></a>
+<span class="sourceLineNo">2741</span>              e);<a name="line.2741"></a>
+<span class="sourceLineNo">2742</span>        }<a name="line.2742"></a>
+<span class="sourceLineNo">2743</span>      }<a name="line.2743"></a>
+<span class="sourceLineNo">2744</span>    }<a name="line.2744"></a>
+<span class="sourceLineNo">2745</span>    if (this.isPrimaryReplicaStore()) {<a name="line.2745"></a>
+<span class="sourceLineNo">2746</span>      // Only the primary region is allowed to move the file to archive.<a name="line.2746"></a>
+<span class="sourceLineNo">2747</span>      // The secondary region does not move the files to archive. Any active reads from<a name="line.2747"></a>
+<span class="sourceLineNo">2748</span>      // the secondary region will still work because the file as such has active readers on it.<a name="line.2748"></a>
+<span class="sourceLineNo">2749</span>      if (!filesToRemove.isEmpty()) {<a name="line.2749"></a>
+<span class="sourceLineNo">2750</span>        LOG.debug("Moving the files {} to archive", filesToRemove);<a name="line.2750"></a>
+<span class="sourceLineNo">2751</span>        // Only if this is successful it has to be removed<a name="line.2751"></a>
+<span class="sourceLineNo">2752</span>        try {<a name="line.2752"></a>
+<span class="sourceLineNo">2753</span>          this.fs.removeStoreFiles(this.getColumnFamilyDescriptor().getNameAsString(),<a name="line.2753"></a>
+<span class="sourceLineNo">2754</span>            filesToRemove);<a name="line.2754"></a>
+<span class="sourceLineNo">2755</span>        } catch (FailedArchiveException fae) {<a name="line.2755"></a>
+<span class="sourceLineNo">2756</span>          // Even if archiving some files failed, we still need to clear out any of the<a name="line.2756"></a>
+<span class="sourceLineNo">2757</span>          // files which were successfully archived.  Otherwise we will receive a<a name="line.2757"></a>
+<span class="sourceLineNo">2758</span>          // FileNotFoundException when we attempt to re-archive them in the next go around.<a name="line.2758"></a>
+<span class="sourceLineNo">2759</span>          Collection&lt;Path&gt; failedFiles = fae.getFailedFiles();<a name="line.2759"></a>
+<span class="sourceLineNo">2760</span>          Iterator&lt;HStoreFile&gt; iter = filesToRemove.iterator();<a name="line.2760"></a>
+<span class="sourceLineNo">2761</span>          Iterator&lt;Long&gt; sizeIter = storeFileSizes.iterator();<a name="line.2761"></a>
+<span class="sourceLineNo">2762</span>          while (iter.hasNext()) {<a name="line.2762"></a>
+<span class="sourceLineNo">2763</span>            sizeIter.next();<a name="line.2763"></a>
+<span class="sourceLineNo">2764</span>            if (failedFiles.contains(iter.next().getPath())) {<a name="line.2764"></a>
+<span class="sourceLineNo">2765</span>              iter.remove();<a name="line.2765"></a>
+<span class="sourceLineNo">2766</span>              sizeIter.remove();<a name="line.2766"></a>
+<span class="sourceLineNo">2767</span>            }<a name="line.2767"></a>
+<span class="sourceLineNo">2768</span>          }<a name="line.2768"></a>
+<span class="sourceLineNo">2769</span>          if (!filesToRemove.isEmpty()) {<a name="line.2769"></a>
+<span class="sourceLineNo">2770</span>            clearCompactedfiles(filesToRemove);<a name="line.2770"></a>
+<span class="sourceLineNo">2771</span>          }<a name="line.2771"></a>
+<span class="sourceLineNo">2772</span>          throw fae;<a name="line.2772"></a>
+<span class="sourceLineNo">2773</span>        }<a name="line.2773"></a>
+<span class="sourceLineNo">2774</span>      }<a name="line.2774"></a>
+<span class="sourceLineNo">2775</span>    }<a name="line.2775"></a>
+<span class="sourceLineNo">2776</span>    if (!filesToRemove.isEmpty()) {<a name="line.2776"></a>
+<span class="sourceLineNo">2777</span>      // Clear the compactedfiles from the store file manager<a name="line.2777"></a>
+<span class="sourceLineNo">2778</span>      clearCompactedfiles(filesToRemove);<a name="line.2778"></a>
+<span class="sourceLineNo">2779</span>      // Try to send report of this archival to the Master for updating quota usage faster<a name="line.2779"></a>
+<span class="sourceLineNo">2780</span>      reportArchivedFilesForQuota(filesToRemove, storeFileSizes);<a name="line.2780"></a>
+<span class="sourceLineNo">2781</span>    }<a name="line.2781"></a>
+<span class="sourceLineNo">2782</span>  }<a name="line.2782"></a>
+<span class="sourceLineNo">2783</span><a name="line.2783"></a>
+<span class="sourceLineNo">2784</span>  /**<a name="line.2784"></a>
+<span class="sourceLineNo">2785</span>   * Computes the length of a store file without succumbing to any errors along the way. If an<a name="line.2785"></a>
+<span class="sourceLineNo">2786</span>   * error is encountered, the implementation returns {@code 0} instead of the actual size.<a name="line.2786"></a>
+<span class="sourceLineNo">2787</span>   *<a name="line.2787"></a>
+<span class="sourceLineNo">2788</span>   * @param file The file to compute the size of.<a name="line.2788"></a>
+<span class="sourceLineNo">2789</span>   * @return The size in bytes of the provided {@code file}.<a name="line.2789"></a>
+<span class="sourceLineNo">2790</span>   */<a name="line.2790"></a>
+<span class="sourceLineNo">2791</span>  long getStoreFileSize(HStoreFile file) {<a name="line.2791"></a>
+<span class="sourceLineNo">2792</span>    long length = 0;<a name="line.2792"></a>
+<span class="sourceLineNo">2793</span>    try {<a name="line.2793"></a>
+<span class="sourceLineNo">2794</span>      file.initReader();<a name="line.2794"></a>
+<span class="sourceLineNo">2795</span>      length = file.getReader().length();<a name="line.2795"></a>
+<span class="sourceLineNo">2796</span>    } catch (IOException e) {<a name="line.2796"></a>
+<span class="sourceLineNo">2797</span>      LOG.trace("Failed to open reader when trying to compute store file size, ignoring", e);<a name="line.2797"></a>
+<span class="sourceLineNo">2798</span>    } finally {<a name="line.2798"></a>
+<span class="sourceLineNo">2799</span>      try {<a name="line.2799"></a>
+<span class="sourceLineNo">2800</span>        file.closeStoreFile(<a name="line.2800"></a>
+<span class="sourceLineNo">2801</span>            file.getCacheConf() != null ? file.getCacheConf().shouldEvictOnClose() : true);<a name="line.2801"></a>
+<span class="sourceLineNo">2802</span>      } catch (IOException e) {<a name="line.2802"></a>
+<span class="sourceLineNo">2803</span>        LOG.trace("Failed to close reader after computing store file size, ignoring", e);<a name="line.2803"></a>
+<span class="sourceLineNo">2804</span>      }<a name="line.2804"></a>
+<span class="sourceLineNo">2805</span>    }<a name="line.2805"></a>
+<span class="sourceLineNo">2806</span>    return length;<a name="line.2806"></a>
+<span class="sourceLineNo">2807</span>  }<a name="line.2807"></a>
+<span class="sourceLineNo">2808</span><a name="line.2808"></a>
+<span class="sourceLineNo">2809</span>  public Long preFlushSeqIDEstimation() {<a name="line.2809"></a>
+<span class="sourceLineNo">2810</span>    return memstore.preFlushSeqIDEstimation();<a name="line.2810"></a>
+<span class="sourceLineNo">2811</span>  }<a name="line.2811"></a>
+<span class="sourceLineNo">2812</span><a name="line.2812"></a>
+<span class="sourceLineNo">2813</span>  @Override<a name="line.2813"></a>
+<span class="sourceLineNo">2814</span>  public boolean isSloppyMemStore() {<a name="line.2814"></a>
+<span class="sourceLineNo">2815</span>    return this.memstore.isSloppy();<a name="line.2815"></a>
 <span class="sourceLineNo">2816</span>  }<a name="line.2816"></a>
 <span class="sourceLineNo">2817</span><a name="line.2817"></a>
-<span class="sourceLineNo">2818</span>  @Override<a name="line.2818"></a>
-<span class="sourceLineNo">2819</span>  public boolean isSloppyMemStore() {<a name="line.2819"></a>
-<span class="sourceLineNo">2820</span>    return this.memstore.isSloppy();<a name="line.2820"></a>
-<span class="sourceLineNo">2821</span>  }<a name="line.2821"></a>
-<span class="sourceLineNo">2822</span><a name="line.2822"></a>
-<span class="sourceLineNo">2823</span>  private void clearCompactedfiles(List&lt;HStoreFile&gt; filesToRemove) throws IOException {<a name="line.2823"></a>
-<span class="sourceLineNo">2824</span>    LOG.trace("Clearing the compacted file {} from this store", filesToRemove);<a name="line.2824"></a>
-<span class="sourceLineNo">2825</span>    try {<a name="line.2825"></a>
-<span class="sourceLineNo">2826</span>      lock.writeLock().lock();<a name="line.2826"></a>
-<span class="sourceLineNo">2827</span>      this.getStoreEngine().getStoreFileManager().removeCompactedFiles(filesToRemove);<a name="line.2827"></a>
-<span class="sourceLineNo">2828</span>    } finally {<a name="line.2828"></a>
-<span class="sourceLineNo">2829</span>      lock.writeLock().unlock();<a name="line.2829"></a>
-<span class="sourceLineNo">2830</span>    }<a name="line.2830"></a>
-<span class="sourceLineNo">2831</span>  }<a name="line.2831"></a>
-<span class="sourceLineNo">2832</span><a name="line.2832"></a>
-<span class="sourceLineNo">2833</span>  void reportArchivedFilesForQuota(List&lt;? extends StoreFile&gt; archivedFiles, List&lt;Long&gt; fileSizes) {<a name="line.2833"></a>
-<span class="sourceLineNo">2834</span>    // Sanity check from the caller<a name="line.2834"></a>
-<span class="sourceLineNo">2835</span>    if (archivedFiles.size() != fileSizes.size()) {<a name="line.2835"></a>
-<span class="sourceLineNo">2836</span>      throw new RuntimeException("Coding error: should never see lists of varying size");<a name="line.2836"></a>
-<span class="sourceLineNo">2837</span>    }<a name="line.2837"></a>
-<span class="sourceLineNo">2838</span>    RegionServerServices rss = this.region.getRegionServerServices();<a name="line.2838"></a>
-<span class="sourceLineNo">2839</span>    if (rss == null) {<a name="line.2839"></a>
-<span class="sourceLineNo">2840</span>      return;<a name="line.2840"></a>
-<span class="sourceLineNo">2841</span>    }<a name="line.2841"></a>
-<span class="sourceLineNo">2842</span>    List&lt;Entry&lt;String,Long&gt;&gt; filesWithSizes = new ArrayList&lt;&gt;(archivedFiles.size());<a name="line.2842"></a>
-<span class="sourceLineNo">2843</span>    Iterator&lt;Long&gt; fileSizeIter = fileSizes.iterator();<a name="line.2843"></a>
-<span class="sourceLineNo">2844</span>    for (StoreFile storeFile : archivedFiles) {<a name="line.2844"></a>
-<span class="sourceLineNo">2845</span>      final long fileSize = fileSizeIter.next();<a name="line.2845"></a>
-<span class="sourceLineNo">2846</span>      if (storeFile.isHFile() &amp;&amp; fileSize != 0) {<a name="line.2846"></a>
-<span class="sourceLineNo">2847</span>        filesWithSizes.add(Maps.immutableEntry(storeFile.getPath().getName(), fileSize));<a name="line.2847"></a>
-<span class="sourceLineNo">2848</span>      }<a name="line.2848"></a>
-<span class="sourceLineNo">2849</span>    }<a name="line.2849"></a>
-<span class="sourceLineNo">2850</span>    if (LOG.isTraceEnabled()) {<a name="line.2850"></a>
-<span class="sourceLineNo">2851</span>      LOG.trace("Files archived: " + archivedFiles + ", reporting the following to the Master: "<a name="line.2851"></a>
-<span class="sourceLineNo">2852</span>          + filesWithSizes);<a name="line.2852"></a>
-<span class="sourceLineNo">2853</span>    }<a name="line.2853"></a>
-<span class="sourceLineNo">2854</span>    boolean success = rss.reportFileArchivalForQuotas(getTableName(), filesWithSizes);<a name="line.2854"></a>
-<span class="sourceLineNo">2855</span>    if (!success) {<a name="line.2855"></a>
-<span class="sourceLineNo">2856</span>      LOG.warn("Failed to report archival of files: " + filesWithSizes);<a name="line.2856"></a>
-<span class="sourceLineNo">2857</span>    }<a name="line.2857"></a>
+<span class="sourceLineNo">2818</span>  private void clearCompactedfiles(List&lt;HStoreFile&gt; filesToRemove) throws IOException {<a name="line.2818"></a>
+<span class="sourceLineNo">2819</span>    LOG.trace("Clearing the compacted file {} from this store", filesToRemove);<a name="line.2819"></a>
+<span class="sourceLineNo">2820</span>    try {<a name="line.2820"></a>
+<span class="sourceLineNo">2821</span>      lock.writeLock().lock();<a name="line.2821"></a>
+<span class="sourceLineNo">2822</span>      this.getStoreEngine().getStoreFileManager().removeCompactedFiles(filesToRemove);<a name="line.2822"></a>
+<span class="sourceLineNo">2823</span>    } finally {<a name="line.2823"></a>
+<span class="sourceLineNo">2824</span>      lock.writeLock().unlock();<a name="line.2824"></a>
+<span class="sourceLineNo">2825</span>    }<a name="line.2825"></a>
+<span class="sourceLineNo">2826</span>  }<a name="line.2826"></a>
+<span class="sourceLineNo">2827</span><a name="line.2827"></a>
+<span class="sourceLineNo">2828</span>  void reportArchivedFilesForQuota(List&lt;? extends StoreFile&gt; archivedFiles, List&lt;Long&gt; fileSizes) {<a name="line.2828"></a>
+<span class="sourceLineNo">2829</span>    // Sanity check from the caller<a name="line.2829"></a>
+<span class="sourceLineNo">2830</span>    if (archivedFiles.size() != fileSizes.size()) {<a name="line.2830"></a>
+<span class="sourceLineNo">2831</span>      throw new RuntimeException("Coding error: should never see lists of varying size");<a name="line.2831"></a>
+<span class="sourceLineNo">2832</span>    }<a name="line.2832"></a>
+<span class="sourceLineNo">2833</span>    RegionServerServices rss = this.region.getRegionServerServices();<a name="line.2833"></a>
+<span class="sourceLineNo">2834</span>    if (rss == null) {<a name="line.2834"></a>
+<span class="sourceLineNo">2835</span>      return;<a name="line.2835"></a>
+<span class="sourceLineNo">2836</span>    }<a name="line.2836"></a>
+<span class="sourceLineNo">2837</span>    List&lt;Entry&lt;String,Long&gt;&gt; filesWithSizes = new ArrayList&lt;&gt;(archivedFiles.size());<a name="line.2837"></a>
+<span class="sourceLineNo">2838</span>    Iterator&lt;Long&gt; fileSizeIter = fileSizes.iterator();<a name="line.2838"></a>
+<span class="sourceLineNo">2839</span>    for (StoreFile storeFile : archivedFiles) {<a name="line.2839"></a>
+<span class="sourceLineNo">2840</span>      final long fileSize = fileSizeIter.next();<a name="line.2840"></a>
+<span class="sourceLineNo">2841</span>      if (storeFile.isHFile() &amp;&amp; fileSize != 0) {<a name="line.2841"></a>
+<span class="sourceLineNo">2842</span>        filesWithSizes.add(Maps.immutableEntry(storeFile.getPath().getName(), fileSize));<a name="line.2842"></a>
+<span class="sourceLineNo">2843</span>      }<a name="line.2843"></a>
+<span class="sourceLineNo">2844</span>    }<a name="line.2844"></a>
+<span class="sourceLineNo">2845</span>    if (LOG.isTraceEnabled()) {<a name="line.2845"></a>
+<span class="sourceLineNo">2846</span>      LOG.trace("Files archived: " + archivedFiles + ", reporting the following to the Master: "<a name="line.2846"></a>
+<span class="sourceLineNo">2847</span>          + filesWithSizes);<a name="line.2847"></a>
+<span class="sourceLineNo">2848</span>    }<a name="line.2848"></a>
+<span class="sourceLineNo">2849</span>    boolean success = rss.reportFileArchivalForQuotas(getTableName(), filesWithSizes);<a name="line.2849"></a>
+<span class="sourceLineNo">2850</span>    if (!success) {<a name="line.2850"></a>
+<span class="sourceLineNo">2851</span>      LOG.warn("Failed to report archival of files: " + filesWithSizes);<a name="line.2851"></a>
+<span class="sourceLineNo">2852</span>    }<a name="line.2852"></a>
+<span class="sourceLineNo">2853</span>  }<a name="line.2853"></a>
+<span class="sourceLineNo">2854</span><a name="line.2854"></a>
+<span class="sourceLineNo">2855</span>  @Override<a name="line.2855"></a>
+<span class="sourceLineNo">2856</span>  public int getCurrentParallelPutCount() {<a name="line.2856"></a>
+<span class="sourceLineNo">2857</span>    return currentParallelPutCount.get();<a name="line.2857"></a>
 <span class="sourceLineNo">2858</span>  }<a name="line.2858"></a>
 <span class="sourceLineNo">2859</span><a name="line.2859"></a>
-<span class="sourceLineNo">2860</span>  @Override<a name="line.2860"></a>
-<span class="sourceLineNo">2861</span>  public int getCurrentParallelPutCount() {<a name="line.2861"></a>
-<span class="sourceLineNo">2862</span>    return currentParallelPutCount.get();<a name="line.2862"></a>
-<span class="sourceLineNo">2863</span>  }<a name="line.2863"></a>
-<span class="sourceLineNo">2864</span><a name="line.2864"></a>
-<span class="sourceLineNo">2865</span>  public int getStoreRefCount() {<a name="line.2865"></a>
-<span class="sourceLineNo">2866</span>    return this.storeEngine.getStoreFileManager().getStorefiles().stream()<a name="line.2866"></a>
-<span class="sourceLineNo">2867</span>      .filter(sf -&gt; sf.getReader() != null).filter(HStoreFile::isHFile)<a name="line.2867"></a>
-<span class="sourceLineNo">2868</span>      .mapToInt(HStoreFile::getRefCount).sum();<a name="line.2868"></a>
-<span class="sourceLineNo">2869</span>  }<a name="line.2869"></a>
-<span class="sourceLineNo">2870</span><a name="line.2870"></a>
-<span class="sourceLineNo">2871</span>  /**<a name="line.2871"></a>
-<span class="sourceLineNo">2872</span>   * @return get maximum ref count of storeFile among all compacted HStore Files<a name="line.2872"></a>
-<span class="sourceLineNo">2873</span>   *   for the HStore<a name="line.2873"></a>
-<span class="sourceLineNo">2874</span>   */<a name="line.2874"></a>
-<span class="sourceLineNo">2875</span>  public int getMaxCompactedStoreFileRefCount() {<a name="line.2875"></a>
-<span class="sourceLineNo">2876</span>    OptionalInt maxCompactedStoreFileRefCount = this.storeEngine.getStoreFileManager()<a name="line.2876"></a>
-<span class="sourceLineNo">2877</span>      .getCompactedfiles()<a name="line.2877"></a>
-<span class="sourceLineNo">2878</span>      .stream()<a name="line.2878"></a>
-<span class="sourceLineNo">2879</span>      .filter(sf -&gt; sf.getReader() != null)<a name="line.2879"></a>
-<span class="sourceLineNo">2880</span>      .filter(HStoreFile::isHFile)<a name="line.2880"></a>
-<span class="sourceLineNo">2881</span>      .mapToInt(HStoreFile::getRefCount)<a name="line.2881"></a>
-<span class="sourceLineNo">2882</span>      .max();<a name="line.2882"></a>
-<span class="sourceLineNo">2883</span>    return maxCompactedStoreFileRefCount.isPresent()<a name="line.2883"></a>
-<span class="sourceLineNo">2884</span>      ? maxCompactedStoreFileRefCount.getAsInt() : 0;<a name="line.2884"></a>
-<span class="sourceLineNo">2885</span>  }<a name="line.2885"></a>
-<span class="sourceLineNo">2886</span><a name="line.2886"></a>
-<span class="sourceLineNo">2887</span>}<a name="line.2887"></a>
+<span class="sourceLineNo">2860</span>  public int getStoreRefCount() {<a name="line.2860"></a>
+<span class="sourceLineNo">2861</span>    return this.storeEngine.getStoreFileManager().getStorefiles().stream()<a name="line.2861"></a>
+<span class="sourceLineNo">2862</span>      .filter(sf -&gt; sf.getReader() != null).filter(HStoreFile::isHFile)<a name="line.2862"></a>
+<span class="sourceLineNo">2863</span>      .mapToInt(HStoreFile::getRefCount).sum();<a name="line.2863"></a>
+<span class="sourceLineNo">2864</span>  }<a name="line.2864"></a>
+<span class="sourceLineNo">2865</span><a name="line.2865"></a>
+<span class="sourceLineNo">2866</span>  /**<a name="line.2866"></a>
+<span class="sourceLineNo">2867</span>   * @return get maximum ref count of storeFile among all compacted HStore Files<a name="line.2867"></a>
+<span class="sourceLineNo">2868</span>   *   for the HStore<a name="line.2868"></a>
+<span class="sourceLineNo">2869</span>   */<a name="line.2869"></a>
+<span class="sourceLineNo">2870</span>  public int getMaxCompactedStoreFileRefCount() {<a name="line.2870"></a>
+<span class="sourceLineNo">2871</span>    OptionalInt maxCompactedStoreFileRefCount = this.storeEngine.getStoreFileManager()<a name="line.2871"></a>
+<span class="sourceLineNo">2872</span>      .getCompactedfiles()<a name="line.2872"></a>
+<span class="sourceLineNo">2873</span>      .stream()<a name="line.2873"></a>
+<span class="sourceLineNo">2874</span>      .filter(sf -&gt; sf.getReader() != null)<a name="line.2874"></a>
+<span class="sourceLineNo">2875</span>      .filter(HStoreFile::isHFile)<a name="line.2875"></a>
+<span class="sourceLineNo">2876</span>      .mapToInt(HStoreFile::getRefCount)<a name="line.2876"></a>
+<span class="sourceLineNo">2877</span>      .max();<a name="line.2877"></a>
+<span class="sourceLineNo">2878</span>    return maxCompactedStoreFileRefCount.isPresent()<a name="line.2878"></a>
+<span class="sourceLineNo">2879</span>      ? maxCompactedStoreFileRefCount.getAsInt() : 0;<a name="line.2879"></a>
+<span class="sourceLineNo">2880</span>  }<a name="line.2880"></a>
+<span class="sourceLineNo">2881</span><a name="line.2881"></a>
+<span class="sourceLineNo">2882</span>}<a name="line.2882"></a>
 
 
 
diff --git a/downloads.html b/downloads.html
index 4fe318e..835498a 100644
--- a/downloads.html
+++ b/downloads.html
@@ -191,29 +191,29 @@
 <tr class="b">
       
 <td style="test-align: left">
-        2.2.4
+        2.2.5
       </td>
       
 <td style="test-align: left">
-        2020/03/11
+        2020/05/21
       </td>
       
 <td style="test-align: left">
-        <a class="externalLink" href="https://downloads.apache.org/hbase/2.2.4/api_compare_2.2.4RC0_to_2.2.3.html">2.2.4 vs 2.2.3</a>
+        <a class="externalLink" href="https://downloads.apache.org/hbase/2.2.5/api_compare_2.2.5RC0_to_2.2.4.html">2.2.5 vs 2.2.4</a>
       </td>
       
 <td style="test-align: left">
-        <a class="externalLink" href="https://apache.org/dist/hbase/2.2.4/CHANGES.md">Changes</a>
+        <a class="externalLink" href="https://apache.org/dist/hbase/2.2.5/CHANGES.md">Changes</a>
       </td>
       
 <td style="test-align: left">
-        <a class="externalLink" href="https://apache.org/dist/hbase/2.2.4/RELEASENOTES.md">Release Notes</a>
+        <a class="externalLink" href="https://apache.org/dist/hbase/2.2.5/RELEASENOTES.md">Release Notes</a>
       </td>
       
 <td style="test-align: left">
-        <a class="externalLink" href="https://www.apache.org/dyn/closer.lua/hbase/2.2.4/hbase-2.2.4-src.tar.gz">src</a> (<a class="externalLink" href="https://apache.org/dist/hbase/2.2.4/hbase-2.2.4-src.tar.gz.sha512">sha512</a> <a class="externalLink" href="https://apache.org/dist/hbase/2.2.4/hbase-2.2.4-src.tar.gz.asc">asc</a>) <br />
-        <a class="externalLink" href="https://www.apache.org/dyn/closer.lua/hbase/2.2.4/hbase-2.2.4-bin.tar.gz">bin</a> (<a class="externalLink" href="https://apache.org/dist/hbase/2.2.4/hbase-2.2.4-bin.tar.gz.sha512">sha512</a> <a class="externalLink" href="https://apache.org/dist/hbase/2.2.4/hbase-2.2.4-bin.tar.gz.asc">asc</a>) <br />
-        <a class="externalLink" href="https://www.apache.org/dyn/closer.lua/hbase/2.2.4/hbase-2.2.4-client-bin.tar.gz">client-bin</a> (<a class="externalLink" href="https://apache.org/dist/hbase/2.2.4/hbase-2.2.4-client-bin.tar.gz.sha512">sha512</a> <a class="externalLink" href="https://apache.org/dist/hbase/2.2.4/hbase-2.2.4-client-bin.tar.gz.asc">asc</a>)
+        <a class="externalLink" href="https://www.apache.org/dyn/closer.lua/hbase/2.2.5/hbase-2.2.5-src.tar.gz">src</a> (<a class="externalLink" href="https://apache.org/dist/hbase/2.2.5/hbase-2.2.5-src.tar.gz.sha512">sha512</a> <a class="externalLink" href="https://apache.org/dist/hbase/2.2.5/hbase-2.2.5-src.tar.gz.asc">asc</a>) <br />
+        <a class="externalLink" href="https://www.apache.org/dyn/closer.lua/hbase/2.2.5/hbase-2.2.5-bin.tar.gz">bin</a> (<a class="externalLink" href="https://apache.org/dist/hbase/2.2.5/hbase-2.2.5-bin.tar.gz.sha512">sha512</a> <a class="externalLink" href="https://apache.org/dist/hbase/2.2.5/hbase-2.2.5-bin.tar.gz.asc">asc</a>) <br />
+        <a class="externalLink" href="https://www.apache.org/dyn/closer.lua/hbase/2.2.5/hbase-2.2.5-client-bin.tar.gz">client-bin</a> (<a class="externalLink" href="https://apache.org/dist/hbase/2.2.5/hbase-2.2.5-client-bin.tar.gz.sha512">sha512</a> <a class="externalLink" href="https://apache.org/dist/hbase/2.2.5/hbase-2.2.5-client-bin.tar.gz.asc">asc</a>)
       </td>
       
 <td><i>stable release</i></td>
@@ -434,7 +434,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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 c57bf3e..46057e4 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 74e0fe0..62e1259 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 79974e8..e5647f0 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 0614217..24b6d23 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 201f075..09008d0 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 83de7fd..023aeaa 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 6e76e50..3cb3261 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 7950cfe..c5c183f 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 8c00fe7..c8e85e8 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 96dcb74..26c9c6b 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 0f8c5e2..5be557e 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 fe460ba..0400a47 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 d0500af..fd19bb2 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 22ddee8..0bdf86b 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 1501c4b..17cf692 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 4e54566..e60baf2 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 ce80cd3..e551252 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 65a5434..e7ec351 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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 3aa44c5..a795c09 100644
--- a/team-list.html
+++ b/team-list.html
@@ -701,7 +701,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-05-25</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-05-26</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 c8916ed..87bd09d 100644
--- a/testdevapidocs/index-all.html
+++ b/testdevapidocs/index-all.html
@@ -71987,6 +71987,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/TestAdmin1.html#testSplitFlushCompactUnknownTable--">testSplitFlushCompactUnknownTable()</a></span> - Method in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestAdmin1.html" title="class in org.apache.hadoop.hbase.client">TestAdmin1</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testSplitIfTooFewRegions--">testSplitIfTooFewRegions()</a></span> - Method in class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html" title="class in org.apache.hadoop.hbase.master.normalizer">TestSimpleRegionNormalizer</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/wal/TestWALSplit.html#testSplitLeavesCompactionEventsEdits--">testSplitLeavesCompactionEventsEdits()</a></span> - Method in class org.apache.hadoop.hbase.wal.<a href="org/apache/hadoop/hbase/wal/TestWALSplit.html" title="class in org.apache.hadoop.hbase.wal">TestWALSplit</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/replication/TestSyncReplicationMoreLogsInLocalCopyToRemote.html#testSplitLog--">testSplitLog()</a></span> - Method in class org.apache.hadoop.hbase.replication.<a href="org/apache/hadoop/hbase/replication/TestSyncReplicationMoreLogsInLocalCopyToRemote.html" title="class in org.apache.hadoop.hbase.replication">TestSyncReplicationMoreLogsInLocalCopyToRemote</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/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/master/normalizer/TestSimpleRegionNormalizer.html b/testdevapidocs/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html
index c3ddb67..34d3fe6 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.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,"i17":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,"i18":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/master/normalizer/TestSimpleRegionNormalizer.html#line.62">TestSimpleRegionNormalizer</a>
+<pre>public class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.66">TestSimpleRegionNormalizer</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">Tests logic of <code>SimpleRegionNormalizer</code>.</div>
 </li>
@@ -245,14 +245,18 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 </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/master/normalizer/TestSimpleRegionNormalizer.html#testSplitOfLargeRegion--">testSplitOfLargeRegion</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testSplitIfTooFewRegions--">testSplitIfTooFewRegions</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/master/normalizer/TestSimpleRegionNormalizer.html#testSplitWithTargetRegionCount--">testSplitWithTargetRegionCount</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testSplitOfLargeRegion--">testSplitOfLargeRegion</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/master/normalizer/TestSimpleRegionNormalizer.html#testSplitWithTargetRegionCount--">testSplitWithTargetRegionCount</a></span>()</code>&nbsp;</td>
+</tr>
+<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/master/normalizer/TestSimpleRegionNormalizer.html#testSplitWithTargetRegionSize--">testSplitWithTargetRegionSize</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
@@ -283,7 +287,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/master/normalizer/TestSimpleRegionNormalizer.html#line.65">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/master/normalizer/TestSimpleRegionNormalizer.html#line.69">CLASS_RULE</a></pre>
 </li>
 </ul>
 <a name="LOG">
@@ -292,7 +296,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/master/normalizer/TestSimpleRegionNormalizer.html#line.68">LOG</a></pre>
+<pre>private static final&nbsp;org.slf4j.Logger <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.72">LOG</a></pre>
 </li>
 </ul>
 <a name="normalizer">
@@ -301,7 +305,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>normalizer</h4>
-<pre>private&nbsp;org.apache.hadoop.hbase.master.normalizer.RegionNormalizer <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.70">normalizer</a></pre>
+<pre>private&nbsp;org.apache.hadoop.hbase.master.normalizer.RegionNormalizer <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.74">normalizer</a></pre>
 </li>
 </ul>
 <a name="masterServices">
@@ -310,7 +314,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>masterServices</h4>
-<pre>private&nbsp;org.apache.hadoop.hbase.master.MasterServices <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.71">masterServices</a></pre>
+<pre>private&nbsp;org.apache.hadoop.hbase.master.MasterServices <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.75">masterServices</a></pre>
 </li>
 </ul>
 <a name="name">
@@ -319,7 +323,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>name</h4>
-<pre>public&nbsp;org.junit.rules.TestName <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.74">name</a></pre>
+<pre>public&nbsp;org.junit.rules.TestName <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.78">name</a></pre>
 </li>
 </ul>
 </li>
@@ -336,7 +340,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TestSimpleRegionNormalizer</h4>
-<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.62">TestSimpleRegionNormalizer</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.66">TestSimpleRegionNormalizer</a>()</pre>
 </li>
 </ul>
 </li>
@@ -353,7 +357,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testPlanComparator</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.77">testPlanComparator</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.81">testPlanComparator</a>()</pre>
 </li>
 </ul>
 <a name="testNoNormalizationForMetaTable--">
@@ -362,7 +366,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testNoNormalizationForMetaTable</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.93">testNoNormalizationForMetaTable</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.97">testNoNormalizationForMetaTable</a>()
                                      throws org.apache.hadoop.hbase.HBaseIOException</pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -376,7 +380,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testNoNormalizationIfTooFewRegions</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.104">testNoNormalizationIfTooFewRegions</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.108">testNoNormalizationIfTooFewRegions</a>()
                                         throws org.apache.hadoop.hbase.HBaseIOException</pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -390,7 +394,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testNoNormalizationOnNormalizedCluster</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.128">testNoNormalizationOnNormalizedCluster</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.132">testNoNormalizationOnNormalizedCluster</a>()
                                             throws org.apache.hadoop.hbase.HBaseIOException</pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -404,7 +408,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>noNormalizationOnTransitioningRegions</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.165">noNormalizationOnTransitioningRegions</a>(org.apache.hadoop.hbase.master.RegionState.State&nbsp;state)
+<pre>private&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.169">noNormalizationOnTransitioningRegions</a>(org.apache.hadoop.hbase.master.RegionState.State&nbsp;state)
                                             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>
@@ -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>testNoNormalizationOnMergingNewRegions</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.195">testNoNormalizationOnMergingNewRegions</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.199">testNoNormalizationOnMergingNewRegions</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>
@@ -432,7 +436,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testNoNormalizationOnMergingRegions</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.200">testNoNormalizationOnMergingRegions</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.204">testNoNormalizationOnMergingRegions</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>
@@ -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>testNoNormalizationOnMergedRegions</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.205">testNoNormalizationOnMergedRegions</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.209">testNoNormalizationOnMergedRegions</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>
@@ -460,7 +464,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testNoNormalizationOnSplittingNewRegions</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.210">testNoNormalizationOnSplittingNewRegions</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.214">testNoNormalizationOnSplittingNewRegions</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>
@@ -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>testNoNormalizationOnSplittingRegions</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.215">testNoNormalizationOnSplittingRegions</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.219">testNoNormalizationOnSplittingRegions</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>
@@ -488,7 +492,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testNoNormalizationOnSplitRegions</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.220">testNoNormalizationOnSplitRegions</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.224">testNoNormalizationOnSplitRegions</a>()
                                        throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -502,7 +506,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testMergeOfSmallRegions</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.225">testMergeOfSmallRegions</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.229">testMergeOfSmallRegions</a>()
                              throws org.apache.hadoop.hbase.HBaseIOException</pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -516,7 +520,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testMergeOfSecondSmallestRegions</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.276">testMergeOfSecondSmallestRegions</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.280">testMergeOfSecondSmallestRegions</a>()
                                       throws org.apache.hadoop.hbase.HBaseIOException</pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -530,7 +534,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testMergeOfSmallNonAdjacentRegions</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.333">testMergeOfSmallNonAdjacentRegions</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.337">testMergeOfSmallNonAdjacentRegions</a>()
                                         throws org.apache.hadoop.hbase.HBaseIOException</pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -544,7 +548,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testSplitOfLargeRegion</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.380">testSplitOfLargeRegion</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.384">testSplitOfLargeRegion</a>()
                             throws org.apache.hadoop.hbase.HBaseIOException</pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -558,7 +562,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testSplitWithTargetRegionCount</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.422">testSplitWithTargetRegionCount</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.426">testSplitWithTargetRegionCount</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>
@@ -572,7 +576,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testSplitWithTargetRegionSize</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.481">testSplitWithTargetRegionSize</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.485">testSplitWithTargetRegionSize</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>
@@ -580,13 +584,27 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 </dl>
 </li>
 </ul>
+<a name="testSplitIfTooFewRegions--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testSplitIfTooFewRegions</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.534">testSplitIfTooFewRegions</a>()
+                              throws org.apache.hadoop.hbase.HBaseIOException</pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code>org.apache.hadoop.hbase.HBaseIOException</code></dd>
+</dl>
+</li>
+</ul>
 <a name="setupMocksForNormalizer-java.util.Map-java.util.List-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>setupMocksForNormalizer</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.530">setupMocksForNormalizer</a>(<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/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt;&nbsp;regionSizes,
+<pre>private&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.573">setupMocksForNormalizer</a>(<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/lang/Integer.html?is-external=true" title="class or interface in java.lang">Integer</a>&gt;&nbsp;regionSizes,
                                      <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.hbase.client.RegionInfo&gt;&nbsp;RegionInfo)</pre>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
index 7245017..62bbbe1 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -670,18 +670,18 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&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/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/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/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.Service.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.Service</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.RoleCommand</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ScanPerformanceEvaluation.ScanCounter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ScanPerformanceEvaluation.ScanCounter</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ResourceChecker.Phase.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ResourceChecker.Phase</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.ACTION.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">IntegrationTestDDLMasterFailover.ACTION</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleState.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.RoleState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/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/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.RoleCommand</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.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/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/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.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/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.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.CommandProvider.Operation</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.Stat.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">IntegrationTestRegionReplicaPerf.Stat</span></a></li>
 </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 01858e6..11b8fb7 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -241,10 +241,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.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>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestProcedureRecovery.TestStateMachineProcedure.State</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestYieldProcedures.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestYieldProcedures.TestStateMachineProcedure.State</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestStateMachineProcedure.TestSMProcedureState</span></a></li>
 </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 0877c4d..6b00f59 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -719,10 +719,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.<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/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/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/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/TestRegionServerReadRequestMetrics.Metric.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestRegionServerReadRequestMetrics.Metric</span></a></li>
 </ul>
 </li>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
index c7a3e85..5119ec3 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
@@ -253,10 +253,10 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&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.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestLoadAndVerify.Counters</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Generator.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Generator.Counts</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Verify.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Verify.Counts</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestWithCellVisibilityLoadAndVerify.Counters</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestLoadAndVerify.Counters</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.Verify.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Verify.Counts</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
index a8b0f08..da87dd9 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
@@ -163,9 +163,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&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/IOTestProvider.AllowedOperations.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">IOTestProvider.AllowedOperations</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/FaultyFSLog.FailureType.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">FaultyFSLog.FailureType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">TestWALSplit.Corruptions</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/FaultyFSLog.FailureType.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">FaultyFSLog.FailureType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/IOTestProvider.AllowedOperations.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">IOTestProvider.AllowedOperations</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html
index 190231d..cd6da21 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html
@@ -27,555 +27,598 @@
 <span class="sourceLineNo">019</span><a name="line.19"></a>
 <span class="sourceLineNo">020</span>import static java.lang.String.format;<a name="line.20"></a>
 <span class="sourceLineNo">021</span>import static org.junit.Assert.assertEquals;<a name="line.21"></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.mockito.ArgumentMatchers.any;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import static org.mockito.Mockito.RETURNS_DEEP_STUBS;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import static org.mockito.Mockito.when;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import java.util.ArrayList;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import java.util.Comparator;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import java.util.HashMap;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import java.util.LinkedList;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import java.util.List;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import java.util.Map;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.HBaseIOException;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.RegionMetrics;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.ServerName;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.Size;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.TableName;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.client.RegionInfoBuilder;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.master.MasterRpcServices;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.master.RegionState;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.junit.ClassRule;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.junit.Rule;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.junit.Test;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.junit.experimental.categories.Category;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.junit.rules.TestName;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.mockito.Mockito;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.slf4j.Logger;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.slf4j.LoggerFactory;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsSplitOrMergeEnabledResponse;<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>/**<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * Tests logic of {@link SimpleRegionNormalizer}.<a name="line.59"></a>
-<span class="sourceLineNo">060</span> */<a name="line.60"></a>
-<span class="sourceLineNo">061</span>@Category({MasterTests.class, SmallTests.class})<a name="line.61"></a>
-<span class="sourceLineNo">062</span>public class TestSimpleRegionNormalizer {<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>  @ClassRule<a name="line.64"></a>
-<span class="sourceLineNo">065</span>  public static final HBaseClassTestRule CLASS_RULE =<a name="line.65"></a>
-<span class="sourceLineNo">066</span>      HBaseClassTestRule.forClass(TestSimpleRegionNormalizer.class);<a name="line.66"></a>
+<span class="sourceLineNo">022</span>import static org.junit.Assert.assertNotNull;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import static org.junit.Assert.assertNull;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import static org.junit.Assert.assertTrue;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import static org.mockito.ArgumentMatchers.any;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import static org.mockito.Mockito.RETURNS_DEEP_STUBS;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import static org.mockito.Mockito.when;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import java.util.ArrayList;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import java.util.Comparator;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import java.util.HashMap;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import java.util.LinkedList;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import java.util.List;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import java.util.Map;<a name="line.33"></a>
+<span class="sourceLineNo">034</span><a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.conf.Configuration;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.HBaseIOException;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.RegionMetrics;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.ServerName;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.Size;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.TableName;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.client.RegionInfoBuilder;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.master.MasterRpcServices;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.master.RegionState;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.junit.ClassRule;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.junit.Rule;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.junit.Test;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.junit.experimental.categories.Category;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.junit.rules.TestName;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.mockito.Mockito;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.slf4j.Logger;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.slf4j.LoggerFactory;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.hbase.thirdparty.com.google.protobuf.ServiceException;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsSplitOrMergeEnabledResponse;<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> * Tests logic of {@link SimpleRegionNormalizer}.<a name="line.63"></a>
+<span class="sourceLineNo">064</span> */<a name="line.64"></a>
+<span class="sourceLineNo">065</span>@Category({MasterTests.class, SmallTests.class})<a name="line.65"></a>
+<span class="sourceLineNo">066</span>public class TestSimpleRegionNormalizer {<a name="line.66"></a>
 <span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span>  private static final Logger LOG = LoggerFactory.getLogger(TestSimpleRegionNormalizer.class);<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>  private RegionNormalizer normalizer;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  private MasterServices masterServices;<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span>  @Rule<a name="line.73"></a>
-<span class="sourceLineNo">074</span>  public TestName name = new TestName();<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span>  @Test<a name="line.76"></a>
-<span class="sourceLineNo">077</span>  public void testPlanComparator() {<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    Comparator&lt;NormalizationPlan&gt; comparator = new SimpleRegionNormalizer.PlanComparator();<a name="line.78"></a>
-<span class="sourceLineNo">079</span>    NormalizationPlan splitPlan1 = new SplitNormalizationPlan(null, null);<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    NormalizationPlan splitPlan2 = new SplitNormalizationPlan(null, null);<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    NormalizationPlan mergePlan1 = new MergeNormalizationPlan(null, null);<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    NormalizationPlan mergePlan2 = new MergeNormalizationPlan(null, null);<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span>    assertEquals(0, comparator.compare(splitPlan1, splitPlan2));<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    assertEquals(0, comparator.compare(splitPlan2, splitPlan1));<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    assertEquals(0, comparator.compare(mergePlan1, mergePlan2));<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    assertEquals(0, comparator.compare(mergePlan2, mergePlan1));<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    assertTrue(comparator.compare(splitPlan1, mergePlan1) &lt; 0);<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    assertTrue(comparator.compare(mergePlan1, splitPlan1) &gt; 0);<a name="line.89"></a>
-<span class="sourceLineNo">090</span>  }<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span>  @Test<a name="line.92"></a>
-<span class="sourceLineNo">093</span>  public void testNoNormalizationForMetaTable() throws HBaseIOException {<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    TableName testTable = TableName.META_TABLE_NAME;<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    List&lt;RegionInfo&gt; RegionInfo = new ArrayList&lt;&gt;();<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>    setupMocksForNormalizer(regionSizes, RegionInfo);<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlanForTable(testTable);<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    assertNull(plans);<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>  @Test<a name="line.103"></a>
-<span class="sourceLineNo">104</span>  public void testNoNormalizationIfTooFewRegions() throws HBaseIOException {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    List&lt;RegionInfo&gt; RegionInfo = new ArrayList&lt;&gt;();<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    RegionInfo hri1 = RegionInfoBuilder.newBuilder(tableName)<a name="line.108"></a>
-<span class="sourceLineNo">109</span>        .setStartKey(Bytes.toBytes("aaa"))<a name="line.109"></a>
-<span class="sourceLineNo">110</span>        .setEndKey(Bytes.toBytes("bbb"))<a name="line.110"></a>
-<span class="sourceLineNo">111</span>        .build();<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    RegionInfo.add(hri1);<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    regionSizes.put(hri1.getRegionName(), 10);<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span>    RegionInfo hri2 = RegionInfoBuilder.newBuilder(tableName)<a name="line.115"></a>
-<span class="sourceLineNo">116</span>        .setStartKey(Bytes.toBytes("bbb"))<a name="line.116"></a>
-<span class="sourceLineNo">117</span>        .setEndKey(Bytes.toBytes("ccc"))<a name="line.117"></a>
-<span class="sourceLineNo">118</span>        .build();<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    RegionInfo.add(hri2);<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    regionSizes.put(hri2.getRegionName(), 15);<a name="line.120"></a>
-<span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span>    setupMocksForNormalizer(regionSizes, RegionInfo);<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlanForTable(tableName);<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    assertNull(plans);<a name="line.124"></a>
-<span class="sourceLineNo">125</span>  }<a name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span>  @Test<a name="line.127"></a>
-<span class="sourceLineNo">128</span>  public void testNoNormalizationOnNormalizedCluster() throws HBaseIOException {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    List&lt;RegionInfo&gt; RegionInfo = new ArrayList&lt;&gt;();<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span>    RegionInfo hri1 = RegionInfoBuilder.newBuilder(tableName)<a name="line.133"></a>
-<span class="sourceLineNo">134</span>        .setStartKey(Bytes.toBytes("aaa"))<a name="line.134"></a>
-<span class="sourceLineNo">135</span>        .setEndKey(Bytes.toBytes("bbb"))<a name="line.135"></a>
-<span class="sourceLineNo">136</span>        .build();<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    RegionInfo.add(hri1);<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    regionSizes.put(hri1.getRegionName(), 10);<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span>    RegionInfo hri2 = RegionInfoBuilder.newBuilder(tableName)<a name="line.140"></a>
-<span class="sourceLineNo">141</span>        .setStartKey(Bytes.toBytes("bbb"))<a name="line.141"></a>
-<span class="sourceLineNo">142</span>        .setEndKey(Bytes.toBytes("ccc"))<a name="line.142"></a>
-<span class="sourceLineNo">143</span>        .build();<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    RegionInfo.add(hri2);<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    regionSizes.put(hri2.getRegionName(), 15);<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span>    RegionInfo hri3 = RegionInfoBuilder.newBuilder(tableName)<a name="line.147"></a>
-<span class="sourceLineNo">148</span>        .setStartKey(Bytes.toBytes("ccc"))<a name="line.148"></a>
-<span class="sourceLineNo">149</span>        .setEndKey(Bytes.toBytes("ddd"))<a name="line.149"></a>
-<span class="sourceLineNo">150</span>        .build();<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    RegionInfo.add(hri3);<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    regionSizes.put(hri3.getRegionName(), 8);<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span>    RegionInfo hri4 = RegionInfoBuilder.newBuilder(tableName)<a name="line.154"></a>
-<span class="sourceLineNo">155</span>        .setStartKey(Bytes.toBytes("ddd"))<a name="line.155"></a>
-<span class="sourceLineNo">156</span>        .setEndKey(Bytes.toBytes("eee"))<a name="line.156"></a>
-<span class="sourceLineNo">157</span>        .build();<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    regionSizes.put(hri4.getRegionName(), 10);<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>    setupMocksForNormalizer(regionSizes, RegionInfo);<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlanForTable(tableName);<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    assertNull(plans);<a name="line.162"></a>
-<span class="sourceLineNo">163</span>  }<a name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span>  private void noNormalizationOnTransitioningRegions(final RegionState.State state)<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    throws Exception {<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    final List&lt;RegionInfo&gt; regionInfos = new LinkedList&lt;&gt;();<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    final Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span>    final RegionInfo ri1 = RegionInfoBuilder.newBuilder(tableName)<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      .setStartKey(Bytes.toBytes("aaa"))<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      .setEndKey(Bytes.toBytes("bbb"))<a name="line.173"></a>
-<span class="sourceLineNo">174</span>      .build();<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    regionInfos.add(ri1);<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    regionSizes.put(ri1.getRegionName(), 10);<a name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
-<span class="sourceLineNo">178</span>    final RegionInfo ri2 = RegionInfoBuilder.newBuilder(tableName)<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      .setStartKey(Bytes.toBytes("bbb"))<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      .setEndKey(Bytes.toBytes("ccc"))<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      .build();<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    regionInfos.add(ri2);<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    regionSizes.put(ri2.getRegionName(), 1);<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    when(masterServices.getAssignmentManager().getRegionStates()<a name="line.186"></a>
-<span class="sourceLineNo">187</span>      .getRegionState(any(RegionInfo.class))).thenReturn(<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      RegionState.createForTesting(null, state));<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    assertNull(<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      format("Unexpected plans for RegionState %s", state),<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      normalizer.computePlanForTable(tableName));<a name="line.191"></a>
-<span class="sourceLineNo">192</span>  }<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>  @Test<a name="line.194"></a>
-<span class="sourceLineNo">195</span>  public void testNoNormalizationOnMergingNewRegions() throws Exception {<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    noNormalizationOnTransitioningRegions(RegionState.State.MERGING_NEW);<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>  @Test<a name="line.199"></a>
-<span class="sourceLineNo">200</span>  public void testNoNormalizationOnMergingRegions() throws Exception {<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    noNormalizationOnTransitioningRegions(RegionState.State.MERGING);<a name="line.201"></a>
-<span class="sourceLineNo">202</span>  }<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span>  @Test<a name="line.204"></a>
-<span class="sourceLineNo">205</span>  public void testNoNormalizationOnMergedRegions() throws Exception {<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    noNormalizationOnTransitioningRegions(RegionState.State.MERGED);<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<a name="line.209"></a>
-<span class="sourceLineNo">210</span>  public void testNoNormalizationOnSplittingNewRegions() throws Exception {<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    noNormalizationOnTransitioningRegions(RegionState.State.SPLITTING_NEW);<a name="line.211"></a>
-<span class="sourceLineNo">212</span>  }<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span>  @Test<a name="line.214"></a>
-<span class="sourceLineNo">215</span>  public void testNoNormalizationOnSplittingRegions() throws Exception {<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    noNormalizationOnTransitioningRegions(RegionState.State.SPLITTING);<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>  @Test<a name="line.219"></a>
-<span class="sourceLineNo">220</span>  public void testNoNormalizationOnSplitRegions() throws Exception {<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    noNormalizationOnTransitioningRegions(RegionState.State.SPLIT);<a name="line.221"></a>
-<span class="sourceLineNo">222</span>  }<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 testMergeOfSmallRegions() throws HBaseIOException {<a name="line.225"></a>
-<span class="sourceLineNo">226</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    List&lt;RegionInfo&gt; RegionInfo = new ArrayList&lt;&gt;();<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span>    RegionInfo hri1 = RegionInfoBuilder.newBuilder(tableName)<a name="line.230"></a>
-<span class="sourceLineNo">231</span>        .setStartKey(Bytes.toBytes("aaa"))<a name="line.231"></a>
-<span class="sourceLineNo">232</span>        .setEndKey(Bytes.toBytes("bbb"))<a name="line.232"></a>
-<span class="sourceLineNo">233</span>        .build();<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    RegionInfo.add(hri1);<a name="line.234"></a>
-<span class="sourceLineNo">235</span>    regionSizes.put(hri1.getRegionName(), 15);<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span>    RegionInfo hri2 = RegionInfoBuilder.newBuilder(tableName)<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        .setStartKey(Bytes.toBytes("bbb"))<a name="line.238"></a>
-<span class="sourceLineNo">239</span>        .setEndKey(Bytes.toBytes("ccc"))<a name="line.239"></a>
-<span class="sourceLineNo">240</span>        .build();<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    RegionInfo.add(hri2);<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    regionSizes.put(hri2.getRegionName(), 5);<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span>    RegionInfo hri3 = RegionInfoBuilder.newBuilder(tableName)<a name="line.244"></a>
-<span class="sourceLineNo">245</span>        .setStartKey(Bytes.toBytes("ccc"))<a name="line.245"></a>
-<span class="sourceLineNo">246</span>        .setEndKey(Bytes.toBytes("ddd"))<a name="line.246"></a>
-<span class="sourceLineNo">247</span>        .build();<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    RegionInfo.add(hri3);<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    regionSizes.put(hri3.getRegionName(), 5);<a name="line.249"></a>
-<span class="sourceLineNo">250</span><a name="line.250"></a>
-<span class="sourceLineNo">251</span>    RegionInfo hri4 = RegionInfoBuilder.newBuilder(tableName)<a name="line.251"></a>
-<span class="sourceLineNo">252</span>        .setStartKey(Bytes.toBytes("ddd"))<a name="line.252"></a>
-<span class="sourceLineNo">253</span>        .setEndKey(Bytes.toBytes("eee"))<a name="line.253"></a>
-<span class="sourceLineNo">254</span>        .build();<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    RegionInfo.add(hri4);<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    regionSizes.put(hri4.getRegionName(), 15);<a name="line.256"></a>
-<span class="sourceLineNo">257</span><a name="line.257"></a>
-<span class="sourceLineNo">258</span>    RegionInfo hri5 = RegionInfoBuilder.newBuilder(tableName)<a name="line.258"></a>
-<span class="sourceLineNo">259</span>        .setStartKey(Bytes.toBytes("eee"))<a name="line.259"></a>
-<span class="sourceLineNo">260</span>        .setEndKey(Bytes.toBytes("fff"))<a name="line.260"></a>
-<span class="sourceLineNo">261</span>        .build();<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    RegionInfo.add(hri5);<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    regionSizes.put(hri5.getRegionName(), 16);<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span>    setupMocksForNormalizer(regionSizes, RegionInfo);<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlanForTable(tableName);<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span>    NormalizationPlan plan = plans.get(0);<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    assertTrue(plan instanceof MergeNormalizationPlan);<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    assertEquals(hri2, ((MergeNormalizationPlan) plan).getFirstRegion());<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    assertEquals(hri3, ((MergeNormalizationPlan) plan).getSecondRegion());<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 for situation illustrated in HBASE-14867<a name="line.274"></a>
-<span class="sourceLineNo">275</span>  @Test<a name="line.275"></a>
-<span class="sourceLineNo">276</span>  public void testMergeOfSecondSmallestRegions() throws HBaseIOException {<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    List&lt;RegionInfo&gt; RegionInfo = new ArrayList&lt;&gt;();<a name="line.278"></a>
-<span class="sourceLineNo">279</span>    Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.279"></a>
-<span class="sourceLineNo">280</span><a name="line.280"></a>
-<span class="sourceLineNo">281</span>    RegionInfo hri1 = RegionInfoBuilder.newBuilder(tableName)<a name="line.281"></a>
-<span class="sourceLineNo">282</span>        .setStartKey(Bytes.toBytes("aaa"))<a name="line.282"></a>
-<span class="sourceLineNo">283</span>        .setEndKey(Bytes.toBytes("bbb"))<a name="line.283"></a>
-<span class="sourceLineNo">284</span>        .build();<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    RegionInfo.add(hri1);<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    regionSizes.put(hri1.getRegionName(), 1);<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>    RegionInfo hri2 = RegionInfoBuilder.newBuilder(tableName)<a name="line.288"></a>
-<span class="sourceLineNo">289</span>        .setStartKey(Bytes.toBytes("bbb"))<a name="line.289"></a>
-<span class="sourceLineNo">290</span>        .setEndKey(Bytes.toBytes("ccc"))<a name="line.290"></a>
-<span class="sourceLineNo">291</span>        .build();<a name="line.291"></a>
-<span class="sourceLineNo">292</span>    RegionInfo.add(hri2);<a name="line.292"></a>
-<span class="sourceLineNo">293</span>    regionSizes.put(hri2.getRegionName(), 10000);<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span>    RegionInfo hri3 = RegionInfoBuilder.newBuilder(tableName)<a name="line.295"></a>
-<span class="sourceLineNo">296</span>        .setStartKey(Bytes.toBytes("ccc"))<a name="line.296"></a>
-<span class="sourceLineNo">297</span>        .setEndKey(Bytes.toBytes("ddd"))<a name="line.297"></a>
-<span class="sourceLineNo">298</span>        .build();<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    RegionInfo.add(hri3);<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    regionSizes.put(hri3.getRegionName(), 10000);<a name="line.300"></a>
-<span class="sourceLineNo">301</span><a name="line.301"></a>
-<span class="sourceLineNo">302</span>    RegionInfo hri4 = RegionInfoBuilder.newBuilder(tableName)<a name="line.302"></a>
-<span class="sourceLineNo">303</span>        .setStartKey(Bytes.toBytes("ddd"))<a name="line.303"></a>
-<span class="sourceLineNo">304</span>        .setEndKey(Bytes.toBytes("eee"))<a name="line.304"></a>
-<span class="sourceLineNo">305</span>        .build();<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    RegionInfo.add(hri4);<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    regionSizes.put(hri4.getRegionName(), 10000);<a name="line.307"></a>
-<span class="sourceLineNo">308</span><a name="line.308"></a>
-<span class="sourceLineNo">309</span>    RegionInfo hri5 = RegionInfoBuilder.newBuilder(tableName)<a name="line.309"></a>
-<span class="sourceLineNo">310</span>        .setStartKey(Bytes.toBytes("eee"))<a name="line.310"></a>
-<span class="sourceLineNo">311</span>        .setEndKey(Bytes.toBytes("fff"))<a name="line.311"></a>
-<span class="sourceLineNo">312</span>        .build();<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    RegionInfo.add(hri5);<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    regionSizes.put(hri5.getRegionName(), 2700);<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span>    RegionInfo hri6 = RegionInfoBuilder.newBuilder(tableName)<a name="line.316"></a>
-<span class="sourceLineNo">317</span>        .setStartKey(Bytes.toBytes("fff"))<a name="line.317"></a>
-<span class="sourceLineNo">318</span>        .setEndKey(Bytes.toBytes("ggg"))<a name="line.318"></a>
-<span class="sourceLineNo">319</span>        .build();<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    RegionInfo.add(hri6);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    regionSizes.put(hri6.getRegionName(), 2700);<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span>    setupMocksForNormalizer(regionSizes, RegionInfo);<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlanForTable(tableName);<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    NormalizationPlan plan = plans.get(0);<a name="line.325"></a>
+<span class="sourceLineNo">068</span>  @ClassRule<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  public static final HBaseClassTestRule CLASS_RULE =<a name="line.69"></a>
+<span class="sourceLineNo">070</span>      HBaseClassTestRule.forClass(TestSimpleRegionNormalizer.class);<a name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span>  private static final Logger LOG = LoggerFactory.getLogger(TestSimpleRegionNormalizer.class);<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span>  private RegionNormalizer normalizer;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  private MasterServices masterServices;<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>  @Rule<a name="line.77"></a>
+<span class="sourceLineNo">078</span>  public TestName name = new TestName();<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span>  @Test<a name="line.80"></a>
+<span class="sourceLineNo">081</span>  public void testPlanComparator() {<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    Comparator&lt;NormalizationPlan&gt; comparator = new SimpleRegionNormalizer.PlanComparator();<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    NormalizationPlan splitPlan1 = new SplitNormalizationPlan(null, null);<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    NormalizationPlan splitPlan2 = new SplitNormalizationPlan(null, null);<a name="line.84"></a>
+<span class="sourceLineNo">085</span>    NormalizationPlan mergePlan1 = new MergeNormalizationPlan(null, null);<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    NormalizationPlan mergePlan2 = new MergeNormalizationPlan(null, null);<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span>    assertEquals(0, comparator.compare(splitPlan1, splitPlan2));<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    assertEquals(0, comparator.compare(splitPlan2, splitPlan1));<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    assertEquals(0, comparator.compare(mergePlan1, mergePlan2));<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    assertEquals(0, comparator.compare(mergePlan2, mergePlan1));<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    assertTrue(comparator.compare(splitPlan1, mergePlan1) &lt; 0);<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    assertTrue(comparator.compare(mergePlan1, splitPlan1) &gt; 0);<a name="line.93"></a>
+<span class="sourceLineNo">094</span>  }<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span>  @Test<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  public void testNoNormalizationForMetaTable() throws HBaseIOException {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    TableName testTable = TableName.META_TABLE_NAME;<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    List&lt;RegionInfo&gt; RegionInfo = new ArrayList&lt;&gt;();<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>    setupMocksForNormalizer(regionSizes, RegionInfo);<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlanForTable(testTable);<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    assertNull(plans);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>  }<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 testNoNormalizationIfTooFewRegions() throws HBaseIOException {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    List&lt;RegionInfo&gt; RegionInfo = new ArrayList&lt;&gt;();<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    RegionInfo hri1 = RegionInfoBuilder.newBuilder(tableName)<a name="line.112"></a>
+<span class="sourceLineNo">113</span>        .setStartKey(Bytes.toBytes("aaa"))<a name="line.113"></a>
+<span class="sourceLineNo">114</span>        .setEndKey(Bytes.toBytes("bbb"))<a name="line.114"></a>
+<span class="sourceLineNo">115</span>        .build();<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    RegionInfo.add(hri1);<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    regionSizes.put(hri1.getRegionName(), 10);<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span>    RegionInfo hri2 = RegionInfoBuilder.newBuilder(tableName)<a name="line.119"></a>
+<span class="sourceLineNo">120</span>        .setStartKey(Bytes.toBytes("bbb"))<a name="line.120"></a>
+<span class="sourceLineNo">121</span>        .setEndKey(Bytes.toBytes("ccc"))<a name="line.121"></a>
+<span class="sourceLineNo">122</span>        .build();<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    RegionInfo.add(hri2);<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    regionSizes.put(hri2.getRegionName(), 15);<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span>    setupMocksForNormalizer(regionSizes, RegionInfo);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlanForTable(tableName);<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    assertNull(plans);<a name="line.128"></a>
+<span class="sourceLineNo">129</span>  }<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span>  @Test<a name="line.131"></a>
+<span class="sourceLineNo">132</span>  public void testNoNormalizationOnNormalizedCluster() throws HBaseIOException {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    List&lt;RegionInfo&gt; RegionInfo = new ArrayList&lt;&gt;();<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span>    RegionInfo hri1 = RegionInfoBuilder.newBuilder(tableName)<a name="line.137"></a>
+<span class="sourceLineNo">138</span>        .setStartKey(Bytes.toBytes("aaa"))<a name="line.138"></a>
+<span class="sourceLineNo">139</span>        .setEndKey(Bytes.toBytes("bbb"))<a name="line.139"></a>
+<span class="sourceLineNo">140</span>        .build();<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    RegionInfo.add(hri1);<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    regionSizes.put(hri1.getRegionName(), 10);<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>    RegionInfo hri2 = RegionInfoBuilder.newBuilder(tableName)<a name="line.144"></a>
+<span class="sourceLineNo">145</span>        .setStartKey(Bytes.toBytes("bbb"))<a name="line.145"></a>
+<span class="sourceLineNo">146</span>        .setEndKey(Bytes.toBytes("ccc"))<a name="line.146"></a>
+<span class="sourceLineNo">147</span>        .build();<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    RegionInfo.add(hri2);<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    regionSizes.put(hri2.getRegionName(), 15);<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span>    RegionInfo hri3 = RegionInfoBuilder.newBuilder(tableName)<a name="line.151"></a>
+<span class="sourceLineNo">152</span>        .setStartKey(Bytes.toBytes("ccc"))<a name="line.152"></a>
+<span class="sourceLineNo">153</span>        .setEndKey(Bytes.toBytes("ddd"))<a name="line.153"></a>
+<span class="sourceLineNo">154</span>        .build();<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    RegionInfo.add(hri3);<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    regionSizes.put(hri3.getRegionName(), 8);<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span>    RegionInfo hri4 = RegionInfoBuilder.newBuilder(tableName)<a name="line.158"></a>
+<span class="sourceLineNo">159</span>        .setStartKey(Bytes.toBytes("ddd"))<a name="line.159"></a>
+<span class="sourceLineNo">160</span>        .setEndKey(Bytes.toBytes("eee"))<a name="line.160"></a>
+<span class="sourceLineNo">161</span>        .build();<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    regionSizes.put(hri4.getRegionName(), 10);<a name="line.162"></a>
+<span class="sourceLineNo">163</span><a name="line.163"></a>
+<span class="sourceLineNo">164</span>    setupMocksForNormalizer(regionSizes, RegionInfo);<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlanForTable(tableName);<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    assertNull(plans);<a name="line.166"></a>
+<span class="sourceLineNo">167</span>  }<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span>  private void noNormalizationOnTransitioningRegions(final RegionState.State state)<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    throws Exception {<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    final List&lt;RegionInfo&gt; regionInfos = new LinkedList&lt;&gt;();<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    final Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>    final RegionInfo ri1 = RegionInfoBuilder.newBuilder(tableName)<a name="line.175"></a>
+<span class="sourceLineNo">176</span>      .setStartKey(Bytes.toBytes("aaa"))<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      .setEndKey(Bytes.toBytes("bbb"))<a name="line.177"></a>
+<span class="sourceLineNo">178</span>      .build();<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    regionInfos.add(ri1);<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    regionSizes.put(ri1.getRegionName(), 10);<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span>    final RegionInfo ri2 = RegionInfoBuilder.newBuilder(tableName)<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      .setStartKey(Bytes.toBytes("bbb"))<a name="line.183"></a>
+<span class="sourceLineNo">184</span>      .setEndKey(Bytes.toBytes("ccc"))<a name="line.184"></a>
+<span class="sourceLineNo">185</span>      .build();<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    regionInfos.add(ri2);<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    regionSizes.put(ri2.getRegionName(), 1);<a name="line.187"></a>
+<span class="sourceLineNo">188</span><a name="line.188"></a>
+<span class="sourceLineNo">189</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    when(masterServices.getAssignmentManager().getRegionStates()<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      .getRegionState(any(RegionInfo.class))).thenReturn(<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      RegionState.createForTesting(null, state));<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    assertNull(<a name="line.193"></a>
+<span class="sourceLineNo">194</span>      format("Unexpected plans for RegionState %s", state),<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      normalizer.computePlanForTable(tableName));<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 testNoNormalizationOnMergingNewRegions() throws Exception {<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    noNormalizationOnTransitioningRegions(RegionState.State.MERGING_NEW);<a name="line.200"></a>
+<span class="sourceLineNo">201</span>  }<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span>  @Test<a name="line.203"></a>
+<span class="sourceLineNo">204</span>  public void testNoNormalizationOnMergingRegions() throws Exception {<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    noNormalizationOnTransitioningRegions(RegionState.State.MERGING);<a name="line.205"></a>
+<span class="sourceLineNo">206</span>  }<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span>  @Test<a name="line.208"></a>
+<span class="sourceLineNo">209</span>  public void testNoNormalizationOnMergedRegions() throws Exception {<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    noNormalizationOnTransitioningRegions(RegionState.State.MERGED);<a name="line.210"></a>
+<span class="sourceLineNo">211</span>  }<a name="line.211"></a>
+<span class="sourceLineNo">212</span><a name="line.212"></a>
+<span class="sourceLineNo">213</span>  @Test<a name="line.213"></a>
+<span class="sourceLineNo">214</span>  public void testNoNormalizationOnSplittingNewRegions() throws Exception {<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    noNormalizationOnTransitioningRegions(RegionState.State.SPLITTING_NEW);<a name="line.215"></a>
+<span class="sourceLineNo">216</span>  }<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span>  @Test<a name="line.218"></a>
+<span class="sourceLineNo">219</span>  public void testNoNormalizationOnSplittingRegions() throws Exception {<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    noNormalizationOnTransitioningRegions(RegionState.State.SPLITTING);<a name="line.220"></a>
+<span class="sourceLineNo">221</span>  }<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span>  @Test<a name="line.223"></a>
+<span class="sourceLineNo">224</span>  public void testNoNormalizationOnSplitRegions() throws Exception {<a name="line.224"></a>
+<span class="sourceLineNo">225</span>    noNormalizationOnTransitioningRegions(RegionState.State.SPLIT);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>  }<a name="line.226"></a>
+<span class="sourceLineNo">227</span><a name="line.227"></a>
+<span class="sourceLineNo">228</span>  @Test<a name="line.228"></a>
+<span class="sourceLineNo">229</span>  public void testMergeOfSmallRegions() throws HBaseIOException {<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    List&lt;RegionInfo&gt; RegionInfo = new ArrayList&lt;&gt;();<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span>    RegionInfo hri1 = RegionInfoBuilder.newBuilder(tableName)<a name="line.234"></a>
+<span class="sourceLineNo">235</span>        .setStartKey(Bytes.toBytes("aaa"))<a name="line.235"></a>
+<span class="sourceLineNo">236</span>        .setEndKey(Bytes.toBytes("bbb"))<a name="line.236"></a>
+<span class="sourceLineNo">237</span>        .build();<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    RegionInfo.add(hri1);<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    regionSizes.put(hri1.getRegionName(), 15);<a name="line.239"></a>
+<span class="sourceLineNo">240</span><a name="line.240"></a>
+<span class="sourceLineNo">241</span>    RegionInfo hri2 = RegionInfoBuilder.newBuilder(tableName)<a name="line.241"></a>
+<span class="sourceLineNo">242</span>        .setStartKey(Bytes.toBytes("bbb"))<a name="line.242"></a>
+<span class="sourceLineNo">243</span>        .setEndKey(Bytes.toBytes("ccc"))<a name="line.243"></a>
+<span class="sourceLineNo">244</span>        .build();<a name="line.244"></a>
+<span class="sourceLineNo">245</span>    RegionInfo.add(hri2);<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    regionSizes.put(hri2.getRegionName(), 5);<a name="line.246"></a>
+<span class="sourceLineNo">247</span><a name="line.247"></a>
+<span class="sourceLineNo">248</span>    RegionInfo hri3 = RegionInfoBuilder.newBuilder(tableName)<a name="line.248"></a>
+<span class="sourceLineNo">249</span>        .setStartKey(Bytes.toBytes("ccc"))<a name="line.249"></a>
+<span class="sourceLineNo">250</span>        .setEndKey(Bytes.toBytes("ddd"))<a name="line.250"></a>
+<span class="sourceLineNo">251</span>        .build();<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    RegionInfo.add(hri3);<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    regionSizes.put(hri3.getRegionName(), 5);<a name="line.253"></a>
+<span class="sourceLineNo">254</span><a name="line.254"></a>
+<span class="sourceLineNo">255</span>    RegionInfo hri4 = RegionInfoBuilder.newBuilder(tableName)<a name="line.255"></a>
+<span class="sourceLineNo">256</span>        .setStartKey(Bytes.toBytes("ddd"))<a name="line.256"></a>
+<span class="sourceLineNo">257</span>        .setEndKey(Bytes.toBytes("eee"))<a name="line.257"></a>
+<span class="sourceLineNo">258</span>        .build();<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    RegionInfo.add(hri4);<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    regionSizes.put(hri4.getRegionName(), 15);<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span>    RegionInfo hri5 = RegionInfoBuilder.newBuilder(tableName)<a name="line.262"></a>
+<span class="sourceLineNo">263</span>        .setStartKey(Bytes.toBytes("eee"))<a name="line.263"></a>
+<span class="sourceLineNo">264</span>        .setEndKey(Bytes.toBytes("fff"))<a name="line.264"></a>
+<span class="sourceLineNo">265</span>        .build();<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    RegionInfo.add(hri5);<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    regionSizes.put(hri5.getRegionName(), 16);<a name="line.267"></a>
+<span class="sourceLineNo">268</span><a name="line.268"></a>
+<span class="sourceLineNo">269</span>    setupMocksForNormalizer(regionSizes, RegionInfo);<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlanForTable(tableName);<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span>    NormalizationPlan plan = plans.get(0);<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    assertTrue(plan instanceof MergeNormalizationPlan);<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    assertEquals(hri2, ((MergeNormalizationPlan) plan).getFirstRegion());<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    assertEquals(hri3, ((MergeNormalizationPlan) plan).getSecondRegion());<a name="line.275"></a>
+<span class="sourceLineNo">276</span>  }<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span>  // Test for situation illustrated in HBASE-14867<a name="line.278"></a>
+<span class="sourceLineNo">279</span>  @Test<a name="line.279"></a>
+<span class="sourceLineNo">280</span>  public void testMergeOfSecondSmallestRegions() throws HBaseIOException {<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    List&lt;RegionInfo&gt; RegionInfo = new ArrayList&lt;&gt;();<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span>    RegionInfo hri1 = RegionInfoBuilder.newBuilder(tableName)<a name="line.285"></a>
+<span class="sourceLineNo">286</span>        .setStartKey(Bytes.toBytes("aaa"))<a name="line.286"></a>
+<span class="sourceLineNo">287</span>        .setEndKey(Bytes.toBytes("bbb"))<a name="line.287"></a>
+<span class="sourceLineNo">288</span>        .build();<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    RegionInfo.add(hri1);<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    regionSizes.put(hri1.getRegionName(), 1);<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span>    RegionInfo hri2 = RegionInfoBuilder.newBuilder(tableName)<a name="line.292"></a>
+<span class="sourceLineNo">293</span>        .setStartKey(Bytes.toBytes("bbb"))<a name="line.293"></a>
+<span class="sourceLineNo">294</span>        .setEndKey(Bytes.toBytes("ccc"))<a name="line.294"></a>
+<span class="sourceLineNo">295</span>        .build();<a name="line.295"></a>
+<span class="sourceLineNo">296</span>    RegionInfo.add(hri2);<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    regionSizes.put(hri2.getRegionName(), 10000);<a name="line.297"></a>
+<span class="sourceLineNo">298</span><a name="line.298"></a>
+<span class="sourceLineNo">299</span>    RegionInfo hri3 = RegionInfoBuilder.newBuilder(tableName)<a name="line.299"></a>
+<span class="sourceLineNo">300</span>        .setStartKey(Bytes.toBytes("ccc"))<a name="line.300"></a>
+<span class="sourceLineNo">301</span>        .setEndKey(Bytes.toBytes("ddd"))<a name="line.301"></a>
+<span class="sourceLineNo">302</span>        .build();<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    RegionInfo.add(hri3);<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    regionSizes.put(hri3.getRegionName(), 10000);<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span>    RegionInfo hri4 = RegionInfoBuilder.newBuilder(tableName)<a name="line.306"></a>
+<span class="sourceLineNo">307</span>        .setStartKey(Bytes.toBytes("ddd"))<a name="line.307"></a>
+<span class="sourceLineNo">308</span>        .setEndKey(Bytes.toBytes("eee"))<a name="line.308"></a>
+<span class="sourceLineNo">309</span>        .build();<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    RegionInfo.add(hri4);<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    regionSizes.put(hri4.getRegionName(), 10000);<a name="line.311"></a>
+<span class="sourceLineNo">312</span><a name="line.312"></a>
+<span class="sourceLineNo">313</span>    RegionInfo hri5 = RegionInfoBuilder.newBuilder(tableName)<a name="line.313"></a>
+<span class="sourceLineNo">314</span>        .setStartKey(Bytes.toBytes("eee"))<a name="line.314"></a>
+<span class="sourceLineNo">315</span>        .setEndKey(Bytes.toBytes("fff"))<a name="line.315"></a>
+<span class="sourceLineNo">316</span>        .build();<a name="line.316"></a>
+<span class="sourceLineNo">317</span>    RegionInfo.add(hri5);<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    regionSizes.put(hri5.getRegionName(), 2700);<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span>    RegionInfo hri6 = RegionInfoBuilder.newBuilder(tableName)<a name="line.320"></a>
+<span class="sourceLineNo">321</span>        .setStartKey(Bytes.toBytes("fff"))<a name="line.321"></a>
+<span class="sourceLineNo">322</span>        .setEndKey(Bytes.toBytes("ggg"))<a name="line.322"></a>
+<span class="sourceLineNo">323</span>        .build();<a name="line.323"></a>
+<span class="sourceLineNo">324</span>    RegionInfo.add(hri6);<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    regionSizes.put(hri6.getRegionName(), 2700);<a name="line.325"></a>
 <span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span>    assertTrue(plan instanceof MergeNormalizationPlan);<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    assertEquals(hri5, ((MergeNormalizationPlan) plan).getFirstRegion());<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    assertEquals(hri6, ((MergeNormalizationPlan) plan).getSecondRegion());<a name="line.329"></a>
-<span class="sourceLineNo">330</span>  }<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span>  @Test<a name="line.332"></a>
-<span class="sourceLineNo">333</span>  public void testMergeOfSmallNonAdjacentRegions() throws HBaseIOException {<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    List&lt;RegionInfo&gt; RegionInfo = new ArrayList&lt;&gt;();<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.336"></a>
-<span class="sourceLineNo">337</span><a name="line.337"></a>
-<span class="sourceLineNo">338</span>    RegionInfo hri1 = RegionInfoBuilder.newBuilder(tableName)<a name="line.338"></a>
-<span class="sourceLineNo">339</span>        .setStartKey(Bytes.toBytes("aaa"))<a name="line.339"></a>
-<span class="sourceLineNo">340</span>        .setEndKey(Bytes.toBytes("bbb"))<a name="line.340"></a>
-<span class="sourceLineNo">341</span>        .build();<a name="line.341"></a>
-<span class="sourceLineNo">342</span>    RegionInfo.add(hri1);<a name="line.342"></a>
-<span class="sourceLineNo">343</span>    regionSizes.put(hri1.getRegionName(), 15);<a name="line.343"></a>
-<span class="sourceLineNo">344</span><a name="line.344"></a>
-<span class="sourceLineNo">345</span>    RegionInfo hri2 = RegionInfoBuilder.newBuilder(tableName)<a name="line.345"></a>
-<span class="sourceLineNo">346</span>        .setStartKey(Bytes.toBytes("bbb"))<a name="line.346"></a>
-<span class="sourceLineNo">347</span>        .setEndKey(Bytes.toBytes("ccc"))<a name="line.347"></a>
-<span class="sourceLineNo">348</span>        .build();<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    RegionInfo.add(hri2);<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    regionSizes.put(hri2.getRegionName(), 5);<a name="line.350"></a>
-<span class="sourceLineNo">351</span><a name="line.351"></a>
-<span class="sourceLineNo">352</span>    RegionInfo hri3 = RegionInfoBuilder.newBuilder(tableName)<a name="line.352"></a>
-<span class="sourceLineNo">353</span>        .setStartKey(Bytes.toBytes("ccc"))<a name="line.353"></a>
-<span class="sourceLineNo">354</span>        .setEndKey(Bytes.toBytes("ddd"))<a name="line.354"></a>
-<span class="sourceLineNo">355</span>        .build();<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    RegionInfo.add(hri3);<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    regionSizes.put(hri3.getRegionName(), 16);<a name="line.357"></a>
-<span class="sourceLineNo">358</span><a name="line.358"></a>
-<span class="sourceLineNo">359</span>    RegionInfo hri4 = RegionInfoBuilder.newBuilder(tableName)<a name="line.359"></a>
-<span class="sourceLineNo">360</span>        .setStartKey(Bytes.toBytes("ddd"))<a name="line.360"></a>
-<span class="sourceLineNo">361</span>        .setEndKey(Bytes.toBytes("eee"))<a name="line.361"></a>
-<span class="sourceLineNo">362</span>        .build();<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    RegionInfo.add(hri4);<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    regionSizes.put(hri4.getRegionName(), 15);<a name="line.364"></a>
-<span class="sourceLineNo">365</span><a name="line.365"></a>
-<span class="sourceLineNo">366</span>    RegionInfo hri5 = RegionInfoBuilder.newBuilder(tableName)<a name="line.366"></a>
-<span class="sourceLineNo">367</span>        .setStartKey(Bytes.toBytes("ddd"))<a name="line.367"></a>
-<span class="sourceLineNo">368</span>        .setEndKey(Bytes.toBytes("eee"))<a name="line.368"></a>
-<span class="sourceLineNo">369</span>        .build();<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    RegionInfo.add(hri4);<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    regionSizes.put(hri5.getRegionName(), 5);<a name="line.371"></a>
-<span class="sourceLineNo">372</span><a name="line.372"></a>
-<span class="sourceLineNo">373</span>    setupMocksForNormalizer(regionSizes, RegionInfo);<a name="line.373"></a>
-<span class="sourceLineNo">374</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlanForTable(tableName);<a name="line.374"></a>
-<span class="sourceLineNo">375</span><a name="line.375"></a>
-<span class="sourceLineNo">376</span>    assertNull(plans);<a name="line.376"></a>
-<span class="sourceLineNo">377</span>  }<a name="line.377"></a>
-<span class="sourceLineNo">378</span><a name="line.378"></a>
-<span class="sourceLineNo">379</span>  @Test<a name="line.379"></a>
-<span class="sourceLineNo">380</span>  public void testSplitOfLargeRegion() throws HBaseIOException {<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.381"></a>
-<span class="sourceLineNo">382</span>    List&lt;RegionInfo&gt; RegionInfo = new ArrayList&lt;&gt;();<a name="line.382"></a>
-<span class="sourceLineNo">383</span>    Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.383"></a>
-<span class="sourceLineNo">384</span><a name="line.384"></a>
-<span class="sourceLineNo">385</span>    RegionInfo hri1 = RegionInfoBuilder.newBuilder(tableName)<a name="line.385"></a>
-<span class="sourceLineNo">386</span>        .setStartKey(Bytes.toBytes("aaa"))<a name="line.386"></a>
-<span class="sourceLineNo">387</span>        .setEndKey(Bytes.toBytes("bbb"))<a name="line.387"></a>
-<span class="sourceLineNo">388</span>        .build();<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    RegionInfo.add(hri1);<a name="line.389"></a>
-<span class="sourceLineNo">390</span>    regionSizes.put(hri1.getRegionName(), 8);<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span>    RegionInfo hri2 = RegionInfoBuilder.newBuilder(tableName)<a name="line.392"></a>
-<span class="sourceLineNo">393</span>        .setStartKey(Bytes.toBytes("bbb"))<a name="line.393"></a>
-<span class="sourceLineNo">394</span>        .setEndKey(Bytes.toBytes("ccc"))<a name="line.394"></a>
-<span class="sourceLineNo">395</span>        .build();<a name="line.395"></a>
-<span class="sourceLineNo">396</span>    RegionInfo.add(hri2);<a name="line.396"></a>
-<span class="sourceLineNo">397</span>    regionSizes.put(hri2.getRegionName(), 6);<a name="line.397"></a>
-<span class="sourceLineNo">398</span><a name="line.398"></a>
-<span class="sourceLineNo">399</span>    RegionInfo hri3 = RegionInfoBuilder.newBuilder(tableName)<a name="line.399"></a>
-<span class="sourceLineNo">400</span>        .setStartKey(Bytes.toBytes("ccc"))<a name="line.400"></a>
-<span class="sourceLineNo">401</span>        .setEndKey(Bytes.toBytes("ddd"))<a name="line.401"></a>
-<span class="sourceLineNo">402</span>        .build();<a name="line.402"></a>
-<span class="sourceLineNo">403</span>    RegionInfo.add(hri3);<a name="line.403"></a>
-<span class="sourceLineNo">404</span>    regionSizes.put(hri3.getRegionName(), 10);<a name="line.404"></a>
-<span class="sourceLineNo">405</span><a name="line.405"></a>
-<span class="sourceLineNo">406</span>    RegionInfo hri4 = RegionInfoBuilder.newBuilder(tableName)<a name="line.406"></a>
-<span class="sourceLineNo">407</span>        .setStartKey(Bytes.toBytes("ddd"))<a name="line.407"></a>
-<span class="sourceLineNo">408</span>        .setEndKey(Bytes.toBytes("eee"))<a name="line.408"></a>
-<span class="sourceLineNo">409</span>        .build();<a name="line.409"></a>
-<span class="sourceLineNo">410</span>    RegionInfo.add(hri4);<a name="line.410"></a>
-<span class="sourceLineNo">411</span>    regionSizes.put(hri4.getRegionName(), 30);<a name="line.411"></a>
-<span class="sourceLineNo">412</span><a name="line.412"></a>
-<span class="sourceLineNo">413</span>    setupMocksForNormalizer(regionSizes, RegionInfo);<a name="line.413"></a>
-<span class="sourceLineNo">414</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlanForTable(tableName);<a name="line.414"></a>
-<span class="sourceLineNo">415</span>    NormalizationPlan plan = plans.get(0);<a name="line.415"></a>
+<span class="sourceLineNo">327</span>    setupMocksForNormalizer(regionSizes, RegionInfo);<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlanForTable(tableName);<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    NormalizationPlan plan = plans.get(0);<a name="line.329"></a>
+<span class="sourceLineNo">330</span><a name="line.330"></a>
+<span class="sourceLineNo">331</span>    assertTrue(plan instanceof MergeNormalizationPlan);<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    assertEquals(hri5, ((MergeNormalizationPlan) plan).getFirstRegion());<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    assertEquals(hri6, ((MergeNormalizationPlan) plan).getSecondRegion());<a name="line.333"></a>
+<span class="sourceLineNo">334</span>  }<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span>  @Test<a name="line.336"></a>
+<span class="sourceLineNo">337</span>  public void testMergeOfSmallNonAdjacentRegions() throws HBaseIOException {<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    List&lt;RegionInfo&gt; RegionInfo = new ArrayList&lt;&gt;();<a name="line.339"></a>
+<span class="sourceLineNo">340</span>    Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span>    RegionInfo hri1 = RegionInfoBuilder.newBuilder(tableName)<a name="line.342"></a>
+<span class="sourceLineNo">343</span>        .setStartKey(Bytes.toBytes("aaa"))<a name="line.343"></a>
+<span class="sourceLineNo">344</span>        .setEndKey(Bytes.toBytes("bbb"))<a name="line.344"></a>
+<span class="sourceLineNo">345</span>        .build();<a name="line.345"></a>
+<span class="sourceLineNo">346</span>    RegionInfo.add(hri1);<a name="line.346"></a>
+<span class="sourceLineNo">347</span>    regionSizes.put(hri1.getRegionName(), 15);<a name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span>    RegionInfo hri2 = RegionInfoBuilder.newBuilder(tableName)<a name="line.349"></a>
+<span class="sourceLineNo">350</span>        .setStartKey(Bytes.toBytes("bbb"))<a name="line.350"></a>
+<span class="sourceLineNo">351</span>        .setEndKey(Bytes.toBytes("ccc"))<a name="line.351"></a>
+<span class="sourceLineNo">352</span>        .build();<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    RegionInfo.add(hri2);<a name="line.353"></a>
+<span class="sourceLineNo">354</span>    regionSizes.put(hri2.getRegionName(), 5);<a name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span>    RegionInfo hri3 = RegionInfoBuilder.newBuilder(tableName)<a name="line.356"></a>
+<span class="sourceLineNo">357</span>        .setStartKey(Bytes.toBytes("ccc"))<a name="line.357"></a>
+<span class="sourceLineNo">358</span>        .setEndKey(Bytes.toBytes("ddd"))<a name="line.358"></a>
+<span class="sourceLineNo">359</span>        .build();<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    RegionInfo.add(hri3);<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    regionSizes.put(hri3.getRegionName(), 16);<a name="line.361"></a>
+<span class="sourceLineNo">362</span><a name="line.362"></a>
+<span class="sourceLineNo">363</span>    RegionInfo hri4 = RegionInfoBuilder.newBuilder(tableName)<a name="line.363"></a>
+<span class="sourceLineNo">364</span>        .setStartKey(Bytes.toBytes("ddd"))<a name="line.364"></a>
+<span class="sourceLineNo">365</span>        .setEndKey(Bytes.toBytes("eee"))<a name="line.365"></a>
+<span class="sourceLineNo">366</span>        .build();<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    RegionInfo.add(hri4);<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    regionSizes.put(hri4.getRegionName(), 15);<a name="line.368"></a>
+<span class="sourceLineNo">369</span><a name="line.369"></a>
+<span class="sourceLineNo">370</span>    RegionInfo hri5 = RegionInfoBuilder.newBuilder(tableName)<a name="line.370"></a>
+<span class="sourceLineNo">371</span>        .setStartKey(Bytes.toBytes("ddd"))<a name="line.371"></a>
+<span class="sourceLineNo">372</span>        .setEndKey(Bytes.toBytes("eee"))<a name="line.372"></a>
+<span class="sourceLineNo">373</span>        .build();<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    RegionInfo.add(hri4);<a name="line.374"></a>
+<span class="sourceLineNo">375</span>    regionSizes.put(hri5.getRegionName(), 5);<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span>    setupMocksForNormalizer(regionSizes, RegionInfo);<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlanForTable(tableName);<a name="line.378"></a>
+<span class="sourceLineNo">379</span><a name="line.379"></a>
+<span class="sourceLineNo">380</span>    assertNull(plans);<a name="line.380"></a>
+<span class="sourceLineNo">381</span>  }<a name="line.381"></a>
+<span class="sourceLineNo">382</span><a name="line.382"></a>
+<span class="sourceLineNo">383</span>  @Test<a name="line.383"></a>
+<span class="sourceLineNo">384</span>  public void testSplitOfLargeRegion() throws HBaseIOException {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    List&lt;RegionInfo&gt; RegionInfo = new ArrayList&lt;&gt;();<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.387"></a>
+<span class="sourceLineNo">388</span><a name="line.388"></a>
+<span class="sourceLineNo">389</span>    RegionInfo hri1 = RegionInfoBuilder.newBuilder(tableName)<a name="line.389"></a>
+<span class="sourceLineNo">390</span>        .setStartKey(Bytes.toBytes("aaa"))<a name="line.390"></a>
+<span class="sourceLineNo">391</span>        .setEndKey(Bytes.toBytes("bbb"))<a name="line.391"></a>
+<span class="sourceLineNo">392</span>        .build();<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    RegionInfo.add(hri1);<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    regionSizes.put(hri1.getRegionName(), 8);<a name="line.394"></a>
+<span class="sourceLineNo">395</span><a name="line.395"></a>
+<span class="sourceLineNo">396</span>    RegionInfo hri2 = RegionInfoBuilder.newBuilder(tableName)<a name="line.396"></a>
+<span class="sourceLineNo">397</span>        .setStartKey(Bytes.toBytes("bbb"))<a name="line.397"></a>
+<span class="sourceLineNo">398</span>        .setEndKey(Bytes.toBytes("ccc"))<a name="line.398"></a>
+<span class="sourceLineNo">399</span>        .build();<a name="line.399"></a>
+<span class="sourceLineNo">400</span>    RegionInfo.add(hri2);<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    regionSizes.put(hri2.getRegionName(), 6);<a name="line.401"></a>
+<span class="sourceLineNo">402</span><a name="line.402"></a>
+<span class="sourceLineNo">403</span>    RegionInfo hri3 = RegionInfoBuilder.newBuilder(tableName)<a name="line.403"></a>
+<span class="sourceLineNo">404</span>        .setStartKey(Bytes.toBytes("ccc"))<a name="line.404"></a>
+<span class="sourceLineNo">405</span>        .setEndKey(Bytes.toBytes("ddd"))<a name="line.405"></a>
+<span class="sourceLineNo">406</span>        .build();<a name="line.406"></a>
+<span class="sourceLineNo">407</span>    RegionInfo.add(hri3);<a name="line.407"></a>
+<span class="sourceLineNo">408</span>    regionSizes.put(hri3.getRegionName(), 10);<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span>    RegionInfo hri4 = RegionInfoBuilder.newBuilder(tableName)<a name="line.410"></a>
+<span class="sourceLineNo">411</span>        .setStartKey(Bytes.toBytes("ddd"))<a name="line.411"></a>
+<span class="sourceLineNo">412</span>        .setEndKey(Bytes.toBytes("eee"))<a name="line.412"></a>
+<span class="sourceLineNo">413</span>        .build();<a name="line.413"></a>
+<span class="sourceLineNo">414</span>    RegionInfo.add(hri4);<a name="line.414"></a>
+<span class="sourceLineNo">415</span>    regionSizes.put(hri4.getRegionName(), 30);<a name="line.415"></a>
 <span class="sourceLineNo">416</span><a name="line.416"></a>
-<span class="sourceLineNo">417</span>    assertTrue(plan instanceof SplitNormalizationPlan);<a name="line.417"></a>
-<span class="sourceLineNo">418</span>    assertEquals(hri4, ((SplitNormalizationPlan) plan).getRegionInfo());<a name="line.418"></a>
-<span class="sourceLineNo">419</span>  }<a name="line.419"></a>
+<span class="sourceLineNo">417</span>    setupMocksForNormalizer(regionSizes, RegionInfo);<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlanForTable(tableName);<a name="line.418"></a>
+<span class="sourceLineNo">419</span>    NormalizationPlan plan = plans.get(0);<a name="line.419"></a>
 <span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span>  @Test<a name="line.421"></a>
-<span class="sourceLineNo">422</span>  public void testSplitWithTargetRegionCount() throws Exception {<a name="line.422"></a>
-<span class="sourceLineNo">423</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    List&lt;RegionInfo&gt; RegionInfo = new ArrayList&lt;&gt;();<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.425"></a>
-<span class="sourceLineNo">426</span><a name="line.426"></a>
-<span class="sourceLineNo">427</span>    RegionInfo hri1 = RegionInfoBuilder.newBuilder(tableName).setStartKey(Bytes.toBytes("aaa"))<a name="line.427"></a>
-<span class="sourceLineNo">428</span>        .setEndKey(Bytes.toBytes("bbb")).build();<a name="line.428"></a>
-<span class="sourceLineNo">429</span>    RegionInfo.add(hri1);<a name="line.429"></a>
-<span class="sourceLineNo">430</span>    regionSizes.put(hri1.getRegionName(), 20);<a name="line.430"></a>
-<span class="sourceLineNo">431</span><a name="line.431"></a>
-<span class="sourceLineNo">432</span>    RegionInfo hri2 = RegionInfoBuilder.newBuilder(tableName).setStartKey(Bytes.toBytes("bbb"))<a name="line.432"></a>
-<span class="sourceLineNo">433</span>        .setEndKey(Bytes.toBytes("ccc")).build();<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    RegionInfo.add(hri2);<a name="line.434"></a>
-<span class="sourceLineNo">435</span>    regionSizes.put(hri2.getRegionName(), 40);<a name="line.435"></a>
-<span class="sourceLineNo">436</span><a name="line.436"></a>
-<span class="sourceLineNo">437</span>    RegionInfo hri3 = RegionInfoBuilder.newBuilder(tableName).setStartKey(Bytes.toBytes("ccc"))<a name="line.437"></a>
-<span class="sourceLineNo">438</span>        .setEndKey(Bytes.toBytes("ddd")).build();<a name="line.438"></a>
-<span class="sourceLineNo">439</span>    RegionInfo.add(hri3);<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    regionSizes.put(hri3.getRegionName(), 60);<a name="line.440"></a>
-<span class="sourceLineNo">441</span><a name="line.441"></a>
-<span class="sourceLineNo">442</span>    RegionInfo hri4 = RegionInfoBuilder.newBuilder(tableName).setStartKey(Bytes.toBytes("ddd"))<a name="line.442"></a>
-<span class="sourceLineNo">443</span>        .setEndKey(Bytes.toBytes("eee")).build();<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    RegionInfo.add(hri4);<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    regionSizes.put(hri4.getRegionName(), 80);<a name="line.445"></a>
-<span class="sourceLineNo">446</span><a name="line.446"></a>
-<span class="sourceLineNo">447</span>    RegionInfo hri5 = RegionInfoBuilder.newBuilder(tableName).setStartKey(Bytes.toBytes("eee"))<a name="line.447"></a>
-<span class="sourceLineNo">448</span>        .setEndKey(Bytes.toBytes("fff")).build();<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    RegionInfo.add(hri5);<a name="line.449"></a>
-<span class="sourceLineNo">450</span>    regionSizes.put(hri5.getRegionName(), 100);<a name="line.450"></a>
-<span class="sourceLineNo">451</span><a name="line.451"></a>
-<span class="sourceLineNo">452</span>    RegionInfo hri6 = RegionInfoBuilder.newBuilder(tableName).setStartKey(Bytes.toBytes("fff"))<a name="line.452"></a>
-<span class="sourceLineNo">453</span>        .setEndKey(Bytes.toBytes("ggg")).build();<a name="line.453"></a>
-<span class="sourceLineNo">454</span>    RegionInfo.add(hri6);<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    regionSizes.put(hri6.getRegionName(), 120);<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span>    setupMocksForNormalizer(regionSizes, RegionInfo);<a name="line.457"></a>
-<span class="sourceLineNo">458</span><a name="line.458"></a>
-<span class="sourceLineNo">459</span>    // test when target region size is 20<a name="line.459"></a>
-<span class="sourceLineNo">460</span>    when(masterServices.getTableDescriptors().get(any()).getNormalizerTargetRegionSize())<a name="line.460"></a>
-<span class="sourceLineNo">461</span>        .thenReturn(20L);<a name="line.461"></a>
-<span class="sourceLineNo">462</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlanForTable(tableName);<a name="line.462"></a>
-<span class="sourceLineNo">463</span>    assertEquals(4, plans.size());<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span>    for (NormalizationPlan plan : plans) {<a name="line.465"></a>
-<span class="sourceLineNo">466</span>      assertTrue(plan instanceof SplitNormalizationPlan);<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    }<a name="line.467"></a>
+<span class="sourceLineNo">421</span>    assertTrue(plan instanceof SplitNormalizationPlan);<a name="line.421"></a>
+<span class="sourceLineNo">422</span>    assertEquals(hri4, ((SplitNormalizationPlan) plan).getRegionInfo());<a name="line.422"></a>
+<span class="sourceLineNo">423</span>  }<a name="line.423"></a>
+<span class="sourceLineNo">424</span><a name="line.424"></a>
+<span class="sourceLineNo">425</span>  @Test<a name="line.425"></a>
+<span class="sourceLineNo">426</span>  public void testSplitWithTargetRegionCount() throws Exception {<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    List&lt;RegionInfo&gt; RegionInfo = new ArrayList&lt;&gt;();<a name="line.428"></a>
+<span class="sourceLineNo">429</span>    Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.429"></a>
+<span class="sourceLineNo">430</span><a name="line.430"></a>
+<span class="sourceLineNo">431</span>    RegionInfo hri1 = RegionInfoBuilder.newBuilder(tableName).setStartKey(Bytes.toBytes("aaa"))<a name="line.431"></a>
+<span class="sourceLineNo">432</span>        .setEndKey(Bytes.toBytes("bbb")).build();<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    RegionInfo.add(hri1);<a name="line.433"></a>
+<span class="sourceLineNo">434</span>    regionSizes.put(hri1.getRegionName(), 20);<a name="line.434"></a>
+<span class="sourceLineNo">435</span><a name="line.435"></a>
+<span class="sourceLineNo">436</span>    RegionInfo hri2 = RegionInfoBuilder.newBuilder(tableName).setStartKey(Bytes.toBytes("bbb"))<a name="line.436"></a>
+<span class="sourceLineNo">437</span>        .setEndKey(Bytes.toBytes("ccc")).build();<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    RegionInfo.add(hri2);<a name="line.438"></a>
+<span class="sourceLineNo">439</span>    regionSizes.put(hri2.getRegionName(), 40);<a name="line.439"></a>
+<span class="sourceLineNo">440</span><a name="line.440"></a>
+<span class="sourceLineNo">441</span>    RegionInfo hri3 = RegionInfoBuilder.newBuilder(tableName).setStartKey(Bytes.toBytes("ccc"))<a name="line.441"></a>
+<span class="sourceLineNo">442</span>        .setEndKey(Bytes.toBytes("ddd")).build();<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    RegionInfo.add(hri3);<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    regionSizes.put(hri3.getRegionName(), 60);<a name="line.444"></a>
+<span class="sourceLineNo">445</span><a name="line.445"></a>
+<span class="sourceLineNo">446</span>    RegionInfo hri4 = RegionInfoBuilder.newBuilder(tableName).setStartKey(Bytes.toBytes("ddd"))<a name="line.446"></a>
+<span class="sourceLineNo">447</span>        .setEndKey(Bytes.toBytes("eee")).build();<a name="line.447"></a>
+<span class="sourceLineNo">448</span>    RegionInfo.add(hri4);<a name="line.448"></a>
+<span class="sourceLineNo">449</span>    regionSizes.put(hri4.getRegionName(), 80);<a name="line.449"></a>
+<span class="sourceLineNo">450</span><a name="line.450"></a>
+<span class="sourceLineNo">451</span>    RegionInfo hri5 = RegionInfoBuilder.newBuilder(tableName).setStartKey(Bytes.toBytes("eee"))<a name="line.451"></a>
+<span class="sourceLineNo">452</span>        .setEndKey(Bytes.toBytes("fff")).build();<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    RegionInfo.add(hri5);<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    regionSizes.put(hri5.getRegionName(), 100);<a name="line.454"></a>
+<span class="sourceLineNo">455</span><a name="line.455"></a>
+<span class="sourceLineNo">456</span>    RegionInfo hri6 = RegionInfoBuilder.newBuilder(tableName).setStartKey(Bytes.toBytes("fff"))<a name="line.456"></a>
+<span class="sourceLineNo">457</span>        .setEndKey(Bytes.toBytes("ggg")).build();<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    RegionInfo.add(hri6);<a name="line.458"></a>
+<span class="sourceLineNo">459</span>    regionSizes.put(hri6.getRegionName(), 120);<a name="line.459"></a>
+<span class="sourceLineNo">460</span><a name="line.460"></a>
+<span class="sourceLineNo">461</span>    setupMocksForNormalizer(regionSizes, RegionInfo);<a name="line.461"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
+<span class="sourceLineNo">463</span>    // test when target region size is 20<a name="line.463"></a>
+<span class="sourceLineNo">464</span>    when(masterServices.getTableDescriptors().get(any()).getNormalizerTargetRegionSize())<a name="line.464"></a>
+<span class="sourceLineNo">465</span>        .thenReturn(20L);<a name="line.465"></a>
+<span class="sourceLineNo">466</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlanForTable(tableName);<a name="line.466"></a>
+<span class="sourceLineNo">467</span>    assertEquals(4, plans.size());<a name="line.467"></a>
 <span class="sourceLineNo">468</span><a name="line.468"></a>
-<span class="sourceLineNo">469</span>    // test when target region size is 200<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    when(masterServices.getTableDescriptors().get(any()).getNormalizerTargetRegionSize())<a name="line.470"></a>
-<span class="sourceLineNo">471</span>        .thenReturn(200L);<a name="line.471"></a>
-<span class="sourceLineNo">472</span>    plans = normalizer.computePlanForTable(tableName);<a name="line.472"></a>
-<span class="sourceLineNo">473</span>    assertEquals(2, plans.size());<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    NormalizationPlan plan = plans.get(0);<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    assertTrue(plan instanceof MergeNormalizationPlan);<a name="line.475"></a>
-<span class="sourceLineNo">476</span>    assertEquals(hri1, ((MergeNormalizationPlan) plan).getFirstRegion());<a name="line.476"></a>
-<span class="sourceLineNo">477</span>    assertEquals(hri2, ((MergeNormalizationPlan) plan).getSecondRegion());<a name="line.477"></a>
-<span class="sourceLineNo">478</span>  }<a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span>  @Test<a name="line.480"></a>
-<span class="sourceLineNo">481</span>  public void testSplitWithTargetRegionSize() throws Exception {<a name="line.481"></a>
-<span class="sourceLineNo">482</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.482"></a>
-<span class="sourceLineNo">483</span>    List&lt;RegionInfo&gt; RegionInfo = new ArrayList&lt;&gt;();<a name="line.483"></a>
-<span class="sourceLineNo">484</span>    Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.484"></a>
-<span class="sourceLineNo">485</span><a name="line.485"></a>
-<span class="sourceLineNo">486</span>    RegionInfo hri1 = RegionInfoBuilder.newBuilder(tableName).setStartKey(Bytes.toBytes("aaa"))<a name="line.486"></a>
-<span class="sourceLineNo">487</span>        .setEndKey(Bytes.toBytes("bbb")).build();<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    RegionInfo.add(hri1);<a name="line.488"></a>
-<span class="sourceLineNo">489</span>    regionSizes.put(hri1.getRegionName(), 20);<a name="line.489"></a>
-<span class="sourceLineNo">490</span><a name="line.490"></a>
-<span class="sourceLineNo">491</span>    RegionInfo hri2 = RegionInfoBuilder.newBuilder(tableName).setStartKey(Bytes.toBytes("bbb"))<a name="line.491"></a>
-<span class="sourceLineNo">492</span>        .setEndKey(Bytes.toBytes("ccc")).build();<a name="line.492"></a>
-<span class="sourceLineNo">493</span>    RegionInfo.add(hri2);<a name="line.493"></a>
-<span class="sourceLineNo">494</span>    regionSizes.put(hri2.getRegionName(), 40);<a name="line.494"></a>
-<span class="sourceLineNo">495</span><a name="line.495"></a>
-<span class="sourceLineNo">496</span>    RegionInfo hri3 = RegionInfoBuilder.newBuilder(tableName).setStartKey(Bytes.toBytes("ccc"))<a name="line.496"></a>
-<span class="sourceLineNo">497</span>        .setEndKey(Bytes.toBytes("ddd")).build();<a name="line.497"></a>
-<span class="sourceLineNo">498</span>    RegionInfo.add(hri3);<a name="line.498"></a>
-<span class="sourceLineNo">499</span>    regionSizes.put(hri3.getRegionName(), 60);<a name="line.499"></a>
-<span class="sourceLineNo">500</span><a name="line.500"></a>
-<span class="sourceLineNo">501</span>    RegionInfo hri4 = RegionInfoBuilder.newBuilder(tableName).setStartKey(Bytes.toBytes("ddd"))<a name="line.501"></a>
-<span class="sourceLineNo">502</span>        .setEndKey(Bytes.toBytes("eee")).build();<a name="line.502"></a>
-<span class="sourceLineNo">503</span>    RegionInfo.add(hri4);<a name="line.503"></a>
-<span class="sourceLineNo">504</span>    regionSizes.put(hri4.getRegionName(), 80);<a name="line.504"></a>
-<span class="sourceLineNo">505</span><a name="line.505"></a>
-<span class="sourceLineNo">506</span>    setupMocksForNormalizer(regionSizes, RegionInfo);<a name="line.506"></a>
-<span class="sourceLineNo">507</span><a name="line.507"></a>
-<span class="sourceLineNo">508</span>    // test when target region count is 8<a name="line.508"></a>
-<span class="sourceLineNo">509</span>    when(masterServices.getTableDescriptors().get(any()).getNormalizerTargetRegionCount())<a name="line.509"></a>
-<span class="sourceLineNo">510</span>        .thenReturn(8);<a name="line.510"></a>
-<span class="sourceLineNo">511</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlanForTable(tableName);<a name="line.511"></a>
-<span class="sourceLineNo">512</span>    assertEquals(2, plans.size());<a name="line.512"></a>
-<span class="sourceLineNo">513</span><a name="line.513"></a>
-<span class="sourceLineNo">514</span>    for (NormalizationPlan plan : plans) {<a name="line.514"></a>
-<span class="sourceLineNo">515</span>      assertTrue(plan instanceof SplitNormalizationPlan);<a name="line.515"></a>
-<span class="sourceLineNo">516</span>    }<a name="line.516"></a>
+<span class="sourceLineNo">469</span>    for (NormalizationPlan plan : plans) {<a name="line.469"></a>
+<span class="sourceLineNo">470</span>      assertTrue(plan instanceof SplitNormalizationPlan);<a name="line.470"></a>
+<span class="sourceLineNo">471</span>    }<a name="line.471"></a>
+<span class="sourceLineNo">472</span><a name="line.472"></a>
+<span class="sourceLineNo">473</span>    // test when target region size is 200<a name="line.473"></a>
+<span class="sourceLineNo">474</span>    when(masterServices.getTableDescriptors().get(any()).getNormalizerTargetRegionSize())<a name="line.474"></a>
+<span class="sourceLineNo">475</span>        .thenReturn(200L);<a name="line.475"></a>
+<span class="sourceLineNo">476</span>    plans = normalizer.computePlanForTable(tableName);<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    assertEquals(2, plans.size());<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    NormalizationPlan plan = plans.get(0);<a name="line.478"></a>
+<span class="sourceLineNo">479</span>    assertTrue(plan instanceof MergeNormalizationPlan);<a name="line.479"></a>
+<span class="sourceLineNo">480</span>    assertEquals(hri1, ((MergeNormalizationPlan) plan).getFirstRegion());<a name="line.480"></a>
+<span class="sourceLineNo">481</span>    assertEquals(hri2, ((MergeNormalizationPlan) plan).getSecondRegion());<a name="line.481"></a>
+<span class="sourceLineNo">482</span>  }<a name="line.482"></a>
+<span class="sourceLineNo">483</span><a name="line.483"></a>
+<span class="sourceLineNo">484</span>  @Test<a name="line.484"></a>
+<span class="sourceLineNo">485</span>  public void testSplitWithTargetRegionSize() throws Exception {<a name="line.485"></a>
+<span class="sourceLineNo">486</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.486"></a>
+<span class="sourceLineNo">487</span>    List&lt;RegionInfo&gt; RegionInfo = new ArrayList&lt;&gt;();<a name="line.487"></a>
+<span class="sourceLineNo">488</span>    Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.488"></a>
+<span class="sourceLineNo">489</span><a name="line.489"></a>
+<span class="sourceLineNo">490</span>    RegionInfo hri1 = RegionInfoBuilder.newBuilder(tableName).setStartKey(Bytes.toBytes("aaa"))<a name="line.490"></a>
+<span class="sourceLineNo">491</span>        .setEndKey(Bytes.toBytes("bbb")).build();<a name="line.491"></a>
+<span class="sourceLineNo">492</span>    RegionInfo.add(hri1);<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    regionSizes.put(hri1.getRegionName(), 20);<a name="line.493"></a>
+<span class="sourceLineNo">494</span><a name="line.494"></a>
+<span class="sourceLineNo">495</span>    RegionInfo hri2 = RegionInfoBuilder.newBuilder(tableName).setStartKey(Bytes.toBytes("bbb"))<a name="line.495"></a>
+<span class="sourceLineNo">496</span>        .setEndKey(Bytes.toBytes("ccc")).build();<a name="line.496"></a>
+<span class="sourceLineNo">497</span>    RegionInfo.add(hri2);<a name="line.497"></a>
+<span class="sourceLineNo">498</span>    regionSizes.put(hri2.getRegionName(), 40);<a name="line.498"></a>
+<span class="sourceLineNo">499</span><a name="line.499"></a>
+<span class="sourceLineNo">500</span>    RegionInfo hri3 = RegionInfoBuilder.newBuilder(tableName).setStartKey(Bytes.toBytes("ccc"))<a name="line.500"></a>
+<span class="sourceLineNo">501</span>        .setEndKey(Bytes.toBytes("ddd")).build();<a name="line.501"></a>
+<span class="sourceLineNo">502</span>    RegionInfo.add(hri3);<a name="line.502"></a>
+<span class="sourceLineNo">503</span>    regionSizes.put(hri3.getRegionName(), 60);<a name="line.503"></a>
+<span class="sourceLineNo">504</span><a name="line.504"></a>
+<span class="sourceLineNo">505</span>    RegionInfo hri4 = RegionInfoBuilder.newBuilder(tableName).setStartKey(Bytes.toBytes("ddd"))<a name="line.505"></a>
+<span class="sourceLineNo">506</span>        .setEndKey(Bytes.toBytes("eee")).build();<a name="line.506"></a>
+<span class="sourceLineNo">507</span>    RegionInfo.add(hri4);<a name="line.507"></a>
+<span class="sourceLineNo">508</span>    regionSizes.put(hri4.getRegionName(), 80);<a name="line.508"></a>
+<span class="sourceLineNo">509</span><a name="line.509"></a>
+<span class="sourceLineNo">510</span>    setupMocksForNormalizer(regionSizes, RegionInfo);<a name="line.510"></a>
+<span class="sourceLineNo">511</span><a name="line.511"></a>
+<span class="sourceLineNo">512</span>    // test when target region count is 8<a name="line.512"></a>
+<span class="sourceLineNo">513</span>    when(masterServices.getTableDescriptors().get(any()).getNormalizerTargetRegionCount())<a name="line.513"></a>
+<span class="sourceLineNo">514</span>        .thenReturn(8);<a name="line.514"></a>
+<span class="sourceLineNo">515</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlanForTable(tableName);<a name="line.515"></a>
+<span class="sourceLineNo">516</span>    assertEquals(2, plans.size());<a name="line.516"></a>
 <span class="sourceLineNo">517</span><a name="line.517"></a>
-<span class="sourceLineNo">518</span>    // test when target region count is 3<a name="line.518"></a>
-<span class="sourceLineNo">519</span>    when(masterServices.getTableDescriptors().get(any()).getNormalizerTargetRegionCount())<a name="line.519"></a>
-<span class="sourceLineNo">520</span>        .thenReturn(3);<a name="line.520"></a>
-<span class="sourceLineNo">521</span>    plans = normalizer.computePlanForTable(tableName);<a name="line.521"></a>
-<span class="sourceLineNo">522</span>    assertEquals(1, plans.size());<a name="line.522"></a>
-<span class="sourceLineNo">523</span>    NormalizationPlan plan = plans.get(0);<a name="line.523"></a>
-<span class="sourceLineNo">524</span>    assertTrue(plan instanceof MergeNormalizationPlan);<a name="line.524"></a>
-<span class="sourceLineNo">525</span>    assertEquals(hri1, ((MergeNormalizationPlan) plan).getFirstRegion());<a name="line.525"></a>
-<span class="sourceLineNo">526</span>    assertEquals(hri2, ((MergeNormalizationPlan) plan).getSecondRegion());<a name="line.526"></a>
-<span class="sourceLineNo">527</span>  }<a name="line.527"></a>
-<span class="sourceLineNo">528</span><a name="line.528"></a>
-<span class="sourceLineNo">529</span>  @SuppressWarnings("MockitoCast")<a name="line.529"></a>
-<span class="sourceLineNo">530</span>  private void setupMocksForNormalizer(Map&lt;byte[], Integer&gt; regionSizes,<a name="line.530"></a>
-<span class="sourceLineNo">531</span>    List&lt;RegionInfo&gt; RegionInfo) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span>    masterServices = Mockito.mock(MasterServices.class, RETURNS_DEEP_STUBS);<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    final MasterRpcServices masterRpcServices =<a name="line.533"></a>
-<span class="sourceLineNo">534</span>      Mockito.mock(MasterRpcServices.class, RETURNS_DEEP_STUBS);<a name="line.534"></a>
-<span class="sourceLineNo">535</span><a name="line.535"></a>
-<span class="sourceLineNo">536</span>    // for simplicity all regions are assumed to be on one server; doesn't matter to us<a name="line.536"></a>
-<span class="sourceLineNo">537</span>    ServerName sn = ServerName.valueOf("localhost", 0, 1L);<a name="line.537"></a>
-<span class="sourceLineNo">538</span>    when(masterServices.getAssignmentManager().getRegionStates()<a name="line.538"></a>
-<span class="sourceLineNo">539</span>      .getRegionsOfTable(any())).thenReturn(RegionInfo);<a name="line.539"></a>
-<span class="sourceLineNo">540</span>    when(masterServices.getAssignmentManager().getRegionStates()<a name="line.540"></a>
-<span class="sourceLineNo">541</span>      .getRegionServerOfRegion(any())).thenReturn(sn);<a name="line.541"></a>
-<span class="sourceLineNo">542</span>    when(masterServices.getAssignmentManager().getRegionStates()<a name="line.542"></a>
-<span class="sourceLineNo">543</span>      .getRegionState(any(RegionInfo.class))).thenReturn(<a name="line.543"></a>
-<span class="sourceLineNo">544</span>        RegionState.createForTesting(null, RegionState.State.OPEN));<a name="line.544"></a>
+<span class="sourceLineNo">518</span>    for (NormalizationPlan plan : plans) {<a name="line.518"></a>
+<span class="sourceLineNo">519</span>      assertTrue(plan instanceof SplitNormalizationPlan);<a name="line.519"></a>
+<span class="sourceLineNo">520</span>    }<a name="line.520"></a>
+<span class="sourceLineNo">521</span><a name="line.521"></a>
+<span class="sourceLineNo">522</span>    // test when target region count is 3<a name="line.522"></a>
+<span class="sourceLineNo">523</span>    when(masterServices.getTableDescriptors().get(any()).getNormalizerTargetRegionCount())<a name="line.523"></a>
+<span class="sourceLineNo">524</span>        .thenReturn(3);<a name="line.524"></a>
+<span class="sourceLineNo">525</span>    plans = normalizer.computePlanForTable(tableName);<a name="line.525"></a>
+<span class="sourceLineNo">526</span>    assertEquals(1, plans.size());<a name="line.526"></a>
+<span class="sourceLineNo">527</span>    NormalizationPlan plan = plans.get(0);<a name="line.527"></a>
+<span class="sourceLineNo">528</span>    assertTrue(plan instanceof MergeNormalizationPlan);<a name="line.528"></a>
+<span class="sourceLineNo">529</span>    assertEquals(hri1, ((MergeNormalizationPlan) plan).getFirstRegion());<a name="line.529"></a>
+<span class="sourceLineNo">530</span>    assertEquals(hri2, ((MergeNormalizationPlan) plan).getSecondRegion());<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>  @Test<a name="line.533"></a>
+<span class="sourceLineNo">534</span>  public void testSplitIfTooFewRegions() throws HBaseIOException {<a name="line.534"></a>
+<span class="sourceLineNo">535</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.535"></a>
+<span class="sourceLineNo">536</span>    List&lt;RegionInfo&gt; RegionInfo = new ArrayList&lt;&gt;();<a name="line.536"></a>
+<span class="sourceLineNo">537</span>    Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.537"></a>
+<span class="sourceLineNo">538</span><a name="line.538"></a>
+<span class="sourceLineNo">539</span>    RegionInfo hri1 = RegionInfoBuilder.newBuilder(tableName)<a name="line.539"></a>
+<span class="sourceLineNo">540</span>        .setStartKey(Bytes.toBytes("aaa"))<a name="line.540"></a>
+<span class="sourceLineNo">541</span>        .setEndKey(Bytes.toBytes("bbb"))<a name="line.541"></a>
+<span class="sourceLineNo">542</span>        .build();<a name="line.542"></a>
+<span class="sourceLineNo">543</span>    RegionInfo.add(hri1);<a name="line.543"></a>
+<span class="sourceLineNo">544</span>    regionSizes.put(hri1.getRegionName(), 1);<a name="line.544"></a>
 <span class="sourceLineNo">545</span><a name="line.545"></a>
-<span class="sourceLineNo">546</span>    for (Map.Entry&lt;byte[], Integer&gt; region : regionSizes.entrySet()) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span>      RegionMetrics regionLoad = Mockito.mock(RegionMetrics.class);<a name="line.547"></a>
-<span class="sourceLineNo">548</span>      when(regionLoad.getRegionName()).thenReturn(region.getKey());<a name="line.548"></a>
-<span class="sourceLineNo">549</span>      when(regionLoad.getStoreFileSize())<a name="line.549"></a>
-<span class="sourceLineNo">550</span>        .thenReturn(new Size(region.getValue(), Size.Unit.MEGABYTE));<a name="line.550"></a>
-<span class="sourceLineNo">551</span><a name="line.551"></a>
-<span class="sourceLineNo">552</span>      // this is possibly broken with jdk9, unclear if false positive or not<a name="line.552"></a>
-<span class="sourceLineNo">553</span>      // suppress it for now, fix it when we get to running tests on 9<a name="line.553"></a>
-<span class="sourceLineNo">554</span>      // see: http://errorprone.info/bugpattern/MockitoCast<a name="line.554"></a>
-<span class="sourceLineNo">555</span>      when((Object) masterServices.getServerManager().getLoad(sn)<a name="line.555"></a>
-<span class="sourceLineNo">556</span>        .getRegionMetrics().get(region.getKey())).thenReturn(regionLoad);<a name="line.556"></a>
-<span class="sourceLineNo">557</span>    }<a name="line.557"></a>
-<span class="sourceLineNo">558</span>    try {<a name="line.558"></a>
-<span class="sourceLineNo">559</span>      when(masterRpcServices.isSplitOrMergeEnabled(any(),<a name="line.559"></a>
-<span class="sourceLineNo">560</span>        any())).thenReturn(<a name="line.560"></a>
-<span class="sourceLineNo">561</span>          IsSplitOrMergeEnabledResponse.newBuilder().setEnabled(true).build());<a name="line.561"></a>
-<span class="sourceLineNo">562</span>    } catch (ServiceException se) {<a name="line.562"></a>
-<span class="sourceLineNo">563</span>      LOG.debug("error setting isSplitOrMergeEnabled switch", se);<a name="line.563"></a>
-<span class="sourceLineNo">564</span>    }<a name="line.564"></a>
+<span class="sourceLineNo">546</span>    RegionInfo hri2 = RegionInfoBuilder.newBuilder(tableName)<a name="line.546"></a>
+<span class="sourceLineNo">547</span>        .setStartKey(Bytes.toBytes("bbb"))<a name="line.547"></a>
+<span class="sourceLineNo">548</span>        .setEndKey(Bytes.toBytes("ccc"))<a name="line.548"></a>
+<span class="sourceLineNo">549</span>        .build();<a name="line.549"></a>
+<span class="sourceLineNo">550</span>    RegionInfo.add(hri2);<a name="line.550"></a>
+<span class="sourceLineNo">551</span>    regionSizes.put(hri2.getRegionName(), 1);<a name="line.551"></a>
+<span class="sourceLineNo">552</span>    // the third region is huge one<a name="line.552"></a>
+<span class="sourceLineNo">553</span>    RegionInfo hri3 = RegionInfoBuilder.newBuilder(tableName)<a name="line.553"></a>
+<span class="sourceLineNo">554</span>        .setStartKey(Bytes.toBytes("ccc"))<a name="line.554"></a>
+<span class="sourceLineNo">555</span>        .setEndKey(Bytes.toBytes("ddd"))<a name="line.555"></a>
+<span class="sourceLineNo">556</span>        .build();<a name="line.556"></a>
+<span class="sourceLineNo">557</span>    RegionInfo.add(hri3);<a name="line.557"></a>
+<span class="sourceLineNo">558</span>    regionSizes.put(hri3.getRegionName(), 10);<a name="line.558"></a>
+<span class="sourceLineNo">559</span><a name="line.559"></a>
+<span class="sourceLineNo">560</span>    setupMocksForNormalizer(regionSizes, RegionInfo);<a name="line.560"></a>
+<span class="sourceLineNo">561</span><a name="line.561"></a>
+<span class="sourceLineNo">562</span>    Configuration configuration = HBaseConfiguration.create();<a name="line.562"></a>
+<span class="sourceLineNo">563</span>    configuration.setInt(AbstractRegionNormalizer.HBASE_REGION_NORMALIZER_MIN_REGION_COUNT_KEY, 4);<a name="line.563"></a>
+<span class="sourceLineNo">564</span>    when(masterServices.getConfiguration()).thenReturn(configuration);<a name="line.564"></a>
 <span class="sourceLineNo">565</span><a name="line.565"></a>
-<span class="sourceLineNo">566</span>    normalizer = new SimpleRegionNormalizer();<a name="line.566"></a>
-<span class="sourceLineNo">567</span>    normalizer.setMasterServices(masterServices);<a name="line.567"></a>
-<span class="sourceLineNo">568</span>    normalizer.setMasterRpcServices(masterRpcServices);<a name="line.568"></a>
-<span class="sourceLineNo">569</span>  }<a name="line.569"></a>
-<span class="sourceLineNo">570</span>}<a name="line.570"></a>
+<span class="sourceLineNo">566</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlanForTable(tableName);<a name="line.566"></a>
+<span class="sourceLineNo">567</span>    assertNotNull(plans);<a name="line.567"></a>
+<span class="sourceLineNo">568</span>    NormalizationPlan plan = plans.get(0);<a name="line.568"></a>
+<span class="sourceLineNo">569</span>    assertEquals(hri3, ((SplitNormalizationPlan) plan).getRegionInfo());<a name="line.569"></a>
+<span class="sourceLineNo">570</span>  }<a name="line.570"></a>
+<span class="sourceLineNo">571</span><a name="line.571"></a>
+<span class="sourceLineNo">572</span>  @SuppressWarnings("MockitoCast")<a name="line.572"></a>
+<span class="sourceLineNo">573</span>  private void setupMocksForNormalizer(Map&lt;byte[], Integer&gt; regionSizes,<a name="line.573"></a>
+<span class="sourceLineNo">574</span>    List&lt;RegionInfo&gt; RegionInfo) {<a name="line.574"></a>
+<span class="sourceLineNo">575</span>    masterServices = Mockito.mock(MasterServices.class, RETURNS_DEEP_STUBS);<a name="line.575"></a>
+<span class="sourceLineNo">576</span>    final MasterRpcServices masterRpcServices =<a name="line.576"></a>
+<span class="sourceLineNo">577</span>      Mockito.mock(MasterRpcServices.class, RETURNS_DEEP_STUBS);<a name="line.577"></a>
+<span class="sourceLineNo">578</span><a name="line.578"></a>
+<span class="sourceLineNo">579</span>    // for simplicity all regions are assumed to be on one server; doesn't matter to us<a name="line.579"></a>
+<span class="sourceLineNo">580</span>    ServerName sn = ServerName.valueOf("localhost", 0, 1L);<a name="line.580"></a>
+<span class="sourceLineNo">581</span>    when(masterServices.getAssignmentManager().getRegionStates()<a name="line.581"></a>
+<span class="sourceLineNo">582</span>      .getRegionsOfTable(any())).thenReturn(RegionInfo);<a name="line.582"></a>
+<span class="sourceLineNo">583</span>    when(masterServices.getAssignmentManager().getRegionStates()<a name="line.583"></a>
+<span class="sourceLineNo">584</span>      .getRegionServerOfRegion(any())).thenReturn(sn);<a name="line.584"></a>
+<span class="sourceLineNo">585</span>    when(masterServices.getAssignmentManager().getRegionStates()<a name="line.585"></a>
+<span class="sourceLineNo">586</span>      .getRegionState(any(RegionInfo.class))).thenReturn(<a name="line.586"></a>
+<span class="sourceLineNo">587</span>        RegionState.createForTesting(null, RegionState.State.OPEN));<a name="line.587"></a>
+<span class="sourceLineNo">588</span><a name="line.588"></a>
+<span class="sourceLineNo">589</span>    for (Map.Entry&lt;byte[], Integer&gt; region : regionSizes.entrySet()) {<a name="line.589"></a>
+<span class="sourceLineNo">590</span>      RegionMetrics regionLoad = Mockito.mock(RegionMetrics.class);<a name="line.590"></a>
+<span class="sourceLineNo">591</span>      when(regionLoad.getRegionName()).thenReturn(region.getKey());<a name="line.591"></a>
+<span class="sourceLineNo">592</span>      when(regionLoad.getStoreFileSize())<a name="line.592"></a>
+<span class="sourceLineNo">593</span>        .thenReturn(new Size(region.getValue(), Size.Unit.MEGABYTE));<a name="line.593"></a>
+<span class="sourceLineNo">594</span><a name="line.594"></a>
+<span class="sourceLineNo">595</span>      // this is possibly broken with jdk9, unclear if false positive or not<a name="line.595"></a>
+<span class="sourceLineNo">596</span>      // suppress it for now, fix it when we get to running tests on 9<a name="line.596"></a>
+<span class="sourceLineNo">597</span>      // see: http://errorprone.info/bugpattern/MockitoCast<a name="line.597"></a>
+<span class="sourceLineNo">598</span>      when((Object) masterServices.getServerManager().getLoad(sn)<a name="line.598"></a>
+<span class="sourceLineNo">599</span>        .getRegionMetrics().get(region.getKey())).thenReturn(regionLoad);<a name="line.599"></a>
+<span class="sourceLineNo">600</span>    }<a name="line.600"></a>
+<span class="sourceLineNo">601</span>    try {<a name="line.601"></a>
+<span class="sourceLineNo">602</span>      when(masterRpcServices.isSplitOrMergeEnabled(any(),<a name="line.602"></a>
+<span class="sourceLineNo">603</span>        any())).thenReturn(<a name="line.603"></a>
+<span class="sourceLineNo">604</span>          IsSplitOrMergeEnabledResponse.newBuilder().setEnabled(true).build());<a name="line.604"></a>
+<span class="sourceLineNo">605</span>    } catch (ServiceException se) {<a name="line.605"></a>
+<span class="sourceLineNo">606</span>      LOG.debug("error setting isSplitOrMergeEnabled switch", se);<a name="line.606"></a>
+<span class="sourceLineNo">607</span>    }<a name="line.607"></a>
+<span class="sourceLineNo">608</span><a name="line.608"></a>
+<span class="sourceLineNo">609</span>    normalizer = new SimpleRegionNormalizer();<a name="line.609"></a>
+<span class="sourceLineNo">610</span>    normalizer.setMasterServices(masterServices);<a name="line.610"></a>
+<span class="sourceLineNo">611</span>    normalizer.setMasterRpcServices(masterRpcServices);<a name="line.611"></a>
+<span class="sourceLineNo">612</span>  }<a name="line.612"></a>
+<span class="sourceLineNo">613</span>}<a name="line.613"></a>