http://git-wip-us.apache.org/repos/asf/hbase-site/blob/31809c03/supportingprojects.html
----------------------------------------------------------------------
diff --git a/supportingprojects.html b/supportingprojects.html
index c41af7e..8cf70cc 100644
--- a/supportingprojects.html
+++ b/supportingprojects.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180413" />
+    <meta name="Date-Revision-yyyymmdd" content="20180414" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Supporting Projects</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" 
/>
@@ -520,7 +520,7 @@ under the License. -->
                         <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2018-04-13</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2018-04-14</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/31809c03/team-list.html
----------------------------------------------------------------------
diff --git a/team-list.html b/team-list.html
index 7988747..55bf7cf 100644
--- a/team-list.html
+++ b/team-list.html
@@ -7,7 +7,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta name="Date-Revision-yyyymmdd" content="20180413" />
+    <meta name="Date-Revision-yyyymmdd" content="20180414" />
     <meta http-equiv="Content-Language" content="en" />
     <title>Apache HBase &#x2013; Project Team</title>
     <link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" 
/>
@@ -730,7 +730,7 @@
                         <a href="https://www.apache.org/";>The Apache Software 
Foundation</a>.
             All rights reserved.      
                     
-                  <li id="publishDate" class="pull-right">Last Published: 
2018-04-13</li>
+                  <li id="publishDate" class="pull-right">Last Published: 
2018-04-14</li>
             </p>
                 </div>
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/31809c03/testdevapidocs/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.WarnOnlyStoppable.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.WarnOnlyStoppable.html
 
b/testdevapidocs/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.WarnOnlyStoppable.html
index b283e6b..75b79b2 100644
--- 
a/testdevapidocs/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.WarnOnlyStoppable.html
+++ 
b/testdevapidocs/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.WarnOnlyStoppable.html
@@ -117,7 +117,7 @@ var activeTableTab = "activeTableTab";
 </dl>
 <hr>
 <br>
-<pre>private static class <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.282">TestReplicationBarrierCleaner.WarnOnlyStoppable</a>
+<pre>private static class <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.288">TestReplicationBarrierCleaner.WarnOnlyStoppable</a>
 extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html?is-external=true";
 title="class or interface in java.lang">Object</a>
 implements org.apache.hadoop.hbase.Stoppable</pre>
 </li>
@@ -193,7 +193,7 @@ implements org.apache.hadoop.hbase.Stoppable</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>WarnOnlyStoppable</h4>
-<pre>private&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.WarnOnlyStoppable.html#line.282">WarnOnlyStoppable</a>()</pre>
+<pre>private&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.WarnOnlyStoppable.html#line.288">WarnOnlyStoppable</a>()</pre>
 </li>
 </ul>
 </li>
@@ -210,7 +210,7 @@ implements org.apache.hadoop.hbase.Stoppable</pre>
 <ul class="blockList">
 <li class="blockList">
 <h4>stop</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.WarnOnlyStoppable.html#line.284">stop</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;why)</pre>
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.WarnOnlyStoppable.html#line.290">stop</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;why)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code>stop</code>&nbsp;in 
interface&nbsp;<code>org.apache.hadoop.hbase.Stoppable</code></dd>
@@ -223,7 +223,7 @@ implements org.apache.hadoop.hbase.Stoppable</pre>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>isStopped</h4>
-<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.WarnOnlyStoppable.html#line.289">isStopped</a>()</pre>
+<pre>public&nbsp;boolean&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.WarnOnlyStoppable.html#line.295">isStopped</a>()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
 <dd><code>isStopped</code>&nbsp;in 
interface&nbsp;<code>org.apache.hadoop.hbase.Stoppable</code></dd>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/31809c03/testdevapidocs/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html
 
b/testdevapidocs/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html
index 9f10905..d275877 100644
--- 
a/testdevapidocs/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html
+++ 
b/testdevapidocs/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html
@@ -109,7 +109,7 @@ var activeTableTab = "activeTableTab";
 <li class="blockList">
 <hr>
 <br>
-<pre>public class <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.70">TestReplicationBarrierCleaner</a>
+<pre>public class <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.72">TestReplicationBarrierCleaner</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>
@@ -280,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>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/cleaner/TestReplicationBarrierCleaner.html#line.73">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/cleaner/TestReplicationBarrierCleaner.html#line.75">CLASS_RULE</a></pre>
 </li>
 </ul>
 <a name="LOG">
@@ -289,7 +289,7 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>LOG</h4>
-<pre>private static final&nbsp;org.slf4j.Logger <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.76">LOG</a></pre>
+<pre>private static final&nbsp;org.slf4j.Logger <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.78">LOG</a></pre>
 </li>
 </ul>
 <a name="UTIL">
@@ -298,7 +298,7 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>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/cleaner/TestReplicationBarrierCleaner.html#line.78">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/cleaner/TestReplicationBarrierCleaner.html#line.80">UTIL</a></pre>
 </li>
 </ul>
 <a name="name">
@@ -307,7 +307,7 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>name</h4>
-<pre>public final&nbsp;org.junit.rules.TestName <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.81">name</a></pre>
+<pre>public final&nbsp;org.junit.rules.TestName <a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.83">name</a></pre>
 </li>
 </ul>
 </li>
@@ -324,7 +324,7 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>TestReplicationBarrierCleaner</h4>
-<pre>public&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.70">TestReplicationBarrierCleaner</a>()</pre>
+<pre>public&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.72">TestReplicationBarrierCleaner</a>()</pre>
 </li>
 </ul>
 </li>
@@ -341,7 +341,7 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>setUpBeforeClass</h4>
-<pre>public static&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.84">setUpBeforeClass</a>()
+<pre>public static&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.86">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>
@@ -355,7 +355,7 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>tearDownAfterClass</h4>
-<pre>public static&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.89">tearDownAfterClass</a>()
+<pre>public static&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.91">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>
@@ -369,7 +369,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&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.94">tearDown</a>()
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.96">tearDown</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>
@@ -383,7 +383,7 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>create</h4>
-<pre>private&nbsp;org.apache.hadoop.hbase.master.replication.ReplicationPeerManager&nbsp;<a
 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.111">create</a>(org.apache.hadoop.hbase.replication.ReplicationQueueStorage&nbsp;queueStorage,
+<pre>private&nbsp;org.apache.hadoop.hbase.master.replication.ReplicationPeerManager&nbsp;<a
 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.113">create</a>(org.apache.hadoop.hbase.replication.ReplicationQueueStorage&nbsp;queueStorage,
                                                                                
  <a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&gt;&nbsp;firstPeerIds,
                                                                                
  <a 
href="https://docs.oracle.com/javase/8/docs/api/java/util/List.html?is-external=true";
 title="class or interface in java.util">List</a>&lt;<a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/String.html?is-external=true";
 title="class or interface in java.lang">String</a>&gt;...&nbsp;peerIds)</pre>
 </li>
@@ -394,7 +394,7 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>create</h4>
-<pre>private&nbsp;org.apache.hadoop.hbase.replication.ReplicationQueueStorage&nbsp;<a
 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.126">create</a>(<a
 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true";
 title="class or interface in java.lang">Long</a>&nbsp;lastPushedSeqId,
+<pre>private&nbsp;org.apache.hadoop.hbase.replication.ReplicationQueueStorage&nbsp;<a
 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.128">create</a>(<a
 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true";
 title="class or interface in java.lang">Long</a>&nbsp;lastPushedSeqId,
                                                                            <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Long.html?is-external=true";
 title="class or interface in java.lang">Long</a>...&nbsp;lastPushedSeqIds)
                                                                     throws 
org.apache.hadoop.hbase.replication.ReplicationException</pre>
 <dl>
@@ -409,7 +409,7 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>create</h4>
-<pre>private&nbsp;org.apache.hadoop.hbase.master.cleaner.ReplicationBarrierCleaner&nbsp;<a
 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.138">create</a>(org.apache.hadoop.hbase.master.replication.ReplicationPeerManager&nbsp;peerManager)
+<pre>private&nbsp;org.apache.hadoop.hbase.master.cleaner.ReplicationBarrierCleaner&nbsp;<a
 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.140">create</a>(org.apache.hadoop.hbase.master.replication.ReplicationPeerManager&nbsp;peerManager)
                                                                          
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>
@@ -423,7 +423,7 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>addBarrier</h4>
-<pre>private&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.143">addBarrier</a>(org.apache.hadoop.hbase.client.RegionInfo&nbsp;region,
+<pre>private&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.145">addBarrier</a>(org.apache.hadoop.hbase.client.RegionInfo&nbsp;region,
                         long...&nbsp;barriers)
                  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>
@@ -438,7 +438,7 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>fillCatalogFamily</h4>
-<pre>private&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.154">fillCatalogFamily</a>(org.apache.hadoop.hbase.client.RegionInfo&nbsp;region)
+<pre>private&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.156">fillCatalogFamily</a>(org.apache.hadoop.hbase.client.RegionInfo&nbsp;region)
                         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>
@@ -452,7 +452,7 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>clearCatalogFamily</h4>
-<pre>private&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.161">clearCatalogFamily</a>(org.apache.hadoop.hbase.client.RegionInfo&nbsp;region)
+<pre>private&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.163">clearCatalogFamily</a>(org.apache.hadoop.hbase.client.RegionInfo&nbsp;region)
                          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>
@@ -466,7 +466,7 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testNothing</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.168">testNothing</a>()
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.170">testNothing</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>
@@ -480,7 +480,7 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testCleanNoPeers</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.177">testCleanNoPeers</a>()
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.179">testCleanNoPeers</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>
@@ -494,7 +494,7 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockList">
 <li class="blockList">
 <h4>testDeleteBarriers</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.217">testDeleteBarriers</a>()
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.219">testDeleteBarriers</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>,
                                
org.apache.hadoop.hbase.replication.ReplicationException</pre>
 <dl>
@@ -510,7 +510,7 @@ extends <a 
href="https://docs.oracle.com/javase/8/docs/api/java/lang/Object.html
 <ul class="blockListLast">
 <li class="blockList">
 <h4>testDeleteRowForDeletedRegion</h4>
-<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.257">testDeleteRowForDeletedRegion</a>()
+<pre>public&nbsp;void&nbsp;<a 
href="../../../../../../src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.html#line.259">testDeleteRowForDeletedRegion</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>,
                                           
org.apache.hadoop.hbase.replication.ReplicationException</pre>
 <dl>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/31809c03/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.WarnOnlyStoppable.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.WarnOnlyStoppable.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.WarnOnlyStoppable.html
index 11d906b..ad020bd 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.WarnOnlyStoppable.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/cleaner/TestReplicationBarrierCleaner.WarnOnlyStoppable.html
@@ -28,277 +28,283 @@
 <span class="sourceLineNo">020</span>import static 
org.junit.Assert.assertArrayEquals;<a name="line.20"></a>
 <span class="sourceLineNo">021</span>import static 
org.junit.Assert.assertFalse;<a name="line.21"></a>
 <span class="sourceLineNo">022</span>import static 
org.mockito.ArgumentMatchers.any;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import static 
org.mockito.ArgumentMatchers.anyString;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import static org.mockito.Mockito.mock;<a 
name="line.24"></a>
-<span class="sourceLineNo">025</span>import static 
org.mockito.Mockito.never;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import static 
org.mockito.Mockito.times;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import static 
org.mockito.Mockito.verify;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import static org.mockito.Mockito.when;<a 
name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>import java.io.IOException;<a 
name="line.30"></a>
-<span class="sourceLineNo">031</span>import java.util.Collections;<a 
name="line.31"></a>
-<span class="sourceLineNo">032</span>import java.util.List;<a 
name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.Stoppable;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.client.Delete;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.client.Get;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.client.Put;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.client.RegionInfo;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.client.RegionInfoBuilder;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.client.Result;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.client.ResultScanner;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.client.Scan;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.client.Table;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import 
org.apache.hadoop.hbase.master.replication.ReplicationPeerManager;<a 
name="line.49"></a>
-<span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.replication.ReplicationException;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.replication.ReplicationQueueStorage;<a 
name="line.51"></a>
-<span class="sourceLineNo">052</span>import 
org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import 
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.junit.After;<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.junit.AfterClass;<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.junit.BeforeClass;<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.junit.ClassRule;<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span>import org.junit.Rule;<a 
name="line.60"></a>
-<span class="sourceLineNo">061</span>import org.junit.Test;<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span>import 
org.junit.experimental.categories.Category;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>import org.junit.rules.TestName;<a 
name="line.63"></a>
-<span class="sourceLineNo">064</span>import org.slf4j.Logger;<a 
name="line.64"></a>
-<span class="sourceLineNo">065</span>import org.slf4j.LoggerFactory;<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span>import 
org.apache.hbase.thirdparty.com.google.common.collect.Lists;<a 
name="line.67"></a>
+<span class="sourceLineNo">023</span>import static 
org.mockito.ArgumentMatchers.anyList;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import static 
org.mockito.ArgumentMatchers.anyString;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import static org.mockito.Mockito.mock;<a 
name="line.25"></a>
+<span class="sourceLineNo">026</span>import static 
org.mockito.Mockito.never;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import static 
org.mockito.Mockito.times;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import static 
org.mockito.Mockito.verify;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import static org.mockito.Mockito.when;<a 
name="line.29"></a>
+<span class="sourceLineNo">030</span><a name="line.30"></a>
+<span class="sourceLineNo">031</span>import java.io.IOException;<a 
name="line.31"></a>
+<span class="sourceLineNo">032</span>import java.util.Arrays;<a 
name="line.32"></a>
+<span class="sourceLineNo">033</span>import java.util.Collections;<a 
name="line.33"></a>
+<span class="sourceLineNo">034</span>import java.util.List;<a 
name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.Stoppable;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.client.Delete;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.client.Get;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.client.Put;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.client.RegionInfo;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.client.RegionInfoBuilder;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.client.Result;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.client.ResultScanner;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.client.Scan;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import 
org.apache.hadoop.hbase.client.Table;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.master.replication.ReplicationPeerManager;<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>import 
org.apache.hadoop.hbase.replication.ReplicationException;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import 
org.apache.hadoop.hbase.replication.ReplicationQueueStorage;<a 
name="line.53"></a>
+<span class="sourceLineNo">054</span>import 
org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import 
org.apache.hadoop.hbase.testclassification.MediumTests;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.junit.After;<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.junit.AfterClass;<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.junit.BeforeClass;<a 
name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.junit.ClassRule;<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>import org.junit.Rule;<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span>import org.junit.Test;<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span>import 
org.junit.experimental.categories.Category;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>import org.junit.rules.TestName;<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span>import org.slf4j.Logger;<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span>import org.slf4j.LoggerFactory;<a 
name="line.67"></a>
 <span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>@Category({ MasterTests.class, 
MediumTests.class })<a name="line.69"></a>
-<span class="sourceLineNo">070</span>public class 
TestReplicationBarrierCleaner {<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span>  @ClassRule<a name="line.72"></a>
-<span class="sourceLineNo">073</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    
HBaseClassTestRule.forClass(TestReplicationBarrierCleaner.class);<a 
name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TestHFileCleaner.class);<a name="line.76"></a>
+<span class="sourceLineNo">069</span>import 
org.apache.hbase.thirdparty.com.google.common.collect.Lists;<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>@Category({ MasterTests.class, 
MediumTests.class })<a name="line.71"></a>
+<span class="sourceLineNo">072</span>public class 
TestReplicationBarrierCleaner {<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span>  @ClassRule<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    
HBaseClassTestRule.forClass(TestReplicationBarrierCleaner.class);<a 
name="line.76"></a>
 <span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span>  private static final 
HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.78"></a>
+<span class="sourceLineNo">078</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TestHFileCleaner.class);<a name="line.78"></a>
 <span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span>  @Rule<a name="line.80"></a>
-<span class="sourceLineNo">081</span>  public final TestName name = new 
TestName();<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span>  @BeforeClass<a name="line.83"></a>
-<span class="sourceLineNo">084</span>  public static void setUpBeforeClass() 
throws Exception {<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    UTIL.startMiniCluster(1);<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span>  }<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span>  @AfterClass<a name="line.88"></a>
-<span class="sourceLineNo">089</span>  public static void tearDownAfterClass() 
throws Exception {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    UTIL.shutdownMiniCluster();<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>  @After<a name="line.93"></a>
-<span class="sourceLineNo">094</span>  public void tearDown() throws 
IOException {<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    try (Table table = 
UTIL.getConnection().getTable(TableName.META_TABLE_NAME);<a name="line.95"></a>
-<span class="sourceLineNo">096</span>        ResultScanner scanner = 
table.getScanner(new Scan().addFamily(HConstants.CATALOG_FAMILY)<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span>          
.addFamily(HConstants.REPLICATION_BARRIER_FAMILY).setFilter(new 
FirstKeyOnlyFilter()))) {<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      for (;;) {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>        Result result = scanner.next();<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>        if (result == null) {<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>          break;<a name="line.101"></a>
-<span class="sourceLineNo">102</span>        }<a name="line.102"></a>
-<span class="sourceLineNo">103</span>        TableName tableName = 
RegionInfo.getTable(result.getRow());<a name="line.103"></a>
-<span class="sourceLineNo">104</span>        if (!tableName.isSystemTable()) 
{<a name="line.104"></a>
-<span class="sourceLineNo">105</span>          table.delete(new 
Delete(result.getRow()));<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>    }<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>  private ReplicationPeerManager 
create(ReplicationQueueStorage queueStorage,<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      List&lt;String&gt; firstPeerIds, 
@SuppressWarnings("unchecked") List&lt;String&gt;... peerIds) {<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>    ReplicationPeerManager peerManager = 
mock(ReplicationPeerManager.class);<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    if (queueStorage != null) {<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>      
when(peerManager.getQueueStorage()).thenReturn(queueStorage);<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>    }<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    if (peerIds.length == 0) {<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>      
when(peerManager.getSerialPeerIdsBelongsTo(any(TableName.class))).thenReturn(firstPeerIds);<a
 name="line.118"></a>
-<span class="sourceLineNo">119</span>    } else {<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      
when(peerManager.getSerialPeerIdsBelongsTo(any(TableName.class))).thenReturn(firstPeerIds,<a
 name="line.120"></a>
-<span class="sourceLineNo">121</span>        peerIds);<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    }<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    return peerManager;<a 
name="line.123"></a>
-<span class="sourceLineNo">124</span>  }<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>  private ReplicationQueueStorage 
create(Long lastPushedSeqId, Long... lastPushedSeqIds)<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      throws ReplicationException {<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>    ReplicationQueueStorage queueStorage 
= mock(ReplicationQueueStorage.class);<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    if (lastPushedSeqIds.length == 0) {<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>      
when(queueStorage.getLastSequenceId(anyString(), 
anyString())).thenReturn(lastPushedSeqId);<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    } else {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      
when(queueStorage.getLastSequenceId(anyString(), 
anyString())).thenReturn(lastPushedSeqId,<a name="line.132"></a>
-<span class="sourceLineNo">133</span>        lastPushedSeqIds);<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>    }<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    return queueStorage;<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>  }<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span>  private ReplicationBarrierCleaner 
create(ReplicationPeerManager peerManager) throws IOException {<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>    return new 
ReplicationBarrierCleaner(UTIL.getConfiguration(), new WarnOnlyStoppable(),<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>      UTIL.getConnection(), 
peerManager);<a name="line.140"></a>
-<span class="sourceLineNo">141</span>  }<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span>  private void addBarrier(RegionInfo 
region, long... barriers) throws IOException {<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    Put put = new 
Put(region.getRegionName(), EnvironmentEdgeManager.currentTime());<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>    for (int i = 0; i &lt; 
barriers.length; i++) {<a name="line.145"></a>
-<span class="sourceLineNo">146</span>      
put.addColumn(HConstants.REPLICATION_BARRIER_FAMILY, 
HConstants.SEQNUM_QUALIFIER,<a name="line.146"></a>
-<span class="sourceLineNo">147</span>        put.getTimeStamp() - 
barriers.length + i, Bytes.toBytes(barriers[i]));<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    }<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    try (Table table = 
UTIL.getConnection().getTable(TableName.META_TABLE_NAME)) {<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>      table.put(put);<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>    }<a name="line.151"></a>
-<span class="sourceLineNo">152</span>  }<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span>  private void 
fillCatalogFamily(RegionInfo region) throws IOException {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    try (Table table = 
UTIL.getConnection().getTable(TableName.META_TABLE_NAME)) {<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>      table.put(new 
Put(region.getRegionName()).addColumn(HConstants.CATALOG_FAMILY,<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>        Bytes.toBytes("whatever"), 
Bytes.toBytes("whatever")));<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    }<a name="line.158"></a>
-<span class="sourceLineNo">159</span>  }<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span>  private void 
clearCatalogFamily(RegionInfo region) throws IOException {<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>    try (Table table = 
UTIL.getConnection().getTable(TableName.META_TABLE_NAME)) {<a 
name="line.162"></a>
-<span class="sourceLineNo">163</span>      table.delete(new 
Delete(region.getRegionName()).addFamily(HConstants.CATALOG_FAMILY));<a 
name="line.163"></a>
-<span class="sourceLineNo">164</span>    }<a name="line.164"></a>
-<span class="sourceLineNo">165</span>  }<a name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span>  @Test<a name="line.167"></a>
-<span class="sourceLineNo">168</span>  public void testNothing() throws 
IOException {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    ReplicationPeerManager peerManager = 
mock(ReplicationPeerManager.class);<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    ReplicationBarrierCleaner cleaner = 
create(peerManager);<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    cleaner.chore();<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>    verify(peerManager, 
never()).getSerialPeerIdsBelongsTo(any(TableName.class));<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    verify(peerManager, 
never()).getQueueStorage();<a name="line.173"></a>
-<span class="sourceLineNo">174</span>  }<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span>  @Test<a name="line.176"></a>
-<span class="sourceLineNo">177</span>  public void testCleanNoPeers() throws 
IOException {<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    TableName tableName1 = 
TableName.valueOf(name.getMethodName() + "_1");<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    RegionInfo region11 =<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>      
RegionInfoBuilder.newBuilder(tableName1).setEndKey(Bytes.toBytes(1)).build();<a 
name="line.180"></a>
-<span class="sourceLineNo">181</span>    addBarrier(region11, 10, 20, 30, 40, 
50, 60);<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    RegionInfo region12 =<a 
name="line.182"></a>
-<span class="sourceLineNo">183</span>      
RegionInfoBuilder.newBuilder(tableName1).setStartKey(Bytes.toBytes(1)).build();<a
 name="line.183"></a>
-<span class="sourceLineNo">184</span>    addBarrier(region12, 20, 30, 40, 50, 
60, 70);<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span>    TableName tableName2 = 
TableName.valueOf(name.getMethodName() + "_2");<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    RegionInfo region21 =<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>      
RegionInfoBuilder.newBuilder(tableName2).setEndKey(Bytes.toBytes(1)).build();<a 
name="line.188"></a>
-<span class="sourceLineNo">189</span>    addBarrier(region21, 100, 200, 300, 
400);<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    RegionInfo region22 =<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>      
RegionInfoBuilder.newBuilder(tableName2).setStartKey(Bytes.toBytes(1)).build();<a
 name="line.191"></a>
-<span class="sourceLineNo">192</span>    addBarrier(region22, 200, 300, 400, 
500, 600);<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>    @SuppressWarnings("unchecked")<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>    ReplicationPeerManager peerManager 
=<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      create(null, 
Collections.emptyList(), Collections.emptyList());<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    ReplicationBarrierCleaner cleaner = 
create(peerManager);<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    cleaner.chore();<a 
name="line.198"></a>
-<span class="sourceLineNo">199</span><a name="line.199"></a>
-<span class="sourceLineNo">200</span>    // should never call this method<a 
name="line.200"></a>
-<span class="sourceLineNo">201</span>    verify(peerManager, 
never()).getQueueStorage();<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    // should only be called twice 
although we have 4 regions to clean<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    verify(peerManager, 
times(2)).getSerialPeerIdsBelongsTo(any(TableName.class));<a 
name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span>    assertArrayEquals(new long[] { 60 
},<a name="line.205"></a>
-<span class="sourceLineNo">206</span>      
MetaTableAccessor.getReplicationBarrier(UTIL.getConnection(), 
region11.getRegionName()));<a name="line.206"></a>
-<span class="sourceLineNo">207</span>    assertArrayEquals(new long[] { 70 
},<a name="line.207"></a>
-<span class="sourceLineNo">208</span>      
MetaTableAccessor.getReplicationBarrier(UTIL.getConnection(), 
region12.getRegionName()));<a name="line.208"></a>
-<span class="sourceLineNo">209</span><a name="line.209"></a>
-<span class="sourceLineNo">210</span>    assertArrayEquals(new long[] { 400 
},<a name="line.210"></a>
-<span class="sourceLineNo">211</span>      
MetaTableAccessor.getReplicationBarrier(UTIL.getConnection(), 
region21.getRegionName()));<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    assertArrayEquals(new long[] { 600 
},<a name="line.212"></a>
-<span class="sourceLineNo">213</span>      
MetaTableAccessor.getReplicationBarrier(UTIL.getConnection(), 
region22.getRegionName()));<a name="line.213"></a>
-<span class="sourceLineNo">214</span>  }<a name="line.214"></a>
-<span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span>  @Test<a name="line.216"></a>
-<span class="sourceLineNo">217</span>  public void testDeleteBarriers() throws 
IOException, ReplicationException {<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    RegionInfo region = 
RegionInfoBuilder.newBuilder(tableName).build();<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    addBarrier(region, 10, 20, 30, 40, 
50, 60);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>    // two peers<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    ReplicationQueueStorage queueStorage 
= create(-1L, 2L, 15L, 25L, 20L, 25L, 65L, 55L, 70L, 70L);<a 
name="line.222"></a>
-<span class="sourceLineNo">223</span>    List&lt;String&gt; peerIds = 
Lists.newArrayList("1", "2");<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span>    @SuppressWarnings("unchecked")<a 
name="line.225"></a>
-<span class="sourceLineNo">226</span>    ReplicationPeerManager peerManager 
=<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      create(queueStorage, peerIds, 
peerIds, peerIds, peerIds, peerIds);<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    ReplicationBarrierCleaner cleaner = 
create(peerManager);<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span>    // beyond the first barrier, no 
deletion<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    cleaner.chore();<a 
name="line.231"></a>
-<span class="sourceLineNo">232</span>    assertArrayEquals(new long[] { 10, 
20, 30, 40, 50, 60 },<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      
MetaTableAccessor.getReplicationBarrier(UTIL.getConnection(), 
region.getRegionName()));<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span>    // in the first range, still no 
deletion<a name="line.235"></a>
-<span class="sourceLineNo">236</span>    cleaner.chore();<a 
name="line.236"></a>
-<span class="sourceLineNo">237</span>    assertArrayEquals(new long[] { 10, 
20, 30, 40, 50, 60 },<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      
MetaTableAccessor.getReplicationBarrier(UTIL.getConnection(), 
region.getRegionName()));<a name="line.238"></a>
-<span class="sourceLineNo">239</span><a name="line.239"></a>
-<span class="sourceLineNo">240</span>    // in the second range, 10 is 
deleted<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    cleaner.chore();<a 
name="line.241"></a>
-<span class="sourceLineNo">242</span>    assertArrayEquals(new long[] { 20, 
30, 40, 50, 60 },<a name="line.242"></a>
-<span class="sourceLineNo">243</span>      
MetaTableAccessor.getReplicationBarrier(UTIL.getConnection(), 
region.getRegionName()));<a name="line.243"></a>
-<span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span>    // between 50 and 60, so the barriers 
before 50 will be deleted<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    cleaner.chore();<a 
name="line.246"></a>
-<span class="sourceLineNo">247</span>    assertArrayEquals(new long[] { 50, 60 
},<a name="line.247"></a>
-<span class="sourceLineNo">248</span>      
MetaTableAccessor.getReplicationBarrier(UTIL.getConnection(), 
region.getRegionName()));<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>    // in the last open range, 50 is 
deleted<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    cleaner.chore();<a 
name="line.251"></a>
-<span class="sourceLineNo">252</span>    assertArrayEquals(new long[] { 60 
},<a name="line.252"></a>
-<span class="sourceLineNo">253</span>      
MetaTableAccessor.getReplicationBarrier(UTIL.getConnection(), 
region.getRegionName()));<a name="line.253"></a>
-<span class="sourceLineNo">254</span>  }<a name="line.254"></a>
-<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span>  @Test<a name="line.256"></a>
-<span class="sourceLineNo">257</span>  public void 
testDeleteRowForDeletedRegion() throws IOException, ReplicationException {<a 
name="line.257"></a>
-<span class="sourceLineNo">258</span>    TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    RegionInfo region = 
RegionInfoBuilder.newBuilder(tableName).build();<a name="line.259"></a>
-<span class="sourceLineNo">260</span>    addBarrier(region, 40, 50, 60);<a 
name="line.260"></a>
-<span class="sourceLineNo">261</span>    fillCatalogFamily(region);<a 
name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>    ReplicationQueueStorage queueStorage 
= create(59L);<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    @SuppressWarnings("unchecked")<a 
name="line.264"></a>
-<span class="sourceLineNo">265</span>    ReplicationPeerManager peerManager = 
create(queueStorage, Lists.newArrayList("1"));<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    ReplicationBarrierCleaner cleaner = 
create(peerManager);<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span>    // we have something in catalog 
family, so only delete 40<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    cleaner.chore();<a 
name="line.269"></a>
-<span class="sourceLineNo">270</span>    assertArrayEquals(new long[] { 50, 60 
},<a name="line.270"></a>
-<span class="sourceLineNo">271</span>      
MetaTableAccessor.getReplicationBarrier(UTIL.getConnection(), 
region.getRegionName()));<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span>    // No catalog family, then we should 
remove the whole row<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    clearCatalogFamily(region);<a 
name="line.274"></a>
-<span class="sourceLineNo">275</span>    cleaner.chore();<a 
name="line.275"></a>
-<span class="sourceLineNo">276</span>    try (Table table = 
UTIL.getConnection().getTable(TableName.META_TABLE_NAME)) {<a 
name="line.276"></a>
-<span class="sourceLineNo">277</span>      assertFalse(table<a 
name="line.277"></a>
-<span class="sourceLineNo">278</span>        .exists(new 
Get(region.getRegionName()).addFamily(HConstants.REPLICATION_BARRIER_FAMILY)));<a
 name="line.278"></a>
-<span class="sourceLineNo">279</span>    }<a name="line.279"></a>
-<span class="sourceLineNo">280</span>  }<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span>  private static class WarnOnlyStoppable 
implements Stoppable {<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    @Override<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    public void stop(String why) {<a 
name="line.284"></a>
-<span class="sourceLineNo">285</span>      
LOG.warn("TestReplicationBarrierCleaner received stop, ignoring. Reason: " + 
why);<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    }<a name="line.286"></a>
+<span class="sourceLineNo">080</span>  private static final 
HBaseTestingUtility UTIL = new HBaseTestingUtility();<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span>  @Rule<a name="line.82"></a>
+<span class="sourceLineNo">083</span>  public final TestName name = new 
TestName();<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span>  @BeforeClass<a name="line.85"></a>
+<span class="sourceLineNo">086</span>  public static void setUpBeforeClass() 
throws Exception {<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    UTIL.startMiniCluster(1);<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>  }<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span>  @AfterClass<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  public static void tearDownAfterClass() 
throws Exception {<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    UTIL.shutdownMiniCluster();<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>  }<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span>  @After<a name="line.95"></a>
+<span class="sourceLineNo">096</span>  public void tearDown() throws 
IOException {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    try (Table table = 
UTIL.getConnection().getTable(TableName.META_TABLE_NAME);<a name="line.97"></a>
+<span class="sourceLineNo">098</span>      ResultScanner scanner = 
table.getScanner(new Scan().addFamily(HConstants.CATALOG_FAMILY)<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>        
.addFamily(HConstants.REPLICATION_BARRIER_FAMILY).setFilter(new 
FirstKeyOnlyFilter()))) {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>      for (;;) {<a name="line.100"></a>
+<span class="sourceLineNo">101</span>        Result result = scanner.next();<a 
name="line.101"></a>
+<span class="sourceLineNo">102</span>        if (result == null) {<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>          break;<a name="line.103"></a>
+<span class="sourceLineNo">104</span>        }<a name="line.104"></a>
+<span class="sourceLineNo">105</span>        TableName tableName = 
RegionInfo.getTable(result.getRow());<a name="line.105"></a>
+<span class="sourceLineNo">106</span>        if (!tableName.isSystemTable()) 
{<a name="line.106"></a>
+<span class="sourceLineNo">107</span>          table.delete(new 
Delete(result.getRow()));<a name="line.107"></a>
+<span class="sourceLineNo">108</span>        }<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>  }<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span>  private ReplicationPeerManager 
create(ReplicationQueueStorage queueStorage,<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      List&lt;String&gt; firstPeerIds, 
@SuppressWarnings("unchecked") List&lt;String&gt;... peerIds) {<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>    ReplicationPeerManager peerManager = 
mock(ReplicationPeerManager.class);<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    if (queueStorage != null) {<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>      
when(peerManager.getQueueStorage()).thenReturn(queueStorage);<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>    }<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    if (peerIds.length == 0) {<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>      
when(peerManager.getSerialPeerIdsBelongsTo(any(TableName.class))).thenReturn(firstPeerIds);<a
 name="line.120"></a>
+<span class="sourceLineNo">121</span>    } else {<a name="line.121"></a>
+<span class="sourceLineNo">122</span>      
when(peerManager.getSerialPeerIdsBelongsTo(any(TableName.class))).thenReturn(firstPeerIds,<a
 name="line.122"></a>
+<span class="sourceLineNo">123</span>        peerIds);<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    }<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    return peerManager;<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>  }<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span>  private ReplicationQueueStorage 
create(Long lastPushedSeqId, Long... lastPushedSeqIds)<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      throws ReplicationException {<a 
name="line.129"></a>
+<span class="sourceLineNo">130</span>    ReplicationQueueStorage queueStorage 
= mock(ReplicationQueueStorage.class);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    if (lastPushedSeqIds.length == 0) {<a 
name="line.131"></a>
+<span class="sourceLineNo">132</span>      
when(queueStorage.getLastSequenceId(anyString(), 
anyString())).thenReturn(lastPushedSeqId);<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    } else {<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      
when(queueStorage.getLastSequenceId(anyString(), 
anyString())).thenReturn(lastPushedSeqId,<a name="line.134"></a>
+<span class="sourceLineNo">135</span>        lastPushedSeqIds);<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>    }<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    return queueStorage;<a 
name="line.137"></a>
+<span class="sourceLineNo">138</span>  }<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span>  private ReplicationBarrierCleaner 
create(ReplicationPeerManager peerManager) throws IOException {<a 
name="line.140"></a>
+<span class="sourceLineNo">141</span>    return new 
ReplicationBarrierCleaner(UTIL.getConfiguration(), new WarnOnlyStoppable(),<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>      UTIL.getConnection(), 
peerManager);<a name="line.142"></a>
+<span class="sourceLineNo">143</span>  }<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>  private void addBarrier(RegionInfo 
region, long... barriers) throws IOException {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    Put put = new 
Put(region.getRegionName(), EnvironmentEdgeManager.currentTime());<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>    for (int i = 0; i &lt; 
barriers.length; i++) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      
put.addColumn(HConstants.REPLICATION_BARRIER_FAMILY, 
HConstants.SEQNUM_QUALIFIER,<a name="line.148"></a>
+<span class="sourceLineNo">149</span>        put.getTimestamp() - 
barriers.length + i, Bytes.toBytes(barriers[i]));<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    }<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    try (Table table = 
UTIL.getConnection().getTable(TableName.META_TABLE_NAME)) {<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>      table.put(put);<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>    }<a name="line.153"></a>
+<span class="sourceLineNo">154</span>  }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span>  private void 
fillCatalogFamily(RegionInfo region) throws IOException {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    try (Table table = 
UTIL.getConnection().getTable(TableName.META_TABLE_NAME)) {<a 
name="line.157"></a>
+<span class="sourceLineNo">158</span>      table.put(new 
Put(region.getRegionName()).addColumn(HConstants.CATALOG_FAMILY,<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>        Bytes.toBytes("whatever"), 
Bytes.toBytes("whatever")));<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    }<a name="line.160"></a>
+<span class="sourceLineNo">161</span>  }<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span>  private void 
clearCatalogFamily(RegionInfo region) throws IOException {<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>    try (Table table = 
UTIL.getConnection().getTable(TableName.META_TABLE_NAME)) {<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span>      table.delete(new 
Delete(region.getRegionName()).addFamily(HConstants.CATALOG_FAMILY));<a 
name="line.165"></a>
+<span class="sourceLineNo">166</span>    }<a name="line.166"></a>
+<span class="sourceLineNo">167</span>  }<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span>  @Test<a name="line.169"></a>
+<span class="sourceLineNo">170</span>  public void testNothing() throws 
IOException {<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    ReplicationPeerManager peerManager = 
mock(ReplicationPeerManager.class);<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    ReplicationBarrierCleaner cleaner = 
create(peerManager);<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    cleaner.chore();<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>    verify(peerManager, 
never()).getSerialPeerIdsBelongsTo(any(TableName.class));<a name="line.174"></a>
+<span class="sourceLineNo">175</span>    verify(peerManager, 
never()).getQueueStorage();<a name="line.175"></a>
+<span class="sourceLineNo">176</span>  }<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span>  @Test<a name="line.178"></a>
+<span class="sourceLineNo">179</span>  public void testCleanNoPeers() throws 
IOException {<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    TableName tableName1 = 
TableName.valueOf(name.getMethodName() + "_1");<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    RegionInfo region11 =<a 
name="line.181"></a>
+<span class="sourceLineNo">182</span>      
RegionInfoBuilder.newBuilder(tableName1).setEndKey(Bytes.toBytes(1)).build();<a 
name="line.182"></a>
+<span class="sourceLineNo">183</span>    addBarrier(region11, 10, 20, 30, 40, 
50, 60);<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    RegionInfo region12 =<a 
name="line.184"></a>
+<span class="sourceLineNo">185</span>      
RegionInfoBuilder.newBuilder(tableName1).setStartKey(Bytes.toBytes(1)).build();<a
 name="line.185"></a>
+<span class="sourceLineNo">186</span>    addBarrier(region12, 20, 30, 40, 50, 
60, 70);<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span>    TableName tableName2 = 
TableName.valueOf(name.getMethodName() + "_2");<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    RegionInfo region21 =<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>      
RegionInfoBuilder.newBuilder(tableName2).setEndKey(Bytes.toBytes(1)).build();<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>    addBarrier(region21, 100, 200, 300, 
400);<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    RegionInfo region22 =<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>      
RegionInfoBuilder.newBuilder(tableName2).setStartKey(Bytes.toBytes(1)).build();<a
 name="line.193"></a>
+<span class="sourceLineNo">194</span>    addBarrier(region22, 200, 300, 400, 
500, 600);<a name="line.194"></a>
+<span class="sourceLineNo">195</span><a name="line.195"></a>
+<span class="sourceLineNo">196</span>    @SuppressWarnings("unchecked")<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>    ReplicationPeerManager peerManager 
=<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      create(null, 
Collections.emptyList(), Collections.emptyList());<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    ReplicationBarrierCleaner cleaner = 
create(peerManager);<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    cleaner.chore();<a 
name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span>    // should never call this method<a 
name="line.202"></a>
+<span class="sourceLineNo">203</span>    verify(peerManager, 
never()).getQueueStorage();<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    // should only be called twice 
although we have 4 regions to clean<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    verify(peerManager, 
times(2)).getSerialPeerIdsBelongsTo(any(TableName.class));<a 
name="line.205"></a>
+<span class="sourceLineNo">206</span><a name="line.206"></a>
+<span class="sourceLineNo">207</span>    assertArrayEquals(new long[] { 60 
},<a name="line.207"></a>
+<span class="sourceLineNo">208</span>      
MetaTableAccessor.getReplicationBarrier(UTIL.getConnection(), 
region11.getRegionName()));<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    assertArrayEquals(new long[] { 70 
},<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      
MetaTableAccessor.getReplicationBarrier(UTIL.getConnection(), 
region12.getRegionName()));<a name="line.210"></a>
+<span class="sourceLineNo">211</span><a name="line.211"></a>
+<span class="sourceLineNo">212</span>    assertArrayEquals(new long[] { 400 
},<a name="line.212"></a>
+<span class="sourceLineNo">213</span>      
MetaTableAccessor.getReplicationBarrier(UTIL.getConnection(), 
region21.getRegionName()));<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    assertArrayEquals(new long[] { 600 
},<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      
MetaTableAccessor.getReplicationBarrier(UTIL.getConnection(), 
region22.getRegionName()));<a name="line.215"></a>
+<span class="sourceLineNo">216</span>  }<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span>  @Test<a name="line.218"></a>
+<span class="sourceLineNo">219</span>  public void testDeleteBarriers() throws 
IOException, ReplicationException {<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    RegionInfo region = 
RegionInfoBuilder.newBuilder(tableName).build();<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    addBarrier(region, 10, 20, 30, 40, 
50, 60);<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    // two peers<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    ReplicationQueueStorage queueStorage 
= create(-1L, 2L, 15L, 25L, 20L, 25L, 65L, 55L, 70L, 70L);<a 
name="line.224"></a>
+<span class="sourceLineNo">225</span>    List&lt;String&gt; peerIds = 
Lists.newArrayList("1", "2");<a name="line.225"></a>
+<span class="sourceLineNo">226</span><a name="line.226"></a>
+<span class="sourceLineNo">227</span>    @SuppressWarnings("unchecked")<a 
name="line.227"></a>
+<span class="sourceLineNo">228</span>    ReplicationPeerManager peerManager 
=<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      create(queueStorage, peerIds, 
peerIds, peerIds, peerIds, peerIds);<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    ReplicationBarrierCleaner cleaner = 
create(peerManager);<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span>    // beyond the first barrier, no 
deletion<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    cleaner.chore();<a 
name="line.233"></a>
+<span class="sourceLineNo">234</span>    assertArrayEquals(new long[] { 10, 
20, 30, 40, 50, 60 },<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      
MetaTableAccessor.getReplicationBarrier(UTIL.getConnection(), 
region.getRegionName()));<a name="line.235"></a>
+<span class="sourceLineNo">236</span><a name="line.236"></a>
+<span class="sourceLineNo">237</span>    // in the first range, still no 
deletion<a name="line.237"></a>
+<span class="sourceLineNo">238</span>    cleaner.chore();<a 
name="line.238"></a>
+<span class="sourceLineNo">239</span>    assertArrayEquals(new long[] { 10, 
20, 30, 40, 50, 60 },<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      
MetaTableAccessor.getReplicationBarrier(UTIL.getConnection(), 
region.getRegionName()));<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span>    // in the second range, 10 is 
deleted<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    cleaner.chore();<a 
name="line.243"></a>
+<span class="sourceLineNo">244</span>    assertArrayEquals(new long[] { 20, 
30, 40, 50, 60 },<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      
MetaTableAccessor.getReplicationBarrier(UTIL.getConnection(), 
region.getRegionName()));<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span>    // between 50 and 60, so the barriers 
before 50 will be deleted<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    cleaner.chore();<a 
name="line.248"></a>
+<span class="sourceLineNo">249</span>    assertArrayEquals(new long[] { 50, 60 
},<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      
MetaTableAccessor.getReplicationBarrier(UTIL.getConnection(), 
region.getRegionName()));<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span>    // in the last open range, 50 is 
deleted<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    cleaner.chore();<a 
name="line.253"></a>
+<span class="sourceLineNo">254</span>    assertArrayEquals(new long[] { 60 
},<a name="line.254"></a>
+<span class="sourceLineNo">255</span>      
MetaTableAccessor.getReplicationBarrier(UTIL.getConnection(), 
region.getRegionName()));<a name="line.255"></a>
+<span class="sourceLineNo">256</span>  }<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span>  @Test<a name="line.258"></a>
+<span class="sourceLineNo">259</span>  public void 
testDeleteRowForDeletedRegion() throws IOException, ReplicationException {<a 
name="line.259"></a>
+<span class="sourceLineNo">260</span>    TableName tableName = 
TableName.valueOf(name.getMethodName());<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    RegionInfo region = 
RegionInfoBuilder.newBuilder(tableName).build();<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    addBarrier(region, 40, 50, 60);<a 
name="line.262"></a>
+<span class="sourceLineNo">263</span>    fillCatalogFamily(region);<a 
name="line.263"></a>
+<span class="sourceLineNo">264</span><a name="line.264"></a>
+<span class="sourceLineNo">265</span>    String peerId = "1";<a 
name="line.265"></a>
+<span class="sourceLineNo">266</span>    ReplicationQueueStorage queueStorage 
= create(59L);<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    @SuppressWarnings("unchecked")<a 
name="line.267"></a>
+<span class="sourceLineNo">268</span>    ReplicationPeerManager peerManager = 
create(queueStorage, Lists.newArrayList(peerId));<a name="line.268"></a>
+<span class="sourceLineNo">269</span>    ReplicationBarrierCleaner cleaner = 
create(peerManager);<a name="line.269"></a>
+<span class="sourceLineNo">270</span><a name="line.270"></a>
+<span class="sourceLineNo">271</span>    // we have something in catalog 
family, so only delete 40<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    cleaner.chore();<a 
name="line.272"></a>
+<span class="sourceLineNo">273</span>    assertArrayEquals(new long[] { 50, 60 
},<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      
MetaTableAccessor.getReplicationBarrier(UTIL.getConnection(), 
region.getRegionName()));<a name="line.274"></a>
+<span class="sourceLineNo">275</span>    verify(queueStorage, 
never()).removeLastSequenceIds(anyString(), anyList());<a name="line.275"></a>
+<span class="sourceLineNo">276</span><a name="line.276"></a>
+<span class="sourceLineNo">277</span>    // No catalog family, then we should 
remove the whole row<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    clearCatalogFamily(region);<a 
name="line.278"></a>
+<span class="sourceLineNo">279</span>    cleaner.chore();<a 
name="line.279"></a>
+<span class="sourceLineNo">280</span>    try (Table table = 
UTIL.getConnection().getTable(TableName.META_TABLE_NAME)) {<a 
name="line.280"></a>
+<span class="sourceLineNo">281</span>      assertFalse(table<a 
name="line.281"></a>
+<span class="sourceLineNo">282</span>        .exists(new 
Get(region.getRegionName()).addFamily(HConstants.REPLICATION_BARRIER_FAMILY)));<a
 name="line.282"></a>
+<span class="sourceLineNo">283</span>    }<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    verify(queueStorage, 
times(1)).removeLastSequenceIds(peerId,<a name="line.284"></a>
+<span class="sourceLineNo">285</span>      
Arrays.asList(region.getEncodedName()));<a name="line.285"></a>
+<span class="sourceLineNo">286</span>  }<a name="line.286"></a>
 <span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>    @Override<a name="line.288"></a>
-<span class="sourceLineNo">289</span>    public boolean isStopped() {<a 
name="line.289"></a>
-<span class="sourceLineNo">290</span>      return false;<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    }<a name="line.291"></a>
-<span class="sourceLineNo">292</span>  }<a name="line.292"></a>
-<span class="sourceLineNo">293</span>}<a name="line.293"></a>
+<span class="sourceLineNo">288</span>  private static class WarnOnlyStoppable 
implements Stoppable {<a name="line.288"></a>
+<span class="sourceLineNo">289</span>    @Override<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    public void stop(String why) {<a 
name="line.290"></a>
+<span class="sourceLineNo">291</span>      
LOG.warn("TestReplicationBarrierCleaner received stop, ignoring. Reason: " + 
why);<a name="line.291"></a>
+<span class="sourceLineNo">292</span>    }<a name="line.292"></a>
+<span class="sourceLineNo">293</span><a name="line.293"></a>
+<span class="sourceLineNo">294</span>    @Override<a name="line.294"></a>
+<span class="sourceLineNo">295</span>    public boolean isStopped() {<a 
name="line.295"></a>
+<span class="sourceLineNo">296</span>      return false;<a name="line.296"></a>
+<span class="sourceLineNo">297</span>    }<a name="line.297"></a>
+<span class="sourceLineNo">298</span>  }<a name="line.298"></a>
+<span class="sourceLineNo">299</span>}<a name="line.299"></a>
 
 
 

Reply via email to