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/02/08 14:44:42 UTC

[hbase-site] branch asf-site updated: Published site at 546828685e2a7c2d686925a80c7a68dd4d4e3f8d.

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 d29c2a4  Published site at 546828685e2a7c2d686925a80c7a68dd4d4e3f8d.
d29c2a4 is described below

commit d29c2a4055fd39daba870fe4fadead820de3fbc9
Author: jenkins <bu...@apache.org>
AuthorDate: Sat Feb 8 14:44:24 2020 +0000

    Published site at 546828685e2a7c2d686925a80c7a68dd4d4e3f8d.
---
 acid-semantics.html                                |   2 +-
 apache_hbase_reference_guide.pdf                   |   4 +-
 book.html                                          |   2 +-
 bulk-loads.html                                    |   2 +-
 checkstyle-aggregate.html                          |   4 +-
 checkstyle.rss                                     |  16 +-
 coc.html                                           |   2 +-
 dependencies.html                                  |   2 +-
 dependency-convergence.html                        |   2 +-
 dependency-info.html                               |   2 +-
 dependency-management.html                         |   2 +-
 devapidocs/constant-values.html                    |   4 +-
 .../hadoop/hbase/rsgroup/RSGroupAdminServer.html   |  24 +-
 .../src-html/org/apache/hadoop/hbase/Version.html  |   4 +-
 .../hadoop/hbase/rsgroup/RSGroupAdminServer.html   | 701 +++++++++++----------
 downloads.html                                     |   2 +-
 export_control.html                                |   2 +-
 index.html                                         |   2 +-
 issue-tracking.html                                |   2 +-
 mail-lists.html                                    |   2 +-
 metrics.html                                       |   2 +-
 old_news.html                                      |   2 +-
 plugin-management.html                             |   2 +-
 plugins.html                                       |   2 +-
 poweredbyhbase.html                                |   2 +-
 project-info.html                                  |   2 +-
 project-reports.html                               |   2 +-
 project-summary.html                               |   2 +-
 pseudo-distributed.html                            |   2 +-
 replication.html                                   |   2 +-
 resources.html                                     |   2 +-
 source-repository.html                             |   2 +-
 sponsors.html                                      |   2 +-
 supportingprojects.html                            |   2 +-
 team-list.html                                     |   2 +-
 testdevapidocs/allclasses-frame.html               |   1 +
 testdevapidocs/allclasses-noframe.html             |   1 +
 testdevapidocs/index-all.html                      |  16 +
 .../hadoop/hbase/chaos/actions/package-tree.html   |   2 +-
 .../hadoop/hbase/class-use/HBaseClassTestRule.html |  12 +-
 .../hadoop/hbase/client/AbstractTestShell.html     |  47 +-
 .../apache/hadoop/hbase/client/TestAdminShell.html |   2 +-
 .../hadoop/hbase/client/TestAdminShell2.html       |   2 +-
 .../hadoop/hbase/client/TestQuotasShell.html       |   2 +-
 ...stShellNoCluster.html => TestRSGroupShell.html} |  83 ++-
 .../hadoop/hbase/client/TestReplicationShell.html  |   2 +-
 ...ntrollerFactory.StaticRpcControllerFactory.html |   4 +-
 .../org/apache/hadoop/hbase/client/TestScan.html   |   4 +-
 .../org/apache/hadoop/hbase/client/TestShell.html  |   2 +-
 .../hadoop/hbase/client/TestShellNoCluster.html    |   7 +
 .../apache/hadoop/hbase/client/TestTableShell.html |   2 +-
 .../hbase/client/class-use/AbstractTestShell.html  |   8 +-
 .../hbase/client/class-use/TestRSGroupShell.html   | 125 ++++
 .../apache/hadoop/hbase/client/package-frame.html  |   1 +
 .../hadoop/hbase/client/package-summary.html       |  82 +--
 .../apache/hadoop/hbase/client/package-tree.html   |   1 +
 ...eBetweenSCPAndDTP.AssignmentManagerForTest.html |   6 +-
 .../TestRaceBetweenSCPAndDTP.HMasterForTest.html   |   6 +-
 .../assignment/TestRaceBetweenSCPAndDTP.html       |  47 +-
 .../org/apache/hadoop/hbase/package-tree.html      |  10 +-
 .../hadoop/hbase/procedure/package-tree.html       |   8 +-
 .../hadoop/hbase/procedure2/package-tree.html      |   2 +-
 .../hadoop/hbase/regionserver/package-tree.html    |   6 +-
 .../org/apache/hadoop/hbase/test/package-tree.html |   2 +-
 .../org/apache/hadoop/hbase/wal/package-tree.html  |   4 +-
 testdevapidocs/overview-tree.html                  |   1 +
 .../hadoop/hbase/client/AbstractTestShell.html     | 123 ++--
 .../hadoop/hbase/client/TestRSGroupShell.html      | 135 ++++
 ...eBetweenSCPAndDTP.AssignmentManagerForTest.html | 238 +++----
 .../TestRaceBetweenSCPAndDTP.HMasterForTest.html   | 238 +++----
 .../assignment/TestRaceBetweenSCPAndDTP.html       | 238 +++----
 71 files changed, 1345 insertions(+), 938 deletions(-)

diff --git a/acid-semantics.html b/acid-semantics.html
index e63b46f..f24ab0d 100644
--- a/acid-semantics.html
+++ b/acid-semantics.html
@@ -467,7 +467,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/apache_hbase_reference_guide.pdf b/apache_hbase_reference_guide.pdf
index 3e7085a..ba0f344 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:20200207143014+00'00')
-/CreationDate (D:20200207144038+00'00')
+/ModDate (D:20200208143029+00'00')
+/CreationDate (D:20200208144143+00'00')
 >>
 endobj
 2 0 obj
diff --git a/book.html b/book.html
index afbec5c..2f4d984 100644
--- a/book.html
+++ b/book.html
@@ -44451,7 +44451,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-02-07 14:30:14 UTC
+Last updated 2020-02-08 14:30:29 UTC
 </div>
 </div>
 </body>
diff --git a/bulk-loads.html b/bulk-loads.html
index 788eaf6..c06db0c 100644
--- a/bulk-loads.html
+++ b/bulk-loads.html
@@ -172,7 +172,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/checkstyle-aggregate.html b/checkstyle-aggregate.html
index f47bfef..0aa320f 100644
--- a/checkstyle-aggregate.html
+++ b/checkstyle-aggregate.html
@@ -166,7 +166,7 @@
 <th><img src="images/icon_warning_sml.gif" alt="" />&#160;Warnings</th>
 <th><img src="images/icon_error_sml.gif" alt="" />&#160;Errors</th></tr>
 <tr class="b">
-<td>4186</td>
+<td>4187</td>
 <td>0</td>
 <td>0</td>
 <td>10485</td></tr></table></div>
@@ -83740,7 +83740,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/checkstyle.rss b/checkstyle.rss
index b21d6dd..856e4cb 100644
--- a/checkstyle.rss
+++ b/checkstyle.rss
@@ -25,7 +25,7 @@ under the License.
     <language>en-us</language>
     <copyright>&#169;2007 - 2020 The Apache Software Foundation</copyright>
     <item>
-      <title>File: 4186,
+      <title>File: 4187,
              Errors: 10485,
              Warnings: 0,
              Infos: 0
@@ -38322,6 +38322,20 @@ under the License.
               </tr>
                           <tr>
                 <td>
+                  <a href="https://hbase.apache.org/checkstyle.html#org.apache.hadoop.hbase.client.TestRSGroupShell.java">org/apache/hadoop/hbase/client/TestRSGroupShell.java</a>
+                </td>
+                <td>
+                  0
+                </td>
+                <td>
+                  0
+                </td>
+                <td>
+                  0
+                </td>
+              </tr>
+                          <tr>
+                <td>
                   <a href="https://hbase.apache.org/checkstyle.html#org.apache.hadoop.hbase.regionserver.compactions.CompactionWindowFactory.java">org/apache/hadoop/hbase/regionserver/compactions/CompactionWindowFactory.java</a>
                 </td>
                 <td>
diff --git a/coc.html b/coc.html
index 86d5c73..7ceb983 100644
--- a/coc.html
+++ b/coc.html
@@ -241,7 +241,7 @@ email to <a class="externalLink" href="mailto:private@hbase.apache.org">the priv
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/dependencies.html b/dependencies.html
index 42d9ea6..4d6923d 100644
--- a/dependencies.html
+++ b/dependencies.html
@@ -313,7 +313,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/dependency-convergence.html b/dependency-convergence.html
index f96aef0..6242df6 100644
--- a/dependency-convergence.html
+++ b/dependency-convergence.html
@@ -558,7 +558,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/dependency-info.html b/dependency-info.html
index 4a36b4a..768acbf 100644
--- a/dependency-info.html
+++ b/dependency-info.html
@@ -194,7 +194,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/dependency-management.html b/dependency-management.html
index d281f40..a96ccba 100644
--- a/dependency-management.html
+++ b/dependency-management.html
@@ -928,7 +928,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/devapidocs/constant-values.html b/devapidocs/constant-values.html
index 166d831..f8a9ecf 100644
--- a/devapidocs/constant-values.html
+++ b/devapidocs/constant-values.html
@@ -4109,14 +4109,14 @@
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="org/apache/hadoop/hbase/Version.html#date">date</a></code></td>
-<td class="colLast"><code>"Fri Feb  7 14:37:07 UTC 2020"</code></td>
+<td class="colLast"><code>"Sat Feb  8 14:38:19 UTC 2020"</code></td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><a name="org.apache.hadoop.hbase.Version.revision">
 <!--   -->
 </a><code>public&nbsp;static&nbsp;final&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a></code></td>
 <td><code><a href="org/apache/hadoop/hbase/Version.html#revision">revision</a></code></td>
-<td class="colLast"><code>"93c5e7691f02e4b46b4b7d4a582b32e9b9ce9792"</code></td>
+<td class="colLast"><code>"546828685e2a7c2d686925a80c7a68dd4d4e3f8d"</code></td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><a name="org.apache.hadoop.hbase.Version.srcChecksum">
diff --git a/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html b/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html
index bd8f858..fda6165 100644
--- a/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html
+++ b/devapidocs/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html
@@ -634,7 +634,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupAdmin.
 <ul class="blockList">
 <li class="blockList">
 <h4>moveServers</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html#line.328">moveServers</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/net/Address.html" title="class in org.apache.hadoop.hbase.net">Address</a>&gt;&nbsp;servers,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html#line.329">moveServers</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/net/Address.html" title="class in org.apache.hadoop.hbase.net">Address</a>&gt;&nbsp;servers,
                         <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;targetGroupName)
                  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/rsgroup/RSGroupAdmin.html#moveServers-java.util.Set-java.lang.String-">RSGroupAdmin</a></code></span></div>
@@ -653,7 +653,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupAdmin.
 <ul class="blockList">
 <li class="blockList">
 <h4>moveTables</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html#line.381">moveTables</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&gt;&nbsp;tables,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html#line.382">moveTables</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&gt;&nbsp;tables,
                        <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;targetGroup)
                 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/rsgroup/RSGroupAdmin.html#moveTables-java.util.Set-java.lang.String-">RSGroupAdmin</a></code></span></div>
@@ -673,7 +673,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupAdmin.
 <ul class="blockList">
 <li class="blockList">
 <h4>addRSGroup</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html#line.413">addRSGroup</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;name)
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html#line.414">addRSGroup</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;name)
                 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/rsgroup/RSGroupAdmin.html#addRSGroup-java.lang.String-">RSGroupAdmin</a></code></span></div>
 <div class="block">Creates a new RegionServer group with the given name.</div>
@@ -691,7 +691,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupAdmin.
 <ul class="blockList">
 <li class="blockList">
 <h4>removeRSGroup</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html#line.418">removeRSGroup</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;name)
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html#line.419">removeRSGroup</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;name)
                    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/rsgroup/RSGroupAdmin.html#removeRSGroup-java.lang.String-">RSGroupAdmin</a></code></span></div>
 <div class="block">Removes RegionServer group associated with the given name.</div>
@@ -709,7 +709,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupAdmin.
 <ul class="blockList">
 <li class="blockList">
 <h4>balanceRSGroup</h4>
-<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html#line.450">balanceRSGroup</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;groupName)
+<pre>public&nbsp;boolean&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html#line.451">balanceRSGroup</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;groupName)
                        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/rsgroup/RSGroupAdmin.html#balanceRSGroup-java.lang.String-">RSGroupAdmin</a></code></span></div>
 <div class="block">Balance regions in the given RegionServer group.</div>
@@ -729,7 +729,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupAdmin.
 <ul class="blockList">
 <li class="blockList">
 <h4>listRSGroups</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/rsgroup/RSGroupInfo.html" title="class in org.apache.hadoop.hbase.rsgroup">RSGroupInfo</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html#line.500">listRSGroups</a>()
+<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/rsgroup/RSGroupInfo.html" title="class in org.apache.hadoop.hbase.rsgroup">RSGroupInfo</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html#line.501">listRSGroups</a>()
                                throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <div class="block"><span class="descfrmTypeLabel">Description copied from interface:&nbsp;<code><a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupAdmin.html#listRSGroups--">RSGroupAdmin</a></code></span></div>
 <div class="block">Lists current set of RegionServer groups.</div>
@@ -747,7 +747,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupAdmin.
 <ul class="blockList">
 <li class="blockList">
 <h4>getRSGroupOfServer</h4>
-<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfo.html" title="class in org.apache.hadoop.hbase.rsgroup">RSGroupInfo</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html#line.505">getRSGroupOfServer</a>(<a href="../../../../../org/apache/hadoop/hbase/net/Address.html" title="class in org.apache.hadoop.hbase.net">Address</a>&nbsp;hostPort)
+<pre>public&nbsp;<a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupInfo.html" title="class in org.apache.hadoop.hbase.rsgroup">RSGroupInfo</a>&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html#line.506">getRSGroupOfServer</a>(<a href="../../../../../org/apache/hadoop/hbase/net/Address.html" title="class in org.apache.hadoop.hbase.net">Address</a>&nbsp;hostPort)
                                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/rsgroup/RSGroupAdmin.html#getRSGroupOfServer-org.apache.hadoop.hbase.net.Address-">RSGroupAdmin</a></code></span></div>
 <div class="block">Retrieve the RSGroupInfo a server is affiliated to</div>
@@ -767,7 +767,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupAdmin.
 <ul class="blockList">
 <li class="blockList">
 <h4>moveServersAndTables</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html#line.510">moveServersAndTables</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/net/Address.html" title="class in org.apache.hadoop.hbase.net">Address</a>&gt;&nbsp;servers,
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html#line.511">moveServersAndTables</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/net/Address.html" title="class in org.apache.hadoop.hbase.net">Address</a>&gt;&nbsp;servers,
                                  <a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</a>&gt;&nbsp;tables,
                                  <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;targetGroup)
                           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>
@@ -791,7 +791,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupAdmin.
 <ul class="blockList">
 <li class="blockList">
 <h4>removeServers</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html#line.542">removeServers</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/net/Address.html" title="class in org.apache.hadoop.hbase.net">Address</a>&gt;&nbsp;servers)
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html#line.543">removeServers</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/net/Address.html" title="class in org.apache.hadoop.hbase.net">Address</a>&gt;&nbsp;servers)
                    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/rsgroup/RSGroupAdmin.html#removeServers-java.util.Set-">RSGroupAdmin</a></code></span></div>
 <div class="block">Remove decommissioned servers from rsgroup.
@@ -815,7 +815,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupAdmin.
 <ul class="blockList">
 <li class="blockList">
 <h4>rsGroupGetRegionsInTransition</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/hadoop/hbase/master/RegionState.html" title="class in org.apache.hadoop.hbase.master">RegionState</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/had [...]
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true" title="class or interface in java.lang">String</a>,<a href="../../../../../org/apache/hadoop/hbase/master/RegionState.html" title="class in org.apache.hadoop.hbase.master">RegionState</a>&gt;&nbsp;<a href="../../../../../src-html/org/apache/had [...]
                                                        throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -829,7 +829,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupAdmin.
 <ul class="blockList">
 <li class="blockList">
 <h4>getRSGroupAssignmentsByTable</h4>
-<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</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;<a href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class [...]
+<pre>private&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Map.html?is-external=true" title="class or interface in java.util">Map</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/TableName.html" title="class in org.apache.hadoop.hbase">TableName</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;<a href="../../../../../org/apache/hadoop/hbase/ServerName.html" title="class [...]
                                                                               throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -843,7 +843,7 @@ implements <a href="../../../../../org/apache/hadoop/hbase/rsgroup/RSGroupAdmin.
 <ul class="blockListLast">
 <li class="blockList">
 <h4>checkForDeadOrOnlineServers</h4>
-<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html#line.618">checkForDeadOrOnlineServers</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/net/Address.html" title="class in org.apache.hadoop.hbase.net">Address</a>&gt;&nbsp;servers)
+<pre>private&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html#line.619">checkForDeadOrOnlineServers</a>(<a href="https://docs.oracle.com/javase/8/docs/api/java/util/Set.html?is-external=true" title="class or interface in java.util">Set</a>&lt;<a href="../../../../../org/apache/hadoop/hbase/net/Address.html" title="class in org.apache.hadoop.hbase.net">Address</a>&gt;&nbsp;servers)
                                   throws <a href="../../../../../org/apache/hadoop/hbase/constraint/ConstraintException.html" title="class in org.apache.hadoop.hbase.constraint">ConstraintException</a></pre>
 <div class="block">Check if the set of servers are belong to dead servers list or online servers list.</div>
 <dl>
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
index 973bff1..1a54976 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/Version.html
@@ -18,9 +18,9 @@
 <span class="sourceLineNo">010</span>  justification="Intentional; to be modified in test")<a name="line.10"></a>
 <span class="sourceLineNo">011</span>public class Version {<a name="line.11"></a>
 <span class="sourceLineNo">012</span>  public static final String version = new String("3.0.0-SNAPSHOT");<a name="line.12"></a>
-<span class="sourceLineNo">013</span>  public static final String revision = "93c5e7691f02e4b46b4b7d4a582b32e9b9ce9792";<a name="line.13"></a>
+<span class="sourceLineNo">013</span>  public static final String revision = "546828685e2a7c2d686925a80c7a68dd4d4e3f8d";<a name="line.13"></a>
 <span class="sourceLineNo">014</span>  public static final String user = "jenkins";<a name="line.14"></a>
-<span class="sourceLineNo">015</span>  public static final String date = "Fri Feb  7 14:37:07 UTC 2020";<a name="line.15"></a>
+<span class="sourceLineNo">015</span>  public static final String date = "Sat Feb  8 14:38:19 UTC 2020";<a name="line.15"></a>
 <span class="sourceLineNo">016</span>  public static final String url = "git://jenkins-websites-he-de.apache.org/home/jenkins/jenkins-slave/workspace/hbase_generate_website/hbase";<a name="line.16"></a>
 <span class="sourceLineNo">017</span>  public static final String srcChecksum = "(stdin)=";<a name="line.17"></a>
 <span class="sourceLineNo">018</span>}<a name="line.18"></a>
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html b/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html
index 7f8c9f7..ec9f634 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.html
@@ -302,356 +302,357 @@
 <span class="sourceLineNo">294</span>        }<a name="line.294"></a>
 <span class="sourceLineNo">295</span><a name="line.295"></a>
 <span class="sourceLineNo">296</span>        if (!hasRegionsToMove) {<a name="line.296"></a>
-<span class="sourceLineNo">297</span>          LOG.info("No more regions to move from {} to RSGroup", getOwnerName.apply(owner));<a name="line.297"></a>
-<span class="sourceLineNo">298</span>          iter.remove();<a name="line.298"></a>
-<span class="sourceLineNo">299</span>        }<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>      retry++;<a name="line.302"></a>
-<span class="sourceLineNo">303</span>      try {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>        rsGroupInfoManager.wait(1000);<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      } catch (InterruptedException e) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span>        LOG.warn("Sleep interrupted", e);<a name="line.306"></a>
-<span class="sourceLineNo">307</span>        Thread.currentThread().interrupt();<a name="line.307"></a>
-<span class="sourceLineNo">308</span>      }<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    } while (hasRegionsToMove &amp;&amp; retry &lt;= moveMaxRetry);<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span>    //has up to max retry time or there are no more regions to move<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    if (hasRegionsToMove) {<a name="line.312"></a>
-<span class="sourceLineNo">313</span>      // print failed moved regions, for later process conveniently<a name="line.313"></a>
-<span class="sourceLineNo">314</span>      String msg = String<a name="line.314"></a>
-<span class="sourceLineNo">315</span>          .format("move regions for group %s failed, failed regions: %s", targetGroupName,<a name="line.315"></a>
-<span class="sourceLineNo">316</span>              failedRegions);<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      LOG.error(msg);<a name="line.317"></a>
-<span class="sourceLineNo">318</span>      throw new DoNotRetryIOException(<a name="line.318"></a>
-<span class="sourceLineNo">319</span>          msg + ", just record the last failed region's cause, more details in server log",<a name="line.319"></a>
-<span class="sourceLineNo">320</span>          toThrow);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    }<a name="line.321"></a>
-<span class="sourceLineNo">322</span>  }<a name="line.322"></a>
-<span class="sourceLineNo">323</span><a name="line.323"></a>
-<span class="sourceLineNo">324</span>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(<a name="line.324"></a>
-<span class="sourceLineNo">325</span>      value="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE",<a name="line.325"></a>
-<span class="sourceLineNo">326</span>      justification="Ignoring complaint because don't know what it is complaining about")<a name="line.326"></a>
-<span class="sourceLineNo">327</span>  @Override<a name="line.327"></a>
-<span class="sourceLineNo">328</span>  public void moveServers(Set&lt;Address&gt; servers, String targetGroupName) throws IOException {<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    if (servers == null) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      throw new ConstraintException("The list of servers to move cannot be null.");<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    }<a name="line.331"></a>
-<span class="sourceLineNo">332</span>    if (servers.isEmpty()) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      // For some reason this difference between null servers and isEmpty is important distinction.<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      // TODO. Why? Stuff breaks if I equate them.<a name="line.334"></a>
-<span class="sourceLineNo">335</span>      return;<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    }<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    //check target group<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    getAndCheckRSGroupInfo(targetGroupName);<a name="line.338"></a>
-<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span>    // Hold a lock on the manager instance while moving servers to prevent<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    // another writer changing our state while we are working.<a name="line.341"></a>
-<span class="sourceLineNo">342</span>    synchronized (rsGroupInfoManager) {<a name="line.342"></a>
-<span class="sourceLineNo">343</span>      // Presume first server's source group. Later ensure all servers are from this group.<a name="line.343"></a>
-<span class="sourceLineNo">344</span>      Address firstServer = servers.iterator().next();<a name="line.344"></a>
-<span class="sourceLineNo">345</span>      RSGroupInfo srcGrp = rsGroupInfoManager.getRSGroupOfServer(firstServer);<a name="line.345"></a>
-<span class="sourceLineNo">346</span>      if (srcGrp == null) {<a name="line.346"></a>
-<span class="sourceLineNo">347</span>        // Be careful. This exception message is tested for in TestRSGroupsBase...<a name="line.347"></a>
-<span class="sourceLineNo">348</span>        throw new ConstraintException("Source RSGroup for server " + firstServer<a name="line.348"></a>
-<span class="sourceLineNo">349</span>            + " does not exist.");<a name="line.349"></a>
-<span class="sourceLineNo">350</span>      }<a name="line.350"></a>
-<span class="sourceLineNo">351</span>      // Only move online servers (when moving from 'default') or servers from other<a name="line.351"></a>
-<span class="sourceLineNo">352</span>      // groups. This prevents bogus servers from entering groups<a name="line.352"></a>
-<span class="sourceLineNo">353</span>      if (RSGroupInfo.DEFAULT_GROUP.equals(srcGrp.getName())) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span>        if (srcGrp.getServers().size() &lt;= servers.size()) {<a name="line.354"></a>
-<span class="sourceLineNo">355</span>          throw new ConstraintException(KEEP_ONE_SERVER_IN_DEFAULT_ERROR_MESSAGE);<a name="line.355"></a>
-<span class="sourceLineNo">356</span>        }<a name="line.356"></a>
-<span class="sourceLineNo">357</span>        checkOnlineServersOnly(servers);<a name="line.357"></a>
-<span class="sourceLineNo">358</span>      }<a name="line.358"></a>
-<span class="sourceLineNo">359</span>      // Ensure all servers are of same rsgroup.<a name="line.359"></a>
-<span class="sourceLineNo">360</span>      for (Address server: servers) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>        String tmpGroup = rsGroupInfoManager.getRSGroupOfServer(server).getName();<a name="line.361"></a>
-<span class="sourceLineNo">362</span>        if (!tmpGroup.equals(srcGrp.getName())) {<a name="line.362"></a>
-<span class="sourceLineNo">363</span>          throw new ConstraintException("Move server request should only come from one source " +<a name="line.363"></a>
-<span class="sourceLineNo">364</span>              "RSGroup. Expecting only " + srcGrp.getName() + " but contains " + tmpGroup);<a name="line.364"></a>
-<span class="sourceLineNo">365</span>        }<a name="line.365"></a>
-<span class="sourceLineNo">366</span>      }<a name="line.366"></a>
-<span class="sourceLineNo">367</span>      if (srcGrp.getServers().size() &lt;= servers.size() &amp;&amp; srcGrp.getTables().size() &gt; 0) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span>        throw new ConstraintException("Cannot leave a RSGroup " + srcGrp.getName() +<a name="line.368"></a>
-<span class="sourceLineNo">369</span>            " that contains tables without servers to host them.");<a name="line.369"></a>
-<span class="sourceLineNo">370</span>      }<a name="line.370"></a>
-<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span>      // MovedServers may be &lt; passed in 'servers'.<a name="line.372"></a>
-<span class="sourceLineNo">373</span>      Set&lt;Address&gt; movedServers = rsGroupInfoManager.moveServers(servers, srcGrp.getName(),<a name="line.373"></a>
-<span class="sourceLineNo">374</span>          targetGroupName);<a name="line.374"></a>
-<span class="sourceLineNo">375</span>      moveServerRegionsFromGroup(movedServers, targetGroupName);<a name="line.375"></a>
-<span class="sourceLineNo">376</span>      LOG.info("Move servers done: {} =&gt; {}", srcGrp.getName(), targetGroupName);<a name="line.376"></a>
-<span class="sourceLineNo">377</span>    }<a name="line.377"></a>
-<span class="sourceLineNo">378</span>  }<a name="line.378"></a>
-<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span>  @Override<a name="line.380"></a>
-<span class="sourceLineNo">381</span>  public void moveTables(Set&lt;TableName&gt; tables, String targetGroup) throws IOException {<a name="line.381"></a>
-<span class="sourceLineNo">382</span>    if (tables == null) {<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      throw new ConstraintException("The list of servers cannot be null.");<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    }<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    if (tables.size() &lt; 1) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>      LOG.debug("moveTables() passed an empty set. Ignoring.");<a name="line.386"></a>
-<span class="sourceLineNo">387</span>      return;<a name="line.387"></a>
-<span class="sourceLineNo">388</span>    }<a name="line.388"></a>
-<span class="sourceLineNo">389</span><a name="line.389"></a>
-<span class="sourceLineNo">390</span>    // Hold a lock on the manager instance while moving servers to prevent<a name="line.390"></a>
-<span class="sourceLineNo">391</span>    // another writer changing our state while we are working.<a name="line.391"></a>
-<span class="sourceLineNo">392</span>    synchronized (rsGroupInfoManager) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span>      if(targetGroup != null) {<a name="line.393"></a>
-<span class="sourceLineNo">394</span>        RSGroupInfo destGroup = rsGroupInfoManager.getRSGroup(targetGroup);<a name="line.394"></a>
-<span class="sourceLineNo">395</span>        if(destGroup == null) {<a name="line.395"></a>
-<span class="sourceLineNo">396</span>          throw new ConstraintException("Target " + targetGroup + " RSGroup does not exist.");<a name="line.396"></a>
-<span class="sourceLineNo">397</span>        }<a name="line.397"></a>
-<span class="sourceLineNo">398</span>        if(destGroup.getServers().size() &lt; 1) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>          throw new ConstraintException("Target RSGroup must have at least one server.");<a name="line.399"></a>
-<span class="sourceLineNo">400</span>        }<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      }<a name="line.401"></a>
-<span class="sourceLineNo">402</span>      rsGroupInfoManager.moveTables(tables, targetGroup);<a name="line.402"></a>
-<span class="sourceLineNo">403</span><a name="line.403"></a>
-<span class="sourceLineNo">404</span>      // targetGroup is null when a table is being deleted. In this case no further<a name="line.404"></a>
-<span class="sourceLineNo">405</span>      // action is required.<a name="line.405"></a>
-<span class="sourceLineNo">406</span>      if (targetGroup != null) {<a name="line.406"></a>
-<span class="sourceLineNo">407</span>        moveTableRegionsToGroup(tables, targetGroup);<a name="line.407"></a>
-<span class="sourceLineNo">408</span>      }<a name="line.408"></a>
-<span class="sourceLineNo">409</span>    }<a name="line.409"></a>
-<span class="sourceLineNo">410</span>  }<a name="line.410"></a>
-<span class="sourceLineNo">411</span><a name="line.411"></a>
-<span class="sourceLineNo">412</span>  @Override<a name="line.412"></a>
-<span class="sourceLineNo">413</span>  public void addRSGroup(String name) throws IOException {<a name="line.413"></a>
-<span class="sourceLineNo">414</span>    rsGroupInfoManager.addRSGroup(new RSGroupInfo(name));<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>  @Override<a name="line.417"></a>
-<span class="sourceLineNo">418</span>  public void removeRSGroup(String name) throws IOException {<a name="line.418"></a>
-<span class="sourceLineNo">419</span>    // Hold a lock on the manager instance while moving servers to prevent<a name="line.419"></a>
-<span class="sourceLineNo">420</span>    // another writer changing our state while we are working.<a name="line.420"></a>
-<span class="sourceLineNo">421</span>    synchronized (rsGroupInfoManager) {<a name="line.421"></a>
-<span class="sourceLineNo">422</span>      RSGroupInfo rsGroupInfo = rsGroupInfoManager.getRSGroup(name);<a name="line.422"></a>
-<span class="sourceLineNo">423</span>      if (rsGroupInfo == null) {<a name="line.423"></a>
-<span class="sourceLineNo">424</span>        throw new ConstraintException("RSGroup " + name + " does not exist");<a name="line.424"></a>
-<span class="sourceLineNo">425</span>      }<a name="line.425"></a>
-<span class="sourceLineNo">426</span>      int tableCount = rsGroupInfo.getTables().size();<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      if (tableCount &gt; 0) {<a name="line.427"></a>
-<span class="sourceLineNo">428</span>        throw new ConstraintException("RSGroup " + name + " has " + tableCount +<a name="line.428"></a>
-<span class="sourceLineNo">429</span>            " tables; you must remove these tables from the rsgroup before " +<a name="line.429"></a>
-<span class="sourceLineNo">430</span>            "the rsgroup can be removed.");<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      }<a name="line.431"></a>
-<span class="sourceLineNo">432</span>      int serverCount = rsGroupInfo.getServers().size();<a name="line.432"></a>
-<span class="sourceLineNo">433</span>      if (serverCount &gt; 0) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span>        throw new ConstraintException("RSGroup " + name + " has " + serverCount +<a name="line.434"></a>
-<span class="sourceLineNo">435</span>            " servers; you must remove these servers from the RSGroup before" +<a name="line.435"></a>
-<span class="sourceLineNo">436</span>            "the RSGroup can be removed.");<a name="line.436"></a>
-<span class="sourceLineNo">437</span>      }<a name="line.437"></a>
-<span class="sourceLineNo">438</span>      for (NamespaceDescriptor ns : master.getClusterSchema().getNamespaces()) {<a name="line.438"></a>
-<span class="sourceLineNo">439</span>        String nsGroup = ns.getConfigurationValue(RSGroupInfo.NAMESPACE_DESC_PROP_GROUP);<a name="line.439"></a>
-<span class="sourceLineNo">440</span>        if (nsGroup != null &amp;&amp; nsGroup.equals(name)) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span>          throw new ConstraintException(<a name="line.441"></a>
-<span class="sourceLineNo">442</span>            "RSGroup " + name + " is referenced by namespace: " + ns.getName());<a name="line.442"></a>
-<span class="sourceLineNo">443</span>        }<a name="line.443"></a>
-<span class="sourceLineNo">444</span>      }<a name="line.444"></a>
-<span class="sourceLineNo">445</span>      rsGroupInfoManager.removeRSGroup(name);<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>  @Override<a name="line.449"></a>
-<span class="sourceLineNo">450</span>  public boolean balanceRSGroup(String groupName) throws IOException {<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    ServerManager serverManager = master.getServerManager();<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    LoadBalancer balancer = master.getLoadBalancer();<a name="line.452"></a>
-<span class="sourceLineNo">453</span><a name="line.453"></a>
-<span class="sourceLineNo">454</span>    synchronized (balancer) {<a name="line.454"></a>
-<span class="sourceLineNo">455</span>      // If balance not true, don't run balancer.<a name="line.455"></a>
-<span class="sourceLineNo">456</span>      if (!((HMaster) master).isBalancerOn()) {<a name="line.456"></a>
-<span class="sourceLineNo">457</span>        return false;<a name="line.457"></a>
-<span class="sourceLineNo">458</span>      }<a name="line.458"></a>
-<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span>      if (getRSGroupInfo(groupName) == null) {<a name="line.460"></a>
-<span class="sourceLineNo">461</span>        throw new ConstraintException("RSGroup does not exist: "+groupName);<a name="line.461"></a>
-<span class="sourceLineNo">462</span>      }<a name="line.462"></a>
-<span class="sourceLineNo">463</span>      // Only allow one balance run at at time.<a name="line.463"></a>
-<span class="sourceLineNo">464</span>      Map&lt;String, RegionState&gt; groupRIT = rsGroupGetRegionsInTransition(groupName);<a name="line.464"></a>
-<span class="sourceLineNo">465</span>      if (groupRIT.size() &gt; 0) {<a name="line.465"></a>
-<span class="sourceLineNo">466</span>        LOG.debug("Not running balancer because {} region(s) in transition: {}", groupRIT.size(),<a name="line.466"></a>
-<span class="sourceLineNo">467</span>            StringUtils.abbreviate(<a name="line.467"></a>
-<span class="sourceLineNo">468</span>              master.getAssignmentManager().getRegionStates().getRegionsInTransition().toString(),<a name="line.468"></a>
-<span class="sourceLineNo">469</span>              256));<a name="line.469"></a>
-<span class="sourceLineNo">470</span>        return false;<a name="line.470"></a>
-<span class="sourceLineNo">471</span>      }<a name="line.471"></a>
-<span class="sourceLineNo">472</span>      if (serverManager.areDeadServersInProgress()) {<a name="line.472"></a>
-<span class="sourceLineNo">473</span>        LOG.debug("Not running balancer because processing dead regionserver(s): {}",<a name="line.473"></a>
-<span class="sourceLineNo">474</span>            serverManager.getDeadServers());<a name="line.474"></a>
-<span class="sourceLineNo">475</span>        return false;<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>      //We balance per group instead of per table<a name="line.478"></a>
-<span class="sourceLineNo">479</span>      List&lt;RegionPlan&gt; plans = new ArrayList&lt;&gt;();<a name="line.479"></a>
-<span class="sourceLineNo">480</span>      for(Map.Entry&lt;TableName, Map&lt;ServerName, List&lt;RegionInfo&gt;&gt;&gt; tableMap:<a name="line.480"></a>
-<span class="sourceLineNo">481</span>          getRSGroupAssignmentsByTable(groupName).entrySet()) {<a name="line.481"></a>
-<span class="sourceLineNo">482</span>        LOG.info("Creating partial plan for table {} : {}", tableMap.getKey(), tableMap.getValue());<a name="line.482"></a>
-<span class="sourceLineNo">483</span>        List&lt;RegionPlan&gt; partialPlans = balancer.balanceCluster(tableMap.getValue());<a name="line.483"></a>
-<span class="sourceLineNo">484</span>        LOG.info("Partial plan for table {} : {}", tableMap.getKey(), partialPlans);<a name="line.484"></a>
-<span class="sourceLineNo">485</span>        if (partialPlans != null) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span>          plans.addAll(partialPlans);<a name="line.486"></a>
-<span class="sourceLineNo">487</span>        }<a name="line.487"></a>
-<span class="sourceLineNo">488</span>      }<a name="line.488"></a>
-<span class="sourceLineNo">489</span>      boolean balancerRan = !plans.isEmpty();<a name="line.489"></a>
-<span class="sourceLineNo">490</span>      if (balancerRan) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span>        LOG.info("RSGroup balance {} starting with plan count: {}", groupName, plans.size());<a name="line.491"></a>
-<span class="sourceLineNo">492</span>        master.executeRegionPlansWithThrottling(plans);<a name="line.492"></a>
-<span class="sourceLineNo">493</span>        LOG.info("RSGroup balance " + groupName + " completed");<a name="line.493"></a>
-<span class="sourceLineNo">494</span>      }<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      return balancerRan;<a name="line.495"></a>
-<span class="sourceLineNo">496</span>    }<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>  @Override<a name="line.499"></a>
-<span class="sourceLineNo">500</span>  public List&lt;RSGroupInfo&gt; listRSGroups() throws IOException {<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    return rsGroupInfoManager.listRSGroups();<a name="line.501"></a>
-<span class="sourceLineNo">502</span>  }<a name="line.502"></a>
-<span class="sourceLineNo">503</span><a name="line.503"></a>
-<span class="sourceLineNo">504</span>  @Override<a name="line.504"></a>
-<span class="sourceLineNo">505</span>  public RSGroupInfo getRSGroupOfServer(Address hostPort) throws IOException {<a name="line.505"></a>
-<span class="sourceLineNo">506</span>    return rsGroupInfoManager.getRSGroupOfServer(hostPort);<a name="line.506"></a>
-<span class="sourceLineNo">507</span>  }<a name="line.507"></a>
-<span class="sourceLineNo">508</span><a name="line.508"></a>
-<span class="sourceLineNo">509</span>  @Override<a name="line.509"></a>
-<span class="sourceLineNo">510</span>  public void moveServersAndTables(Set&lt;Address&gt; servers, Set&lt;TableName&gt; tables, String targetGroup)<a name="line.510"></a>
-<span class="sourceLineNo">511</span>      throws IOException {<a name="line.511"></a>
-<span class="sourceLineNo">512</span>    if (servers == null || servers.isEmpty()) {<a name="line.512"></a>
-<span class="sourceLineNo">513</span>      throw new ConstraintException("The list of servers to move cannot be null or empty.");<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    }<a name="line.514"></a>
-<span class="sourceLineNo">515</span>    if (tables == null || tables.isEmpty()) {<a name="line.515"></a>
-<span class="sourceLineNo">516</span>      throw new ConstraintException("The list of tables to move cannot be null or empty.");<a name="line.516"></a>
-<span class="sourceLineNo">517</span>    }<a name="line.517"></a>
-<span class="sourceLineNo">518</span><a name="line.518"></a>
-<span class="sourceLineNo">519</span>    //check target group<a name="line.519"></a>
-<span class="sourceLineNo">520</span>    getAndCheckRSGroupInfo(targetGroup);<a name="line.520"></a>
-<span class="sourceLineNo">521</span><a name="line.521"></a>
-<span class="sourceLineNo">522</span>    // Hold a lock on the manager instance while moving servers and tables to prevent<a name="line.522"></a>
-<span class="sourceLineNo">523</span>    // another writer changing our state while we are working.<a name="line.523"></a>
-<span class="sourceLineNo">524</span>    synchronized (rsGroupInfoManager) {<a name="line.524"></a>
-<span class="sourceLineNo">525</span>      //check servers and tables status<a name="line.525"></a>
-<span class="sourceLineNo">526</span>      checkServersAndTables(servers, tables, targetGroup);<a name="line.526"></a>
-<span class="sourceLineNo">527</span><a name="line.527"></a>
-<span class="sourceLineNo">528</span>      //Move servers and tables to a new group.<a name="line.528"></a>
-<span class="sourceLineNo">529</span>      String srcGroup = getRSGroupOfServer(servers.iterator().next()).getName();<a name="line.529"></a>
-<span class="sourceLineNo">530</span>      rsGroupInfoManager.moveServersAndTables(servers, tables, srcGroup, targetGroup);<a name="line.530"></a>
-<span class="sourceLineNo">531</span><a name="line.531"></a>
-<span class="sourceLineNo">532</span>      //move regions on these servers which do not belong to group tables<a name="line.532"></a>
-<span class="sourceLineNo">533</span>      moveServerRegionsFromGroup(servers, targetGroup);<a name="line.533"></a>
-<span class="sourceLineNo">534</span>      //move regions of these tables which are not on group servers<a name="line.534"></a>
-<span class="sourceLineNo">535</span>      moveTableRegionsToGroup(tables, targetGroup);<a name="line.535"></a>
-<span class="sourceLineNo">536</span>    }<a name="line.536"></a>
-<span class="sourceLineNo">537</span>    LOG.info("Move servers and tables done. Severs: {}, Tables: {} =&gt; {}", servers, tables,<a name="line.537"></a>
-<span class="sourceLineNo">538</span>        targetGroup);<a name="line.538"></a>
-<span class="sourceLineNo">539</span>  }<a name="line.539"></a>
-<span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span>  @Override<a name="line.541"></a>
-<span class="sourceLineNo">542</span>  public void removeServers(Set&lt;Address&gt; servers) throws IOException {<a name="line.542"></a>
-<span class="sourceLineNo">543</span>    {<a name="line.543"></a>
-<span class="sourceLineNo">544</span>      if (servers == null || servers.isEmpty()) {<a name="line.544"></a>
-<span class="sourceLineNo">545</span>        throw new ConstraintException("The set of servers to remove cannot be null or empty.");<a name="line.545"></a>
-<span class="sourceLineNo">546</span>      }<a name="line.546"></a>
-<span class="sourceLineNo">547</span>      // Hold a lock on the manager instance while moving servers to prevent<a name="line.547"></a>
-<span class="sourceLineNo">548</span>      // another writer changing our state while we are working.<a name="line.548"></a>
-<span class="sourceLineNo">549</span>      synchronized (rsGroupInfoManager) {<a name="line.549"></a>
-<span class="sourceLineNo">550</span>        //check the set of servers<a name="line.550"></a>
-<span class="sourceLineNo">551</span>        checkForDeadOrOnlineServers(servers);<a name="line.551"></a>
-<span class="sourceLineNo">552</span>        rsGroupInfoManager.removeServers(servers);<a name="line.552"></a>
-<span class="sourceLineNo">553</span>        LOG.info("Remove decommissioned servers {} from RSGroup done", servers);<a name="line.553"></a>
-<span class="sourceLineNo">554</span>      }<a name="line.554"></a>
-<span class="sourceLineNo">555</span>    }<a name="line.555"></a>
-<span class="sourceLineNo">556</span>  }<a name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span>  private Map&lt;String, RegionState&gt; rsGroupGetRegionsInTransition(String groupName)<a name="line.558"></a>
-<span class="sourceLineNo">559</span>      throws IOException {<a name="line.559"></a>
-<span class="sourceLineNo">560</span>    Map&lt;String, RegionState&gt; rit = Maps.newTreeMap();<a name="line.560"></a>
-<span class="sourceLineNo">561</span>    AssignmentManager am = master.getAssignmentManager();<a name="line.561"></a>
-<span class="sourceLineNo">562</span>    for(TableName tableName : getRSGroupInfo(groupName).getTables()) {<a name="line.562"></a>
-<span class="sourceLineNo">563</span>      for(RegionInfo regionInfo: am.getRegionStates().getRegionsOfTable(tableName)) {<a name="line.563"></a>
-<span class="sourceLineNo">564</span>        RegionState state = am.getRegionStates().getRegionTransitionState(regionInfo);<a name="line.564"></a>
-<span class="sourceLineNo">565</span>        if(state != null) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span>          rit.put(regionInfo.getEncodedName(), state);<a name="line.566"></a>
-<span class="sourceLineNo">567</span>        }<a name="line.567"></a>
-<span class="sourceLineNo">568</span>      }<a name="line.568"></a>
-<span class="sourceLineNo">569</span>    }<a name="line.569"></a>
-<span class="sourceLineNo">570</span>    return rit;<a name="line.570"></a>
-<span class="sourceLineNo">571</span>  }<a name="line.571"></a>
-<span class="sourceLineNo">572</span><a name="line.572"></a>
-<span class="sourceLineNo">573</span>  private Map&lt;TableName, Map&lt;ServerName, List&lt;RegionInfo&gt;&gt;&gt;<a name="line.573"></a>
-<span class="sourceLineNo">574</span>      getRSGroupAssignmentsByTable(String groupName) throws IOException {<a name="line.574"></a>
-<span class="sourceLineNo">575</span>    Map&lt;TableName, Map&lt;ServerName, List&lt;RegionInfo&gt;&gt;&gt; result = Maps.newHashMap();<a name="line.575"></a>
-<span class="sourceLineNo">576</span>    RSGroupInfo rsGroupInfo = getRSGroupInfo(groupName);<a name="line.576"></a>
-<span class="sourceLineNo">577</span>    Map&lt;TableName, Map&lt;ServerName, List&lt;RegionInfo&gt;&gt;&gt; assignments = Maps.newHashMap();<a name="line.577"></a>
-<span class="sourceLineNo">578</span>    for(Map.Entry&lt;RegionInfo, ServerName&gt; entry:<a name="line.578"></a>
-<span class="sourceLineNo">579</span>        master.getAssignmentManager().getRegionStates().getRegionAssignments().entrySet()) {<a name="line.579"></a>
-<span class="sourceLineNo">580</span>      TableName currTable = entry.getKey().getTable();<a name="line.580"></a>
-<span class="sourceLineNo">581</span>      ServerName currServer = entry.getValue();<a name="line.581"></a>
-<span class="sourceLineNo">582</span>      RegionInfo currRegion = entry.getKey();<a name="line.582"></a>
-<span class="sourceLineNo">583</span>      if (rsGroupInfo.getTables().contains(currTable)) {<a name="line.583"></a>
-<span class="sourceLineNo">584</span>        assignments.computeIfAbsent(currTable, key -&gt; new HashMap&lt;&gt;())<a name="line.584"></a>
-<span class="sourceLineNo">585</span>            .computeIfAbsent(currServer, key -&gt; new ArrayList&lt;&gt;())<a name="line.585"></a>
-<span class="sourceLineNo">586</span>            .add(currRegion);<a name="line.586"></a>
-<span class="sourceLineNo">587</span>      }<a name="line.587"></a>
-<span class="sourceLineNo">588</span>    }<a name="line.588"></a>
-<span class="sourceLineNo">589</span><a name="line.589"></a>
-<span class="sourceLineNo">590</span>    Map&lt;ServerName, List&lt;RegionInfo&gt;&gt; serverMap = Maps.newHashMap();<a name="line.590"></a>
-<span class="sourceLineNo">591</span>    for(ServerName serverName: master.getServerManager().getOnlineServers().keySet()) {<a name="line.591"></a>
-<span class="sourceLineNo">592</span>      if(rsGroupInfo.getServers().contains(serverName.getAddress())) {<a name="line.592"></a>
-<span class="sourceLineNo">593</span>        serverMap.put(serverName, Collections.emptyList());<a name="line.593"></a>
-<span class="sourceLineNo">594</span>      }<a name="line.594"></a>
-<span class="sourceLineNo">595</span>    }<a name="line.595"></a>
-<span class="sourceLineNo">596</span><a name="line.596"></a>
-<span class="sourceLineNo">597</span>    // add all tables that are members of the group<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    for (TableName tableName : rsGroupInfo.getTables()) {<a name="line.598"></a>
-<span class="sourceLineNo">599</span>      if (assignments.containsKey(tableName)) {<a name="line.599"></a>
-<span class="sourceLineNo">600</span>        Map&lt;ServerName, List&lt;RegionInfo&gt;&gt; tableResults = new HashMap&lt;&gt;(serverMap);<a name="line.600"></a>
-<span class="sourceLineNo">601</span><a name="line.601"></a>
-<span class="sourceLineNo">602</span>        Map&lt;ServerName, List&lt;RegionInfo&gt;&gt; tableAssignments = assignments.get(tableName);<a name="line.602"></a>
-<span class="sourceLineNo">603</span>        tableResults.putAll(tableAssignments);<a name="line.603"></a>
-<span class="sourceLineNo">604</span><a name="line.604"></a>
-<span class="sourceLineNo">605</span>        result.put(tableName, tableResults);<a name="line.605"></a>
-<span class="sourceLineNo">606</span><a name="line.606"></a>
-<span class="sourceLineNo">607</span>        LOG.debug("Adding assignments for {}: {}", tableName, tableAssignments);<a name="line.607"></a>
-<span class="sourceLineNo">608</span>      }<a name="line.608"></a>
-<span class="sourceLineNo">609</span>    }<a name="line.609"></a>
-<span class="sourceLineNo">610</span><a name="line.610"></a>
-<span class="sourceLineNo">611</span>    return result;<a name="line.611"></a>
-<span class="sourceLineNo">612</span>  }<a name="line.612"></a>
-<span class="sourceLineNo">613</span><a name="line.613"></a>
-<span class="sourceLineNo">614</span>  /**<a name="line.614"></a>
-<span class="sourceLineNo">615</span>   * Check if the set of servers are belong to dead servers list or online servers list.<a name="line.615"></a>
-<span class="sourceLineNo">616</span>   * @param servers servers to remove<a name="line.616"></a>
-<span class="sourceLineNo">617</span>   */<a name="line.617"></a>
-<span class="sourceLineNo">618</span>  private void checkForDeadOrOnlineServers(Set&lt;Address&gt; servers) throws ConstraintException {<a name="line.618"></a>
-<span class="sourceLineNo">619</span>    // This uglyness is because we only have Address, not ServerName.<a name="line.619"></a>
-<span class="sourceLineNo">620</span>    Set&lt;Address&gt; onlineServers = new HashSet&lt;&gt;();<a name="line.620"></a>
-<span class="sourceLineNo">621</span>    List&lt;ServerName&gt; drainingServers = master.getServerManager().getDrainingServersList();<a name="line.621"></a>
-<span class="sourceLineNo">622</span>    for (ServerName server : master.getServerManager().getOnlineServers().keySet()) {<a name="line.622"></a>
-<span class="sourceLineNo">623</span>      // Only online but not decommissioned servers are really online<a name="line.623"></a>
-<span class="sourceLineNo">624</span>      if (!drainingServers.contains(server)) {<a name="line.624"></a>
-<span class="sourceLineNo">625</span>        onlineServers.add(server.getAddress());<a name="line.625"></a>
-<span class="sourceLineNo">626</span>      }<a name="line.626"></a>
-<span class="sourceLineNo">627</span>    }<a name="line.627"></a>
-<span class="sourceLineNo">628</span><a name="line.628"></a>
-<span class="sourceLineNo">629</span>    Set&lt;Address&gt; deadServers = new HashSet&lt;&gt;();<a name="line.629"></a>
-<span class="sourceLineNo">630</span>    for(ServerName server: master.getServerManager().getDeadServers().copyServerNames()) {<a name="line.630"></a>
-<span class="sourceLineNo">631</span>      deadServers.add(server.getAddress());<a name="line.631"></a>
-<span class="sourceLineNo">632</span>    }<a name="line.632"></a>
-<span class="sourceLineNo">633</span><a name="line.633"></a>
-<span class="sourceLineNo">634</span>    for (Address address: servers) {<a name="line.634"></a>
-<span class="sourceLineNo">635</span>      if (onlineServers.contains(address)) {<a name="line.635"></a>
-<span class="sourceLineNo">636</span>        throw new ConstraintException(<a name="line.636"></a>
-<span class="sourceLineNo">637</span>            "Server " + address + " is an online server, not allowed to remove.");<a name="line.637"></a>
-<span class="sourceLineNo">638</span>      }<a name="line.638"></a>
-<span class="sourceLineNo">639</span>      if (deadServers.contains(address)) {<a name="line.639"></a>
-<span class="sourceLineNo">640</span>        throw new ConstraintException(<a name="line.640"></a>
-<span class="sourceLineNo">641</span>            "Server " + address + " is on the dead servers list,"<a name="line.641"></a>
-<span class="sourceLineNo">642</span>                + " Maybe it will come back again, not allowed to remove.");<a name="line.642"></a>
-<span class="sourceLineNo">643</span>      }<a name="line.643"></a>
-<span class="sourceLineNo">644</span>    }<a name="line.644"></a>
-<span class="sourceLineNo">645</span>  }<a name="line.645"></a>
-<span class="sourceLineNo">646</span>}<a name="line.646"></a>
+<span class="sourceLineNo">297</span>          LOG.info("No more regions to move from {} to RSGroup {}", getOwnerName.apply(owner),<a name="line.297"></a>
+<span class="sourceLineNo">298</span>            targetGroupName);<a name="line.298"></a>
+<span class="sourceLineNo">299</span>          iter.remove();<a name="line.299"></a>
+<span class="sourceLineNo">300</span>        }<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      }<a name="line.301"></a>
+<span class="sourceLineNo">302</span><a name="line.302"></a>
+<span class="sourceLineNo">303</span>      retry++;<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      try {<a name="line.304"></a>
+<span class="sourceLineNo">305</span>        rsGroupInfoManager.wait(1000);<a name="line.305"></a>
+<span class="sourceLineNo">306</span>      } catch (InterruptedException e) {<a name="line.306"></a>
+<span class="sourceLineNo">307</span>        LOG.warn("Sleep interrupted", e);<a name="line.307"></a>
+<span class="sourceLineNo">308</span>        Thread.currentThread().interrupt();<a name="line.308"></a>
+<span class="sourceLineNo">309</span>      }<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    } while (hasRegionsToMove &amp;&amp; retry &lt;= moveMaxRetry);<a name="line.310"></a>
+<span class="sourceLineNo">311</span><a name="line.311"></a>
+<span class="sourceLineNo">312</span>    //has up to max retry time or there are no more regions to move<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    if (hasRegionsToMove) {<a name="line.313"></a>
+<span class="sourceLineNo">314</span>      // print failed moved regions, for later process conveniently<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      String msg = String<a name="line.315"></a>
+<span class="sourceLineNo">316</span>          .format("move regions for group %s failed, failed regions: %s", targetGroupName,<a name="line.316"></a>
+<span class="sourceLineNo">317</span>              failedRegions);<a name="line.317"></a>
+<span class="sourceLineNo">318</span>      LOG.error(msg);<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      throw new DoNotRetryIOException(<a name="line.319"></a>
+<span class="sourceLineNo">320</span>          msg + ", just record the last failed region's cause, more details in server log",<a name="line.320"></a>
+<span class="sourceLineNo">321</span>          toThrow);<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    }<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>  @edu.umd.cs.findbugs.annotations.SuppressWarnings(<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      value="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE",<a name="line.326"></a>
+<span class="sourceLineNo">327</span>      justification="Ignoring complaint because don't know what it is complaining about")<a name="line.327"></a>
+<span class="sourceLineNo">328</span>  @Override<a name="line.328"></a>
+<span class="sourceLineNo">329</span>  public void moveServers(Set&lt;Address&gt; servers, String targetGroupName) throws IOException {<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    if (servers == null) {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      throw new ConstraintException("The list of servers to move cannot be null.");<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    }<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    if (servers.isEmpty()) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span>      // For some reason this difference between null servers and isEmpty is important distinction.<a name="line.334"></a>
+<span class="sourceLineNo">335</span>      // TODO. Why? Stuff breaks if I equate them.<a name="line.335"></a>
+<span class="sourceLineNo">336</span>      return;<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    }<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    //check target group<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    getAndCheckRSGroupInfo(targetGroupName);<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span>    // Hold a lock on the manager instance while moving servers to prevent<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    // another writer changing our state while we are working.<a name="line.342"></a>
+<span class="sourceLineNo">343</span>    synchronized (rsGroupInfoManager) {<a name="line.343"></a>
+<span class="sourceLineNo">344</span>      // Presume first server's source group. Later ensure all servers are from this group.<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      Address firstServer = servers.iterator().next();<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      RSGroupInfo srcGrp = rsGroupInfoManager.getRSGroupOfServer(firstServer);<a name="line.346"></a>
+<span class="sourceLineNo">347</span>      if (srcGrp == null) {<a name="line.347"></a>
+<span class="sourceLineNo">348</span>        // Be careful. This exception message is tested for in TestRSGroupsBase...<a name="line.348"></a>
+<span class="sourceLineNo">349</span>        throw new ConstraintException("Source RSGroup for server " + firstServer<a name="line.349"></a>
+<span class="sourceLineNo">350</span>            + " does not exist.");<a name="line.350"></a>
+<span class="sourceLineNo">351</span>      }<a name="line.351"></a>
+<span class="sourceLineNo">352</span>      // Only move online servers (when moving from 'default') or servers from other<a name="line.352"></a>
+<span class="sourceLineNo">353</span>      // groups. This prevents bogus servers from entering groups<a name="line.353"></a>
+<span class="sourceLineNo">354</span>      if (RSGroupInfo.DEFAULT_GROUP.equals(srcGrp.getName())) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span>        if (srcGrp.getServers().size() &lt;= servers.size()) {<a name="line.355"></a>
+<span class="sourceLineNo">356</span>          throw new ConstraintException(KEEP_ONE_SERVER_IN_DEFAULT_ERROR_MESSAGE);<a name="line.356"></a>
+<span class="sourceLineNo">357</span>        }<a name="line.357"></a>
+<span class="sourceLineNo">358</span>        checkOnlineServersOnly(servers);<a name="line.358"></a>
+<span class="sourceLineNo">359</span>      }<a name="line.359"></a>
+<span class="sourceLineNo">360</span>      // Ensure all servers are of same rsgroup.<a name="line.360"></a>
+<span class="sourceLineNo">361</span>      for (Address server: servers) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span>        String tmpGroup = rsGroupInfoManager.getRSGroupOfServer(server).getName();<a name="line.362"></a>
+<span class="sourceLineNo">363</span>        if (!tmpGroup.equals(srcGrp.getName())) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>          throw new ConstraintException("Move server request should only come from one source " +<a name="line.364"></a>
+<span class="sourceLineNo">365</span>              "RSGroup. Expecting only " + srcGrp.getName() + " but contains " + tmpGroup);<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>      if (srcGrp.getServers().size() &lt;= servers.size() &amp;&amp; srcGrp.getTables().size() &gt; 0) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>        throw new ConstraintException("Cannot leave a RSGroup " + srcGrp.getName() +<a name="line.369"></a>
+<span class="sourceLineNo">370</span>            " that contains tables without servers to host them.");<a name="line.370"></a>
+<span class="sourceLineNo">371</span>      }<a name="line.371"></a>
+<span class="sourceLineNo">372</span><a name="line.372"></a>
+<span class="sourceLineNo">373</span>      // MovedServers may be &lt; passed in 'servers'.<a name="line.373"></a>
+<span class="sourceLineNo">374</span>      Set&lt;Address&gt; movedServers = rsGroupInfoManager.moveServers(servers, srcGrp.getName(),<a name="line.374"></a>
+<span class="sourceLineNo">375</span>          targetGroupName);<a name="line.375"></a>
+<span class="sourceLineNo">376</span>      moveServerRegionsFromGroup(movedServers, targetGroupName);<a name="line.376"></a>
+<span class="sourceLineNo">377</span>      LOG.info("Move servers done: {} =&gt; {}", srcGrp.getName(), targetGroupName);<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>  @Override<a name="line.381"></a>
+<span class="sourceLineNo">382</span>  public void moveTables(Set&lt;TableName&gt; tables, String targetGroup) throws IOException {<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    if (tables == null) {<a name="line.383"></a>
+<span class="sourceLineNo">384</span>      throw new ConstraintException("The list of servers cannot be null.");<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    }<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    if (tables.size() &lt; 1) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span>      LOG.debug("moveTables() passed an empty set. Ignoring.");<a name="line.387"></a>
+<span class="sourceLineNo">388</span>      return;<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    }<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span>    // Hold a lock on the manager instance while moving servers to prevent<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    // another writer changing our state while we are working.<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    synchronized (rsGroupInfoManager) {<a name="line.393"></a>
+<span class="sourceLineNo">394</span>      if(targetGroup != null) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span>        RSGroupInfo destGroup = rsGroupInfoManager.getRSGroup(targetGroup);<a name="line.395"></a>
+<span class="sourceLineNo">396</span>        if(destGroup == null) {<a name="line.396"></a>
+<span class="sourceLineNo">397</span>          throw new ConstraintException("Target " + targetGroup + " RSGroup does not exist.");<a name="line.397"></a>
+<span class="sourceLineNo">398</span>        }<a name="line.398"></a>
+<span class="sourceLineNo">399</span>        if(destGroup.getServers().size() &lt; 1) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span>          throw new ConstraintException("Target RSGroup must have at least one server.");<a name="line.400"></a>
+<span class="sourceLineNo">401</span>        }<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      }<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      rsGroupInfoManager.moveTables(tables, targetGroup);<a name="line.403"></a>
+<span class="sourceLineNo">404</span><a name="line.404"></a>
+<span class="sourceLineNo">405</span>      // targetGroup is null when a table is being deleted. In this case no further<a name="line.405"></a>
+<span class="sourceLineNo">406</span>      // action is required.<a name="line.406"></a>
+<span class="sourceLineNo">407</span>      if (targetGroup != null) {<a name="line.407"></a>
+<span class="sourceLineNo">408</span>        moveTableRegionsToGroup(tables, targetGroup);<a name="line.408"></a>
+<span class="sourceLineNo">409</span>      }<a name="line.409"></a>
+<span class="sourceLineNo">410</span>    }<a name="line.410"></a>
+<span class="sourceLineNo">411</span>  }<a name="line.411"></a>
+<span class="sourceLineNo">412</span><a name="line.412"></a>
+<span class="sourceLineNo">413</span>  @Override<a name="line.413"></a>
+<span class="sourceLineNo">414</span>  public void addRSGroup(String name) throws IOException {<a name="line.414"></a>
+<span class="sourceLineNo">415</span>    rsGroupInfoManager.addRSGroup(new RSGroupInfo(name));<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>  @Override<a name="line.418"></a>
+<span class="sourceLineNo">419</span>  public void removeRSGroup(String name) throws IOException {<a name="line.419"></a>
+<span class="sourceLineNo">420</span>    // Hold a lock on the manager instance while moving servers to prevent<a name="line.420"></a>
+<span class="sourceLineNo">421</span>    // another writer changing our state while we are working.<a name="line.421"></a>
+<span class="sourceLineNo">422</span>    synchronized (rsGroupInfoManager) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span>      RSGroupInfo rsGroupInfo = rsGroupInfoManager.getRSGroup(name);<a name="line.423"></a>
+<span class="sourceLineNo">424</span>      if (rsGroupInfo == null) {<a name="line.424"></a>
+<span class="sourceLineNo">425</span>        throw new ConstraintException("RSGroup " + name + " does not exist");<a name="line.425"></a>
+<span class="sourceLineNo">426</span>      }<a name="line.426"></a>
+<span class="sourceLineNo">427</span>      int tableCount = rsGroupInfo.getTables().size();<a name="line.427"></a>
+<span class="sourceLineNo">428</span>      if (tableCount &gt; 0) {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>        throw new ConstraintException("RSGroup " + name + " has " + tableCount +<a name="line.429"></a>
+<span class="sourceLineNo">430</span>            " tables; you must remove these tables from the rsgroup before " +<a name="line.430"></a>
+<span class="sourceLineNo">431</span>            "the rsgroup can be removed.");<a name="line.431"></a>
+<span class="sourceLineNo">432</span>      }<a name="line.432"></a>
+<span class="sourceLineNo">433</span>      int serverCount = rsGroupInfo.getServers().size();<a name="line.433"></a>
+<span class="sourceLineNo">434</span>      if (serverCount &gt; 0) {<a name="line.434"></a>
+<span class="sourceLineNo">435</span>        throw new ConstraintException("RSGroup " + name + " has " + serverCount +<a name="line.435"></a>
+<span class="sourceLineNo">436</span>            " servers; you must remove these servers from the RSGroup before" +<a name="line.436"></a>
+<span class="sourceLineNo">437</span>            "the RSGroup can be removed.");<a name="line.437"></a>
+<span class="sourceLineNo">438</span>      }<a name="line.438"></a>
+<span class="sourceLineNo">439</span>      for (NamespaceDescriptor ns : master.getClusterSchema().getNamespaces()) {<a name="line.439"></a>
+<span class="sourceLineNo">440</span>        String nsGroup = ns.getConfigurationValue(RSGroupInfo.NAMESPACE_DESC_PROP_GROUP);<a name="line.440"></a>
+<span class="sourceLineNo">441</span>        if (nsGroup != null &amp;&amp; nsGroup.equals(name)) {<a name="line.441"></a>
+<span class="sourceLineNo">442</span>          throw new ConstraintException(<a name="line.442"></a>
+<span class="sourceLineNo">443</span>            "RSGroup " + name + " is referenced by namespace: " + ns.getName());<a name="line.443"></a>
+<span class="sourceLineNo">444</span>        }<a name="line.444"></a>
+<span class="sourceLineNo">445</span>      }<a name="line.445"></a>
+<span class="sourceLineNo">446</span>      rsGroupInfoManager.removeRSGroup(name);<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><a name="line.449"></a>
+<span class="sourceLineNo">450</span>  @Override<a name="line.450"></a>
+<span class="sourceLineNo">451</span>  public boolean balanceRSGroup(String groupName) throws IOException {<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    ServerManager serverManager = master.getServerManager();<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    LoadBalancer balancer = master.getLoadBalancer();<a name="line.453"></a>
+<span class="sourceLineNo">454</span><a name="line.454"></a>
+<span class="sourceLineNo">455</span>    synchronized (balancer) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>      // If balance not true, don't run balancer.<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      if (!((HMaster) master).isBalancerOn()) {<a name="line.457"></a>
+<span class="sourceLineNo">458</span>        return false;<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>      if (getRSGroupInfo(groupName) == null) {<a name="line.461"></a>
+<span class="sourceLineNo">462</span>        throw new ConstraintException("RSGroup does not exist: "+groupName);<a name="line.462"></a>
+<span class="sourceLineNo">463</span>      }<a name="line.463"></a>
+<span class="sourceLineNo">464</span>      // Only allow one balance run at at time.<a name="line.464"></a>
+<span class="sourceLineNo">465</span>      Map&lt;String, RegionState&gt; groupRIT = rsGroupGetRegionsInTransition(groupName);<a name="line.465"></a>
+<span class="sourceLineNo">466</span>      if (groupRIT.size() &gt; 0) {<a name="line.466"></a>
+<span class="sourceLineNo">467</span>        LOG.debug("Not running balancer because {} region(s) in transition: {}", groupRIT.size(),<a name="line.467"></a>
+<span class="sourceLineNo">468</span>            StringUtils.abbreviate(<a name="line.468"></a>
+<span class="sourceLineNo">469</span>              master.getAssignmentManager().getRegionStates().getRegionsInTransition().toString(),<a name="line.469"></a>
+<span class="sourceLineNo">470</span>              256));<a name="line.470"></a>
+<span class="sourceLineNo">471</span>        return false;<a name="line.471"></a>
+<span class="sourceLineNo">472</span>      }<a name="line.472"></a>
+<span class="sourceLineNo">473</span>      if (serverManager.areDeadServersInProgress()) {<a name="line.473"></a>
+<span class="sourceLineNo">474</span>        LOG.debug("Not running balancer because processing dead regionserver(s): {}",<a name="line.474"></a>
+<span class="sourceLineNo">475</span>            serverManager.getDeadServers());<a name="line.475"></a>
+<span class="sourceLineNo">476</span>        return false;<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>      //We balance per group instead of per table<a name="line.479"></a>
+<span class="sourceLineNo">480</span>      List&lt;RegionPlan&gt; plans = new ArrayList&lt;&gt;();<a name="line.480"></a>
+<span class="sourceLineNo">481</span>      for(Map.Entry&lt;TableName, Map&lt;ServerName, List&lt;RegionInfo&gt;&gt;&gt; tableMap:<a name="line.481"></a>
+<span class="sourceLineNo">482</span>          getRSGroupAssignmentsByTable(groupName).entrySet()) {<a name="line.482"></a>
+<span class="sourceLineNo">483</span>        LOG.info("Creating partial plan for table {} : {}", tableMap.getKey(), tableMap.getValue());<a name="line.483"></a>
+<span class="sourceLineNo">484</span>        List&lt;RegionPlan&gt; partialPlans = balancer.balanceCluster(tableMap.getValue());<a name="line.484"></a>
+<span class="sourceLineNo">485</span>        LOG.info("Partial plan for table {} : {}", tableMap.getKey(), partialPlans);<a name="line.485"></a>
+<span class="sourceLineNo">486</span>        if (partialPlans != null) {<a name="line.486"></a>
+<span class="sourceLineNo">487</span>          plans.addAll(partialPlans);<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>      boolean balancerRan = !plans.isEmpty();<a name="line.490"></a>
+<span class="sourceLineNo">491</span>      if (balancerRan) {<a name="line.491"></a>
+<span class="sourceLineNo">492</span>        LOG.info("RSGroup balance {} starting with plan count: {}", groupName, plans.size());<a name="line.492"></a>
+<span class="sourceLineNo">493</span>        master.executeRegionPlansWithThrottling(plans);<a name="line.493"></a>
+<span class="sourceLineNo">494</span>        LOG.info("RSGroup balance " + groupName + " completed");<a name="line.494"></a>
+<span class="sourceLineNo">495</span>      }<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      return balancerRan;<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><a name="line.499"></a>
+<span class="sourceLineNo">500</span>  @Override<a name="line.500"></a>
+<span class="sourceLineNo">501</span>  public List&lt;RSGroupInfo&gt; listRSGroups() throws IOException {<a name="line.501"></a>
+<span class="sourceLineNo">502</span>    return rsGroupInfoManager.listRSGroups();<a name="line.502"></a>
+<span class="sourceLineNo">503</span>  }<a name="line.503"></a>
+<span class="sourceLineNo">504</span><a name="line.504"></a>
+<span class="sourceLineNo">505</span>  @Override<a name="line.505"></a>
+<span class="sourceLineNo">506</span>  public RSGroupInfo getRSGroupOfServer(Address hostPort) throws IOException {<a name="line.506"></a>
+<span class="sourceLineNo">507</span>    return rsGroupInfoManager.getRSGroupOfServer(hostPort);<a name="line.507"></a>
+<span class="sourceLineNo">508</span>  }<a name="line.508"></a>
+<span class="sourceLineNo">509</span><a name="line.509"></a>
+<span class="sourceLineNo">510</span>  @Override<a name="line.510"></a>
+<span class="sourceLineNo">511</span>  public void moveServersAndTables(Set&lt;Address&gt; servers, Set&lt;TableName&gt; tables, String targetGroup)<a name="line.511"></a>
+<span class="sourceLineNo">512</span>      throws IOException {<a name="line.512"></a>
+<span class="sourceLineNo">513</span>    if (servers == null || servers.isEmpty()) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span>      throw new ConstraintException("The list of servers to move cannot be null or empty.");<a name="line.514"></a>
+<span class="sourceLineNo">515</span>    }<a name="line.515"></a>
+<span class="sourceLineNo">516</span>    if (tables == null || tables.isEmpty()) {<a name="line.516"></a>
+<span class="sourceLineNo">517</span>      throw new ConstraintException("The list of tables to move cannot be null or empty.");<a name="line.517"></a>
+<span class="sourceLineNo">518</span>    }<a name="line.518"></a>
+<span class="sourceLineNo">519</span><a name="line.519"></a>
+<span class="sourceLineNo">520</span>    //check target group<a name="line.520"></a>
+<span class="sourceLineNo">521</span>    getAndCheckRSGroupInfo(targetGroup);<a name="line.521"></a>
+<span class="sourceLineNo">522</span><a name="line.522"></a>
+<span class="sourceLineNo">523</span>    // Hold a lock on the manager instance while moving servers and tables to prevent<a name="line.523"></a>
+<span class="sourceLineNo">524</span>    // another writer changing our state while we are working.<a name="line.524"></a>
+<span class="sourceLineNo">525</span>    synchronized (rsGroupInfoManager) {<a name="line.525"></a>
+<span class="sourceLineNo">526</span>      //check servers and tables status<a name="line.526"></a>
+<span class="sourceLineNo">527</span>      checkServersAndTables(servers, tables, targetGroup);<a name="line.527"></a>
+<span class="sourceLineNo">528</span><a name="line.528"></a>
+<span class="sourceLineNo">529</span>      //Move servers and tables to a new group.<a name="line.529"></a>
+<span class="sourceLineNo">530</span>      String srcGroup = getRSGroupOfServer(servers.iterator().next()).getName();<a name="line.530"></a>
+<span class="sourceLineNo">531</span>      rsGroupInfoManager.moveServersAndTables(servers, tables, srcGroup, targetGroup);<a name="line.531"></a>
+<span class="sourceLineNo">532</span><a name="line.532"></a>
+<span class="sourceLineNo">533</span>      //move regions on these servers which do not belong to group tables<a name="line.533"></a>
+<span class="sourceLineNo">534</span>      moveServerRegionsFromGroup(servers, targetGroup);<a name="line.534"></a>
+<span class="sourceLineNo">535</span>      //move regions of these tables which are not on group servers<a name="line.535"></a>
+<span class="sourceLineNo">536</span>      moveTableRegionsToGroup(tables, targetGroup);<a name="line.536"></a>
+<span class="sourceLineNo">537</span>    }<a name="line.537"></a>
+<span class="sourceLineNo">538</span>    LOG.info("Move servers and tables done. Severs: {}, Tables: {} =&gt; {}", servers, tables,<a name="line.538"></a>
+<span class="sourceLineNo">539</span>        targetGroup);<a name="line.539"></a>
+<span class="sourceLineNo">540</span>  }<a name="line.540"></a>
+<span class="sourceLineNo">541</span><a name="line.541"></a>
+<span class="sourceLineNo">542</span>  @Override<a name="line.542"></a>
+<span class="sourceLineNo">543</span>  public void removeServers(Set&lt;Address&gt; servers) throws IOException {<a name="line.543"></a>
+<span class="sourceLineNo">544</span>    {<a name="line.544"></a>
+<span class="sourceLineNo">545</span>      if (servers == null || servers.isEmpty()) {<a name="line.545"></a>
+<span class="sourceLineNo">546</span>        throw new ConstraintException("The set of servers to remove cannot be null or empty.");<a name="line.546"></a>
+<span class="sourceLineNo">547</span>      }<a name="line.547"></a>
+<span class="sourceLineNo">548</span>      // Hold a lock on the manager instance while moving servers to prevent<a name="line.548"></a>
+<span class="sourceLineNo">549</span>      // another writer changing our state while we are working.<a name="line.549"></a>
+<span class="sourceLineNo">550</span>      synchronized (rsGroupInfoManager) {<a name="line.550"></a>
+<span class="sourceLineNo">551</span>        //check the set of servers<a name="line.551"></a>
+<span class="sourceLineNo">552</span>        checkForDeadOrOnlineServers(servers);<a name="line.552"></a>
+<span class="sourceLineNo">553</span>        rsGroupInfoManager.removeServers(servers);<a name="line.553"></a>
+<span class="sourceLineNo">554</span>        LOG.info("Remove decommissioned servers {} from RSGroup done", servers);<a name="line.554"></a>
+<span class="sourceLineNo">555</span>      }<a name="line.555"></a>
+<span class="sourceLineNo">556</span>    }<a name="line.556"></a>
+<span class="sourceLineNo">557</span>  }<a name="line.557"></a>
+<span class="sourceLineNo">558</span><a name="line.558"></a>
+<span class="sourceLineNo">559</span>  private Map&lt;String, RegionState&gt; rsGroupGetRegionsInTransition(String groupName)<a name="line.559"></a>
+<span class="sourceLineNo">560</span>      throws IOException {<a name="line.560"></a>
+<span class="sourceLineNo">561</span>    Map&lt;String, RegionState&gt; rit = Maps.newTreeMap();<a name="line.561"></a>
+<span class="sourceLineNo">562</span>    AssignmentManager am = master.getAssignmentManager();<a name="line.562"></a>
+<span class="sourceLineNo">563</span>    for(TableName tableName : getRSGroupInfo(groupName).getTables()) {<a name="line.563"></a>
+<span class="sourceLineNo">564</span>      for(RegionInfo regionInfo: am.getRegionStates().getRegionsOfTable(tableName)) {<a name="line.564"></a>
+<span class="sourceLineNo">565</span>        RegionState state = am.getRegionStates().getRegionTransitionState(regionInfo);<a name="line.565"></a>
+<span class="sourceLineNo">566</span>        if(state != null) {<a name="line.566"></a>
+<span class="sourceLineNo">567</span>          rit.put(regionInfo.getEncodedName(), state);<a name="line.567"></a>
+<span class="sourceLineNo">568</span>        }<a name="line.568"></a>
+<span class="sourceLineNo">569</span>      }<a name="line.569"></a>
+<span class="sourceLineNo">570</span>    }<a name="line.570"></a>
+<span class="sourceLineNo">571</span>    return rit;<a name="line.571"></a>
+<span class="sourceLineNo">572</span>  }<a name="line.572"></a>
+<span class="sourceLineNo">573</span><a name="line.573"></a>
+<span class="sourceLineNo">574</span>  private Map&lt;TableName, Map&lt;ServerName, List&lt;RegionInfo&gt;&gt;&gt;<a name="line.574"></a>
+<span class="sourceLineNo">575</span>      getRSGroupAssignmentsByTable(String groupName) throws IOException {<a name="line.575"></a>
+<span class="sourceLineNo">576</span>    Map&lt;TableName, Map&lt;ServerName, List&lt;RegionInfo&gt;&gt;&gt; result = Maps.newHashMap();<a name="line.576"></a>
+<span class="sourceLineNo">577</span>    RSGroupInfo rsGroupInfo = getRSGroupInfo(groupName);<a name="line.577"></a>
+<span class="sourceLineNo">578</span>    Map&lt;TableName, Map&lt;ServerName, List&lt;RegionInfo&gt;&gt;&gt; assignments = Maps.newHashMap();<a name="line.578"></a>
+<span class="sourceLineNo">579</span>    for(Map.Entry&lt;RegionInfo, ServerName&gt; entry:<a name="line.579"></a>
+<span class="sourceLineNo">580</span>        master.getAssignmentManager().getRegionStates().getRegionAssignments().entrySet()) {<a name="line.580"></a>
+<span class="sourceLineNo">581</span>      TableName currTable = entry.getKey().getTable();<a name="line.581"></a>
+<span class="sourceLineNo">582</span>      ServerName currServer = entry.getValue();<a name="line.582"></a>
+<span class="sourceLineNo">583</span>      RegionInfo currRegion = entry.getKey();<a name="line.583"></a>
+<span class="sourceLineNo">584</span>      if (rsGroupInfo.getTables().contains(currTable)) {<a name="line.584"></a>
+<span class="sourceLineNo">585</span>        assignments.computeIfAbsent(currTable, key -&gt; new HashMap&lt;&gt;())<a name="line.585"></a>
+<span class="sourceLineNo">586</span>            .computeIfAbsent(currServer, key -&gt; new ArrayList&lt;&gt;())<a name="line.586"></a>
+<span class="sourceLineNo">587</span>            .add(currRegion);<a name="line.587"></a>
+<span class="sourceLineNo">588</span>      }<a name="line.588"></a>
+<span class="sourceLineNo">589</span>    }<a name="line.589"></a>
+<span class="sourceLineNo">590</span><a name="line.590"></a>
+<span class="sourceLineNo">591</span>    Map&lt;ServerName, List&lt;RegionInfo&gt;&gt; serverMap = Maps.newHashMap();<a name="line.591"></a>
+<span class="sourceLineNo">592</span>    for(ServerName serverName: master.getServerManager().getOnlineServers().keySet()) {<a name="line.592"></a>
+<span class="sourceLineNo">593</span>      if(rsGroupInfo.getServers().contains(serverName.getAddress())) {<a name="line.593"></a>
+<span class="sourceLineNo">594</span>        serverMap.put(serverName, Collections.emptyList());<a name="line.594"></a>
+<span class="sourceLineNo">595</span>      }<a name="line.595"></a>
+<span class="sourceLineNo">596</span>    }<a name="line.596"></a>
+<span class="sourceLineNo">597</span><a name="line.597"></a>
+<span class="sourceLineNo">598</span>    // add all tables that are members of the group<a name="line.598"></a>
+<span class="sourceLineNo">599</span>    for (TableName tableName : rsGroupInfo.getTables()) {<a name="line.599"></a>
+<span class="sourceLineNo">600</span>      if (assignments.containsKey(tableName)) {<a name="line.600"></a>
+<span class="sourceLineNo">601</span>        Map&lt;ServerName, List&lt;RegionInfo&gt;&gt; tableResults = new HashMap&lt;&gt;(serverMap);<a name="line.601"></a>
+<span class="sourceLineNo">602</span><a name="line.602"></a>
+<span class="sourceLineNo">603</span>        Map&lt;ServerName, List&lt;RegionInfo&gt;&gt; tableAssignments = assignments.get(tableName);<a name="line.603"></a>
+<span class="sourceLineNo">604</span>        tableResults.putAll(tableAssignments);<a name="line.604"></a>
+<span class="sourceLineNo">605</span><a name="line.605"></a>
+<span class="sourceLineNo">606</span>        result.put(tableName, tableResults);<a name="line.606"></a>
+<span class="sourceLineNo">607</span><a name="line.607"></a>
+<span class="sourceLineNo">608</span>        LOG.debug("Adding assignments for {}: {}", tableName, tableAssignments);<a name="line.608"></a>
+<span class="sourceLineNo">609</span>      }<a name="line.609"></a>
+<span class="sourceLineNo">610</span>    }<a name="line.610"></a>
+<span class="sourceLineNo">611</span><a name="line.611"></a>
+<span class="sourceLineNo">612</span>    return result;<a name="line.612"></a>
+<span class="sourceLineNo">613</span>  }<a name="line.613"></a>
+<span class="sourceLineNo">614</span><a name="line.614"></a>
+<span class="sourceLineNo">615</span>  /**<a name="line.615"></a>
+<span class="sourceLineNo">616</span>   * Check if the set of servers are belong to dead servers list or online servers list.<a name="line.616"></a>
+<span class="sourceLineNo">617</span>   * @param servers servers to remove<a name="line.617"></a>
+<span class="sourceLineNo">618</span>   */<a name="line.618"></a>
+<span class="sourceLineNo">619</span>  private void checkForDeadOrOnlineServers(Set&lt;Address&gt; servers) throws ConstraintException {<a name="line.619"></a>
+<span class="sourceLineNo">620</span>    // This uglyness is because we only have Address, not ServerName.<a name="line.620"></a>
+<span class="sourceLineNo">621</span>    Set&lt;Address&gt; onlineServers = new HashSet&lt;&gt;();<a name="line.621"></a>
+<span class="sourceLineNo">622</span>    List&lt;ServerName&gt; drainingServers = master.getServerManager().getDrainingServersList();<a name="line.622"></a>
+<span class="sourceLineNo">623</span>    for (ServerName server : master.getServerManager().getOnlineServers().keySet()) {<a name="line.623"></a>
+<span class="sourceLineNo">624</span>      // Only online but not decommissioned servers are really online<a name="line.624"></a>
+<span class="sourceLineNo">625</span>      if (!drainingServers.contains(server)) {<a name="line.625"></a>
+<span class="sourceLineNo">626</span>        onlineServers.add(server.getAddress());<a name="line.626"></a>
+<span class="sourceLineNo">627</span>      }<a name="line.627"></a>
+<span class="sourceLineNo">628</span>    }<a name="line.628"></a>
+<span class="sourceLineNo">629</span><a name="line.629"></a>
+<span class="sourceLineNo">630</span>    Set&lt;Address&gt; deadServers = new HashSet&lt;&gt;();<a name="line.630"></a>
+<span class="sourceLineNo">631</span>    for(ServerName server: master.getServerManager().getDeadServers().copyServerNames()) {<a name="line.631"></a>
+<span class="sourceLineNo">632</span>      deadServers.add(server.getAddress());<a name="line.632"></a>
+<span class="sourceLineNo">633</span>    }<a name="line.633"></a>
+<span class="sourceLineNo">634</span><a name="line.634"></a>
+<span class="sourceLineNo">635</span>    for (Address address: servers) {<a name="line.635"></a>
+<span class="sourceLineNo">636</span>      if (onlineServers.contains(address)) {<a name="line.636"></a>
+<span class="sourceLineNo">637</span>        throw new ConstraintException(<a name="line.637"></a>
+<span class="sourceLineNo">638</span>            "Server " + address + " is an online server, not allowed to remove.");<a name="line.638"></a>
+<span class="sourceLineNo">639</span>      }<a name="line.639"></a>
+<span class="sourceLineNo">640</span>      if (deadServers.contains(address)) {<a name="line.640"></a>
+<span class="sourceLineNo">641</span>        throw new ConstraintException(<a name="line.641"></a>
+<span class="sourceLineNo">642</span>            "Server " + address + " is on the dead servers list,"<a name="line.642"></a>
+<span class="sourceLineNo">643</span>                + " Maybe it will come back again, not allowed to remove.");<a name="line.643"></a>
+<span class="sourceLineNo">644</span>      }<a name="line.644"></a>
+<span class="sourceLineNo">645</span>    }<a name="line.645"></a>
+<span class="sourceLineNo">646</span>  }<a name="line.646"></a>
+<span class="sourceLineNo">647</span>}<a name="line.647"></a>
 
 
 
diff --git a/downloads.html b/downloads.html
index a72548d..72bb21b 100644
--- a/downloads.html
+++ b/downloads.html
@@ -465,7 +465,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/export_control.html b/export_control.html
index de60624..70df1bf 100644
--- a/export_control.html
+++ b/export_control.html
@@ -197,7 +197,7 @@ for more details.</p>
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/index.html b/index.html
index cc40716..bd188f3 100644
--- a/index.html
+++ b/index.html
@@ -275,7 +275,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/issue-tracking.html b/issue-tracking.html
index 7e0a6a7..9e48e4e 100644
--- a/issue-tracking.html
+++ b/issue-tracking.html
@@ -169,7 +169,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/mail-lists.html b/mail-lists.html
index 6c6b1e0..64ffe1e 100644
--- a/mail-lists.html
+++ b/mail-lists.html
@@ -229,7 +229,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/metrics.html b/metrics.html
index 4e4a653..97eef19 100644
--- a/metrics.html
+++ b/metrics.html
@@ -325,7 +325,7 @@ export HBASE_REGIONSERVER_OPTS=&quot;$HBASE_JMX_OPTS -Dcom.sun.management.jmxrem
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/old_news.html b/old_news.html
index 463ad13..75a1cab 100644
--- a/old_news.html
+++ b/old_news.html
@@ -316,7 +316,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/plugin-management.html b/plugin-management.html
index bdea14f..436fae3 100644
--- a/plugin-management.html
+++ b/plugin-management.html
@@ -321,7 +321,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/plugins.html b/plugins.html
index 6bce909..11c4219 100644
--- a/plugins.html
+++ b/plugins.html
@@ -248,7 +248,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/poweredbyhbase.html b/poweredbyhbase.html
index 0df3c75..af172e0 100644
--- a/poweredbyhbase.html
+++ b/poweredbyhbase.html
@@ -650,7 +650,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/project-info.html b/project-info.html
index 4743893..3976a2b 100644
--- a/project-info.html
+++ b/project-info.html
@@ -210,7 +210,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/project-reports.html b/project-reports.html
index a10d8fa..c2147a6 100644
--- a/project-reports.html
+++ b/project-reports.html
@@ -186,7 +186,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/project-summary.html b/project-summary.html
index 7789e59..a5a2d0c 100644
--- a/project-summary.html
+++ b/project-summary.html
@@ -212,7 +212,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/pseudo-distributed.html b/pseudo-distributed.html
index da29740..acb979e 100644
--- a/pseudo-distributed.html
+++ b/pseudo-distributed.html
@@ -174,7 +174,7 @@ Running Apache HBase (TM) in pseudo-distributed mode
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/replication.html b/replication.html
index bd4ca20..52f2866 100644
--- a/replication.html
+++ b/replication.html
@@ -169,7 +169,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/resources.html b/resources.html
index 23ea9b0..cd0ae3e 100644
--- a/resources.html
+++ b/resources.html
@@ -197,7 +197,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/source-repository.html b/source-repository.html
index 6493c2d..f41d7d3 100644
--- a/source-repository.html
+++ b/source-repository.html
@@ -180,7 +180,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/sponsors.html b/sponsors.html
index 9e6b177..03741df 100644
--- a/sponsors.html
+++ b/sponsors.html
@@ -199,7 +199,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/supportingprojects.html b/supportingprojects.html
index 492861f..cc0cca9 100644
--- a/supportingprojects.html
+++ b/supportingprojects.html
@@ -390,7 +390,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/team-list.html b/team-list.html
index e376484..2dd9892 100644
--- a/team-list.html
+++ b/team-list.html
@@ -695,7 +695,7 @@
         <div class="row">
             <p>Copyright &copy;2007&#x2013;2020
 <a href="https://www.apache.org/">The Apache Software Foundation</a>.
-All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-07</li>
+All rights reserved.        <li id="publishDate" class="pull-right">Last Published: 2020-02-08</li>
 </p>
         </div>
         <p id="poweredBy" class="pull-right"><a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"><img class="builtBy" alt="Built by Maven" src="./images/logos/maven-feather.png" /></a>
diff --git a/testdevapidocs/allclasses-frame.html b/testdevapidocs/allclasses-frame.html
index 0521ffd..ef36faf 100644
--- a/testdevapidocs/allclasses-frame.html
+++ b/testdevapidocs/allclasses-frame.html
@@ -2241,6 +2241,7 @@
 <li><a href="org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase.html" title="class in org.apache.hadoop.hbase.rsgroup" target="classFrame">TestRSGroupsBase</a></li>
 <li><a href="org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase.CPMasterObserver.html" title="class in org.apache.hadoop.hbase.rsgroup" target="classFrame">TestRSGroupsBase.CPMasterObserver</a></li>
 <li><a href="org/apache/hadoop/hbase/rsgroup/TestRSGroupsBasics.html" title="class in org.apache.hadoop.hbase.rsgroup" target="classFrame">TestRSGroupsBasics</a></li>
+<li><a href="org/apache/hadoop/hbase/client/TestRSGroupShell.html" title="class in org.apache.hadoop.hbase.client" target="classFrame">TestRSGroupShell</a></li>
 <li><a href="org/apache/hadoop/hbase/rsgroup/TestRSGroupsKillRS.html" title="class in org.apache.hadoop.hbase.rsgroup" target="classFrame">TestRSGroupsKillRS</a></li>
 <li><a href="org/apache/hadoop/hbase/rsgroup/TestRSGroupsOfflineMode.html" title="class in org.apache.hadoop.hbase.rsgroup" target="classFrame">TestRSGroupsOfflineMode</a></li>
 <li><a href="org/apache/hadoop/hbase/rsgroup/TestRSGroupsWithACL.html" title="class in org.apache.hadoop.hbase.rsgroup" target="classFrame">TestRSGroupsWithACL</a></li>
diff --git a/testdevapidocs/allclasses-noframe.html b/testdevapidocs/allclasses-noframe.html
index 6f0cecd..9298444 100644
--- a/testdevapidocs/allclasses-noframe.html
+++ b/testdevapidocs/allclasses-noframe.html
@@ -2241,6 +2241,7 @@
 <li><a href="org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase.html" title="class in org.apache.hadoop.hbase.rsgroup">TestRSGroupsBase</a></li>
 <li><a href="org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase.CPMasterObserver.html" title="class in org.apache.hadoop.hbase.rsgroup">TestRSGroupsBase.CPMasterObserver</a></li>
 <li><a href="org/apache/hadoop/hbase/rsgroup/TestRSGroupsBasics.html" title="class in org.apache.hadoop.hbase.rsgroup">TestRSGroupsBasics</a></li>
+<li><a href="org/apache/hadoop/hbase/client/TestRSGroupShell.html" title="class in org.apache.hadoop.hbase.client">TestRSGroupShell</a></li>
 <li><a href="org/apache/hadoop/hbase/rsgroup/TestRSGroupsKillRS.html" title="class in org.apache.hadoop.hbase.rsgroup">TestRSGroupsKillRS</a></li>
 <li><a href="org/apache/hadoop/hbase/rsgroup/TestRSGroupsOfflineMode.html" title="class in org.apache.hadoop.hbase.rsgroup">TestRSGroupsOfflineMode</a></li>
 <li><a href="org/apache/hadoop/hbase/rsgroup/TestRSGroupsWithACL.html" title="class in org.apache.hadoop.hbase.rsgroup">TestRSGroupsWithACL</a></li>
diff --git a/testdevapidocs/index-all.html b/testdevapidocs/index-all.html
index f5a33eb..c9286ad 100644
--- a/testdevapidocs/index-all.html
+++ b/testdevapidocs/index-all.html
@@ -5039,6 +5039,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/TestRpcControllerFactory.html#CLASS_RULE">CLASS_RULE</a></span> - Static variable in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestRpcControllerFactory.html" title="class in org.apache.hadoop.hbase.client">TestRpcControllerFactory</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/TestRSGroupShell.html#CLASS_RULE">CLASS_RULE</a></span> - Static variable in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestRSGroupShell.html" title="class in org.apache.hadoop.hbase.client">TestRSGroupShell</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/TestScan.html#CLASS_RULE">CLASS_RULE</a></span> - Static variable in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestScan.html" title="class in org.apache.hadoop.hbase.client">TestScan</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/TestScannersFromClientSide.html#CLASS_RULE">CLASS_RULE</a></span> - Static variable in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestScannersFromClientSide.html" title="class in org.apache.hadoop.hbase.client">TestScannersFromClientSide</a></dt>
@@ -20804,6 +20806,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html#getScopes--">getScopes()</a></span> - Static method in class org.apache.hadoop.hbase.replication.regionserver.<a href="org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.html" title="class in org.apache.hadoop.hbase.replication.regionserver">TestWALEntryStream</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#getSCPPID-org.apache.hadoop.hbase.procedure2.ProcedureExecutor-">getSCPPID(ProcedureExecutor&lt;?&gt;)</a></span> - Method in class org.apache.hadoop.hbase.master.assignment.<a href="org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html" title="class in org.apache.hadoop.hbase.master.assignment">TestRaceBetweenSCPAndDTP</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/master/procedure/TestSCPBase.html#getSCPProcId-org.apache.hadoop.hbase.procedure2.ProcedureExecutor-">getSCPProcId(ProcedureExecutor&lt;?&gt;)</a></span> - Method in class org.apache.hadoop.hbase.master.procedure.<a href="org/apache/hadoop/hbase/master/procedure/TestSCPBase.html" title="class in org.apache.hadoop.hbase.master.procedure">TestSCPBase</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/TestReplicasClient.SlowMeCopro.html#getSecondaryCdl--">getSecondaryCdl()</a></span> - Static method in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestReplicasClient.SlowMeCopro.html" title="class in org.apache.hadoop.hbase.client">TestReplicasClient.SlowMeCopro</a></dt>
@@ -42018,6 +42022,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/TestResultSizeEstimation.html#setUpBeforeClass--">setUpBeforeClass()</a></span> - Static method in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestResultSizeEstimation.html" title="class in org.apache.hadoop.hbase.client">TestResultSizeEstimation</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/TestRSGroupShell.html#setUpBeforeClass--">setUpBeforeClass()</a></span> - Static method in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestRSGroupShell.html" title="class in org.apache.hadoop.hbase.client">TestRSGroupShell</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/TestScannersFromClientSide.html#setUpBeforeClass--">setUpBeforeClass()</a></span> - Static method in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestScannersFromClientSide.html" title="class in org.apache.hadoop.hbase.client">TestScannersFromClientSide</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/TestScannerTimeout.html#setUpBeforeClass--">setUpBeforeClass()</a></span> - Static method in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestScannerTimeout.html" title="class in org.apache.hadoop.hbase.client">TestScannerTimeout</a></dt>
@@ -42821,6 +42827,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.html#setupConf-org.apache.hadoop.conf.Configuration-">setupConf(Configuration)</a></span> - Method in class org.apache.hadoop.hbase.snapshot.<a href="org/apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.html" title="class in org.apache.hadoop.hbase.snapshot">TestRestoreSnapshotHelper</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpConfig--">setUpConfig()</a></span> - Static method in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/AbstractTestShell.html" title="class in org.apache.hadoop.hbase.client">AbstractTestShell</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.html#setupConfig-org.apache.hadoop.conf.Configuration-">setupConfig(Configuration)</a></span> - Method in class org.apache.hadoop.hbase.procedure2.store.wal.<a href="org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.html" title="class in org.apache.hadoop.hbase.procedure2.store.wal">TestWALProcedureStore</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/replication/TestReplicationBase.html#setupConfig-org.apache.hadoop.hbase.HBaseTestingUtility-java.lang.String-">setupConfig(HBaseTestingUtility, String)</a></span> - Static method in class org.apache.hadoop.hbase.replication.<a href="org/apache/hadoop/hbase/replication/TestReplicationBase.html" title="class in org.apache.hadoop.hbase.replication">TestReplicationBase</a></dt>
@@ -42873,6 +42881,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/backup/TestBackupBase.html#setupIsDone">setupIsDone</a></span> - Static variable in class org.apache.hadoop.hbase.backup.<a href="org/apache/hadoop/hbase/backup/TestBackupBase.html" title="class in org.apache.hadoop.hbase.backup">TestBackupBase</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpJRubyRuntime--">setUpJRubyRuntime()</a></span> - Static method in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/AbstractTestShell.html" title="class in org.apache.hadoop.hbase.client">AbstractTestShell</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html#setUpJumboCellChunkMap-boolean-">setUpJumboCellChunkMap(boolean)</a></span> - Method in class org.apache.hadoop.hbase.regionserver.<a href="org/apache/hadoop/hbase/regionserver/TestCellFlatSet.html" title="class in org.apache.hadoop.hbase.regionserver">TestCellFlatSet</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/coprocessor/TestSecureExport.html#setUpKdcServer--">setUpKdcServer()</a></span> - Static method in class org.apache.hadoop.hbase.coprocessor.<a href="org/apache/hadoop/hbase/coprocessor/TestSecureExport.html" title="class in org.apache.hadoop.hbase.coprocessor">TestSecureExport</a></dt>
@@ -67529,6 +67539,10 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/rsgroup/TestRSGroupsBasics.html#TestRSGroupsBasics--">TestRSGroupsBasics()</a></span> - Constructor for class org.apache.hadoop.hbase.rsgroup.<a href="org/apache/hadoop/hbase/rsgroup/TestRSGroupsBasics.html" title="class in org.apache.hadoop.hbase.rsgroup">TestRSGroupsBasics</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/apache/hadoop/hbase/client/TestRSGroupShell.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">TestRSGroupShell</span></a> - Class in <a href="org/apache/hadoop/hbase/client/package-summary.html">org.apache.hadoop.hbase.client</a></dt>
+<dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/TestRSGroupShell.html#TestRSGroupShell--">TestRSGroupShell()</a></span> - Constructor for class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestRSGroupShell.html" title="class in org.apache.hadoop.hbase.client">TestRSGroupShell</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/apache/hadoop/hbase/rsgroup/TestRSGroupsKillRS.html" title="class in org.apache.hadoop.hbase.rsgroup"><span class="typeNameLink">TestRSGroupsKillRS</span></a> - Class in <a href="org/apache/hadoop/hbase/rsgroup/package-summary.html">org.apache.hadoop.hbase.rsgroup</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/rsgroup/TestRSGroupsKillRS.html#TestRSGroupsKillRS--">TestRSGroupsKillRS()</a></span> - Constructor for class org.apache.hadoop.hbase.rsgroup.<a href="org/apache/hadoop/hbase/rsgroup/TestRSGroupsKillRS.html" title="class in org.apache.hadoop.hbase.rsgroup">TestRSGroupsKillRS</a></dt>
@@ -67610,6 +67624,8 @@
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/TestReplicationShell.html#testRunShellTests--">testRunShellTests()</a></span> - Method in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestReplicationShell.html" title="class in org.apache.hadoop.hbase.client">TestReplicationShell</a></dt>
 <dd>&nbsp;</dd>
+<dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/TestRSGroupShell.html#testRunShellTests--">testRunShellTests()</a></span> - Method in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestRSGroupShell.html" title="class in org.apache.hadoop.hbase.client">TestRSGroupShell</a></dt>
+<dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/TestShell.html#testRunShellTests--">testRunShellTests()</a></span> - Method in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestShell.html" title="class in org.apache.hadoop.hbase.client">TestShell</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="org/apache/hadoop/hbase/client/TestTableShell.html#testRunShellTests--">testRunShellTests()</a></span> - Method in class org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestTableShell.html" title="class in org.apache.hadoop.hbase.client">TestTableShell</a></dt>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/chaos/actions/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/chaos/actions/package-tree.html
index a579719..ce3b748 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/chaos/actions/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/chaos/actions/package-tree.html
@@ -163,8 +163,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/RollingBatchRestartRsAction.KillOrStart.html" title="enum in org.apache.hadoop.hbase.chaos.actions"><span class="typeNameLink">RollingBatchRestartRsAction.KillOrStart</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.chaos.actions.<a href="../../../../../../org/apache/hadoop/hbase/chaos/actions/RollingBatchSuspendResumeRsAction.SuspendOrResume.html" title="enum in org.apache.hadoop.hbase.chaos.actions"><span class="typeNameLink">RollingBatchSuspendResumeRsAction.SuspendOrResume</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.chaos.actions.<a href="../../../../../../org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsAction.KillOrStart.html" title="enum in org.apache.hadoop.hbase.chaos.actions"><span class="typeNameLink">RollingBatchRestartRsAction.KillOrStart</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html b/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html
index 0d3dee5..ecb7a4a 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/class-use/HBaseClassTestRule.html
@@ -1791,22 +1791,26 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><span class="typeNameLabel">TestQuotasShell.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestQuotasShell.html#CLASS_RULE">CLASS_RULE</a></span></code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">TestRSGroupShell.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestRSGroupShell.html#CLASS_RULE">CLASS_RULE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><span class="typeNameLabel">TestShell.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestShell.html#CLASS_RULE">CLASS_RULE</a></span></code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">TestQuotasShell.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestQuotasShell.html#CLASS_RULE">CLASS_RULE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><span class="typeNameLabel">TestAdminShell2.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestAdminShell2.html#CLASS_RULE">CLASS_RULE</a></span></code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">TestShell.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestShell.html#CLASS_RULE">CLASS_RULE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><span class="typeNameLabel">TestRpcControllerFactory.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestRpcControllerFactory.html#CLASS_RULE">CLASS_RULE</a></span></code>&nbsp;</td>
+<td class="colLast"><span class="typeNameLabel">TestAdminShell2.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestAdminShell2.html#CLASS_RULE">CLASS_RULE</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
+<td class="colLast"><span class="typeNameLabel">TestRpcControllerFactory.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestRpcControllerFactory.html#CLASS_RULE">CLASS_RULE</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
 <td class="colLast"><span class="typeNameLabel">TestAsyncAggregationClient.</span><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestAsyncAggregationClient.html#CLASS_RULE">CLASS_RULE</a></span></code>&nbsp;</td>
 </tr>
 </tbody>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/client/AbstractTestShell.html b/testdevapidocs/org/apache/hadoop/hbase/client/AbstractTestShell.html
index 7dad8eb..32fb059 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/client/AbstractTestShell.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/client/AbstractTestShell.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":9};
+var methods = {"i0":9,"i1":9,"i2":9,"i3":9};
 var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]};
 var altColor = "altColor";
 var rowColor = "rowColor";
@@ -109,11 +109,11 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <dl>
 <dt>Direct Known Subclasses:</dt>
-<dd><a href="../../../../../org/apache/hadoop/hbase/client/TestAdminShell.html" title="class in org.apache.hadoop.hbase.client">TestAdminShell</a>, <a href="../../../../../org/apache/hadoop/hbase/client/TestAdminShell2.html" title="class in org.apache.hadoop.hbase.client">TestAdminShell2</a>, <a href="../../../../../org/apache/hadoop/hbase/client/TestQuotasShell.html" title="class in org.apache.hadoop.hbase.client">TestQuotasShell</a>, <a href="../../../../../org/apache/hadoop/hbase/clie [...]
+<dd><a href="../../../../../org/apache/hadoop/hbase/client/TestAdminShell.html" title="class in org.apache.hadoop.hbase.client">TestAdminShell</a>, <a href="../../../../../org/apache/hadoop/hbase/client/TestAdminShell2.html" title="class in org.apache.hadoop.hbase.client">TestAdminShell2</a>, <a href="../../../../../org/apache/hadoop/hbase/client/TestQuotasShell.html" title="class in org.apache.hadoop.hbase.client">TestQuotasShell</a>, <a href="../../../../../org/apache/hadoop/hbase/clie [...]
 </dl>
 <hr>
 <br>
-<pre>public abstract class <a href="../../../../../src-html/org/apache/hadoop/hbase/client/AbstractTestShell.html#line.32">AbstractTestShell</a>
+<pre>public abstract class <a href="../../../../../src-html/org/apache/hadoop/hbase/client/AbstractTestShell.html#line.35">AbstractTestShell</a>
 extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang">Object</a></pre>
 </li>
 </ul>
@@ -178,6 +178,14 @@ 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/client/AbstractTestShell.html#setUpBeforeClass--">setUpBeforeClass</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
+<td class="colFirst"><code>protected static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpConfig--">setUpConfig</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>protected static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpJRubyRuntime--">setUpJRubyRuntime</a></span>()</code>&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#tearDownAfterClass--">tearDownAfterClass</a></span>()</code>&nbsp;</td>
 </tr>
@@ -209,7 +217,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>TEST_UTIL</h4>
-<pre>protected static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/AbstractTestShell.html#line.34">TEST_UTIL</a></pre>
+<pre>protected static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/AbstractTestShell.html#line.37">TEST_UTIL</a></pre>
 </li>
 </ul>
 <a name="jruby">
@@ -218,7 +226,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>jruby</h4>
-<pre>protected static final&nbsp;org.jruby.embed.ScriptingContainer <a href="../../../../../src-html/org/apache/hadoop/hbase/client/AbstractTestShell.html#line.35">jruby</a></pre>
+<pre>protected static final&nbsp;org.jruby.embed.ScriptingContainer <a href="../../../../../src-html/org/apache/hadoop/hbase/client/AbstractTestShell.html#line.38">jruby</a></pre>
 </li>
 </ul>
 </li>
@@ -235,7 +243,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>AbstractTestShell</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/AbstractTestShell.html#line.32">AbstractTestShell</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/AbstractTestShell.html#line.35">AbstractTestShell</a>()</pre>
 </li>
 </ul>
 </li>
@@ -246,13 +254,36 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <!--   -->
 </a>
 <h3>Method Detail</h3>
+<a name="setUpConfig--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setUpConfig</h4>
+<pre>protected static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/AbstractTestShell.html#line.40">setUpConfig</a>()
+                           throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<dl>
+<dt><span class="throwsLabel">Throws:</span></dt>
+<dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
+</dl>
+</li>
+</ul>
+<a name="setUpJRubyRuntime--">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>setUpJRubyRuntime</h4>
+<pre>protected static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/AbstractTestShell.html#line.58">setUpJRubyRuntime</a>()</pre>
+</li>
+</ul>
 <a name="setUpBeforeClass--">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>setUpBeforeClass</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/AbstractTestShell.html#line.38">setUpBeforeClass</a>()
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/AbstractTestShell.html#line.71">setUpBeforeClass</a>()
                              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -266,7 +297,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>tearDownAfterClass</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/AbstractTestShell.html#line.69">tearDownAfterClass</a>()
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/AbstractTestShell.html#line.88">tearDownAfterClass</a>()
                                throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/client/TestAdminShell.html b/testdevapidocs/org/apache/hadoop/hbase/client/TestAdminShell.html
index 79dc89b..6ca4739 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/client/TestAdminShell.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/client/TestAdminShell.html
@@ -187,7 +187,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html" title="class in org.apache.hadoop.hbase.client">AbstractTestShell</a></h3>
-<code><a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpBeforeClass--">setUpBeforeClass</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#tearDownAfterClass--">tearDownAfterClass</a></code></li>
+<code><a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpBeforeClass--">setUpBeforeClass</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpConfig--">setUpConfig</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpJRubyRuntime--">setUpJRubyRuntime</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#tearDownAfterClass--">tearDownAfterClass</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/testdevapidocs/org/apache/hadoop/hbase/client/TestAdminShell2.html b/testdevapidocs/org/apache/hadoop/hbase/client/TestAdminShell2.html
index d83ba7e..de1ee16 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/client/TestAdminShell2.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/client/TestAdminShell2.html
@@ -187,7 +187,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html" title="class in org.apache.hadoop.hbase.client">AbstractTestShell</a></h3>
-<code><a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpBeforeClass--">setUpBeforeClass</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#tearDownAfterClass--">tearDownAfterClass</a></code></li>
+<code><a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpBeforeClass--">setUpBeforeClass</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpConfig--">setUpConfig</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpJRubyRuntime--">setUpJRubyRuntime</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#tearDownAfterClass--">tearDownAfterClass</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/testdevapidocs/org/apache/hadoop/hbase/client/TestQuotasShell.html b/testdevapidocs/org/apache/hadoop/hbase/client/TestQuotasShell.html
index 66ac790..9a6a0ac 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/client/TestQuotasShell.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/client/TestQuotasShell.html
@@ -187,7 +187,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html" title="class in org.apache.hadoop.hbase.client">AbstractTestShell</a></h3>
-<code><a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpBeforeClass--">setUpBeforeClass</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#tearDownAfterClass--">tearDownAfterClass</a></code></li>
+<code><a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpBeforeClass--">setUpBeforeClass</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpConfig--">setUpConfig</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpJRubyRuntime--">setUpJRubyRuntime</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#tearDownAfterClass--">tearDownAfterClass</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/testdevapidocs/org/apache/hadoop/hbase/client/TestShellNoCluster.html b/testdevapidocs/org/apache/hadoop/hbase/client/TestRSGroupShell.html
similarity index 78%
copy from testdevapidocs/org/apache/hadoop/hbase/client/TestShellNoCluster.html
copy to testdevapidocs/org/apache/hadoop/hbase/client/TestRSGroupShell.html
index ab59b54..b710a43 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/client/TestShellNoCluster.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/client/TestRSGroupShell.html
@@ -4,7 +4,7 @@
 <head>
 <!-- Generated by javadoc -->
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>TestShellNoCluster (Apache HBase 3.0.0-SNAPSHOT Test API)</title>
+<title>TestRSGroupShell (Apache HBase 3.0.0-SNAPSHOT Test API)</title>
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
@@ -12,13 +12,13 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="TestShellNoCluster (Apache HBase 3.0.0-SNAPSHOT Test API)";
+            parent.document.title="TestRSGroupShell (Apache HBase 3.0.0-SNAPSHOT Test API)";
         }
     }
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":9,"i2":10};
+var methods = {"i0":9,"i1":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";
@@ -40,7 +40,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../../overview-summary.html">Overview</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/TestShellNoCluster.html">Use</a></li>
+<li><a href="class-use/TestRSGroupShell.html">Use</a></li>
 <li><a href="package-tree.html">Tree</a></li>
 <li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
 <li><a href="../../../../../index-all.html">Index</a></li>
@@ -49,12 +49,12 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/hadoop/hbase/client/TestShell.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/hadoop/hbase/client/TestSimpleRequestController.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/client/TestRpcControllerFactory.StaticRpcControllerFactory.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/client/TestScan.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/hadoop/hbase/client/TestShellNoCluster.html" target="_top">Frames</a></li>
-<li><a href="TestShellNoCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/hadoop/hbase/client/TestRSGroupShell.html" target="_top">Frames</a></li>
+<li><a href="TestRSGroupShell.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_top">
 <li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
@@ -93,7 +93,7 @@ var activeTableTab = "activeTableTab";
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="subTitle">org.apache.hadoop.hbase.client</div>
-<h2 title="Class TestShellNoCluster" class="title">Class TestShellNoCluster</h2>
+<h2 title="Class TestRSGroupShell" class="title">Class TestRSGroupShell</h2>
 </div>
 <div class="contentContainer">
 <ul class="inheritance">
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html" title="class in org.apache.hadoop.hbase.client">org.apache.hadoop.hbase.client.AbstractTestShell</a></li>
 <li>
 <ul class="inheritance">
-<li>org.apache.hadoop.hbase.client.TestShellNoCluster</li>
+<li>org.apache.hadoop.hbase.client.TestRSGroupShell</li>
 </ul>
 </li>
 </ul>
@@ -114,7 +114,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestShellNoCluster.html#line.34">TestShellNoCluster</a>
+<pre>public class <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestRSGroupShell.html#line.35">TestRSGroupShell</a>
 extends <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html" title="class in org.apache.hadoop.hbase.client">AbstractTestShell</a></pre>
 </li>
 </ul>
@@ -136,7 +136,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static <a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestShellNoCluster.html#CLASS_RULE">CLASS_RULE</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestRSGroupShell.html#CLASS_RULE">CLASS_RULE</a></span></code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
@@ -160,7 +160,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell
 <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/client/TestShellNoCluster.html#TestShellNoCluster--">TestShellNoCluster</a></span>()</code>&nbsp;</td>
+<td class="colOne"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestRSGroupShell.html#TestRSGroupShell--">TestRSGroupShell</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 </li>
@@ -179,18 +179,21 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestShellNoCluster.html#setUpBeforeClass--">setUpBeforeClass</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestRSGroupShell.html#setUpBeforeClass--">setUpBeforeClass</a></span>()</code>&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestShellNoCluster.html#tearDownAfterClass--">tearDownAfterClass</a></span>()</code>&nbsp;</td>
-</tr>
-<tr id="i2" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestShellNoCluster.html#testRunNoClusterShellTests--">testRunNoClusterShellTests</a></span>()</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../org/apache/hadoop/hbase/client/TestRSGroupShell.html#testRunShellTests--">testRunShellTests</a></span>()</code>&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.hadoop.hbase.client.AbstractTestShell">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html" title="class in org.apache.hadoop.hbase.client">AbstractTestShell</a></h3>
+<code><a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpConfig--">setUpConfig</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpJRubyRuntime--">setUpJRubyRuntime</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#tearDownAfterClass--">tearDownAfterClass</a></code></li>
+</ul>
+<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
@@ -217,7 +220,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell
 <ul class="blockListLast">
 <li class="blockList">
 <h4>CLASS_RULE</h4>
-<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestShellNoCluster.html#line.37">CLASS_RULE</a></pre>
+<pre>public static final&nbsp;<a href="../../../../../org/apache/hadoop/hbase/HBaseClassTestRule.html" title="class in org.apache.hadoop.hbase">HBaseClassTestRule</a> <a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestRSGroupShell.html#line.38">CLASS_RULE</a></pre>
 </li>
 </ul>
 </li>
@@ -228,13 +231,13 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="TestShellNoCluster--">
+<a name="TestRSGroupShell--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>TestShellNoCluster</h4>
-<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestShellNoCluster.html#line.34">TestShellNoCluster</a>()</pre>
+<h4>TestRSGroupShell</h4>
+<pre>public&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestRSGroupShell.html#line.35">TestRSGroupShell</a>()</pre>
 </li>
 </ul>
 </li>
@@ -251,7 +254,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell
 <ul class="blockList">
 <li class="blockList">
 <h4>setUpBeforeClass</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestShellNoCluster.html#line.41">setUpBeforeClass</a>()
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestRSGroupShell.html#line.42">setUpBeforeClass</a>()
                              throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
@@ -259,28 +262,14 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell
 </dl>
 </li>
 </ul>
-<a name="tearDownAfterClass--">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>tearDownAfterClass</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestShellNoCluster.html#line.54">tearDownAfterClass</a>()
-                               throws <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Exception.html?is-external=true" title="class or interface in java.lang">Exception</a></pre>
-<dl>
-<dt><span class="throwsLabel">Throws:</span></dt>
-<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="testRunNoClusterShellTests--">
+<a name="testRunShellTests--">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>testRunNoClusterShellTests</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestShellNoCluster.html#line.59">testRunNoClusterShellTests</a>()
-                                throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
+<h4>testRunShellTests</h4>
+<pre>public&nbsp;void&nbsp;<a href="../../../../../src-html/org/apache/hadoop/hbase/client/TestRSGroupShell.html#line.58">testRunShellTests</a>()
+                       throws <a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></pre>
 <dl>
 <dt><span class="throwsLabel">Throws:</span></dt>
 <dd><code><a href="https://docs.oracle.com/javase/8/docs/api/java/io/IOException.html?is-external=true" title="class or interface in java.io">IOException</a></code></dd>
@@ -306,7 +295,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell
 <li><a href="../../../../../overview-summary.html">Overview</a></li>
 <li><a href="package-summary.html">Package</a></li>
 <li class="navBarCell1Rev">Class</li>
-<li><a href="class-use/TestShellNoCluster.html">Use</a></li>
+<li><a href="class-use/TestRSGroupShell.html">Use</a></li>
 <li><a href="package-tree.html">Tree</a></li>
 <li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
 <li><a href="../../../../../index-all.html">Index</a></li>
@@ -315,12 +304,12 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/hadoop/hbase/client/TestShell.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/hadoop/hbase/client/TestSimpleRequestController.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/client/TestRpcControllerFactory.StaticRpcControllerFactory.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/client/TestScan.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
-<li><a href="../../../../../index.html?org/apache/hadoop/hbase/client/TestShellNoCluster.html" target="_top">Frames</a></li>
-<li><a href="TestShellNoCluster.html" target="_top">No&nbsp;Frames</a></li>
+<li><a href="../../../../../index.html?org/apache/hadoop/hbase/client/TestRSGroupShell.html" target="_top">Frames</a></li>
+<li><a href="TestRSGroupShell.html" target="_top">No&nbsp;Frames</a></li>
 </ul>
 <ul class="navList" id="allclasses_navbar_bottom">
 <li><a href="../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/client/TestReplicationShell.html b/testdevapidocs/org/apache/hadoop/hbase/client/TestReplicationShell.html
index 1fdc130..d3d74d7 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/client/TestReplicationShell.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/client/TestReplicationShell.html
@@ -187,7 +187,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html" title="class in org.apache.hadoop.hbase.client">AbstractTestShell</a></h3>
-<code><a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpBeforeClass--">setUpBeforeClass</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#tearDownAfterClass--">tearDownAfterClass</a></code></li>
+<code><a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpBeforeClass--">setUpBeforeClass</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpConfig--">setUpConfig</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpJRubyRuntime--">setUpJRubyRuntime</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#tearDownAfterClass--">tearDownAfterClass</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/testdevapidocs/org/apache/hadoop/hbase/client/TestRpcControllerFactory.StaticRpcControllerFactory.html b/testdevapidocs/org/apache/hadoop/hbase/client/TestRpcControllerFactory.StaticRpcControllerFactory.html
index 8a7ce6c..b146f7e 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/client/TestRpcControllerFactory.StaticRpcControllerFactory.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/client/TestRpcControllerFactory.StaticRpcControllerFactory.html
@@ -50,7 +50,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/hadoop/hbase/client/TestRpcControllerFactory.CountingRpcController.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/hadoop/hbase/client/TestScan.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/client/TestRSGroupShell.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/hadoop/hbase/client/TestRpcControllerFactory.StaticRpcControllerFactory.html" target="_top">Frames</a></li>
@@ -296,7 +296,7 @@ extends org.apache.hadoop.hbase.ipc.RpcControllerFactory</pre>
 <div class="subNav">
 <ul class="navList">
 <li><a href="../../../../../org/apache/hadoop/hbase/client/TestRpcControllerFactory.CountingRpcController.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../org/apache/hadoop/hbase/client/TestScan.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/client/TestRSGroupShell.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?org/apache/hadoop/hbase/client/TestRpcControllerFactory.StaticRpcControllerFactory.html" target="_top">Frames</a></li>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/client/TestScan.html b/testdevapidocs/org/apache/hadoop/hbase/client/TestScan.html
index e8cff21..140d77e 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/client/TestScan.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/client/TestScan.html
@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/hadoop/hbase/client/TestRpcControllerFactory.StaticRpcControllerFactory.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/client/TestRSGroupShell.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../org/apache/hadoop/hbase/client/TestScannersFromClientSide.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
@@ -355,7 +355,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../org/apache/hadoop/hbase/client/TestRpcControllerFactory.StaticRpcControllerFactory.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../org/apache/hadoop/hbase/client/TestRSGroupShell.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li><a href="../../../../../org/apache/hadoop/hbase/client/TestScannersFromClientSide.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
diff --git a/testdevapidocs/org/apache/hadoop/hbase/client/TestShell.html b/testdevapidocs/org/apache/hadoop/hbase/client/TestShell.html
index 7d54386..1a76b81 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/client/TestShell.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/client/TestShell.html
@@ -187,7 +187,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html" title="class in org.apache.hadoop.hbase.client">AbstractTestShell</a></h3>
-<code><a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpBeforeClass--">setUpBeforeClass</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#tearDownAfterClass--">tearDownAfterClass</a></code></li>
+<code><a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpBeforeClass--">setUpBeforeClass</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpConfig--">setUpConfig</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpJRubyRuntime--">setUpJRubyRuntime</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#tearDownAfterClass--">tearDownAfterClass</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/testdevapidocs/org/apache/hadoop/hbase/client/TestShellNoCluster.html b/testdevapidocs/org/apache/hadoop/hbase/client/TestShellNoCluster.html
index ab59b54..c0b98c3 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/client/TestShellNoCluster.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/client/TestShellNoCluster.html
@@ -191,6 +191,13 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell
 </tr>
 </table>
 <ul class="blockList">
+<li class="blockList"><a name="methods.inherited.from.class.org.apache.hadoop.hbase.client.AbstractTestShell">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html" title="class in org.apache.hadoop.hbase.client">AbstractTestShell</a></h3>
+<code><a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpConfig--">setUpConfig</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpJRubyRuntime--">setUpJRubyRuntime</a></code></li>
+</ul>
+<ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
 <!--   -->
 </a>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/client/TestTableShell.html b/testdevapidocs/org/apache/hadoop/hbase/client/TestTableShell.html
index 58febd0..59341cd 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/client/TestTableShell.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/client/TestTableShell.html
@@ -187,7 +187,7 @@ extends <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html" title="class in org.apache.hadoop.hbase.client">AbstractTestShell</a></h3>
-<code><a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpBeforeClass--">setUpBeforeClass</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#tearDownAfterClass--">tearDownAfterClass</a></code></li>
+<code><a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpBeforeClass--">setUpBeforeClass</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpConfig--">setUpConfig</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#setUpJRubyRuntime--">setUpJRubyRuntime</a>, <a href="../../../../../org/apache/hadoop/hbase/client/AbstractTestShell.html#tearDownAfterClass--">tearDownAfterClass</a></code></li>
 </ul>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.java.lang.Object">
diff --git a/testdevapidocs/org/apache/hadoop/hbase/client/class-use/AbstractTestShell.html b/testdevapidocs/org/apache/hadoop/hbase/client/class-use/AbstractTestShell.html
index 4e29c0b..1d23892 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/client/class-use/AbstractTestShell.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/client/class-use/AbstractTestShell.html
@@ -120,14 +120,18 @@
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/client/TestShell.html" title="class in org.apache.hadoop.hbase.client">TestShell</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/client/TestRSGroupShell.html" title="class in org.apache.hadoop.hbase.client">TestRSGroupShell</a></span></code>&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/client/TestShellNoCluster.html" title="class in org.apache.hadoop.hbase.client">TestShellNoCluster</a></span></code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/client/TestShell.html" title="class in org.apache.hadoop.hbase.client">TestShell</a></span></code>&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>class&nbsp;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/client/TestShellNoCluster.html" title="class in org.apache.hadoop.hbase.client">TestShellNoCluster</a></span></code>&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>class&nbsp;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/client/TestTableShell.html" title="class in org.apache.hadoop.hbase.client">TestTableShell</a></span></code>&nbsp;</td>
 </tr>
 </tbody>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/client/class-use/TestRSGroupShell.html b/testdevapidocs/org/apache/hadoop/hbase/client/class-use/TestRSGroupShell.html
new file mode 100644
index 0000000..8094847
--- /dev/null
+++ b/testdevapidocs/org/apache/hadoop/hbase/client/class-use/TestRSGroupShell.html
@@ -0,0 +1,125 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- NewPage -->
+<html lang="en">
+<head>
+<!-- Generated by javadoc -->
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Uses of Class org.apache.hadoop.hbase.client.TestRSGroupShell (Apache HBase 3.0.0-SNAPSHOT Test API)</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+</head>
+<body>
+<script type="text/javascript"><!--
+    try {
+        if (location.href.indexOf('is-external=true') == -1) {
+            parent.document.title="Uses of Class org.apache.hadoop.hbase.client.TestRSGroupShell (Apache HBase 3.0.0-SNAPSHOT Test API)";
+        }
+    }
+    catch(err) {
+    }
+//-->
+</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="topNav"><a name="navbar.top">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.top" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.top.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../../org/apache/hadoop/hbase/client/TestRSGroupShell.html" title="class in org.apache.hadoop.hbase.client">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../../../../../../overview-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?org/apache/hadoop/hbase/client/class-use/TestRSGroupShell.html" target="_top">Frames</a></li>
+<li><a href="TestRSGroupShell.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_top">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_top");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.top">
+<!--   -->
+</a></div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<div class="header">
+<h2 title="Uses of Class org.apache.hadoop.hbase.client.TestRSGroupShell" class="title">Uses of Class<br>org.apache.hadoop.hbase.client.TestRSGroupShell</h2>
+</div>
+<div class="classUseContainer">No usage of org.apache.hadoop.hbase.client.TestRSGroupShell</div>
+<!-- ======= START OF BOTTOM NAVBAR ====== -->
+<div class="bottomNav"><a name="navbar.bottom">
+<!--   -->
+</a>
+<div class="skipNav"><a href="#skip.navbar.bottom" title="Skip navigation links">Skip navigation links</a></div>
+<a name="navbar.bottom.firstrow">
+<!--   -->
+</a>
+<ul class="navList" title="Navigation">
+<li><a href="../../../../../../overview-summary.html">Overview</a></li>
+<li><a href="../package-summary.html">Package</a></li>
+<li><a href="../../../../../../org/apache/hadoop/hbase/client/TestRSGroupShell.html" title="class in org.apache.hadoop.hbase.client">Class</a></li>
+<li class="navBarCell1Rev">Use</li>
+<li><a href="../../../../../../overview-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html">Help</a></li>
+</ul>
+</div>
+<div class="subNav">
+<ul class="navList">
+<li>Prev</li>
+<li>Next</li>
+</ul>
+<ul class="navList">
+<li><a href="../../../../../../index.html?org/apache/hadoop/hbase/client/class-use/TestRSGroupShell.html" target="_top">Frames</a></li>
+<li><a href="TestRSGroupShell.html" target="_top">No&nbsp;Frames</a></li>
+</ul>
+<ul class="navList" id="allclasses_navbar_bottom">
+<li><a href="../../../../../../allclasses-noframe.html">All&nbsp;Classes</a></li>
+</ul>
+<div>
+<script type="text/javascript"><!--
+  allClassesLink = document.getElementById("allclasses_navbar_bottom");
+  if(window==top) {
+    allClassesLink.style.display = "block";
+  }
+  else {
+    allClassesLink.style.display = "none";
+  }
+  //-->
+</script>
+</div>
+<a name="skip.navbar.bottom">
+<!--   -->
+</a></div>
+<!-- ======== END OF BOTTOM NAVBAR ======= -->
+<p class="legalCopy"><small>Copyright &#169; 2007&#x2013;2020 <a href="https://www.apache.org/">The Apache Software Foundation</a>. All rights reserved.</small></p>
+</body>
+</html>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/client/package-frame.html b/testdevapidocs/org/apache/hadoop/hbase/client/package-frame.html
index 7a7662a..0a7811d 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/client/package-frame.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/client/package-frame.html
@@ -285,6 +285,7 @@
 <li><a href="TestRpcControllerFactory.html" title="class in org.apache.hadoop.hbase.client" target="classFrame">TestRpcControllerFactory</a></li>
 <li><a href="TestRpcControllerFactory.CountingRpcController.html" title="class in org.apache.hadoop.hbase.client" target="classFrame">TestRpcControllerFactory.CountingRpcController</a></li>
 <li><a href="TestRpcControllerFactory.StaticRpcControllerFactory.html" title="class in org.apache.hadoop.hbase.client" target="classFrame">TestRpcControllerFactory.StaticRpcControllerFactory</a></li>
+<li><a href="TestRSGroupShell.html" title="class in org.apache.hadoop.hbase.client" target="classFrame">TestRSGroupShell</a></li>
 <li><a href="TestScan.html" title="class in org.apache.hadoop.hbase.client" target="classFrame">TestScan</a></li>
 <li><a href="TestScannersFromClientSide.html" title="class in org.apache.hadoop.hbase.client" target="classFrame">TestScannersFromClientSide</a></li>
 <li><a href="TestScannersFromClientSide.LimitKVsReturnFilter.html" title="class in org.apache.hadoop.hbase.client" target="classFrame">TestScannersFromClientSide.LimitKVsReturnFilter</a></li>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/client/package-summary.html b/testdevapidocs/org/apache/hadoop/hbase/client/package-summary.html
index 1a6b290..399c74c 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/client/package-summary.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/client/package-summary.html
@@ -1337,65 +1337,69 @@
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestScan.html" title="class in org.apache.hadoop.hbase.client">TestScan</a></td>
+<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestRSGroupShell.html" title="class in org.apache.hadoop.hbase.client">TestRSGroupShell</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
+<td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestScan.html" title="class in org.apache.hadoop.hbase.client">TestScan</a></td>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestScannersFromClientSide.html" title="class in org.apache.hadoop.hbase.client">TestScannersFromClientSide</a></td>
 <td class="colLast">
 <div class="block">A client-side test, mostly testing scanners with various parameters.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestScannersFromClientSide.LimitKVsReturnFilter.html" title="class in org.apache.hadoop.hbase.client">TestScannersFromClientSide.LimitKVsReturnFilter</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestScannersFromClientSide2.html" title="class in org.apache.hadoop.hbase.client">TestScannersFromClientSide2</a></td>
 <td class="colLast">
 <div class="block">Testcase for newly added feature in HBASE-17143, such as startRow and stopRow
  inclusive/exclusive, limit for rows, etc.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestScannerTimeout.html" title="class in org.apache.hadoop.hbase.client">TestScannerTimeout</a></td>
 <td class="colLast">
 <div class="block">Test various scanner timeout issues.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestScanWithoutFetchingData.html" title="class in org.apache.hadoop.hbase.client">TestScanWithoutFetchingData</a></td>
 <td class="colLast">
 <div class="block">Testcase to make sure that we do not close scanners if ScanRequest.numberOfRows is zero.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestSeparateClientZKCluster.html" title="class in org.apache.hadoop.hbase.client">TestSeparateClientZKCluster</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestServerBusyException.html" title="class in org.apache.hadoop.hbase.client">TestServerBusyException</a></td>
 <td class="colLast">
 <div class="block">This class is for testing HBaseConnectionManager ServerBusyException.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestServerBusyException.SleepCoprocessor.html" title="class in org.apache.hadoop.hbase.client">TestServerBusyException.SleepCoprocessor</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestServerBusyException.SleepLongerAtFirstCoprocessor.html" title="class in org.apache.hadoop.hbase.client">TestServerBusyException.SleepLongerAtFirstCoprocessor</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestServerBusyException.TestGetThread.html" title="class in org.apache.hadoop.hbase.client">TestServerBusyException.TestGetThread</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestServerBusyException.TestPutThread.html" title="class in org.apache.hadoop.hbase.client">TestServerBusyException.TestPutThread</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestServerLoadDurability.html" title="class in org.apache.hadoop.hbase.client">TestServerLoadDurability</a></td>
 <td class="colLast">
 <div class="block">HBASE-19496 noticed that the RegionLoad/ServerLoad may be corrupted if rpc server
@@ -1403,127 +1407,127 @@
  invoke HMaster to iterate all stored server/region loads.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestShell.html" title="class in org.apache.hadoop.hbase.client">TestShell</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestShellNoCluster.html" title="class in org.apache.hadoop.hbase.client">TestShellNoCluster</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestSimpleRequestController.html" title="class in org.apache.hadoop.hbase.client">TestSimpleRequestController</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestSizeFailures.html" title="class in org.apache.hadoop.hbase.client">TestSizeFailures</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestSmallReversedScanner.html" title="class in org.apache.hadoop.hbase.client">TestSmallReversedScanner</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestSnapshotCloneIndependence.html" title="class in org.apache.hadoop.hbase.client">TestSnapshotCloneIndependence</a></td>
 <td class="colLast">
 <div class="block">Test to verify that the cloned table is independent of the table from which it was cloned</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestSnapshotDFSTemporaryDirectory.html" title="class in org.apache.hadoop.hbase.client">TestSnapshotDFSTemporaryDirectory</a></td>
 <td class="colLast">
 <div class="block">This class tests that the use of a temporary snapshot directory supports snapshot functionality
  while the temporary directory is on the same file system as the root directory</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestSnapshotFromClient.html" title="class in org.apache.hadoop.hbase.client">TestSnapshotFromClient</a></td>
 <td class="colLast">
 <div class="block">Test create/using/deleting snapshots from the client</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestSnapshotFromClientWithRegionReplicas.html" title="class in org.apache.hadoop.hbase.client">TestSnapshotFromClientWithRegionReplicas</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestSnapshotMetadata.html" title="class in org.apache.hadoop.hbase.client">TestSnapshotMetadata</a></td>
 <td class="colLast">
 <div class="block">Test class to verify that metadata is consistent before and after a snapshot attempt.</div>
 </td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestSnapshotTemporaryDirectory.html" title="class in org.apache.hadoop.hbase.client">TestSnapshotTemporaryDirectory</a></td>
 <td class="colLast">
 <div class="block">This class tests that the use of a temporary snapshot directory supports snapshot functionality
  while the temporary directory is on a different file system than the root directory</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestSnapshotTemporaryDirectoryWithRegionReplicas.html" title="class in org.apache.hadoop.hbase.client">TestSnapshotTemporaryDirectoryWithRegionReplicas</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestSnapshotWithAcl.html" title="class in org.apache.hadoop.hbase.client">TestSnapshotWithAcl</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestSnapshotWithAclAsyncAdmin.html" title="class in org.apache.hadoop.hbase.client">TestSnapshotWithAclAsyncAdmin</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestSplitOrMergeAtTableLevel.html" title="class in org.apache.hadoop.hbase.client">TestSplitOrMergeAtTableLevel</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestSplitOrMergeStatus.html" title="class in org.apache.hadoop.hbase.client">TestSplitOrMergeStatus</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestTableDescriptorBuilder.html" title="class in org.apache.hadoop.hbase.client">TestTableDescriptorBuilder</a></td>
 <td class="colLast">
 <div class="block">Test setting values in the descriptor.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestTableDescriptorUtils.html" title="class in org.apache.hadoop.hbase.client">TestTableDescriptorUtils</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestTableFavoredNodes.html" title="class in org.apache.hadoop.hbase.client">TestTableFavoredNodes</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestTableOperationException.html" title="class in org.apache.hadoop.hbase.client">TestTableOperationException</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestTableOperationException.ThrowDoNotRetryIOExceptionCoprocessor.html" title="class in org.apache.hadoop.hbase.client">TestTableOperationException.ThrowDoNotRetryIOExceptionCoprocessor</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestTableOperationException.ThrowIOExceptionCoprocessor.html" title="class in org.apache.hadoop.hbase.client">TestTableOperationException.ThrowIOExceptionCoprocessor</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestTableShell.html" title="class in org.apache.hadoop.hbase.client">TestTableShell</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestTableSnapshotScanner.html" title="class in org.apache.hadoop.hbase.client">TestTableSnapshotScanner</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestTimestampsFilter.html" title="class in org.apache.hadoop.hbase.client">TestTimestampsFilter</a></td>
 <td class="colLast">
 <div class="block">Run tests related to <code>TimestampsFilter</code> using HBase client APIs.</div>
 </td>
 </tr>
-<tr class="altColor">
+<tr class="rowColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestUpdateConfiguration.html" title="class in org.apache.hadoop.hbase.client">TestUpdateConfiguration</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
-<tr class="rowColor">
+<tr class="altColor">
 <td class="colFirst"><a href="../../../../../org/apache/hadoop/hbase/client/TestZKAsyncRegistry.html" title="class in org.apache.hadoop.hbase.client">TestZKAsyncRegistry</a></td>
 <td class="colLast">&nbsp;</td>
 </tr>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/client/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/client/package-tree.html
index baca59d..c0e92a9 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/client/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/client/package-tree.html
@@ -160,6 +160,7 @@
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/TestAdminShell2.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">TestAdminShell2</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/TestQuotasShell.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">TestQuotasShell</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/TestReplicationShell.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">TestReplicationShell</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/TestRSGroupShell.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">TestRSGroupShell</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/TestShell.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">TestShell</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/TestShellNoCluster.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">TestShellNoCluster</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="../../../../../org/apache/hadoop/hbase/client/TestTableShell.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">TestTableShell</span></a></li>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.AssignmentManagerForTest.html b/testdevapidocs/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.AssignmentManagerForTest.html
index c75840d..396c81d 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.AssignmentManagerForTest.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.AssignmentManagerForTest.html
@@ -118,7 +118,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>private static final class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.64">TestRaceBetweenSCPAndDTP.AssignmentManagerForTest</a>
+<pre>private static final class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.66">TestRaceBetweenSCPAndDTP.AssignmentManagerForTest</a>
 extends org.apache.hadoop.hbase.master.assignment.AssignmentManager</pre>
 </li>
 </ul>
@@ -224,7 +224,7 @@ extends org.apache.hadoop.hbase.master.assignment.AssignmentManager</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>AssignmentManagerForTest</h4>
-<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.AssignmentManagerForTest.html#line.66">AssignmentManagerForTest</a>(org.apache.hadoop.hbase.master.MasterServices&nbsp;master)</pre>
+<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.AssignmentManagerForTest.html#line.68">AssignmentManagerForTest</a>(org.apache.hadoop.hbase.master.MasterServices&nbsp;master)</pre>
 </li>
 </ul>
 </li>
@@ -241,7 +241,7 @@ extends org.apache.hadoop.hbase.master.assignment.AssignmentManager</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>createUnassignProceduresForDisabling</h4>
-<pre>public&nbsp;org.apache.hadoop.hbase.master.assignment.TransitRegionStateProcedure[]&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.AssignmentManagerForTest.html#line.71">createUnassignProceduresForDisabling</a>(org.apache.hadoop.hbase.TableName&nbsp;tableName)</pre>
+<pre>public&nbsp;org.apache.hadoop.hbase.master.assignment.TransitRegionStateProcedure[]&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.AssignmentManagerForTest.html#line.73">createUnassignProceduresForDisabling</a>(org.apache.hadoop.hbase.TableName&nbsp;tableName)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code>createUnassignProceduresForDisabling</code>&nbsp;in class&nbsp;<code>org.apache.hadoop.hbase.master.assignment.AssignmentManager</code></dd>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.HMasterForTest.html b/testdevapidocs/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.HMasterForTest.html
index c6914db..0b7d519 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.HMasterForTest.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.HMasterForTest.html
@@ -132,7 +132,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>public static final class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.85">TestRaceBetweenSCPAndDTP.HMasterForTest</a>
+<pre>public static final class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.87">TestRaceBetweenSCPAndDTP.HMasterForTest</a>
 extends org.apache.hadoop.hbase.master.HMaster</pre>
 </li>
 </ul>
@@ -301,7 +301,7 @@ extends org.apache.hadoop.hbase.master.HMaster</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>HMasterForTest</h4>
-<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.HMasterForTest.html#line.87">HMasterForTest</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)
+<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.HMasterForTest.html#line.89">HMasterForTest</a>(org.apache.hadoop.conf.Configuration&nbsp;conf)
                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>,
                       org.apache.zookeeper.KeeperException</pre>
 <dl>
@@ -325,7 +325,7 @@ extends org.apache.hadoop.hbase.master.HMaster</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>createAssignmentManager</h4>
-<pre>protected&nbsp;org.apache.hadoop.hbase.master.assignment.AssignmentManager&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.HMasterForTest.html#line.92">createAssignmentManager</a>(org.apache.hadoop.hbase.master.MasterServices&nbsp;master)</pre>
+<pre>protected&nbsp;org.apache.hadoop.hbase.master.assignment.AssignmentManager&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.HMasterForTest.html#line.94">createAssignmentManager</a>(org.apache.hadoop.hbase.master.MasterServices&nbsp;master)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
 <dd><code>createAssignmentManager</code>&nbsp;in class&nbsp;<code>org.apache.hadoop.hbase.master.HMaster</code></dd>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html b/testdevapidocs/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html
index de04503..5599571 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html
@@ -18,7 +18,7 @@
     catch(err) {
     }
 //-->
-var methods = {"i0":9,"i1":9,"i2":10};
+var methods = {"i0":10,"i1":9,"i2":9,"i3":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/assignment/TestRaceBetweenSCPAndDTP.html#line.48">TestRaceBetweenSCPAndDTP</a>
+<pre>public class <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.51">TestRaceBetweenSCPAndDTP</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">Testcase for HBASE-23636.</div>
 </li>
@@ -210,14 +210,18 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
+<td class="colFirst"><code>private long</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#getSCPPID-org.apache.hadoop.hbase.procedure2.ProcedureExecutor-">getSCPPID</a></span>(org.apache.hadoop.hbase.procedure2.ProcedureExecutor&lt;?&gt;&nbsp;e)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#setUp--">setUp</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr id="i2" class="altColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="../../../../../../org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#tearDown--">tearDown</a></span>()</code>&nbsp;</td>
 </tr>
-<tr id="i2" class="altColor">
+<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/assignment/TestRaceBetweenSCPAndDTP.html#test--">test</a></span>()</code>&nbsp;</td>
 </tr>
@@ -249,7 +253,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/assignment/TestRaceBetweenSCPAndDTP.html#line.51">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/assignment/TestRaceBetweenSCPAndDTP.html#line.53">CLASS_RULE</a></pre>
 </li>
 </ul>
 <a name="UTIL">
@@ -258,7 +262,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>UTIL</h4>
-<pre>private static final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.54">UTIL</a></pre>
+<pre>private static final&nbsp;<a href="../../../../../../org/apache/hadoop/hbase/HBaseTestingUtility.html" title="class in org.apache.hadoop.hbase">HBaseTestingUtility</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.56">UTIL</a></pre>
 </li>
 </ul>
 <a name="NAME">
@@ -267,7 +271,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>NAME</h4>
-<pre>private static&nbsp;org.apache.hadoop.hbase.TableName <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.56">NAME</a></pre>
+<pre>private static&nbsp;org.apache.hadoop.hbase.TableName <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.58">NAME</a></pre>
 </li>
 </ul>
 <a name="CF">
@@ -276,7 +280,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>CF</h4>
-<pre>private static&nbsp;byte[] <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.58">CF</a></pre>
+<pre>private static&nbsp;byte[] <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.60">CF</a></pre>
 </li>
 </ul>
 <a name="ARRIVE_GET_REGIONS_ON_TABLE">
@@ -285,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>ARRIVE_GET_REGIONS_ON_TABLE</h4>
-<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CountDownLatch.html?is-external=true" title="class or interface in java.util.concurrent">CountDownLatch</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.60">ARRIVE_GET_REGIONS_ON_TABLE</a></pre>
+<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CountDownLatch.html?is-external=true" title="class or interface in java.util.concurrent">CountDownLatch</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.62">ARRIVE_GET_REGIONS_ON_TABLE</a></pre>
 </li>
 </ul>
 <a name="RESUME_GET_REGIONS_ON_SERVER">
@@ -294,7 +298,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>RESUME_GET_REGIONS_ON_SERVER</h4>
-<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CountDownLatch.html?is-external=true" title="class or interface in java.util.concurrent">CountDownLatch</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.62">RESUME_GET_REGIONS_ON_SERVER</a></pre>
+<pre>private static&nbsp;<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/CountDownLatch.html?is-external=true" title="class or interface in java.util.concurrent">CountDownLatch</a> <a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.64">RESUME_GET_REGIONS_ON_SERVER</a></pre>
 </li>
 </ul>
 </li>
@@ -311,7 +315,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TestRaceBetweenSCPAndDTP</h4>
-<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.48">TestRaceBetweenSCPAndDTP</a>()</pre>
+<pre>public&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.51">TestRaceBetweenSCPAndDTP</a>()</pre>
 </li>
 </ul>
 </li>
@@ -328,7 +332,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>setUp</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.98">setUp</a>()
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.100">setUp</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>
@@ -342,7 +346,7 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>tearDown</h4>
-<pre>public static&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.107">tearDown</a>()
+<pre>public static&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.109">tearDown</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>
@@ -353,10 +357,10 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <a name="test--">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>test</h4>
-<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.112">test</a>()
+<pre>public&nbsp;void&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.114">test</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>
@@ -364,6 +368,19 @@ extends <a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 </dl>
 </li>
 </ul>
+<a name="getSCPPID-org.apache.hadoop.hbase.procedure2.ProcedureExecutor-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getSCPPID</h4>
+<pre>private&nbsp;long&nbsp;<a href="../../../../../../src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html#line.146">getSCPPID</a>(org.apache.hadoop.hbase.procedure2.ProcedureExecutor&lt;?&gt;&nbsp;e)</pre>
+<dl>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Returns <code>Procedure.NO_PROC_ID</code> if no SCP found else actual pid.</dd>
+</dl>
+</li>
+</ul>
 </li>
 </ul>
 </li>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
index 7917444..d56a970 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/package-tree.html
@@ -603,15 +603,15 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true [...]
 <ul>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterManager.ServiceType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClusterManager.ServiceType</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.CommandProvider.Operation</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.Service</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ResourceChecker.Phase.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ResourceChecker.Phase</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.ACTION.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">IntegrationTestDDLMasterFailover.ACTION</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/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/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/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.RoleCommand</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/ClusterManager.ServiceType.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">ClusterManager.ServiceType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.Service.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.Service</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.Stat.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">IntegrationTestRegionReplicaPerf.Stat</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/PerformanceEvaluation.Counter.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">PerformanceEvaluation.Counter</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/HBaseClusterManager.CommandProvider.Operation.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">HBaseClusterManager.CommandProvider.Operation</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.<a href="../../../../org/apache/hadoop/hbase/RESTApiClusterManager.RoleCommand.html" title="enum in org.apache.hadoop.hbase"><span class="typeNameLink">RESTApiClusterManager.RoleCommand</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html
index c6bce5f..8ff917c 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure/package-tree.html
@@ -81,14 +81,14 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Object</span></a>
 <ul>
-<li type="circle">org.apache.hadoop.hbase.procedure2.Procedure&lt;TEnvironment&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;)
+<li type="circle">org.apache.hadoop.hbase.procedure.Procedure (implements java.util.concurrent.<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Callable.html?is-external=true" title="class or interface in java.util.concurrent">Callable</a>&lt;V&gt;, org.apache.hadoop.hbase.errorhandling.ForeignExceptionListener)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedureDescriber.TestProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedureDescriber.TestProcedure</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedure.LatchedProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedure.LatchedProcedure</span></a></li>
 </ul>
 </li>
-<li type="circle">org.apache.hadoop.hbase.procedure.Procedure (implements java.util.concurrent.<a href="https://docs.oracle.com/javase/8/docs/api/java/util/concurrent/Callable.html?is-external=true" title="class or interface in java.util.concurrent">Callable</a>&lt;V&gt;, org.apache.hadoop.hbase.errorhandling.ForeignExceptionListener)
+<li type="circle">org.apache.hadoop.hbase.procedure2.Procedure&lt;TEnvironment&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;)
 <ul>
-<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedure.LatchedProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedure.LatchedProcedure</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.procedure.<a href="../../../../../org/apache/hadoop/hbase/procedure/TestProcedureDescriber.TestProcedure.html" title="class in org.apache.hadoop.hbase.procedure"><span class="typeNameLink">TestProcedureDescriber.TestProcedure</span></a></li>
 </ul>
 </li>
 <li type="circle">org.apache.hadoop.hbase.procedure.ProcedureManager
diff --git a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
index ab85021..16561bb 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/procedure2/package-tree.html
@@ -241,10 +241,10 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true [...]
 <ul>
+<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestStateMachineProcedure.TestSMProcedureState</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestYieldProcedures.TestStateMachineProcedure.State.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestYieldProcedures.TestStateMachineProcedure.State</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/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>
-<li type="circle">org.apache.hadoop.hbase.procedure2.<a href="../../../../../org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html" title="enum in org.apache.hadoop.hbase.procedure2"><span class="typeNameLink">TestStateMachineProcedure.TestSMProcedureState</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
index a0e2067..b92e573 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/regionserver/package-tree.html
@@ -721,11 +721,11 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true [...]
 <ul>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.Manipulation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DataBlockEncodingTool.Manipulation</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestAtomicOperation.TestStep.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestAtomicOperation.TestStep</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.CacheOnWriteType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestCacheOnWriteInSchema.CacheOnWriteType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestRegionServerReadRequestMetrics.Metric.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestRegionServerReadRequestMetrics.Metric</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestMultiLogThreshold.ActionType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestMultiLogThreshold.ActionType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/DataBlockEncodingTool.Manipulation.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">DataBlockEncodingTool.Manipulation</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.CacheOnWriteType.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestCacheOnWriteInSchema.CacheOnWriteType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.regionserver.<a href="../../../../../org/apache/hadoop/hbase/regionserver/TestAtomicOperation.TestStep.html" title="enum in org.apache.hadoop.hbase.regionserver"><span class="typeNameLink">TestAtomicOperation.TestStep</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
index 8f29a7c..254dc65 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/test/package-tree.html
@@ -254,9 +254,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.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.Counters.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestWithCellVisibilityLoadAndVerify.Counters</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.test.<a href="../../../../../org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.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/IntegrationTestBigLinkedList.Verify.Counts.html" title="enum in org.apache.hadoop.hbase.test"><span class="typeNameLink">IntegrationTestBigLinkedList.Verify.Counts</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
index da87dd9..a8b0f08 100644
--- a/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
+++ b/testdevapidocs/org/apache/hadoop/hbase/wal/package-tree.html
@@ -163,9 +163,9 @@
 <ul>
 <li type="circle">java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Enum.html?is-external=true" title="class or interface in java.lang"><span class="typeNameLink">Enum</span></a>&lt;E&gt; (implements java.lang.<a href="https://docs.oracle.com/javase/8/docs/api/java/lang/Comparable.html?is-external=true" title="class or interface in java.lang">Comparable</a>&lt;T&gt;, java.io.<a href="https://docs.oracle.com/javase/8/docs/api/java/io/Serializable.html?is-external=true [...]
 <ul>
-<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">TestWALSplit.Corruptions</span></a></li>
-<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/FaultyFSLog.FailureType.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">FaultyFSLog.FailureType</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/IOTestProvider.AllowedOperations.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">IOTestProvider.AllowedOperations</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/FaultyFSLog.FailureType.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">FaultyFSLog.FailureType</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.wal.<a href="../../../../../org/apache/hadoop/hbase/wal/TestWALSplit.Corruptions.html" title="enum in org.apache.hadoop.hbase.wal"><span class="typeNameLink">TestWALSplit.Corruptions</span></a></li>
 </ul>
 </li>
 </ul>
diff --git a/testdevapidocs/overview-tree.html b/testdevapidocs/overview-tree.html
index 0d489d9..60cef97 100644
--- a/testdevapidocs/overview-tree.html
+++ b/testdevapidocs/overview-tree.html
@@ -516,6 +516,7 @@
 <li type="circle">org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestAdminShell2.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">TestAdminShell2</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestQuotasShell.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">TestQuotasShell</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestReplicationShell.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">TestReplicationShell</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestRSGroupShell.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">TestRSGroupShell</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestShell.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">TestShell</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestShellNoCluster.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">TestShellNoCluster</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.client.<a href="org/apache/hadoop/hbase/client/TestTableShell.html" title="class in org.apache.hadoop.hbase.client"><span class="typeNameLink">TestTableShell</span></a></li>
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/AbstractTestShell.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/AbstractTestShell.html
index 172e334..4b4e4db 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/AbstractTestShell.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/AbstractTestShell.html
@@ -25,59 +25,78 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.client;<a name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import java.util.ArrayList;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import java.util.List;<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.HBaseTestingUtility;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.HConstants;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.security.access.SecureTestUtil;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.security.visibility.VisibilityTestUtil;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.jruby.embed.ScriptingContainer;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.junit.AfterClass;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.junit.BeforeClass;<a name="line.30"></a>
-<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>public abstract class AbstractTestShell {<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>  protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.34"></a>
-<span class="sourceLineNo">035</span>  protected final static ScriptingContainer jruby = new ScriptingContainer();<a name="line.35"></a>
+<span class="sourceLineNo">020</span>import java.io.IOException;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import java.util.ArrayList;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.List;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.hadoop.conf.Configuration;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.HConstants;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.rsgroup.RSGroupAdminEndpoint;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.rsgroup.RSGroupBasedLoadBalancer;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.security.access.SecureTestUtil;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.security.visibility.VisibilityTestUtil;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.jruby.embed.ScriptingContainer;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.junit.AfterClass;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.junit.BeforeClass;<a name="line.33"></a>
+<span class="sourceLineNo">034</span><a name="line.34"></a>
+<span class="sourceLineNo">035</span>public abstract class AbstractTestShell {<a name="line.35"></a>
 <span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span>  @BeforeClass<a name="line.37"></a>
-<span class="sourceLineNo">038</span>  public static void setUpBeforeClass() throws Exception {<a name="line.38"></a>
-<span class="sourceLineNo">039</span>    // Start mini cluster<a name="line.39"></a>
-<span class="sourceLineNo">040</span>    TEST_UTIL.getConfiguration().setInt("hbase.regionserver.msginterval", 100);<a name="line.40"></a>
-<span class="sourceLineNo">041</span>    TEST_UTIL.getConfiguration().setInt("hbase.client.pause", 250);<a name="line.41"></a>
-<span class="sourceLineNo">042</span>    TEST_UTIL.getConfiguration().setBoolean("hbase.quota.enabled", true);<a name="line.42"></a>
-<span class="sourceLineNo">043</span>    TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 6);<a name="line.43"></a>
-<span class="sourceLineNo">044</span>    TEST_UTIL.getConfiguration().setBoolean(CoprocessorHost.ABORT_ON_ERROR_KEY, false);<a name="line.44"></a>
-<span class="sourceLineNo">045</span>    TEST_UTIL.getConfiguration().setInt("hfile.format.version", 3);<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span>    // Below settings are necessary for task monitor test.<a name="line.47"></a>
-<span class="sourceLineNo">048</span>    TEST_UTIL.getConfiguration().setInt(HConstants.MASTER_INFO_PORT, 0);<a name="line.48"></a>
-<span class="sourceLineNo">049</span>    TEST_UTIL.getConfiguration().setInt(HConstants.REGIONSERVER_INFO_PORT, 0);<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    TEST_UTIL.getConfiguration().setBoolean(HConstants.REGIONSERVER_INFO_PORT_AUTO, true);<a name="line.50"></a>
-<span class="sourceLineNo">051</span>    // Security setup configuration<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    SecureTestUtil.enableSecurity(TEST_UTIL.getConfiguration());<a name="line.52"></a>
-<span class="sourceLineNo">053</span>    VisibilityTestUtil.enableVisiblityLabels(TEST_UTIL.getConfiguration());<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>    TEST_UTIL.startMiniCluster();<a name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span>    // Configure jruby runtime<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    List&lt;String&gt; loadPaths = new ArrayList&lt;&gt;(2);<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    loadPaths.add("src/main/ruby");<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    loadPaths.add("src/test/ruby");<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    jruby.setLoadPaths(loadPaths);<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    jruby.put("$TEST_CLUSTER", TEST_UTIL);<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    System.setProperty("jruby.jit.logging.verbose", "true");<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    System.setProperty("jruby.jit.logging", "true");<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    System.setProperty("jruby.native.verbose", "true");<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>  @AfterClass<a name="line.68"></a>
-<span class="sourceLineNo">069</span>  public static void tearDownAfterClass() throws Exception {<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    TEST_UTIL.shutdownMiniCluster();<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  }<a name="line.71"></a>
-<span class="sourceLineNo">072</span>}<a name="line.72"></a>
+<span class="sourceLineNo">037</span>  protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.37"></a>
+<span class="sourceLineNo">038</span>  protected final static ScriptingContainer jruby = new ScriptingContainer();<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span>  protected static void setUpConfig() throws IOException {<a name="line.40"></a>
+<span class="sourceLineNo">041</span>    Configuration conf = TEST_UTIL.getConfiguration();<a name="line.41"></a>
+<span class="sourceLineNo">042</span>    conf.setInt("hbase.regionserver.msginterval", 100);<a name="line.42"></a>
+<span class="sourceLineNo">043</span>    conf.setInt("hbase.client.pause", 250);<a name="line.43"></a>
+<span class="sourceLineNo">044</span>    conf.setBoolean("hbase.quota.enabled", true);<a name="line.44"></a>
+<span class="sourceLineNo">045</span>    conf.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 6);<a name="line.45"></a>
+<span class="sourceLineNo">046</span>    conf.setBoolean(CoprocessorHost.ABORT_ON_ERROR_KEY, false);<a name="line.46"></a>
+<span class="sourceLineNo">047</span>    conf.setInt("hfile.format.version", 3);<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span>    // Below settings are necessary for task monitor test.<a name="line.49"></a>
+<span class="sourceLineNo">050</span>    conf.setInt(HConstants.MASTER_INFO_PORT, 0);<a name="line.50"></a>
+<span class="sourceLineNo">051</span>    conf.setInt(HConstants.REGIONSERVER_INFO_PORT, 0);<a name="line.51"></a>
+<span class="sourceLineNo">052</span>    conf.setBoolean(HConstants.REGIONSERVER_INFO_PORT_AUTO, true);<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    // Security setup configuration<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    SecureTestUtil.enableSecurity(conf);<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    VisibilityTestUtil.enableVisiblityLabels(conf);<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>  protected static void setUpJRubyRuntime() {<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    // Configure jruby runtime<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    List&lt;String&gt; loadPaths = new ArrayList&lt;&gt;(2);<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    loadPaths.add("src/main/ruby");<a name="line.61"></a>
+<span class="sourceLineNo">062</span>    loadPaths.add("src/test/ruby");<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    jruby.setLoadPaths(loadPaths);<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    jruby.put("$TEST_CLUSTER", TEST_UTIL);<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    System.setProperty("jruby.jit.logging.verbose", "true");<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    System.setProperty("jruby.jit.logging", "true");<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    System.setProperty("jruby.native.verbose", "true");<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>  @BeforeClass<a name="line.70"></a>
+<span class="sourceLineNo">071</span>  public static void setUpBeforeClass() throws Exception {<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    setUpConfig();<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span>    // enable rs group<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    TEST_UTIL.getConfiguration().set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY,<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      TEST_UTIL.getConfiguration().get(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY) + "," +<a name="line.76"></a>
+<span class="sourceLineNo">077</span>        RSGroupAdminEndpoint.class.getName());<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    TEST_UTIL.getConfiguration().set(HConstants.HBASE_MASTER_LOADBALANCER_CLASS,<a name="line.78"></a>
+<span class="sourceLineNo">079</span>      RSGroupBasedLoadBalancer.class.getName());<a name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span>    // Start mini cluster<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    TEST_UTIL.startMiniCluster(1);<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span>    setUpJRubyRuntime();<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  }<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span>  @AfterClass<a name="line.87"></a>
+<span class="sourceLineNo">088</span>  public static void tearDownAfterClass() throws Exception {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>    TEST_UTIL.shutdownMiniCluster();<a name="line.89"></a>
+<span class="sourceLineNo">090</span>  }<a name="line.90"></a>
+<span class="sourceLineNo">091</span>}<a name="line.91"></a>
 
 
 
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestRSGroupShell.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestRSGroupShell.html
new file mode 100644
index 0000000..2c9efb7
--- /dev/null
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestRSGroupShell.html
@@ -0,0 +1,135 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
+<span class="sourceLineNo">002</span> * Licensed to the Apache Software Foundation (ASF) under one<a name="line.2"></a>
+<span class="sourceLineNo">003</span> * or more contributor license agreements.  See the NOTICE file<a name="line.3"></a>
+<span class="sourceLineNo">004</span> * distributed with this work for additional information<a name="line.4"></a>
+<span class="sourceLineNo">005</span> * regarding copyright ownership.  The ASF licenses this file<a name="line.5"></a>
+<span class="sourceLineNo">006</span> * to you under the Apache License, Version 2.0 (the<a name="line.6"></a>
+<span class="sourceLineNo">007</span> * "License"); you may not use this file except in compliance<a name="line.7"></a>
+<span class="sourceLineNo">008</span> * with the License.  You may obtain a copy of the License at<a name="line.8"></a>
+<span class="sourceLineNo">009</span> *<a name="line.9"></a>
+<span class="sourceLineNo">010</span> *     http://www.apache.org/licenses/LICENSE-2.0<a name="line.10"></a>
+<span class="sourceLineNo">011</span> *<a name="line.11"></a>
+<span class="sourceLineNo">012</span> * Unless required by applicable law or agreed to in writing, software<a name="line.12"></a>
+<span class="sourceLineNo">013</span> * distributed under the License is distributed on an "AS IS" BASIS,<a name="line.13"></a>
+<span class="sourceLineNo">014</span> * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.<a name="line.14"></a>
+<span class="sourceLineNo">015</span> * See the License for the specific language governing permissions and<a name="line.15"></a>
+<span class="sourceLineNo">016</span> * limitations under the License.<a name="line.16"></a>
+<span class="sourceLineNo">017</span> */<a name="line.17"></a>
+<span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.client;<a name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>import java.io.IOException;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import org.apache.hadoop.hbase.HConstants;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.rsgroup.RSGroupAdminEndpoint;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.rsgroup.RSGroupBasedLoadBalancer;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.testclassification.ClientTests;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.jruby.embed.PathType;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.junit.BeforeClass;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.junit.ClassRule;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.junit.Test;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.junit.experimental.categories.Category;<a name="line.32"></a>
+<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">034</span>@Category({ ClientTests.class, LargeTests.class })<a name="line.34"></a>
+<span class="sourceLineNo">035</span>public class TestRSGroupShell extends AbstractTestShell {<a name="line.35"></a>
+<span class="sourceLineNo">036</span><a name="line.36"></a>
+<span class="sourceLineNo">037</span>  @ClassRule<a name="line.37"></a>
+<span class="sourceLineNo">038</span>  public static final HBaseClassTestRule CLASS_RULE =<a name="line.38"></a>
+<span class="sourceLineNo">039</span>    HBaseClassTestRule.forClass(TestRSGroupShell.class);<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span>  @BeforeClass<a name="line.41"></a>
+<span class="sourceLineNo">042</span>  public static void setUpBeforeClass() throws Exception {<a name="line.42"></a>
+<span class="sourceLineNo">043</span>    setUpConfig();<a name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span>    // enable rs group<a name="line.45"></a>
+<span class="sourceLineNo">046</span>    TEST_UTIL.getConfiguration().set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY,<a name="line.46"></a>
+<span class="sourceLineNo">047</span>      TEST_UTIL.getConfiguration().get(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY) + "," +<a name="line.47"></a>
+<span class="sourceLineNo">048</span>        RSGroupAdminEndpoint.class.getName());<a name="line.48"></a>
+<span class="sourceLineNo">049</span>    TEST_UTIL.getConfiguration().set(HConstants.HBASE_MASTER_LOADBALANCER_CLASS,<a name="line.49"></a>
+<span class="sourceLineNo">050</span>      RSGroupBasedLoadBalancer.class.getName());<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span>    TEST_UTIL.startMiniCluster(3);<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span>    setUpJRubyRuntime();<a name="line.54"></a>
+<span class="sourceLineNo">055</span>  }<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>  @Test<a name="line.57"></a>
+<span class="sourceLineNo">058</span>  public void testRunShellTests() throws IOException {<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    System.setProperty("shell.test.include", "rsgroup_shell_test.rb");<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    // Start all ruby tests<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    jruby.runScriptlet(PathType.ABSOLUTE, "src/test/ruby/tests_runner.rb");<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>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.AssignmentManagerForTest.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.AssignmentManagerForTest.html
index cd7d032..3b2d886 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.AssignmentManagerForTest.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.AssignmentManagerForTest.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> * Licensed to the Apache Software Foundation (ASF) under one<a name="line.2"></a>
 <span class="sourceLineNo">003</span> * or more contributor license agreements.  See the NOTICE file<a name="line.3"></a>
 <span class="sourceLineNo">004</span> * distributed with this work for additional information<a name="line.4"></a>
@@ -26,125 +26,137 @@
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.master.assignment;<a name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
 <span class="sourceLineNo">020</span>import java.io.IOException;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import java.util.concurrent.CountDownLatch;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.hadoop.conf.Configuration;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.HConstants;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.ServerName;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.TableName;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.master.HMaster;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.master.procedure.DisableTableProcedure;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.master.procedure.ServerCrashProcedure;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.zookeeper.KeeperException;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.junit.AfterClass;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.junit.BeforeClass;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.junit.ClassRule;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.junit.Test;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.junit.experimental.categories.Category;<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> * Testcase for HBASE-23636.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> */<a name="line.46"></a>
-<span class="sourceLineNo">047</span>@Category({ MasterTests.class, MediumTests.class })<a name="line.47"></a>
-<span class="sourceLineNo">048</span>public class TestRaceBetweenSCPAndDTP {<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>  @ClassRule<a name="line.50"></a>
-<span class="sourceLineNo">051</span>  public static final HBaseClassTestRule CLASS_RULE =<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    HBaseClassTestRule.forClass(TestRaceBetweenSCPAndDTP.class);<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span>  private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.54"></a>
+<span class="sourceLineNo">021</span>import java.util.Optional;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.concurrent.CountDownLatch;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.hadoop.conf.Configuration;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<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.ServerName;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.TableName;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.master.HMaster;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.master.procedure.DisableTableProcedure;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.master.procedure.ServerCrashProcedure;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.util.Threads;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.zookeeper.KeeperException;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.junit.AfterClass;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.junit.BeforeClass;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.junit.ClassRule;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.junit.Test;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.junit.experimental.categories.Category;<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>/**<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * Testcase for HBASE-23636.<a name="line.48"></a>
+<span class="sourceLineNo">049</span> */<a name="line.49"></a>
+<span class="sourceLineNo">050</span>@Category({ MasterTests.class, MediumTests.class })<a name="line.50"></a>
+<span class="sourceLineNo">051</span>public class TestRaceBetweenSCPAndDTP {<a name="line.51"></a>
+<span class="sourceLineNo">052</span>  @ClassRule<a name="line.52"></a>
+<span class="sourceLineNo">053</span>  public static final HBaseClassTestRule CLASS_RULE =<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    HBaseClassTestRule.forClass(TestRaceBetweenSCPAndDTP.class);<a name="line.54"></a>
 <span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span>  private static TableName NAME = TableName.valueOf("Race");<a name="line.56"></a>
+<span class="sourceLineNo">056</span>  private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.56"></a>
 <span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>  private static byte[] CF = Bytes.toBytes("cf");<a name="line.58"></a>
+<span class="sourceLineNo">058</span>  private static TableName NAME = TableName.valueOf("Race");<a name="line.58"></a>
 <span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>  private static CountDownLatch ARRIVE_GET_REGIONS_ON_TABLE;<a name="line.60"></a>
+<span class="sourceLineNo">060</span>  private static byte[] CF = Bytes.toBytes("cf");<a name="line.60"></a>
 <span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>  private static CountDownLatch RESUME_GET_REGIONS_ON_SERVER;<a name="line.62"></a>
+<span class="sourceLineNo">062</span>  private static CountDownLatch ARRIVE_GET_REGIONS_ON_TABLE;<a name="line.62"></a>
 <span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>  private static final class AssignmentManagerForTest extends AssignmentManager {<a name="line.64"></a>
+<span class="sourceLineNo">064</span>  private static CountDownLatch RESUME_GET_REGIONS_ON_SERVER;<a name="line.64"></a>
 <span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>    public AssignmentManagerForTest(MasterServices master) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span>      super(master);<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>    @Override<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    public TransitRegionStateProcedure[] createUnassignProceduresForDisabling(TableName tableName) {<a name="line.71"></a>
-<span class="sourceLineNo">072</span>      if (ARRIVE_GET_REGIONS_ON_TABLE != null) {<a name="line.72"></a>
-<span class="sourceLineNo">073</span>        ARRIVE_GET_REGIONS_ON_TABLE.countDown();<a name="line.73"></a>
-<span class="sourceLineNo">074</span>        ARRIVE_GET_REGIONS_ON_TABLE = null;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>        try {<a name="line.75"></a>
-<span class="sourceLineNo">076</span>          RESUME_GET_REGIONS_ON_SERVER.await();<a name="line.76"></a>
-<span class="sourceLineNo">077</span>        } catch (InterruptedException e) {<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>      TransitRegionStateProcedure[] procs = super.createUnassignProceduresForDisabling(tableName);<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      return procs;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    }<a name="line.82"></a>
-<span class="sourceLineNo">083</span>  }<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span>  public static final class HMasterForTest extends HMaster {<a name="line.85"></a>
+<span class="sourceLineNo">066</span>  private static final class AssignmentManagerForTest extends AssignmentManager {<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span>    public AssignmentManagerForTest(MasterServices master) {<a name="line.68"></a>
+<span class="sourceLineNo">069</span>      super(master);<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 TransitRegionStateProcedure[] createUnassignProceduresForDisabling(TableName tableName) {<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      if (ARRIVE_GET_REGIONS_ON_TABLE != null) {<a name="line.74"></a>
+<span class="sourceLineNo">075</span>        ARRIVE_GET_REGIONS_ON_TABLE.countDown();<a name="line.75"></a>
+<span class="sourceLineNo">076</span>        ARRIVE_GET_REGIONS_ON_TABLE = null;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>        try {<a name="line.77"></a>
+<span class="sourceLineNo">078</span>          RESUME_GET_REGIONS_ON_SERVER.await();<a name="line.78"></a>
+<span class="sourceLineNo">079</span>        } catch (InterruptedException e) {<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>      TransitRegionStateProcedure[] procs = super.createUnassignProceduresForDisabling(tableName);<a name="line.82"></a>
+<span class="sourceLineNo">083</span>      return procs;<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    }<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  }<a name="line.85"></a>
 <span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span>    public HMasterForTest(Configuration conf) throws IOException, KeeperException {<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      super(conf);<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>    @Override<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    protected AssignmentManager createAssignmentManager(MasterServices master) {<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      return new AssignmentManagerForTest(master);<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    }<a name="line.94"></a>
-<span class="sourceLineNo">095</span>  }<a name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span>  @BeforeClass<a name="line.97"></a>
-<span class="sourceLineNo">098</span>  public static void setUp() throws Exception {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    UTIL.getConfiguration().setClass(HConstants.MASTER_IMPL, HMasterForTest.class, HMaster.class);<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    UTIL.startMiniCluster(2);<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    UTIL.createTable(NAME, CF);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    UTIL.waitTableAvailable(NAME);<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    UTIL.getAdmin().balancerSwitch(false, true);<a name="line.103"></a>
-<span class="sourceLineNo">104</span>  }<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span>  @AfterClass<a name="line.106"></a>
-<span class="sourceLineNo">107</span>  public static void tearDown() throws Exception {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    UTIL.shutdownMiniCluster();<a name="line.108"></a>
-<span class="sourceLineNo">109</span>  }<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span>  @Test<a name="line.111"></a>
-<span class="sourceLineNo">112</span>  public void test() throws Exception {<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    RegionInfo region = UTIL.getMiniHBaseCluster().getRegions(NAME).get(0).getRegionInfo();<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    AssignmentManager am = UTIL.getMiniHBaseCluster().getMaster().getAssignmentManager();<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    ServerName sn = am.getRegionStates().getRegionState(region).getServerName();<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>    ARRIVE_GET_REGIONS_ON_TABLE = new CountDownLatch(1);<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    RESUME_GET_REGIONS_ON_SERVER = new CountDownLatch(1);<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>    UTIL.getAdmin().disableTableAsync(NAME);<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    ARRIVE_GET_REGIONS_ON_TABLE.await();<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span>    UTIL.getMiniHBaseCluster().stopRegionServer(sn);<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    // Wait ServerCrashProcedure to init.<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    Thread.sleep(1000);<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    ProcedureExecutor&lt;?&gt; procExec =<a name="line.126"></a>
-<span class="sourceLineNo">127</span>        UTIL.getMiniHBaseCluster().getMaster().getMasterProcedureExecutor();<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    long scpProcId =<a name="line.128"></a>
-<span class="sourceLineNo">129</span>        procExec.getProcedures().stream().filter(p -&gt; p instanceof ServerCrashProcedure)<a name="line.129"></a>
-<span class="sourceLineNo">130</span>            .map(p -&gt; (ServerCrashProcedure) p).findAny().get().getProcId();<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    UTIL.waitFor(60000, () -&gt; procExec.isFinished(scpProcId));<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    RESUME_GET_REGIONS_ON_SERVER.countDown();<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span>    long dtpProcId =<a name="line.134"></a>
-<span class="sourceLineNo">135</span>        procExec.getProcedures().stream().filter(p -&gt; p instanceof DisableTableProcedure)<a name="line.135"></a>
-<span class="sourceLineNo">136</span>            .map(p -&gt; (DisableTableProcedure) p).findAny().get().getProcId();<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    UTIL.waitFor(60000, () -&gt; procExec.isFinished(dtpProcId));<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">087</span>  public static final class HMasterForTest extends HMaster {<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span>    public HMasterForTest(Configuration conf) throws IOException, KeeperException {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      super(conf);<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>    @Override<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    protected AssignmentManager createAssignmentManager(MasterServices master) {<a name="line.94"></a>
+<span class="sourceLineNo">095</span>      return new AssignmentManagerForTest(master);<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    }<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  }<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>  @BeforeClass<a name="line.99"></a>
+<span class="sourceLineNo">100</span>  public static void setUp() throws Exception {<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    UTIL.getConfiguration().setClass(HConstants.MASTER_IMPL, HMasterForTest.class, HMaster.class);<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    UTIL.startMiniCluster(2);<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    UTIL.createTable(NAME, CF);<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    UTIL.waitTableAvailable(NAME);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    UTIL.getAdmin().balancerSwitch(false, true);<a name="line.105"></a>
+<span class="sourceLineNo">106</span>  }<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span>  @AfterClass<a name="line.108"></a>
+<span class="sourceLineNo">109</span>  public static void tearDown() throws Exception {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    UTIL.shutdownMiniCluster();<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 test() throws Exception {<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    RegionInfo region = UTIL.getMiniHBaseCluster().getRegions(NAME).get(0).getRegionInfo();<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    AssignmentManager am = UTIL.getMiniHBaseCluster().getMaster().getAssignmentManager();<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    ServerName sn = am.getRegionStates().getRegionState(region).getServerName();<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span>    ARRIVE_GET_REGIONS_ON_TABLE = new CountDownLatch(1);<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    RESUME_GET_REGIONS_ON_SERVER = new CountDownLatch(1);<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span>    UTIL.getAdmin().disableTableAsync(NAME);<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    ARRIVE_GET_REGIONS_ON_TABLE.await();<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span>    ProcedureExecutor&lt;?&gt; procExec =<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      UTIL.getMiniHBaseCluster().getMaster().getMasterProcedureExecutor();<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    UTIL.getMiniHBaseCluster().stopRegionServer(sn);<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    long pid = Procedure.NO_PROC_ID;<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    do {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      Threads.sleep(1);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>      pid = getSCPPID(procExec);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    } while (pid != Procedure.NO_PROC_ID);<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    final long scppid = pid;<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    UTIL.waitFor(60000, () -&gt; procExec.isFinished(scppid));<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    RESUME_GET_REGIONS_ON_SERVER.countDown();<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span>    long dtpProcId =<a name="line.137"></a>
+<span class="sourceLineNo">138</span>        procExec.getProcedures().stream().filter(p -&gt; p instanceof DisableTableProcedure)<a name="line.138"></a>
+<span class="sourceLineNo">139</span>            .map(p -&gt; (DisableTableProcedure) p).findAny().get().getProcId();<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    UTIL.waitFor(60000, () -&gt; procExec.isFinished(dtpProcId));<a name="line.140"></a>
+<span class="sourceLineNo">141</span>  }<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span>  /**<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   * @return Returns {@link Procedure#NO_PROC_ID} if no SCP found else actual pid.<a name="line.144"></a>
+<span class="sourceLineNo">145</span>   */<a name="line.145"></a>
+<span class="sourceLineNo">146</span>  private long getSCPPID(ProcedureExecutor&lt;?&gt; e) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    Optional&lt;ServerCrashProcedure&gt; optional = e.getProcedures().stream().<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      filter(p -&gt; p instanceof ServerCrashProcedure).map(p -&gt; (ServerCrashProcedure) p).findAny();<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    return optional.isPresent()? optional.get().getProcId(): Procedure.NO_PROC_ID;<a name="line.149"></a>
+<span class="sourceLineNo">150</span>  }<a name="line.150"></a>
+<span class="sourceLineNo">151</span>}<a name="line.151"></a>
 
 
 
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.HMasterForTest.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.HMasterForTest.html
index cd7d032..3b2d886 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.HMasterForTest.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.HMasterForTest.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> * Licensed to the Apache Software Foundation (ASF) under one<a name="line.2"></a>
 <span class="sourceLineNo">003</span> * or more contributor license agreements.  See the NOTICE file<a name="line.3"></a>
 <span class="sourceLineNo">004</span> * distributed with this work for additional information<a name="line.4"></a>
@@ -26,125 +26,137 @@
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.master.assignment;<a name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
 <span class="sourceLineNo">020</span>import java.io.IOException;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import java.util.concurrent.CountDownLatch;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.hadoop.conf.Configuration;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.HConstants;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.ServerName;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.TableName;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.master.HMaster;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.master.procedure.DisableTableProcedure;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.master.procedure.ServerCrashProcedure;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.zookeeper.KeeperException;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.junit.AfterClass;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.junit.BeforeClass;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.junit.ClassRule;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.junit.Test;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.junit.experimental.categories.Category;<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> * Testcase for HBASE-23636.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> */<a name="line.46"></a>
-<span class="sourceLineNo">047</span>@Category({ MasterTests.class, MediumTests.class })<a name="line.47"></a>
-<span class="sourceLineNo">048</span>public class TestRaceBetweenSCPAndDTP {<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>  @ClassRule<a name="line.50"></a>
-<span class="sourceLineNo">051</span>  public static final HBaseClassTestRule CLASS_RULE =<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    HBaseClassTestRule.forClass(TestRaceBetweenSCPAndDTP.class);<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span>  private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.54"></a>
+<span class="sourceLineNo">021</span>import java.util.Optional;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.concurrent.CountDownLatch;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.hadoop.conf.Configuration;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<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.ServerName;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.TableName;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.master.HMaster;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.master.procedure.DisableTableProcedure;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.master.procedure.ServerCrashProcedure;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.util.Threads;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.zookeeper.KeeperException;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.junit.AfterClass;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.junit.BeforeClass;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.junit.ClassRule;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.junit.Test;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.junit.experimental.categories.Category;<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>/**<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * Testcase for HBASE-23636.<a name="line.48"></a>
+<span class="sourceLineNo">049</span> */<a name="line.49"></a>
+<span class="sourceLineNo">050</span>@Category({ MasterTests.class, MediumTests.class })<a name="line.50"></a>
+<span class="sourceLineNo">051</span>public class TestRaceBetweenSCPAndDTP {<a name="line.51"></a>
+<span class="sourceLineNo">052</span>  @ClassRule<a name="line.52"></a>
+<span class="sourceLineNo">053</span>  public static final HBaseClassTestRule CLASS_RULE =<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    HBaseClassTestRule.forClass(TestRaceBetweenSCPAndDTP.class);<a name="line.54"></a>
 <span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span>  private static TableName NAME = TableName.valueOf("Race");<a name="line.56"></a>
+<span class="sourceLineNo">056</span>  private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.56"></a>
 <span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>  private static byte[] CF = Bytes.toBytes("cf");<a name="line.58"></a>
+<span class="sourceLineNo">058</span>  private static TableName NAME = TableName.valueOf("Race");<a name="line.58"></a>
 <span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>  private static CountDownLatch ARRIVE_GET_REGIONS_ON_TABLE;<a name="line.60"></a>
+<span class="sourceLineNo">060</span>  private static byte[] CF = Bytes.toBytes("cf");<a name="line.60"></a>
 <span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>  private static CountDownLatch RESUME_GET_REGIONS_ON_SERVER;<a name="line.62"></a>
+<span class="sourceLineNo">062</span>  private static CountDownLatch ARRIVE_GET_REGIONS_ON_TABLE;<a name="line.62"></a>
 <span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>  private static final class AssignmentManagerForTest extends AssignmentManager {<a name="line.64"></a>
+<span class="sourceLineNo">064</span>  private static CountDownLatch RESUME_GET_REGIONS_ON_SERVER;<a name="line.64"></a>
 <span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>    public AssignmentManagerForTest(MasterServices master) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span>      super(master);<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>    @Override<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    public TransitRegionStateProcedure[] createUnassignProceduresForDisabling(TableName tableName) {<a name="line.71"></a>
-<span class="sourceLineNo">072</span>      if (ARRIVE_GET_REGIONS_ON_TABLE != null) {<a name="line.72"></a>
-<span class="sourceLineNo">073</span>        ARRIVE_GET_REGIONS_ON_TABLE.countDown();<a name="line.73"></a>
-<span class="sourceLineNo">074</span>        ARRIVE_GET_REGIONS_ON_TABLE = null;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>        try {<a name="line.75"></a>
-<span class="sourceLineNo">076</span>          RESUME_GET_REGIONS_ON_SERVER.await();<a name="line.76"></a>
-<span class="sourceLineNo">077</span>        } catch (InterruptedException e) {<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>      TransitRegionStateProcedure[] procs = super.createUnassignProceduresForDisabling(tableName);<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      return procs;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    }<a name="line.82"></a>
-<span class="sourceLineNo">083</span>  }<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span>  public static final class HMasterForTest extends HMaster {<a name="line.85"></a>
+<span class="sourceLineNo">066</span>  private static final class AssignmentManagerForTest extends AssignmentManager {<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span>    public AssignmentManagerForTest(MasterServices master) {<a name="line.68"></a>
+<span class="sourceLineNo">069</span>      super(master);<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 TransitRegionStateProcedure[] createUnassignProceduresForDisabling(TableName tableName) {<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      if (ARRIVE_GET_REGIONS_ON_TABLE != null) {<a name="line.74"></a>
+<span class="sourceLineNo">075</span>        ARRIVE_GET_REGIONS_ON_TABLE.countDown();<a name="line.75"></a>
+<span class="sourceLineNo">076</span>        ARRIVE_GET_REGIONS_ON_TABLE = null;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>        try {<a name="line.77"></a>
+<span class="sourceLineNo">078</span>          RESUME_GET_REGIONS_ON_SERVER.await();<a name="line.78"></a>
+<span class="sourceLineNo">079</span>        } catch (InterruptedException e) {<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>      TransitRegionStateProcedure[] procs = super.createUnassignProceduresForDisabling(tableName);<a name="line.82"></a>
+<span class="sourceLineNo">083</span>      return procs;<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    }<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  }<a name="line.85"></a>
 <span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span>    public HMasterForTest(Configuration conf) throws IOException, KeeperException {<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      super(conf);<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>    @Override<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    protected AssignmentManager createAssignmentManager(MasterServices master) {<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      return new AssignmentManagerForTest(master);<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    }<a name="line.94"></a>
-<span class="sourceLineNo">095</span>  }<a name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span>  @BeforeClass<a name="line.97"></a>
-<span class="sourceLineNo">098</span>  public static void setUp() throws Exception {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    UTIL.getConfiguration().setClass(HConstants.MASTER_IMPL, HMasterForTest.class, HMaster.class);<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    UTIL.startMiniCluster(2);<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    UTIL.createTable(NAME, CF);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    UTIL.waitTableAvailable(NAME);<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    UTIL.getAdmin().balancerSwitch(false, true);<a name="line.103"></a>
-<span class="sourceLineNo">104</span>  }<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span>  @AfterClass<a name="line.106"></a>
-<span class="sourceLineNo">107</span>  public static void tearDown() throws Exception {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    UTIL.shutdownMiniCluster();<a name="line.108"></a>
-<span class="sourceLineNo">109</span>  }<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span>  @Test<a name="line.111"></a>
-<span class="sourceLineNo">112</span>  public void test() throws Exception {<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    RegionInfo region = UTIL.getMiniHBaseCluster().getRegions(NAME).get(0).getRegionInfo();<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    AssignmentManager am = UTIL.getMiniHBaseCluster().getMaster().getAssignmentManager();<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    ServerName sn = am.getRegionStates().getRegionState(region).getServerName();<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>    ARRIVE_GET_REGIONS_ON_TABLE = new CountDownLatch(1);<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    RESUME_GET_REGIONS_ON_SERVER = new CountDownLatch(1);<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>    UTIL.getAdmin().disableTableAsync(NAME);<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    ARRIVE_GET_REGIONS_ON_TABLE.await();<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span>    UTIL.getMiniHBaseCluster().stopRegionServer(sn);<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    // Wait ServerCrashProcedure to init.<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    Thread.sleep(1000);<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    ProcedureExecutor&lt;?&gt; procExec =<a name="line.126"></a>
-<span class="sourceLineNo">127</span>        UTIL.getMiniHBaseCluster().getMaster().getMasterProcedureExecutor();<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    long scpProcId =<a name="line.128"></a>
-<span class="sourceLineNo">129</span>        procExec.getProcedures().stream().filter(p -&gt; p instanceof ServerCrashProcedure)<a name="line.129"></a>
-<span class="sourceLineNo">130</span>            .map(p -&gt; (ServerCrashProcedure) p).findAny().get().getProcId();<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    UTIL.waitFor(60000, () -&gt; procExec.isFinished(scpProcId));<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    RESUME_GET_REGIONS_ON_SERVER.countDown();<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span>    long dtpProcId =<a name="line.134"></a>
-<span class="sourceLineNo">135</span>        procExec.getProcedures().stream().filter(p -&gt; p instanceof DisableTableProcedure)<a name="line.135"></a>
-<span class="sourceLineNo">136</span>            .map(p -&gt; (DisableTableProcedure) p).findAny().get().getProcId();<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    UTIL.waitFor(60000, () -&gt; procExec.isFinished(dtpProcId));<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">087</span>  public static final class HMasterForTest extends HMaster {<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span>    public HMasterForTest(Configuration conf) throws IOException, KeeperException {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      super(conf);<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>    @Override<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    protected AssignmentManager createAssignmentManager(MasterServices master) {<a name="line.94"></a>
+<span class="sourceLineNo">095</span>      return new AssignmentManagerForTest(master);<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    }<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  }<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>  @BeforeClass<a name="line.99"></a>
+<span class="sourceLineNo">100</span>  public static void setUp() throws Exception {<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    UTIL.getConfiguration().setClass(HConstants.MASTER_IMPL, HMasterForTest.class, HMaster.class);<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    UTIL.startMiniCluster(2);<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    UTIL.createTable(NAME, CF);<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    UTIL.waitTableAvailable(NAME);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    UTIL.getAdmin().balancerSwitch(false, true);<a name="line.105"></a>
+<span class="sourceLineNo">106</span>  }<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span>  @AfterClass<a name="line.108"></a>
+<span class="sourceLineNo">109</span>  public static void tearDown() throws Exception {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    UTIL.shutdownMiniCluster();<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 test() throws Exception {<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    RegionInfo region = UTIL.getMiniHBaseCluster().getRegions(NAME).get(0).getRegionInfo();<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    AssignmentManager am = UTIL.getMiniHBaseCluster().getMaster().getAssignmentManager();<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    ServerName sn = am.getRegionStates().getRegionState(region).getServerName();<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span>    ARRIVE_GET_REGIONS_ON_TABLE = new CountDownLatch(1);<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    RESUME_GET_REGIONS_ON_SERVER = new CountDownLatch(1);<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span>    UTIL.getAdmin().disableTableAsync(NAME);<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    ARRIVE_GET_REGIONS_ON_TABLE.await();<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span>    ProcedureExecutor&lt;?&gt; procExec =<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      UTIL.getMiniHBaseCluster().getMaster().getMasterProcedureExecutor();<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    UTIL.getMiniHBaseCluster().stopRegionServer(sn);<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    long pid = Procedure.NO_PROC_ID;<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    do {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      Threads.sleep(1);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>      pid = getSCPPID(procExec);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    } while (pid != Procedure.NO_PROC_ID);<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    final long scppid = pid;<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    UTIL.waitFor(60000, () -&gt; procExec.isFinished(scppid));<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    RESUME_GET_REGIONS_ON_SERVER.countDown();<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span>    long dtpProcId =<a name="line.137"></a>
+<span class="sourceLineNo">138</span>        procExec.getProcedures().stream().filter(p -&gt; p instanceof DisableTableProcedure)<a name="line.138"></a>
+<span class="sourceLineNo">139</span>            .map(p -&gt; (DisableTableProcedure) p).findAny().get().getProcId();<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    UTIL.waitFor(60000, () -&gt; procExec.isFinished(dtpProcId));<a name="line.140"></a>
+<span class="sourceLineNo">141</span>  }<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span>  /**<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   * @return Returns {@link Procedure#NO_PROC_ID} if no SCP found else actual pid.<a name="line.144"></a>
+<span class="sourceLineNo">145</span>   */<a name="line.145"></a>
+<span class="sourceLineNo">146</span>  private long getSCPPID(ProcedureExecutor&lt;?&gt; e) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    Optional&lt;ServerCrashProcedure&gt; optional = e.getProcedures().stream().<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      filter(p -&gt; p instanceof ServerCrashProcedure).map(p -&gt; (ServerCrashProcedure) p).findAny();<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    return optional.isPresent()? optional.get().getProcId(): Procedure.NO_PROC_ID;<a name="line.149"></a>
+<span class="sourceLineNo">150</span>  }<a name="line.150"></a>
+<span class="sourceLineNo">151</span>}<a name="line.151"></a>
 
 
 
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html
index cd7d032..3b2d886 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/assignment/TestRaceBetweenSCPAndDTP.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> * Licensed to the Apache Software Foundation (ASF) under one<a name="line.2"></a>
 <span class="sourceLineNo">003</span> * or more contributor license agreements.  See the NOTICE file<a name="line.3"></a>
 <span class="sourceLineNo">004</span> * distributed with this work for additional information<a name="line.4"></a>
@@ -26,125 +26,137 @@
 <span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.master.assignment;<a name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
 <span class="sourceLineNo">020</span>import java.io.IOException;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import java.util.concurrent.CountDownLatch;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import org.apache.hadoop.conf.Configuration;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.HConstants;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.ServerName;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.TableName;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.master.HMaster;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.master.procedure.DisableTableProcedure;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.master.procedure.ServerCrashProcedure;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.zookeeper.KeeperException;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.junit.AfterClass;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.junit.BeforeClass;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.junit.ClassRule;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.junit.Test;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.junit.experimental.categories.Category;<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> * Testcase for HBASE-23636.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> */<a name="line.46"></a>
-<span class="sourceLineNo">047</span>@Category({ MasterTests.class, MediumTests.class })<a name="line.47"></a>
-<span class="sourceLineNo">048</span>public class TestRaceBetweenSCPAndDTP {<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>  @ClassRule<a name="line.50"></a>
-<span class="sourceLineNo">051</span>  public static final HBaseClassTestRule CLASS_RULE =<a name="line.51"></a>
-<span class="sourceLineNo">052</span>    HBaseClassTestRule.forClass(TestRaceBetweenSCPAndDTP.class);<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span>  private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.54"></a>
+<span class="sourceLineNo">021</span>import java.util.Optional;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.concurrent.CountDownLatch;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import org.apache.hadoop.conf.Configuration;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<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.ServerName;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.TableName;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.master.HMaster;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.master.procedure.DisableTableProcedure;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.master.procedure.ServerCrashProcedure;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.procedure2.ProcedureExecutor;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.util.Threads;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.zookeeper.KeeperException;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.junit.AfterClass;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.junit.BeforeClass;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.junit.ClassRule;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.junit.Test;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.junit.experimental.categories.Category;<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>/**<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * Testcase for HBASE-23636.<a name="line.48"></a>
+<span class="sourceLineNo">049</span> */<a name="line.49"></a>
+<span class="sourceLineNo">050</span>@Category({ MasterTests.class, MediumTests.class })<a name="line.50"></a>
+<span class="sourceLineNo">051</span>public class TestRaceBetweenSCPAndDTP {<a name="line.51"></a>
+<span class="sourceLineNo">052</span>  @ClassRule<a name="line.52"></a>
+<span class="sourceLineNo">053</span>  public static final HBaseClassTestRule CLASS_RULE =<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    HBaseClassTestRule.forClass(TestRaceBetweenSCPAndDTP.class);<a name="line.54"></a>
 <span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span>  private static TableName NAME = TableName.valueOf("Race");<a name="line.56"></a>
+<span class="sourceLineNo">056</span>  private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.56"></a>
 <span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>  private static byte[] CF = Bytes.toBytes("cf");<a name="line.58"></a>
+<span class="sourceLineNo">058</span>  private static TableName NAME = TableName.valueOf("Race");<a name="line.58"></a>
 <span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>  private static CountDownLatch ARRIVE_GET_REGIONS_ON_TABLE;<a name="line.60"></a>
+<span class="sourceLineNo">060</span>  private static byte[] CF = Bytes.toBytes("cf");<a name="line.60"></a>
 <span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>  private static CountDownLatch RESUME_GET_REGIONS_ON_SERVER;<a name="line.62"></a>
+<span class="sourceLineNo">062</span>  private static CountDownLatch ARRIVE_GET_REGIONS_ON_TABLE;<a name="line.62"></a>
 <span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>  private static final class AssignmentManagerForTest extends AssignmentManager {<a name="line.64"></a>
+<span class="sourceLineNo">064</span>  private static CountDownLatch RESUME_GET_REGIONS_ON_SERVER;<a name="line.64"></a>
 <span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>    public AssignmentManagerForTest(MasterServices master) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span>      super(master);<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>    @Override<a name="line.70"></a>
-<span class="sourceLineNo">071</span>    public TransitRegionStateProcedure[] createUnassignProceduresForDisabling(TableName tableName) {<a name="line.71"></a>
-<span class="sourceLineNo">072</span>      if (ARRIVE_GET_REGIONS_ON_TABLE != null) {<a name="line.72"></a>
-<span class="sourceLineNo">073</span>        ARRIVE_GET_REGIONS_ON_TABLE.countDown();<a name="line.73"></a>
-<span class="sourceLineNo">074</span>        ARRIVE_GET_REGIONS_ON_TABLE = null;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>        try {<a name="line.75"></a>
-<span class="sourceLineNo">076</span>          RESUME_GET_REGIONS_ON_SERVER.await();<a name="line.76"></a>
-<span class="sourceLineNo">077</span>        } catch (InterruptedException e) {<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>      TransitRegionStateProcedure[] procs = super.createUnassignProceduresForDisabling(tableName);<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      return procs;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    }<a name="line.82"></a>
-<span class="sourceLineNo">083</span>  }<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span>  public static final class HMasterForTest extends HMaster {<a name="line.85"></a>
+<span class="sourceLineNo">066</span>  private static final class AssignmentManagerForTest extends AssignmentManager {<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span>    public AssignmentManagerForTest(MasterServices master) {<a name="line.68"></a>
+<span class="sourceLineNo">069</span>      super(master);<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 TransitRegionStateProcedure[] createUnassignProceduresForDisabling(TableName tableName) {<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      if (ARRIVE_GET_REGIONS_ON_TABLE != null) {<a name="line.74"></a>
+<span class="sourceLineNo">075</span>        ARRIVE_GET_REGIONS_ON_TABLE.countDown();<a name="line.75"></a>
+<span class="sourceLineNo">076</span>        ARRIVE_GET_REGIONS_ON_TABLE = null;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>        try {<a name="line.77"></a>
+<span class="sourceLineNo">078</span>          RESUME_GET_REGIONS_ON_SERVER.await();<a name="line.78"></a>
+<span class="sourceLineNo">079</span>        } catch (InterruptedException e) {<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>      TransitRegionStateProcedure[] procs = super.createUnassignProceduresForDisabling(tableName);<a name="line.82"></a>
+<span class="sourceLineNo">083</span>      return procs;<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    }<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  }<a name="line.85"></a>
 <span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span>    public HMasterForTest(Configuration conf) throws IOException, KeeperException {<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      super(conf);<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>    @Override<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    protected AssignmentManager createAssignmentManager(MasterServices master) {<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      return new AssignmentManagerForTest(master);<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    }<a name="line.94"></a>
-<span class="sourceLineNo">095</span>  }<a name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span>  @BeforeClass<a name="line.97"></a>
-<span class="sourceLineNo">098</span>  public static void setUp() throws Exception {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    UTIL.getConfiguration().setClass(HConstants.MASTER_IMPL, HMasterForTest.class, HMaster.class);<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    UTIL.startMiniCluster(2);<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    UTIL.createTable(NAME, CF);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    UTIL.waitTableAvailable(NAME);<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    UTIL.getAdmin().balancerSwitch(false, true);<a name="line.103"></a>
-<span class="sourceLineNo">104</span>  }<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span>  @AfterClass<a name="line.106"></a>
-<span class="sourceLineNo">107</span>  public static void tearDown() throws Exception {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    UTIL.shutdownMiniCluster();<a name="line.108"></a>
-<span class="sourceLineNo">109</span>  }<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span>  @Test<a name="line.111"></a>
-<span class="sourceLineNo">112</span>  public void test() throws Exception {<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    RegionInfo region = UTIL.getMiniHBaseCluster().getRegions(NAME).get(0).getRegionInfo();<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    AssignmentManager am = UTIL.getMiniHBaseCluster().getMaster().getAssignmentManager();<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    ServerName sn = am.getRegionStates().getRegionState(region).getServerName();<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>    ARRIVE_GET_REGIONS_ON_TABLE = new CountDownLatch(1);<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    RESUME_GET_REGIONS_ON_SERVER = new CountDownLatch(1);<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>    UTIL.getAdmin().disableTableAsync(NAME);<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    ARRIVE_GET_REGIONS_ON_TABLE.await();<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span>    UTIL.getMiniHBaseCluster().stopRegionServer(sn);<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    // Wait ServerCrashProcedure to init.<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    Thread.sleep(1000);<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    ProcedureExecutor&lt;?&gt; procExec =<a name="line.126"></a>
-<span class="sourceLineNo">127</span>        UTIL.getMiniHBaseCluster().getMaster().getMasterProcedureExecutor();<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    long scpProcId =<a name="line.128"></a>
-<span class="sourceLineNo">129</span>        procExec.getProcedures().stream().filter(p -&gt; p instanceof ServerCrashProcedure)<a name="line.129"></a>
-<span class="sourceLineNo">130</span>            .map(p -&gt; (ServerCrashProcedure) p).findAny().get().getProcId();<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    UTIL.waitFor(60000, () -&gt; procExec.isFinished(scpProcId));<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    RESUME_GET_REGIONS_ON_SERVER.countDown();<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span>    long dtpProcId =<a name="line.134"></a>
-<span class="sourceLineNo">135</span>        procExec.getProcedures().stream().filter(p -&gt; p instanceof DisableTableProcedure)<a name="line.135"></a>
-<span class="sourceLineNo">136</span>            .map(p -&gt; (DisableTableProcedure) p).findAny().get().getProcId();<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    UTIL.waitFor(60000, () -&gt; procExec.isFinished(dtpProcId));<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">087</span>  public static final class HMasterForTest extends HMaster {<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span>    public HMasterForTest(Configuration conf) throws IOException, KeeperException {<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      super(conf);<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>    @Override<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    protected AssignmentManager createAssignmentManager(MasterServices master) {<a name="line.94"></a>
+<span class="sourceLineNo">095</span>      return new AssignmentManagerForTest(master);<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    }<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  }<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>  @BeforeClass<a name="line.99"></a>
+<span class="sourceLineNo">100</span>  public static void setUp() throws Exception {<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    UTIL.getConfiguration().setClass(HConstants.MASTER_IMPL, HMasterForTest.class, HMaster.class);<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    UTIL.startMiniCluster(2);<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    UTIL.createTable(NAME, CF);<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    UTIL.waitTableAvailable(NAME);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    UTIL.getAdmin().balancerSwitch(false, true);<a name="line.105"></a>
+<span class="sourceLineNo">106</span>  }<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span>  @AfterClass<a name="line.108"></a>
+<span class="sourceLineNo">109</span>  public static void tearDown() throws Exception {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    UTIL.shutdownMiniCluster();<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 test() throws Exception {<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    RegionInfo region = UTIL.getMiniHBaseCluster().getRegions(NAME).get(0).getRegionInfo();<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    AssignmentManager am = UTIL.getMiniHBaseCluster().getMaster().getAssignmentManager();<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    ServerName sn = am.getRegionStates().getRegionState(region).getServerName();<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span>    ARRIVE_GET_REGIONS_ON_TABLE = new CountDownLatch(1);<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    RESUME_GET_REGIONS_ON_SERVER = new CountDownLatch(1);<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span>    UTIL.getAdmin().disableTableAsync(NAME);<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    ARRIVE_GET_REGIONS_ON_TABLE.await();<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span>    ProcedureExecutor&lt;?&gt; procExec =<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      UTIL.getMiniHBaseCluster().getMaster().getMasterProcedureExecutor();<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    UTIL.getMiniHBaseCluster().stopRegionServer(sn);<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    long pid = Procedure.NO_PROC_ID;<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    do {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      Threads.sleep(1);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>      pid = getSCPPID(procExec);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    } while (pid != Procedure.NO_PROC_ID);<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    final long scppid = pid;<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    UTIL.waitFor(60000, () -&gt; procExec.isFinished(scppid));<a name="line.134"></a>
+<span class="sourceLineNo">135</span>    RESUME_GET_REGIONS_ON_SERVER.countDown();<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span>    long dtpProcId =<a name="line.137"></a>
+<span class="sourceLineNo">138</span>        procExec.getProcedures().stream().filter(p -&gt; p instanceof DisableTableProcedure)<a name="line.138"></a>
+<span class="sourceLineNo">139</span>            .map(p -&gt; (DisableTableProcedure) p).findAny().get().getProcId();<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    UTIL.waitFor(60000, () -&gt; procExec.isFinished(dtpProcId));<a name="line.140"></a>
+<span class="sourceLineNo">141</span>  }<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span>  /**<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   * @return Returns {@link Procedure#NO_PROC_ID} if no SCP found else actual pid.<a name="line.144"></a>
+<span class="sourceLineNo">145</span>   */<a name="line.145"></a>
+<span class="sourceLineNo">146</span>  private long getSCPPID(ProcedureExecutor&lt;?&gt; e) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    Optional&lt;ServerCrashProcedure&gt; optional = e.getProcedures().stream().<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      filter(p -&gt; p instanceof ServerCrashProcedure).map(p -&gt; (ServerCrashProcedure) p).findAny();<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    return optional.isPresent()? optional.get().getProcId(): Procedure.NO_PROC_ID;<a name="line.149"></a>
+<span class="sourceLineNo">150</span>  }<a name="line.150"></a>
+<span class="sourceLineNo">151</span>}<a name="line.151"></a>