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/08/12 20:19:32 UTC

[hbase-site] branch asf-site updated: Published site at 2e8120a63fd545e66e9e83cfde8ade80de3d3df0.

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 f4d2a79  Published site at 2e8120a63fd545e66e9e83cfde8ade80de3d3df0.
f4d2a79 is described below

commit f4d2a79b391d39e228f8f526dafcfa76720f6306
Author: jenkins <us...@infra.apache.org>
AuthorDate: Wed Aug 12 20:19:12 2020 +0000

    Published site at 2e8120a63fd545e66e9e83cfde8ade80de3d3df0.
---
 apache_hbase_reference_guide.pdf                   |   4 +-
 book.html                                          |   2 +-
 checkstyle-aggregate.html                          |  12 +-
 devapidocs/index-all.html                          |  27 +-
 .../hadoop/hbase/client/class-use/RegionInfo.html  |   9 +-
 .../hbase/master/class-use/MasterServices.html     |   5 +-
 .../master/normalizer/MergeNormalizationPlan.html  |  71 +-
 .../SimpleRegionNormalizer.NormalizeContext.html   |  20 +-
 .../master/normalizer/SimpleRegionNormalizer.html  |  10 +-
 .../master/normalizer/SplitNormalizationPlan.html  | 106 +--
 .../master/normalizer/MergeNormalizationPlan.html  | 116 ++-
 .../SimpleRegionNormalizer.NormalizeContext.html   | 239 +++---
 .../master/normalizer/SimpleRegionNormalizer.html  | 239 +++---
 .../master/normalizer/SplitNormalizationPlan.html  | 119 +--
 testdevapidocs/index-all.html                      |   2 +
 .../org/apache/hadoop/hbase/TableNameTestRule.html |  15 +-
 .../apache/hadoop/hbase/backup/package-tree.html   |   2 +-
 .../hadoop/hbase/chaos/actions/package-tree.html   |   2 +-
 .../hadoop/hbase/class-use/TableNameTestRule.html  |  28 +-
 .../apache/hadoop/hbase/io/hfile/package-tree.html |   2 +-
 .../normalizer/TestSimpleRegionNormalizer.html     | 131 +--
 .../org/apache/hadoop/hbase/package-tree.html      |  14 +-
 .../org/apache/hadoop/hbase/package-use.html       |   5 +
 .../hadoop/hbase/procedure2/package-tree.html      |   4 +-
 .../hadoop/hbase/regionserver/package-tree.html    |   4 +-
 .../org/apache/hadoop/hbase/test/package-tree.html |   2 +-
 .../org/apache/hadoop/hbase/TableNameTestRule.html |  59 +-
 .../normalizer/TestSimpleRegionNormalizer.html     | 937 ++++++++++-----------
 28 files changed, 1117 insertions(+), 1069 deletions(-)

diff --git a/apache_hbase_reference_guide.pdf b/apache_hbase_reference_guide.pdf
index d73e8ae..d61e390 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:20200812145325+00'00')
-/CreationDate (D:20200812150416+00'00')
+/ModDate (D:20200812200409+00'00')
+/CreationDate (D:20200812201550+00'00')
 >>
 endobj
 2 0 obj
diff --git a/book.html b/book.html
index 4eab687..774cf20 100644
--- a/book.html
+++ b/book.html
@@ -45993,7 +45993,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-08-12 14:53:25 UTC
+Last updated 2020-08-12 20:04:09 UTC
 </div>
 </div>
 <script type="text/x-mathjax-config">
diff --git a/checkstyle-aggregate.html b/checkstyle-aggregate.html
index 573f392..f562ba9 100644
--- a/checkstyle-aggregate.html
+++ b/checkstyle-aggregate.html
@@ -7379,7 +7379,7 @@
 <tr class="a">
 <td>annotation</td>
 <td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_annotation.html#MissingDeprecated">MissingDeprecated</a></td>
-<td>7</td>
+<td>5</td>
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td></tr>
 <tr class="b">
 <td>blocks</td>
@@ -7483,7 +7483,7 @@
 <tr class="b">
 <td></td>
 <td><a class="externalLink" href="http://checkstyle.sourceforge.net/config_javadoc.html#NonEmptyAtclauseDescription">NonEmptyAtclauseDescription</a></td>
-<td>2331</td>
+<td>2333</td>
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td></tr>
 <tr class="a">
 <td>misc</td>
@@ -40464,14 +40464,14 @@
 <th>Line</th></tr>
 <tr class="a">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
-<td>annotation</td>
-<td>MissingDeprecated</td>
+<td>javadoc</td>
+<td>NonEmptyAtclauseDescription</td>
 <td>Javadoc comment at column 0 has parse error. Details: no viable alternative at input '   *' while parsing JAVADOC_TAG</td>
 <td>631</td></tr>
 <tr class="b">
 <td><img src="images/icon_error_sml.gif" alt="" />&#160;Error</td>
-<td>annotation</td>
-<td>MissingDeprecated</td>
+<td>javadoc</td>
+<td>NonEmptyAtclauseDescription</td>
 <td>Javadoc comment at column 0 has parse error. Details: no viable alternative at input '   *' while parsing JAVADOC_TAG</td>
 <td>642</td></tr>
 <tr class="a">
diff --git a/devapidocs/index-all.html b/devapidocs/index-all.html
index a4ada77..97d65df 100644
--- a/devapidocs/index-all.html
+++ b/devapidocs/index-all.html
@@ -29558,6 +29558,10 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/balancer/ServerAndLoad.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class org.apache.hadoop.hbase.master.balancer.<a href="org/apache/hadoop/hbase/master/balancer/ServerAndLoad.html" title="class in org.apache.hadoop.hbase.master.balancer">ServerAndLoad</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html" title="class in org.apache.hadoop.hbase.master.normalizer">MergeNormalizationPlan</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html" title="class in org.apache.hadoop.hbase.master.normalizer">SplitNormalizationPlan</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/RegionPlan.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/RegionPlan.html" title="class in org.apache.hadoop.hbase.master">RegionPlan</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/RegionsRecoveryChore.html#equals-java.lang.Object-">equals(Object)</a></span> - Method in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/RegionsRecoveryChore.html" title="class in org.apache.hadoop.hbase.master">RegionsRecoveryChore</a></dt>
@@ -52007,8 +52011,6 @@
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/MetricsMasterWrapperImpl.html#getSplitPlanCount--">getSplitPlanCount()</a></span> - Method in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/MetricsMasterWrapperImpl.html" title="class in org.apache.hadoop.hbase.master">MetricsMasterWrapperImpl</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#getSplitPoint--">getSplitPoint()</a></span> - Method in class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html" title="class in org.apache.hadoop.hbase.master.normalizer">SplitNormalizationPlan</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/regionserver/DefaultStoreFileManager.html#getSplitPoint--">getSplitPoint()</a></span> - Method in class org.apache.hadoop.hbase.regionserver.<a href="org/apache/hadoop/hbase/regionserver/DefaultStoreFileManager.html" title="class in org.apache.hadoop.hbase.regionserver">DefaultStoreFileManager</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/regionserver/DelimitedKeyPrefixRegionSplitPolicy.html#getSplitPoint--">getSplitPoint()</a></span> - Method in class org.apache.hadoop.hbase.regionserver.<a href="org/apache/hadoop/hbase/regionserver/DelimitedKeyPrefixRegionSplitPolicy.html" title="class in org.apache.hadoop.hbase.regionserver">DelimitedKeyPrefixRegionSplitPolicy</a></dt>
@@ -57556,6 +57558,10 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/balancer/ServerAndLoad.html#hashCode--">hashCode()</a></span> - Method in class org.apache.hadoop.hbase.master.balancer.<a href="org/apache/hadoop/hbase/master/balancer/ServerAndLoad.html" title="class in org.apache.hadoop.hbase.master.balancer">ServerAndLoad</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html#hashCode--">hashCode()</a></span> - Method in class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html" title="class in org.apache.hadoop.hbase.master.normalizer">MergeNormalizationPlan</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#hashCode--">hashCode()</a></span> - Method in class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html" title="class in org.apache.hadoop.hbase.master.normalizer">SplitNormalizationPlan</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/RegionPlan.html#hashCode--">hashCode()</a></span> - Method in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/RegionPlan.html" title="class in org.apache.hadoop.hbase.master">RegionPlan</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/RegionsRecoveryChore.html#hashCode--">hashCode()</a></span> - Method in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/RegionsRecoveryChore.html" title="class in org.apache.hadoop.hbase.master">RegionsRecoveryChore</a></dt>
@@ -71473,14 +71479,10 @@
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 &nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html" title="class in org.apache.hadoop.hbase.master.normalizer">MergeNormalizationPlan</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/RegionNormalizerChore.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/RegionNormalizerChore.html" title="class in org.apache.hadoop.hbase.master.normalizer">RegionNormalizerChore</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#LOG">LOG</a></span> - Static 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>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html" title="class in org.apache.hadoop.hbase.master.normalizer">SplitNormalizationPlan</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.master.procedure.<a href="org/apache/hadoop/hbase/master/procedure/CloneSnapshotProcedure.html" title="class in org.apache.hadoop.hbase.master.procedure">CloneSnapshotProcedure</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/procedure/CreateNamespaceProcedure.html#LOG">LOG</a></span> - Static variable in class org.apache.hadoop.hbase.master.procedure.<a href="org/apache/hadoop/hbase/master/procedure/CreateNamespaceProcedure.html" title="class in org.apache.hadoop.hbase.master.procedure">CreateNamespaceProcedure</a></dt>
@@ -107798,8 +107800,6 @@ service.</div>
 <dd>
 <div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 &nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#setRegionInfo-org.apache.hadoop.hbase.client.RegionInfo-">setRegionInfo(RegionInfo)</a></span> - Method in class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html" title="class in org.apache.hadoop.hbase.master.normalizer">SplitNormalizationPlan</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/assignment/RegionStateNode.html#setRegionLocation-org.apache.hadoop.hbase.ServerName-">setRegionLocation(ServerName)</a></span> - Method in class org.apache.hadoop.hbase.master.assignment.<a href="org/apache/hadoop/hbase/master/assignment/RegionStateNode.html" title="class in org.apache.hadoop.hbase.master.assignment">RegionStateNode</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/TableDescriptorBuilder.ModifyableTableDescriptor.html#setRegionMemStoreReplication-boolean-">setRegionMemStoreReplication(boolean)</a></span> - Method in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TableDescriptorBuilder.ModifyableTableDescriptor.html" title="class in org.apache.hadoop.hbase.client">TableDescriptorBuilder.ModifyableTableDescriptor</a></dt>
@@ -108480,8 +108480,6 @@ service.</div>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.html#setSplitOrMergeOn-boolean-boolean-org.apache.hadoop.hbase.client.MasterSwitchType-">setSplitOrMergeOn(boolean, boolean, MasterSwitchType)</a></span> - Method in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/RawAsyncHBaseAdmin.html" title="class in org.apache.hadoop.hbase.client">RawAsyncHBaseAdmin</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#setSplitPoint-byte:A-">setSplitPoint(byte[])</a></span> - Method in class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html" title="class in org.apache.hadoop.hbase.master.normalizer">SplitNormalizationPlan</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/RegionStatesCount.RegionStatesCountBuilder.html#setSplitRegions-int-">setSplitRegions(int)</a></span> - Method in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/RegionStatesCount.RegionStatesCountBuilder.html" title="class in org.apache.hadoop.hbase.client">RegionStatesCount.RegionStatesCountBuilder</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/RegionStatesCount.html#setSplitRegions-int-">setSplitRegions(int)</a></span> - Method in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/RegionStatesCount.html" title="class in org.apache.hadoop.hbase.client">RegionStatesCount</a></dt>
@@ -113012,7 +113010,7 @@ service.</div>
 <dd>
 <div class="block">Normalization plan to split region.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#SplitNormalizationPlan-org.apache.hadoop.hbase.client.RegionInfo-byte:A-">SplitNormalizationPlan(RegionInfo, byte[])</a></span> - Constructor for class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html" title="class in org.apache.hadoop.hbase.master.normalizer">SplitNormalizationPlan</a></dt>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#SplitNormalizationPlan-org.apache.hadoop.hbase.client.RegionInfo-">SplitNormalizationPlan(RegionInfo)</a></span> - Constructor for class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html" title="class in org.apache.hadoop.hbase.master.normalizer">SplitNormalizationPlan</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/HMaster.html#splitOrMergeTracker">splitOrMergeTracker</a></span> - Variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a></dt>
 <dd>&nbsp;</dd>
@@ -113036,8 +113034,6 @@ service.</div>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/HMaster.html#splitPlanCount">splitPlanCount</a></span> - Variable in class org.apache.hadoop.hbase.master.<a href="org/apache/hadoop/hbase/master/HMaster.html" title="class in org.apache.hadoop.hbase.master">HMaster</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#splitPoint">splitPoint</a></span> - Variable in class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html" title="class in org.apache.hadoop.hbase.master.normalizer">SplitNormalizationPlan</a></dt>
-<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html#splitPolicy">splitPolicy</a></span> - Variable in class org.apache.hadoop.hbase.master.assignment.<a href="org/apache/hadoop/hbase/master/assignment/SplitTableRegionProcedure.html" title="class in org.apache.hadoop.hbase.master.assignment">SplitTableRegionProcedure</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/regionserver/HRegion.html#splitPolicy">splitPolicy</a></span> - Variable in class org.apache.hadoop.hbase.regionserver.<a href="org/apache/hadoop/hbase/regionserver/HRegion.html" title="class in org.apache.hadoop.hbase.regionserver">HRegion</a></dt>
@@ -115734,10 +115730,7 @@ service.</div>
  returns proc Id to caller.</div>
 </dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#submit-org.apache.hadoop.hbase.master.MasterServices-">submit(MasterServices)</a></span> - Method in class org.apache.hadoop.hbase.master.normalizer.<a href="org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html" title="class in org.apache.hadoop.hbase.master.normalizer">SplitNormalizationPlan</a></dt>
-<dd>
-<div class="block">Submits normalization plan on cluster (does actual splitting/merging work) and
- returns proc Id to caller.</div>
-</dd>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/util/BoundedCompletionService.html#submit-java.util.concurrent.Callable-">submit(Callable&lt;V&gt;)</a></span> - Method in class org.apache.hadoop.hbase.util.<a href="org/apache/hadoop/hbase/util/BoundedCompletionService.html" title="class in org.apache.hadoop.hbase.util">BoundedCompletionService</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/procedure/ProcedureSyncWait.html#submitAndWaitProcedure-org.apache.hadoop.hbase.procedure2.ProcedureExecutor-org.apache.hadoop.hbase.procedure2.Procedure-">submitAndWaitProcedure(ProcedureExecutor&lt;MasterProcedureEnv&gt;, Procedure&lt;MasterProcedureEnv&gt;)</a></span> - Static method in class org.apache.hadoop.hbase.master.procedure.<a href="org/apache/hadoop/hbase/master/procedure/ProcedureSyncWait.html" title=" [...]
diff --git a/devapidocs/org/apache/hadoop/hbase/client/class-use/RegionInfo.html b/devapidocs/org/apache/hadoop/hbase/client/class-use/RegionInfo.html
index 78a57af..cbf0331 100644
--- a/devapidocs/org/apache/hadoop/hbase/client/class-use/RegionInfo.html
+++ b/devapidocs/org/apache/hadoop/hbase/client/class-use/RegionInfo.html
@@ -4416,17 +4416,13 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><span class="typeNameLabel">SplitNormalizationPlan.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#setRegionInfo-org.apache.hadoop.hbase.client.RegionInfo-">setRegionInfo</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;regionInfo)</code>&nbsp;</td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><code>private boolean</code></td>
 <td class="colLast"><span class="typeNameLabel">SimpleRegionNormalizer.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#skipForMerge-org.apache.hadoop.hbase.master.assignment.RegionStates-org.apache.hadoop.hbase.client.RegionInfo-">skipForMerge</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html" title="class in org.apache.hadoop.hbase.master.assignment" [...]
             <a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;regionInfo)</code>
 <div class="block">Determine if a <a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client"><code>RegionInfo</code></a> should be considered for a merge operation.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><code>private static boolean</code></td>
 <td class="colLast"><span class="typeNameLabel">SimpleRegionNormalizer.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#skipForSplit-org.apache.hadoop.hbase.master.RegionState-org.apache.hadoop.hbase.client.RegionInfo-">skipForSplit</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/master/RegionState.html" title="class in org.apache.hadoop.hbase.master">RegionState</a>&nbsp;state,
             <a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;regionInfo)</code>
@@ -4459,8 +4455,7 @@ Input/OutputFormats, a table indexing MapReduce job, and utility methods.</div>
                       <a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;secondRegion)</code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#SplitNormalizationPlan-org.apache.hadoop.hbase.client.RegionInfo-byte:A-">SplitNormalizationPlan</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;regionInfo,
-                      byte[]&nbsp;splitPoint)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#SplitNormalizationPlan-org.apache.hadoop.hbase.client.RegionInfo-">SplitNormalizationPlan</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;regionInfo)</code>&nbsp;</td>
 </tr>
 </tbody>
 </table>
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 3465184..19ed95c 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/class-use/MasterServices.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/class-use/MasterServices.html
@@ -708,10 +708,7 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>long</code></td>
-<td class="colLast"><span class="typeNameLabel">SplitNormalizationPlan.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#submit-org.apache.hadoop.hbase.master.MasterServices-">submit</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">Submits normalization plan on cluster (does actual splitting/merging work) and
- returns proc Id to caller.</div>
-</td>
+<td class="colLast"><span class="typeNameLabel">SplitNormalizationPlan.</span><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#submit-org.apache.hadoop.hbase.master.MasterServices-">submit</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>
diff --git a/devapidocs/org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html b/devapidocs/org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html
index 3917ef5..c683f21 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.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,"i6":10};
 var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -114,7 +114,7 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>@InterfaceAudience.Private
-public class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html#line.34">MergeNormalizationPlan</a>
+public class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html#line.35">MergeNormalizationPlan</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/NormalizationPlan.html" title="interface in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan</a></pre>
 <div class="block">Normalization plan to merge regions (smallest region in the table with its smallest neighbor).</div>
@@ -156,10 +156,6 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html#firstRegion">firstRegion</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<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/MergeNormalizationPlan.html#LOG">LOG</a></span></code>&nbsp;</td>
-</tr>
-<tr class="altColor">
 <td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html#secondRegion">secondRegion</a></span></code>&nbsp;</td>
 </tr>
@@ -197,25 +193,33 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html#equals-java.lang.Object-">equals</a></span>(<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>&nbsp;o)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
 <td class="colFirst"><code>(package private) <a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html#getFirstRegion--">getFirstRegion</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr id="i2" class="altColor">
 <td class="colFirst"><code>(package private) <a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html#getSecondRegion--">getSecondRegion</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.PlanType.html" title="enum in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan.PlanType</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html#getType--">getType</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html#hashCode--">hashCode</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code>long</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html#submit-org.apache.hadoop.hbase.master.MasterServices-">submit</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">Submits normalization plan on cluster (does actual splitting/merging work) and
  returns proc Id to caller.</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code><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/MergeNormalizationPlan.html#toString--">toString</a></span>()</code>&nbsp;</td>
 </tr>
@@ -225,7 +229,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
-<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="htt [...]
+<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="https://docs.or [...]
 </ul>
 </li>
 </ul>
@@ -241,15 +245,6 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <!--   -->
 </a>
 <h3>Field Detail</h3>
-<a name="LOG">
-<!--   -->
-</a>
-<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/MergeNormalizationPlan.html#line.35">LOG</a></pre>
-</li>
-</ul>
 <a name="firstRegion">
 <!--   -->
 </a>
@@ -322,7 +317,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <ul class="blockList">
 <li class="blockList">
 <h4>getType</h4>
-<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.PlanType.html" title="enum in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan.PlanType</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html#line.60">getType</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.PlanType.html" title="enum in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan.PlanType</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html#line.59">getType</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.html#getType--">getType</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.html" title="interface in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan</a></code></dd>
@@ -337,7 +332,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <ul class="blockList">
 <li class="blockList">
 <h4>getFirstRegion</h4>
-<pre><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/master/normalizer/MergeNormalizationPlan.html#line.64">getFirstRegion</a>()</pre>
+<pre><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/master/normalizer/MergeNormalizationPlan.html#line.63">getFirstRegion</a>()</pre>
 </li>
 </ul>
 <a name="getSecondRegion--">
@@ -346,22 +341,48 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <ul class="blockList">
 <li class="blockList">
 <h4>getSecondRegion</h4>
-<pre><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/master/normalizer/MergeNormalizationPlan.html#line.68">getSecondRegion</a>()</pre>
+<pre><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/master/normalizer/MergeNormalizationPlan.html#line.67">getSecondRegion</a>()</pre>
 </li>
 </ul>
 <a name="toString--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<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/master/normalizer/MergeNormalizationPlan.html#line.73">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/master/normalizer/MergeNormalizationPlan.html#line.72">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>
 </dl>
 </li>
 </ul>
+<a name="equals-java.lang.Object-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>equals</h4>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html#line.80">equals</a>(<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>&nbsp;o)</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#equals-java.lang.Object-" title="class or interface in java.lang">equals</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>
+</dl>
+</li>
+</ul>
+<a name="hashCode--">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>hashCode</h4>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html#line.98">hashCode</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#hashCode--" title="class or interface in java.lang">hashCode</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>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>
diff --git a/devapidocs/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html b/devapidocs/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html
index 56eb5f9..09c024d 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html
@@ -113,7 +113,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>private class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.452">SimpleRegionNormalizer.NormalizeContext</a>
+<pre>private class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.453">SimpleRegionNormalizer.NormalizeContext</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">Inner class caries the state necessary to perform a single invocation of
  <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#computePlansForTable-org.apache.hadoop.hbase.TableName-"><code>SimpleRegionNormalizer.computePlansForTable(TableName)</code></a>. Grabbing this data from the assignment manager
@@ -228,7 +228,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>tableName</h4>
-<pre>private final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html#line.453">tableName</a></pre>
+<pre>private final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html#line.454">tableName</a></pre>
 </li>
 </ul>
 <a name="regionStates">
@@ -237,7 +237,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>regionStates</h4>
-<pre>private final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html" title="class in org.apache.hadoop.hbase.master.assignment">RegionStates</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html#line.454">regionStates</a></pre>
+<pre>private final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html" title="class in org.apache.hadoop.hbase.master.assignment">RegionStates</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html#line.455">regionStates</a></pre>
 </li>
 </ul>
 <a name="tableRegions">
@@ -246,7 +246,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>tableRegions</h4>
-<pre>private final&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/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html#line.455">tableRegions</a></pre>
+<pre>private final&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/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&gt; <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html#line.456">tableRegions</a></pre>
 </li>
 </ul>
 <a name="averageRegionSizeMb">
@@ -255,7 +255,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>averageRegionSizeMb</h4>
-<pre>private final&nbsp;double <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html#line.456">averageRegionSizeMb</a></pre>
+<pre>private final&nbsp;double <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html#line.457">averageRegionSizeMb</a></pre>
 </li>
 </ul>
 </li>
@@ -272,7 +272,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>NormalizeContext</h4>
-<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html#line.458">NormalizeContext</a>(<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName)</pre>
+<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html#line.459">NormalizeContext</a>(<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;tableName)</pre>
 </li>
 </ul>
 </li>
@@ -289,7 +289,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getTableName</h4>
-<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html#line.474">getTableName</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html#line.475">getTableName</a>()</pre>
 </li>
 </ul>
 <a name="getRegionStates--">
@@ -298,7 +298,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getRegionStates</h4>
-<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html" title="class in org.apache.hadoop.hbase.master.assignment">RegionStates</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html#line.478">getRegionStates</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/assignment/RegionStates.html" title="class in org.apache.hadoop.hbase.master.assignment">RegionStates</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html#line.479">getRegionStates</a>()</pre>
 </li>
 </ul>
 <a name="getTableRegions--">
@@ -307,7 +307,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>getTableRegions</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/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html#line.482">getTableRegions</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;<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html#line.483">getTableRegions</a>()</pre>
 </li>
 </ul>
 <a name="getAverageRegionSizeMb--">
@@ -316,7 +316,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getAverageRegionSizeMb</h4>
-<pre>public&nbsp;double&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html#line.486">getAverageRegionSizeMb</a>()</pre>
+<pre>public&nbsp;double&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html#line.487">getAverageRegionSizeMb</a>()</pre>
 </li>
 </ul>
 </li>
diff --git a/devapidocs/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html b/devapidocs/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html
index 45f2b57..fb69acd 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html
@@ -977,7 +977,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/SimpleRegionNormalizer.html#line.383">skipForSplit</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/RegionState.html" title="class in org.apache.hadoop.hbase.master">RegionState</a>&nbsp;state,
+<pre>private static&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.384">skipForSplit</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/RegionState.html" title="class in org.apache.hadoop.hbase.master">RegionState</a>&nbsp;state,
                                     <a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;regionInfo)</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>
@@ -988,7 +988,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <ul class="blockList">
 <li class="blockList">
 <h4>computeSplitNormalizationPlans</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;<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.401">computeSplitNormalizationPlans [...]
+<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;<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.402">computeSplitNormalizationPlans [...]
 <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.
  <br />
@@ -1002,7 +1002,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <ul class="blockList">
 <li class="blockList">
 <h4>isOldEnoughForMerge</h4>
-<pre>private&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.424">isOldEnoughForMerge</a>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;regionInfo)</pre>
+<pre>private&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.425">isOldEnoughForMerge</a>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;regionInfo)</pre>
 <div class="block">Return <code>true</code> when <code>regionInfo</code> has a creation date that is old
  enough to be considered for a merge operation, <code>false</code> otherwise.</div>
 </li>
@@ -1013,7 +1013,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <ul class="blockList">
 <li class="blockList">
 <h4>isLargeEnoughForMerge</h4>
-<pre>private&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.434">isLargeEnoughForMerge</a>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;regionInfo)</pre>
+<pre>private&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.435">isLargeEnoughForMerge</a>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;regionInfo)</pre>
 <div class="block">Return <code>true</code> when <code>regionInfo</code> has a size that is sufficient
  to be considered for a merge operation, <code>false</code> otherwise.</div>
 </li>
@@ -1024,7 +1024,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <ul class="blockListLast">
 <li class="blockList">
 <h4>logTraceReason</h4>
-<pre>private static&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.438">logTraceReason</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/BooleanSupplier.html?is-external=true" title="class or interface in java.util.function">BooleanSupplier</a>&nbsp;predicate,
+<pre>private static&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.html#line.439">logTraceReason</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/function/BooleanSupplier.html?is-external=true" title="class or interface in java.util.function">BooleanSupplier</a>&nbsp;predicate,
                                       <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;fmtWhenTrue,
                                       <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>...&nbsp;args)</pre>
 </li>
diff --git a/devapidocs/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html b/devapidocs/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html
index 2d6704e..fb5ec46 100644
--- a/devapidocs/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html
+++ b/devapidocs/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":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";
@@ -114,7 +114,7 @@ var activeTableTab = "activeTableTab";
 <hr>
 <br>
 <pre>@InterfaceAudience.Private
-public class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#line.34">SplitNormalizationPlan</a>
+public class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#line.35">SplitNormalizationPlan</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/NormalizationPlan.html" title="interface in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan</a></pre>
 <div class="block">Normalization plan to split region.</div>
@@ -152,17 +152,9 @@ 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>private static org.slf4j.Logger</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#LOG">LOG</a></span></code>&nbsp;</td>
-</tr>
-<tr class="rowColor">
 <td class="colFirst"><code>private <a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#regionInfo">regionInfo</a></span></code>&nbsp;</td>
 </tr>
-<tr class="altColor">
-<td class="colFirst"><code>private byte[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#splitPoint">splitPoint</a></span></code>&nbsp;</td>
-</tr>
 </table>
 </li>
 </ul>
@@ -178,8 +170,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <th class="colOne" scope="col">Constructor and Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#SplitNormalizationPlan-org.apache.hadoop.hbase.client.RegionInfo-byte:A-">SplitNormalizationPlan</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;regionInfo,
-                      byte[]&nbsp;splitPoint)</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#SplitNormalizationPlan-org.apache.hadoop.hbase.client.RegionInfo-">SplitNormalizationPlan</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;regionInfo)</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -197,33 +188,29 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#getRegionInfo--">getRegionInfo</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code>boolean</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#equals-java.lang.Object-">equals</a></span>(<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>&nbsp;o)</code>&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>byte[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#getSplitPoint--">getSplitPoint</a></span>()</code>&nbsp;</td>
+<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a></code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#getRegionInfo--">getRegionInfo</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.PlanType.html" title="enum in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan.PlanType</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#getType--">getType</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i3" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#setRegionInfo-org.apache.hadoop.hbase.client.RegionInfo-">setRegionInfo</a></span>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;regionInfo)</code>&nbsp;</td>
+<td class="colFirst"><code>int</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#hashCode--">hashCode</a></span>()</code>&nbsp;</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/SplitNormalizationPlan.html#setSplitPoint-byte:A-">setSplitPoint</a></span>(byte[]&nbsp;splitPoint)</code>&nbsp;</td>
-</tr>
-<tr id="i5" class="rowColor">
 <td class="colFirst"><code>long</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#submit-org.apache.hadoop.hbase.master.MasterServices-">submit</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">Submits normalization plan on cluster (does actual splitting/merging work) and
  returns proc Id to caller.</div>
 </td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code><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/SplitNormalizationPlan.html#toString--">toString</a></span>()</code>&nbsp;</td>
 </tr>
@@ -233,7 +220,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></h3>
-<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#equals-java.lang.Object-" title="class or interface in java.lang">equals</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="htt [...]
+<code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#clone--" title="class or interface in java.lang">clone</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#finalize--" title="class or interface in java.lang">finalize</a>, <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#getClass--" title="class or interface in java.lang">getClass</a>, <a href="https://docs.or [...]
 </ul>
 </li>
 </ul>
@@ -249,31 +236,13 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <!--   -->
 </a>
 <h3>Field Detail</h3>
-<a name="LOG">
-<!--   -->
-</a>
-<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/SplitNormalizationPlan.html#line.35">LOG</a></pre>
-</li>
-</ul>
 <a name="regionInfo">
 <!--   -->
 </a>
-<ul class="blockList">
-<li class="blockList">
-<h4>regionInfo</h4>
-<pre>private&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#line.37">regionInfo</a></pre>
-</li>
-</ul>
-<a name="splitPoint">
-<!--   -->
-</a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>splitPoint</h4>
-<pre>private&nbsp;byte[] <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#line.38">splitPoint</a></pre>
+<h4>regionInfo</h4>
+<pre>private final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#line.37">regionInfo</a></pre>
 </li>
 </ul>
 </li>
@@ -284,14 +253,13 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="SplitNormalizationPlan-org.apache.hadoop.hbase.client.RegionInfo-byte:A-">
+<a name="SplitNormalizationPlan-org.apache.hadoop.hbase.client.RegionInfo-">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>SplitNormalizationPlan</h4>
-<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#line.40">SplitNormalizationPlan</a>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;regionInfo,
-                              byte[]&nbsp;splitPoint)</pre>
+<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#line.39">SplitNormalizationPlan</a>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;regionInfo)</pre>
 </li>
 </ul>
 </li>
@@ -308,8 +276,9 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <ul class="blockList">
 <li class="blockList">
 <h4>submit</h4>
-<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#line.49">submit</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a>&nbsp;masterServices)
+<pre>public&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#line.44">submit</a>(<a href="../../../../../../org/apache/hadoop/hbase/master/MasterServices.html" title="interface in org.apache.hadoop.hbase.master">MasterServices</a>&nbsp;masterServices)
             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/master/normalizer/NormalizationPlan.html#submit-org.apache.hadoop.hbase.master.MasterServices-">NormalizationPlan</a></code></span></div>
 <div class="block">Submits normalization plan on cluster (does actual splitting/merging work) and
  returns proc Id to caller.</div>
 <dl>
@@ -330,7 +299,7 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <ul class="blockList">
 <li class="blockList">
 <h4>getType</h4>
-<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.PlanType.html" title="enum in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan.PlanType</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#line.54">getType</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.PlanType.html" title="enum in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan.PlanType</a>&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#line.50">getType</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.html#getType--">getType</a></code>&nbsp;in interface&nbsp;<code><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/NormalizationPlan.html" title="interface in org.apache.hadoop.hbase.master.normalizer">NormalizationPlan</a></code></dd>
@@ -345,46 +314,45 @@ implements <a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/
 <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/master/normalizer/SplitNormalizationPlan.html#line.58">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/master/normalizer/SplitNormalizationPlan.html#line.54">getRegionInfo</a>()</pre>
 </li>
 </ul>
-<a name="setRegionInfo-org.apache.hadoop.hbase.client.RegionInfo-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>setRegionInfo</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#line.62">setRegionInfo</a>(<a href="../../../../../../org/apache/hadoop/hbase/client/RegionInfo.html" title="interface in org.apache.hadoop.hbase.client">RegionInfo</a>&nbsp;regionInfo)</pre>
-</li>
-</ul>
-<a name="getSplitPoint--">
+<a name="toString--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getSplitPoint</h4>
-<pre>public&nbsp;byte[]&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#line.66">getSplitPoint</a>()</pre>
+<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/master/normalizer/SplitNormalizationPlan.html#line.59">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>
+</dl>
 </li>
 </ul>
-<a name="setSplitPoint-byte:A-">
+<a name="equals-java.lang.Object-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>setSplitPoint</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#line.70">setSplitPoint</a>(byte[]&nbsp;splitPoint)</pre>
+<h4>equals</h4>
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#line.66">equals</a>(<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>&nbsp;o)</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#equals-java.lang.Object-" title="class or interface in java.lang">equals</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>
+</dl>
 </li>
 </ul>
-<a name="toString--">
+<a name="hashCode--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <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/master/normalizer/SplitNormalizationPlan.html#line.75">toString</a>()</pre>
+<h4>hashCode</h4>
+<pre>public&nbsp;int&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html#line.82">hashCode</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>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true#hashCode--" title="class or interface in java.lang">hashCode</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>
 </dl>
 </li>
 </ul>
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html
index a994493..b6ccced 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/MergeNormalizationPlan.html
@@ -6,7 +6,7 @@
 </head>
 <body>
 <div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
+<pre><span class="sourceLineNo">001</span>/*<a name="line.1"></a>
 <span class="sourceLineNo">002</span> *<a name="line.2"></a>
 <span class="sourceLineNo">003</span> * Licensed to the Apache Software Foundation (ASF) under one<a name="line.3"></a>
 <span class="sourceLineNo">004</span> * or more contributor license agreements.  See the NOTICE file<a name="line.4"></a>
@@ -27,20 +27,20 @@
 <span class="sourceLineNo">019</span>package org.apache.hadoop.hbase.master.normalizer;<a name="line.19"></a>
 <span class="sourceLineNo">020</span><a name="line.20"></a>
 <span class="sourceLineNo">021</span>import java.io.IOException;<a name="line.21"></a>
-<span class="sourceLineNo">022</span><a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.HConstants;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.slf4j.Logger;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.slf4j.LoggerFactory;<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>/**<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * Normalization plan to merge regions (smallest region in the table with its smallest neighbor).<a name="line.31"></a>
-<span class="sourceLineNo">032</span> */<a name="line.32"></a>
-<span class="sourceLineNo">033</span>@InterfaceAudience.Private<a name="line.33"></a>
-<span class="sourceLineNo">034</span>public class MergeNormalizationPlan implements NormalizationPlan {<a name="line.34"></a>
-<span class="sourceLineNo">035</span>  private static final Logger LOG = LoggerFactory.getLogger(MergeNormalizationPlan.class.getName());<a name="line.35"></a>
+<span class="sourceLineNo">022</span>import org.apache.commons.lang3.builder.EqualsBuilder;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.commons.lang3.builder.HashCodeBuilder;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.commons.lang3.builder.ToStringBuilder;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.commons.lang3.builder.ToStringStyle;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.HConstants;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.29"></a>
+<span class="sourceLineNo">030</span><a name="line.30"></a>
+<span class="sourceLineNo">031</span>/**<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * Normalization plan to merge regions (smallest region in the table with its smallest neighbor).<a name="line.32"></a>
+<span class="sourceLineNo">033</span> */<a name="line.33"></a>
+<span class="sourceLineNo">034</span>@InterfaceAudience.Private<a name="line.34"></a>
+<span class="sourceLineNo">035</span>public class MergeNormalizationPlan implements NormalizationPlan {<a name="line.35"></a>
 <span class="sourceLineNo">036</span><a name="line.36"></a>
 <span class="sourceLineNo">037</span>  private final RegionInfo firstRegion;<a name="line.37"></a>
 <span class="sourceLineNo">038</span>  private final RegionInfo secondRegion;<a name="line.38"></a>
@@ -55,37 +55,61 @@
 <span class="sourceLineNo">047</span>   */<a name="line.47"></a>
 <span class="sourceLineNo">048</span>  @Override<a name="line.48"></a>
 <span class="sourceLineNo">049</span>  public long submit(MasterServices masterServices) throws IOException {<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    LOG.info("Executing merging normalization plan: " + this);<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    // Do not use force=true as corner cases can happen, non adjacent regions,<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    // merge with a merged child region with no GC done yet, it is going to<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    // cause all different issues.<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    return masterServices<a name="line.54"></a>
-<span class="sourceLineNo">055</span>      .mergeRegions(new RegionInfo[] { firstRegion, secondRegion }, false, HConstants.NO_NONCE,<a name="line.55"></a>
-<span class="sourceLineNo">056</span>        HConstants.NO_NONCE);<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>  @Override<a name="line.59"></a>
-<span class="sourceLineNo">060</span>  public PlanType getType() {<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    return PlanType.MERGE;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>  }<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>  RegionInfo getFirstRegion() {<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    return firstRegion;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  }<a name="line.66"></a>
-<span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span>  RegionInfo getSecondRegion() {<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    return secondRegion;<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>  @Override<a name="line.72"></a>
-<span class="sourceLineNo">073</span>  public String toString() {<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    return "MergeNormalizationPlan{" +<a name="line.74"></a>
-<span class="sourceLineNo">075</span>      "firstRegion=" + firstRegion +<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      ", secondRegion=" + secondRegion +<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      '}';<a name="line.77"></a>
-<span class="sourceLineNo">078</span>  }<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span>}<a name="line.80"></a>
+<span class="sourceLineNo">050</span>    // Do not use force=true as corner cases can happen, non adjacent regions,<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    // merge with a merged child region with no GC done yet, it is going to<a name="line.51"></a>
+<span class="sourceLineNo">052</span>    // cause all different issues.<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    return masterServices<a name="line.53"></a>
+<span class="sourceLineNo">054</span>      .mergeRegions(new RegionInfo[] { firstRegion, secondRegion }, false, HConstants.NO_NONCE,<a name="line.54"></a>
+<span class="sourceLineNo">055</span>        HConstants.NO_NONCE);<a name="line.55"></a>
+<span class="sourceLineNo">056</span>  }<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>  @Override<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  public PlanType getType() {<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    return PlanType.MERGE;<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>  RegionInfo getFirstRegion() {<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    return firstRegion;<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>  RegionInfo getSecondRegion() {<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    return secondRegion;<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>  @Override<a name="line.71"></a>
+<span class="sourceLineNo">072</span>  public String toString() {<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      .append("firstRegion", firstRegion)<a name="line.74"></a>
+<span class="sourceLineNo">075</span>      .append("secondRegion", secondRegion)<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      .toString();<a name="line.76"></a>
+<span class="sourceLineNo">077</span>  }<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span>  @Override<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  public boolean equals(Object o) {<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    if (this == o) {<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      return true;<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>    if (o == null || getClass() != o.getClass()) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span>      return false;<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>    MergeNormalizationPlan that = (MergeNormalizationPlan) o;<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span>    return new EqualsBuilder()<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      .append(firstRegion, that.firstRegion)<a name="line.92"></a>
+<span class="sourceLineNo">093</span>      .append(secondRegion, that.secondRegion)<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      .isEquals();<a name="line.94"></a>
+<span class="sourceLineNo">095</span>  }<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span>  @Override<a name="line.97"></a>
+<span class="sourceLineNo">098</span>  public int hashCode() {<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    return new HashCodeBuilder(17, 37)<a name="line.99"></a>
+<span class="sourceLineNo">100</span>      .append(firstRegion)<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      .append(secondRegion)<a name="line.101"></a>
+<span class="sourceLineNo">102</span>      .toHashCode();<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>
 
 
 
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html
index 135eadd..6cc1d3c 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/SimpleRegionNormalizer.NormalizeContext.html
@@ -377,125 +377,126 @@
 <span class="sourceLineNo">369</span>      }<a name="line.369"></a>
 <span class="sourceLineNo">370</span>      final long currentSizeMb = getRegionSizeMB(current);<a name="line.370"></a>
 <span class="sourceLineNo">371</span>      final long nextSizeMb = getRegionSizeMB(next);<a name="line.371"></a>
-<span class="sourceLineNo">372</span>      if (currentSizeMb + nextSizeMb &lt; avgRegionSizeMb) {<a name="line.372"></a>
-<span class="sourceLineNo">373</span>        plans.add(new MergeNormalizationPlan(current, next));<a name="line.373"></a>
-<span class="sourceLineNo">374</span>        candidateIdx++;<a name="line.374"></a>
-<span class="sourceLineNo">375</span>      }<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    }<a name="line.376"></a>
-<span class="sourceLineNo">377</span>    return plans;<a name="line.377"></a>
-<span class="sourceLineNo">378</span>  }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span>  /**<a name="line.380"></a>
-<span class="sourceLineNo">381</span>   * Determine if a region in {@link RegionState} should be considered for a split operation.<a name="line.381"></a>
-<span class="sourceLineNo">382</span>   */<a name="line.382"></a>
-<span class="sourceLineNo">383</span>  private static boolean skipForSplit(final RegionState state, final RegionInfo regionInfo) {<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    final String name = regionInfo.getEncodedName();<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    return<a name="line.385"></a>
-<span class="sourceLineNo">386</span>      logTraceReason(<a name="line.386"></a>
-<span class="sourceLineNo">387</span>        () -&gt; state == null,<a name="line.387"></a>
-<span class="sourceLineNo">388</span>        "skipping split of region {} because no state information is available.", name)<a name="line.388"></a>
-<span class="sourceLineNo">389</span>        || logTraceReason(<a name="line.389"></a>
-<span class="sourceLineNo">390</span>          () -&gt; !Objects.equals(state.getState(), RegionState.State.OPEN),<a name="line.390"></a>
-<span class="sourceLineNo">391</span>          "skipping merge of region {} because it is not open.", name);<a name="line.391"></a>
-<span class="sourceLineNo">392</span>  }<a name="line.392"></a>
-<span class="sourceLineNo">393</span><a name="line.393"></a>
-<span class="sourceLineNo">394</span>  /**<a name="line.394"></a>
-<span class="sourceLineNo">395</span>   * Computes the split plans that should be executed for this table to converge average region size<a name="line.395"></a>
-<span class="sourceLineNo">396</span>   * towards target average or target region count.<a name="line.396"></a>
-<span class="sourceLineNo">397</span>   * &lt;br /&gt;<a name="line.397"></a>
-<span class="sourceLineNo">398</span>   * if the region is &gt; 2 times larger than average, we split it. split<a name="line.398"></a>
-<span class="sourceLineNo">399</span>   * is more high priority normalization action than merge.<a name="line.399"></a>
-<span class="sourceLineNo">400</span>   */<a name="line.400"></a>
-<span class="sourceLineNo">401</span>  private List&lt;NormalizationPlan&gt; computeSplitNormalizationPlans(final NormalizeContext ctx) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    final double avgRegionSize = ctx.getAverageRegionSizeMb();<a name="line.402"></a>
-<span class="sourceLineNo">403</span>    LOG.debug("Table {}, average region size: {}", ctx.getTableName(), avgRegionSize);<a name="line.403"></a>
-<span class="sourceLineNo">404</span><a name="line.404"></a>
-<span class="sourceLineNo">405</span>    final List&lt;NormalizationPlan&gt; plans = new ArrayList&lt;&gt;();<a name="line.405"></a>
-<span class="sourceLineNo">406</span>    for (final RegionInfo hri : ctx.getTableRegions()) {<a name="line.406"></a>
-<span class="sourceLineNo">407</span>      if (skipForSplit(ctx.getRegionStates().getRegionState(hri), hri)) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>        continue;<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      }<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      final long regionSize = getRegionSizeMB(hri);<a name="line.410"></a>
-<span class="sourceLineNo">411</span>      if (regionSize &gt; 2 * avgRegionSize) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span>        LOG.info("Table {}, large region {} has size {}, more than twice avg size {}, splitting",<a name="line.412"></a>
-<span class="sourceLineNo">413</span>          ctx.getTableName(), hri.getRegionNameAsString(), regionSize, avgRegionSize);<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        plans.add(new SplitNormalizationPlan(hri, null));<a name="line.414"></a>
-<span class="sourceLineNo">415</span>      }<a name="line.415"></a>
-<span class="sourceLineNo">416</span>    }<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    return plans;<a name="line.417"></a>
-<span class="sourceLineNo">418</span>  }<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span>  /**<a name="line.420"></a>
-<span class="sourceLineNo">421</span>   * Return {@code true} when {@code regionInfo} has a creation date that is old<a name="line.421"></a>
-<span class="sourceLineNo">422</span>   * enough to be considered for a merge operation, {@code false} otherwise.<a name="line.422"></a>
-<span class="sourceLineNo">423</span>   */<a name="line.423"></a>
-<span class="sourceLineNo">424</span>  private boolean isOldEnoughForMerge(final RegionInfo regionInfo) {<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    final Instant currentTime = Instant.ofEpochMilli(EnvironmentEdgeManager.currentTime());<a name="line.425"></a>
-<span class="sourceLineNo">426</span>    final Instant regionCreateTime = Instant.ofEpochMilli(regionInfo.getRegionId());<a name="line.426"></a>
-<span class="sourceLineNo">427</span>    return currentTime.isAfter(regionCreateTime.plus(mergeMinRegionAge));<a name="line.427"></a>
-<span class="sourceLineNo">428</span>  }<a name="line.428"></a>
-<span class="sourceLineNo">429</span><a name="line.429"></a>
-<span class="sourceLineNo">430</span>  /**<a name="line.430"></a>
-<span class="sourceLineNo">431</span>   * Return {@code true} when {@code regionInfo} has a size that is sufficient<a name="line.431"></a>
-<span class="sourceLineNo">432</span>   * to be considered for a merge operation, {@code false} otherwise.<a name="line.432"></a>
-<span class="sourceLineNo">433</span>   */<a name="line.433"></a>
-<span class="sourceLineNo">434</span>  private boolean isLargeEnoughForMerge(final RegionInfo regionInfo) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span>    return getRegionSizeMB(regionInfo) &gt;= mergeMinRegionSizeMb;<a name="line.435"></a>
-<span class="sourceLineNo">436</span>  }<a name="line.436"></a>
-<span class="sourceLineNo">437</span><a name="line.437"></a>
-<span class="sourceLineNo">438</span>  private static boolean logTraceReason(final BooleanSupplier predicate, final String fmtWhenTrue,<a name="line.438"></a>
-<span class="sourceLineNo">439</span>    final Object... args) {<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    final boolean value = predicate.getAsBoolean();<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    if (value) {<a name="line.441"></a>
-<span class="sourceLineNo">442</span>      LOG.trace(fmtWhenTrue, args);<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    }<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    return value;<a name="line.444"></a>
-<span class="sourceLineNo">445</span>  }<a name="line.445"></a>
-<span class="sourceLineNo">446</span><a name="line.446"></a>
-<span class="sourceLineNo">447</span>  /**<a name="line.447"></a>
-<span class="sourceLineNo">448</span>   * Inner class caries the state necessary to perform a single invocation of<a name="line.448"></a>
-<span class="sourceLineNo">449</span>   * {@link #computePlansForTable(TableName)}. Grabbing this data from the assignment manager<a name="line.449"></a>
-<span class="sourceLineNo">450</span>   * up-front allows any computed values to be realized just once.<a name="line.450"></a>
-<span class="sourceLineNo">451</span>   */<a name="line.451"></a>
-<span class="sourceLineNo">452</span>  private class NormalizeContext {<a name="line.452"></a>
-<span class="sourceLineNo">453</span>    private final TableName tableName;<a name="line.453"></a>
-<span class="sourceLineNo">454</span>    private final RegionStates regionStates;<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    private final List&lt;RegionInfo&gt; tableRegions;<a name="line.455"></a>
-<span class="sourceLineNo">456</span>    private final double averageRegionSizeMb;<a name="line.456"></a>
-<span class="sourceLineNo">457</span><a name="line.457"></a>
-<span class="sourceLineNo">458</span>    public NormalizeContext(final TableName tableName) {<a name="line.458"></a>
-<span class="sourceLineNo">459</span>      this.tableName = tableName;<a name="line.459"></a>
-<span class="sourceLineNo">460</span>      regionStates = SimpleRegionNormalizer.this.masterServices<a name="line.460"></a>
-<span class="sourceLineNo">461</span>        .getAssignmentManager()<a name="line.461"></a>
-<span class="sourceLineNo">462</span>        .getRegionStates();<a name="line.462"></a>
-<span class="sourceLineNo">463</span>      tableRegions = regionStates.getRegionsOfTable(tableName);<a name="line.463"></a>
-<span class="sourceLineNo">464</span>      // The list of regionInfo from getRegionsOfTable() is ordered by regionName.<a name="line.464"></a>
-<span class="sourceLineNo">465</span>      // regionName does not necessary guarantee the order by STARTKEY (let's say 'aa1', 'aa1!',<a name="line.465"></a>
-<span class="sourceLineNo">466</span>      // in order by regionName, it will be 'aa1!' followed by 'aa1').<a name="line.466"></a>
-<span class="sourceLineNo">467</span>      // This could result in normalizer merging non-adjacent regions into one and creates overlaps.<a name="line.467"></a>
-<span class="sourceLineNo">468</span>      // In order to avoid that, sort the list by RegionInfo.COMPARATOR.<a name="line.468"></a>
-<span class="sourceLineNo">469</span>      // See HBASE-24376<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      tableRegions.sort(RegionInfo.COMPARATOR);<a name="line.470"></a>
-<span class="sourceLineNo">471</span>      averageRegionSizeMb = SimpleRegionNormalizer.this.getAverageRegionSizeMb(this.tableRegions);<a name="line.471"></a>
-<span class="sourceLineNo">472</span>    }<a name="line.472"></a>
-<span class="sourceLineNo">473</span><a name="line.473"></a>
-<span class="sourceLineNo">474</span>    public TableName getTableName() {<a name="line.474"></a>
-<span class="sourceLineNo">475</span>      return tableName;<a name="line.475"></a>
-<span class="sourceLineNo">476</span>    }<a name="line.476"></a>
-<span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span>    public RegionStates getRegionStates() {<a name="line.478"></a>
-<span class="sourceLineNo">479</span>      return regionStates;<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    }<a name="line.480"></a>
-<span class="sourceLineNo">481</span><a name="line.481"></a>
-<span class="sourceLineNo">482</span>    public List&lt;RegionInfo&gt; getTableRegions() {<a name="line.482"></a>
-<span class="sourceLineNo">483</span>      return tableRegions;<a name="line.483"></a>
-<span class="sourceLineNo">484</span>    }<a name="line.484"></a>
-<span class="sourceLineNo">485</span><a name="line.485"></a>
-<span class="sourceLineNo">486</span>    public double getAverageRegionSizeMb() {<a name="line.486"></a>
-<span class="sourceLineNo">487</span>      return averageRegionSizeMb;<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    }<a name="line.488"></a>
-<span class="sourceLineNo">489</span>  }<a name="line.489"></a>
-<span class="sourceLineNo">490</span>}<a name="line.490"></a>
+<span class="sourceLineNo">372</span>      // always merge away empty regions when they present themselves.<a name="line.372"></a>
+<span class="sourceLineNo">373</span>      if (currentSizeMb == 0 || nextSizeMb == 0 || currentSizeMb + nextSizeMb &lt; avgRegionSizeMb) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>        plans.add(new MergeNormalizationPlan(current, next));<a name="line.374"></a>
+<span class="sourceLineNo">375</span>        candidateIdx++;<a name="line.375"></a>
+<span class="sourceLineNo">376</span>      }<a name="line.376"></a>
+<span class="sourceLineNo">377</span>    }<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    return plans;<a name="line.378"></a>
+<span class="sourceLineNo">379</span>  }<a name="line.379"></a>
+<span class="sourceLineNo">380</span><a name="line.380"></a>
+<span class="sourceLineNo">381</span>  /**<a name="line.381"></a>
+<span class="sourceLineNo">382</span>   * Determine if a region in {@link RegionState} should be considered for a split operation.<a name="line.382"></a>
+<span class="sourceLineNo">383</span>   */<a name="line.383"></a>
+<span class="sourceLineNo">384</span>  private static boolean skipForSplit(final RegionState state, final RegionInfo regionInfo) {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    final String name = regionInfo.getEncodedName();<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    return<a name="line.386"></a>
+<span class="sourceLineNo">387</span>      logTraceReason(<a name="line.387"></a>
+<span class="sourceLineNo">388</span>        () -&gt; state == null,<a name="line.388"></a>
+<span class="sourceLineNo">389</span>        "skipping split of region {} because no state information is available.", name)<a name="line.389"></a>
+<span class="sourceLineNo">390</span>        || logTraceReason(<a name="line.390"></a>
+<span class="sourceLineNo">391</span>          () -&gt; !Objects.equals(state.getState(), RegionState.State.OPEN),<a name="line.391"></a>
+<span class="sourceLineNo">392</span>          "skipping merge of region {} because it is not open.", name);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>  }<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span>  /**<a name="line.395"></a>
+<span class="sourceLineNo">396</span>   * Computes the split plans that should be executed for this table to converge average region size<a name="line.396"></a>
+<span class="sourceLineNo">397</span>   * towards target average or target region count.<a name="line.397"></a>
+<span class="sourceLineNo">398</span>   * &lt;br /&gt;<a name="line.398"></a>
+<span class="sourceLineNo">399</span>   * if the region is &gt; 2 times larger than average, we split it. split<a name="line.399"></a>
+<span class="sourceLineNo">400</span>   * is more high priority normalization action than merge.<a name="line.400"></a>
+<span class="sourceLineNo">401</span>   */<a name="line.401"></a>
+<span class="sourceLineNo">402</span>  private List&lt;NormalizationPlan&gt; computeSplitNormalizationPlans(final NormalizeContext ctx) {<a name="line.402"></a>
+<span class="sourceLineNo">403</span>    final double avgRegionSize = ctx.getAverageRegionSizeMb();<a name="line.403"></a>
+<span class="sourceLineNo">404</span>    LOG.debug("Table {}, average region size: {}", ctx.getTableName(), avgRegionSize);<a name="line.404"></a>
+<span class="sourceLineNo">405</span><a name="line.405"></a>
+<span class="sourceLineNo">406</span>    final List&lt;NormalizationPlan&gt; plans = new ArrayList&lt;&gt;();<a name="line.406"></a>
+<span class="sourceLineNo">407</span>    for (final RegionInfo hri : ctx.getTableRegions()) {<a name="line.407"></a>
+<span class="sourceLineNo">408</span>      if (skipForSplit(ctx.getRegionStates().getRegionState(hri), hri)) {<a name="line.408"></a>
+<span class="sourceLineNo">409</span>        continue;<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      }<a name="line.410"></a>
+<span class="sourceLineNo">411</span>      final long regionSize = getRegionSizeMB(hri);<a name="line.411"></a>
+<span class="sourceLineNo">412</span>      if (regionSize &gt; 2 * avgRegionSize) {<a name="line.412"></a>
+<span class="sourceLineNo">413</span>        LOG.info("Table {}, large region {} has size {}, more than twice avg size {}, splitting",<a name="line.413"></a>
+<span class="sourceLineNo">414</span>          ctx.getTableName(), hri.getRegionNameAsString(), regionSize, avgRegionSize);<a name="line.414"></a>
+<span class="sourceLineNo">415</span>        plans.add(new SplitNormalizationPlan(hri));<a name="line.415"></a>
+<span class="sourceLineNo">416</span>      }<a name="line.416"></a>
+<span class="sourceLineNo">417</span>    }<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    return plans;<a name="line.418"></a>
+<span class="sourceLineNo">419</span>  }<a name="line.419"></a>
+<span class="sourceLineNo">420</span><a name="line.420"></a>
+<span class="sourceLineNo">421</span>  /**<a name="line.421"></a>
+<span class="sourceLineNo">422</span>   * Return {@code true} when {@code regionInfo} has a creation date that is old<a name="line.422"></a>
+<span class="sourceLineNo">423</span>   * enough to be considered for a merge operation, {@code false} otherwise.<a name="line.423"></a>
+<span class="sourceLineNo">424</span>   */<a name="line.424"></a>
+<span class="sourceLineNo">425</span>  private boolean isOldEnoughForMerge(final RegionInfo regionInfo) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    final Instant currentTime = Instant.ofEpochMilli(EnvironmentEdgeManager.currentTime());<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    final Instant regionCreateTime = Instant.ofEpochMilli(regionInfo.getRegionId());<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    return currentTime.isAfter(regionCreateTime.plus(mergeMinRegionAge));<a name="line.428"></a>
+<span class="sourceLineNo">429</span>  }<a name="line.429"></a>
+<span class="sourceLineNo">430</span><a name="line.430"></a>
+<span class="sourceLineNo">431</span>  /**<a name="line.431"></a>
+<span class="sourceLineNo">432</span>   * Return {@code true} when {@code regionInfo} has a size that is sufficient<a name="line.432"></a>
+<span class="sourceLineNo">433</span>   * to be considered for a merge operation, {@code false} otherwise.<a name="line.433"></a>
+<span class="sourceLineNo">434</span>   */<a name="line.434"></a>
+<span class="sourceLineNo">435</span>  private boolean isLargeEnoughForMerge(final RegionInfo regionInfo) {<a name="line.435"></a>
+<span class="sourceLineNo">436</span>    return getRegionSizeMB(regionInfo) &gt;= mergeMinRegionSizeMb;<a name="line.436"></a>
+<span class="sourceLineNo">437</span>  }<a name="line.437"></a>
+<span class="sourceLineNo">438</span><a name="line.438"></a>
+<span class="sourceLineNo">439</span>  private static boolean logTraceReason(final BooleanSupplier predicate, final String fmtWhenTrue,<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    final Object... args) {<a name="line.440"></a>
+<span class="sourceLineNo">441</span>    final boolean value = predicate.getAsBoolean();<a name="line.441"></a>
+<span class="sourceLineNo">442</span>    if (value) {<a name="line.442"></a>
+<span class="sourceLineNo">443</span>      LOG.trace(fmtWhenTrue, args);<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    }<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    return value;<a name="line.445"></a>
+<span class="sourceLineNo">446</span>  }<a name="line.446"></a>
+<span class="sourceLineNo">447</span><a name="line.447"></a>
+<span class="sourceLineNo">448</span>  /**<a name="line.448"></a>
+<span class="sourceLineNo">449</span>   * Inner class caries the state necessary to perform a single invocation of<a name="line.449"></a>
+<span class="sourceLineNo">450</span>   * {@link #computePlansForTable(TableName)}. Grabbing this data from the assignment manager<a name="line.450"></a>
+<span class="sourceLineNo">451</span>   * up-front allows any computed values to be realized just once.<a name="line.451"></a>
+<span class="sourceLineNo">452</span>   */<a name="line.452"></a>
+<span class="sourceLineNo">453</span>  private class NormalizeContext {<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    private final TableName tableName;<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    private final RegionStates regionStates;<a name="line.455"></a>
+<span class="sourceLineNo">456</span>    private final List&lt;RegionInfo&gt; tableRegions;<a name="line.456"></a>
+<span class="sourceLineNo">457</span>    private final double averageRegionSizeMb;<a name="line.457"></a>
+<span class="sourceLineNo">458</span><a name="line.458"></a>
+<span class="sourceLineNo">459</span>    public NormalizeContext(final TableName tableName) {<a name="line.459"></a>
+<span class="sourceLineNo">460</span>      this.tableName = tableName;<a name="line.460"></a>
+<span class="sourceLineNo">461</span>      regionStates = SimpleRegionNormalizer.this.masterServices<a name="line.461"></a>
+<span class="sourceLineNo">462</span>        .getAssignmentManager()<a name="line.462"></a>
+<span class="sourceLineNo">463</span>        .getRegionStates();<a name="line.463"></a>
+<span class="sourceLineNo">464</span>      tableRegions = regionStates.getRegionsOfTable(tableName);<a name="line.464"></a>
+<span class="sourceLineNo">465</span>      // The list of regionInfo from getRegionsOfTable() is ordered by regionName.<a name="line.465"></a>
+<span class="sourceLineNo">466</span>      // regionName does not necessary guarantee the order by STARTKEY (let's say 'aa1', 'aa1!',<a name="line.466"></a>
+<span class="sourceLineNo">467</span>      // in order by regionName, it will be 'aa1!' followed by 'aa1').<a name="line.467"></a>
+<span class="sourceLineNo">468</span>      // This could result in normalizer merging non-adjacent regions into one and creates overlaps.<a name="line.468"></a>
+<span class="sourceLineNo">469</span>      // In order to avoid that, sort the list by RegionInfo.COMPARATOR.<a name="line.469"></a>
+<span class="sourceLineNo">470</span>      // See HBASE-24376<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      tableRegions.sort(RegionInfo.COMPARATOR);<a name="line.471"></a>
+<span class="sourceLineNo">472</span>      averageRegionSizeMb = SimpleRegionNormalizer.this.getAverageRegionSizeMb(this.tableRegions);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    }<a name="line.473"></a>
+<span class="sourceLineNo">474</span><a name="line.474"></a>
+<span class="sourceLineNo">475</span>    public TableName getTableName() {<a name="line.475"></a>
+<span class="sourceLineNo">476</span>      return tableName;<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    }<a name="line.477"></a>
+<span class="sourceLineNo">478</span><a name="line.478"></a>
+<span class="sourceLineNo">479</span>    public RegionStates getRegionStates() {<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      return regionStates;<a name="line.480"></a>
+<span class="sourceLineNo">481</span>    }<a name="line.481"></a>
+<span class="sourceLineNo">482</span><a name="line.482"></a>
+<span class="sourceLineNo">483</span>    public List&lt;RegionInfo&gt; getTableRegions() {<a name="line.483"></a>
+<span class="sourceLineNo">484</span>      return tableRegions;<a name="line.484"></a>
+<span class="sourceLineNo">485</span>    }<a name="line.485"></a>
+<span class="sourceLineNo">486</span><a name="line.486"></a>
+<span class="sourceLineNo">487</span>    public double getAverageRegionSizeMb() {<a name="line.487"></a>
+<span class="sourceLineNo">488</span>      return averageRegionSizeMb;<a name="line.488"></a>
+<span class="sourceLineNo">489</span>    }<a name="line.489"></a>
+<span class="sourceLineNo">490</span>  }<a name="line.490"></a>
+<span class="sourceLineNo">491</span>}<a name="line.491"></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 135eadd..6cc1d3c 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
@@ -377,125 +377,126 @@
 <span class="sourceLineNo">369</span>      }<a name="line.369"></a>
 <span class="sourceLineNo">370</span>      final long currentSizeMb = getRegionSizeMB(current);<a name="line.370"></a>
 <span class="sourceLineNo">371</span>      final long nextSizeMb = getRegionSizeMB(next);<a name="line.371"></a>
-<span class="sourceLineNo">372</span>      if (currentSizeMb + nextSizeMb &lt; avgRegionSizeMb) {<a name="line.372"></a>
-<span class="sourceLineNo">373</span>        plans.add(new MergeNormalizationPlan(current, next));<a name="line.373"></a>
-<span class="sourceLineNo">374</span>        candidateIdx++;<a name="line.374"></a>
-<span class="sourceLineNo">375</span>      }<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    }<a name="line.376"></a>
-<span class="sourceLineNo">377</span>    return plans;<a name="line.377"></a>
-<span class="sourceLineNo">378</span>  }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span>  /**<a name="line.380"></a>
-<span class="sourceLineNo">381</span>   * Determine if a region in {@link RegionState} should be considered for a split operation.<a name="line.381"></a>
-<span class="sourceLineNo">382</span>   */<a name="line.382"></a>
-<span class="sourceLineNo">383</span>  private static boolean skipForSplit(final RegionState state, final RegionInfo regionInfo) {<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    final String name = regionInfo.getEncodedName();<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    return<a name="line.385"></a>
-<span class="sourceLineNo">386</span>      logTraceReason(<a name="line.386"></a>
-<span class="sourceLineNo">387</span>        () -&gt; state == null,<a name="line.387"></a>
-<span class="sourceLineNo">388</span>        "skipping split of region {} because no state information is available.", name)<a name="line.388"></a>
-<span class="sourceLineNo">389</span>        || logTraceReason(<a name="line.389"></a>
-<span class="sourceLineNo">390</span>          () -&gt; !Objects.equals(state.getState(), RegionState.State.OPEN),<a name="line.390"></a>
-<span class="sourceLineNo">391</span>          "skipping merge of region {} because it is not open.", name);<a name="line.391"></a>
-<span class="sourceLineNo">392</span>  }<a name="line.392"></a>
-<span class="sourceLineNo">393</span><a name="line.393"></a>
-<span class="sourceLineNo">394</span>  /**<a name="line.394"></a>
-<span class="sourceLineNo">395</span>   * Computes the split plans that should be executed for this table to converge average region size<a name="line.395"></a>
-<span class="sourceLineNo">396</span>   * towards target average or target region count.<a name="line.396"></a>
-<span class="sourceLineNo">397</span>   * &lt;br /&gt;<a name="line.397"></a>
-<span class="sourceLineNo">398</span>   * if the region is &gt; 2 times larger than average, we split it. split<a name="line.398"></a>
-<span class="sourceLineNo">399</span>   * is more high priority normalization action than merge.<a name="line.399"></a>
-<span class="sourceLineNo">400</span>   */<a name="line.400"></a>
-<span class="sourceLineNo">401</span>  private List&lt;NormalizationPlan&gt; computeSplitNormalizationPlans(final NormalizeContext ctx) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span>    final double avgRegionSize = ctx.getAverageRegionSizeMb();<a name="line.402"></a>
-<span class="sourceLineNo">403</span>    LOG.debug("Table {}, average region size: {}", ctx.getTableName(), avgRegionSize);<a name="line.403"></a>
-<span class="sourceLineNo">404</span><a name="line.404"></a>
-<span class="sourceLineNo">405</span>    final List&lt;NormalizationPlan&gt; plans = new ArrayList&lt;&gt;();<a name="line.405"></a>
-<span class="sourceLineNo">406</span>    for (final RegionInfo hri : ctx.getTableRegions()) {<a name="line.406"></a>
-<span class="sourceLineNo">407</span>      if (skipForSplit(ctx.getRegionStates().getRegionState(hri), hri)) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>        continue;<a name="line.408"></a>
-<span class="sourceLineNo">409</span>      }<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      final long regionSize = getRegionSizeMB(hri);<a name="line.410"></a>
-<span class="sourceLineNo">411</span>      if (regionSize &gt; 2 * avgRegionSize) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span>        LOG.info("Table {}, large region {} has size {}, more than twice avg size {}, splitting",<a name="line.412"></a>
-<span class="sourceLineNo">413</span>          ctx.getTableName(), hri.getRegionNameAsString(), regionSize, avgRegionSize);<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        plans.add(new SplitNormalizationPlan(hri, null));<a name="line.414"></a>
-<span class="sourceLineNo">415</span>      }<a name="line.415"></a>
-<span class="sourceLineNo">416</span>    }<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    return plans;<a name="line.417"></a>
-<span class="sourceLineNo">418</span>  }<a name="line.418"></a>
-<span class="sourceLineNo">419</span><a name="line.419"></a>
-<span class="sourceLineNo">420</span>  /**<a name="line.420"></a>
-<span class="sourceLineNo">421</span>   * Return {@code true} when {@code regionInfo} has a creation date that is old<a name="line.421"></a>
-<span class="sourceLineNo">422</span>   * enough to be considered for a merge operation, {@code false} otherwise.<a name="line.422"></a>
-<span class="sourceLineNo">423</span>   */<a name="line.423"></a>
-<span class="sourceLineNo">424</span>  private boolean isOldEnoughForMerge(final RegionInfo regionInfo) {<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    final Instant currentTime = Instant.ofEpochMilli(EnvironmentEdgeManager.currentTime());<a name="line.425"></a>
-<span class="sourceLineNo">426</span>    final Instant regionCreateTime = Instant.ofEpochMilli(regionInfo.getRegionId());<a name="line.426"></a>
-<span class="sourceLineNo">427</span>    return currentTime.isAfter(regionCreateTime.plus(mergeMinRegionAge));<a name="line.427"></a>
-<span class="sourceLineNo">428</span>  }<a name="line.428"></a>
-<span class="sourceLineNo">429</span><a name="line.429"></a>
-<span class="sourceLineNo">430</span>  /**<a name="line.430"></a>
-<span class="sourceLineNo">431</span>   * Return {@code true} when {@code regionInfo} has a size that is sufficient<a name="line.431"></a>
-<span class="sourceLineNo">432</span>   * to be considered for a merge operation, {@code false} otherwise.<a name="line.432"></a>
-<span class="sourceLineNo">433</span>   */<a name="line.433"></a>
-<span class="sourceLineNo">434</span>  private boolean isLargeEnoughForMerge(final RegionInfo regionInfo) {<a name="line.434"></a>
-<span class="sourceLineNo">435</span>    return getRegionSizeMB(regionInfo) &gt;= mergeMinRegionSizeMb;<a name="line.435"></a>
-<span class="sourceLineNo">436</span>  }<a name="line.436"></a>
-<span class="sourceLineNo">437</span><a name="line.437"></a>
-<span class="sourceLineNo">438</span>  private static boolean logTraceReason(final BooleanSupplier predicate, final String fmtWhenTrue,<a name="line.438"></a>
-<span class="sourceLineNo">439</span>    final Object... args) {<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    final boolean value = predicate.getAsBoolean();<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    if (value) {<a name="line.441"></a>
-<span class="sourceLineNo">442</span>      LOG.trace(fmtWhenTrue, args);<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    }<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    return value;<a name="line.444"></a>
-<span class="sourceLineNo">445</span>  }<a name="line.445"></a>
-<span class="sourceLineNo">446</span><a name="line.446"></a>
-<span class="sourceLineNo">447</span>  /**<a name="line.447"></a>
-<span class="sourceLineNo">448</span>   * Inner class caries the state necessary to perform a single invocation of<a name="line.448"></a>
-<span class="sourceLineNo">449</span>   * {@link #computePlansForTable(TableName)}. Grabbing this data from the assignment manager<a name="line.449"></a>
-<span class="sourceLineNo">450</span>   * up-front allows any computed values to be realized just once.<a name="line.450"></a>
-<span class="sourceLineNo">451</span>   */<a name="line.451"></a>
-<span class="sourceLineNo">452</span>  private class NormalizeContext {<a name="line.452"></a>
-<span class="sourceLineNo">453</span>    private final TableName tableName;<a name="line.453"></a>
-<span class="sourceLineNo">454</span>    private final RegionStates regionStates;<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    private final List&lt;RegionInfo&gt; tableRegions;<a name="line.455"></a>
-<span class="sourceLineNo">456</span>    private final double averageRegionSizeMb;<a name="line.456"></a>
-<span class="sourceLineNo">457</span><a name="line.457"></a>
-<span class="sourceLineNo">458</span>    public NormalizeContext(final TableName tableName) {<a name="line.458"></a>
-<span class="sourceLineNo">459</span>      this.tableName = tableName;<a name="line.459"></a>
-<span class="sourceLineNo">460</span>      regionStates = SimpleRegionNormalizer.this.masterServices<a name="line.460"></a>
-<span class="sourceLineNo">461</span>        .getAssignmentManager()<a name="line.461"></a>
-<span class="sourceLineNo">462</span>        .getRegionStates();<a name="line.462"></a>
-<span class="sourceLineNo">463</span>      tableRegions = regionStates.getRegionsOfTable(tableName);<a name="line.463"></a>
-<span class="sourceLineNo">464</span>      // The list of regionInfo from getRegionsOfTable() is ordered by regionName.<a name="line.464"></a>
-<span class="sourceLineNo">465</span>      // regionName does not necessary guarantee the order by STARTKEY (let's say 'aa1', 'aa1!',<a name="line.465"></a>
-<span class="sourceLineNo">466</span>      // in order by regionName, it will be 'aa1!' followed by 'aa1').<a name="line.466"></a>
-<span class="sourceLineNo">467</span>      // This could result in normalizer merging non-adjacent regions into one and creates overlaps.<a name="line.467"></a>
-<span class="sourceLineNo">468</span>      // In order to avoid that, sort the list by RegionInfo.COMPARATOR.<a name="line.468"></a>
-<span class="sourceLineNo">469</span>      // See HBASE-24376<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      tableRegions.sort(RegionInfo.COMPARATOR);<a name="line.470"></a>
-<span class="sourceLineNo">471</span>      averageRegionSizeMb = SimpleRegionNormalizer.this.getAverageRegionSizeMb(this.tableRegions);<a name="line.471"></a>
-<span class="sourceLineNo">472</span>    }<a name="line.472"></a>
-<span class="sourceLineNo">473</span><a name="line.473"></a>
-<span class="sourceLineNo">474</span>    public TableName getTableName() {<a name="line.474"></a>
-<span class="sourceLineNo">475</span>      return tableName;<a name="line.475"></a>
-<span class="sourceLineNo">476</span>    }<a name="line.476"></a>
-<span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span>    public RegionStates getRegionStates() {<a name="line.478"></a>
-<span class="sourceLineNo">479</span>      return regionStates;<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    }<a name="line.480"></a>
-<span class="sourceLineNo">481</span><a name="line.481"></a>
-<span class="sourceLineNo">482</span>    public List&lt;RegionInfo&gt; getTableRegions() {<a name="line.482"></a>
-<span class="sourceLineNo">483</span>      return tableRegions;<a name="line.483"></a>
-<span class="sourceLineNo">484</span>    }<a name="line.484"></a>
-<span class="sourceLineNo">485</span><a name="line.485"></a>
-<span class="sourceLineNo">486</span>    public double getAverageRegionSizeMb() {<a name="line.486"></a>
-<span class="sourceLineNo">487</span>      return averageRegionSizeMb;<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    }<a name="line.488"></a>
-<span class="sourceLineNo">489</span>  }<a name="line.489"></a>
-<span class="sourceLineNo">490</span>}<a name="line.490"></a>
+<span class="sourceLineNo">372</span>      // always merge away empty regions when they present themselves.<a name="line.372"></a>
+<span class="sourceLineNo">373</span>      if (currentSizeMb == 0 || nextSizeMb == 0 || currentSizeMb + nextSizeMb &lt; avgRegionSizeMb) {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>        plans.add(new MergeNormalizationPlan(current, next));<a name="line.374"></a>
+<span class="sourceLineNo">375</span>        candidateIdx++;<a name="line.375"></a>
+<span class="sourceLineNo">376</span>      }<a name="line.376"></a>
+<span class="sourceLineNo">377</span>    }<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    return plans;<a name="line.378"></a>
+<span class="sourceLineNo">379</span>  }<a name="line.379"></a>
+<span class="sourceLineNo">380</span><a name="line.380"></a>
+<span class="sourceLineNo">381</span>  /**<a name="line.381"></a>
+<span class="sourceLineNo">382</span>   * Determine if a region in {@link RegionState} should be considered for a split operation.<a name="line.382"></a>
+<span class="sourceLineNo">383</span>   */<a name="line.383"></a>
+<span class="sourceLineNo">384</span>  private static boolean skipForSplit(final RegionState state, final RegionInfo regionInfo) {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    final String name = regionInfo.getEncodedName();<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    return<a name="line.386"></a>
+<span class="sourceLineNo">387</span>      logTraceReason(<a name="line.387"></a>
+<span class="sourceLineNo">388</span>        () -&gt; state == null,<a name="line.388"></a>
+<span class="sourceLineNo">389</span>        "skipping split of region {} because no state information is available.", name)<a name="line.389"></a>
+<span class="sourceLineNo">390</span>        || logTraceReason(<a name="line.390"></a>
+<span class="sourceLineNo">391</span>          () -&gt; !Objects.equals(state.getState(), RegionState.State.OPEN),<a name="line.391"></a>
+<span class="sourceLineNo">392</span>          "skipping merge of region {} because it is not open.", name);<a name="line.392"></a>
+<span class="sourceLineNo">393</span>  }<a name="line.393"></a>
+<span class="sourceLineNo">394</span><a name="line.394"></a>
+<span class="sourceLineNo">395</span>  /**<a name="line.395"></a>
+<span class="sourceLineNo">396</span>   * Computes the split plans that should be executed for this table to converge average region size<a name="line.396"></a>
+<span class="sourceLineNo">397</span>   * towards target average or target region count.<a name="line.397"></a>
+<span class="sourceLineNo">398</span>   * &lt;br /&gt;<a name="line.398"></a>
+<span class="sourceLineNo">399</span>   * if the region is &gt; 2 times larger than average, we split it. split<a name="line.399"></a>
+<span class="sourceLineNo">400</span>   * is more high priority normalization action than merge.<a name="line.400"></a>
+<span class="sourceLineNo">401</span>   */<a name="line.401"></a>
+<span class="sourceLineNo">402</span>  private List&lt;NormalizationPlan&gt; computeSplitNormalizationPlans(final NormalizeContext ctx) {<a name="line.402"></a>
+<span class="sourceLineNo">403</span>    final double avgRegionSize = ctx.getAverageRegionSizeMb();<a name="line.403"></a>
+<span class="sourceLineNo">404</span>    LOG.debug("Table {}, average region size: {}", ctx.getTableName(), avgRegionSize);<a name="line.404"></a>
+<span class="sourceLineNo">405</span><a name="line.405"></a>
+<span class="sourceLineNo">406</span>    final List&lt;NormalizationPlan&gt; plans = new ArrayList&lt;&gt;();<a name="line.406"></a>
+<span class="sourceLineNo">407</span>    for (final RegionInfo hri : ctx.getTableRegions()) {<a name="line.407"></a>
+<span class="sourceLineNo">408</span>      if (skipForSplit(ctx.getRegionStates().getRegionState(hri), hri)) {<a name="line.408"></a>
+<span class="sourceLineNo">409</span>        continue;<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      }<a name="line.410"></a>
+<span class="sourceLineNo">411</span>      final long regionSize = getRegionSizeMB(hri);<a name="line.411"></a>
+<span class="sourceLineNo">412</span>      if (regionSize &gt; 2 * avgRegionSize) {<a name="line.412"></a>
+<span class="sourceLineNo">413</span>        LOG.info("Table {}, large region {} has size {}, more than twice avg size {}, splitting",<a name="line.413"></a>
+<span class="sourceLineNo">414</span>          ctx.getTableName(), hri.getRegionNameAsString(), regionSize, avgRegionSize);<a name="line.414"></a>
+<span class="sourceLineNo">415</span>        plans.add(new SplitNormalizationPlan(hri));<a name="line.415"></a>
+<span class="sourceLineNo">416</span>      }<a name="line.416"></a>
+<span class="sourceLineNo">417</span>    }<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    return plans;<a name="line.418"></a>
+<span class="sourceLineNo">419</span>  }<a name="line.419"></a>
+<span class="sourceLineNo">420</span><a name="line.420"></a>
+<span class="sourceLineNo">421</span>  /**<a name="line.421"></a>
+<span class="sourceLineNo">422</span>   * Return {@code true} when {@code regionInfo} has a creation date that is old<a name="line.422"></a>
+<span class="sourceLineNo">423</span>   * enough to be considered for a merge operation, {@code false} otherwise.<a name="line.423"></a>
+<span class="sourceLineNo">424</span>   */<a name="line.424"></a>
+<span class="sourceLineNo">425</span>  private boolean isOldEnoughForMerge(final RegionInfo regionInfo) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    final Instant currentTime = Instant.ofEpochMilli(EnvironmentEdgeManager.currentTime());<a name="line.426"></a>
+<span class="sourceLineNo">427</span>    final Instant regionCreateTime = Instant.ofEpochMilli(regionInfo.getRegionId());<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    return currentTime.isAfter(regionCreateTime.plus(mergeMinRegionAge));<a name="line.428"></a>
+<span class="sourceLineNo">429</span>  }<a name="line.429"></a>
+<span class="sourceLineNo">430</span><a name="line.430"></a>
+<span class="sourceLineNo">431</span>  /**<a name="line.431"></a>
+<span class="sourceLineNo">432</span>   * Return {@code true} when {@code regionInfo} has a size that is sufficient<a name="line.432"></a>
+<span class="sourceLineNo">433</span>   * to be considered for a merge operation, {@code false} otherwise.<a name="line.433"></a>
+<span class="sourceLineNo">434</span>   */<a name="line.434"></a>
+<span class="sourceLineNo">435</span>  private boolean isLargeEnoughForMerge(final RegionInfo regionInfo) {<a name="line.435"></a>
+<span class="sourceLineNo">436</span>    return getRegionSizeMB(regionInfo) &gt;= mergeMinRegionSizeMb;<a name="line.436"></a>
+<span class="sourceLineNo">437</span>  }<a name="line.437"></a>
+<span class="sourceLineNo">438</span><a name="line.438"></a>
+<span class="sourceLineNo">439</span>  private static boolean logTraceReason(final BooleanSupplier predicate, final String fmtWhenTrue,<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    final Object... args) {<a name="line.440"></a>
+<span class="sourceLineNo">441</span>    final boolean value = predicate.getAsBoolean();<a name="line.441"></a>
+<span class="sourceLineNo">442</span>    if (value) {<a name="line.442"></a>
+<span class="sourceLineNo">443</span>      LOG.trace(fmtWhenTrue, args);<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    }<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    return value;<a name="line.445"></a>
+<span class="sourceLineNo">446</span>  }<a name="line.446"></a>
+<span class="sourceLineNo">447</span><a name="line.447"></a>
+<span class="sourceLineNo">448</span>  /**<a name="line.448"></a>
+<span class="sourceLineNo">449</span>   * Inner class caries the state necessary to perform a single invocation of<a name="line.449"></a>
+<span class="sourceLineNo">450</span>   * {@link #computePlansForTable(TableName)}. Grabbing this data from the assignment manager<a name="line.450"></a>
+<span class="sourceLineNo">451</span>   * up-front allows any computed values to be realized just once.<a name="line.451"></a>
+<span class="sourceLineNo">452</span>   */<a name="line.452"></a>
+<span class="sourceLineNo">453</span>  private class NormalizeContext {<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    private final TableName tableName;<a name="line.454"></a>
+<span class="sourceLineNo">455</span>    private final RegionStates regionStates;<a name="line.455"></a>
+<span class="sourceLineNo">456</span>    private final List&lt;RegionInfo&gt; tableRegions;<a name="line.456"></a>
+<span class="sourceLineNo">457</span>    private final double averageRegionSizeMb;<a name="line.457"></a>
+<span class="sourceLineNo">458</span><a name="line.458"></a>
+<span class="sourceLineNo">459</span>    public NormalizeContext(final TableName tableName) {<a name="line.459"></a>
+<span class="sourceLineNo">460</span>      this.tableName = tableName;<a name="line.460"></a>
+<span class="sourceLineNo">461</span>      regionStates = SimpleRegionNormalizer.this.masterServices<a name="line.461"></a>
+<span class="sourceLineNo">462</span>        .getAssignmentManager()<a name="line.462"></a>
+<span class="sourceLineNo">463</span>        .getRegionStates();<a name="line.463"></a>
+<span class="sourceLineNo">464</span>      tableRegions = regionStates.getRegionsOfTable(tableName);<a name="line.464"></a>
+<span class="sourceLineNo">465</span>      // The list of regionInfo from getRegionsOfTable() is ordered by regionName.<a name="line.465"></a>
+<span class="sourceLineNo">466</span>      // regionName does not necessary guarantee the order by STARTKEY (let's say 'aa1', 'aa1!',<a name="line.466"></a>
+<span class="sourceLineNo">467</span>      // in order by regionName, it will be 'aa1!' followed by 'aa1').<a name="line.467"></a>
+<span class="sourceLineNo">468</span>      // This could result in normalizer merging non-adjacent regions into one and creates overlaps.<a name="line.468"></a>
+<span class="sourceLineNo">469</span>      // In order to avoid that, sort the list by RegionInfo.COMPARATOR.<a name="line.469"></a>
+<span class="sourceLineNo">470</span>      // See HBASE-24376<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      tableRegions.sort(RegionInfo.COMPARATOR);<a name="line.471"></a>
+<span class="sourceLineNo">472</span>      averageRegionSizeMb = SimpleRegionNormalizer.this.getAverageRegionSizeMb(this.tableRegions);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    }<a name="line.473"></a>
+<span class="sourceLineNo">474</span><a name="line.474"></a>
+<span class="sourceLineNo">475</span>    public TableName getTableName() {<a name="line.475"></a>
+<span class="sourceLineNo">476</span>      return tableName;<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    }<a name="line.477"></a>
+<span class="sourceLineNo">478</span><a name="line.478"></a>
+<span class="sourceLineNo">479</span>    public RegionStates getRegionStates() {<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      return regionStates;<a name="line.480"></a>
+<span class="sourceLineNo">481</span>    }<a name="line.481"></a>
+<span class="sourceLineNo">482</span><a name="line.482"></a>
+<span class="sourceLineNo">483</span>    public List&lt;RegionInfo&gt; getTableRegions() {<a name="line.483"></a>
+<span class="sourceLineNo">484</span>      return tableRegions;<a name="line.484"></a>
+<span class="sourceLineNo">485</span>    }<a name="line.485"></a>
+<span class="sourceLineNo">486</span><a name="line.486"></a>
+<span class="sourceLineNo">487</span>    public double getAverageRegionSizeMb() {<a name="line.487"></a>
+<span class="sourceLineNo">488</span>      return averageRegionSizeMb;<a name="line.488"></a>
+<span class="sourceLineNo">489</span>    }<a name="line.489"></a>
+<span class="sourceLineNo">490</span>  }<a name="line.490"></a>
+<span class="sourceLineNo">491</span>}<a name="line.491"></a>
 
 
 
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html
index 050dbe0..94994cd 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/normalizer/SplitNormalizationPlan.html
@@ -6,7 +6,7 @@
 </head>
 <body>
 <div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
+<pre><span class="sourceLineNo">001</span>/*<a name="line.1"></a>
 <span class="sourceLineNo">002</span> *<a name="line.2"></a>
 <span class="sourceLineNo">003</span> * Licensed to the Apache Software Foundation (ASF) under one<a name="line.3"></a>
 <span class="sourceLineNo">004</span> * or more contributor license agreements.  See the NOTICE file<a name="line.4"></a>
@@ -27,67 +27,72 @@
 <span class="sourceLineNo">019</span>package org.apache.hadoop.hbase.master.normalizer;<a name="line.19"></a>
 <span class="sourceLineNo">020</span><a name="line.20"></a>
 <span class="sourceLineNo">021</span>import java.io.IOException;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import java.util.Arrays;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.HConstants;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.slf4j.Logger;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.slf4j.LoggerFactory;<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>/**<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * Normalization plan to split region.<a name="line.31"></a>
-<span class="sourceLineNo">032</span> */<a name="line.32"></a>
-<span class="sourceLineNo">033</span>@InterfaceAudience.Private<a name="line.33"></a>
-<span class="sourceLineNo">034</span>public class SplitNormalizationPlan implements NormalizationPlan {<a name="line.34"></a>
-<span class="sourceLineNo">035</span>  private static final Logger LOG = LoggerFactory.getLogger(SplitNormalizationPlan.class.getName());<a name="line.35"></a>
+<span class="sourceLineNo">022</span>import org.apache.commons.lang3.builder.EqualsBuilder;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.commons.lang3.builder.HashCodeBuilder;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.commons.lang3.builder.ToStringBuilder;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.commons.lang3.builder.ToStringStyle;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.HConstants;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.29"></a>
+<span class="sourceLineNo">030</span><a name="line.30"></a>
+<span class="sourceLineNo">031</span>/**<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * Normalization plan to split region.<a name="line.32"></a>
+<span class="sourceLineNo">033</span> */<a name="line.33"></a>
+<span class="sourceLineNo">034</span>@InterfaceAudience.Private<a name="line.34"></a>
+<span class="sourceLineNo">035</span>public class SplitNormalizationPlan implements NormalizationPlan {<a name="line.35"></a>
 <span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span>  private RegionInfo regionInfo;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>  private byte[] splitPoint;<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span>  public SplitNormalizationPlan(RegionInfo regionInfo, byte[] splitPoint) {<a name="line.40"></a>
-<span class="sourceLineNo">041</span>    this.regionInfo = regionInfo;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>    this.splitPoint = splitPoint;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>  }<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>  /**<a name="line.45"></a>
-<span class="sourceLineNo">046</span>   * {@inheritDoc}<a name="line.46"></a>
-<span class="sourceLineNo">047</span>   */<a name="line.47"></a>
-<span class="sourceLineNo">048</span>  @Override<a name="line.48"></a>
-<span class="sourceLineNo">049</span>  public long submit(MasterServices masterServices) throws IOException {<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    return masterServices.splitRegion(regionInfo, null, HConstants.NO_NONCE, HConstants.NO_NONCE);<a name="line.50"></a>
-<span class="sourceLineNo">051</span>  }<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span>  @Override<a name="line.53"></a>
-<span class="sourceLineNo">054</span>  public PlanType getType() {<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    return PlanType.SPLIT;<a name="line.55"></a>
+<span class="sourceLineNo">037</span>  private final RegionInfo regionInfo;<a name="line.37"></a>
+<span class="sourceLineNo">038</span><a name="line.38"></a>
+<span class="sourceLineNo">039</span>  public SplitNormalizationPlan(RegionInfo regionInfo) {<a name="line.39"></a>
+<span class="sourceLineNo">040</span>    this.regionInfo = regionInfo;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>  }<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span>  @Override<a name="line.43"></a>
+<span class="sourceLineNo">044</span>  public long submit(MasterServices masterServices) throws IOException {<a name="line.44"></a>
+<span class="sourceLineNo">045</span>    return masterServices.splitRegion(regionInfo, null, HConstants.NO_NONCE,<a name="line.45"></a>
+<span class="sourceLineNo">046</span>      HConstants.NO_NONCE);<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>  @Override<a name="line.49"></a>
+<span class="sourceLineNo">050</span>  public PlanType getType() {<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    return PlanType.SPLIT;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>  }<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span>  public RegionInfo getRegionInfo() {<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    return regionInfo;<a name="line.55"></a>
 <span class="sourceLineNo">056</span>  }<a name="line.56"></a>
 <span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>  public RegionInfo getRegionInfo() {<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    return regionInfo;<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>  public void setRegionInfo(RegionInfo regionInfo) {<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    this.regionInfo = regionInfo;<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>  public byte[] getSplitPoint() {<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    return splitPoint;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>  }<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>  public void setSplitPoint(byte[] splitPoint) {<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    this.splitPoint = splitPoint;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>  }<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>  @Override<a name="line.74"></a>
-<span class="sourceLineNo">075</span>  public String toString() {<a name="line.75"></a>
-<span class="sourceLineNo">076</span>    return "SplitNormalizationPlan{" +<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      "regionInfo=" + regionInfo +<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      ", splitPoint=" + Arrays.toString(splitPoint) +<a name="line.78"></a>
-<span class="sourceLineNo">079</span>      '}';<a name="line.79"></a>
+<span class="sourceLineNo">058</span>  @Override<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  public String toString() {<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE)<a name="line.60"></a>
+<span class="sourceLineNo">061</span>      .append("regionInfo", regionInfo)<a name="line.61"></a>
+<span class="sourceLineNo">062</span>      .toString();<a name="line.62"></a>
+<span class="sourceLineNo">063</span>  }<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span>  @Override<a name="line.65"></a>
+<span class="sourceLineNo">066</span>  public boolean equals(Object o) {<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    if (this == o) {<a name="line.67"></a>
+<span class="sourceLineNo">068</span>      return true;<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>    if (o == null || getClass() != o.getClass()) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      return false;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    }<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>    SplitNormalizationPlan that = (SplitNormalizationPlan) o;<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>    return new EqualsBuilder()<a name="line.77"></a>
+<span class="sourceLineNo">078</span>      .append(regionInfo, that.regionInfo)<a name="line.78"></a>
+<span class="sourceLineNo">079</span>      .isEquals();<a name="line.79"></a>
 <span class="sourceLineNo">080</span>  }<a name="line.80"></a>
 <span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span>}<a name="line.82"></a>
+<span class="sourceLineNo">082</span>  @Override public int hashCode() {<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    return new HashCodeBuilder(17, 37)<a name="line.83"></a>
+<span class="sourceLineNo">084</span>      .append(regionInfo)<a name="line.84"></a>
+<span class="sourceLineNo">085</span>      .toHashCode();<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>
 
 
 
diff --git a/testdevapidocs/index-all.html b/testdevapidocs/index-all.html
index 071963f..5641491 100644
--- a/testdevapidocs/index-all.html
+++ b/testdevapidocs/index-all.html
@@ -62673,6 +62673,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/filter/TestMultiRowRangeFilter.html#testMergeAndSortWithStartRowInclusive--">testMergeAndSortWithStartRowInclusive()</a></span> - Method in class org.apache.hadoop.hbase.filter.<a href="org/apache/hadoop/hbase/filter/TestMultiRowRangeFilter.html" title="class in org.apache.hadoop.hbase.filter">TestMultiRowRangeFilter</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testMergeEmptyRegions--">testMergeEmptyRegions()</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/regionserver/compactions/TestStripeCompactionPolicy.html#testMergeExpiredFiles--">testMergeExpiredFiles()</a></span> - Method in class org.apache.hadoop.hbase.regionserver.compactions.<a href="org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactionPolicy.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">TestStripeCompactionPolicy</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactionPolicy.html#testMergeExpiredStripes--">testMergeExpiredStripes()</a></span> - Method in class org.apache.hadoop.hbase.regionserver.compactions.<a href="org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactionPolicy.html" title="class in org.apache.hadoop.hbase.regionserver.compactions">TestStripeCompactionPolicy</a></dt>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/TableNameTestRule.html b/testdevapidocs/org/apache/hadoop/hbase/TableNameTestRule.html
index 2c3fddd..8217633 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/TableNameTestRule.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/TableNameTestRule.html
@@ -118,9 +118,10 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public class <a href="../../../../src-html/org/apache/hadoop/hbase/TableNameTestRule.html#line.26">TableNameTestRule</a>
+<pre>public class <a href="../../../../src-html/org/apache/hadoop/hbase/TableNameTestRule.html#line.27">TableNameTestRule</a>
 extends org.junit.rules.TestWatcher</pre>
-<div class="block">Returns a <code>TableName</code> based on currently running test method name.</div>
+<div class="block">Returns a <code>TableName</code> based on currently running test method name. Supports
+  tests built on the <code>Parameterized</code> runner.</div>
 </li>
 </ul>
 </div>
@@ -224,7 +225,7 @@ extends org.junit.rules.TestWatcher</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>tableName</h4>
-<pre>private&nbsp;org.apache.hadoop.hbase.TableName <a href="../../../../src-html/org/apache/hadoop/hbase/TableNameTestRule.html#line.28">tableName</a></pre>
+<pre>private&nbsp;org.apache.hadoop.hbase.TableName <a href="../../../../src-html/org/apache/hadoop/hbase/TableNameTestRule.html#line.29">tableName</a></pre>
 </li>
 </ul>
 </li>
@@ -241,7 +242,7 @@ extends org.junit.rules.TestWatcher</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TableNameTestRule</h4>
-<pre>public&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/TableNameTestRule.html#line.26">TableNameTestRule</a>()</pre>
+<pre>public&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/TableNameTestRule.html#line.27">TableNameTestRule</a>()</pre>
 </li>
 </ul>
 </li>
@@ -258,7 +259,7 @@ extends org.junit.rules.TestWatcher</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>starting</h4>
-<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/TableNameTestRule.html#line.31">starting</a>(org.junit.runner.Description&nbsp;description)</pre>
+<pre>protected&nbsp;void&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/TableNameTestRule.html#line.32">starting</a>(org.junit.runner.Description&nbsp;description)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code>starting</code>&nbsp;in class&nbsp;<code>org.junit.rules.TestWatcher</code></dd>
@@ -271,7 +272,7 @@ extends org.junit.rules.TestWatcher</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>cleanUpTestName</h4>
-<pre>private static&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/TableNameTestRule.html#line.41">cleanUpTestName</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;methodName)</pre>
+<pre>private static&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/TableNameTestRule.html#line.42">cleanUpTestName</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>&nbsp;methodName)</pre>
 <div class="block">Helper to handle parameterized method names. Unlike regular test methods, parameterized method
  names look like 'foo[x]'. This is problematic for tests that use this name for HBase tables.
  This helper strips out the parameter suffixes.</div>
@@ -287,7 +288,7 @@ extends org.junit.rules.TestWatcher</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getTableName</h4>
-<pre>public&nbsp;org.apache.hadoop.hbase.TableName&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/TableNameTestRule.html#line.49">getTableName</a>()</pre>
+<pre>public&nbsp;org.apache.hadoop.hbase.TableName&nbsp;<a href="../../../../src-html/org/apache/hadoop/hbase/TableNameTestRule.html#line.50">getTableName</a>()</pre>
 </li>
 </ul>
 </li>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html
index fa6650a..88e37d3 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/backup/package-tree.html
@@ -150,8 +150,8 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&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/TestIncrementalBackupMergeWithFailures.FailurePhase.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">TestIncrementalBackupMergeWithFailures.FailurePhase</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/TestBackupDeleteWithFailures.Failure.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">TestBackupDeleteWithFailures.Failure</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.backup.<a href="../../../../../org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.FailurePhase.html" title="enum in org.apache.hadoop.hbase.backup"><span class="typeNameLink">TestIncrementalBackupMergeWithFailures.FailurePhase</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/chaos/actions/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/chaos/actions/package-tree.html
index 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/class-use/TableNameTestRule.html b/testdevapidocs/org/apache/hadoop/hbase/class-use/TableNameTestRule.html
index dda9952..c61a5b8 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/class-use/TableNameTestRule.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/class-use/TableNameTestRule.html
@@ -91,18 +91,22 @@
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="#org.apache.hadoop.hbase.regionserver">org.apache.hadoop.hbase.regionserver</a></td>
+<td class="colFirst"><a href="#org.apache.hadoop.hbase.master.normalizer">org.apache.hadoop.hbase.master.normalizer</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="#org.apache.hadoop.hbase.security.access">org.apache.hadoop.hbase.security.access</a></td>
+<td class="colFirst"><a href="#org.apache.hadoop.hbase.regionserver">org.apache.hadoop.hbase.regionserver</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="#org.apache.hadoop.hbase.security.provider">org.apache.hadoop.hbase.security.provider</a></td>
+<td class="colFirst"><a href="#org.apache.hadoop.hbase.security.access">org.apache.hadoop.hbase.security.access</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="#org.apache.hadoop.hbase.security.provider">org.apache.hadoop.hbase.security.provider</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="#org.apache.hadoop.hbase.snapshot">org.apache.hadoop.hbase.snapshot</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -167,6 +171,24 @@
 </tbody>
 </table>
 </li>
+<li class="blockList"><a name="org.apache.hadoop.hbase.master.normalizer">
+<!--   -->
+</a>
+<h3>Uses of <a href="../../../../../org/apache/hadoop/hbase/TableNameTestRule.html" title="class in org.apache.hadoop.hbase">TableNameTestRule</a> in <a href="../../../../../org/apache/hadoop/hbase/master/normalizer/package-summary.html">org.apache.hadoop.hbase.master.normalizer</a></h3>
+<table class="useSummary" border="0" cellpadding="3" cellspacing="0" summary="Use table, listing fields, and an explanation">
+<caption><span>Fields in <a href="../../../../../org/apache/hadoop/hbase/master/normalizer/package-summary.html">org.apache.hadoop.hbase.master.normalizer</a> declared as <a href="../../../../../org/apache/hadoop/hbase/TableNameTestRule.html" title="class in org.apache.hadoop.hbase">TableNameTestRule</a></span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colLast" scope="col">Field and Description</th>
+</tr>
+<tbody>
+<tr class="altColor">
+<td class="colFirst"><code><a href="../../../../../org/apache/hadoop/hbase/TableNameTestRule.html" title="class in org.apache.hadoop.hbase">TableNameTestRule</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TestSimpleRegionNormalizer.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#name">name</a></span></code>&nbsp;</td>
+</tr>
+</tbody>
+</table>
+</li>
 <li class="blockList"><a name="org.apache.hadoop.hbase.regionserver">
 <!--   -->
 </a>
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 28fd96e..f0fc769 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":9,"i2":9,"i3":9,"i4":9,"i5":9,"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,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10};
+var methods = {"i0":10,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"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,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -109,7 +109,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.75">TestSimpleRegionNormalizer</a>
+<pre>public class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.73">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>
@@ -143,7 +143,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#masterServices">masterServices</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><code>org.junit.rules.TestName</code></td>
+<td class="colFirst"><code><a href="../../../../../../org/apache/hadoop/hbase/TableNameTestRule.html" title="class in org.apache.hadoop.hbase">TableNameTestRule</a></code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#name">name</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
@@ -244,66 +244,70 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 </tr>
 <tr id="i13" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testMergeOfSecondSmallestRegions--">testMergeOfSecondSmallestRegions</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testMergeEmptyRegions--">testMergeEmptyRegions</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i14" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testMergeOfSmallNonAdjacentRegions--">testMergeOfSmallNonAdjacentRegions</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testMergeOfSecondSmallestRegions--">testMergeOfSecondSmallestRegions</a></span>()</code>&nbsp;</td>
 </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#testMergeOfSmallRegions--">testMergeOfSmallRegions</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testMergeOfSmallNonAdjacentRegions--">testMergeOfSmallNonAdjacentRegions</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#testNoNormalizationForMetaTable--">testNoNormalizationForMetaTable</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testMergeOfSmallRegions--">testMergeOfSmallRegions</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#testNoNormalizationIfTooFewRegions--">testNoNormalizationIfTooFewRegions</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testNoNormalizationForMetaTable--">testNoNormalizationForMetaTable</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#testNoNormalizationOnMergedRegions--">testNoNormalizationOnMergedRegions</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testNoNormalizationIfTooFewRegions--">testNoNormalizationIfTooFewRegions</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i19" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testNoNormalizationOnMergingNewRegions--">testNoNormalizationOnMergingNewRegions</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testNoNormalizationOnMergedRegions--">testNoNormalizationOnMergedRegions</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i20" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testNoNormalizationOnMergingRegions--">testNoNormalizationOnMergingRegions</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testNoNormalizationOnMergingNewRegions--">testNoNormalizationOnMergingNewRegions</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i21" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testNoNormalizationOnNormalizedCluster--">testNoNormalizationOnNormalizedCluster</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testNoNormalizationOnMergingRegions--">testNoNormalizationOnMergingRegions</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i22" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testNoNormalizationOnSplitRegions--">testNoNormalizationOnSplitRegions</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testNoNormalizationOnNormalizedCluster--">testNoNormalizationOnNormalizedCluster</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i23" 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#testNoNormalizationOnSplittingNewRegions--">testNoNormalizationOnSplittingNewRegions</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testNoNormalizationOnSplitRegions--">testNoNormalizationOnSplitRegions</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i24" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testNoNormalizationOnSplittingRegions--">testNoNormalizationOnSplittingRegions</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testNoNormalizationOnSplittingNewRegions--">testNoNormalizationOnSplittingNewRegions</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i25" 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#testNormalizerCannotMergeNonAdjacentRegions--">testNormalizerCannotMergeNonAdjacentRegions</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testNoNormalizationOnSplittingRegions--">testNoNormalizationOnSplittingRegions</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i26" 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#testSplitOfLargeRegion--">testSplitOfLargeRegion</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#testNormalizerCannotMergeNonAdjacentRegions--">testNormalizerCannotMergeNonAdjacentRegions</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i27" 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>
+<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="i28" 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>
+</tr>
+<tr id="i29" 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#testSplitWithTargetRegionSize--">testSplitWithTargetRegionSize</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
@@ -334,7 +338,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.78">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.76">CLASS_RULE</a></pre>
 </li>
 </ul>
 <a name="conf">
@@ -343,7 +347,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>conf</h4>
-<pre>private&nbsp;org.apache.hadoop.conf.Configuration <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.81">conf</a></pre>
+<pre>private&nbsp;org.apache.hadoop.conf.Configuration <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.79">conf</a></pre>
 </li>
 </ul>
 <a name="normalizer">
@@ -352,7 +356,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.SimpleRegionNormalizer <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.82">normalizer</a></pre>
+<pre>private&nbsp;org.apache.hadoop.hbase.master.normalizer.SimpleRegionNormalizer <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.80">normalizer</a></pre>
 </li>
 </ul>
 <a name="masterServices">
@@ -361,7 +365,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.83">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.81">masterServices</a></pre>
 </li>
 </ul>
 <a name="name">
@@ -370,7 +374,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.86">name</a></pre>
+<pre>public&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/TableNameTestRule.html" title="class in org.apache.hadoop.hbase">TableNameTestRule</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.84">name</a></pre>
 </li>
 </ul>
 </li>
@@ -387,7 +391,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.75">TestSimpleRegionNormalizer</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.73">TestSimpleRegionNormalizer</a>()</pre>
 </li>
 </ul>
 </li>
@@ -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>before</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.89">before</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.87">before</a>()</pre>
 </li>
 </ul>
 <a name="testNoNormalizationForMetaTable--">
@@ -413,7 +417,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.94">testNoNormalizationForMetaTable</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.92">testNoNormalizationForMetaTable</a>()</pre>
 </li>
 </ul>
 <a name="testNoNormalizationIfTooFewRegions--">
@@ -422,7 +426,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.105">testNoNormalizationIfTooFewRegions</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.103">testNoNormalizationIfTooFewRegions</a>()</pre>
 </li>
 </ul>
 <a name="testNoNormalizationOnNormalizedCluster--">
@@ -431,7 +435,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.116">testNoNormalizationOnNormalizedCluster</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.114">testNoNormalizationOnNormalizedCluster</a>()</pre>
 </li>
 </ul>
 <a name="noNormalizationOnTransitioningRegions-org.apache.hadoop.hbase.master.RegionState.State-">
@@ -440,7 +444,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.126">noNormalizationOnTransitioningRegions</a>(org.apache.hadoop.hbase.master.RegionState.State&nbsp;state)</pre>
+<pre>private&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.125">noNormalizationOnTransitioningRegions</a>(org.apache.hadoop.hbase.master.RegionState.State&nbsp;state)</pre>
 </li>
 </ul>
 <a name="testNoNormalizationOnMergingNewRegions--">
@@ -449,7 +453,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.142">testNoNormalizationOnMergingNewRegions</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.141">testNoNormalizationOnMergingNewRegions</a>()</pre>
 </li>
 </ul>
 <a name="testNoNormalizationOnMergingRegions--">
@@ -458,7 +462,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.147">testNoNormalizationOnMergingRegions</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.146">testNoNormalizationOnMergingRegions</a>()</pre>
 </li>
 </ul>
 <a name="testNoNormalizationOnMergedRegions--">
@@ -467,7 +471,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.152">testNoNormalizationOnMergedRegions</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.151">testNoNormalizationOnMergedRegions</a>()</pre>
 </li>
 </ul>
 <a name="testNoNormalizationOnSplittingNewRegions--">
@@ -476,7 +480,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.157">testNoNormalizationOnSplittingNewRegions</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.156">testNoNormalizationOnSplittingNewRegions</a>()</pre>
 </li>
 </ul>
 <a name="testNoNormalizationOnSplittingRegions--">
@@ -485,7 +489,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.162">testNoNormalizationOnSplittingRegions</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.161">testNoNormalizationOnSplittingRegions</a>()</pre>
 </li>
 </ul>
 <a name="testNoNormalizationOnSplitRegions--">
@@ -494,7 +498,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.167">testNoNormalizationOnSplitRegions</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.166">testNoNormalizationOnSplitRegions</a>()</pre>
 </li>
 </ul>
 <a name="testMergeOfSmallRegions--">
@@ -503,7 +507,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.172">testMergeOfSmallRegions</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.171">testMergeOfSmallRegions</a>()</pre>
 </li>
 </ul>
 <a name="testMergeOfSecondSmallestRegions--">
@@ -512,7 +516,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.188">testMergeOfSecondSmallestRegions</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.184">testMergeOfSecondSmallestRegions</a>()</pre>
 </li>
 </ul>
 <a name="testMergeOfSmallNonAdjacentRegions--">
@@ -521,7 +525,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.203">testMergeOfSmallNonAdjacentRegions</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.197">testMergeOfSmallNonAdjacentRegions</a>()</pre>
 </li>
 </ul>
 <a name="testSplitOfLargeRegion--">
@@ -530,31 +534,31 @@ 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.215">testSplitOfLargeRegion</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.209">testSplitOfLargeRegion</a>()</pre>
 </li>
 </ul>
-<a name="testSplitWithTargetRegionCount--">
+<a name="testSplitWithTargetRegionSize--">
 <!--   -->
 </a>
 <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.229">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>
+<h4>testSplitWithTargetRegionSize</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.221">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>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
 </dl>
 </li>
 </ul>
-<a name="testSplitWithTargetRegionSize--">
+<a name="testSplitWithTargetRegionCount--">
 <!--   -->
 </a>
 <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.255">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>
+<h4>testSplitWithTargetRegionCount</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.247">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>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></code></dd>
@@ -567,7 +571,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testHonorsSplitEnabled</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.279">testHonorsSplitEnabled</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.269">testHonorsSplitEnabled</a>()</pre>
 </li>
 </ul>
 <a name="testHonorsMergeEnabled--">
@@ -576,7 +580,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testHonorsMergeEnabled</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.296">testHonorsMergeEnabled</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.286">testHonorsMergeEnabled</a>()</pre>
 </li>
 </ul>
 <a name="testHonorsMinimumRegionCount--">
@@ -585,7 +589,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testHonorsMinimumRegionCount</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.313">testHonorsMinimumRegionCount</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.303">testHonorsMinimumRegionCount</a>()</pre>
 </li>
 </ul>
 <a name="testHonorsMergeMinRegionAge--">
@@ -594,7 +598,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testHonorsMergeMinRegionAge</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.343">testHonorsMergeMinRegionAge</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.326">testHonorsMergeMinRegionAge</a>()</pre>
 </li>
 </ul>
 <a name="testHonorsMergeMinRegionSize--">
@@ -603,7 +607,16 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testHonorsMergeMinRegionSize</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.366">testHonorsMergeMinRegionSize</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.349">testHonorsMergeMinRegionSize</a>()</pre>
+</li>
+</ul>
+<a name="testMergeEmptyRegions--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>testMergeEmptyRegions</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.369">testMergeEmptyRegions</a>()</pre>
 </li>
 </ul>
 <a name="testNormalizerCannotMergeNonAdjacentRegions--">
@@ -612,7 +625,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testNormalizerCannotMergeNonAdjacentRegions</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.390">testNormalizerCannotMergeNonAdjacentRegions</a>()</pre>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.388">testNormalizerCannotMergeNonAdjacentRegions</a>()</pre>
 </li>
 </ul>
 <a name="setupMocksForNormalizer-java.util.Map-java.util.List-">
@@ -621,7 +634,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>setupMocksForNormalizer</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.414">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.413">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;regionInfoList)</pre>
 </li>
 </ul>
@@ -631,7 +644,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>createRegionInfos</h4>
-<pre>private static&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.hbase.client.RegionInfo&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.451">createRegionInfos</a>(org.apache.hadoop.hbase.TableName&nbsp;tableName,
+<pre>private static&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.hbase.client.RegionInfo&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.450">createRegionInfos</a>(org.apache.hadoop.hbase.TableName&nbsp;tableName,
                                                                                  int&nbsp;length)</pre>
 <div class="block">Create a list of <code>RegionInfo</code>s that represent a region chain of the specified length.</div>
 </li>
@@ -642,7 +655,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>createRegionInfo</h4>
-<pre>private static&nbsp;org.apache.hadoop.hbase.client.RegionInfo&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.470">createRegionInfo</a>(org.apache.hadoop.hbase.TableName&nbsp;tableName,
+<pre>private static&nbsp;org.apache.hadoop.hbase.client.RegionInfo&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.469">createRegionInfo</a>(org.apache.hadoop.hbase.TableName&nbsp;tableName,
                                                                           byte[]&nbsp;startKey,
                                                                           byte[]&nbsp;endKey)</pre>
 </li>
@@ -653,7 +666,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>generateRegionId</h4>
-<pre>private static&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.479">generateRegionId</a>()</pre>
+<pre>private static&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.478">generateRegionId</a>()</pre>
 </li>
 </ul>
 <a name="createRegionInfos-org.apache.hadoop.hbase.TableName-byte:A:A-">
@@ -662,7 +675,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>createRegionInfos</h4>
-<pre>private static&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.hbase.client.RegionInfo&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.485">createRegionInfos</a>(org.apache.hadoop.hbase.TableName&nbsp;tableName,
+<pre>private static&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.hbase.client.RegionInfo&gt;&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.484">createRegionInfos</a>(org.apache.hadoop.hbase.TableName&nbsp;tableName,
                                                                                  byte[][]&nbsp;splitKeys)</pre>
 </li>
 </ul>
@@ -672,7 +685,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>createRegionSizesMap</h4>
-<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;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;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.494">createRegionSizesMap</a>(<a href="https://docs.o [...]
+<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;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;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizer.html#line.493">createRegionSizesMap</a>(<a href="https://docs.o [...]
                                                         int...&nbsp;sizes)</pre>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
index bf02024..9f1e625 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -652,18 +652,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/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/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/IntegrationTestDDLMasterFailover.ACTION.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">IntegrationTestDDLMasterFailover.ACTION</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.RoleCommand</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.Service</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.Signal.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.Signal</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.CommandProvider.Operation</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ResourceChecker.Phase.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ResourceChecker.Phase</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/PerformanceEvaluation.Counter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">PerformanceEvaluation.Counter</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.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/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/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.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/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/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/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/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/HBaseClusterManager.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.CommandProvider.Operation</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/package-use.html b/testdevapidocs/org/apache/hadoop/hbase/package-use.html
index 26ee109..5ae277b 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/package-use.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/package-use.html
@@ -2051,6 +2051,11 @@
 <div class="block">Facility for testing HBase.</div>
 </td>
 </tr>
+<tr class="altColor">
+<td class="colOne"><a href="../../../../org/apache/hadoop/hbase/class-use/TableNameTestRule.html#org.apache.hadoop.hbase.master.normalizer">TableNameTestRule</a>
+<div class="block">Returns a <code>TableName</code> based on currently running test method name.</div>
+</td>
+</tr>
 </tbody>
 </table>
 </li>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index 11b8fb7..52aa6c8 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -242,9 +242,9 @@
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true [...]
 <ul>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/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/TestProcedureRecovery.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestProcedureRecovery.TestStateMachineProcedure.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestStateMachineProcedure.TestSMProcedureState</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/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/TestProcedureBypass.StuckStateMachineState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestProcedureBypass.StuckStateMachineState</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 f25b04c..6957018 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -707,10 +707,10 @@
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true [...]
 <ul>
 <li type="circle">org.apache.hadoop.hbase.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/TestRegionServerReadRequestMetrics.Metric.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestRegionServerReadRequestMetrics.Metric</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/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/TestRegionServerReadRequestMetrics.Metric.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestRegionServerReadRequestMetrics.Metric</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.CacheOnWriteType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestCacheOnWriteInSchema.CacheOnWriteType</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
index 93c7d15..9f53873 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
@@ -254,8 +254,8 @@
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true [...]
 <ul>
 <li type="circle">org.apache.hadoop.hbase.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/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/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/IntegrationTestWithCellVisibilityLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestWithCellVisibilityLoadAndVerify.Counters</span></a></li>
 </ul>
 </li>
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/TableNameTestRule.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/TableNameTestRule.html
index 25654f0..aafbc54 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/TableNameTestRule.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/TableNameTestRule.html
@@ -29,35 +29,36 @@
 <span class="sourceLineNo">021</span>import org.junit.runner.Description;<a name="line.21"></a>
 <span class="sourceLineNo">022</span><a name="line.22"></a>
 <span class="sourceLineNo">023</span>/**<a name="line.23"></a>
-<span class="sourceLineNo">024</span> * Returns a {@code TableName} based on currently running test method name.<a name="line.24"></a>
-<span class="sourceLineNo">025</span> */<a name="line.25"></a>
-<span class="sourceLineNo">026</span>public class TableNameTestRule extends TestWatcher {<a name="line.26"></a>
-<span class="sourceLineNo">027</span><a name="line.27"></a>
-<span class="sourceLineNo">028</span>  private TableName tableName;<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>  @Override<a name="line.30"></a>
-<span class="sourceLineNo">031</span>  protected void starting(Description description) {<a name="line.31"></a>
-<span class="sourceLineNo">032</span>    tableName = TableName.valueOf(cleanUpTestName(description.getMethodName()));<a name="line.32"></a>
-<span class="sourceLineNo">033</span>  }<a name="line.33"></a>
-<span class="sourceLineNo">034</span><a name="line.34"></a>
-<span class="sourceLineNo">035</span>  /**<a name="line.35"></a>
-<span class="sourceLineNo">036</span>   * Helper to handle parameterized method names. Unlike regular test methods, parameterized method<a name="line.36"></a>
-<span class="sourceLineNo">037</span>   * names look like 'foo[x]'. This is problematic for tests that use this name for HBase tables.<a name="line.37"></a>
-<span class="sourceLineNo">038</span>   * This helper strips out the parameter suffixes.<a name="line.38"></a>
-<span class="sourceLineNo">039</span>   * @return current test method name with out parameterized suffixes.<a name="line.39"></a>
-<span class="sourceLineNo">040</span>   */<a name="line.40"></a>
-<span class="sourceLineNo">041</span>  private static String cleanUpTestName(String methodName) {<a name="line.41"></a>
-<span class="sourceLineNo">042</span>    int index = methodName.indexOf('[');<a name="line.42"></a>
-<span class="sourceLineNo">043</span>    if (index == -1) {<a name="line.43"></a>
-<span class="sourceLineNo">044</span>      return methodName;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>    }<a name="line.45"></a>
-<span class="sourceLineNo">046</span>    return methodName.substring(0, index);<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>  public TableName getTableName() {<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    return tableName;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>  }<a name="line.51"></a>
-<span class="sourceLineNo">052</span>}<a name="line.52"></a>
+<span class="sourceLineNo">024</span> * Returns a {@code TableName} based on currently running test method name. Supports<a name="line.24"></a>
+<span class="sourceLineNo">025</span> *  tests built on the {@link org.junit.runners.Parameterized} runner.<a name="line.25"></a>
+<span class="sourceLineNo">026</span> */<a name="line.26"></a>
+<span class="sourceLineNo">027</span>public class TableNameTestRule extends TestWatcher {<a name="line.27"></a>
+<span class="sourceLineNo">028</span><a name="line.28"></a>
+<span class="sourceLineNo">029</span>  private TableName tableName;<a name="line.29"></a>
+<span class="sourceLineNo">030</span><a name="line.30"></a>
+<span class="sourceLineNo">031</span>  @Override<a name="line.31"></a>
+<span class="sourceLineNo">032</span>  protected void starting(Description description) {<a name="line.32"></a>
+<span class="sourceLineNo">033</span>    tableName = TableName.valueOf(cleanUpTestName(description.getMethodName()));<a name="line.33"></a>
+<span class="sourceLineNo">034</span>  }<a name="line.34"></a>
+<span class="sourceLineNo">035</span><a name="line.35"></a>
+<span class="sourceLineNo">036</span>  /**<a name="line.36"></a>
+<span class="sourceLineNo">037</span>   * Helper to handle parameterized method names. Unlike regular test methods, parameterized method<a name="line.37"></a>
+<span class="sourceLineNo">038</span>   * names look like 'foo[x]'. This is problematic for tests that use this name for HBase tables.<a name="line.38"></a>
+<span class="sourceLineNo">039</span>   * This helper strips out the parameter suffixes.<a name="line.39"></a>
+<span class="sourceLineNo">040</span>   * @return current test method name with out parameterized suffixes.<a name="line.40"></a>
+<span class="sourceLineNo">041</span>   */<a name="line.41"></a>
+<span class="sourceLineNo">042</span>  private static String cleanUpTestName(String methodName) {<a name="line.42"></a>
+<span class="sourceLineNo">043</span>    int index = methodName.indexOf('[');<a name="line.43"></a>
+<span class="sourceLineNo">044</span>    if (index == -1) {<a name="line.44"></a>
+<span class="sourceLineNo">045</span>      return methodName;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>    }<a name="line.46"></a>
+<span class="sourceLineNo">047</span>    return methodName.substring(0, index);<a name="line.47"></a>
+<span class="sourceLineNo">048</span>  }<a name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span>  public TableName getTableName() {<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    return tableName;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>  }<a name="line.52"></a>
+<span class="sourceLineNo">053</span>}<a name="line.53"></a>
 
 
 
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 09761b7..a805431 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
@@ -38,480 +38,479 @@
 <span class="sourceLineNo">030</span>import static org.hamcrest.Matchers.everyItem;<a name="line.30"></a>
 <span class="sourceLineNo">031</span>import static org.hamcrest.Matchers.greaterThanOrEqualTo;<a name="line.31"></a>
 <span class="sourceLineNo">032</span>import static org.hamcrest.Matchers.instanceOf;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import static org.hamcrest.Matchers.iterableWithSize;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import static org.hamcrest.Matchers.not;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import static org.junit.Assert.assertEquals;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import static org.junit.Assert.assertFalse;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import static org.junit.Assert.assertTrue;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import static org.mockito.ArgumentMatchers.any;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import static org.mockito.Mockito.RETURNS_DEEP_STUBS;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import static org.mockito.Mockito.when;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import java.time.Instant;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import java.time.Period;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import java.util.ArrayList;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import java.util.Collections;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import java.util.HashMap;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import java.util.List;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import java.util.Map;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.conf.Configuration;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.RegionMetrics;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.ServerName;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.Size;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.TableName;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.client.RegionInfoBuilder;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.master.RegionState;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>import org.junit.Before;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>import org.junit.ClassRule;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>import org.junit.Rule;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>import org.junit.Test;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>import org.junit.experimental.categories.Category;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>import org.junit.rules.TestName;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>import org.mockito.Mockito;<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> * Tests logic of {@link SimpleRegionNormalizer}.<a name="line.72"></a>
-<span class="sourceLineNo">073</span> */<a name="line.73"></a>
-<span class="sourceLineNo">074</span>@Category({MasterTests.class, SmallTests.class})<a name="line.74"></a>
-<span class="sourceLineNo">075</span>public class TestSimpleRegionNormalizer {<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span>  @ClassRule<a name="line.77"></a>
-<span class="sourceLineNo">078</span>  public static final HBaseClassTestRule CLASS_RULE =<a name="line.78"></a>
-<span class="sourceLineNo">079</span>      HBaseClassTestRule.forClass(TestSimpleRegionNormalizer.class);<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span>  private Configuration conf;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  private SimpleRegionNormalizer normalizer;<a name="line.82"></a>
-<span class="sourceLineNo">083</span>  private MasterServices masterServices;<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span>  @Rule<a name="line.85"></a>
-<span class="sourceLineNo">086</span>  public TestName name = new TestName();<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span>  @Before<a name="line.88"></a>
-<span class="sourceLineNo">089</span>  public void before() {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    conf = HBaseConfiguration.create();<a name="line.90"></a>
-<span class="sourceLineNo">091</span>  }<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span>  @Test<a name="line.93"></a>
-<span class="sourceLineNo">094</span>  public void testNoNormalizationForMetaTable() {<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    TableName testTable = TableName.META_TABLE_NAME;<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    List&lt;RegionInfo&gt; RegionInfo = new ArrayList&lt;&gt;();<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span>    setupMocksForNormalizer(regionSizes, RegionInfo);<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlansForTable(testTable);<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    assertThat(plans, empty());<a name="line.101"></a>
-<span class="sourceLineNo">102</span>  }<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span>  @Test<a name="line.104"></a>
-<span class="sourceLineNo">105</span>  public void testNoNormalizationIfTooFewRegions() {<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 2);<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    final Map&lt;byte[], Integer&gt; regionSizes = createRegionSizesMap(regionInfos, 10, 15);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    setupMocksForNormalizer(regionSizes, regionInfos);<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 = normalizer.computePlansForTable(tableName);<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    assertThat(plans, empty());<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>  @Test<a name="line.115"></a>
-<span class="sourceLineNo">116</span>  public void testNoNormalizationOnNormalizedCluster() {<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 4);<a name="line.118"></a>
-<span class="sourceLineNo">119</span>    final Map&lt;byte[], Integer&gt; regionSizes = createRegionSizesMap(regionInfos, 10, 15, 8, 10);<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.120"></a>
-<span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlansForTable(tableName);<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    assertThat(plans, empty());<a name="line.123"></a>
-<span class="sourceLineNo">124</span>  }<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>  private void noNormalizationOnTransitioningRegions(final RegionState.State state) {<a name="line.126"></a>
-<span class="sourceLineNo">127</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 3);<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    final Map&lt;byte[], Integer&gt; regionSizes = createRegionSizesMap(regionInfos, 10, 1, 100);<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    when(masterServices.getAssignmentManager().getRegionStates()<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      .getRegionState(any(RegionInfo.class)))<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      .thenReturn(RegionState.createForTesting(null, state));<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    assertThat(normalizer.getMinRegionCount(), greaterThanOrEqualTo(regionInfos.size()));<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlansForTable(tableName);<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    assertThat(format("Unexpected plans for RegionState %s", state), plans, empty());<a name="line.138"></a>
-<span class="sourceLineNo">139</span>  }<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>  @Test<a name="line.141"></a>
-<span class="sourceLineNo">142</span>  public void testNoNormalizationOnMergingNewRegions() {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    noNormalizationOnTransitioningRegions(RegionState.State.MERGING_NEW);<a name="line.143"></a>
-<span class="sourceLineNo">144</span>  }<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span>  @Test<a name="line.146"></a>
-<span class="sourceLineNo">147</span>  public void testNoNormalizationOnMergingRegions() {<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    noNormalizationOnTransitioningRegions(RegionState.State.MERGING);<a name="line.148"></a>
-<span class="sourceLineNo">149</span>  }<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span>  @Test<a name="line.151"></a>
-<span class="sourceLineNo">152</span>  public void testNoNormalizationOnMergedRegions() {<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    noNormalizationOnTransitioningRegions(RegionState.State.MERGED);<a name="line.153"></a>
-<span class="sourceLineNo">154</span>  }<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span>  @Test<a name="line.156"></a>
-<span class="sourceLineNo">157</span>  public void testNoNormalizationOnSplittingNewRegions() {<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    noNormalizationOnTransitioningRegions(RegionState.State.SPLITTING_NEW);<a name="line.158"></a>
-<span class="sourceLineNo">159</span>  }<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span>  @Test<a name="line.161"></a>
-<span class="sourceLineNo">162</span>  public void testNoNormalizationOnSplittingRegions() {<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    noNormalizationOnTransitioningRegions(RegionState.State.SPLITTING);<a name="line.163"></a>
-<span class="sourceLineNo">164</span>  }<a name="line.164"></a>
-<span class="sourceLineNo">165</span><a name="line.165"></a>
-<span class="sourceLineNo">166</span>  @Test<a name="line.166"></a>
-<span class="sourceLineNo">167</span>  public void testNoNormalizationOnSplitRegions() {<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    noNormalizationOnTransitioningRegions(RegionState.State.SPLIT);<a name="line.168"></a>
-<span class="sourceLineNo">169</span>  }<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span>  @Test<a name="line.171"></a>
-<span class="sourceLineNo">172</span>  public void testMergeOfSmallRegions() {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 5);<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    final Map&lt;byte[], Integer&gt; regionSizes =<a name="line.175"></a>
-<span class="sourceLineNo">176</span>      createRegionSizesMap(regionInfos, 15, 5, 5, 15, 16);<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlansForTable(tableName);<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    assertThat(plans.get(0), instanceOf(MergeNormalizationPlan.class));<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    MergeNormalizationPlan plan = (MergeNormalizationPlan) plans.get(0);<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    assertEquals(regionInfos.get(1), plan.getFirstRegion());<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    assertEquals(regionInfos.get(2), plan.getSecondRegion());<a name="line.183"></a>
-<span class="sourceLineNo">184</span>  }<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span>  // Test for situation illustrated in HBASE-14867<a name="line.186"></a>
-<span class="sourceLineNo">187</span>  @Test<a name="line.187"></a>
-<span class="sourceLineNo">188</span>  public void testMergeOfSecondSmallestRegions() {<a name="line.188"></a>
-<span class="sourceLineNo">189</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 6);<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    final Map&lt;byte[], Integer&gt; regionSizes =<a name="line.191"></a>
-<span class="sourceLineNo">192</span>      createRegionSizesMap(regionInfos, 1, 10000, 10000, 10000, 2700, 2700);<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlansForTable(tableName);<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    assertThat(plans.get(0), instanceOf(MergeNormalizationPlan.class));<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    MergeNormalizationPlan plan = (MergeNormalizationPlan) plans.get(0);<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    assertEquals(regionInfos.get(4), plan.getFirstRegion());<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    assertEquals(regionInfos.get(5), plan.getSecondRegion());<a name="line.199"></a>
-<span class="sourceLineNo">200</span>  }<a name="line.200"></a>
-<span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span>  @Test<a name="line.202"></a>
-<span class="sourceLineNo">203</span>  public void testMergeOfSmallNonAdjacentRegions() {<a name="line.203"></a>
-<span class="sourceLineNo">204</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.204"></a>
-<span class="sourceLineNo">205</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 5);<a name="line.205"></a>
-<span class="sourceLineNo">206</span>    final Map&lt;byte[], Integer&gt; regionSizes =<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      createRegionSizesMap(regionInfos, 15, 5, 16, 15, 5);<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.208"></a>
-<span class="sourceLineNo">209</span><a name="line.209"></a>
-<span class="sourceLineNo">210</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlansForTable(tableName);<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    assertThat(plans, empty());<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 testSplitOfLargeRegion() {<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.216"></a>
-<span class="sourceLineNo">217</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 4);<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    final Map&lt;byte[], Integer&gt; regionSizes =<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      createRegionSizesMap(regionInfos, 8, 6, 10, 30);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlansForTable(tableName);<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    assertThat(plans.get(0), instanceOf(SplitNormalizationPlan.class));<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    SplitNormalizationPlan plan = (SplitNormalizationPlan) plans.get(0);<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    assertEquals(regionInfos.get(3), plan.getRegionInfo());<a name="line.225"></a>
-<span class="sourceLineNo">226</span>  }<a name="line.226"></a>
+<span class="sourceLineNo">033</span>import static org.hamcrest.Matchers.not;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import static org.junit.Assert.assertEquals;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import static org.junit.Assert.assertFalse;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import static org.mockito.ArgumentMatchers.any;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import static org.mockito.Mockito.RETURNS_DEEP_STUBS;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import static org.mockito.Mockito.when;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import java.time.Instant;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import java.time.Period;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import java.util.ArrayList;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import java.util.Collections;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import java.util.HashMap;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import java.util.List;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import java.util.Map;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.conf.Configuration;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.RegionMetrics;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.ServerName;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.Size;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.TableName;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.TableNameTestRule;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.client.RegionInfoBuilder;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.master.RegionState;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import org.junit.Before;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import org.junit.ClassRule;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>import org.junit.Rule;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>import org.junit.Test;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>import org.junit.experimental.categories.Category;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>import org.mockito.Mockito;<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span>/**<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * Tests logic of {@link SimpleRegionNormalizer}.<a name="line.70"></a>
+<span class="sourceLineNo">071</span> */<a name="line.71"></a>
+<span class="sourceLineNo">072</span>@Category({MasterTests.class, SmallTests.class})<a name="line.72"></a>
+<span class="sourceLineNo">073</span>public class TestSimpleRegionNormalizer {<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>  @ClassRule<a name="line.75"></a>
+<span class="sourceLineNo">076</span>  public static final HBaseClassTestRule CLASS_RULE =<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      HBaseClassTestRule.forClass(TestSimpleRegionNormalizer.class);<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span>  private Configuration conf;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  private SimpleRegionNormalizer normalizer;<a name="line.80"></a>
+<span class="sourceLineNo">081</span>  private MasterServices masterServices;<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span>  @Rule<a name="line.83"></a>
+<span class="sourceLineNo">084</span>  public TableNameTestRule name = new TableNameTestRule();<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span>  @Before<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  public void before() {<a name="line.87"></a>
+<span class="sourceLineNo">088</span>    conf = HBaseConfiguration.create();<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>  @Test<a name="line.91"></a>
+<span class="sourceLineNo">092</span>  public void testNoNormalizationForMetaTable() {<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    TableName testTable = TableName.META_TABLE_NAME;<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    List&lt;RegionInfo&gt; RegionInfo = new ArrayList&lt;&gt;();<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    Map&lt;byte[], Integer&gt; regionSizes = new HashMap&lt;&gt;();<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span>    setupMocksForNormalizer(regionSizes, RegionInfo);<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlansForTable(testTable);<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    assertThat(plans, empty());<a name="line.99"></a>
+<span class="sourceLineNo">100</span>  }<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>  @Test<a name="line.102"></a>
+<span class="sourceLineNo">103</span>  public void testNoNormalizationIfTooFewRegions() {<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    final TableName tableName = name.getTableName();<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 2);<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    final Map&lt;byte[], Integer&gt; regionSizes = createRegionSizesMap(regionInfos, 10, 15);<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlansForTable(tableName);<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    assertThat(plans, empty());<a name="line.110"></a>
+<span class="sourceLineNo">111</span>  }<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span>  @Test<a name="line.113"></a>
+<span class="sourceLineNo">114</span>  public void testNoNormalizationOnNormalizedCluster() {<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    final TableName tableName = name.getTableName();<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 4);<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    final Map&lt;byte[], Integer&gt; regionSizes =<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      createRegionSizesMap(regionInfos, 10, 15, 8, 10);<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlansForTable(tableName);<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    assertThat(plans, empty());<a name="line.122"></a>
+<span class="sourceLineNo">123</span>  }<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span>  private void noNormalizationOnTransitioningRegions(final RegionState.State state) {<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    final TableName tableName = name.getTableName();<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 3);<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    final Map&lt;byte[], Integer&gt; regionSizes = createRegionSizesMap(regionInfos, 10, 1, 100);<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    when(masterServices.getAssignmentManager().getRegionStates()<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      .getRegionState(any(RegionInfo.class)))<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      .thenReturn(RegionState.createForTesting(null, state));<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    assertThat(normalizer.getMinRegionCount(), greaterThanOrEqualTo(regionInfos.size()));<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlansForTable(tableName);<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    assertThat(format("Unexpected plans for RegionState %s", state), plans, empty());<a name="line.137"></a>
+<span class="sourceLineNo">138</span>  }<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span>  @Test<a name="line.140"></a>
+<span class="sourceLineNo">141</span>  public void testNoNormalizationOnMergingNewRegions() {<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    noNormalizationOnTransitioningRegions(RegionState.State.MERGING_NEW);<a name="line.142"></a>
+<span class="sourceLineNo">143</span>  }<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>  @Test<a name="line.145"></a>
+<span class="sourceLineNo">146</span>  public void testNoNormalizationOnMergingRegions() {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    noNormalizationOnTransitioningRegions(RegionState.State.MERGING);<a name="line.147"></a>
+<span class="sourceLineNo">148</span>  }<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span>  @Test<a name="line.150"></a>
+<span class="sourceLineNo">151</span>  public void testNoNormalizationOnMergedRegions() {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    noNormalizationOnTransitioningRegions(RegionState.State.MERGED);<a name="line.152"></a>
+<span class="sourceLineNo">153</span>  }<a name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span>  @Test<a name="line.155"></a>
+<span class="sourceLineNo">156</span>  public void testNoNormalizationOnSplittingNewRegions() {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    noNormalizationOnTransitioningRegions(RegionState.State.SPLITTING_NEW);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>  }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span>  @Test<a name="line.160"></a>
+<span class="sourceLineNo">161</span>  public void testNoNormalizationOnSplittingRegions() {<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    noNormalizationOnTransitioningRegions(RegionState.State.SPLITTING);<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>  @Test<a name="line.165"></a>
+<span class="sourceLineNo">166</span>  public void testNoNormalizationOnSplitRegions() {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    noNormalizationOnTransitioningRegions(RegionState.State.SPLIT);<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>  @Test<a name="line.170"></a>
+<span class="sourceLineNo">171</span>  public void testMergeOfSmallRegions() {<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    final TableName tableName = name.getTableName();<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 5);<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    final Map&lt;byte[], Integer&gt; regionSizes =<a name="line.174"></a>
+<span class="sourceLineNo">175</span>      createRegionSizesMap(regionInfos, 15, 5, 5, 15, 16);<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span>    assertThat(normalizer.computePlansForTable(tableName), contains(<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      new MergeNormalizationPlan(regionInfos.get(1), regionInfos.get(2))));<a name="line.179"></a>
+<span class="sourceLineNo">180</span>  }<a name="line.180"></a>
+<span class="sourceLineNo">181</span><a name="line.181"></a>
+<span class="sourceLineNo">182</span>  // Test for situation illustrated in HBASE-14867<a name="line.182"></a>
+<span class="sourceLineNo">183</span>  @Test<a name="line.183"></a>
+<span class="sourceLineNo">184</span>  public void testMergeOfSecondSmallestRegions() {<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    final TableName tableName = name.getTableName();<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 6);<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    final Map&lt;byte[], Integer&gt; regionSizes =<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      createRegionSizesMap(regionInfos, 1, 10000, 10000, 10000, 2700, 2700);<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span>    assertThat(normalizer.computePlansForTable(tableName), contains(<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      new MergeNormalizationPlan(regionInfos.get(4), regionInfos.get(5))<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    ));<a name="line.193"></a>
+<span class="sourceLineNo">194</span>  }<a name="line.194"></a>
+<span class="sourceLineNo">195</span><a name="line.195"></a>
+<span class="sourceLineNo">196</span>  @Test<a name="line.196"></a>
+<span class="sourceLineNo">197</span>  public void testMergeOfSmallNonAdjacentRegions() {<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    final TableName tableName = name.getTableName();<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 5);<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    final Map&lt;byte[], Integer&gt; regionSizes =<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      createRegionSizesMap(regionInfos, 15, 5, 16, 15, 5);<a name="line.201"></a>
+<span class="sourceLineNo">202</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlansForTable(tableName);<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    assertThat(plans, empty());<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 testSplitOfLargeRegion() {<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    final TableName tableName = name.getTableName();<a name="line.210"></a>
+<span class="sourceLineNo">211</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 4);<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    final Map&lt;byte[], Integer&gt; regionSizes =<a name="line.212"></a>
+<span class="sourceLineNo">213</span>      createRegionSizesMap(regionInfos, 8, 6, 10, 30);<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.214"></a>
+<span class="sourceLineNo">215</span><a name="line.215"></a>
+<span class="sourceLineNo">216</span>    assertThat(normalizer.computePlansForTable(tableName), contains(<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      new SplitNormalizationPlan(regionInfos.get(3))));<a name="line.217"></a>
+<span class="sourceLineNo">218</span>  }<a name="line.218"></a>
+<span class="sourceLineNo">219</span><a name="line.219"></a>
+<span class="sourceLineNo">220</span>  @Test<a name="line.220"></a>
+<span class="sourceLineNo">221</span>  public void testSplitWithTargetRegionSize() throws Exception {<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    final TableName tableName = name.getTableName();<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 6);<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    final Map&lt;byte[], Integer&gt; regionSizes =<a name="line.224"></a>
+<span class="sourceLineNo">225</span>      createRegionSizesMap(regionInfos, 20, 40, 60, 80, 100, 120);<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    setupMocksForNormalizer(regionSizes, regionInfos);<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 testSplitWithTargetRegionCount() throws Exception {<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>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 6);<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    final Map&lt;byte[], Integer&gt; regionSizes =<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      createRegionSizesMap(regionInfos, 20, 40, 60, 80, 100, 120);<a name="line.233"></a>
-<span class="sourceLineNo">234</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span>    // test when target region size is 20<a name="line.236"></a>
-<span class="sourceLineNo">237</span>    when(masterServices.getTableDescriptors().get(any()).getNormalizerTargetRegionSize())<a name="line.237"></a>
-<span class="sourceLineNo">238</span>        .thenReturn(20L);<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlansForTable(tableName);<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    assertThat(plans, iterableWithSize(4));<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    assertThat(plans, everyItem(instanceOf(SplitNormalizationPlan.class)));<a name="line.241"></a>
-<span class="sourceLineNo">242</span><a name="line.242"></a>
-<span class="sourceLineNo">243</span>    // test when target region size is 200<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    when(masterServices.getTableDescriptors().get(any()).getNormalizerTargetRegionSize())<a name="line.244"></a>
-<span class="sourceLineNo">245</span>        .thenReturn(200L);<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    plans = normalizer.computePlansForTable(tableName);<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    assertThat(plans, iterableWithSize(2));<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    assertTrue(plans.get(0) instanceof MergeNormalizationPlan);<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    MergeNormalizationPlan plan = (MergeNormalizationPlan) plans.get(0);<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    assertEquals(regionInfos.get(0), plan.getFirstRegion());<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    assertEquals(regionInfos.get(1), plan.getSecondRegion());<a name="line.251"></a>
-<span class="sourceLineNo">252</span>  }<a name="line.252"></a>
+<span class="sourceLineNo">228</span>    // test when target region size is 20<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    when(masterServices.getTableDescriptors().get(any()).getNormalizerTargetRegionSize())<a name="line.229"></a>
+<span class="sourceLineNo">230</span>        .thenReturn(20L);<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    assertThat(normalizer.computePlansForTable(tableName), contains(<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      new SplitNormalizationPlan(regionInfos.get(2)),<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      new SplitNormalizationPlan(regionInfos.get(3)),<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      new SplitNormalizationPlan(regionInfos.get(4)),<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      new SplitNormalizationPlan(regionInfos.get(5))<a name="line.235"></a>
+<span class="sourceLineNo">236</span>    ));<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span>    // test when target region size is 200<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    when(masterServices.getTableDescriptors().get(any()).getNormalizerTargetRegionSize())<a name="line.239"></a>
+<span class="sourceLineNo">240</span>        .thenReturn(200L);<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    assertThat(normalizer.computePlansForTable(tableName), contains(<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      new MergeNormalizationPlan(regionInfos.get(0), regionInfos.get(1)),<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      new MergeNormalizationPlan(regionInfos.get(2), regionInfos.get(3))));<a name="line.243"></a>
+<span class="sourceLineNo">244</span>  }<a name="line.244"></a>
+<span class="sourceLineNo">245</span><a name="line.245"></a>
+<span class="sourceLineNo">246</span>  @Test<a name="line.246"></a>
+<span class="sourceLineNo">247</span>  public void testSplitWithTargetRegionCount() throws Exception {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    final TableName tableName = name.getTableName();<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 4);<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    final Map&lt;byte[], Integer&gt; regionSizes =<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      createRegionSizesMap(regionInfos, 20, 40, 60, 80);<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.252"></a>
 <span class="sourceLineNo">253</span><a name="line.253"></a>
-<span class="sourceLineNo">254</span>  @Test<a name="line.254"></a>
-<span class="sourceLineNo">255</span>  public void testSplitWithTargetRegionSize() throws Exception {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.256"></a>
-<span class="sourceLineNo">257</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 4);<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    final Map&lt;byte[], Integer&gt; regionSizes = createRegionSizesMap(regionInfos, 20, 40, 60, 80);<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.259"></a>
+<span class="sourceLineNo">254</span>    // test when target region count is 8<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    when(masterServices.getTableDescriptors().get(any()).getNormalizerTargetRegionCount())<a name="line.255"></a>
+<span class="sourceLineNo">256</span>        .thenReturn(8);<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    assertThat(normalizer.computePlansForTable(tableName), contains(<a name="line.257"></a>
+<span class="sourceLineNo">258</span>      new SplitNormalizationPlan(regionInfos.get(2)),<a name="line.258"></a>
+<span class="sourceLineNo">259</span>      new SplitNormalizationPlan(regionInfos.get(3))));<a name="line.259"></a>
 <span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span>    // test when target region count is 8<a name="line.261"></a>
+<span class="sourceLineNo">261</span>    // test when target region count is 3<a name="line.261"></a>
 <span class="sourceLineNo">262</span>    when(masterServices.getTableDescriptors().get(any()).getNormalizerTargetRegionCount())<a name="line.262"></a>
-<span class="sourceLineNo">263</span>        .thenReturn(8);<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlansForTable(tableName);<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    assertThat(plans, iterableWithSize(2));<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    assertThat(plans, everyItem(instanceOf(SplitNormalizationPlan.class)));<a name="line.266"></a>
+<span class="sourceLineNo">263</span>        .thenReturn(3);<a name="line.263"></a>
+<span class="sourceLineNo">264</span>    assertThat(normalizer.computePlansForTable(tableName), contains(<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      new MergeNormalizationPlan(regionInfos.get(0), regionInfos.get(1))));<a name="line.265"></a>
+<span class="sourceLineNo">266</span>  }<a name="line.266"></a>
 <span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span>    // test when target region count is 3<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    when(masterServices.getTableDescriptors().get(any()).getNormalizerTargetRegionCount())<a name="line.269"></a>
-<span class="sourceLineNo">270</span>        .thenReturn(3);<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    plans = normalizer.computePlansForTable(tableName);<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    assertThat(plans, contains(instanceOf(MergeNormalizationPlan.class)));<a name="line.272"></a>
-<span class="sourceLineNo">273</span>    MergeNormalizationPlan plan = (MergeNormalizationPlan) plans.get(0);<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    assertEquals(regionInfos.get(0), plan.getFirstRegion());<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    assertEquals(regionInfos.get(1), 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<a name="line.278"></a>
-<span class="sourceLineNo">279</span>  public void testHonorsSplitEnabled() {<a name="line.279"></a>
-<span class="sourceLineNo">280</span>    conf.setBoolean(SPLIT_ENABLED_KEY, true);<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>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 5);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    final Map&lt;byte[], Integer&gt; regionSizes =<a name="line.283"></a>
-<span class="sourceLineNo">284</span>      createRegionSizesMap(regionInfos, 5, 5, 20, 5, 5);<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    assertThat(<a name="line.286"></a>
-<span class="sourceLineNo">287</span>      normalizer.computePlansForTable(tableName),<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      contains(instanceOf(SplitNormalizationPlan.class)));<a name="line.288"></a>
-<span class="sourceLineNo">289</span><a name="line.289"></a>
-<span class="sourceLineNo">290</span>    conf.setBoolean(SPLIT_ENABLED_KEY, false);<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.291"></a>
-<span class="sourceLineNo">292</span>    assertThat(normalizer.computePlansForTable(tableName), empty());<a name="line.292"></a>
-<span class="sourceLineNo">293</span>  }<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span>  @Test<a name="line.295"></a>
-<span class="sourceLineNo">296</span>  public void testHonorsMergeEnabled() {<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    conf.setBoolean(MERGE_ENABLED_KEY, true);<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.298"></a>
-<span class="sourceLineNo">299</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 5);<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    final Map&lt;byte[], Integer&gt; regionSizes =<a name="line.300"></a>
-<span class="sourceLineNo">301</span>      createRegionSizesMap(regionInfos, 20, 5, 5, 20, 20);<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    assertThat(<a name="line.303"></a>
-<span class="sourceLineNo">304</span>      normalizer.computePlansForTable(tableName),<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      contains(instanceOf(MergeNormalizationPlan.class)));<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span>    conf.setBoolean(MERGE_ENABLED_KEY, false);<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    assertThat(normalizer.computePlansForTable(tableName), empty());<a name="line.309"></a>
-<span class="sourceLineNo">310</span>  }<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span>  @Test<a name="line.312"></a>
-<span class="sourceLineNo">313</span>  public void testHonorsMinimumRegionCount() {<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    conf.setInt(MIN_REGION_COUNT_KEY, 1);<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 3);<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    // create a table topology that results in both a merge plan and a split plan. Assert that the<a name="line.317"></a>
-<span class="sourceLineNo">318</span>    // merge is only created when the when the number of table regions is above the region count<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    // threshold, and that the split plan is create in both cases.<a name="line.319"></a>
-<span class="sourceLineNo">320</span>    final Map&lt;byte[], Integer&gt; regionSizes = createRegionSizesMap(regionInfos, 1, 1, 10);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlansForTable(tableName);<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    assertThat(plans, contains(<a name="line.324"></a>
-<span class="sourceLineNo">325</span>      instanceOf(SplitNormalizationPlan.class),<a name="line.325"></a>
-<span class="sourceLineNo">326</span>      instanceOf(MergeNormalizationPlan.class)));<a name="line.326"></a>
-<span class="sourceLineNo">327</span>    SplitNormalizationPlan splitPlan = (SplitNormalizationPlan) plans.get(0);<a name="line.327"></a>
-<span class="sourceLineNo">328</span>    assertEquals(regionInfos.get(2), splitPlan.getRegionInfo());<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    MergeNormalizationPlan mergePlan = (MergeNormalizationPlan) plans.get(1);<a name="line.329"></a>
-<span class="sourceLineNo">330</span>    assertEquals(regionInfos.get(0), mergePlan.getFirstRegion());<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    assertEquals(regionInfos.get(1), mergePlan.getSecondRegion());<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span>    // have to call setupMocks again because we don't have dynamic config update on normalizer.<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    conf.setInt(MIN_REGION_COUNT_KEY, 4);<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    plans = normalizer.computePlansForTable(tableName);<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    assertThat(plans, contains(instanceOf(SplitNormalizationPlan.class)));<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    splitPlan = (SplitNormalizationPlan) plans.get(0);<a name="line.338"></a>
-<span class="sourceLineNo">339</span>    assertEquals(regionInfos.get(2), splitPlan.getRegionInfo());<a name="line.339"></a>
-<span class="sourceLineNo">340</span>  }<a name="line.340"></a>
-<span class="sourceLineNo">341</span><a name="line.341"></a>
-<span class="sourceLineNo">342</span>  @Test<a name="line.342"></a>
-<span class="sourceLineNo">343</span>  public void testHonorsMergeMinRegionAge() {<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    conf.setInt(MERGE_MIN_REGION_AGE_DAYS_KEY, 7);<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 4);<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    final Map&lt;byte[], Integer&gt; regionSizes =<a name="line.347"></a>
-<span class="sourceLineNo">348</span>      createRegionSizesMap(regionInfos, 1, 1, 10, 10);<a name="line.348"></a>
-<span class="sourceLineNo">349</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.349"></a>
-<span class="sourceLineNo">350</span>    assertEquals(Period.ofDays(7), normalizer.getMergeMinRegionAge());<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    assertThat(<a name="line.351"></a>
-<span class="sourceLineNo">352</span>      normalizer.computePlansForTable(tableName),<a name="line.352"></a>
-<span class="sourceLineNo">353</span>      everyItem(not(instanceOf(MergeNormalizationPlan.class))));<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span>    // have to call setupMocks again because we don't have dynamic config update on normalizer.<a name="line.355"></a>
-<span class="sourceLineNo">356</span>    conf.unset(MERGE_MIN_REGION_AGE_DAYS_KEY);<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    assertEquals(<a name="line.358"></a>
-<span class="sourceLineNo">359</span>      Period.ofDays(DEFAULT_MERGE_MIN_REGION_AGE_DAYS), normalizer.getMergeMinRegionAge());<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    final List&lt;NormalizationPlan&gt; plans = normalizer.computePlansForTable(tableName);<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    assertThat(plans, not(empty()));<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    assertThat(plans, everyItem(instanceOf(MergeNormalizationPlan.class)));<a name="line.362"></a>
-<span class="sourceLineNo">363</span>  }<a name="line.363"></a>
-<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span>  @Test<a name="line.365"></a>
-<span class="sourceLineNo">366</span>  public void testHonorsMergeMinRegionSize() {<a name="line.366"></a>
-<span class="sourceLineNo">367</span>    conf.setBoolean(SPLIT_ENABLED_KEY, false);<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 5);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    final Map&lt;byte[], Integer&gt; regionSizes = createRegionSizesMap(regionInfos, 1, 2, 0, 10, 10);<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.371"></a>
-<span class="sourceLineNo">372</span><a name="line.372"></a>
-<span class="sourceLineNo">373</span>    assertFalse(normalizer.isSplitEnabled());<a name="line.373"></a>
-<span class="sourceLineNo">374</span>    assertEquals(1, normalizer.getMergeMinRegionSizeMb());<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    final List&lt;NormalizationPlan&gt; plans = normalizer.computePlansForTable(tableName);<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    assertThat(plans, everyItem(instanceOf(MergeNormalizationPlan.class)));<a name="line.376"></a>
-<span class="sourceLineNo">377</span>    assertThat(plans, iterableWithSize(1));<a name="line.377"></a>
-<span class="sourceLineNo">378</span>    final MergeNormalizationPlan plan = (MergeNormalizationPlan) plans.get(0);<a name="line.378"></a>
-<span class="sourceLineNo">379</span>    assertEquals(regionInfos.get(0), plan.getFirstRegion());<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    assertEquals(regionInfos.get(1), plan.getSecondRegion());<a name="line.380"></a>
-<span class="sourceLineNo">381</span><a name="line.381"></a>
-<span class="sourceLineNo">382</span>    conf.setInt(MERGE_MIN_REGION_SIZE_MB_KEY, 3);<a name="line.382"></a>
-<span class="sourceLineNo">383</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    assertEquals(3, normalizer.getMergeMinRegionSizeMb());<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    assertThat(normalizer.computePlansForTable(tableName), empty());<a name="line.385"></a>
-<span class="sourceLineNo">386</span>  }<a name="line.386"></a>
-<span class="sourceLineNo">387</span><a name="line.387"></a>
-<span class="sourceLineNo">388</span>  // This test is to make sure that normalizer is only going to merge adjacent regions.<a name="line.388"></a>
-<span class="sourceLineNo">389</span>  @Test<a name="line.389"></a>
-<span class="sourceLineNo">390</span>  public void testNormalizerCannotMergeNonAdjacentRegions() {<a name="line.390"></a>
-<span class="sourceLineNo">391</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.391"></a>
-<span class="sourceLineNo">392</span>    // create 5 regions with sizes to trigger merge of small regions. region ranges are:<a name="line.392"></a>
-<span class="sourceLineNo">393</span>    // [, "aa"), ["aa", "aa1"), ["aa1", "aa1!"), ["aa1!", "aa2"), ["aa2", )<a name="line.393"></a>
-<span class="sourceLineNo">394</span>    // Region ["aa", "aa1") and ["aa1!", "aa2") are not adjacent, they are not supposed to<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    // merged.<a name="line.395"></a>
-<span class="sourceLineNo">396</span>    final byte[][] keys = {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>      null,<a name="line.397"></a>
-<span class="sourceLineNo">398</span>      Bytes.toBytes("aa"),<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      Bytes.toBytes("aa1!"),<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      Bytes.toBytes("aa1"),<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      Bytes.toBytes("aa2"),<a name="line.401"></a>
-<span class="sourceLineNo">402</span>      null,<a name="line.402"></a>
-<span class="sourceLineNo">403</span>    };<a name="line.403"></a>
-<span class="sourceLineNo">404</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, keys);<a name="line.404"></a>
-<span class="sourceLineNo">405</span>    final Map&lt;byte[], Integer&gt; regionSizes = createRegionSizesMap(regionInfos, 3, 1, 1, 3, 5);<a name="line.405"></a>
-<span class="sourceLineNo">406</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.406"></a>
-<span class="sourceLineNo">407</span><a name="line.407"></a>
-<span class="sourceLineNo">408</span>    // Compute the plan, no merge plan returned as they are not adjacent.<a name="line.408"></a>
-<span class="sourceLineNo">409</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlansForTable(tableName);<a name="line.409"></a>
-<span class="sourceLineNo">410</span>    assertThat(plans, empty());<a name="line.410"></a>
-<span class="sourceLineNo">411</span>  }<a name="line.411"></a>
-<span class="sourceLineNo">412</span><a name="line.412"></a>
-<span class="sourceLineNo">413</span>  @SuppressWarnings("MockitoCast")<a name="line.413"></a>
-<span class="sourceLineNo">414</span>  private void setupMocksForNormalizer(Map&lt;byte[], Integer&gt; regionSizes,<a name="line.414"></a>
-<span class="sourceLineNo">415</span>    List&lt;RegionInfo&gt; regionInfoList) {<a name="line.415"></a>
-<span class="sourceLineNo">416</span>    masterServices = Mockito.mock(MasterServices.class, RETURNS_DEEP_STUBS);<a name="line.416"></a>
-<span class="sourceLineNo">417</span><a name="line.417"></a>
-<span class="sourceLineNo">418</span>    // for simplicity all regions are assumed to be on one server; doesn't matter to us<a name="line.418"></a>
-<span class="sourceLineNo">419</span>    ServerName sn = ServerName.valueOf("localhost", 0, 0L);<a name="line.419"></a>
-<span class="sourceLineNo">420</span>    when(masterServices.getAssignmentManager().getRegionStates()<a name="line.420"></a>
-<span class="sourceLineNo">421</span>      .getRegionsOfTable(any())).thenReturn(regionInfoList);<a name="line.421"></a>
-<span class="sourceLineNo">422</span>    when(masterServices.getAssignmentManager().getRegionStates()<a name="line.422"></a>
-<span class="sourceLineNo">423</span>      .getRegionServerOfRegion(any())).thenReturn(sn);<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    when(masterServices.getAssignmentManager().getRegionStates()<a name="line.424"></a>
-<span class="sourceLineNo">425</span>      .getRegionState(any(RegionInfo.class))).thenReturn(<a name="line.425"></a>
-<span class="sourceLineNo">426</span>        RegionState.createForTesting(null, RegionState.State.OPEN));<a name="line.426"></a>
-<span class="sourceLineNo">427</span><a name="line.427"></a>
-<span class="sourceLineNo">428</span>    for (Map.Entry&lt;byte[], Integer&gt; region : regionSizes.entrySet()) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span>      RegionMetrics regionLoad = Mockito.mock(RegionMetrics.class);<a name="line.429"></a>
-<span class="sourceLineNo">430</span>      when(regionLoad.getRegionName()).thenReturn(region.getKey());<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      when(regionLoad.getStoreFileSize())<a name="line.431"></a>
-<span class="sourceLineNo">432</span>        .thenReturn(new Size(region.getValue(), Size.Unit.MEGABYTE));<a name="line.432"></a>
-<span class="sourceLineNo">433</span><a name="line.433"></a>
-<span class="sourceLineNo">434</span>      // this is possibly broken with jdk9, unclear if false positive or not<a name="line.434"></a>
-<span class="sourceLineNo">435</span>      // suppress it for now, fix it when we get to running tests on 9<a name="line.435"></a>
-<span class="sourceLineNo">436</span>      // see: http://errorprone.info/bugpattern/MockitoCast<a name="line.436"></a>
-<span class="sourceLineNo">437</span>      when((Object) masterServices.getServerManager().getLoad(sn)<a name="line.437"></a>
-<span class="sourceLineNo">438</span>        .getRegionMetrics().get(region.getKey())).thenReturn(regionLoad);<a name="line.438"></a>
-<span class="sourceLineNo">439</span>    }<a name="line.439"></a>
-<span class="sourceLineNo">440</span><a name="line.440"></a>
-<span class="sourceLineNo">441</span>    when(masterServices.isSplitOrMergeEnabled(any())).thenReturn(true);<a name="line.441"></a>
-<span class="sourceLineNo">442</span><a name="line.442"></a>
-<span class="sourceLineNo">443</span>    normalizer = new SimpleRegionNormalizer();<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    normalizer.setConf(conf);<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    normalizer.setMasterServices(masterServices);<a name="line.445"></a>
-<span class="sourceLineNo">446</span>  }<a name="line.446"></a>
-<span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span>  /**<a name="line.448"></a>
-<span class="sourceLineNo">449</span>   * Create a list of {@link RegionInfo}s that represent a region chain of the specified length.<a name="line.449"></a>
-<span class="sourceLineNo">450</span>   */<a name="line.450"></a>
-<span class="sourceLineNo">451</span>  private static List&lt;RegionInfo&gt; createRegionInfos(final TableName tableName, final int length) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    if (length &lt; 1) {<a name="line.452"></a>
-<span class="sourceLineNo">453</span>      throw new IllegalStateException("length must be greater than or equal to 1.");<a name="line.453"></a>
-<span class="sourceLineNo">454</span>    }<a name="line.454"></a>
-<span class="sourceLineNo">455</span><a name="line.455"></a>
-<span class="sourceLineNo">456</span>    final byte[] startKey = Bytes.toBytes("aaaaa");<a name="line.456"></a>
-<span class="sourceLineNo">457</span>    final byte[] endKey = Bytes.toBytes("zzzzz");<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    if (length == 1) {<a name="line.458"></a>
-<span class="sourceLineNo">459</span>      return Collections.singletonList(createRegionInfo(tableName, startKey, endKey));<a name="line.459"></a>
-<span class="sourceLineNo">460</span>    }<a name="line.460"></a>
-<span class="sourceLineNo">461</span><a name="line.461"></a>
-<span class="sourceLineNo">462</span>    final byte[][] splitKeys = Bytes.split(startKey, endKey, length - 1);<a name="line.462"></a>
-<span class="sourceLineNo">463</span>    final List&lt;RegionInfo&gt; ret = new ArrayList&lt;&gt;(length);<a name="line.463"></a>
-<span class="sourceLineNo">464</span>    for (int i = 0; i &lt; splitKeys.length - 1; i++) {<a name="line.464"></a>
-<span class="sourceLineNo">465</span>      ret.add(createRegionInfo(tableName, splitKeys[i], splitKeys[i+1]));<a name="line.465"></a>
-<span class="sourceLineNo">466</span>    }<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    return ret;<a name="line.467"></a>
-<span class="sourceLineNo">468</span>  }<a name="line.468"></a>
-<span class="sourceLineNo">469</span><a name="line.469"></a>
-<span class="sourceLineNo">470</span>  private static RegionInfo createRegionInfo(final TableName tableName, final byte[] startKey,<a name="line.470"></a>
-<span class="sourceLineNo">471</span>    final byte[] endKey) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span>    return RegionInfoBuilder.newBuilder(tableName)<a name="line.472"></a>
-<span class="sourceLineNo">473</span>      .setStartKey(startKey)<a name="line.473"></a>
-<span class="sourceLineNo">474</span>      .setEndKey(endKey)<a name="line.474"></a>
-<span class="sourceLineNo">475</span>      .setRegionId(generateRegionId())<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      .build();<a name="line.476"></a>
-<span class="sourceLineNo">477</span>  }<a name="line.477"></a>
-<span class="sourceLineNo">478</span><a name="line.478"></a>
-<span class="sourceLineNo">479</span>  private static long generateRegionId() {<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    return Instant.ofEpochMilli(EnvironmentEdgeManager.currentTime())<a name="line.480"></a>
-<span class="sourceLineNo">481</span>      .minus(Period.ofDays(DEFAULT_MERGE_MIN_REGION_AGE_DAYS + 1))<a name="line.481"></a>
-<span class="sourceLineNo">482</span>      .toEpochMilli();<a name="line.482"></a>
-<span class="sourceLineNo">483</span>  }<a name="line.483"></a>
-<span class="sourceLineNo">484</span><a name="line.484"></a>
-<span class="sourceLineNo">485</span>  private static List&lt;RegionInfo&gt; createRegionInfos(final TableName tableName,<a name="line.485"></a>
-<span class="sourceLineNo">486</span>    final byte[][] splitKeys) {<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    final List&lt;RegionInfo&gt; ret = new ArrayList&lt;&gt;(splitKeys.length);<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    for (int i = 0; i &lt; splitKeys.length - 1; i++) {<a name="line.488"></a>
-<span class="sourceLineNo">489</span>      ret.add(createRegionInfo(tableName, splitKeys[i], splitKeys[i+1]));<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    }<a name="line.490"></a>
-<span class="sourceLineNo">491</span>    return ret;<a name="line.491"></a>
-<span class="sourceLineNo">492</span>  }<a name="line.492"></a>
-<span class="sourceLineNo">493</span><a name="line.493"></a>
-<span class="sourceLineNo">494</span>  private static Map&lt;byte[], Integer&gt; createRegionSizesMap(final List&lt;RegionInfo&gt; regionInfos,<a name="line.494"></a>
-<span class="sourceLineNo">495</span>    int... sizes) {<a name="line.495"></a>
-<span class="sourceLineNo">496</span>    if (regionInfos.size() != sizes.length) {<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      throw new IllegalStateException("Parameter lengths must match.");<a name="line.497"></a>
-<span class="sourceLineNo">498</span>    }<a name="line.498"></a>
-<span class="sourceLineNo">499</span><a name="line.499"></a>
-<span class="sourceLineNo">500</span>    final Map&lt;byte[], Integer&gt; ret = new HashMap&lt;&gt;(regionInfos.size());<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    for (int i = 0; i &lt; regionInfos.size(); i++) {<a name="line.501"></a>
-<span class="sourceLineNo">502</span>      ret.put(regionInfos.get(i).getRegionName(), sizes[i]);<a name="line.502"></a>
-<span class="sourceLineNo">503</span>    }<a name="line.503"></a>
-<span class="sourceLineNo">504</span>    return ret;<a name="line.504"></a>
-<span class="sourceLineNo">505</span>  }<a name="line.505"></a>
-<span class="sourceLineNo">506</span>}<a name="line.506"></a>
+<span class="sourceLineNo">268</span>  @Test<a name="line.268"></a>
+<span class="sourceLineNo">269</span>  public void testHonorsSplitEnabled() {<a name="line.269"></a>
+<span class="sourceLineNo">270</span>    conf.setBoolean(SPLIT_ENABLED_KEY, true);<a name="line.270"></a>
+<span class="sourceLineNo">271</span>    final TableName tableName = name.getTableName();<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 5);<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    final Map&lt;byte[], Integer&gt; regionSizes =<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      createRegionSizesMap(regionInfos, 5, 5, 20, 5, 5);<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    assertThat(<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      normalizer.computePlansForTable(tableName),<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      contains(instanceOf(SplitNormalizationPlan.class)));<a name="line.278"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span>    conf.setBoolean(SPLIT_ENABLED_KEY, false);<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    assertThat(normalizer.computePlansForTable(tableName), empty());<a name="line.282"></a>
+<span class="sourceLineNo">283</span>  }<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span>  @Test<a name="line.285"></a>
+<span class="sourceLineNo">286</span>  public void testHonorsMergeEnabled() {<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    conf.setBoolean(MERGE_ENABLED_KEY, true);<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    final TableName tableName = name.getTableName();<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 5);<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    final Map&lt;byte[], Integer&gt; regionSizes =<a name="line.290"></a>
+<span class="sourceLineNo">291</span>      createRegionSizesMap(regionInfos, 20, 5, 5, 20, 20);<a name="line.291"></a>
+<span class="sourceLineNo">292</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.292"></a>
+<span class="sourceLineNo">293</span>    assertThat(<a name="line.293"></a>
+<span class="sourceLineNo">294</span>      normalizer.computePlansForTable(tableName),<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      contains(instanceOf(MergeNormalizationPlan.class)));<a name="line.295"></a>
+<span class="sourceLineNo">296</span><a name="line.296"></a>
+<span class="sourceLineNo">297</span>    conf.setBoolean(MERGE_ENABLED_KEY, false);<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    assertThat(normalizer.computePlansForTable(tableName), empty());<a name="line.299"></a>
+<span class="sourceLineNo">300</span>  }<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span>  @Test<a name="line.302"></a>
+<span class="sourceLineNo">303</span>  public void testHonorsMinimumRegionCount() {<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    conf.setInt(MIN_REGION_COUNT_KEY, 1);<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    final TableName tableName = name.getTableName();<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 3);<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    // create a table topology that results in both a merge plan and a split plan. Assert that the<a name="line.307"></a>
+<span class="sourceLineNo">308</span>    // merge is only created when the when the number of table regions is above the region count<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    // threshold, and that the split plan is create in both cases.<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    final Map&lt;byte[], Integer&gt; regionSizes = createRegionSizesMap(regionInfos, 1, 1, 10);<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.311"></a>
+<span class="sourceLineNo">312</span><a name="line.312"></a>
+<span class="sourceLineNo">313</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlansForTable(tableName);<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    assertThat(plans, contains(<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      new SplitNormalizationPlan(regionInfos.get(2)),<a name="line.315"></a>
+<span class="sourceLineNo">316</span>      new MergeNormalizationPlan(regionInfos.get(0), regionInfos.get(1))));<a name="line.316"></a>
+<span class="sourceLineNo">317</span><a name="line.317"></a>
+<span class="sourceLineNo">318</span>    // have to call setupMocks again because we don't have dynamic config update on normalizer.<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    conf.setInt(MIN_REGION_COUNT_KEY, 4);<a name="line.319"></a>
+<span class="sourceLineNo">320</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    assertThat(normalizer.computePlansForTable(tableName), contains(<a name="line.321"></a>
+<span class="sourceLineNo">322</span>      new SplitNormalizationPlan(regionInfos.get(2))));<a name="line.322"></a>
+<span class="sourceLineNo">323</span>  }<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span>  @Test<a name="line.325"></a>
+<span class="sourceLineNo">326</span>  public void testHonorsMergeMinRegionAge() {<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    conf.setInt(MERGE_MIN_REGION_AGE_DAYS_KEY, 7);<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    final TableName tableName = name.getTableName();<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 4);<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    final Map&lt;byte[], Integer&gt; regionSizes =<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      createRegionSizesMap(regionInfos, 1, 1, 10, 10);<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    assertEquals(Period.ofDays(7), normalizer.getMergeMinRegionAge());<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    assertThat(<a name="line.334"></a>
+<span class="sourceLineNo">335</span>      normalizer.computePlansForTable(tableName),<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      everyItem(not(instanceOf(MergeNormalizationPlan.class))));<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span>    // have to call setupMocks again because we don't have dynamic config update on normalizer.<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    conf.unset(MERGE_MIN_REGION_AGE_DAYS_KEY);<a name="line.339"></a>
+<span class="sourceLineNo">340</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    assertEquals(<a name="line.341"></a>
+<span class="sourceLineNo">342</span>      Period.ofDays(DEFAULT_MERGE_MIN_REGION_AGE_DAYS), normalizer.getMergeMinRegionAge());<a name="line.342"></a>
+<span class="sourceLineNo">343</span>    final List&lt;NormalizationPlan&gt; plans = normalizer.computePlansForTable(tableName);<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    assertThat(plans, not(empty()));<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    assertThat(plans, everyItem(instanceOf(MergeNormalizationPlan.class)));<a name="line.345"></a>
+<span class="sourceLineNo">346</span>  }<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span>  @Test<a name="line.348"></a>
+<span class="sourceLineNo">349</span>  public void testHonorsMergeMinRegionSize() {<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    conf.setBoolean(SPLIT_ENABLED_KEY, false);<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    final TableName tableName = name.getTableName();<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 5);<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    final Map&lt;byte[], Integer&gt; regionSizes =<a name="line.353"></a>
+<span class="sourceLineNo">354</span>      createRegionSizesMap(regionInfos, 1, 2, 0, 10, 10);<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span>    assertFalse(normalizer.isSplitEnabled());<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    assertEquals(1, normalizer.getMergeMinRegionSizeMb());<a name="line.358"></a>
+<span class="sourceLineNo">359</span>    assertThat(normalizer.computePlansForTable(tableName), contains(<a name="line.359"></a>
+<span class="sourceLineNo">360</span>      new MergeNormalizationPlan(regionInfos.get(0), regionInfos.get(1))));<a name="line.360"></a>
+<span class="sourceLineNo">361</span><a name="line.361"></a>
+<span class="sourceLineNo">362</span>    conf.setInt(MERGE_MIN_REGION_SIZE_MB_KEY, 3);<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    assertEquals(3, normalizer.getMergeMinRegionSizeMb());<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    assertThat(normalizer.computePlansForTable(tableName), empty());<a name="line.365"></a>
+<span class="sourceLineNo">366</span>  }<a name="line.366"></a>
+<span class="sourceLineNo">367</span><a name="line.367"></a>
+<span class="sourceLineNo">368</span>  @Test<a name="line.368"></a>
+<span class="sourceLineNo">369</span>  public void testMergeEmptyRegions() {<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    conf.setBoolean(SPLIT_ENABLED_KEY, false);<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    conf.setInt(MERGE_MIN_REGION_SIZE_MB_KEY, 0);<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    final TableName tableName = name.getTableName();<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, 7);<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    final Map&lt;byte[], Integer&gt; regionSizes =<a name="line.374"></a>
+<span class="sourceLineNo">375</span>      createRegionSizesMap(regionInfos, 0, 1, 10, 0, 9, 10, 0);<a name="line.375"></a>
+<span class="sourceLineNo">376</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.376"></a>
+<span class="sourceLineNo">377</span><a name="line.377"></a>
+<span class="sourceLineNo">378</span>    assertFalse(normalizer.isSplitEnabled());<a name="line.378"></a>
+<span class="sourceLineNo">379</span>    assertEquals(0, normalizer.getMergeMinRegionSizeMb());<a name="line.379"></a>
+<span class="sourceLineNo">380</span>    assertThat(normalizer.computePlansForTable(tableName), contains(<a name="line.380"></a>
+<span class="sourceLineNo">381</span>      new MergeNormalizationPlan(regionInfos.get(0), regionInfos.get(1)),<a name="line.381"></a>
+<span class="sourceLineNo">382</span>      new MergeNormalizationPlan(regionInfos.get(2), regionInfos.get(3)),<a name="line.382"></a>
+<span class="sourceLineNo">383</span>      new MergeNormalizationPlan(regionInfos.get(5), regionInfos.get(6))));<a name="line.383"></a>
+<span class="sourceLineNo">384</span>  }<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span>  // This test is to make sure that normalizer is only going to merge adjacent regions.<a name="line.386"></a>
+<span class="sourceLineNo">387</span>  @Test<a name="line.387"></a>
+<span class="sourceLineNo">388</span>  public void testNormalizerCannotMergeNonAdjacentRegions() {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    final TableName tableName = name.getTableName();<a name="line.389"></a>
+<span class="sourceLineNo">390</span>    // create 5 regions with sizes to trigger merge of small regions. region ranges are:<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    // [, "aa"), ["aa", "aa1"), ["aa1", "aa1!"), ["aa1!", "aa2"), ["aa2", )<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    // Region ["aa", "aa1") and ["aa1!", "aa2") are not adjacent, they are not supposed to<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    // merged.<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    final byte[][] keys = {<a name="line.394"></a>
+<span class="sourceLineNo">395</span>      null,<a name="line.395"></a>
+<span class="sourceLineNo">396</span>      Bytes.toBytes("aa"),<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      Bytes.toBytes("aa1!"),<a name="line.397"></a>
+<span class="sourceLineNo">398</span>      Bytes.toBytes("aa1"),<a name="line.398"></a>
+<span class="sourceLineNo">399</span>      Bytes.toBytes("aa2"),<a name="line.399"></a>
+<span class="sourceLineNo">400</span>      null,<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    };<a name="line.401"></a>
+<span class="sourceLineNo">402</span>    final List&lt;RegionInfo&gt; regionInfos = createRegionInfos(tableName, keys);<a name="line.402"></a>
+<span class="sourceLineNo">403</span>    final Map&lt;byte[], Integer&gt; regionSizes =<a name="line.403"></a>
+<span class="sourceLineNo">404</span>      createRegionSizesMap(regionInfos, 3, 1, 1, 3, 5);<a name="line.404"></a>
+<span class="sourceLineNo">405</span>    setupMocksForNormalizer(regionSizes, regionInfos);<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span>    // Compute the plan, no merge plan returned as they are not adjacent.<a name="line.407"></a>
+<span class="sourceLineNo">408</span>    List&lt;NormalizationPlan&gt; plans = normalizer.computePlansForTable(tableName);<a name="line.408"></a>
+<span class="sourceLineNo">409</span>    assertThat(plans, empty());<a name="line.409"></a>
+<span class="sourceLineNo">410</span>  }<a name="line.410"></a>
+<span class="sourceLineNo">411</span><a name="line.411"></a>
+<span class="sourceLineNo">412</span>  @SuppressWarnings("MockitoCast")<a name="line.412"></a>
+<span class="sourceLineNo">413</span>  private void setupMocksForNormalizer(Map&lt;byte[], Integer&gt; regionSizes,<a name="line.413"></a>
+<span class="sourceLineNo">414</span>    List&lt;RegionInfo&gt; regionInfoList) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span>    masterServices = Mockito.mock(MasterServices.class, RETURNS_DEEP_STUBS);<a name="line.415"></a>
+<span class="sourceLineNo">416</span><a name="line.416"></a>
+<span class="sourceLineNo">417</span>    // for simplicity all regions are assumed to be on one server; doesn't matter to us<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    ServerName sn = ServerName.valueOf("localhost", 0, 0L);<a name="line.418"></a>
+<span class="sourceLineNo">419</span>    when(masterServices.getAssignmentManager().getRegionStates()<a name="line.419"></a>
+<span class="sourceLineNo">420</span>      .getRegionsOfTable(any())).thenReturn(regionInfoList);<a name="line.420"></a>
+<span class="sourceLineNo">421</span>    when(masterServices.getAssignmentManager().getRegionStates()<a name="line.421"></a>
+<span class="sourceLineNo">422</span>      .getRegionServerOfRegion(any())).thenReturn(sn);<a name="line.422"></a>
+<span class="sourceLineNo">423</span>    when(masterServices.getAssignmentManager().getRegionStates()<a name="line.423"></a>
+<span class="sourceLineNo">424</span>      .getRegionState(any(RegionInfo.class))).thenReturn(<a name="line.424"></a>
+<span class="sourceLineNo">425</span>        RegionState.createForTesting(null, RegionState.State.OPEN));<a name="line.425"></a>
+<span class="sourceLineNo">426</span><a name="line.426"></a>
+<span class="sourceLineNo">427</span>    for (Map.Entry&lt;byte[], Integer&gt; region : regionSizes.entrySet()) {<a name="line.427"></a>
+<span class="sourceLineNo">428</span>      RegionMetrics regionLoad = Mockito.mock(RegionMetrics.class);<a name="line.428"></a>
+<span class="sourceLineNo">429</span>      when(regionLoad.getRegionName()).thenReturn(region.getKey());<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      when(regionLoad.getStoreFileSize())<a name="line.430"></a>
+<span class="sourceLineNo">431</span>        .thenReturn(new Size(region.getValue(), Size.Unit.MEGABYTE));<a name="line.431"></a>
+<span class="sourceLineNo">432</span><a name="line.432"></a>
+<span class="sourceLineNo">433</span>      // this is possibly broken with jdk9, unclear if false positive or not<a name="line.433"></a>
+<span class="sourceLineNo">434</span>      // suppress it for now, fix it when we get to running tests on 9<a name="line.434"></a>
+<span class="sourceLineNo">435</span>      // see: http://errorprone.info/bugpattern/MockitoCast<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      when((Object) masterServices.getServerManager().getLoad(sn)<a name="line.436"></a>
+<span class="sourceLineNo">437</span>        .getRegionMetrics().get(region.getKey())).thenReturn(regionLoad);<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    }<a name="line.438"></a>
+<span class="sourceLineNo">439</span><a name="line.439"></a>
+<span class="sourceLineNo">440</span>    when(masterServices.isSplitOrMergeEnabled(any())).thenReturn(true);<a name="line.440"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span>    normalizer = new SimpleRegionNormalizer();<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    normalizer.setConf(conf);<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    normalizer.setMasterServices(masterServices);<a name="line.444"></a>
+<span class="sourceLineNo">445</span>  }<a name="line.445"></a>
+<span class="sourceLineNo">446</span><a name="line.446"></a>
+<span class="sourceLineNo">447</span>  /**<a name="line.447"></a>
+<span class="sourceLineNo">448</span>   * Create a list of {@link RegionInfo}s that represent a region chain of the specified length.<a name="line.448"></a>
+<span class="sourceLineNo">449</span>   */<a name="line.449"></a>
+<span class="sourceLineNo">450</span>  private static List&lt;RegionInfo&gt; createRegionInfos(final TableName tableName, final int length) {<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    if (length &lt; 1) {<a name="line.451"></a>
+<span class="sourceLineNo">452</span>      throw new IllegalStateException("length must be greater than or equal to 1.");<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    }<a name="line.453"></a>
+<span class="sourceLineNo">454</span><a name="line.454"></a>
+<span class="sourceLineNo">455</span>    final byte[] startKey = Bytes.toBytes("aaaaa");<a name="line.455"></a>
+<span class="sourceLineNo">456</span>    final byte[] endKey = Bytes.toBytes("zzzzz");<a name="line.456"></a>
+<span class="sourceLineNo">457</span>    if (length == 1) {<a name="line.457"></a>
+<span class="sourceLineNo">458</span>      return Collections.singletonList(createRegionInfo(tableName, startKey, endKey));<a name="line.458"></a>
+<span class="sourceLineNo">459</span>    }<a name="line.459"></a>
+<span class="sourceLineNo">460</span><a name="line.460"></a>
+<span class="sourceLineNo">461</span>    final byte[][] splitKeys = Bytes.split(startKey, endKey, length - 1);<a name="line.461"></a>
+<span class="sourceLineNo">462</span>    final List&lt;RegionInfo&gt; ret = new ArrayList&lt;&gt;(length);<a name="line.462"></a>
+<span class="sourceLineNo">463</span>    for (int i = 0; i &lt; splitKeys.length - 1; i++) {<a name="line.463"></a>
+<span class="sourceLineNo">464</span>      ret.add(createRegionInfo(tableName, splitKeys[i], splitKeys[i+1]));<a name="line.464"></a>
+<span class="sourceLineNo">465</span>    }<a name="line.465"></a>
+<span class="sourceLineNo">466</span>    return ret;<a name="line.466"></a>
+<span class="sourceLineNo">467</span>  }<a name="line.467"></a>
+<span class="sourceLineNo">468</span><a name="line.468"></a>
+<span class="sourceLineNo">469</span>  private static RegionInfo createRegionInfo(final TableName tableName, final byte[] startKey,<a name="line.469"></a>
+<span class="sourceLineNo">470</span>    final byte[] endKey) {<a name="line.470"></a>
+<span class="sourceLineNo">471</span>    return RegionInfoBuilder.newBuilder(tableName)<a name="line.471"></a>
+<span class="sourceLineNo">472</span>      .setStartKey(startKey)<a name="line.472"></a>
+<span class="sourceLineNo">473</span>      .setEndKey(endKey)<a name="line.473"></a>
+<span class="sourceLineNo">474</span>      .setRegionId(generateRegionId())<a name="line.474"></a>
+<span class="sourceLineNo">475</span>      .build();<a name="line.475"></a>
+<span class="sourceLineNo">476</span>  }<a name="line.476"></a>
+<span class="sourceLineNo">477</span><a name="line.477"></a>
+<span class="sourceLineNo">478</span>  private static long generateRegionId() {<a name="line.478"></a>
+<span class="sourceLineNo">479</span>    return Instant.ofEpochMilli(EnvironmentEdgeManager.currentTime())<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      .minus(Period.ofDays(DEFAULT_MERGE_MIN_REGION_AGE_DAYS + 1))<a name="line.480"></a>
+<span class="sourceLineNo">481</span>      .toEpochMilli();<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>  private static List&lt;RegionInfo&gt; createRegionInfos(final TableName tableName,<a name="line.484"></a>
+<span class="sourceLineNo">485</span>    final byte[][] splitKeys) {<a name="line.485"></a>
+<span class="sourceLineNo">486</span>    final List&lt;RegionInfo&gt; ret = new ArrayList&lt;&gt;(splitKeys.length);<a name="line.486"></a>
+<span class="sourceLineNo">487</span>    for (int i = 0; i &lt; splitKeys.length - 1; i++) {<a name="line.487"></a>
+<span class="sourceLineNo">488</span>      ret.add(createRegionInfo(tableName, splitKeys[i], splitKeys[i+1]));<a name="line.488"></a>
+<span class="sourceLineNo">489</span>    }<a name="line.489"></a>
+<span class="sourceLineNo">490</span>    return ret;<a name="line.490"></a>
+<span class="sourceLineNo">491</span>  }<a name="line.491"></a>
+<span class="sourceLineNo">492</span><a name="line.492"></a>
+<span class="sourceLineNo">493</span>  private static Map&lt;byte[], Integer&gt; createRegionSizesMap(final List&lt;RegionInfo&gt; regionInfos,<a name="line.493"></a>
+<span class="sourceLineNo">494</span>    int... sizes) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>    if (regionInfos.size() != sizes.length) {<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      throw new IllegalStateException("Parameter lengths must match.");<a name="line.496"></a>
+<span class="sourceLineNo">497</span>    }<a name="line.497"></a>
+<span class="sourceLineNo">498</span><a name="line.498"></a>
+<span class="sourceLineNo">499</span>    final Map&lt;byte[], Integer&gt; ret = new HashMap&lt;&gt;(regionInfos.size());<a name="line.499"></a>
+<span class="sourceLineNo">500</span>    for (int i = 0; i &lt; regionInfos.size(); i++) {<a name="line.500"></a>
+<span class="sourceLineNo">501</span>      ret.put(regionInfos.get(i).getRegionName(), sizes[i]);<a name="line.501"></a>
+<span class="sourceLineNo">502</span>    }<a name="line.502"></a>
+<span class="sourceLineNo">503</span>    return ret;<a name="line.503"></a>
+<span class="sourceLineNo">504</span>  }<a name="line.504"></a>
+<span class="sourceLineNo">505</span>}<a name="line.505"></a>