hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From git-site-r...@apache.org
Subject [01/11] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
Date Sun, 11 Jun 2017 14:59:49 GMT
Repository: hbase-site
Updated Branches:
  refs/heads/asf-site a108d2508 -> 49852d7b5


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/49852d7b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.html
index 301f309..4e786b3 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.html
@@ -49,943 +49,1023 @@
 <span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.HTableDescriptor;<a name="line.41"></a>
 <span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.42"></a>
 <span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.TableName;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.client.Delete;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.Get;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.client.Put;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.client.Result;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.client.ResultScanner;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.client.Table;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.client.replication.ReplicationAdmin;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.mapreduce.replication.VerifyReplication;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.regionserver.HRegion;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.regionserver.MultiVersionConcurrencyControl;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.regionserver.wal.WALEdit;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.replication.regionserver.Replication;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>import org.apache.hadoop.hbase.testclassification.ReplicationTests;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>import org.apache.hadoop.hbase.util.JVMClusterUtil;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>import org.apache.hadoop.hbase.wal.WAL;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>import org.apache.hadoop.hbase.wal.WALKey;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>import org.apache.hadoop.mapreduce.Job;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>import org.junit.Before;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>import org.junit.Rule;<a name="line.72"></a>
-<span class="sourceLineNo">073</span>import org.junit.Test;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>import org.junit.experimental.categories.Category;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>import org.junit.rules.TestName;<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span>import com.google.common.collect.Lists;<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span>@Category({ReplicationTests.class, LargeTests.class})<a name="line.79"></a>
-<span class="sourceLineNo">080</span>public class TestReplicationSmallTests extends TestReplicationBase {<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span>  private static final Log LOG = LogFactory.getLog(TestReplicationSmallTests.class);<a name="line.82"></a>
-<span class="sourceLineNo">083</span>  private static final String PEER_ID = "2";<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span>  @Rule<a name="line.85"></a>
-<span class="sourceLineNo">086</span>  public TestName name = new TestName();<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span>  /**<a name="line.88"></a>
-<span class="sourceLineNo">089</span>   * @throws java.lang.Exception<a name="line.89"></a>
-<span class="sourceLineNo">090</span>   */<a name="line.90"></a>
-<span class="sourceLineNo">091</span>  @Before<a name="line.91"></a>
-<span class="sourceLineNo">092</span>  public void setUp() throws Exception {<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    // Starting and stopping replication can make us miss new logs,<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    // rolling like this makes sure the most recent one gets added to the queue<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    for ( JVMClusterUtil.RegionServerThread r :<a name="line.95"></a>
-<span class="sourceLineNo">096</span>        utility1.getHBaseCluster().getRegionServerThreads()) {<a name="line.96"></a>
-<span class="sourceLineNo">097</span>      utility1.getAdmin().rollWALWriter(r.getRegionServer().getServerName());<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    }<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    int rowCount = utility1.countRows(tableName);<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    utility1.deleteTableData(tableName);<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    // truncating the table will send one Delete per row to the slave cluster<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    // in an async fashion, which is why we cannot just call deleteTableData on<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    // utility2 since late writes could make it to the slave in some way.<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    // Instead, we truncate the first table and wait for all the Deletes to<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    // make it to the slave.<a name="line.105"></a>
-<span class="sourceLineNo">106</span>    Scan scan = new Scan();<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    int lastCount = 0;<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    for (int i = 0; i &lt; NB_RETRIES; i++) {<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      if (i==NB_RETRIES-1) {<a name="line.109"></a>
-<span class="sourceLineNo">110</span>        fail("Waited too much time for truncate");<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      }<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      ResultScanner scanner = htable2.getScanner(scan);<a name="line.112"></a>
-<span class="sourceLineNo">113</span>      Result[] res = scanner.next(rowCount);<a name="line.113"></a>
-<span class="sourceLineNo">114</span>      scanner.close();<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      if (res.length != 0) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>        if (res.length &lt; lastCount) {<a name="line.116"></a>
-<span class="sourceLineNo">117</span>          i--; // Don't increment timeout if we make progress<a name="line.117"></a>
-<span class="sourceLineNo">118</span>        }<a name="line.118"></a>
-<span class="sourceLineNo">119</span>        lastCount = res.length;<a name="line.119"></a>
-<span class="sourceLineNo">120</span>        LOG.info("Still got " + res.length + " rows");<a name="line.120"></a>
-<span class="sourceLineNo">121</span>        Thread.sleep(SLEEP_TIME);<a name="line.121"></a>
-<span class="sourceLineNo">122</span>      } else {<a name="line.122"></a>
-<span class="sourceLineNo">123</span>        break;<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>  }<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span>  /**<a name="line.128"></a>
-<span class="sourceLineNo">129</span>   * Verify that version and column delete marker types are replicated<a name="line.129"></a>
-<span class="sourceLineNo">130</span>   * correctly.<a name="line.130"></a>
-<span class="sourceLineNo">131</span>   * @throws Exception<a name="line.131"></a>
-<span class="sourceLineNo">132</span>   */<a name="line.132"></a>
-<span class="sourceLineNo">133</span>  @Test(timeout=300000)<a name="line.133"></a>
-<span class="sourceLineNo">134</span>  public void testDeleteTypes() throws Exception {<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    LOG.info("testDeleteTypes");<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    final byte[] v1 = Bytes.toBytes("v1");<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    final byte[] v2 = Bytes.toBytes("v2");<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    final byte[] v3 = Bytes.toBytes("v3");<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    htable1 = utility1.getConnection().getTable(tableName);<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>    long t = EnvironmentEdgeManager.currentTime();<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    // create three versions for "row"<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    Put put = new Put(row);<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    put.addColumn(famName, row, t, v1);<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    htable1.put(put);<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span>    put = new Put(row);<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    put.addColumn(famName, row, t + 1, v2);<a name="line.148"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.Waiter;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.Delete;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.client.Get;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.client.Put;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.client.Result;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.client.ResultScanner;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.client.Table;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.client.replication.ReplicationAdmin;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.mapreduce.replication.VerifyReplication;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.regionserver.HRegion;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.regionserver.MultiVersionConcurrencyControl;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.regionserver.wal.WALEdit;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.replication.regionserver.Replication;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.replication.regionserver.ReplicationSource;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.replication.regionserver.ReplicationSourceInterface;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>import org.apache.hadoop.hbase.testclassification.ReplicationTests;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>import org.apache.hadoop.hbase.util.JVMClusterUtil;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>import org.apache.hadoop.hbase.wal.AbstractFSWALProvider;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>import org.apache.hadoop.hbase.wal.WAL;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>import org.apache.hadoop.hbase.wal.WALKey;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>import org.apache.hadoop.mapreduce.Job;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>import org.junit.Before;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>import org.junit.Rule;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>import org.junit.Test;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>import org.junit.experimental.categories.Category;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>import org.junit.rules.TestName;<a name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span>import com.google.common.collect.Lists;<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span>@Category({ReplicationTests.class, LargeTests.class})<a name="line.83"></a>
+<span class="sourceLineNo">084</span>public class TestReplicationSmallTests extends TestReplicationBase {<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span>  private static final Log LOG = LogFactory.getLog(TestReplicationSmallTests.class);<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  private static final String PEER_ID = "2";<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span>  @Rule<a name="line.89"></a>
+<span class="sourceLineNo">090</span>  public TestName name = new TestName();<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>   * @throws java.lang.Exception<a name="line.93"></a>
+<span class="sourceLineNo">094</span>   */<a name="line.94"></a>
+<span class="sourceLineNo">095</span>  @Before<a name="line.95"></a>
+<span class="sourceLineNo">096</span>  public void setUp() throws Exception {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    // Starting and stopping replication can make us miss new logs,<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    // rolling like this makes sure the most recent one gets added to the queue<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    for ( JVMClusterUtil.RegionServerThread r :<a name="line.99"></a>
+<span class="sourceLineNo">100</span>        utility1.getHBaseCluster().getRegionServerThreads()) {<a name="line.100"></a>
+<span class="sourceLineNo">101</span>      utility1.getAdmin().rollWALWriter(r.getRegionServer().getServerName());<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    }<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    int rowCount = utility1.countRows(tableName);<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    utility1.deleteTableData(tableName);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>    // truncating the table will send one Delete per row to the slave cluster<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    // in an async fashion, which is why we cannot just call deleteTableData on<a name="line.106"></a>
+<span class="sourceLineNo">107</span>    // utility2 since late writes could make it to the slave in some way.<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    // Instead, we truncate the first table and wait for all the Deletes to<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    // make it to the slave.<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    Scan scan = new Scan();<a name="line.110"></a>
+<span class="sourceLineNo">111</span>    int lastCount = 0;<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    for (int i = 0; i &lt; NB_RETRIES; i++) {<a name="line.112"></a>
+<span class="sourceLineNo">113</span>      if (i==NB_RETRIES-1) {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>        fail("Waited too much time for truncate");<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      }<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      ResultScanner scanner = htable2.getScanner(scan);<a name="line.116"></a>
+<span class="sourceLineNo">117</span>      Result[] res = scanner.next(rowCount);<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      scanner.close();<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      if (res.length != 0) {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>        if (res.length &lt; lastCount) {<a name="line.120"></a>
+<span class="sourceLineNo">121</span>          i--; // Don't increment timeout if we make progress<a name="line.121"></a>
+<span class="sourceLineNo">122</span>        }<a name="line.122"></a>
+<span class="sourceLineNo">123</span>        lastCount = res.length;<a name="line.123"></a>
+<span class="sourceLineNo">124</span>        LOG.info("Still got " + res.length + " rows");<a name="line.124"></a>
+<span class="sourceLineNo">125</span>        Thread.sleep(SLEEP_TIME);<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      } else {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>        break;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      }<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    }<a name="line.129"></a>
+<span class="sourceLineNo">130</span>  }<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span>  /**<a name="line.132"></a>
+<span class="sourceLineNo">133</span>   * Verify that version and column delete marker types are replicated<a name="line.133"></a>
+<span class="sourceLineNo">134</span>   * correctly.<a name="line.134"></a>
+<span class="sourceLineNo">135</span>   * @throws Exception<a name="line.135"></a>
+<span class="sourceLineNo">136</span>   */<a name="line.136"></a>
+<span class="sourceLineNo">137</span>  @Test(timeout=300000)<a name="line.137"></a>
+<span class="sourceLineNo">138</span>  public void testDeleteTypes() throws Exception {<a name="line.138"></a>
+<span class="sourceLineNo">139</span>    LOG.info("testDeleteTypes");<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    final byte[] v1 = Bytes.toBytes("v1");<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    final byte[] v2 = Bytes.toBytes("v2");<a name="line.141"></a>
+<span class="sourceLineNo">142</span>    final byte[] v3 = Bytes.toBytes("v3");<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    htable1 = utility1.getConnection().getTable(tableName);<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>    long t = EnvironmentEdgeManager.currentTime();<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    // create three versions for "row"<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    Put put = new Put(row);<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    put.addColumn(famName, row, t, v1);<a name="line.148"></a>
 <span class="sourceLineNo">149</span>    htable1.put(put);<a name="line.149"></a>
 <span class="sourceLineNo">150</span><a name="line.150"></a>
 <span class="sourceLineNo">151</span>    put = new Put(row);<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    put.addColumn(famName, row, t + 2, v3);<a name="line.152"></a>
+<span class="sourceLineNo">152</span>    put.addColumn(famName, row, t + 1, v2);<a name="line.152"></a>
 <span class="sourceLineNo">153</span>    htable1.put(put);<a name="line.153"></a>
 <span class="sourceLineNo">154</span><a name="line.154"></a>
-<span class="sourceLineNo">155</span>    Get get = new Get(row);<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    get.setMaxVersions();<a name="line.156"></a>
-<span class="sourceLineNo">157</span>    for (int i = 0; i &lt; NB_RETRIES; i++) {<a name="line.157"></a>
-<span class="sourceLineNo">158</span>      if (i==NB_RETRIES-1) {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>        fail("Waited too much time for put replication");<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      }<a name="line.160"></a>
-<span class="sourceLineNo">161</span>      Result res = htable2.get(get);<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      if (res.size() &lt; 3) {<a name="line.162"></a>
-<span class="sourceLineNo">163</span>        LOG.info("Rows not available");<a name="line.163"></a>
-<span class="sourceLineNo">164</span>        Thread.sleep(SLEEP_TIME);<a name="line.164"></a>
-<span class="sourceLineNo">165</span>      } else {<a name="line.165"></a>
-<span class="sourceLineNo">166</span>        assertArrayEquals(CellUtil.cloneValue(res.rawCells()[0]), v3);<a name="line.166"></a>
-<span class="sourceLineNo">167</span>        assertArrayEquals(CellUtil.cloneValue(res.rawCells()[1]), v2);<a name="line.167"></a>
-<span class="sourceLineNo">168</span>        assertArrayEquals(CellUtil.cloneValue(res.rawCells()[2]), v1);<a name="line.168"></a>
-<span class="sourceLineNo">169</span>        break;<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      }<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    }<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    // place a version delete marker (delete last version)<a name="line.172"></a>
-<span class="sourceLineNo">173</span>    Delete d = new Delete(row);<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    d.addColumn(famName, row, t);<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    htable1.delete(d);<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span>    get = new Get(row);<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    get.setMaxVersions();<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    for (int i = 0; i &lt; NB_RETRIES; i++) {<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      if (i==NB_RETRIES-1) {<a name="line.180"></a>
-<span class="sourceLineNo">181</span>        fail("Waited too much time for put replication");<a name="line.181"></a>
-<span class="sourceLineNo">182</span>      }<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      Result res = htable2.get(get);<a name="line.183"></a>
-<span class="sourceLineNo">184</span>      if (res.size() &gt; 2) {<a name="line.184"></a>
-<span class="sourceLineNo">185</span>        LOG.info("Version not deleted");<a name="line.185"></a>
-<span class="sourceLineNo">186</span>        Thread.sleep(SLEEP_TIME);<a name="line.186"></a>
-<span class="sourceLineNo">187</span>      } else {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>        assertArrayEquals(CellUtil.cloneValue(res.rawCells()[0]), v3);<a name="line.188"></a>
-<span class="sourceLineNo">189</span>        assertArrayEquals(CellUtil.cloneValue(res.rawCells()[1]), v2);<a name="line.189"></a>
-<span class="sourceLineNo">190</span>        break;<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      }<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    }<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>    // place a column delete marker<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    d = new Delete(row);<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    d.addColumns(famName, row, t+2);<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    htable1.delete(d);<a name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span>    // now *both* of the remaining version should be deleted<a name="line.199"></a>
-<span class="sourceLineNo">200</span>    // at the replica<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    get = new Get(row);<a name="line.201"></a>
-<span class="sourceLineNo">202</span>    for (int i = 0; i &lt; NB_RETRIES; i++) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      if (i==NB_RETRIES-1) {<a name="line.203"></a>
-<span class="sourceLineNo">204</span>        fail("Waited too much time for del replication");<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      }<a name="line.205"></a>
-<span class="sourceLineNo">206</span>      Result res = htable2.get(get);<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      if (res.size() &gt;= 1) {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>        LOG.info("Rows not deleted");<a name="line.208"></a>
-<span class="sourceLineNo">209</span>        Thread.sleep(SLEEP_TIME);<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      } else {<a name="line.210"></a>
-<span class="sourceLineNo">211</span>        break;<a name="line.211"></a>
-<span class="sourceLineNo">212</span>      }<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    }<a name="line.213"></a>
-<span class="sourceLineNo">214</span>  }<a name="line.214"></a>
-<span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span>  /**<a name="line.216"></a>
-<span class="sourceLineNo">217</span>   * Add a row, check it's replicated, delete it, check's gone<a name="line.217"></a>
-<span class="sourceLineNo">218</span>   * @throws Exception<a name="line.218"></a>
-<span class="sourceLineNo">219</span>   */<a name="line.219"></a>
-<span class="sourceLineNo">220</span>  @Test(timeout=300000)<a name="line.220"></a>
-<span class="sourceLineNo">221</span>  public void testSimplePutDelete() throws Exception {<a name="line.221"></a>
-<span class="sourceLineNo">222</span>    LOG.info("testSimplePutDelete");<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    Put put = new Put(row);<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    put.addColumn(famName, row, row);<a name="line.224"></a>
-<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span>    htable1 = utility1.getConnection().getTable(tableName);<a name="line.226"></a>
-<span class="sourceLineNo">227</span>    htable1.put(put);<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span>    Get get = new Get(row);<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    for (int i = 0; i &lt; NB_RETRIES; i++) {<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      if (i==NB_RETRIES-1) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span>        fail("Waited too much time for put replication");<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      }<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      Result res = htable2.get(get);<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      if (res.isEmpty()) {<a name="line.235"></a>
-<span class="sourceLineNo">236</span>        LOG.info("Row not available");<a name="line.236"></a>
-<span class="sourceLineNo">237</span>        Thread.sleep(SLEEP_TIME);<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      } else {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>        assertArrayEquals(res.value(), row);<a name="line.239"></a>
-<span class="sourceLineNo">240</span>        break;<a name="line.240"></a>
-<span class="sourceLineNo">241</span>      }<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    }<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span>    Delete del = new Delete(row);<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    htable1.delete(del);<a name="line.245"></a>
-<span class="sourceLineNo">246</span><a name="line.246"></a>
-<span class="sourceLineNo">247</span>    get = new Get(row);<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    for (int i = 0; i &lt; NB_RETRIES; i++) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      if (i==NB_RETRIES-1) {<a name="line.249"></a>
-<span class="sourceLineNo">250</span>        fail("Waited too much time for del replication");<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      }<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      Result res = htable2.get(get);<a name="line.252"></a>
-<span class="sourceLineNo">253</span>      if (res.size() &gt;= 1) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span>        LOG.info("Row not deleted");<a name="line.254"></a>
-<span class="sourceLineNo">255</span>        Thread.sleep(SLEEP_TIME);<a name="line.255"></a>
-<span class="sourceLineNo">256</span>      } else {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>        break;<a name="line.257"></a>
-<span class="sourceLineNo">258</span>      }<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    }<a name="line.259"></a>
-<span class="sourceLineNo">260</span>  }<a name="line.260"></a>
-<span class="sourceLineNo">261</span><a name="line.261"></a>
-<span class="sourceLineNo">262</span>  /**<a name="line.262"></a>
-<span class="sourceLineNo">263</span>   * Try a small batch upload using the write buffer, check it's replicated<a name="line.263"></a>
-<span class="sourceLineNo">264</span>   * @throws Exception<a name="line.264"></a>
-<span class="sourceLineNo">265</span>   */<a name="line.265"></a>
-<span class="sourceLineNo">266</span>  @Test(timeout=300000)<a name="line.266"></a>
-<span class="sourceLineNo">267</span>  public void testSmallBatch() throws Exception {<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    LOG.info("testSmallBatch");<a name="line.268"></a>
-<span class="sourceLineNo">269</span>    // normal Batch tests<a name="line.269"></a>
-<span class="sourceLineNo">270</span>    loadData("", row);<a name="line.270"></a>
-<span class="sourceLineNo">271</span><a name="line.271"></a>
-<span class="sourceLineNo">272</span>    Scan scan = new Scan();<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span>    ResultScanner scanner1 = htable1.getScanner(scan);<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    Result[] res1 = scanner1.next(NB_ROWS_IN_BATCH);<a name="line.275"></a>
-<span class="sourceLineNo">276</span>    scanner1.close();<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    assertEquals(NB_ROWS_IN_BATCH, res1.length);<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span>    waitForReplication(NB_ROWS_IN_BATCH, NB_RETRIES);<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 void waitForReplication(int expectedRows, int retries) throws IOException, InterruptedException {<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    Scan scan;<a name="line.283"></a>
-<span class="sourceLineNo">284</span>    for (int i = 0; i &lt; retries; i++) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span>      scan = new Scan();<a name="line.285"></a>
-<span class="sourceLineNo">286</span>      if (i== retries -1) {<a name="line.286"></a>
-<span class="sourceLineNo">287</span>        fail("Waited too much time for normal batch replication");<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      }<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      ResultScanner scanner = htable2.getScanner(scan);<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      Result[] res = scanner.next(expectedRows);<a name="line.290"></a>
-<span class="sourceLineNo">291</span>      scanner.close();<a name="line.291"></a>
-<span class="sourceLineNo">292</span>      if (res.length != expectedRows) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span>        LOG.info("Only got " + res.length + " rows");<a name="line.293"></a>
-<span class="sourceLineNo">294</span>        Thread.sleep(SLEEP_TIME);<a name="line.294"></a>
-<span class="sourceLineNo">295</span>      } else {<a name="line.295"></a>
-<span class="sourceLineNo">296</span>        break;<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>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span>  private void loadData(String prefix, byte[] row) throws IOException {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>    List&lt;Put&gt; puts = new ArrayList&lt;&gt;(NB_ROWS_IN_BATCH);<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    for (int i = 0; i &lt; NB_ROWS_IN_BATCH; i++) {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>      Put put = new Put(Bytes.toBytes(prefix + Integer.toString(i)));<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      put.addColumn(famName, row, row);<a name="line.305"></a>
-<span class="sourceLineNo">306</span>      puts.add(put);<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    }<a name="line.307"></a>
-<span class="sourceLineNo">308</span>    htable1.put(puts);<a name="line.308"></a>
-<span class="sourceLineNo">309</span>  }<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span>  /**<a name="line.311"></a>
-<span class="sourceLineNo">312</span>   * Test disable/enable replication, trying to insert, make sure nothing's<a name="line.312"></a>
-<span class="sourceLineNo">313</span>   * replicated, enable it, the insert should be replicated<a name="line.313"></a>
-<span class="sourceLineNo">314</span>   *<a name="line.314"></a>
-<span class="sourceLineNo">315</span>   * @throws Exception<a name="line.315"></a>
-<span class="sourceLineNo">316</span>   */<a name="line.316"></a>
-<span class="sourceLineNo">317</span>  @Test(timeout = 300000)<a name="line.317"></a>
-<span class="sourceLineNo">318</span>  public void testDisableEnable() throws Exception {<a name="line.318"></a>
-<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span>    // Test disabling replication<a name="line.320"></a>
-<span class="sourceLineNo">321</span>    admin.disablePeer(PEER_ID);<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span>    byte[] rowkey = Bytes.toBytes("disable enable");<a name="line.323"></a>
-<span class="sourceLineNo">324</span>    Put put = new Put(rowkey);<a name="line.324"></a>
-<span class="sourceLineNo">325</span>    put.addColumn(famName, row, row);<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    htable1.put(put);<a name="line.326"></a>
-<span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span>    Get get = new Get(rowkey);<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    for (int i = 0; i &lt; NB_RETRIES; i++) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span>      Result res = htable2.get(get);<a name="line.330"></a>
-<span class="sourceLineNo">331</span>      if (res.size() &gt;= 1) {<a name="line.331"></a>
-<span class="sourceLineNo">332</span>        fail("Replication wasn't disabled");<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      } else {<a name="line.333"></a>
-<span class="sourceLineNo">334</span>        LOG.info("Row not replicated, let's wait a bit more...");<a name="line.334"></a>
-<span class="sourceLineNo">335</span>        Thread.sleep(SLEEP_TIME);<a name="line.335"></a>
-<span class="sourceLineNo">336</span>      }<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    }<a name="line.337"></a>
-<span class="sourceLineNo">338</span><a name="line.338"></a>
-<span class="sourceLineNo">339</span>    // Test enable replication<a name="line.339"></a>
-<span class="sourceLineNo">340</span>    admin.enablePeer(PEER_ID);<a name="line.340"></a>
-<span class="sourceLineNo">341</span><a name="line.341"></a>
-<span class="sourceLineNo">342</span>    for (int i = 0; i &lt; NB_RETRIES; i++) {<a name="line.342"></a>
-<span class="sourceLineNo">343</span>      Result res = htable2.get(get);<a name="line.343"></a>
-<span class="sourceLineNo">344</span>      if (res.isEmpty()) {<a name="line.344"></a>
-<span class="sourceLineNo">345</span>        LOG.info("Row not available");<a name="line.345"></a>
-<span class="sourceLineNo">346</span>        Thread.sleep(SLEEP_TIME);<a name="line.346"></a>
-<span class="sourceLineNo">347</span>      } else {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>        assertArrayEquals(res.value(), row);<a name="line.348"></a>
-<span class="sourceLineNo">349</span>        return;<a name="line.349"></a>
-<span class="sourceLineNo">350</span>      }<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    }<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    fail("Waited too much time for put replication");<a name="line.352"></a>
-<span class="sourceLineNo">353</span>  }<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span>  /**<a name="line.355"></a>
-<span class="sourceLineNo">356</span>   * Integration test for TestReplicationAdmin, removes and re-add a peer<a name="line.356"></a>
-<span class="sourceLineNo">357</span>   * cluster<a name="line.357"></a>
-<span class="sourceLineNo">358</span>   *<a name="line.358"></a>
-<span class="sourceLineNo">359</span>   * @throws Exception<a name="line.359"></a>
-<span class="sourceLineNo">360</span>   */<a name="line.360"></a>
-<span class="sourceLineNo">361</span>  @Test(timeout=300000)<a name="line.361"></a>
-<span class="sourceLineNo">362</span>  public void testAddAndRemoveClusters() throws Exception {<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    LOG.info("testAddAndRemoveClusters");<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    admin.removePeer(PEER_ID);<a name="line.364"></a>
-<span class="sourceLineNo">365</span>    Thread.sleep(SLEEP_TIME);<a name="line.365"></a>
-<span class="sourceLineNo">366</span>    byte[] rowKey = Bytes.toBytes("Won't be replicated");<a name="line.366"></a>
-<span class="sourceLineNo">367</span>    Put put = new Put(rowKey);<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    put.addColumn(famName, row, row);<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    htable1.put(put);<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span>    Get get = new Get(rowKey);<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    for (int i = 0; i &lt; NB_RETRIES; i++) {<a name="line.372"></a>
-<span class="sourceLineNo">373</span>      if (i == NB_RETRIES-1) {<a name="line.373"></a>
-<span class="sourceLineNo">374</span>        break;<a name="line.374"></a>
-<span class="sourceLineNo">375</span>      }<a name="line.375"></a>
-<span class="sourceLineNo">376</span>      Result res = htable2.get(get);<a name="line.376"></a>
-<span class="sourceLineNo">377</span>      if (res.size() &gt;= 1) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>        fail("Not supposed to be replicated");<a name="line.378"></a>
-<span class="sourceLineNo">379</span>      } else {<a name="line.379"></a>
-<span class="sourceLineNo">380</span>        LOG.info("Row not replicated, let's wait a bit more...");<a name="line.380"></a>
-<span class="sourceLineNo">381</span>        Thread.sleep(SLEEP_TIME);<a name="line.381"></a>
-<span class="sourceLineNo">382</span>      }<a name="line.382"></a>
-<span class="sourceLineNo">383</span>    }<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    ReplicationPeerConfig rpc = new ReplicationPeerConfig();<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    rpc.setClusterKey(utility2.getClusterKey());<a name="line.385"></a>
-<span class="sourceLineNo">386</span>    admin.addPeer(PEER_ID, rpc, null);<a name="line.386"></a>
-<span class="sourceLineNo">387</span>    Thread.sleep(SLEEP_TIME);<a name="line.387"></a>
-<span class="sourceLineNo">388</span>    rowKey = Bytes.toBytes("do rep");<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    put = new Put(rowKey);<a name="line.389"></a>
-<span class="sourceLineNo">390</span>    put.addColumn(famName, row, row);<a name="line.390"></a>
-<span class="sourceLineNo">391</span>    LOG.info("Adding new row");<a name="line.391"></a>
-<span class="sourceLineNo">392</span>    htable1.put(put);<a name="line.392"></a>
-<span class="sourceLineNo">393</span><a name="line.393"></a>
-<span class="sourceLineNo">394</span>    get = new Get(rowKey);<a name="line.394"></a>
-<span class="sourceLineNo">395</span>    for (int i = 0; i &lt; NB_RETRIES; i++) {<a name="line.395"></a>
-<span class="sourceLineNo">396</span>      if (i==NB_RETRIES-1) {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>        fail("Waited too much time for put replication");<a name="line.397"></a>
-<span class="sourceLineNo">398</span>      }<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      Result res = htable2.get(get);<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      if (res.isEmpty()) {<a name="line.400"></a>
-<span class="sourceLineNo">401</span>        LOG.info("Row not available");<a name="line.401"></a>
-<span class="sourceLineNo">402</span>        Thread.sleep(SLEEP_TIME*i);<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      } else {<a name="line.403"></a>
-<span class="sourceLineNo">404</span>        assertArrayEquals(res.value(), row);<a name="line.404"></a>
-<span class="sourceLineNo">405</span>        break;<a name="line.405"></a>
-<span class="sourceLineNo">406</span>      }<a name="line.406"></a>
-<span class="sourceLineNo">407</span>    }<a name="line.407"></a>
-<span class="sourceLineNo">408</span>  }<a name="line.408"></a>
-<span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span><a name="line.410"></a>
-<span class="sourceLineNo">411</span>  /**<a name="line.411"></a>
-<span class="sourceLineNo">412</span>   * Do a more intense version testSmallBatch, one  that will trigger<a name="line.412"></a>
-<span class="sourceLineNo">413</span>   * wal rolling and other non-trivial code paths<a name="line.413"></a>
-<span class="sourceLineNo">414</span>   * @throws Exception<a name="line.414"></a>
-<span class="sourceLineNo">415</span>   */<a name="line.415"></a>
-<span class="sourceLineNo">416</span>  @Test(timeout=300000)<a name="line.416"></a>
-<span class="sourceLineNo">417</span>  public void testLoading() throws Exception {<a name="line.417"></a>
-<span class="sourceLineNo">418</span>    LOG.info("Writing out rows to table1 in testLoading");<a name="line.418"></a>
-<span class="sourceLineNo">419</span>    List&lt;Put&gt; puts = new ArrayList&lt;&gt;(NB_ROWS_IN_BIG_BATCH);<a name="line.419"></a>
-<span class="sourceLineNo">420</span>    for (int i = 0; i &lt; NB_ROWS_IN_BIG_BATCH; i++) {<a name="line.420"></a>
-<span class="sourceLineNo">421</span>      Put put = new Put(Bytes.toBytes(i));<a name="line.421"></a>
-<span class="sourceLineNo">422</span>      put.addColumn(famName, row, row);<a name="line.422"></a>
-<span class="sourceLineNo">423</span>      puts.add(put);<a name="line.423"></a>
-<span class="sourceLineNo">424</span>    }<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    htable1.setWriteBufferSize(1024);<a name="line.425"></a>
-<span class="sourceLineNo">426</span>    // The puts will be iterated through and flushed only when the buffer<a name="line.426"></a>
-<span class="sourceLineNo">427</span>    // size is reached.<a name="line.427"></a>
-<span class="sourceLineNo">428</span>    htable1.put(puts);<a name="line.428"></a>
-<span class="sourceLineNo">429</span><a name="line.429"></a>
-<span class="sourceLineNo">430</span>    Scan scan = new Scan();<a name="line.430"></a>
-<span class="sourceLineNo">431</span><a name="line.431"></a>
-<span class="sourceLineNo">432</span>    ResultScanner scanner = htable1.getScanner(scan);<a name="line.432"></a>
-<span class="sourceLineNo">433</span>    Result[] res = scanner.next(NB_ROWS_IN_BIG_BATCH);<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    scanner.close();<a name="line.434"></a>
+<span class="sourceLineNo">155</span>    put = new Put(row);<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    put.addColumn(famName, row, t + 2, v3);<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    htable1.put(put);<a name="line.157"></a>
+<span class="sourceLineNo">158</span><a name="line.158"></a>
+<span class="sourceLineNo">159</span>    Get get = new Get(row);<a name="line.159"></a>
+<span class="sourceLineNo">160</span>    get.setMaxVersions();<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    for (int i = 0; i &lt; NB_RETRIES; i++) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span>      if (i==NB_RETRIES-1) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span>        fail("Waited too much time for put replication");<a name="line.163"></a>
+<span class="sourceLineNo">164</span>      }<a name="line.164"></a>
+<span class="sourceLineNo">165</span>      Result res = htable2.get(get);<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      if (res.size() &lt; 3) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>        LOG.info("Rows not available");<a name="line.167"></a>
+<span class="sourceLineNo">168</span>        Thread.sleep(SLEEP_TIME);<a name="line.168"></a>
+<span class="sourceLineNo">169</span>      } else {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>        assertArrayEquals(CellUtil.cloneValue(res.rawCells()[0]), v3);<a name="line.170"></a>
+<span class="sourceLineNo">171</span>        assertArrayEquals(CellUtil.cloneValue(res.rawCells()[1]), v2);<a name="line.171"></a>
+<span class="sourceLineNo">172</span>        assertArrayEquals(CellUtil.cloneValue(res.rawCells()[2]), v1);<a name="line.172"></a>
+<span class="sourceLineNo">173</span>        break;<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>    // place a version delete marker (delete last version)<a name="line.176"></a>
+<span class="sourceLineNo">177</span>    Delete d = new Delete(row);<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    d.addColumn(famName, row, t);<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    htable1.delete(d);<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span>    get = new Get(row);<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    get.setMaxVersions();<a name="line.182"></a>
+<span class="sourceLineNo">183</span>    for (int i = 0; i &lt; NB_RETRIES; i++) {<a name="line.183"></a>
+<span class="sourceLineNo">184</span>      if (i==NB_RETRIES-1) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span>        fail("Waited too much time for put replication");<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      }<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      Result res = htable2.get(get);<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      if (res.size() &gt; 2) {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>        LOG.info("Version not deleted");<a name="line.189"></a>
+<span class="sourceLineNo">190</span>        Thread.sleep(SLEEP_TIME);<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      } else {<a name="line.191"></a>
+<span class="sourceLineNo">192</span>        assertArrayEquals(CellUtil.cloneValue(res.rawCells()[0]), v3);<a name="line.192"></a>
+<span class="sourceLineNo">193</span>        assertArrayEquals(CellUtil.cloneValue(res.rawCells()[1]), v2);<a name="line.193"></a>
+<span class="sourceLineNo">194</span>        break;<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      }<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    }<a name="line.196"></a>
+<span class="sourceLineNo">197</span><a name="line.197"></a>
+<span class="sourceLineNo">198</span>    // place a column delete marker<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    d = new Delete(row);<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    d.addColumns(famName, row, t+2);<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    htable1.delete(d);<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span>    // now *both* of the remaining version should be deleted<a name="line.203"></a>
+<span class="sourceLineNo">204</span>    // at the replica<a name="line.204"></a>
+<span class="sourceLineNo">205</span>    get = new Get(row);<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    for (int i = 0; i &lt; NB_RETRIES; i++) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      if (i==NB_RETRIES-1) {<a name="line.207"></a>
+<span class="sourceLineNo">208</span>        fail("Waited too much time for del replication");<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      }<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      Result res = htable2.get(get);<a name="line.210"></a>
+<span class="sourceLineNo">211</span>      if (res.size() &gt;= 1) {<a name="line.211"></a>
+<span class="sourceLineNo">212</span>        LOG.info("Rows not deleted");<a name="line.212"></a>
+<span class="sourceLineNo">213</span>        Thread.sleep(SLEEP_TIME);<a name="line.213"></a>
+<span class="sourceLineNo">214</span>      } else {<a name="line.214"></a>
+<span class="sourceLineNo">215</span>        break;<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>  }<a name="line.218"></a>
+<span class="sourceLineNo">219</span><a name="line.219"></a>
+<span class="sourceLineNo">220</span>  /**<a name="line.220"></a>
+<span class="sourceLineNo">221</span>   * Add a row, check it's replicated, delete it, check's gone<a name="line.221"></a>
+<span class="sourceLineNo">222</span>   * @throws Exception<a name="line.222"></a>
+<span class="sourceLineNo">223</span>   */<a name="line.223"></a>
+<span class="sourceLineNo">224</span>  @Test(timeout=300000)<a name="line.224"></a>
+<span class="sourceLineNo">225</span>  public void testSimplePutDelete() throws Exception {<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    LOG.info("testSimplePutDelete");<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    Put put = new Put(row);<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    put.addColumn(famName, row, row);<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span>    htable1 = utility1.getConnection().getTable(tableName);<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    htable1.put(put);<a name="line.231"></a>
+<span class="sourceLineNo">232</span><a name="line.232"></a>
+<span class="sourceLineNo">233</span>    Get get = new Get(row);<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    for (int i = 0; i &lt; NB_RETRIES; i++) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span>      if (i==NB_RETRIES-1) {<a name="line.235"></a>
+<span class="sourceLineNo">236</span>        fail("Waited too much time for put replication");<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      }<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      Result res = htable2.get(get);<a name="line.238"></a>
+<span class="sourceLineNo">239</span>      if (res.isEmpty()) {<a name="line.239"></a>
+<span class="sourceLineNo">240</span>        LOG.info("Row not available");<a name="line.240"></a>
+<span class="sourceLineNo">241</span>        Thread.sleep(SLEEP_TIME);<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      } else {<a name="line.242"></a>
+<span class="sourceLineNo">243</span>        assertArrayEquals(res.value(), row);<a name="line.243"></a>
+<span class="sourceLineNo">244</span>        break;<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      }<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    }<a name="line.246"></a>
+<span class="sourceLineNo">247</span><a name="line.247"></a>
+<span class="sourceLineNo">248</span>    Delete del = new Delete(row);<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    htable1.delete(del);<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span>    get = new Get(row);<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    for (int i = 0; i &lt; NB_RETRIES; i++) {<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      if (i==NB_RETRIES-1) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span>        fail("Waited too much time for del replication");<a name="line.254"></a>
+<span class="sourceLineNo">255</span>      }<a name="line.255"></a>
+<span class="sourceLineNo">256</span>      Result res = htable2.get(get);<a name="line.256"></a>
+<span class="sourceLineNo">257</span>      if (res.size() &gt;= 1) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span>        LOG.info("Row not deleted");<a name="line.258"></a>
+<span class="sourceLineNo">259</span>        Thread.sleep(SLEEP_TIME);<a name="line.259"></a>
+<span class="sourceLineNo">260</span>      } else {<a name="line.260"></a>
+<span class="sourceLineNo">261</span>        break;<a name="line.261"></a>
+<span class="sourceLineNo">262</span>      }<a name="line.262"></a>
+<span class="sourceLineNo">263</span>    }<a name="line.263"></a>
+<span class="sourceLineNo">264</span>  }<a name="line.264"></a>
+<span class="sourceLineNo">265</span><a name="line.265"></a>
+<span class="sourceLineNo">266</span>  /**<a name="line.266"></a>
+<span class="sourceLineNo">267</span>   * Try a small batch upload using the write buffer, check it's replicated<a name="line.267"></a>
+<span class="sourceLineNo">268</span>   * @throws Exception<a name="line.268"></a>
+<span class="sourceLineNo">269</span>   */<a name="line.269"></a>
+<span class="sourceLineNo">270</span>  @Test(timeout=300000)<a name="line.270"></a>
+<span class="sourceLineNo">271</span>  public void testSmallBatch() throws Exception {<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    LOG.info("testSmallBatch");<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    // normal Batch tests<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    loadData("", row);<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span>    Scan scan = new Scan();<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span>    ResultScanner scanner1 = htable1.getScanner(scan);<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    Result[] res1 = scanner1.next(NB_ROWS_IN_BATCH);<a name="line.279"></a>
+<span class="sourceLineNo">280</span>    scanner1.close();<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    assertEquals(NB_ROWS_IN_BATCH, res1.length);<a name="line.281"></a>
+<span class="sourceLineNo">282</span><a name="line.282"></a>
+<span class="sourceLineNo">283</span>    waitForReplication(NB_ROWS_IN_BATCH, NB_RETRIES);<a name="line.283"></a>
+<span class="sourceLineNo">284</span>  }<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span>  private void waitForReplication(int expectedRows, int retries) throws IOException, InterruptedException {<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    Scan scan;<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    for (int i = 0; i &lt; retries; i++) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span>      scan = new Scan();<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      if (i== retries -1) {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>        fail("Waited too much time for normal batch replication");<a name="line.291"></a>
+<span class="sourceLineNo">292</span>      }<a name="line.292"></a>
+<span class="sourceLineNo">293</span>      ResultScanner scanner = htable2.getScanner(scan);<a name="line.293"></a>
+<span class="sourceLineNo">294</span>      Result[] res = scanner.next(expectedRows);<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      scanner.close();<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      if (res.length != expectedRows) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span>        LOG.info("Only got " + res.length + " rows");<a name="line.297"></a>
+<span class="sourceLineNo">298</span>        Thread.sleep(SLEEP_TIME);<a name="line.298"></a>
+<span class="sourceLineNo">299</span>      } else {<a name="line.299"></a>
+<span class="sourceLineNo">300</span>        break;<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      }<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    }<a name="line.302"></a>
+<span class="sourceLineNo">303</span>  }<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span>  private void loadData(String prefix, byte[] row) throws IOException {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>    List&lt;Put&gt; puts = new ArrayList&lt;&gt;(NB_ROWS_IN_BATCH);<a name="line.306"></a>
+<span class="sourceLineNo">307</span>    for (int i = 0; i &lt; NB_ROWS_IN_BATCH; i++) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span>      Put put = new Put(Bytes.toBytes(prefix + Integer.toString(i)));<a name="line.308"></a>
+<span class="sourceLineNo">309</span>      put.addColumn(famName, row, row);<a name="line.309"></a>
+<span class="sourceLineNo">310</span>      puts.add(put);<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    }<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    htable1.put(puts);<a name="line.312"></a>
+<span class="sourceLineNo">313</span>  }<a name="line.313"></a>
+<span class="sourceLineNo">314</span><a name="line.314"></a>
+<span class="sourceLineNo">315</span>  /**<a name="line.315"></a>
+<span class="sourceLineNo">316</span>   * Test disable/enable replication, trying to insert, make sure nothing's<a name="line.316"></a>
+<span class="sourceLineNo">317</span>   * replicated, enable it, the insert should be replicated<a name="line.317"></a>
+<span class="sourceLineNo">318</span>   *<a name="line.318"></a>
+<span class="sourceLineNo">319</span>   * @throws Exception<a name="line.319"></a>
+<span class="sourceLineNo">320</span>   */<a name="line.320"></a>
+<span class="sourceLineNo">321</span>  @Test(timeout = 300000)<a name="line.321"></a>
+<span class="sourceLineNo">322</span>  public void testDisableEnable() throws Exception {<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span>    // Test disabling replication<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    admin.disablePeer(PEER_ID);<a name="line.325"></a>
+<span class="sourceLineNo">326</span><a name="line.326"></a>
+<span class="sourceLineNo">327</span>    byte[] rowkey = Bytes.toBytes("disable enable");<a name="line.327"></a>
+<span class="sourceLineNo">328</span>    Put put = new Put(rowkey);<a name="line.328"></a>
+<span class="sourceLineNo">329</span>    put.addColumn(famName, row, row);<a name="line.329"></a>
+<span class="sourceLineNo">330</span>    htable1.put(put);<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span>    Get get = new Get(rowkey);<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    for (int i = 0; i &lt; NB_RETRIES; i++) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span>      Result res = htable2.get(get);<a name="line.334"></a>
+<span class="sourceLineNo">335</span>      if (res.size() &gt;= 1) {<a name="line.335"></a>
+<span class="sourceLineNo">336</span>        fail("Replication wasn't disabled");<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      } else {<a name="line.337"></a>
+<span class="sourceLineNo">338</span>        LOG.info("Row not replicated, let's wait a bit more...");<a name="line.338"></a>
+<span class="sourceLineNo">339</span>        Thread.sleep(SLEEP_TIME);<a name="line.339"></a>
+<span class="sourceLineNo">340</span>      }<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    }<a name="line.341"></a>
+<span class="sourceLineNo">342</span><a name="line.342"></a>
+<span class="sourceLineNo">343</span>    // Test enable replication<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    admin.enablePeer(PEER_ID);<a name="line.344"></a>
+<span class="sourceLineNo">345</span><a name="line.345"></a>
+<span class="sourceLineNo">346</span>    for (int i = 0; i &lt; NB_RETRIES; i++) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>      Result res = htable2.get(get);<a name="line.347"></a>
+<span class="sourceLineNo">348</span>      if (res.isEmpty()) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span>        LOG.info("Row not available");<a name="line.349"></a>
+<span class="sourceLineNo">350</span>        Thread.sleep(SLEEP_TIME);<a name="line.350"></a>
+<span class="sourceLineNo">351</span>      } else {<a name="line.351"></a>
+<span class="sourceLineNo">352</span>        assertArrayEquals(res.value(), row);<a name="line.352"></a>
+<span class="sourceLineNo">353</span>        return;<a name="line.353"></a>
+<span class="sourceLineNo">354</span>      }<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    }<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    fail("Waited too much time for put replication");<a name="line.356"></a>
+<span class="sourceLineNo">357</span>  }<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span>  /**<a name="line.359"></a>
+<span class="sourceLineNo">360</span>   * Integration test for TestReplicationAdmin, removes and re-add a peer<a name="line.360"></a>
+<span class="sourceLineNo">361</span>   * cluster<a name="line.361"></a>
+<span class="sourceLineNo">362</span>   *<a name="line.362"></a>
+<span class="sourceLineNo">363</span>   * @throws Exception<a name="line.363"></a>
+<span class="sourceLineNo">364</span>   */<a name="line.364"></a>
+<span class="sourceLineNo">365</span>  @Test(timeout=300000)<a name="line.365"></a>
+<span class="sourceLineNo">366</span>  public void testAddAndRemoveClusters() throws Exception {<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    LOG.info("testAddAndRemoveClusters");<a name="line.367"></a>
+<span class="sourceLineNo">368</span>    admin.removePeer(PEER_ID);<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    Thread.sleep(SLEEP_TIME);<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    byte[] rowKey = Bytes.toBytes("Won't be replicated");<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    Put put = new Put(rowKey);<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    put.addColumn(famName, row, row);<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    htable1.put(put);<a name="line.373"></a>
+<span class="sourceLineNo">374</span><a name="line.374"></a>
+<span class="sourceLineNo">375</span>    Get get = new Get(rowKey);<a name="line.375"></a>
+<span class="sourceLineNo">376</span>    for (int i = 0; i &lt; NB_RETRIES; i++) {<a name="line.376"></a>
+<span class="sourceLineNo">377</span>      if (i == NB_RETRIES-1) {<a name="line.377"></a>
+<span class="sourceLineNo">378</span>        break;<a name="line.378"></a>
+<span class="sourceLineNo">379</span>      }<a name="line.379"></a>
+<span class="sourceLineNo">380</span>      Result res = htable2.get(get);<a name="line.380"></a>
+<span class="sourceLineNo">381</span>      if (res.size() &gt;= 1) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span>        fail("Not supposed to be replicated");<a name="line.382"></a>
+<span class="sourceLineNo">383</span>      } else {<a name="line.383"></a>
+<span class="sourceLineNo">384</span>        LOG.info("Row not replicated, let's wait a bit more...");<a name="line.384"></a>
+<span class="sourceLineNo">385</span>        Thread.sleep(SLEEP_TIME);<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      }<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    }<a name="line.387"></a>
+<span class="sourceLineNo">388</span>    ReplicationPeerConfig rpc = new ReplicationPeerConfig();<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    rpc.setClusterKey(utility2.getClusterKey());<a name="line.389"></a>
+<span class="sourceLineNo">390</span>    admin.addPeer(PEER_ID, rpc, null);<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    Thread.sleep(SLEEP_TIME);<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    rowKey = Bytes.toBytes("do rep");<a name="line.392"></a>
+<span class="sourceLineNo">393</span>    put = new Put(rowKey);<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    put.addColumn(famName, row, row);<a name="line.394"></a>
+<span class="sourceLineNo">395</span>    LOG.info("Adding new row");<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    htable1.put(put);<a name="line.396"></a>
+<span class="sourceLineNo">397</span><a name="line.397"></a>
+<span class="sourceLineNo">398</span>    get = new Get(rowKey);<a name="line.398"></a>
+<span class="sourceLineNo">399</span>    for (int i = 0; i &lt; NB_RETRIES; i++) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span>      if (i==NB_RETRIES-1) {<a name="line.400"></a>
+<span class="sourceLineNo">401</span>        fail("Waited too much time for put replication");<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      }<a name="line.402"></a>
+<span class="sourceLineNo">403</span>      Result res = htable2.get(get);<a name="line.403"></a>
+<span class="sourceLineNo">404</span>      if (res.isEmpty()) {<a name="line.404"></a>
+<span class="sourceLineNo">405</span>        LOG.info("Row not available");<a name="line.405"></a>
+<span class="sourceLineNo">406</span>        Thread.sleep(SLEEP_TIME*i);<a name="line.406"></a>
+<span class="sourceLineNo">407</span>      } else {<a name="line.407"></a>
+<span class="sourceLineNo">408</span>        assertArrayEquals(res.value(), row);<a name="line.408"></a>
+<span class="sourceLineNo">409</span>        break;<a name="line.409"></a>
+<span class="sourceLineNo">410</span>      }<a name="line.410"></a>
+<span class="sourceLineNo">411</span>    }<a name="line.411"></a>
+<span class="sourceLineNo">412</span>  }<a name="line.412"></a>
+<span class="sourceLineNo">413</span><a name="line.413"></a>
+<span class="sourceLineNo">414</span><a name="line.414"></a>
+<span class="sourceLineNo">415</span>  /**<a name="line.415"></a>
+<span class="sourceLineNo">416</span>   * Do a more intense version testSmallBatch, one  that will trigger<a name="line.416"></a>
+<span class="sourceLineNo">417</span>   * wal rolling and other non-trivial code paths<a name="line.417"></a>
+<span class="sourceLineNo">418</span>   * @throws Exception<a name="line.418"></a>
+<span class="sourceLineNo">419</span>   */<a name="line.419"></a>
+<span class="sourceLineNo">420</span>  @Test(timeout=300000)<a name="line.420"></a>
+<span class="sourceLineNo">421</span>  public void testLoading() throws Exception {<a name="line.421"></a>
+<span class="sourceLineNo">422</span>    LOG.info("Writing out rows to table1 in testLoading");<a name="line.422"></a>
+<span class="sourceLineNo">423</span>    List&lt;Put&gt; puts = new ArrayList&lt;&gt;(NB_ROWS_IN_BIG_BATCH);<a name="line.423"></a>
+<span class="sourceLineNo">424</span>    for (int i = 0; i &lt; NB_ROWS_IN_BIG_BATCH; i++) {<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      Put put = new Put(Bytes.toBytes(i));<a name="line.425"></a>
+<span class="sourceLineNo">426</span>      put.addColumn(famName, row, row);<a name="line.426"></a>
+<span class="sourceLineNo">427</span>      puts.add(put);<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    }<a name="line.428"></a>
+<span class="sourceLineNo">429</span>    htable1.setWriteBufferSize(1024);<a name="line.429"></a>
+<span class="sourceLineNo">430</span>    // The puts will be iterated through and flushed only when the buffer<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    // size is reached.<a name="line.431"></a>
+<span class="sourceLineNo">432</span>    htable1.put(puts);<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span>    Scan scan = new Scan();<a name="line.434"></a>
 <span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span>    assertEquals(NB_ROWS_IN_BIG_BATCH, res.length);<a name="line.436"></a>
-<span class="sourceLineNo">437</span><a name="line.437"></a>
-<span class="sourceLineNo">438</span>    LOG.info("Looking in table2 for replicated rows in testLoading");<a name="line.438"></a>
-<span class="sourceLineNo">439</span>    long start = System.currentTimeMillis();<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    // Retry more than NB_RETRIES.  As it was, retries were done in 5 seconds and we'd fail<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    // sometimes.<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    final long retries = NB_RETRIES * 10;<a name="line.442"></a>
-<span class="sourceLineNo">443</span>    for (int i = 0; i &lt; retries; i++) {<a name="line.443"></a>
-<span class="sourceLineNo">444</span>      scan = new Scan();<a name="line.444"></a>
-<span class="sourceLineNo">445</span>      scanner = htable2.getScanner(scan);<a name="line.445"></a>
-<span class="sourceLineNo">446</span>      res = scanner.next(NB_ROWS_IN_BIG_BATCH);<a name="line.446"></a>
-<span class="sourceLineNo">447</span>      scanner.close();<a name="line.447"></a>
-<span class="sourceLineNo">448</span>      if (res.length != NB_ROWS_IN_BIG_BATCH) {<a name="line.448"></a>
-<span class="sourceLineNo">449</span>        if (i == retries - 1) {<a name="line.449"></a>
-<span class="sourceLineNo">450</span>          int lastRow = -1;<a name="line.450"></a>
-<span class="sourceLineNo">451</span>          for (Result result : res) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span>            int currentRow = Bytes.toInt(result.getRow());<a name="line.452"></a>
-<span class="sourceLineNo">453</span>            for (int row = lastRow+1; row &lt; currentRow; row++) {<a name="line.453"></a>
-<span class="sourceLineNo">454</span>              LOG.error("Row missing: " + row);<a name="line.454"></a>
-<span class="sourceLineNo">455</span>            }<a name="line.455"></a>
-<span class="sourceLineNo">456</span>            lastRow = currentRow;<a name="line.456"></a>
-<span class="sourceLineNo">457</span>          }<a name="line.457"></a>
-<span class="sourceLineNo">458</span>          LOG.error("Last row: " + lastRow);<a name="line.458"></a>
-<span class="sourceLineNo">459</span>          fail("Waited too much time for normal batch replication, " +<a name="line.459"></a>
-<span class="sourceLineNo">460</span>            res.length + " instead of " + NB_ROWS_IN_BIG_BATCH + "; waited=" +<a name="line.460"></a>
-<span class="sourceLineNo">461</span>            (System.currentTimeMillis() - start) + "ms");<a name="line.461"></a>
-<span class="sourceLineNo">462</span>        } else {<a name="line.462"></a>
-<span class="sourceLineNo">463</span>          LOG.info("Only got " + res.length + " rows... retrying");<a name="line.463"></a>
-<span class="sourceLineNo">464</span>          Thread.sleep(SLEEP_TIME);<a name="line.464"></a>
-<span class="sourceLineNo">465</span>        }<a name="line.465"></a>
-<span class="sourceLineNo">466</span>      } else {<a name="line.466"></a>
-<span class="sourceLineNo">467</span>        break;<a name="line.467"></a>
-<span class="sourceLineNo">468</span>      }<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    }<a name="line.469"></a>
-<span class="sourceLineNo">470</span>  }<a name="line.470"></a>
-<span class="sourceLineNo">471</span><a name="line.471"></a>
-<span class="sourceLineNo">472</span>  /**<a name="line.472"></a>
-<span class="sourceLineNo">473</span>   * Do a small loading into a table, make sure the data is really the same,<a name="line.473"></a>
-<span class="sourceLineNo">474</span>   * then run the VerifyReplication job to check the results. Do a second<a name="line.474"></a>
-<span class="sourceLineNo">475</span>   * comparison where all the cells are different.<a name="line.475"></a>
-<span class="sourceLineNo">476</span>   * @throws Exception<a name="line.476"></a>
-<span class="sourceLineNo">477</span>   */<a name="line.477"></a>
-<span class="sourceLineNo">478</span>  @Test(timeout=300000)<a name="line.478"></a>
-<span class="sourceLineNo">479</span>  public void testVerifyRepJob() throws Exception {<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    // Populate the tables, at the same time it guarantees that the tables are<a name="line.480"></a>
-<span class="sourceLineNo">481</span>    // identical since it does the check<a name="line.481"></a>
-<span class="sourceLineNo">482</span>    testSmallBatch();<a name="line.482"></a>
-<span class="sourceLineNo">483</span><a name="line.483"></a>
-<span class="sourceLineNo">484</span>    String[] args = new String[] {PEER_ID, tableName.getNameAsString()};<a name="line.484"></a>
-<span class="sourceLineNo">485</span>    runVerifyReplication(args, NB_ROWS_IN_BATCH, 0);<a name="line.485"></a>
-<span class="sourceLineNo">486</span><a name="line.486"></a>
-<span class="sourceLineNo">487</span>    Scan scan = new Scan();<a name="line.487"></a>
-<span class="sourceLineNo">488</span>    ResultScanner rs = htable2.getScanner(scan);<a name="line.488"></a>
-<span class="sourceLineNo">489</span>    Put put = null;<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    for (Result result : rs) {<a name="line.490"></a>
-<span class="sourceLineNo">491</span>      put = new Put(result.getRow());<a name="line.491"></a>
-<span class="sourceLineNo">492</span>      Cell firstVal = result.rawCells()[0];<a name="line.492"></a>
-<span class="sourceLineNo">493</span>      put.addColumn(CellUtil.cloneFamily(firstVal), CellUtil.cloneQualifier(firstVal),<a name="line.493"></a>
-<span class="sourceLineNo">494</span>          Bytes.toBytes("diff data"));<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      htable2.put(put);<a name="line.495"></a>
-<span class="sourceLineNo">496</span>    }<a name="line.496"></a>
-<span class="sourceLineNo">497</span>    Delete delete = new Delete(put.getRow());<a name="line.497"></a>
-<span class="sourceLineNo">498</span>    htable2.delete(delete);<a name="line.498"></a>
-<span class="sourceLineNo">499</span>    runVerifyReplication(args, 0, NB_ROWS_IN_BATCH);<a name="line.499"></a>
-<span class="sourceLineNo">500</span>  }<a name="line.500"></a>
-<span class="sourceLineNo">501</span><a name="line.501"></a>
-<span class="sourceLineNo">502</span>  /**<a name="line.502"></a>
-<span class="sourceLineNo">503</span>   * Load a row into a table, make sure the data is really the same,<a name="line.503"></a>
-<span class="sourceLineNo">504</span>   * delete the row, make sure the delete marker is replicated,<a name="line.504"></a>
-<span class="sourceLineNo">505</span>   * run verify replication with and without raw to check the results.<a name="line.505"></a>
-<span class="sourceLineNo">506</span>   * @throws Exception<a name="line.506"></a>
-<span class="sourceLineNo">507</span>   */<a name="line.507"></a>
-<span class="sourceLineNo">508</span>  @Test(timeout=300000)<a name="line.508"></a>
-<span class="sourceLineNo">509</span>  public void testVerifyRepJobWithRawOptions() throws Exception {<a name="line.509"></a>
-<span class="sourceLineNo">510</span>    LOG.info(name.getMethodName());<a name="line.510"></a>
-<span class="sourceLineNo">511</span><a name="line.511"></a>
-<span class="sourceLineNo">512</span>    final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.512"></a>
-<span class="sourceLineNo">513</span>    byte[] familyname = Bytes.toBytes("fam_raw");<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    byte[] row = Bytes.toBytes("row_raw");<a name="line.514"></a>
+<span class="sourceLineNo">436</span>    ResultScanner scanner = htable1.getScanner(scan);<a name="line.436"></a>
+<span class="sourceLineNo">437</span>    Result[] res = scanner.next(NB_ROWS_IN_BIG_BATCH);<a name="line.437"></a>
+<span class="sourceLineNo">438</span>    scanner.close();<a name="line.438"></a>
+<span class="sourceLineNo">439</span><a name="line.439"></a>
+<span class="sourceLineNo">440</span>    assertEquals(NB_ROWS_IN_BIG_BATCH, res.length);<a name="line.440"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span>    LOG.info("Looking in table2 for replicated rows in testLoading");<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    long start = System.currentTimeMillis();<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    // Retry more than NB_RETRIES.  As it was, retries were done in 5 seconds and we'd fail<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    // sometimes.<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    final long retries = NB_RETRIES * 10;<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    for (int i = 0; i &lt; retries; i++) {<a name="line.447"></a>
+<span class="sourceLineNo">448</span>      scan = new Scan();<a name="line.448"></a>
+<span class="sourceLineNo">449</span>      scanner = htable2.getScanner(scan);<a name="line.449"></a>
+<span class="sourceLineNo">450</span>      res = scanner.next(NB_ROWS_IN_BIG_BATCH);<a name="line.450"></a>
+<span class="sourceLineNo">451</span>      scanner.close();<a name="line.451"></a>
+<span class="sourceLineNo">452</span>      if (res.length != NB_ROWS_IN_BIG_BATCH) {<a name="line.452"></a>
+<span class="sourceLineNo">453</span>        if (i == retries - 1) {<a name="line.453"></a>
+<span class="sourceLineNo">454</span>          int lastRow = -1;<a name="line.454"></a>
+<span class="sourceLineNo">455</span>          for (Result result : res) {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>            int currentRow = Bytes.toInt(result.getRow());<a name="line.456"></a>
+<span class="sourceLineNo">457</span>            for (int row = lastRow+1; row &lt; currentRow; row++) {<a name="line.457"></a>
+<span class="sourceLineNo">458</span>              LOG.error("Row missing: " + row);<a name="line.458"></a>
+<span class="sourceLineNo">459</span>            }<a name="line.459"></a>
+<span class="sourceLineNo">460</span>            lastRow = currentRow;<a name="line.460"></a>
+<span class="sourceLineNo">461</span>          }<a name="line.461"></a>
+<span class="sourceLineNo">462</span>          LOG.error("Last row: " + lastRow);<a name="line.462"></a>
+<span class="sourceLineNo">463</span>          fail("Waited too much time for normal batch replication, " +<a name="line.463"></a>
+<span class="sourceLineNo">464</span>            res.length + " instead of " + NB_ROWS_IN_BIG_BATCH + "; waited=" +<a name="line.464"></a>
+<span class="sourceLineNo">465</span>            (System.currentTimeMillis() - start) + "ms");<a name="line.465"></a>
+<span class="sourceLineNo">466</span>        } else {<a name="line.466"></a>
+<span class="sourceLineNo">467</span>          LOG.info("Only got " + res.length + " rows... retrying");<a name="line.467"></a>
+<span class="sourceLineNo">468</span>          Thread.sleep(SLEEP_TIME);<a name="line.468"></a>
+<span class="sourceLineNo">469</span>        }<a name="line.469"></a>
+<span class="sourceLineNo">470</span>      } else {<a name="line.470"></a>
+<span class="sourceLineNo">471</span>        break;<a name="line.471"></a>
+<span class="sourceLineNo">472</span>      }<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    }<a name="line.473"></a>
+<span class="sourceLineNo">474</span>  }<a name="line.474"></a>
+<span class="sourceLineNo">475</span><a name="line.475"></a>
+<span class="sourceLineNo">476</span>  /**<a name="line.476"></a>
+<span class="sourceLineNo">477</span>   * Do a small loading into a table, make sure the data is really the same,<a name="line.477"></a>
+<span class="sourceLineNo">478</span>   * then run the VerifyReplication job to check the results. Do a second<a name="line.478"></a>
+<span class="sourceLineNo">479</span>   * comparison where all the cells are different.<a name="line.479"></a>
+<span class="sourceLineNo">480</span>   * @throws Exception<a name="line.480"></a>
+<span class="sourceLineNo">481</span>   */<a name="line.481"></a>
+<span class="sourceLineNo">482</span>  @Test(timeout=300000)<a name="line.482"></a>
+<span class="sourceLineNo">483</span>  public void testVerifyRepJob() throws Exception {<a name="line.483"></a>
+<span class="sourceLineNo">484</span>    // Populate the tables, at the same time it guarantees that the tables are<a name="line.484"></a>
+<span class="sourceLineNo">485</span>    // identical since it does the check<a name="line.485"></a>
+<span class="sourceLineNo">486</span>    testSmallBatch();<a name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span>    String[] args = new String[] {PEER_ID, tableName.getNameAsString()};<a name="line.488"></a>
+<span class="sourceLineNo">489</span>    runVerifyReplication(args, NB_ROWS_IN_BATCH, 0);<a name="line.489"></a>
+<span class="sourceLineNo">490</span><a name="line.490"></a>
+<span class="sourceLineNo">491</span>    Scan scan = new Scan();<a name="line.491"></a>
+<span class="sourceLineNo">492</span>    ResultScanner rs = htable2.getScanner(scan);<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    Put put = null;<a name="line.493"></a>
+<span class="sourceLineNo">494</span>    for (Result result : rs) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>      put = new Put(result.getRow());<a name="line.495"></a>
+<span class="sourceLineNo">496</span>      Cell firstVal = result.rawCells()[0];<a name="line.496"></a>
+<span class="sourceLineNo">497</span>      put.addColumn(CellUtil.cloneFamily(firstVal), CellUtil.cloneQualifier(firstVal),<a name="line.497"></a>
+<span class="sourceLineNo">498</span>          Bytes.toBytes("diff data"));<a name="line.498"></a>
+<span class="sourceLineNo">499</span>      htable2.put(put);<a name="line.499"></a>
+<span class="sourceLineNo">500</span>    }<a name="line.500"></a>
+<span class="sourceLineNo">501</span>    Delete delete = new Delete(put.getRow());<a name="line.501"></a>
+<span class="sourceLineNo">502</span>    htable2.delete(delete);<a name="line.502"></a>
+<span class="sourceLineNo">503</span>    runVerifyReplication(args, 0, NB_ROWS_IN_BATCH);<a name="line.503"></a>
+<span class="sourceLineNo">504</span>  }<a name="line.504"></a>
+<span class="sourceLineNo">505</span><a name="line.505"></a>
+<span class="sourceLineNo">506</span>  /**<a name="line.506"></a>
+<span class="sourceLineNo">507</span>   * Load a row into a table, make sure the data is really the same,<a name="line.507"></a>
+<span class="sourceLineNo">508</span>   * delete the row, make sure the delete marker is replicated,<a name="line.508"></a>
+<span class="sourceLineNo">509</span>   * run verify replication with and without raw to check the results.<a name="line.509"></a>
+<span class="sourceLineNo">510</span>   * @throws Exception<a name="line.510"></a>
+<span class="sourceLineNo">511</span>   */<a name="line.511"></a>
+<span class="sourceLineNo">512</span>  @Test(timeout=300000)<a name="line.512"></a>
+<span class="sourceLineNo">513</span>  public void testVerifyRepJobWithRawOptions() throws Exception {<a name="line.513"></a>
+<span class="sourceLineNo">514</span>    LOG.info(name.getMethodName());<a name="line.514"></a>
 <span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span>    Table lHtable1 = null;<a name="line.516"></a>
-<span class="sourceLineNo">517</span>    Table lHtable2 = null;<a name="line.517"></a>
-<span class="sourceLineNo">518</span><a name="line.518"></a>
-<span class="sourceLineNo">519</span>    try {<a name="line.519"></a>
-<span class="sourceLineNo">520</span>      HTableDescriptor table = new HTableDescriptor(tableName);<a name="line.520"></a>
-<span class="sourceLineNo">521</span>      HColumnDescriptor fam = new HColumnDescriptor(familyname);<a name="line.521"></a>
-<span class="sourceLineNo">522</span>      fam.setMaxVersions(100);<a name="line.522"></a>
-<span class="sourceLineNo">523</span>      fam.setScope(HConstants.REPLICATION_SCOPE_GLOBAL);<a name="line.523"></a>
-<span class="sourceLineNo">524</span>      table.addFamily(fam);<a name="line.524"></a>
-<span class="sourceLineNo">525</span>      scopes = new TreeMap&lt;&gt;(Bytes.BYTES_COMPAR

<TRUNCATED>

Mime
View raw message