You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/01/17 15:32:18 UTC
[02/13] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c13644e5/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 86993e3..af89a65 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.html
@@ -6,7 +6,7 @@
</head>
<body>
<div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>/*<a name="line.1"></a>
+<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
<span class="sourceLineNo">002</span> * Licensed to the Apache Software Foundation (ASF) under one<a name="line.2"></a>
<span class="sourceLineNo">003</span> * or more contributor license agreements. See the NOTICE file<a name="line.3"></a>
<span class="sourceLineNo">004</span> * distributed with this work for additional information<a name="line.4"></a>
@@ -23,1068 +23,425 @@
<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><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 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.assertFalse;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import static org.junit.Assert.assertNotNull;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import static org.junit.Assert.assertTrue;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import static org.junit.Assert.fail;<a name="line.26"></a>
-<span class="sourceLineNo">027</span><a name="line.27"></a>
-<span class="sourceLineNo">028</span>import java.io.IOException;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import java.util.ArrayList;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import java.util.List;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import java.util.NavigableMap;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import java.util.TreeMap;<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.conf.Configuration;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.fs.FileStatus;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.fs.FileSystem;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.fs.Path;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.Cell;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.HBaseTestingUtility;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.HConstants;<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.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.ColumnFamilyDescriptor;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.client.Delete;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.client.Get;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.client.Put;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.client.RegionInfoBuilder;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.client.Result;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.client.ResultScanner;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.client.Table;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.client.TableDescriptorBuilder;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.client.replication.TableCFs;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.mapreduce.replication.VerifyReplication;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>import org.apache.hadoop.hbase.regionserver.HRegion;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>import org.apache.hadoop.hbase.regionserver.HRegionServer;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>import org.apache.hadoop.hbase.regionserver.MultiVersionConcurrencyControl;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>import org.apache.hadoop.hbase.regionserver.wal.AbstractFSWAL;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>import org.apache.hadoop.hbase.replication.regionserver.Replication;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>import org.apache.hadoop.hbase.replication.regionserver.ReplicationSource;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>import org.apache.hadoop.hbase.replication.regionserver.ReplicationSourceInterface;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>import org.apache.hadoop.hbase.testclassification.ReplicationTests;<a name="line.72"></a>
-<span class="sourceLineNo">073</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.75"></a>
-<span class="sourceLineNo">076</span>import org.apache.hadoop.hbase.util.JVMClusterUtil;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>import org.apache.hadoop.hbase.wal.AbstractFSWALProvider;<a name="line.77"></a>
-<span class="sourceLineNo">078</span>import org.apache.hadoop.hbase.wal.WAL;<a name="line.78"></a>
-<span class="sourceLineNo">079</span>import org.apache.hadoop.hbase.wal.WALKeyImpl;<a name="line.79"></a>
-<span class="sourceLineNo">080</span>import org.apache.hadoop.hbase.wal.WALEdit;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>import org.apache.hadoop.mapreduce.Job;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>import org.junit.Before;<a name="line.82"></a>
-<span class="sourceLineNo">083</span>import org.junit.Rule;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>import org.junit.Test;<a name="line.84"></a>
-<span class="sourceLineNo">085</span>import org.junit.experimental.categories.Category;<a name="line.85"></a>
-<span class="sourceLineNo">086</span>import org.junit.rules.TestName;<a name="line.86"></a>
-<span class="sourceLineNo">087</span>import org.slf4j.Logger;<a name="line.87"></a>
-<span class="sourceLineNo">088</span>import org.slf4j.LoggerFactory;<a name="line.88"></a>
-<span class="sourceLineNo">089</span>import org.apache.hbase.thirdparty.com.google.common.collect.Lists;<a name="line.89"></a>
-<span class="sourceLineNo">090</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos;<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span>@Category({ReplicationTests.class, LargeTests.class})<a name="line.92"></a>
-<span class="sourceLineNo">093</span>public class TestReplicationSmallTests extends TestReplicationBase {<a name="line.93"></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 static org.junit.Assert.assertArrayEquals;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import static org.junit.Assert.assertEquals;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import static org.junit.Assert.assertTrue;<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.util.ArrayList;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.List;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.util.NavigableMap;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import java.util.TreeMap;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.CellUtil;<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.KeyValue;<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.ColumnFamilyDescriptorBuilder;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.client.Delete;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.client.Get;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.client.Put;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.client.RegionInfoBuilder;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.client.Result;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.client.ResultScanner;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.client.TableDescriptorBuilder;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.client.replication.TableCFs;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.regionserver.HRegion;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.regionserver.MultiVersionConcurrencyControl;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.replication.regionserver.Replication;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.testclassification.ReplicationTests;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.wal.WAL;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.wal.WALEdit;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.wal.WALKeyImpl;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.junit.Before;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.junit.Test;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.junit.experimental.categories.Category;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.slf4j.Logger;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.slf4j.LoggerFactory;<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos;<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span>@Category({ ReplicationTests.class, LargeTests.class })<a name="line.63"></a>
+<span class="sourceLineNo">064</span>public class TestReplicationSmallTests extends TestReplicationBase {<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span> private static final Logger LOG = LoggerFactory.getLogger(TestReplicationSmallTests.class);<a name="line.66"></a>
+<span class="sourceLineNo">067</span> private static final String PEER_ID = "2";<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span> @Before<a name="line.69"></a>
+<span class="sourceLineNo">070</span> public void setUp() throws Exception {<a name="line.70"></a>
+<span class="sourceLineNo">071</span> cleanUp();<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> * Verify that version and column delete marker types are replicated correctly.<a name="line.75"></a>
+<span class="sourceLineNo">076</span> */<a name="line.76"></a>
+<span class="sourceLineNo">077</span> @Test<a name="line.77"></a>
+<span class="sourceLineNo">078</span> public void testDeleteTypes() throws Exception {<a name="line.78"></a>
+<span class="sourceLineNo">079</span> LOG.info("testDeleteTypes");<a name="line.79"></a>
+<span class="sourceLineNo">080</span> final byte[] v1 = Bytes.toBytes("v1");<a name="line.80"></a>
+<span class="sourceLineNo">081</span> final byte[] v2 = Bytes.toBytes("v2");<a name="line.81"></a>
+<span class="sourceLineNo">082</span> final byte[] v3 = Bytes.toBytes("v3");<a name="line.82"></a>
+<span class="sourceLineNo">083</span> htable1 = utility1.getConnection().getTable(tableName);<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span> long t = EnvironmentEdgeManager.currentTime();<a name="line.85"></a>
+<span class="sourceLineNo">086</span> // create three versions for "row"<a name="line.86"></a>
+<span class="sourceLineNo">087</span> Put put = new Put(row);<a name="line.87"></a>
+<span class="sourceLineNo">088</span> put.addColumn(famName, row, t, v1);<a name="line.88"></a>
+<span class="sourceLineNo">089</span> htable1.put(put);<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span> put = new Put(row);<a name="line.91"></a>
+<span class="sourceLineNo">092</span> put.addColumn(famName, row, t + 1, v2);<a name="line.92"></a>
+<span class="sourceLineNo">093</span> htable1.put(put);<a name="line.93"></a>
<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span> private static final Logger LOG = LoggerFactory.getLogger(TestReplicationSmallTests.class);<a name="line.95"></a>
-<span class="sourceLineNo">096</span> private static final String PEER_ID = "2";<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span> @Rule<a name="line.98"></a>
-<span class="sourceLineNo">099</span> public TestName name = new TestName();<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span> /**<a name="line.101"></a>
-<span class="sourceLineNo">102</span> * @throws java.lang.Exception<a name="line.102"></a>
-<span class="sourceLineNo">103</span> */<a name="line.103"></a>
-<span class="sourceLineNo">104</span> @Before<a name="line.104"></a>
-<span class="sourceLineNo">105</span> public void setUp() throws Exception {<a name="line.105"></a>
-<span class="sourceLineNo">106</span> // Starting and stopping replication can make us miss new logs,<a name="line.106"></a>
-<span class="sourceLineNo">107</span> // rolling like this makes sure the most recent one gets added to the queue<a name="line.107"></a>
-<span class="sourceLineNo">108</span> for ( JVMClusterUtil.RegionServerThread r :<a name="line.108"></a>
-<span class="sourceLineNo">109</span> utility1.getHBaseCluster().getRegionServerThreads()) {<a name="line.109"></a>
-<span class="sourceLineNo">110</span> utility1.getAdmin().rollWALWriter(r.getRegionServer().getServerName());<a name="line.110"></a>
-<span class="sourceLineNo">111</span> }<a name="line.111"></a>
-<span class="sourceLineNo">112</span> int rowCount = utility1.countRows(tableName);<a name="line.112"></a>
-<span class="sourceLineNo">113</span> utility1.deleteTableData(tableName);<a name="line.113"></a>
-<span class="sourceLineNo">114</span> // truncating the table will send one Delete per row to the slave cluster<a name="line.114"></a>
-<span class="sourceLineNo">115</span> // in an async fashion, which is why we cannot just call deleteTableData on<a name="line.115"></a>
-<span class="sourceLineNo">116</span> // utility2 since late writes could make it to the slave in some way.<a name="line.116"></a>
-<span class="sourceLineNo">117</span> // Instead, we truncate the first table and wait for all the Deletes to<a name="line.117"></a>
-<span class="sourceLineNo">118</span> // make it to the slave.<a name="line.118"></a>
-<span class="sourceLineNo">119</span> Scan scan = new Scan();<a name="line.119"></a>
-<span class="sourceLineNo">120</span> int lastCount = 0;<a name="line.120"></a>
-<span class="sourceLineNo">121</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span> if (i==NB_RETRIES-1) {<a name="line.122"></a>
-<span class="sourceLineNo">123</span> fail("Waited too much time for truncate");<a name="line.123"></a>
-<span class="sourceLineNo">124</span> }<a name="line.124"></a>
-<span class="sourceLineNo">125</span> ResultScanner scanner = htable2.getScanner(scan);<a name="line.125"></a>
-<span class="sourceLineNo">126</span> Result[] res = scanner.next(rowCount);<a name="line.126"></a>
-<span class="sourceLineNo">127</span> scanner.close();<a name="line.127"></a>
-<span class="sourceLineNo">128</span> if (res.length != 0) {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> if (res.length < lastCount) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span> i--; // Don't increment timeout if we make progress<a name="line.130"></a>
-<span class="sourceLineNo">131</span> }<a name="line.131"></a>
-<span class="sourceLineNo">132</span> lastCount = res.length;<a name="line.132"></a>
-<span class="sourceLineNo">133</span> LOG.info("Still got " + res.length + " rows");<a name="line.133"></a>
-<span class="sourceLineNo">134</span> Thread.sleep(SLEEP_TIME);<a name="line.134"></a>
-<span class="sourceLineNo">135</span> } else {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> break;<a name="line.136"></a>
-<span class="sourceLineNo">137</span> }<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">141</span> /**<a name="line.141"></a>
-<span class="sourceLineNo">142</span> * Verify that version and column delete marker types are replicated<a name="line.142"></a>
-<span class="sourceLineNo">143</span> * correctly.<a name="line.143"></a>
-<span class="sourceLineNo">144</span> * @throws Exception<a name="line.144"></a>
-<span class="sourceLineNo">145</span> */<a name="line.145"></a>
-<span class="sourceLineNo">146</span> @Test(timeout=300000)<a name="line.146"></a>
-<span class="sourceLineNo">147</span> public void testDeleteTypes() throws Exception {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> LOG.info("testDeleteTypes");<a name="line.148"></a>
-<span class="sourceLineNo">149</span> final byte[] v1 = Bytes.toBytes("v1");<a name="line.149"></a>
-<span class="sourceLineNo">150</span> final byte[] v2 = Bytes.toBytes("v2");<a name="line.150"></a>
-<span class="sourceLineNo">151</span> final byte[] v3 = Bytes.toBytes("v3");<a name="line.151"></a>
-<span class="sourceLineNo">152</span> htable1 = utility1.getConnection().getTable(tableName);<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span> long t = EnvironmentEdgeManager.currentTime();<a name="line.154"></a>
-<span class="sourceLineNo">155</span> // create three versions for "row"<a name="line.155"></a>
-<span class="sourceLineNo">156</span> Put put = new Put(row);<a name="line.156"></a>
-<span class="sourceLineNo">157</span> put.addColumn(famName, row, t, v1);<a name="line.157"></a>
-<span class="sourceLineNo">158</span> htable1.put(put);<a name="line.158"></a>
+<span class="sourceLineNo">095</span> put = new Put(row);<a name="line.95"></a>
+<span class="sourceLineNo">096</span> put.addColumn(famName, row, t + 2, v3);<a name="line.96"></a>
+<span class="sourceLineNo">097</span> htable1.put(put);<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span> Get get = new Get(row);<a name="line.99"></a>
+<span class="sourceLineNo">100</span> get.readAllVersions();<a name="line.100"></a>
+<span class="sourceLineNo">101</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> if (i == NB_RETRIES - 1) {<a name="line.102"></a>
+<span class="sourceLineNo">103</span> fail("Waited too much time for put replication");<a name="line.103"></a>
+<span class="sourceLineNo">104</span> }<a name="line.104"></a>
+<span class="sourceLineNo">105</span> Result res = htable2.get(get);<a name="line.105"></a>
+<span class="sourceLineNo">106</span> if (res.size() < 3) {<a name="line.106"></a>
+<span class="sourceLineNo">107</span> LOG.info("Rows not available");<a name="line.107"></a>
+<span class="sourceLineNo">108</span> Thread.sleep(SLEEP_TIME);<a name="line.108"></a>
+<span class="sourceLineNo">109</span> } else {<a name="line.109"></a>
+<span class="sourceLineNo">110</span> assertArrayEquals(CellUtil.cloneValue(res.rawCells()[0]), v3);<a name="line.110"></a>
+<span class="sourceLineNo">111</span> assertArrayEquals(CellUtil.cloneValue(res.rawCells()[1]), v2);<a name="line.111"></a>
+<span class="sourceLineNo">112</span> assertArrayEquals(CellUtil.cloneValue(res.rawCells()[2]), v1);<a name="line.112"></a>
+<span class="sourceLineNo">113</span> break;<a name="line.113"></a>
+<span class="sourceLineNo">114</span> }<a name="line.114"></a>
+<span class="sourceLineNo">115</span> }<a name="line.115"></a>
+<span class="sourceLineNo">116</span> // place a version delete marker (delete last version)<a name="line.116"></a>
+<span class="sourceLineNo">117</span> Delete d = new Delete(row);<a name="line.117"></a>
+<span class="sourceLineNo">118</span> d.addColumn(famName, row, t);<a name="line.118"></a>
+<span class="sourceLineNo">119</span> htable1.delete(d);<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span> get = new Get(row);<a name="line.121"></a>
+<span class="sourceLineNo">122</span> get.readAllVersions();<a name="line.122"></a>
+<span class="sourceLineNo">123</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span> if (i == NB_RETRIES - 1) {<a name="line.124"></a>
+<span class="sourceLineNo">125</span> fail("Waited too much time for put replication");<a name="line.125"></a>
+<span class="sourceLineNo">126</span> }<a name="line.126"></a>
+<span class="sourceLineNo">127</span> Result res = htable2.get(get);<a name="line.127"></a>
+<span class="sourceLineNo">128</span> if (res.size() > 2) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span> LOG.info("Version not deleted");<a name="line.129"></a>
+<span class="sourceLineNo">130</span> Thread.sleep(SLEEP_TIME);<a name="line.130"></a>
+<span class="sourceLineNo">131</span> } else {<a name="line.131"></a>
+<span class="sourceLineNo">132</span> assertArrayEquals(CellUtil.cloneValue(res.rawCells()[0]), v3);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> assertArrayEquals(CellUtil.cloneValue(res.rawCells()[1]), v2);<a name="line.133"></a>
+<span class="sourceLineNo">134</span> break;<a name="line.134"></a>
+<span class="sourceLineNo">135</span> }<a name="line.135"></a>
+<span class="sourceLineNo">136</span> }<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span> // place a column delete marker<a name="line.138"></a>
+<span class="sourceLineNo">139</span> d = new Delete(row);<a name="line.139"></a>
+<span class="sourceLineNo">140</span> d.addColumns(famName, row, t + 2);<a name="line.140"></a>
+<span class="sourceLineNo">141</span> htable1.delete(d);<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span> // now *both* of the remaining version should be deleted<a name="line.143"></a>
+<span class="sourceLineNo">144</span> // at the replica<a name="line.144"></a>
+<span class="sourceLineNo">145</span> get = new Get(row);<a name="line.145"></a>
+<span class="sourceLineNo">146</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> if (i == NB_RETRIES - 1) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> fail("Waited too much time for del replication");<a name="line.148"></a>
+<span class="sourceLineNo">149</span> }<a name="line.149"></a>
+<span class="sourceLineNo">150</span> Result res = htable2.get(get);<a name="line.150"></a>
+<span class="sourceLineNo">151</span> if (res.size() >= 1) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span> LOG.info("Rows not deleted");<a name="line.152"></a>
+<span class="sourceLineNo">153</span> Thread.sleep(SLEEP_TIME);<a name="line.153"></a>
+<span class="sourceLineNo">154</span> } else {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> break;<a name="line.155"></a>
+<span class="sourceLineNo">156</span> }<a name="line.156"></a>
+<span class="sourceLineNo">157</span> }<a name="line.157"></a>
+<span class="sourceLineNo">158</span> }<a name="line.158"></a>
<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span> put = new Put(row);<a name="line.160"></a>
-<span class="sourceLineNo">161</span> put.addColumn(famName, row, t + 1, v2);<a name="line.161"></a>
-<span class="sourceLineNo">162</span> htable1.put(put);<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span> put = new Put(row);<a name="line.164"></a>
-<span class="sourceLineNo">165</span> put.addColumn(famName, row, t + 2, v3);<a name="line.165"></a>
-<span class="sourceLineNo">166</span> htable1.put(put);<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> Get get = new Get(row);<a name="line.168"></a>
-<span class="sourceLineNo">169</span> get.readAllVersions();<a name="line.169"></a>
-<span class="sourceLineNo">170</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.170"></a>
-<span class="sourceLineNo">171</span> if (i==NB_RETRIES-1) {<a name="line.171"></a>
-<span class="sourceLineNo">172</span> fail("Waited too much time for put replication");<a name="line.172"></a>
-<span class="sourceLineNo">173</span> }<a name="line.173"></a>
-<span class="sourceLineNo">174</span> Result res = htable2.get(get);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> if (res.size() < 3) {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> LOG.info("Rows not available");<a name="line.176"></a>
-<span class="sourceLineNo">177</span> Thread.sleep(SLEEP_TIME);<a name="line.177"></a>
-<span class="sourceLineNo">178</span> } else {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> assertArrayEquals(CellUtil.cloneValue(res.rawCells()[0]), v3);<a name="line.179"></a>
-<span class="sourceLineNo">180</span> assertArrayEquals(CellUtil.cloneValue(res.rawCells()[1]), v2);<a name="line.180"></a>
-<span class="sourceLineNo">181</span> assertArrayEquals(CellUtil.cloneValue(res.rawCells()[2]), v1);<a name="line.181"></a>
-<span class="sourceLineNo">182</span> break;<a name="line.182"></a>
-<span class="sourceLineNo">183</span> }<a name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span> // place a version delete marker (delete last version)<a name="line.185"></a>
-<span class="sourceLineNo">186</span> Delete d = new Delete(row);<a name="line.186"></a>
-<span class="sourceLineNo">187</span> d.addColumn(famName, row, t);<a name="line.187"></a>
-<span class="sourceLineNo">188</span> htable1.delete(d);<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span> get = new Get(row);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> get.readAllVersions();<a name="line.191"></a>
-<span class="sourceLineNo">192</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> if (i==NB_RETRIES-1) {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> fail("Waited too much time for put replication");<a name="line.194"></a>
-<span class="sourceLineNo">195</span> }<a name="line.195"></a>
-<span class="sourceLineNo">196</span> Result res = htable2.get(get);<a name="line.196"></a>
-<span class="sourceLineNo">197</span> if (res.size() > 2) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span> LOG.info("Version not deleted");<a name="line.198"></a>
+<span class="sourceLineNo">160</span> /**<a name="line.160"></a>
+<span class="sourceLineNo">161</span> * Add a row, check it's replicated, delete it, check's gone<a name="line.161"></a>
+<span class="sourceLineNo">162</span> */<a name="line.162"></a>
+<span class="sourceLineNo">163</span> @Test<a name="line.163"></a>
+<span class="sourceLineNo">164</span> public void testSimplePutDelete() throws Exception {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> LOG.info("testSimplePutDelete");<a name="line.165"></a>
+<span class="sourceLineNo">166</span> runSimplePutDeleteTest();<a name="line.166"></a>
+<span class="sourceLineNo">167</span> }<a name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span> /**<a name="line.169"></a>
+<span class="sourceLineNo">170</span> * Try a small batch upload using the write buffer, check it's replicated<a name="line.170"></a>
+<span class="sourceLineNo">171</span> */<a name="line.171"></a>
+<span class="sourceLineNo">172</span> @Test<a name="line.172"></a>
+<span class="sourceLineNo">173</span> public void testSmallBatch() throws Exception {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> LOG.info("testSmallBatch");<a name="line.174"></a>
+<span class="sourceLineNo">175</span> runSmallBatchTest();<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> /**<a name="line.178"></a>
+<span class="sourceLineNo">179</span> * Test disable/enable replication, trying to insert, make sure nothing's replicated, enable it,<a name="line.179"></a>
+<span class="sourceLineNo">180</span> * the insert should be replicated<a name="line.180"></a>
+<span class="sourceLineNo">181</span> */<a name="line.181"></a>
+<span class="sourceLineNo">182</span> @Test<a name="line.182"></a>
+<span class="sourceLineNo">183</span> public void testDisableEnable() throws Exception {<a name="line.183"></a>
+<span class="sourceLineNo">184</span> // Test disabling replication<a name="line.184"></a>
+<span class="sourceLineNo">185</span> hbaseAdmin.disableReplicationPeer(PEER_ID);<a name="line.185"></a>
+<span class="sourceLineNo">186</span><a name="line.186"></a>
+<span class="sourceLineNo">187</span> byte[] rowkey = Bytes.toBytes("disable enable");<a name="line.187"></a>
+<span class="sourceLineNo">188</span> Put put = new Put(rowkey);<a name="line.188"></a>
+<span class="sourceLineNo">189</span> put.addColumn(famName, row, row);<a name="line.189"></a>
+<span class="sourceLineNo">190</span> htable1.put(put);<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span> Get get = new Get(rowkey);<a name="line.192"></a>
+<span class="sourceLineNo">193</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> Result res = htable2.get(get);<a name="line.194"></a>
+<span class="sourceLineNo">195</span> if (res.size() >= 1) {<a name="line.195"></a>
+<span class="sourceLineNo">196</span> fail("Replication wasn't disabled");<a name="line.196"></a>
+<span class="sourceLineNo">197</span> } else {<a name="line.197"></a>
+<span class="sourceLineNo">198</span> LOG.info("Row not replicated, let's wait a bit more...");<a name="line.198"></a>
<span class="sourceLineNo">199</span> Thread.sleep(SLEEP_TIME);<a name="line.199"></a>
-<span class="sourceLineNo">200</span> } else {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> assertArrayEquals(CellUtil.cloneValue(res.rawCells()[0]), v3);<a name="line.201"></a>
-<span class="sourceLineNo">202</span> assertArrayEquals(CellUtil.cloneValue(res.rawCells()[1]), v2);<a name="line.202"></a>
-<span class="sourceLineNo">203</span> break;<a name="line.203"></a>
-<span class="sourceLineNo">204</span> }<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span><a name="line.206"></a>
-<span class="sourceLineNo">207</span> // place a column delete marker<a name="line.207"></a>
-<span class="sourceLineNo">208</span> d = new Delete(row);<a name="line.208"></a>
-<span class="sourceLineNo">209</span> d.addColumns(famName, row, t+2);<a name="line.209"></a>
-<span class="sourceLineNo">210</span> htable1.delete(d);<a name="line.210"></a>
-<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span> // now *both* of the remaining version should be deleted<a name="line.212"></a>
-<span class="sourceLineNo">213</span> // at the replica<a name="line.213"></a>
-<span class="sourceLineNo">214</span> get = new Get(row);<a name="line.214"></a>
-<span class="sourceLineNo">215</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> if (i==NB_RETRIES-1) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> fail("Waited too much time for del replication");<a name="line.217"></a>
-<span class="sourceLineNo">218</span> }<a name="line.218"></a>
-<span class="sourceLineNo">219</span> Result res = htable2.get(get);<a name="line.219"></a>
-<span class="sourceLineNo">220</span> if (res.size() >= 1) {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> LOG.info("Rows not deleted");<a name="line.221"></a>
-<span class="sourceLineNo">222</span> Thread.sleep(SLEEP_TIME);<a name="line.222"></a>
-<span class="sourceLineNo">223</span> } else {<a name="line.223"></a>
-<span class="sourceLineNo">224</span> break;<a name="line.224"></a>
-<span class="sourceLineNo">225</span> }<a name="line.225"></a>
-<span class="sourceLineNo">226</span> }<a name="line.226"></a>
-<span class="sourceLineNo">227</span> }<a name="line.227"></a>
-<span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span> /**<a name="line.229"></a>
-<span class="sourceLineNo">230</span> * Add a row, check it's replicated, delete it, check's gone<a name="line.230"></a>
-<span class="sourceLineNo">231</span> * @throws Exception<a name="line.231"></a>
-<span class="sourceLineNo">232</span> */<a name="line.232"></a>
-<span class="sourceLineNo">233</span> @Test(timeout=300000)<a name="line.233"></a>
-<span class="sourceLineNo">234</span> public void testSimplePutDelete() throws Exception {<a name="line.234"></a>
-<span class="sourceLineNo">235</span> LOG.info("testSimplePutDelete");<a name="line.235"></a>
-<span class="sourceLineNo">236</span> Put put = new Put(row);<a name="line.236"></a>
-<span class="sourceLineNo">237</span> put.addColumn(famName, row, row);<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span> htable1 = utility1.getConnection().getTable(tableName);<a name="line.239"></a>
-<span class="sourceLineNo">240</span> htable1.put(put);<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span> Get get = new Get(row);<a name="line.242"></a>
-<span class="sourceLineNo">243</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> if (i==NB_RETRIES-1) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> fail("Waited too much time for put replication");<a name="line.245"></a>
-<span class="sourceLineNo">246</span> }<a name="line.246"></a>
-<span class="sourceLineNo">247</span> Result res = htable2.get(get);<a name="line.247"></a>
-<span class="sourceLineNo">248</span> if (res.isEmpty()) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span> LOG.info("Row not available");<a name="line.249"></a>
-<span class="sourceLineNo">250</span> Thread.sleep(SLEEP_TIME);<a name="line.250"></a>
-<span class="sourceLineNo">251</span> } else {<a name="line.251"></a>
-<span class="sourceLineNo">252</span> assertArrayEquals(res.value(), row);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> break;<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><a name="line.256"></a>
-<span class="sourceLineNo">257</span> Delete del = new Delete(row);<a name="line.257"></a>
-<span class="sourceLineNo">258</span> htable1.delete(del);<a name="line.258"></a>
-<span class="sourceLineNo">259</span><a name="line.259"></a>
-<span class="sourceLineNo">260</span> get = new Get(row);<a name="line.260"></a>
-<span class="sourceLineNo">261</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span> if (i==NB_RETRIES-1) {<a name="line.262"></a>
-<span class="sourceLineNo">263</span> fail("Waited too much time for del replication");<a name="line.263"></a>
-<span class="sourceLineNo">264</span> }<a name="line.264"></a>
-<span class="sourceLineNo">265</span> Result res = htable2.get(get);<a name="line.265"></a>
-<span class="sourceLineNo">266</span> if (res.size() >= 1) {<a name="line.266"></a>
-<span class="sourceLineNo">267</span> LOG.info("Row not deleted");<a name="line.267"></a>
-<span class="sourceLineNo">268</span> Thread.sleep(SLEEP_TIME);<a name="line.268"></a>
-<span class="sourceLineNo">269</span> } else {<a name="line.269"></a>
-<span class="sourceLineNo">270</span> break;<a name="line.270"></a>
-<span class="sourceLineNo">271</span> }<a name="line.271"></a>
-<span class="sourceLineNo">272</span> }<a name="line.272"></a>
-<span class="sourceLineNo">273</span> }<a name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span> /**<a name="line.275"></a>
-<span class="sourceLineNo">276</span> * Try a small batch upload using the write buffer, check it's replicated<a name="line.276"></a>
-<span class="sourceLineNo">277</span> * @throws Exception<a name="line.277"></a>
-<span class="sourceLineNo">278</span> */<a name="line.278"></a>
-<span class="sourceLineNo">279</span> @Test(timeout=300000)<a name="line.279"></a>
-<span class="sourceLineNo">280</span> public void testSmallBatch() throws Exception {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> LOG.info("testSmallBatch");<a name="line.281"></a>
-<span class="sourceLineNo">282</span> // normal Batch tests<a name="line.282"></a>
-<span class="sourceLineNo">283</span> loadData("", row);<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span> Scan scan = new Scan();<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span> ResultScanner scanner1 = htable1.getScanner(scan);<a name="line.287"></a>
-<span class="sourceLineNo">288</span> Result[] res1 = scanner1.next(NB_ROWS_IN_BATCH);<a name="line.288"></a>
-<span class="sourceLineNo">289</span> scanner1.close();<a name="line.289"></a>
-<span class="sourceLineNo">290</span> assertEquals(NB_ROWS_IN_BATCH, res1.length);<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span> waitForReplication(NB_ROWS_IN_BATCH, NB_RETRIES);<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> private void waitForReplication(int expectedRows, int retries) throws IOException, InterruptedException {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> Scan scan;<a name="line.296"></a>
-<span class="sourceLineNo">297</span> for (int i = 0; i < retries; i++) {<a name="line.297"></a>
-<span class="sourceLineNo">298</span> scan = new Scan();<a name="line.298"></a>
-<span class="sourceLineNo">299</span> if (i== retries -1) {<a name="line.299"></a>
-<span class="sourceLineNo">300</span> fail("Waited too much time for normal batch replication");<a name="line.300"></a>
-<span class="sourceLineNo">301</span> }<a name="line.301"></a>
-<span class="sourceLineNo">302</span> ResultScanner scanner = htable2.getScanner(scan);<a name="line.302"></a>
-<span class="sourceLineNo">303</span> Result[] res = scanner.next(expectedRows);<a name="line.303"></a>
-<span class="sourceLineNo">304</span> scanner.close();<a name="line.304"></a>
-<span class="sourceLineNo">305</span> if (res.length != expectedRows) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> LOG.info("Only got " + res.length + " rows");<a name="line.306"></a>
-<span class="sourceLineNo">307</span> Thread.sleep(SLEEP_TIME);<a name="line.307"></a>
-<span class="sourceLineNo">308</span> } else {<a name="line.308"></a>
-<span class="sourceLineNo">309</span> break;<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> }<a name="line.312"></a>
-<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span> private void loadData(String prefix, byte[] row) throws IOException {<a name="line.314"></a>
-<span class="sourceLineNo">315</span> List<Put> puts = new ArrayList<>(NB_ROWS_IN_BATCH);<a name="line.315"></a>
-<span class="sourceLineNo">316</span> for (int i = 0; i < NB_ROWS_IN_BATCH; i++) {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> Put put = new Put(Bytes.toBytes(prefix + Integer.toString(i)));<a name="line.317"></a>
-<span class="sourceLineNo">318</span> put.addColumn(famName, row, row);<a name="line.318"></a>
-<span class="sourceLineNo">319</span> puts.add(put);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span> htable1.put(puts);<a name="line.321"></a>
-<span class="sourceLineNo">322</span> }<a name="line.322"></a>
-<span class="sourceLineNo">323</span><a name="line.323"></a>
-<span class="sourceLineNo">324</span> /**<a name="line.324"></a>
-<span class="sourceLineNo">325</span> * Test disable/enable replication, trying to insert, make sure nothing's<a name="line.325"></a>
-<span class="sourceLineNo">326</span> * replicated, enable it, the insert should be replicated<a name="line.326"></a>
-<span class="sourceLineNo">327</span> *<a name="line.327"></a>
-<span class="sourceLineNo">328</span> * @throws Exception<a name="line.328"></a>
-<span class="sourceLineNo">329</span> */<a name="line.329"></a>
-<span class="sourceLineNo">330</span> @Test(timeout = 300000)<a name="line.330"></a>
-<span class="sourceLineNo">331</span> public void testDisableEnable() throws Exception {<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span> // Test disabling replication<a name="line.333"></a>
-<span class="sourceLineNo">334</span> hbaseAdmin.disableReplicationPeer(PEER_ID);<a name="line.334"></a>
-<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span> byte[] rowkey = Bytes.toBytes("disable enable");<a name="line.336"></a>
-<span class="sourceLineNo">337</span> Put put = new Put(rowkey);<a name="line.337"></a>
-<span class="sourceLineNo">338</span> put.addColumn(famName, row, row);<a name="line.338"></a>
-<span class="sourceLineNo">339</span> htable1.put(put);<a name="line.339"></a>
-<span class="sourceLineNo">340</span><a name="line.340"></a>
-<span class="sourceLineNo">341</span> Get get = new Get(rowkey);<a name="line.341"></a>
-<span class="sourceLineNo">342</span> for (int i = 0; i < 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.size() >= 1) {<a name="line.344"></a>
-<span class="sourceLineNo">345</span> fail("Replication wasn't disabled");<a name="line.345"></a>
-<span class="sourceLineNo">346</span> } else {<a name="line.346"></a>
-<span class="sourceLineNo">347</span> LOG.info("Row not replicated, let's wait a bit more...");<a name="line.347"></a>
-<span class="sourceLineNo">348</span> Thread.sleep(SLEEP_TIME);<a name="line.348"></a>
-<span class="sourceLineNo">349</span> }<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> // Test enable replication<a name="line.352"></a>
-<span class="sourceLineNo">353</span> hbaseAdmin.enableReplicationPeer(PEER_ID);<a name="line.353"></a>
-<span class="sourceLineNo">354</span><a name="line.354"></a>
-<span class="sourceLineNo">355</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.355"></a>
-<span class="sourceLineNo">356</span> Result res = htable2.get(get);<a name="line.356"></a>
-<span class="sourceLineNo">357</span> if (res.isEmpty()) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> LOG.info("Row not available");<a name="line.358"></a>
-<span class="sourceLineNo">359</span> Thread.sleep(SLEEP_TIME);<a name="line.359"></a>
-<span class="sourceLineNo">360</span> } else {<a name="line.360"></a>
-<span class="sourceLineNo">361</span> assertArrayEquals(res.value(), row);<a name="line.361"></a>
-<span class="sourceLineNo">362</span> return;<a name="line.362"></a>
-<span class="sourceLineNo">363</span> }<a name="line.363"></a>
-<span class="sourceLineNo">364</span> }<a name="line.364"></a>
-<span class="sourceLineNo">365</span> fail("Waited too much time for put replication");<a name="line.365"></a>
-<span class="sourceLineNo">366</span> }<a name="line.366"></a>
+<span class="sourceLineNo">200</span> }<a name="line.200"></a>
+<span class="sourceLineNo">201</span> }<a name="line.201"></a>
+<span class="sourceLineNo">202</span><a name="line.202"></a>
+<span class="sourceLineNo">203</span> // Test enable replication<a name="line.203"></a>
+<span class="sourceLineNo">204</span> hbaseAdmin.enableReplicationPeer(PEER_ID);<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span> Result res = htable2.get(get);<a name="line.207"></a>
+<span class="sourceLineNo">208</span> if (res.isEmpty()) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span> LOG.info("Row not available");<a name="line.209"></a>
+<span class="sourceLineNo">210</span> Thread.sleep(SLEEP_TIME);<a name="line.210"></a>
+<span class="sourceLineNo">211</span> } else {<a name="line.211"></a>
+<span class="sourceLineNo">212</span> assertArrayEquals(res.value(), row);<a name="line.212"></a>
+<span class="sourceLineNo">213</span> return;<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> fail("Waited too much time for put replication");<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> * Integration test for TestReplicationAdmin, removes and re-add a peer cluster<a name="line.220"></a>
+<span class="sourceLineNo">221</span> */<a name="line.221"></a>
+<span class="sourceLineNo">222</span> @Test<a name="line.222"></a>
+<span class="sourceLineNo">223</span> public void testAddAndRemoveClusters() throws Exception {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> LOG.info("testAddAndRemoveClusters");<a name="line.224"></a>
+<span class="sourceLineNo">225</span> hbaseAdmin.removeReplicationPeer(PEER_ID);<a name="line.225"></a>
+<span class="sourceLineNo">226</span> Thread.sleep(SLEEP_TIME);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> byte[] rowKey = Bytes.toBytes("Won't be replicated");<a name="line.227"></a>
+<span class="sourceLineNo">228</span> Put put = new Put(rowKey);<a name="line.228"></a>
+<span class="sourceLineNo">229</span> put.addColumn(famName, row, row);<a name="line.229"></a>
+<span class="sourceLineNo">230</span> htable1.put(put);<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span> Get get = new Get(rowKey);<a name="line.232"></a>
+<span class="sourceLineNo">233</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.233"></a>
+<span class="sourceLineNo">234</span> if (i == NB_RETRIES - 1) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> break;<a name="line.235"></a>
+<span class="sourceLineNo">236</span> }<a name="line.236"></a>
+<span class="sourceLineNo">237</span> Result res = htable2.get(get);<a name="line.237"></a>
+<span class="sourceLineNo">238</span> if (res.size() >= 1) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> fail("Not supposed to be replicated");<a name="line.239"></a>
+<span class="sourceLineNo">240</span> } else {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> LOG.info("Row not replicated, let's wait a bit more...");<a name="line.241"></a>
+<span class="sourceLineNo">242</span> Thread.sleep(SLEEP_TIME);<a name="line.242"></a>
+<span class="sourceLineNo">243</span> }<a name="line.243"></a>
+<span class="sourceLineNo">244</span> }<a name="line.244"></a>
+<span class="sourceLineNo">245</span> ReplicationPeerConfig rpc =<a name="line.245"></a>
+<span class="sourceLineNo">246</span> ReplicationPeerConfig.newBuilder().setClusterKey(utility2.getClusterKey()).build();<a name="line.246"></a>
+<span class="sourceLineNo">247</span> hbaseAdmin.addReplicationPeer(PEER_ID, rpc);<a name="line.247"></a>
+<span class="sourceLineNo">248</span> Thread.sleep(SLEEP_TIME);<a name="line.248"></a>
+<span class="sourceLineNo">249</span> rowKey = Bytes.toBytes("do rep");<a name="line.249"></a>
+<span class="sourceLineNo">250</span> put = new Put(rowKey);<a name="line.250"></a>
+<span class="sourceLineNo">251</span> put.addColumn(famName, row, row);<a name="line.251"></a>
+<span class="sourceLineNo">252</span> LOG.info("Adding new row");<a name="line.252"></a>
+<span class="sourceLineNo">253</span> htable1.put(put);<a name="line.253"></a>
+<span class="sourceLineNo">254</span><a name="line.254"></a>
+<span class="sourceLineNo">255</span> get = new Get(rowKey);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.256"></a>
+<span class="sourceLineNo">257</span> if (i == NB_RETRIES - 1) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> fail("Waited too much time for put replication");<a name="line.258"></a>
+<span class="sourceLineNo">259</span> }<a name="line.259"></a>
+<span class="sourceLineNo">260</span> Result res = htable2.get(get);<a name="line.260"></a>
+<span class="sourceLineNo">261</span> if (res.isEmpty()) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> LOG.info("Row not available");<a name="line.262"></a>
+<span class="sourceLineNo">263</span> Thread.sleep(SLEEP_TIME * i);<a name="line.263"></a>
+<span class="sourceLineNo">264</span> } else {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> assertArrayEquals(res.value(), row);<a name="line.265"></a>
+<span class="sourceLineNo">266</span> break;<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
+<span class="sourceLineNo">269</span> }<a name="line.269"></a>
+<span class="sourceLineNo">270</span><a name="line.270"></a>
+<span class="sourceLineNo">271</span> /**<a name="line.271"></a>
+<span class="sourceLineNo">272</span> * Do a more intense version testSmallBatch, one that will trigger wal rolling and other<a name="line.272"></a>
+<span class="sourceLineNo">273</span> * non-trivial code paths<a name="line.273"></a>
+<span class="sourceLineNo">274</span> */<a name="line.274"></a>
+<span class="sourceLineNo">275</span> @Test<a name="line.275"></a>
+<span class="sourceLineNo">276</span> public void testLoading() throws Exception {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> LOG.info("Writing out rows to table1 in testLoading");<a name="line.277"></a>
+<span class="sourceLineNo">278</span> List<Put> puts = new ArrayList<>(NB_ROWS_IN_BIG_BATCH);<a name="line.278"></a>
+<span class="sourceLineNo">279</span> for (int i = 0; i < NB_ROWS_IN_BIG_BATCH; i++) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> Put put = new Put(Bytes.toBytes(i));<a name="line.280"></a>
+<span class="sourceLineNo">281</span> put.addColumn(famName, row, row);<a name="line.281"></a>
+<span class="sourceLineNo">282</span> puts.add(put);<a name="line.282"></a>
+<span class="sourceLineNo">283</span> }<a name="line.283"></a>
+<span class="sourceLineNo">284</span> // The puts will be iterated through and flushed only when the buffer<a name="line.284"></a>
+<span class="sourceLineNo">285</span> // size is reached.<a name="line.285"></a>
+<span class="sourceLineNo">286</span> htable1.put(puts);<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span> Scan scan = new Scan();<a name="line.288"></a>
+<span class="sourceLineNo">289</span><a name="line.289"></a>
+<span class="sourceLineNo">290</span> ResultScanner scanner = htable1.getScanner(scan);<a name="line.290"></a>
+<span class="sourceLineNo">291</span> Result[] res = scanner.next(NB_ROWS_IN_BIG_BATCH);<a name="line.291"></a>
+<span class="sourceLineNo">292</span> scanner.close();<a name="line.292"></a>
+<span class="sourceLineNo">293</span><a name="line.293"></a>
+<span class="sourceLineNo">294</span> assertEquals(NB_ROWS_IN_BIG_BATCH, res.length);<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span> LOG.info("Looking in table2 for replicated rows in testLoading");<a name="line.296"></a>
+<span class="sourceLineNo">297</span> long start = System.currentTimeMillis();<a name="line.297"></a>
+<span class="sourceLineNo">298</span> // Retry more than NB_RETRIES. As it was, retries were done in 5 seconds and we'd fail<a name="line.298"></a>
+<span class="sourceLineNo">299</span> // sometimes.<a name="line.299"></a>
+<span class="sourceLineNo">300</span> final long retries = NB_RETRIES * 10;<a name="line.300"></a>
+<span class="sourceLineNo">301</span> for (int i = 0; i < retries; i++) {<a name="line.301"></a>
+<span class="sourceLineNo">302</span> scan = new Scan();<a name="line.302"></a>
+<span class="sourceLineNo">303</span> scanner = htable2.getScanner(scan);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> res = scanner.next(NB_ROWS_IN_BIG_BATCH);<a name="line.304"></a>
+<span class="sourceLineNo">305</span> scanner.close();<a name="line.305"></a>
+<span class="sourceLineNo">306</span> if (res.length != NB_ROWS_IN_BIG_BATCH) {<a name="line.306"></a>
+<span class="sourceLineNo">307</span> if (i == retries - 1) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span> int lastRow = -1;<a name="line.308"></a>
+<span class="sourceLineNo">309</span> for (Result result : res) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> int currentRow = Bytes.toInt(result.getRow());<a name="line.310"></a>
+<span class="sourceLineNo">311</span> for (int row = lastRow + 1; row < currentRow; row++) {<a name="line.311"></a>
+<span class="sourceLineNo">312</span> LOG.error("Row missing: " + row);<a name="line.312"></a>
+<span class="sourceLineNo">313</span> }<a name="line.313"></a>
+<span class="sourceLineNo">314</span> lastRow = currentRow;<a name="line.314"></a>
+<span class="sourceLineNo">315</span> }<a name="line.315"></a>
+<span class="sourceLineNo">316</span> LOG.error("Last row: " + lastRow);<a name="line.316"></a>
+<span class="sourceLineNo">317</span> fail("Waited too much time for normal batch replication, " + res.length + " instead of " +<a name="line.317"></a>
+<span class="sourceLineNo">318</span> NB_ROWS_IN_BIG_BATCH + "; waited=" + (System.currentTimeMillis() - start) + "ms");<a name="line.318"></a>
+<span class="sourceLineNo">319</span> } else {<a name="line.319"></a>
+<span class="sourceLineNo">320</span> LOG.info("Only got " + res.length + " rows... retrying");<a name="line.320"></a>
+<span class="sourceLineNo">321</span> Thread.sleep(SLEEP_TIME);<a name="line.321"></a>
+<span class="sourceLineNo">322</span> }<a name="line.322"></a>
+<span class="sourceLineNo">323</span> } else {<a name="line.323"></a>
+<span class="sourceLineNo">324</span> break;<a name="line.324"></a>
+<span class="sourceLineNo">325</span> }<a name="line.325"></a>
+<span class="sourceLineNo">326</span> }<a name="line.326"></a>
+<span class="sourceLineNo">327</span> }<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span> /**<a name="line.329"></a>
+<span class="sourceLineNo">330</span> * Test for HBASE-9038, Replication.scopeWALEdits would NPE if it wasn't filtering out the<a name="line.330"></a>
+<span class="sourceLineNo">331</span> * compaction WALEdit.<a name="line.331"></a>
+<span class="sourceLineNo">332</span> */<a name="line.332"></a>
+<span class="sourceLineNo">333</span> @Test<a name="line.333"></a>
+<span class="sourceLineNo">334</span> public void testCompactionWALEdits() throws Exception {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> WALProtos.CompactionDescriptor compactionDescriptor =<a name="line.335"></a>
+<span class="sourceLineNo">336</span> WALProtos.CompactionDescriptor.getDefaultInstance();<a name="line.336"></a>
+<span class="sourceLineNo">337</span> RegionInfo hri = RegionInfoBuilder.newBuilder(htable1.getName())<a name="line.337"></a>
+<span class="sourceLineNo">338</span> .setStartKey(HConstants.EMPTY_START_ROW).setEndKey(HConstants.EMPTY_END_ROW).build();<a name="line.338"></a>
+<span class="sourceLineNo">339</span> WALEdit edit = WALEdit.createCompaction(hri, compactionDescriptor);<a name="line.339"></a>
+<span class="sourceLineNo">340</span> Replication.scopeWALEdits(new WALKeyImpl(), edit, htable1.getConfiguration(), null);<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> /**<a name="line.343"></a>
+<span class="sourceLineNo">344</span> * Test for HBASE-8663<a name="line.344"></a>
+<span class="sourceLineNo">345</span> * <p><a name="line.345"></a>
+<span class="sourceLineNo">346</span> * Create two new Tables with colfamilies enabled for replication then run<a name="line.346"></a>
+<span class="sourceLineNo">347</span> * ReplicationAdmin.listReplicated(). Finally verify the table:colfamilies. Note:<a name="line.347"></a>
+<span class="sourceLineNo">348</span> * TestReplicationAdmin is a better place for this testing but it would need mocks.<a name="line.348"></a>
+<span class="sourceLineNo">349</span> */<a name="line.349"></a>
+<span class="sourceLineNo">350</span> @Test<a name="line.350"></a>
+<span class="sourceLineNo">351</span> public void testVerifyListReplicatedTable() throws Exception {<a name="line.351"></a>
+<span class="sourceLineNo">352</span> LOG.info("testVerifyListReplicatedTable");<a name="line.352"></a>
+<span class="sourceLineNo">353</span><a name="line.353"></a>
+<span class="sourceLineNo">354</span> final String tName = "VerifyListReplicated_";<a name="line.354"></a>
+<span class="sourceLineNo">355</span> final String colFam = "cf1";<a name="line.355"></a>
+<span class="sourceLineNo">356</span> final int numOfTables = 3;<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span> Admin hadmin = utility1.getAdmin();<a name="line.358"></a>
+<span class="sourceLineNo">359</span><a name="line.359"></a>
+<span class="sourceLineNo">360</span> // Create Tables<a name="line.360"></a>
+<span class="sourceLineNo">361</span> for (int i = 0; i < numOfTables; i++) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span> hadmin.createTable(TableDescriptorBuilder.newBuilder(TableName.valueOf(tName + i))<a name="line.362"></a>
+<span class="sourceLineNo">363</span> .addColumnFamily(ColumnFamilyDescriptorBuilder.newBuilder(Bytes.toBytes(colFam))<a name="line.363"></a>
+<span class="sourceLineNo">364</span> .setScope(HConstants.REPLICATION_SCOPE_GLOBAL).build())<a name="line.364"></a>
+<span class="sourceLineNo">365</span> .build());<a name="line.365"></a>
+<span class="sourceLineNo">366</span> }<a name="line.366"></a>
<span class="sourceLineNo">367</span><a name="line.367"></a>
-<span class="sourceLineNo">368</span> /**<a name="line.368"></a>
-<span class="sourceLineNo">369</span> * Integration test for TestReplicationAdmin, removes and re-add a peer<a name="line.369"></a>
-<span class="sourceLineNo">370</span> * cluster<a name="line.370"></a>
-<span class="sourceLineNo">371</span> *<a name="line.371"></a>
-<span class="sourceLineNo">372</span> * @throws Exception<a name="line.372"></a>
-<span class="sourceLineNo">373</span> */<a name="line.373"></a>
-<span class="sourceLineNo">374</span> @Test(timeout=300000)<a name="line.374"></a>
-<span class="sourceLineNo">375</span> public void testAddAndRemoveClusters() throws Exception {<a name="line.375"></a>
-<span class="sourceLineNo">376</span> LOG.info("testAddAndRemoveClusters");<a name="line.376"></a>
-<span class="sourceLineNo">377</span> hbaseAdmin.removeReplicationPeer(PEER_ID);<a name="line.377"></a>
-<span class="sourceLineNo">378</span> Thread.sleep(SLEEP_TIME);<a name="line.378"></a>
-<span class="sourceLineNo">379</span> byte[] rowKey = Bytes.toBytes("Won't be replicated");<a name="line.379"></a>
-<span class="sourceLineNo">380</span> Put put = new Put(rowKey);<a name="line.380"></a>
-<span class="sourceLineNo">381</span> put.addColumn(famName, row, row);<a name="line.381"></a>
-<span class="sourceLineNo">382</span> htable1.put(put);<a name="line.382"></a>
-<span class="sourceLineNo">383</span><a name="line.383"></a>
-<span class="sourceLineNo">384</span> Get get = new Get(rowKey);<a name="line.384"></a>
-<span class="sourceLineNo">385</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span> if (i == NB_RETRIES-1) {<a name="line.386"></a>
-<span class="sourceLineNo">387</span> break;<a name="line.387"></a>
-<span class="sourceLineNo">388</span> }<a name="line.388"></a>
-<span class="sourceLineNo">389</span> Result res = htable2.get(get);<a name="line.389"></a>
-<span class="sourceLineNo">390</span> if (res.size() >= 1) {<a name="line.390"></a>
-<span class="sourceLineNo">391</span> fail("Not supposed to be replicated");<a name="line.391"></a>
-<span class="sourceLineNo">392</span> } else {<a name="line.392"></a>
-<span class="sourceLineNo">393</span> LOG.info("Row not replicated, let's wait a bit more...");<a name="line.393"></a>
-<span class="sourceLineNo">394</span> Thread.sleep(SLEEP_TIME);<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span> }<a name="line.396"></a>
-<span class="sourceLineNo">397</span> ReplicationPeerConfig rpc = new ReplicationPeerConfig();<a name="line.397"></a>
-<span class="sourceLineNo">398</span> rpc.setClusterKey(utility2.getClusterKey());<a name="line.398"></a>
-<span class="sourceLineNo">399</span> hbaseAdmin.addReplicationPeer(PEER_ID, rpc);<a name="line.399"></a>
-<span class="sourceLineNo">400</span> Thread.sleep(SLEEP_TIME);<a name="line.400"></a>
-<span class="sourceLineNo">401</span> rowKey = Bytes.toBytes("do rep");<a name="line.401"></a>
-<span class="sourceLineNo">402</span> put = new Put(rowKey);<a name="line.402"></a>
-<span class="sourceLineNo">403</span> put.addColumn(famName, row, row);<a name="line.403"></a>
-<span class="sourceLineNo">404</span> LOG.info("Adding new row");<a name="line.404"></a>
-<span class="sourceLineNo">405</span> htable1.put(put);<a name="line.405"></a>
-<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span> get = new Get(rowKey);<a name="line.407"></a>
-<span class="sourceLineNo">408</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.408"></a>
-<span class="sourceLineNo">409</span> if (i==NB_RETRIES-1) {<a name="line.409"></a>
-<span class="sourceLineNo">410</span> fail("Waited too much time for put replication");<a name="line.410"></a>
-<span class="sourceLineNo">411</span> }<a name="line.411"></a>
-<span class="sourceLineNo">412</span> Result res = htable2.get(get);<a name="line.412"></a>
-<span class="sourceLineNo">413</span> if (res.isEmpty()) {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> LOG.info("Row not available");<a name="line.414"></a>
-<span class="sourceLineNo">415</span> Thread.sleep(SLEEP_TIME*i);<a name="line.415"></a>
-<span class="sourceLineNo">416</span> } else {<a name="line.416"></a>
-<span class="sourceLineNo">417</span> assertArrayEquals(res.value(), row);<a name="line.417"></a>
-<span class="sourceLineNo">418</span> break;<a name="line.418"></a>
-<span class="sourceLineNo">419</span> }<a name="line.419"></a>
-<span class="sourceLineNo">420</span> }<a name="line.420"></a>
-<span class="sourceLineNo">421</span> }<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span><a name="line.423"></a>
-<span class="sourceLineNo">424</span> /**<a name="line.424"></a>
-<span class="sourceLineNo">425</span> * Do a more intense version testSmallBatch, one that will trigger<a name="line.425"></a>
-<span class="sourceLineNo">426</span> * wal rolling and other non-trivial code paths<a name="line.426"></a>
-<span class="sourceLineNo">427</span> * @throws Exception<a name="line.427"></a>
-<span class="sourceLineNo">428</span> */<a name="line.428"></a>
-<span class="sourceLineNo">429</span> @Test(timeout=300000)<a name="line.429"></a>
-<span class="sourceLineNo">430</span> public void testLoading() throws Exception {<a name="line.430"></a>
-<span class="sourceLineNo">431</span> LOG.info("Writing out rows to table1 in testLoading");<a name="line.431"></a>
-<span class="sourceLineNo">432</span> List<Put> puts = new ArrayList<>(NB_ROWS_IN_BIG_BATCH);<a name="line.432"></a>
-<span class="sourceLineNo">433</span> for (int i = 0; i < NB_ROWS_IN_BIG_BATCH; i++) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> Put put = new Put(Bytes.toBytes(i));<a name="line.434"></a>
-<span class="sourceLineNo">435</span> put.addColumn(famName, row, row);<a name="line.435"></a>
-<span class="sourceLineNo">436</span> puts.add(put);<a name="line.436"></a>
-<span class="sourceLineNo">437</span> }<a name="line.437"></a>
-<span class="sourceLineNo">438</span> // The puts will be iterated through and flushed only when the buffer<a name="line.438"></a>
-<span class="sourceLineNo">439</span> // size is reached.<a name="line.439"></a>
-<span class="sourceLineNo">440</span> htable1.put(puts);<a name="line.440"></a>
-<span class="sourceLineNo">441</span><a name="line.441"></a>
-<span class="sourceLineNo">442</span> Scan scan = new Scan();<a name="line.442"></a>
-<span class="sourceLineNo">443</span><a name="line.443"></a>
-<span class="sourceLineNo">444</span> ResultScanner scanner = htable1.getScanner(scan);<a name="line.444"></a>
-<span class="sourceLineNo">445</span> Result[] res = scanner.next(NB_ROWS_IN_BIG_BATCH);<a name="line.445"></a>
-<span class="sourceLineNo">446</span> scanner.close();<a name="line.446"></a>
-<span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span> assertEquals(NB_ROWS_IN_BIG_BATCH, res.length);<a name="line.448"></a>
-<span class="sourceLineNo">449</span><a name="line.449"></a>
-<span class="sourceLineNo">450</span> LOG.info("Looking in table2 for replicated rows in testLoading");<a name="line.450"></a>
-<span class="sourceLineNo">451</span> long start = System.currentTimeMillis();<a name="line.451"></a>
-<span class="sourceLineNo">452</span> // Retry more than NB_RETRIES. As it was, retries were done in 5 seconds and we'd fail<a name="line.452"></a>
-<span class="sourceLineNo">453</span> // sometimes.<a name="line.453"></a>
-<span class="sourceLineNo">454</span> final long retries = NB_RETRIES * 10;<a name="line.454"></a>
-<span class="sourceLineNo">455</span> for (int i = 0; i < retries; i++) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span> scan = new Scan();<a name="line.456"></a>
-<span class="sourceLineNo">457</span> scanner = htable2.getScanner(scan);<a name="line.457"></a>
-<span class="sourceLineNo">458</span> res = scanner.next(NB_ROWS_IN_BIG_BATCH);<a name="line.458"></a>
-<span class="sourceLineNo">459</span> scanner.close();<a name="line.459"></a>
-<span class="sourceLineNo">460</span> if (res.length != NB_ROWS_IN_BIG_BATCH) {<a name="line.460"></a>
-<span class="sourceLineNo">461</span> if (i == retries - 1) {<a name="line.461"></a>
-<span class="sourceLineNo">462</span> int lastRow = -1;<a name="line.462"></a>
-<span class="sourceLineNo">463</span> for (Result result : res) {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> int currentRow = Bytes.toInt(result.getRow());<a name="line.464"></a>
-<span class="sourceLineNo">465</span> for (int row = lastRow+1; row < currentRow; row++) {<a name="line.465"></a>
-<span class="sourceLineNo">466</span> LOG.error("Row missing: " + row);<a name="line.466"></a>
-<span class="sourceLineNo">467</span> }<a name="line.467"></a>
-<span class="sourceLineNo">468</span> lastRow = currentRow;<a name="line.468"></a>
-<span class="sourceLineNo">469</span> }<a name="line.469"></a>
-<span class="sourceLineNo">470</span> LOG.error("Last row: " + lastRow);<a name="line.470"></a>
-<span class="sourceLineNo">471</span> fail("Waited too much time for normal batch replication, " +<a name="line.471"></a>
-<span class="sourceLineNo">472</span> res.length + " instead of " + NB_ROWS_IN_BIG_BATCH + "; waited=" +<a name="line.472"></a>
-<span class="sourceLineNo">473</span> (System.currentTimeMillis() - start) + "ms");<a name="line.473"></a>
-<span class="sourceLineNo">474</span> } else {<a name="line.474"></a>
-<span class="sourceLineNo">475</span> LOG.info("Only got " + res.length + " rows... retrying");<a name="line.475"></a>
-<span class="sourceLineNo">476</span> Thread.sleep(SLEEP_TIME);<a name="line.476"></a>
-<span class="sourceLineNo">477</span> }<a name="line.477"></a>
-<span class="sourceLineNo">478</span> } else {<a name="line.478"></a>
-<span class="sourceLineNo">479</span> break;<a name="line.479"></a>
-<span class="sourceLineNo">480</span> }<a name="line.480"></a>
-<span class="sourceLineNo">481</span> }<a name="line.481"></a>
-<span class="sourceLineNo">482</span> }<a name="line.482"></a>
-<span class="sourceLineNo">483</span><a name="line.483"></a>
-<span class="sourceLineNo">484</span> /**<a name="line.484"></a>
-<span class="sourceLineNo">485</span> * Do a small loading into a table, make sure the data is really the same,<a name="line.485"></a>
-<span class="sourceLineNo">486</span> * then run the VerifyReplication job to check the results. Do a second<a name="line.486"></a>
-<span class="sourceLineNo">487</span> * comparison where all the cells are different.<a name="line.487"></a>
-<span class="sourceLineNo">488</span> * @throws Exception<a name="line.488"></a>
-<span class="sourceLineNo">489</span> */<a name="line.489"></a>
-<span class="sourceLineNo">490</span> @Test(timeout=300000)<a name="line.490"></a>
-<span class="sourceLineNo">491</span> public void testVerifyRepJob() throws Exception {<a name="line.491"></a>
-<span class="sourceLineNo">492</span> // Populate the tables, at the same time it guarantees that the tables are<a name="line.492"></a>
-<span class="sourceLineNo">493</span> // identical since it does the check<a name="line.493"></a>
-<span class="sourceLineNo">494</span> testSmallBatch();<a name="line.494"></a>
-<span class="sourceLineNo">495</span><a name="line.495"></a>
-<span class="sourceLineNo">496</span> String[] args = new String[] {PEER_ID, tableName.getNameAsString()};<a name="line.496"></a>
-<span class="sourceLineNo">497</span> runVerifyReplication(args, NB_ROWS_IN_BATCH, 0);<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span> Scan scan = new Scan();<a name="line.499"></a>
-<span class="sourceLineNo">500</span> ResultScanner rs = htable2.getScanner(scan);<a name="line.500"></a>
-<span class="sourceLineNo">501</span> Put put = null;<a name="line.501"></a>
-<span class="sourceLineNo">502</span> for (Result result : rs) {<a name="line.502"></a>
-<span class="sourceLineNo">503</span> put = new Put(result.getRow());<a name="line.503"></a>
-<span class="sourceLineNo">504</span> Cell firstVal = result.rawCells()[0];<a name="line.504"></a>
-<span class="sourceLineNo">505</span> put.addColumn(CellUtil.cloneFamily(firstVal), CellUtil.cloneQualifier(firstVal),<a name="line.505"></a>
-<span class="sourceLineNo">506</span> Bytes.toBytes("diff data"));<a name="line.506"></a>
-<span class="sourceLineNo">507</span> htable2.put(put);<a name="line.507"></a>
-<span class="sourceLineNo">508</span> }<a name="line.508"></a>
-<span class="sourceLineNo">509</span> Delete delete = new Delete(put.getRow());<a name="line.509"></a>
-<span class="sourceLineNo">510</span> htable2.delete(delete);<a name="line.510"></a>
-<span class="sourceLineNo">511</span> runVerifyReplication(args, 0, NB_ROWS_IN_BATCH);<a name="line.511"></a>
-<span class="sourceLineNo">512</span> }<a name="line.512"></a>
-<span class="sourceLineNo">513</span><a name="line.513"></a>
-<span class="sourceLineNo">514</span> /**<a name="line.514"></a>
-<span class="sourceLineNo">515</span> * Load a row into a table, make sure the data is really the same,<a name="line.515"></a>
-<span class="sourceLineNo">516</span> * delete the row, make sure the delete marker is replicated,<a name="line.516"></a>
-<span class="sourceLineNo">517</span> * run verify replication with and without raw to check the results.<a name="line.517"></a>
-<span class="sourceLineNo">518</span> * @throws Exception<a name="line.518"></a>
-<span class="sourceLineNo">519</span> */<a name="line.519"></a>
-<span class="sourceLineNo">520</span> @Test(timeout=300000)<a name="line.520"></a>
-<span class="sourceLineNo">521</span> public void testVerifyRepJobWithRawOptions() throws Exception {<a name="line.521"></a>
-<span class="sourceLineNo">522</span> LOG.info(name.getMethodName());<a name="line.522"></a>
-<span class="sourceLineNo">523</span><a name="line.523"></a>
-<span class="sourceLineNo">524</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.524"></a>
-<span class="sourceLineNo">525</span> byte[] familyname = Bytes.toBytes("fam_raw");<a name="line.525"></a>
-<span class="sourceLineNo">526</span> byte[] row = Bytes.toBytes("row_raw");<a name="line.526"></a>
-<span class="sourceLineNo">527</span><a name="line.527"></a>
-<span class="sourceLineNo">528</span> Table lHtable1 = null;<a name="line.528"></a>
-<span class="sourceLineNo">529</span> Table lHtable2 = null;<a name="line.529"></a>
-<span class="sourceLineNo">530</span><a name="line.530"></a>
-<span class="sourceLineNo">531</span> try {<a name="line.531"></a>
-<span class="sourceLineNo">532</span> ColumnFamilyDescriptor fam = ColumnFamilyDescriptorBuilder.newBuilder(familyname)<a name="line.532"></a>
-<span class="sourceLineNo">533</span> .setMaxVersions(100).setScope(HConstants.REPLICATION_SCOPE_GLOBAL).build();<a name="line.533"></a>
-<span class="sourceLineNo">534</span> TableDescriptor table = TableDescriptorBuilder.newBuilder(tableName).addColumnFamily(fam).build();<a name="line.534"></a>
-<span class="sourceLineNo">535</span> scopes = new TreeMap<>(Bytes.BYTES_COMPARATOR);<a name="line.535"></a>
-<span class="sourceLineNo">536</span> for (ColumnFamilyDescriptor f : table.getColumnFamilies()) {<a name="line.536"></a>
-<span class="sourceLineNo">537</span> scopes.put(f.getName(), f.getScope());<a name="line.537"></a>
-<span class="sourceLineNo">538</span> }<a name="line.538"></a>
-<span class="sourceLineNo">539</span><a name="line.539"></a>
-<span class="sourceLineNo">540</span> Connection connection1 = ConnectionFactory.createConnection(conf1);<a name="line.540"></a>
-<span class="sourceLineNo">541</span> Connection connection2 = ConnectionFactory.createConnection(conf2);<a name="line.541"></a>
-<span class="sourceLineNo">542</span> try (Admin admin1 = connection1.getAdmin()) {<a name="line.542"></a>
-<span class="sourceLineNo">543</span> admin1.createTable(table, HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE);<a name="line.543"></a>
-<span class="sourceLineNo">544</span> }<a name="line.544"></a>
-<span class="sourceLineNo">545</span> try (Admin admin2 = connection2.getAdmin()) {<a name="line.545"></a>
-<span class="sourceLineNo">546</span> admin2.createTable(table, HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE);<a name="line.546"></a>
-<span class="sourceLineNo">547</span> }<a name="line.547"></a>
-<span class="sourceLineNo">548</span> utility1.waitUntilAllRegionsAssigned(tableName);<a name="line.548"></a>
-<span class="sourceLineNo">549</span> utility2.waitUntilAllRegionsAssigned(tableName);<a name="line.549"></a>
-<span class="sourceLineNo">550</span><a name="line.550"></a>
-<span class="sourceLineNo">551</span> lHtable1 = utility1.getConnection().getTable(tableName);<a name="line.551"></a>
-<span class="sourceLineNo">552</span> lHtable2 = utility2.getConnection().getTable(tableName);<a name="line.552"></a>
-<span class="sourceLineNo">553</span><a name="line.553"></a>
-<span class="sourceLineNo">554</span> Put put = new Put(row);<a name="line.554"></a>
-<span class="sourceLineNo">555</span> put.addColumn(familyname, row, row);<a name="line.555"></a>
-<span class="sourceLineNo">556</span> lHtable1.put(put);<a name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span> Get get = new Get(row);<a name="line.558"></a>
-<span class="sourceLineNo">559</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.559"></a>
-<span class="sourceLineNo">560</span> if (i==NB_RETRIES-1) {<a name="line.560"></a>
-<span class="sourceLineNo">561</span> fail("Waited too much time for put replication");<a name="line.561"></a>
-<span class="sourceLineNo">562</span> }<a name="line.562"></a>
-<span class="sourceLineNo">563</span> Result res = lHtable2.get(get);<a name="line.563"></a>
-<span class="sourceLineNo">564</span> if (res.isEmpty()) {<a name="line.564"></a>
-<span class="sourceLineNo">565</span> LOG.info("Row not available");<a name="line.565"></a>
-<span class="sourceLineNo">566</span> Thread.sleep(SLEEP_TIME);<a name="line.566"></a>
-<span class="sourceLineNo">567</span> } else {<a name="line.567"></a>
-<span class="sourceLineNo">568</span> assertArrayEquals(res.value(), row);<a name="line.568"></a>
-<span class="sourceLineNo">569</span> break;<a name="line.569"></a>
-<span class="sourceLineNo">570</span> }<a name="line.570"></a>
-<span class="sourceLineNo">571</span> }<a name="line.571"></a>
-<span class="sourceLineNo">572</span><a name="line.572"></a>
-<span class="sourceLineNo">573</span> Delete del = new Delete(row);<a name="line.573"></a>
-<span class="sourceLineNo">574</span> lHtable1.delete(del);<a name="line.574"></a>
-<span class="sourceLineNo">575</span><a name="line.575"></a>
-<span class="sourceLineNo">576</span> get = new Get(row);<a name="line.576"></a>
-<span class="sourceLineNo">577</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span> if (i==NB_RETRIES-1) {<a name="line.578"></a>
-<span class="sourceLineNo">579</span> fail("Waited too much time for del replication");<a name="line.579"></a>
-<span class="sourceLineNo">580</span> }<a name="line.580"></a>
-<span class="sourceLineNo">581</span> Result res = lHtable2.get(get);<a name="line.581"></a>
-<span class="sourceLineNo">582</span> if (res.size() >= 1) {<a name="line.582"></a>
-<span class="sourceLineNo">583</span> LOG.info("Row not deleted");<a name="line.583"></a>
-<span class="sourceLineNo">584</span> Thread.sleep(SLEEP_TIME);<a name="line.584"></a>
-<span class="sourceLineNo">585</span> } else {<a name="line.585"></a>
-<span class="sourceLineNo">586</span> break;<a name="line.586"></a>
-<span class="sourceLineNo">587</span> }<a name="line.587"></a>
-<span class="sourceLineNo">588</span> }<a name="line.588"></a>
-<span class="sourceLineNo">589</span><a name="line.589"></a>
-<span class="sourceLineNo">590</span> // Checking verifyReplication for the default behavior.<a name="line.590"></a>
-<span class="sourceLineNo">591</span> String[] argsWithoutRaw = new String[] {PEER_ID, tableName.getNameAsString()};<a name="line.591"></a>
-<span class="sourceLineNo">592</span> runVerifyReplication(argsWithoutRaw, 0, 0);<a name="line.592"></a>
-<span class="sourceLineNo">593</span><a name="line.593"></a>
-<span class="sourceLineNo">594</span> // Checking verifyReplication with raw<a name="line.594"></a>
-<span class="sourceLineNo">595</span> String[] argsWithRawAsTrue = new String[] {"--raw", PEER_ID, tableName.getNameAsString()};<a name="line.595"></a>
-<span class="sourceLineNo">596</span> runVerifyReplication(argsWithRawAsTrue, 1, 0);<a name="line.596"></a>
-<span class="sourceLineNo">597</span> } finally {<a name="line.597"></a>
-<span class="sourceLineNo">598</span> if (lHtable1 != null) {<a name="line.598"></a>
-<span class="sourceLineNo">599</span> lHtable1.close();<a name="line.599"></a>
-<span class="sourceLineNo">600</span> }<a name="line.600"></a>
-<span class="sourceLineNo">601</span> if (lHtable2 != null) {<a name="line.601"></a>
-<span class="sourceLineNo">602</span> lHtable2.close();<a name="line.602"></a>
-<span class="sourceLineNo">603</span> }<a name="line.603"></a>
-<span class="sourceLineNo">604</span> }<a name="line.
<TRUNCATED>