http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c13644e5/testdevapidocs/overview-tree.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/overview-tree.html 
b/testdevapidocs/overview-tree.html
index 6540205..e0fe3dd 100644
--- a/testdevapidocs/overview-tree.html
+++ b/testdevapidocs/overview-tree.html
@@ -3136,6 +3136,7 @@
 <li type="circle">org.apache.hadoop.hbase.replication.<a 
href="org/apache/hadoop/hbase/replication/TestReplicationChangingPeerRegionservers.html"
 title="class in org.apache.hadoop.hbase.replication"><span 
class="typeNameLink">TestReplicationChangingPeerRegionservers</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.replication.<a 
href="org/apache/hadoop/hbase/replication/TestReplicationDisableInactivePeer.html"
 title="class in org.apache.hadoop.hbase.replication"><span 
class="typeNameLink">TestReplicationDisableInactivePeer</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.replication.<a 
href="org/apache/hadoop/hbase/replication/TestReplicationDroppedTables.html" 
title="class in org.apache.hadoop.hbase.replication"><span 
class="typeNameLink">TestReplicationDroppedTables</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.replication.<a 
href="org/apache/hadoop/hbase/replication/TestReplicationEmptyWALRecovery.html" 
title="class in org.apache.hadoop.hbase.replication"><span 
class="typeNameLink">TestReplicationEmptyWALRecovery</span></a></li>
 <li type="circle">org.apache.hadoop.hbase.replication.<a 
href="org/apache/hadoop/hbase/replication/TestReplicationEndpoint.html" 
title="class in org.apache.hadoop.hbase.replication"><span 
class="typeNameLink">TestReplicationEndpoint</span></a>
 <ul>
 <li type="circle">org.apache.hadoop.hbase.replication.multiwal.<a 
href="org/apache/hadoop/hbase/replication/multiwal/TestReplicationEndpointWithMultipleAsyncWAL.html"
 title="class in org.apache.hadoop.hbase.replication.multiwal"><span 
class="typeNameLink">TestReplicationEndpointWithMultipleAsyncWAL</span></a></li>
@@ -3167,6 +3168,7 @@
 </ul>
 </li>
 <li type="circle">org.apache.hadoop.hbase.replication.regionserver.<a 
href="org/apache/hadoop/hbase/replication/regionserver/TestReplicator.html" 
title="class in org.apache.hadoop.hbase.replication.regionserver"><span 
class="typeNameLink">TestReplicator</span></a></li>
+<li type="circle">org.apache.hadoop.hbase.replication.<a 
href="org/apache/hadoop/hbase/replication/TestVerifyReplication.html" 
title="class in org.apache.hadoop.hbase.replication"><span 
class="typeNameLink">TestVerifyReplication</span></a></li>
 </ul>
 </li>
 <li type="circle">org.apache.hadoop.hbase.replication.<a 
href="org/apache/hadoop/hbase/replication/TestReplicationEndpoint.EverythingPassesWALEntryFilter.html"
 title="class in org.apache.hadoop.hbase.replication"><span 
class="typeNameLink">TestReplicationEndpoint.EverythingPassesWALEntryFilter</span></a>
 (implements org.apache.hadoop.hbase.replication.WALEntryFilter)

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c13644e5/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.html
index 1047518..ddadba0 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/client/TestZKAsyncRegistry.html
@@ -55,97 +55,100 @@
 <span class="sourceLineNo">047</span>import org.slf4j.Logger;<a 
name="line.47"></a>
 <span class="sourceLineNo">048</span>import org.slf4j.LoggerFactory;<a 
name="line.48"></a>
 <span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span>@Category({ MediumTests.class, 
ClientTests.class })<a name="line.50"></a>
-<span class="sourceLineNo">051</span>public class TestZKAsyncRegistry {<a 
name="line.51"></a>
-<span class="sourceLineNo">052</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TestZKAsyncRegistry.class);<a name="line.52"></a>
-<span class="sourceLineNo">053</span>  private static final 
HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>  private static ZKAsyncRegistry 
REGISTRY;<a name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span>  // waits for all replicas to have 
region location<a name="line.57"></a>
-<span class="sourceLineNo">058</span>  static void 
waitUntilAllReplicasHavingRegionLocation(TableName tbl) throws IOException {<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span>    TEST_UTIL.waitFor(<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span>      
TEST_UTIL.getConfiguration().getLong("hbase.client.sync.wait.timeout.msec", 
60000), 200, true,<a name="line.60"></a>
-<span class="sourceLineNo">061</span>      new 
ExplainingPredicate&lt;IOException&gt;() {<a name="line.61"></a>
-<span class="sourceLineNo">062</span>        @Override<a name="line.62"></a>
-<span class="sourceLineNo">063</span>        public String explainFailure() 
throws IOException {<a name="line.63"></a>
-<span class="sourceLineNo">064</span>          return 
TEST_UTIL.explainTableAvailability(tbl);<a name="line.64"></a>
-<span class="sourceLineNo">065</span>        }<a name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span>        @Override<a name="line.67"></a>
-<span class="sourceLineNo">068</span>        public boolean evaluate() throws 
IOException {<a name="line.68"></a>
-<span class="sourceLineNo">069</span>          AtomicBoolean ready = new 
AtomicBoolean(true);<a name="line.69"></a>
-<span class="sourceLineNo">070</span>          try {<a name="line.70"></a>
-<span class="sourceLineNo">071</span>            RegionLocations locs = 
REGISTRY.getMetaRegionLocation().get();<a name="line.71"></a>
-<span class="sourceLineNo">072</span>            assertEquals(3, 
locs.getRegionLocations().length);<a name="line.72"></a>
-<span class="sourceLineNo">073</span>            IntStream.range(0, 
3).forEach(i -&gt; {<a name="line.73"></a>
-<span class="sourceLineNo">074</span>              HRegionLocation loc = 
locs.getRegionLocation(i);<a name="line.74"></a>
-<span class="sourceLineNo">075</span>              if (loc == null) {<a 
name="line.75"></a>
-<span class="sourceLineNo">076</span>                ready.set(false);<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>              }<a name="line.77"></a>
-<span class="sourceLineNo">078</span>            });<a name="line.78"></a>
-<span class="sourceLineNo">079</span>          } catch (Exception e) {<a 
name="line.79"></a>
-<span class="sourceLineNo">080</span>            ready.set(false);<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>          }<a name="line.81"></a>
-<span class="sourceLineNo">082</span>          return ready.get();<a 
name="line.82"></a>
-<span class="sourceLineNo">083</span>        }<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      });<a name="line.84"></a>
-<span class="sourceLineNo">085</span>  }<a name="line.85"></a>
-<span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span>  @BeforeClass<a name="line.87"></a>
-<span class="sourceLineNo">088</span>  public static void setUp() throws 
Exception {<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    
TEST_UTIL.getConfiguration().setInt(META_REPLICAS_NUM, 3);<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    TEST_UTIL.startMiniCluster(3);<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>    REGISTRY = new 
ZKAsyncRegistry(TEST_UTIL.getConfiguration());<a name="line.91"></a>
-<span class="sourceLineNo">092</span>  }<a name="line.92"></a>
-<span class="sourceLineNo">093</span><a name="line.93"></a>
-<span class="sourceLineNo">094</span>  @AfterClass<a name="line.94"></a>
-<span class="sourceLineNo">095</span>  public static void tearDown() throws 
Exception {<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    IOUtils.closeQuietly(REGISTRY);<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span>    TEST_UTIL.shutdownMiniCluster();<a 
name="line.97"></a>
-<span class="sourceLineNo">098</span>  }<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>  @Test<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  public void test() throws 
InterruptedException, ExecutionException, IOException {<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    LOG.info("STARTED TEST");<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>    String clusterId = 
REGISTRY.getClusterId().get();<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    String expectedClusterId = 
TEST_UTIL.getHBaseCluster().getMaster().getClusterId();<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    assertEquals("Expected " + 
expectedClusterId + ", found=" + clusterId,<a name="line.105"></a>
-<span class="sourceLineNo">106</span>        expectedClusterId, clusterId);<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>    
assertEquals(TEST_UTIL.getHBaseCluster().getClusterStatus().getServersSize(),<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>      
REGISTRY.getCurrentNrHRS().get().intValue());<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    
assertEquals(TEST_UTIL.getHBaseCluster().getMaster().getServerName(),<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>      
REGISTRY.getMasterAddress().get());<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    assertEquals(-1, 
REGISTRY.getMasterInfoPort().get().intValue());<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    
waitUntilAllReplicasHavingRegionLocation(TableName.META_TABLE_NAME);<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>    RegionLocations locs = 
REGISTRY.getMetaRegionLocation().get();<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    assertEquals(3, 
locs.getRegionLocations().length);<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    IntStream.range(0, 3).forEach(i -&gt; 
{<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      HRegionLocation loc = 
locs.getRegionLocation(i);<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      assertNotNull("Replica " + i + " 
doesn't have location", loc);<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      
assertEquals(TableName.META_TABLE_NAME, loc.getRegion().getTable());<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>      assertEquals(i, 
loc.getRegion().getReplicaId());<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    });<a name="line.120"></a>
-<span class="sourceLineNo">121</span>  }<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span>  @Test<a name="line.123"></a>
-<span class="sourceLineNo">124</span>  public void 
testIndependentZKConnections() throws IOException {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>    ReadOnlyZKClient zk1 = 
REGISTRY.getZKClient();<a name="line.125"></a>
-<span class="sourceLineNo">126</span><a name="line.126"></a>
-<span class="sourceLineNo">127</span>    Configuration otherConf = new 
Configuration(TEST_UTIL.getConfiguration());<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    
otherConf.set(HConstants.ZOOKEEPER_QUORUM, "127.0.0.1");<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    try (ZKAsyncRegistry otherRegistry = 
new ZKAsyncRegistry(otherConf)) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      ReadOnlyZKClient zk2 = 
otherRegistry.getZKClient();<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span>      assertNotSame("Using a different 
configuration / quorum should result in different backing " +<a 
name="line.132"></a>
-<span class="sourceLineNo">133</span>          "zk connection.",<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>        zk1, zk2);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      assertNotEquals(<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>        "Using a different configrution / 
quorum should be reflected in the " + "zk connection.",<a name="line.136"></a>
-<span class="sourceLineNo">137</span>        zk1.getConnectString(), 
zk2.getConnectString());<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>}<a name="line.140"></a>
+<span class="sourceLineNo">050</span>/**<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * Test the ZooKeeper Async Registry.<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span> */<a name="line.52"></a>
+<span class="sourceLineNo">053</span>@Category({ MediumTests.class, 
ClientTests.class })<a name="line.53"></a>
+<span class="sourceLineNo">054</span>public class TestZKAsyncRegistry {<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TestZKAsyncRegistry.class);<a name="line.55"></a>
+<span class="sourceLineNo">056</span>  private static final 
HBaseTestingUtility TEST_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 ZKAsyncRegistry 
REGISTRY;<a name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span>  // waits for all replicas to have 
region location<a name="line.60"></a>
+<span class="sourceLineNo">061</span>  static void 
waitUntilAllReplicasHavingRegionLocation(TableName tbl) throws IOException {<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>    TEST_UTIL.waitFor(<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span>      
TEST_UTIL.getConfiguration().getLong("hbase.client.sync.wait.timeout.msec", 
60000), 200, true,<a name="line.63"></a>
+<span class="sourceLineNo">064</span>      new 
ExplainingPredicate&lt;IOException&gt;() {<a name="line.64"></a>
+<span class="sourceLineNo">065</span>        @Override<a name="line.65"></a>
+<span class="sourceLineNo">066</span>        public String explainFailure() 
throws IOException {<a name="line.66"></a>
+<span class="sourceLineNo">067</span>          return 
TEST_UTIL.explainTableAvailability(tbl);<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 boolean evaluate() throws 
IOException {<a name="line.71"></a>
+<span class="sourceLineNo">072</span>          AtomicBoolean ready = new 
AtomicBoolean(true);<a name="line.72"></a>
+<span class="sourceLineNo">073</span>          try {<a name="line.73"></a>
+<span class="sourceLineNo">074</span>            RegionLocations locs = 
REGISTRY.getMetaRegionLocation().get();<a name="line.74"></a>
+<span class="sourceLineNo">075</span>            assertEquals(3, 
locs.getRegionLocations().length);<a name="line.75"></a>
+<span class="sourceLineNo">076</span>            IntStream.range(0, 
3).forEach(i -&gt; {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>              HRegionLocation loc = 
locs.getRegionLocation(i);<a name="line.77"></a>
+<span class="sourceLineNo">078</span>              if (loc == null) {<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>                ready.set(false);<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>          } catch (Exception e) {<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>            ready.set(false);<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>          }<a name="line.84"></a>
+<span class="sourceLineNo">085</span>          return ready.get();<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>  }<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span>  @BeforeClass<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  public static void setUp() throws 
Exception {<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    
TEST_UTIL.getConfiguration().setInt(META_REPLICAS_NUM, 3);<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    TEST_UTIL.startMiniCluster(3);<a 
name="line.93"></a>
+<span class="sourceLineNo">094</span>    REGISTRY = new 
ZKAsyncRegistry(TEST_UTIL.getConfiguration());<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>  @AfterClass<a name="line.97"></a>
+<span class="sourceLineNo">098</span>  public static void tearDown() throws 
Exception {<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    IOUtils.closeQuietly(REGISTRY);<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span>    TEST_UTIL.shutdownMiniCluster();<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>  }<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span>  @Test<a name="line.103"></a>
+<span class="sourceLineNo">104</span>  public void test() throws 
InterruptedException, ExecutionException, IOException {<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    LOG.info("STARTED TEST");<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>    String clusterId = 
REGISTRY.getClusterId().get();<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    String expectedClusterId = 
TEST_UTIL.getHBaseCluster().getMaster().getClusterId();<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    assertEquals("Expected " + 
expectedClusterId + ", found=" + clusterId,<a name="line.108"></a>
+<span class="sourceLineNo">109</span>        expectedClusterId, clusterId);<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>    
assertEquals(TEST_UTIL.getHBaseCluster().getClusterStatus().getServersSize(),<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>      
REGISTRY.getCurrentNrHRS().get().intValue());<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    
assertEquals(TEST_UTIL.getHBaseCluster().getMaster().getServerName(),<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>      
REGISTRY.getMasterAddress().get());<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    assertEquals(-1, 
REGISTRY.getMasterInfoPort().get().intValue());<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    
waitUntilAllReplicasHavingRegionLocation(TableName.META_TABLE_NAME);<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>    RegionLocations locs = 
REGISTRY.getMetaRegionLocation().get();<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    assertEquals(3, 
locs.getRegionLocations().length);<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    IntStream.range(0, 3).forEach(i -&gt; 
{<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      HRegionLocation loc = 
locs.getRegionLocation(i);<a name="line.119"></a>
+<span class="sourceLineNo">120</span>      assertNotNull("Replica " + i + " 
doesn't have location", loc);<a name="line.120"></a>
+<span class="sourceLineNo">121</span>      
assertEquals(TableName.META_TABLE_NAME, loc.getRegion().getTable());<a 
name="line.121"></a>
+<span class="sourceLineNo">122</span>      assertEquals(i, 
loc.getRegion().getReplicaId());<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    });<a name="line.123"></a>
+<span class="sourceLineNo">124</span>  }<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span>  @Test<a name="line.126"></a>
+<span class="sourceLineNo">127</span>  public void 
testIndependentZKConnections() throws IOException {<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    ReadOnlyZKClient zk1 = 
REGISTRY.getZKClient();<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span>    Configuration otherConf = new 
Configuration(TEST_UTIL.getConfiguration());<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    
otherConf.set(HConstants.ZOOKEEPER_QUORUM, "127.0.0.1");<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    try (ZKAsyncRegistry otherRegistry = 
new ZKAsyncRegistry(otherConf)) {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      ReadOnlyZKClient zk2 = 
otherRegistry.getZKClient();<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>      assertNotSame("Using a different 
configuration / quorum should result in different backing " +<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>          "zk connection.",<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>        zk1, zk2);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      assertNotEquals(<a 
name="line.138"></a>
+<span class="sourceLineNo">139</span>        "Using a different configrution / 
quorum should be reflected in the " + "zk connection.",<a name="line.139"></a>
+<span class="sourceLineNo">140</span>        zk1.getConnectString(), 
zk2.getConnectString());<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c13644e5/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationBase.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationBase.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationBase.html
index 810175e..1eb2d37 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationBase.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationBase.html
@@ -26,179 +26,304 @@
 <span class="sourceLineNo">018</span> */<a name="line.18"></a>
 <span class="sourceLineNo">019</span>package 
org.apache.hadoop.hbase.replication;<a name="line.19"></a>
 <span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>import java.util.Arrays;<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 java.util.NavigableMap;<a 
name="line.23"></a>
-<span class="sourceLineNo">024</span>import java.util.TreeMap;<a 
name="line.24"></a>
-<span class="sourceLineNo">025</span><a name="line.25"></a>
-<span class="sourceLineNo">026</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.HColumnDescriptor;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.HTableDescriptor;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.client.Admin;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.client.Table;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.client.replication.ReplicationAdmin;<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.wal.AbstractFSWALProvider;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.zookeeper.ZKWatcher;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.junit.AfterClass;<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.junit.BeforeClass;<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>import 
org.junit.runners.Parameterized.Parameter;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import 
org.junit.runners.Parameterized.Parameters;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.slf4j.Logger;<a 
name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.slf4j.LoggerFactory;<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span><a name="line.48"></a>
-<span class="sourceLineNo">049</span>/**<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * This class is only a base for other 
integration-level replication tests.<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * Do not add tests here.<a 
name="line.51"></a>
-<span class="sourceLineNo">052</span> * TestReplicationSmallTests is where 
tests that don't require bring machines up/down should go<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * All other tests should have their own 
classes and extend this one<a name="line.53"></a>
-<span class="sourceLineNo">054</span> */<a name="line.54"></a>
-<span class="sourceLineNo">055</span>public class TestReplicationBase {<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>    ((Log4JLogger) 
ReplicationSource.LOG).getLogger().setLevel(Level.ALL);<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  }*/<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TestReplicationBase.class);<a name="line.61"></a>
+<span class="sourceLineNo">021</span>import static 
org.junit.Assert.assertArrayEquals;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import static 
org.junit.Assert.assertEquals;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import static org.junit.Assert.fail;<a 
name="line.23"></a>
+<span class="sourceLineNo">024</span><a name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.io.IOException;<a 
name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.ArrayList;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.util.Arrays;<a 
name="line.27"></a>
+<span class="sourceLineNo">028</span>import java.util.List;<a 
name="line.28"></a>
+<span class="sourceLineNo">029</span>import java.util.NavigableMap;<a 
name="line.29"></a>
+<span class="sourceLineNo">030</span>import java.util.TreeMap;<a 
name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.client.Admin;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<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.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.client.TableDescriptor;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import 
org.apache.hadoop.hbase.client.TableDescriptorBuilder;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.client.replication.ReplicationAdmin;<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import 
org.apache.hadoop.hbase.util.JVMClusterUtil;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import 
org.apache.hadoop.hbase.wal.AbstractFSWALProvider;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import 
org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import 
org.apache.hadoop.hbase.zookeeper.ZKWatcher;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.junit.AfterClass;<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.junit.BeforeClass;<a 
name="line.57"></a>
+<span class="sourceLineNo">058</span>import 
org.junit.runners.Parameterized.Parameter;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import 
org.junit.runners.Parameterized.Parameters;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.slf4j.Logger;<a 
name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.slf4j.LoggerFactory;<a 
name="line.61"></a>
 <span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span>  protected static Configuration conf1 = 
HBaseConfiguration.create();<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  protected static Configuration conf2;<a 
name="line.64"></a>
-<span class="sourceLineNo">065</span>  protected static Configuration 
CONF_WITH_LOCALFS;<a name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span>  protected static ZKWatcher zkw1;<a 
name="line.67"></a>
-<span class="sourceLineNo">068</span>  protected static ZKWatcher zkw2;<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>  protected static ReplicationAdmin 
admin;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  protected static Admin hbaseAdmin;<a 
name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span>  protected static Table htable1;<a 
name="line.73"></a>
-<span class="sourceLineNo">074</span>  protected static Table htable2;<a 
name="line.74"></a>
-<span class="sourceLineNo">075</span>  protected static 
NavigableMap&lt;byte[], Integer&gt; scopes;<a name="line.75"></a>
+<span class="sourceLineNo">063</span>/**<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * This class is only a base for other 
integration-level replication tests.<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * Do not add tests here.<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span> * TestReplicationSmallTests is where 
tests that don't require bring machines up/down should go<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * All other tests should have their own 
classes and extend this one<a name="line.67"></a>
+<span class="sourceLineNo">068</span> */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>public class TestReplicationBase {<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>    ((Log4JLogger) 
ReplicationSource.LOG).getLogger().setLevel(Level.ALL);<a name="line.72"></a>
+<span class="sourceLineNo">073</span>  }*/<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TestReplicationBase.class);<a name="line.75"></a>
 <span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span>  protected static HBaseTestingUtility 
utility1;<a name="line.77"></a>
-<span class="sourceLineNo">078</span>  protected static HBaseTestingUtility 
utility2;<a name="line.78"></a>
-<span class="sourceLineNo">079</span>  protected static final int 
NB_ROWS_IN_BATCH = 100;<a name="line.79"></a>
-<span class="sourceLineNo">080</span>  protected static final int 
NB_ROWS_IN_BIG_BATCH =<a name="line.80"></a>
-<span class="sourceLineNo">081</span>      NB_ROWS_IN_BATCH * 10;<a 
name="line.81"></a>
-<span class="sourceLineNo">082</span>  protected static final long SLEEP_TIME 
= 500;<a name="line.82"></a>
-<span class="sourceLineNo">083</span>  protected static final int NB_RETRIES = 
10;<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span>  protected static final TableName 
tableName = TableName.valueOf("test");<a name="line.85"></a>
-<span class="sourceLineNo">086</span>  protected static final byte[] famName = 
Bytes.toBytes("f");<a name="line.86"></a>
-<span class="sourceLineNo">087</span>  protected static final byte[] row = 
Bytes.toBytes("row");<a name="line.87"></a>
-<span class="sourceLineNo">088</span>  protected static final byte[] 
noRepfamName = Bytes.toBytes("norep");<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>  @Parameter<a name="line.90"></a>
-<span class="sourceLineNo">091</span>  public static boolean 
seperateOldWALs;<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span>  @Parameters<a name="line.93"></a>
-<span class="sourceLineNo">094</span>  public static List&lt;Boolean&gt; 
params() {<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    return Arrays.asList(false, true);<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>   * @throws java.lang.Exception<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>   */<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  @BeforeClass<a name="line.101"></a>
-<span class="sourceLineNo">102</span>  public static void setUpBeforeClass() 
throws Exception {<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    
conf1.set(HConstants.ZOOKEEPER_ZNODE_PARENT, "/1");<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    // We don't want too many edits per 
batch sent to the ReplicationEndpoint to trigger<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    // sufficient number of events. But 
we don't want to go too low because<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    // 
HBaseInterClusterReplicationEndpoint partitions entries into batches and we 
want<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    // more than one batch sent to the 
peer cluster for better testing.<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    
conf1.setInt("replication.source.size.capacity", 102400);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    
conf1.setLong("replication.source.sleepforretries", 100);<a name="line.109"></a>
-<span class="sourceLineNo">110</span>    
conf1.setInt("hbase.regionserver.maxlogs", 10);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    
conf1.setLong("hbase.master.logcleaner.ttl", 10);<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    
conf1.setInt("zookeeper.recovery.retry", 1);<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    
conf1.setInt("zookeeper.recovery.retry.intervalmill", 10);<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>    
conf1.setLong(HConstants.THREAD_WAKE_FREQUENCY, 100);<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    
conf1.setInt("replication.stats.thread.period.seconds", 5);<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>    
conf1.setBoolean("hbase.tests.use.shortcircuit.reads", false);<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>    
conf1.setLong("replication.sleep.before.failover", 2000);<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    
conf1.setInt("replication.source.maxretriesmultiplier", 10);<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>    
conf1.setFloat("replication.source.ratio", 1.0f);<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    
conf1.setBoolean("replication.source.eof.autorecovery", true);<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span>    // Parameter config<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>    
conf1.setBoolean(AbstractFSWALProvider.SEPARATE_OLDLOGDIR, seperateOldWALs);<a 
name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span>    utility1 = new 
HBaseTestingUtility(conf1);<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    utility1.startMiniZKCluster();<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>    MiniZooKeeperCluster miniZK = 
utility1.getZkCluster();<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    // Have to reget conf1 in case zk 
cluster location different<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    // than default<a name="line.129"></a>
-<span class="sourceLineNo">130</span>    conf1 = 
utility1.getConfiguration();<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    zkw1 = new ZKWatcher(conf1, 
"cluster1", null, true);<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    admin = new 
ReplicationAdmin(conf1);<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    LOG.info("Setup first Zk");<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span>    // Base conf2 on conf1 so it gets the 
right zk cluster.<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    conf2 = 
HBaseConfiguration.create(conf1);<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    
conf2.set(HConstants.ZOOKEEPER_ZNODE_PARENT, "/2");<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    
conf2.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 6);<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    
conf2.setBoolean("hbase.tests.use.shortcircuit.reads", false);<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>    utility2 = new 
HBaseTestingUtility(conf2);<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    utility2.setZkCluster(miniZK);<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>    zkw2 = new ZKWatcher(conf2, 
"cluster2", null, true);<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    LOG.info("Setup second Zk");<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span>    CONF_WITH_LOCALFS = 
HBaseConfiguration.create(conf1);<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    utility1.startMiniCluster(2);<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span>    // Have a bunch of slave servers, 
because inter-cluster shipping logic uses number of sinks<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    // as a component in deciding maximum 
number of parallel batches to send to the peer cluster.<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    utility2.startMiniCluster(4);<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>    ReplicationPeerConfig rpc = new 
ReplicationPeerConfig();<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    
rpc.setClusterKey(utility2.getClusterKey());<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    hbaseAdmin = 
ConnectionFactory.createConnection(conf1).getAdmin();<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    hbaseAdmin.addReplicationPeer("2", 
rpc);<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span>    HTableDescriptor table = new 
HTableDescriptor(tableName);<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    HColumnDescriptor fam = new 
HColumnDescriptor(famName);<a name="line.158"></a>
-<span class="sourceLineNo">159</span>    fam.setMaxVersions(100);<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>    
fam.setScope(HConstants.REPLICATION_SCOPE_GLOBAL);<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    table.addFamily(fam);<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>    fam = new 
HColumnDescriptor(noRepfamName);<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    table.addFamily(fam);<a 
name="line.163"></a>
-<span class="sourceLineNo">164</span>    scopes = new 
TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    for(HColumnDescriptor f : 
table.getColumnFamilies()) {<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      scopes.put(f.getName(), 
f.getScope());<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    }<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    Connection connection1 = 
ConnectionFactory.createConnection(conf1);<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    Connection connection2 = 
ConnectionFactory.createConnection(conf2);<a name="line.169"></a>
-<span class="sourceLineNo">170</span>    try (Admin admin1 = 
connection1.getAdmin()) {<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      admin1.createTable(table, 
HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    }<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    try (Admin admin2 = 
connection2.getAdmin()) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span>      admin2.createTable(table, 
HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE);<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    }<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    
utility1.waitUntilAllRegionsAssigned(tableName);<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    
utility2.waitUntilAllRegionsAssigned(tableName);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    htable1 = 
connection1.getTable(tableName);<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    htable2 = 
connection2.getTable(tableName);<a name="line.179"></a>
-<span class="sourceLineNo">180</span>  }<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span>  /**<a name="line.182"></a>
-<span class="sourceLineNo">183</span>   * @throws java.lang.Exception<a 
name="line.183"></a>
-<span class="sourceLineNo">184</span>   */<a name="line.184"></a>
-<span class="sourceLineNo">185</span>  @AfterClass<a name="line.185"></a>
-<span class="sourceLineNo">186</span>  public static void tearDownAfterClass() 
throws Exception {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    htable2.close();<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>    htable1.close();<a 
name="line.188"></a>
-<span class="sourceLineNo">189</span>    admin.close();<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    utility2.shutdownMiniCluster();<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>    utility1.shutdownMiniCluster();<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>  }<a name="line.192"></a>
-<span class="sourceLineNo">193</span>}<a name="line.193"></a>
+<span class="sourceLineNo">077</span>  protected static Configuration conf1 = 
HBaseConfiguration.create();<a name="line.77"></a>
+<span class="sourceLineNo">078</span>  protected static Configuration conf2;<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>  protected static Configuration 
CONF_WITH_LOCALFS;<a name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span>  protected static ZKWatcher zkw1;<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>  protected static ZKWatcher zkw2;<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span>  protected static ReplicationAdmin 
admin;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  protected static Admin hbaseAdmin;<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span>  protected static Table htable1;<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>  protected static Table htable2;<a 
name="line.88"></a>
+<span class="sourceLineNo">089</span>  protected static 
NavigableMap&lt;byte[], Integer&gt; scopes;<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span>  protected static HBaseTestingUtility 
utility1;<a name="line.91"></a>
+<span class="sourceLineNo">092</span>  protected static HBaseTestingUtility 
utility2;<a name="line.92"></a>
+<span class="sourceLineNo">093</span>  protected static final int 
NB_ROWS_IN_BATCH = 100;<a name="line.93"></a>
+<span class="sourceLineNo">094</span>  protected static final int 
NB_ROWS_IN_BIG_BATCH =<a name="line.94"></a>
+<span class="sourceLineNo">095</span>      NB_ROWS_IN_BATCH * 10;<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span>  protected static final long SLEEP_TIME 
= 500;<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  protected static final int NB_RETRIES = 
10;<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>  protected static final TableName 
tableName = TableName.valueOf("test");<a name="line.99"></a>
+<span class="sourceLineNo">100</span>  protected static final byte[] famName = 
Bytes.toBytes("f");<a name="line.100"></a>
+<span class="sourceLineNo">101</span>  protected static final byte[] row = 
Bytes.toBytes("row");<a name="line.101"></a>
+<span class="sourceLineNo">102</span>  protected static final byte[] 
noRepfamName = Bytes.toBytes("norep");<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span>  @Parameter<a name="line.104"></a>
+<span class="sourceLineNo">105</span>  public static boolean 
seperateOldWALs;<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span>  @Parameters<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  public static List&lt;Boolean&gt; 
params() {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    return Arrays.asList(false, true);<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>  protected final void cleanUp() throws 
IOException, InterruptedException {<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    // Starting and stopping replication 
can make us miss new logs,<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    // rolling like this makes sure the 
most recent one gets added to the queue<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    for 
(JVMClusterUtil.RegionServerThread r : utility1.getHBaseCluster()<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>        .getRegionServerThreads()) {<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>      
utility1.getAdmin().rollWALWriter(r.getRegionServer().getServerName());<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>    }<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    int rowCount = 
utility1.countRows(tableName);<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    
utility1.deleteTableData(tableName);<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    // truncating the table will send one 
Delete per row to the slave cluster<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    // in an async fashion, which is why 
we cannot just call deleteTableData on<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    // utility2 since late writes could 
make it to the slave in some way.<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    // Instead, we truncate the first 
table and wait for all the Deletes to<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    // make it to the slave.<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>    Scan scan = new Scan();<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>    int lastCount = 0;<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>    for (int i = 0; i &lt; NB_RETRIES; 
i++) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      if (i == NB_RETRIES - 1) {<a 
name="line.129"></a>
+<span class="sourceLineNo">130</span>        fail("Waited too much time for 
truncate");<a name="line.130"></a>
+<span class="sourceLineNo">131</span>      }<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      ResultScanner scanner = 
htable2.getScanner(scan);<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      Result[] res = 
scanner.next(rowCount);<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      scanner.close();<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>      if (res.length != 0) {<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>        if (res.length &lt; lastCount) 
{<a name="line.136"></a>
+<span class="sourceLineNo">137</span>          i--; // Don't increment timeout 
if we make progress<a name="line.137"></a>
+<span class="sourceLineNo">138</span>        }<a name="line.138"></a>
+<span class="sourceLineNo">139</span>        lastCount = res.length;<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span>        LOG.info("Still got " + 
res.length + " rows");<a name="line.140"></a>
+<span class="sourceLineNo">141</span>        Thread.sleep(SLEEP_TIME);<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>      } else {<a name="line.142"></a>
+<span class="sourceLineNo">143</span>        break;<a name="line.143"></a>
+<span class="sourceLineNo">144</span>      }<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    }<a name="line.145"></a>
+<span class="sourceLineNo">146</span>  }<a name="line.146"></a>
+<span class="sourceLineNo">147</span><a name="line.147"></a>
+<span class="sourceLineNo">148</span>  protected static void 
waitForReplication(int expectedRows, int retries)<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      throws IOException, 
InterruptedException {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>    Scan scan;<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    for (int i = 0; i &lt; retries; i++) 
{<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      scan = new Scan();<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>      if (i== retries -1) {<a 
name="line.153"></a>
+<span class="sourceLineNo">154</span>        fail("Waited too much time for 
normal batch replication");<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      }<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      ResultScanner scanner = 
htable2.getScanner(scan);<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      Result[] res = 
scanner.next(expectedRows);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      scanner.close();<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>      if (res.length != expectedRows) {<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>        LOG.info("Only got " + res.length 
+ " rows");<a name="line.160"></a>
+<span class="sourceLineNo">161</span>        Thread.sleep(SLEEP_TIME);<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>      } else {<a name="line.162"></a>
+<span class="sourceLineNo">163</span>        break;<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><a name="line.167"></a>
+<span class="sourceLineNo">168</span>  protected static void loadData(String 
prefix, byte[] row) throws IOException {<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    List&lt;Put&gt; puts = new 
ArrayList&lt;&gt;(NB_ROWS_IN_BATCH);<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    for (int i = 0; i &lt; 
NB_ROWS_IN_BATCH; i++) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span>      Put put = new 
Put(Bytes.toBytes(prefix + Integer.toString(i)));<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      put.addColumn(famName, row, row);<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span>      puts.add(put);<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>    }<a name="line.174"></a>
+<span class="sourceLineNo">175</span>    htable1.put(puts);<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>  @BeforeClass<a name="line.178"></a>
+<span class="sourceLineNo">179</span>  public static void setUpBeforeClass() 
throws Exception {<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    
conf1.set(HConstants.ZOOKEEPER_ZNODE_PARENT, "/1");<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    // We don't want too many edits per 
batch sent to the ReplicationEndpoint to trigger<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    // sufficient number of events. But 
we don't want to go too low because<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    // 
HBaseInterClusterReplicationEndpoint partitions entries into batches and we 
want<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    // more than one batch sent to the 
peer cluster for better testing.<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    
conf1.setInt("replication.source.size.capacity", 102400);<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    
conf1.setLong("replication.source.sleepforretries", 100);<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    
conf1.setInt("hbase.regionserver.maxlogs", 10);<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    
conf1.setLong("hbase.master.logcleaner.ttl", 10);<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    
conf1.setInt("zookeeper.recovery.retry", 1);<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    
conf1.setInt("zookeeper.recovery.retry.intervalmill", 10);<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>    
conf1.setLong(HConstants.THREAD_WAKE_FREQUENCY, 100);<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    
conf1.setInt("replication.stats.thread.period.seconds", 5);<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>    
conf1.setBoolean("hbase.tests.use.shortcircuit.reads", false);<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span>    
conf1.setLong("replication.sleep.before.failover", 2000);<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    
conf1.setInt("replication.source.maxretriesmultiplier", 10);<a 
name="line.195"></a>
+<span class="sourceLineNo">196</span>    
conf1.setFloat("replication.source.ratio", 1.0f);<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    
conf1.setBoolean("replication.source.eof.autorecovery", true);<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span>    // Parameter config<a 
name="line.199"></a>
+<span class="sourceLineNo">200</span>    
conf1.setBoolean(AbstractFSWALProvider.SEPARATE_OLDLOGDIR, seperateOldWALs);<a 
name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span>    utility1 = new 
HBaseTestingUtility(conf1);<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    utility1.startMiniZKCluster();<a 
name="line.203"></a>
+<span class="sourceLineNo">204</span>    MiniZooKeeperCluster miniZK = 
utility1.getZkCluster();<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    // Have to reget conf1 in case zk 
cluster location different<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    // than default<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    conf1 = 
utility1.getConfiguration();<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    zkw1 = new ZKWatcher(conf1, 
"cluster1", null, true);<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    admin = new 
ReplicationAdmin(conf1);<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    LOG.info("Setup first Zk");<a 
name="line.210"></a>
+<span class="sourceLineNo">211</span><a name="line.211"></a>
+<span class="sourceLineNo">212</span>    // Base conf2 on conf1 so it gets the 
right zk cluster.<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    conf2 = 
HBaseConfiguration.create(conf1);<a name="line.213"></a>
+<span class="sourceLineNo">214</span>    
conf2.set(HConstants.ZOOKEEPER_ZNODE_PARENT, "/2");<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    
conf2.setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 6);<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    
conf2.setBoolean("hbase.tests.use.shortcircuit.reads", false);<a 
name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span>    utility2 = new 
HBaseTestingUtility(conf2);<a name="line.218"></a>
+<span class="sourceLineNo">219</span>    utility2.setZkCluster(miniZK);<a 
name="line.219"></a>
+<span class="sourceLineNo">220</span>    zkw2 = new ZKWatcher(conf2, 
"cluster2", null, true);<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    LOG.info("Setup second Zk");<a 
name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span>    CONF_WITH_LOCALFS = 
HBaseConfiguration.create(conf1);<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    utility1.startMiniCluster(2);<a 
name="line.224"></a>
+<span class="sourceLineNo">225</span>    // Have a bunch of slave servers, 
because inter-cluster shipping logic uses number of sinks<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    // as a component in deciding maximum 
number of parallel batches to send to the peer cluster.<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    utility2.startMiniCluster(4);<a 
name="line.227"></a>
+<span class="sourceLineNo">228</span><a name="line.228"></a>
+<span class="sourceLineNo">229</span>    ReplicationPeerConfig rpc =<a 
name="line.229"></a>
+<span class="sourceLineNo">230</span>        
ReplicationPeerConfig.newBuilder().setClusterKey(utility2.getClusterKey()).build();<a
 name="line.230"></a>
+<span class="sourceLineNo">231</span>    hbaseAdmin = 
ConnectionFactory.createConnection(conf1).getAdmin();<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    hbaseAdmin.addReplicationPeer("2", 
rpc);<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span>    TableDescriptor table = 
TableDescriptorBuilder.newBuilder(tableName)<a name="line.234"></a>
+<span class="sourceLineNo">235</span>        
.addColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(famName).setMaxVersions(100)<a
 name="line.235"></a>
+<span class="sourceLineNo">236</span>            
.setScope(HConstants.REPLICATION_SCOPE_GLOBAL).build())<a name="line.236"></a>
+<span class="sourceLineNo">237</span>        
.addColumnFamily(ColumnFamilyDescriptorBuilder.of(noRepfamName)).build();<a 
name="line.237"></a>
+<span class="sourceLineNo">238</span>    scopes = new 
TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    for (ColumnFamilyDescriptor f : 
table.getColumnFamilies()) {<a name="line.239"></a>
+<span class="sourceLineNo">240</span>      scopes.put(f.getName(), 
f.getScope());<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    }<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    Connection connection1 = 
ConnectionFactory.createConnection(conf1);<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    Connection connection2 = 
ConnectionFactory.createConnection(conf2);<a name="line.243"></a>
+<span class="sourceLineNo">244</span>    try (Admin admin1 = 
connection1.getAdmin()) {<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      admin1.createTable(table, 
HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE);<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    }<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    try (Admin admin2 = 
connection2.getAdmin()) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      admin2.createTable(table, 
HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE);<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    }<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    
utility1.waitUntilAllRegionsAssigned(tableName);<a name="line.250"></a>
+<span class="sourceLineNo">251</span>    
utility2.waitUntilAllRegionsAssigned(tableName);<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    htable1 = 
connection1.getTable(tableName);<a name="line.252"></a>
+<span class="sourceLineNo">253</span>    htable2 = 
connection2.getTable(tableName);<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>  protected static void 
runSimplePutDeleteTest() throws IOException, InterruptedException {<a 
name="line.256"></a>
+<span class="sourceLineNo">257</span>    Put put = new Put(row);<a 
name="line.257"></a>
+<span class="sourceLineNo">258</span>    put.addColumn(famName, row, row);<a 
name="line.258"></a>
+<span class="sourceLineNo">259</span><a name="line.259"></a>
+<span class="sourceLineNo">260</span>    htable1 = 
utility1.getConnection().getTable(tableName);<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    htable1.put(put);<a 
name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span>    Get get = new Get(row);<a 
name="line.263"></a>
+<span class="sourceLineNo">264</span>    for (int i = 0; i &lt; NB_RETRIES; 
i++) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      if (i == NB_RETRIES - 1) {<a 
name="line.265"></a>
+<span class="sourceLineNo">266</span>        fail("Waited too much time for 
put replication");<a name="line.266"></a>
+<span class="sourceLineNo">267</span>      }<a name="line.267"></a>
+<span class="sourceLineNo">268</span>      Result res = htable2.get(get);<a 
name="line.268"></a>
+<span class="sourceLineNo">269</span>      if (res.isEmpty()) {<a 
name="line.269"></a>
+<span class="sourceLineNo">270</span>        LOG.info("Row not available");<a 
name="line.270"></a>
+<span class="sourceLineNo">271</span>        Thread.sleep(SLEEP_TIME);<a 
name="line.271"></a>
+<span class="sourceLineNo">272</span>      } else {<a name="line.272"></a>
+<span class="sourceLineNo">273</span>        assertArrayEquals(res.value(), 
row);<a name="line.273"></a>
+<span class="sourceLineNo">274</span>        break;<a name="line.274"></a>
+<span class="sourceLineNo">275</span>      }<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    }<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span>    Delete del = new Delete(row);<a 
name="line.278"></a>
+<span class="sourceLineNo">279</span>    htable1.delete(del);<a 
name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span>    get = new Get(row);<a 
name="line.281"></a>
+<span class="sourceLineNo">282</span>    for (int i = 0; i &lt; NB_RETRIES; 
i++) {<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      if (i == NB_RETRIES - 1) {<a 
name="line.283"></a>
+<span class="sourceLineNo">284</span>        fail("Waited too much time for 
del replication");<a name="line.284"></a>
+<span class="sourceLineNo">285</span>      }<a name="line.285"></a>
+<span class="sourceLineNo">286</span>      Result res = htable2.get(get);<a 
name="line.286"></a>
+<span class="sourceLineNo">287</span>      if (res.size() &gt;= 1) {<a 
name="line.287"></a>
+<span class="sourceLineNo">288</span>        LOG.info("Row not deleted");<a 
name="line.288"></a>
+<span class="sourceLineNo">289</span>        Thread.sleep(SLEEP_TIME);<a 
name="line.289"></a>
+<span class="sourceLineNo">290</span>      } else {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>        break;<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>  }<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span>  protected static void 
runSmallBatchTest() throws IOException, InterruptedException {<a 
name="line.296"></a>
+<span class="sourceLineNo">297</span>    // normal Batch tests<a 
name="line.297"></a>
+<span class="sourceLineNo">298</span>    loadData("", row);<a 
name="line.298"></a>
+<span class="sourceLineNo">299</span><a name="line.299"></a>
+<span class="sourceLineNo">300</span>    Scan scan = new Scan();<a 
name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span>    ResultScanner scanner1 = 
htable1.getScanner(scan);<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    Result[] res1 = 
scanner1.next(NB_ROWS_IN_BATCH);<a name="line.303"></a>
+<span class="sourceLineNo">304</span>    scanner1.close();<a 
name="line.304"></a>
+<span class="sourceLineNo">305</span>    assertEquals(NB_ROWS_IN_BATCH, 
res1.length);<a name="line.305"></a>
+<span class="sourceLineNo">306</span><a name="line.306"></a>
+<span class="sourceLineNo">307</span>    waitForReplication(NB_ROWS_IN_BATCH, 
NB_RETRIES);<a name="line.307"></a>
+<span class="sourceLineNo">308</span>  }<a name="line.308"></a>
+<span class="sourceLineNo">309</span><a name="line.309"></a>
+<span class="sourceLineNo">310</span>  @AfterClass<a name="line.310"></a>
+<span class="sourceLineNo">311</span>  public static void tearDownAfterClass() 
throws Exception {<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    htable2.close();<a 
name="line.312"></a>
+<span class="sourceLineNo">313</span>    htable1.close();<a 
name="line.313"></a>
+<span class="sourceLineNo">314</span>    admin.close();<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    utility2.shutdownMiniCluster();<a 
name="line.315"></a>
+<span class="sourceLineNo">316</span>    utility1.shutdownMiniCluster();<a 
name="line.316"></a>
+<span class="sourceLineNo">317</span>  }<a name="line.317"></a>
+<span class="sourceLineNo">318</span>}<a name="line.318"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c13644e5/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEmptyWALRecovery.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEmptyWALRecovery.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEmptyWALRecovery.html
new file mode 100644
index 0000000..5164f27
--- /dev/null
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationEmptyWALRecovery.html
@@ -0,0 +1,189 @@
+<!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.replication;<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.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.fs.Path;<a 
name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.Waiter;<a 
name="line.24"></a>
+<span class="sourceLineNo">025</span>import 
org.apache.hadoop.hbase.client.RegionInfo;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import 
org.apache.hadoop.hbase.regionserver.HRegionServer;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.regionserver.wal.AbstractFSWAL;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.replication.regionserver.Replication;<a 
name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.replication.regionserver.ReplicationSource;<a 
name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.replication.regionserver.ReplicationSourceInterface;<a 
name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.testclassification.ReplicationTests;<a 
name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.wal.AbstractFSWALProvider;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.wal.WAL;<a 
name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.junit.Before;<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.junit.Test;<a 
name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.junit.experimental.categories.Category;<a name="line.37"></a>
+<span class="sourceLineNo">038</span><a name="line.38"></a>
+<span class="sourceLineNo">039</span>@Category({ ReplicationTests.class, 
LargeTests.class })<a name="line.39"></a>
+<span class="sourceLineNo">040</span>public class 
TestReplicationEmptyWALRecovery extends TestReplicationBase {<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span>  @Before<a name="line.42"></a>
+<span class="sourceLineNo">043</span>  public void setUp() throws IOException, 
InterruptedException {<a name="line.43"></a>
+<span class="sourceLineNo">044</span>    cleanUp();<a name="line.44"></a>
+<span class="sourceLineNo">045</span>  }<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>   * Waits until there is only one 
log(the current writing one) in the replication queue<a name="line.48"></a>
+<span class="sourceLineNo">049</span>   * @param numRs number of 
regionservers<a name="line.49"></a>
+<span class="sourceLineNo">050</span>   */<a name="line.50"></a>
+<span class="sourceLineNo">051</span>  private void waitForLogAdvance(int 
numRs) throws Exception {<a name="line.51"></a>
+<span class="sourceLineNo">052</span>    Waiter.waitFor(conf1, 10000, new 
Waiter.Predicate&lt;Exception&gt;() {<a name="line.52"></a>
+<span class="sourceLineNo">053</span>      @Override<a name="line.53"></a>
+<span class="sourceLineNo">054</span>      public boolean evaluate() throws 
Exception {<a name="line.54"></a>
+<span class="sourceLineNo">055</span>        for (int i = 0; i &lt; numRs; 
i++) {<a name="line.55"></a>
+<span class="sourceLineNo">056</span>          HRegionServer hrs = 
utility1.getHBaseCluster().getRegionServer(i);<a name="line.56"></a>
+<span class="sourceLineNo">057</span>          RegionInfo regionInfo =<a 
name="line.57"></a>
+<span class="sourceLineNo">058</span>              
utility1.getHBaseCluster().getRegions(htable1.getName()).get(0).getRegionInfo();<a
 name="line.58"></a>
+<span class="sourceLineNo">059</span>          WAL wal = 
hrs.getWAL(regionInfo);<a name="line.59"></a>
+<span class="sourceLineNo">060</span>          Path currentFile = 
((AbstractFSWAL&lt;?&gt;) wal).getCurrentFileName();<a name="line.60"></a>
+<span class="sourceLineNo">061</span>          Replication replicationService 
= (Replication) utility1.getHBaseCluster()<a name="line.61"></a>
+<span class="sourceLineNo">062</span>              
.getRegionServer(i).getReplicationSourceService();<a name="line.62"></a>
+<span class="sourceLineNo">063</span>          for (ReplicationSourceInterface 
rsi : replicationService.getReplicationManager()<a name="line.63"></a>
+<span class="sourceLineNo">064</span>              .getSources()) {<a 
name="line.64"></a>
+<span class="sourceLineNo">065</span>            ReplicationSource source = 
(ReplicationSource) rsi;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>            if 
(!currentFile.equals(source.getCurrentPath())) {<a name="line.66"></a>
+<span class="sourceLineNo">067</span>              return false;<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>        }<a name="line.70"></a>
+<span class="sourceLineNo">071</span>        return true;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      }<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    });<a name="line.73"></a>
+<span class="sourceLineNo">074</span>  }<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span>  @Test<a name="line.76"></a>
+<span class="sourceLineNo">077</span>  public void testEmptyWALRecovery() 
throws Exception {<a name="line.77"></a>
+<span class="sourceLineNo">078</span>    final int numRs = 
utility1.getHBaseCluster().getRegionServerThreads().size();<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span>    // for each RS, create an empty wal 
with same walGroupId<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    final List&lt;Path&gt; emptyWalPaths 
= new ArrayList&lt;&gt;();<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    long ts = 
System.currentTimeMillis();<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    for (int i = 0; i &lt; numRs; i++) 
{<a name="line.83"></a>
+<span class="sourceLineNo">084</span>      RegionInfo regionInfo =<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>          
utility1.getHBaseCluster().getRegions(htable1.getName()).get(0).getRegionInfo();<a
 name="line.85"></a>
+<span class="sourceLineNo">086</span>      WAL wal = 
utility1.getHBaseCluster().getRegionServer(i).getWAL(regionInfo);<a 
name="line.86"></a>
+<span class="sourceLineNo">087</span>      Path currentWalPath = 
AbstractFSWALProvider.getCurrentFileName(wal);<a name="line.87"></a>
+<span class="sourceLineNo">088</span>      String walGroupId = 
AbstractFSWALProvider.getWALPrefixFromWALName(currentWalPath.getName());<a 
name="line.88"></a>
+<span class="sourceLineNo">089</span>      Path emptyWalPath = new 
Path(utility1.getDataTestDir(), walGroupId + "." + ts);<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      
utility1.getTestFileSystem().create(emptyWalPath).close();<a name="line.90"></a>
+<span class="sourceLineNo">091</span>      emptyWalPaths.add(emptyWalPath);<a 
name="line.91"></a>
+<span class="sourceLineNo">092</span>    }<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span>    // inject our empty wal into the 
replication queue, and then roll the original wal, which<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    // enqueues a new wal behind our 
empty wal. We must roll the wal here as now we use the WAL to<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span>    // determine if the file being 
replicated currently is still opened for write, so just inject a<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>    // new wal to the replication queue 
does not mean the previous file is closed.<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    for (int i = 0; i &lt; numRs; i++) 
{<a name="line.98"></a>
+<span class="sourceLineNo">099</span>      HRegionServer hrs = 
utility1.getHBaseCluster().getRegionServer(i);<a name="line.99"></a>
+<span class="sourceLineNo">100</span>      Replication replicationService = 
(Replication) hrs.getReplicationSourceService();<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      replicationService.preLogRoll(null, 
emptyWalPaths.get(i));<a name="line.101"></a>
+<span class="sourceLineNo">102</span>      
replicationService.postLogRoll(null, emptyWalPaths.get(i));<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>      RegionInfo regionInfo =<a 
name="line.103"></a>
+<span class="sourceLineNo">104</span>          
utility1.getHBaseCluster().getRegions(htable1.getName()).get(0).getRegionInfo();<a
 name="line.104"></a>
+<span class="sourceLineNo">105</span>      WAL wal = hrs.getWAL(regionInfo);<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>      wal.rollWriter(true);<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>    // ReplicationSource should advance 
past the empty wal, or else the test will fail<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    waitForLogAdvance(numRs);<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span>    // we're now writing to the new wal<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>    // if everything works, the source 
should've stopped reading from the empty wal, and start<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    // replicating from the new wal<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>    runSimplePutDeleteTest();<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>  }<a name="line.116"></a>
+<span class="sourceLineNo">117</span>}<a name="line.117"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>

Reply via email to