Repository: hbase-site Updated Branches: refs/heads/asf-site bcbc76949 -> 6b337eb3c
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6b337eb3/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationDroppedTables.html ---------------------------------------------------------------------- diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationDroppedTables.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationDroppedTables.html index f01b6d1..94ef81f 100644 --- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationDroppedTables.html +++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/TestReplicationDroppedTables.html @@ -43,268 +43,277 @@ <span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.client.ResultScanner;<a name="line.35"></a> <span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.client.Scan;<a name="line.36"></a> <span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.client.Table;<a name="line.37"></a> -<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.38"></a> -<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.testclassification.ReplicationTests;<a name="line.39"></a> -<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.40"></a> -<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.util.JVMClusterUtil;<a name="line.41"></a> -<span class="sourceLineNo">042</span>import org.junit.Before;<a name="line.42"></a> -<span class="sourceLineNo">043</span>import org.junit.ClassRule;<a name="line.43"></a> -<span class="sourceLineNo">044</span>import org.junit.Test;<a name="line.44"></a> -<span class="sourceLineNo">045</span>import org.junit.experimental.categories.Category;<a name="line.45"></a> -<span class="sourceLineNo">046</span>import org.slf4j.Logger;<a name="line.46"></a> -<span class="sourceLineNo">047</span>import org.slf4j.LoggerFactory;<a name="line.47"></a> -<span class="sourceLineNo">048</span><a name="line.48"></a> -<span class="sourceLineNo">049</span>@Category({ ReplicationTests.class, LargeTests.class })<a name="line.49"></a> -<span class="sourceLineNo">050</span>public class TestReplicationDroppedTables extends TestReplicationBase {<a name="line.50"></a> -<span class="sourceLineNo">051</span><a name="line.51"></a> -<span class="sourceLineNo">052</span> @ClassRule<a name="line.52"></a> -<span class="sourceLineNo">053</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.53"></a> -<span class="sourceLineNo">054</span> HBaseClassTestRule.forClass(TestReplicationDroppedTables.class);<a name="line.54"></a> -<span class="sourceLineNo">055</span><a name="line.55"></a> -<span class="sourceLineNo">056</span> private static final Logger LOG = LoggerFactory.getLogger(TestReplicationDroppedTables.class);<a name="line.56"></a> -<span class="sourceLineNo">057</span><a name="line.57"></a> -<span class="sourceLineNo">058</span> @Before<a name="line.58"></a> -<span class="sourceLineNo">059</span> public void setUp() throws Exception {<a name="line.59"></a> -<span class="sourceLineNo">060</span> // Starting and stopping replication can make us miss new logs,<a name="line.60"></a> -<span class="sourceLineNo">061</span> // rolling like this makes sure the most recent one gets added to the queue<a name="line.61"></a> -<span class="sourceLineNo">062</span> for ( JVMClusterUtil.RegionServerThread r :<a name="line.62"></a> -<span class="sourceLineNo">063</span> utility1.getHBaseCluster().getRegionServerThreads()) {<a name="line.63"></a> -<span class="sourceLineNo">064</span> utility1.getAdmin().rollWALWriter(r.getRegionServer().getServerName());<a name="line.64"></a> -<span class="sourceLineNo">065</span> }<a name="line.65"></a> -<span class="sourceLineNo">066</span> int rowCount = utility1.countRows(tableName);<a name="line.66"></a> -<span class="sourceLineNo">067</span> utility1.deleteTableData(tableName);<a name="line.67"></a> -<span class="sourceLineNo">068</span> // truncating the table will send one Delete per row to the slave cluster<a name="line.68"></a> -<span class="sourceLineNo">069</span> // in an async fashion, which is why we cannot just call deleteTableData on<a name="line.69"></a> -<span class="sourceLineNo">070</span> // utility2 since late writes could make it to the slave in some way.<a name="line.70"></a> -<span class="sourceLineNo">071</span> // Instead, we truncate the first table and wait for all the Deletes to<a name="line.71"></a> -<span class="sourceLineNo">072</span> // make it to the slave.<a name="line.72"></a> -<span class="sourceLineNo">073</span> Scan scan = new Scan();<a name="line.73"></a> -<span class="sourceLineNo">074</span> int lastCount = 0;<a name="line.74"></a> -<span class="sourceLineNo">075</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.75"></a> -<span class="sourceLineNo">076</span> if (i==NB_RETRIES-1) {<a name="line.76"></a> -<span class="sourceLineNo">077</span> fail("Waited too much time for truncate");<a name="line.77"></a> -<span class="sourceLineNo">078</span> }<a name="line.78"></a> -<span class="sourceLineNo">079</span> ResultScanner scanner = htable2.getScanner(scan);<a name="line.79"></a> -<span class="sourceLineNo">080</span> Result[] res = scanner.next(rowCount);<a name="line.80"></a> -<span class="sourceLineNo">081</span> scanner.close();<a name="line.81"></a> -<span class="sourceLineNo">082</span> if (res.length != 0) {<a name="line.82"></a> -<span class="sourceLineNo">083</span> if (res.length < lastCount) {<a name="line.83"></a> -<span class="sourceLineNo">084</span> i--; // Don't increment timeout if we make progress<a name="line.84"></a> -<span class="sourceLineNo">085</span> }<a name="line.85"></a> -<span class="sourceLineNo">086</span> lastCount = res.length;<a name="line.86"></a> -<span class="sourceLineNo">087</span> LOG.info("Still got " + res.length + " rows");<a name="line.87"></a> -<span class="sourceLineNo">088</span> Thread.sleep(SLEEP_TIME);<a name="line.88"></a> -<span class="sourceLineNo">089</span> } else {<a name="line.89"></a> -<span class="sourceLineNo">090</span> break;<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> }<a name="line.93"></a> -<span class="sourceLineNo">094</span><a name="line.94"></a> -<span class="sourceLineNo">095</span> @Test<a name="line.95"></a> -<span class="sourceLineNo">096</span> public void testEditsStuckBehindDroppedTable() throws Exception {<a name="line.96"></a> -<span class="sourceLineNo">097</span> // Sanity check<a name="line.97"></a> -<span class="sourceLineNo">098</span> // Make sure by default edits for dropped tables stall the replication queue, even when the<a name="line.98"></a> -<span class="sourceLineNo">099</span> // table(s) in question have been deleted on both ends.<a name="line.99"></a> -<span class="sourceLineNo">100</span> testEditsBehindDroppedTable(false, "test_dropped");<a name="line.100"></a> -<span class="sourceLineNo">101</span> }<a name="line.101"></a> -<span class="sourceLineNo">102</span><a name="line.102"></a> -<span class="sourceLineNo">103</span> @Test<a name="line.103"></a> -<span class="sourceLineNo">104</span> public void testEditsDroppedWithDroppedTable() throws Exception {<a name="line.104"></a> -<span class="sourceLineNo">105</span> // Make sure by default edits for dropped tables are themselves dropped when the<a name="line.105"></a> +<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.ipc.RpcServer;<a name="line.38"></a> +<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.39"></a> +<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.testclassification.ReplicationTests;<a name="line.40"></a> +<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.41"></a> +<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.util.JVMClusterUtil;<a name="line.42"></a> +<span class="sourceLineNo">043</span>import org.junit.Before;<a name="line.43"></a> +<span class="sourceLineNo">044</span>import org.junit.ClassRule;<a name="line.44"></a> +<span class="sourceLineNo">045</span>import org.junit.Test;<a name="line.45"></a> +<span class="sourceLineNo">046</span>import org.junit.experimental.categories.Category;<a name="line.46"></a> +<span class="sourceLineNo">047</span>import org.slf4j.Logger;<a name="line.47"></a> +<span class="sourceLineNo">048</span>import org.slf4j.LoggerFactory;<a name="line.48"></a> +<span class="sourceLineNo">049</span><a name="line.49"></a> +<span class="sourceLineNo">050</span>@Category({ ReplicationTests.class, LargeTests.class })<a name="line.50"></a> +<span class="sourceLineNo">051</span>public class TestReplicationDroppedTables extends TestReplicationBase {<a name="line.51"></a> +<span class="sourceLineNo">052</span><a name="line.52"></a> +<span class="sourceLineNo">053</span> @ClassRule<a name="line.53"></a> +<span class="sourceLineNo">054</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.54"></a> +<span class="sourceLineNo">055</span> HBaseClassTestRule.forClass(TestReplicationDroppedTables.class);<a name="line.55"></a> +<span class="sourceLineNo">056</span><a name="line.56"></a> +<span class="sourceLineNo">057</span> private static final Logger LOG = LoggerFactory.getLogger(TestReplicationDroppedTables.class);<a name="line.57"></a> +<span class="sourceLineNo">058</span><a name="line.58"></a> +<span class="sourceLineNo">059</span> @Before<a name="line.59"></a> +<span class="sourceLineNo">060</span> public void setUp() throws Exception {<a name="line.60"></a> +<span class="sourceLineNo">061</span> // Starting and stopping replication can make us miss new logs,<a name="line.61"></a> +<span class="sourceLineNo">062</span> // rolling like this makes sure the most recent one gets added to the queue<a name="line.62"></a> +<span class="sourceLineNo">063</span> for (JVMClusterUtil.RegionServerThread r : utility1.getHBaseCluster()<a name="line.63"></a> +<span class="sourceLineNo">064</span> .getRegionServerThreads()) {<a name="line.64"></a> +<span class="sourceLineNo">065</span> utility1.getAdmin().rollWALWriter(r.getRegionServer().getServerName());<a name="line.65"></a> +<span class="sourceLineNo">066</span> }<a name="line.66"></a> +<span class="sourceLineNo">067</span> int rowCount = utility1.countRows(tableName);<a name="line.67"></a> +<span class="sourceLineNo">068</span> utility1.deleteTableData(tableName);<a name="line.68"></a> +<span class="sourceLineNo">069</span> // truncating the table will send one Delete per row to the slave cluster<a name="line.69"></a> +<span class="sourceLineNo">070</span> // in an async fashion, which is why we cannot just call deleteTableData on<a name="line.70"></a> +<span class="sourceLineNo">071</span> // utility2 since late writes could make it to the slave in some way.<a name="line.71"></a> +<span class="sourceLineNo">072</span> // Instead, we truncate the first table and wait for all the Deletes to<a name="line.72"></a> +<span class="sourceLineNo">073</span> // make it to the slave.<a name="line.73"></a> +<span class="sourceLineNo">074</span> Scan scan = new Scan();<a name="line.74"></a> +<span class="sourceLineNo">075</span> int lastCount = 0;<a name="line.75"></a> +<span class="sourceLineNo">076</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.76"></a> +<span class="sourceLineNo">077</span> if (i == NB_RETRIES - 1) {<a name="line.77"></a> +<span class="sourceLineNo">078</span> fail("Waited too much time for truncate");<a name="line.78"></a> +<span class="sourceLineNo">079</span> }<a name="line.79"></a> +<span class="sourceLineNo">080</span> ResultScanner scanner = htable2.getScanner(scan);<a name="line.80"></a> +<span class="sourceLineNo">081</span> Result[] res = scanner.next(rowCount);<a name="line.81"></a> +<span class="sourceLineNo">082</span> scanner.close();<a name="line.82"></a> +<span class="sourceLineNo">083</span> if (res.length != 0) {<a name="line.83"></a> +<span class="sourceLineNo">084</span> if (res.length < lastCount) {<a name="line.84"></a> +<span class="sourceLineNo">085</span> i--; // Don't increment timeout if we make progress<a name="line.85"></a> +<span class="sourceLineNo">086</span> }<a name="line.86"></a> +<span class="sourceLineNo">087</span> lastCount = res.length;<a name="line.87"></a> +<span class="sourceLineNo">088</span> LOG.info("Still got " + res.length + " rows");<a name="line.88"></a> +<span class="sourceLineNo">089</span> Thread.sleep(SLEEP_TIME);<a name="line.89"></a> +<span class="sourceLineNo">090</span> } else {<a name="line.90"></a> +<span class="sourceLineNo">091</span> break;<a name="line.91"></a> +<span class="sourceLineNo">092</span> }<a name="line.92"></a> +<span class="sourceLineNo">093</span> }<a name="line.93"></a> +<span class="sourceLineNo">094</span> // Set the max request size to a tiny 10K for dividing the replication WAL entries into multiple<a name="line.94"></a> +<span class="sourceLineNo">095</span> // batches. the default max request size is 256M, so all replication entries are in a batch, but<a name="line.95"></a> +<span class="sourceLineNo">096</span> // when replicate at sink side, it'll apply to rs group by table name, so the WAL of test table<a name="line.96"></a> +<span class="sourceLineNo">097</span> // may apply first, and then test_dropped table, and we will believe that the replication is not<a name="line.97"></a> +<span class="sourceLineNo">098</span> // got stuck (HBASE-20475).<a name="line.98"></a> +<span class="sourceLineNo">099</span> conf1.setInt(RpcServer.MAX_REQUEST_SIZE, 10 * 1024);<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> @Test<a name="line.102"></a> +<span class="sourceLineNo">103</span> public void testEditsStuckBehindDroppedTable() throws Exception {<a name="line.103"></a> +<span class="sourceLineNo">104</span> // Sanity check<a name="line.104"></a> +<span class="sourceLineNo">105</span> // Make sure by default edits for dropped tables stall the replication queue, even when the<a name="line.105"></a> <span class="sourceLineNo">106</span> // table(s) in question have been deleted on both ends.<a name="line.106"></a> -<span class="sourceLineNo">107</span> testEditsBehindDroppedTable(true, "test_dropped");<a name="line.107"></a> +<span class="sourceLineNo">107</span> testEditsBehindDroppedTable(false, "test_dropped");<a name="line.107"></a> <span class="sourceLineNo">108</span> }<a name="line.108"></a> <span class="sourceLineNo">109</span><a name="line.109"></a> <span class="sourceLineNo">110</span> @Test<a name="line.110"></a> -<span class="sourceLineNo">111</span> public void testEditsDroppedWithDroppedTableNS() throws Exception {<a name="line.111"></a> -<span class="sourceLineNo">112</span> // also try with a namespace<a name="line.112"></a> -<span class="sourceLineNo">113</span> Connection connection1 = ConnectionFactory.createConnection(conf1);<a name="line.113"></a> -<span class="sourceLineNo">114</span> try (Admin admin1 = connection1.getAdmin()) {<a name="line.114"></a> -<span class="sourceLineNo">115</span> admin1.createNamespace(NamespaceDescriptor.create("NS").build());<a name="line.115"></a> -<span class="sourceLineNo">116</span> }<a name="line.116"></a> -<span class="sourceLineNo">117</span> Connection connection2 = ConnectionFactory.createConnection(conf2);<a name="line.117"></a> -<span class="sourceLineNo">118</span> try (Admin admin2 = connection2.getAdmin()) {<a name="line.118"></a> -<span class="sourceLineNo">119</span> admin2.createNamespace(NamespaceDescriptor.create("NS").build());<a name="line.119"></a> -<span class="sourceLineNo">120</span> }<a name="line.120"></a> -<span class="sourceLineNo">121</span> testEditsBehindDroppedTable(true, "NS:test_dropped");<a name="line.121"></a> -<span class="sourceLineNo">122</span> try (Admin admin1 = connection1.getAdmin()) {<a name="line.122"></a> -<span class="sourceLineNo">123</span> admin1.deleteNamespace("NS");<a name="line.123"></a> -<span class="sourceLineNo">124</span> }<a name="line.124"></a> +<span class="sourceLineNo">111</span> public void testEditsDroppedWithDroppedTable() throws Exception {<a name="line.111"></a> +<span class="sourceLineNo">112</span> // Make sure by default edits for dropped tables are themselves dropped when the<a name="line.112"></a> +<span class="sourceLineNo">113</span> // table(s) in question have been deleted on both ends.<a name="line.113"></a> +<span class="sourceLineNo">114</span> testEditsBehindDroppedTable(true, "test_dropped");<a name="line.114"></a> +<span class="sourceLineNo">115</span> }<a name="line.115"></a> +<span class="sourceLineNo">116</span><a name="line.116"></a> +<span class="sourceLineNo">117</span> @Test<a name="line.117"></a> +<span class="sourceLineNo">118</span> public void testEditsDroppedWithDroppedTableNS() throws Exception {<a name="line.118"></a> +<span class="sourceLineNo">119</span> // also try with a namespace<a name="line.119"></a> +<span class="sourceLineNo">120</span> Connection connection1 = ConnectionFactory.createConnection(conf1);<a name="line.120"></a> +<span class="sourceLineNo">121</span> try (Admin admin1 = connection1.getAdmin()) {<a name="line.121"></a> +<span class="sourceLineNo">122</span> admin1.createNamespace(NamespaceDescriptor.create("NS").build());<a name="line.122"></a> +<span class="sourceLineNo">123</span> }<a name="line.123"></a> +<span class="sourceLineNo">124</span> Connection connection2 = ConnectionFactory.createConnection(conf2);<a name="line.124"></a> <span class="sourceLineNo">125</span> try (Admin admin2 = connection2.getAdmin()) {<a name="line.125"></a> -<span class="sourceLineNo">126</span> admin2.deleteNamespace("NS");<a name="line.126"></a> +<span class="sourceLineNo">126</span> admin2.createNamespace(NamespaceDescriptor.create("NS").build());<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><a name="line.129"></a> -<span class="sourceLineNo">130</span> private void testEditsBehindDroppedTable(boolean allowProceeding, String tName) throws Exception {<a name="line.130"></a> -<span class="sourceLineNo">131</span> conf1.setBoolean(HConstants.REPLICATION_DROP_ON_DELETED_TABLE_KEY, allowProceeding);<a name="line.131"></a> -<span class="sourceLineNo">132</span> conf1.setInt(HConstants.REPLICATION_SOURCE_MAXTHREADS_KEY, 1);<a name="line.132"></a> -<span class="sourceLineNo">133</span><a name="line.133"></a> -<span class="sourceLineNo">134</span> // make sure we have a single region server only, so that all<a name="line.134"></a> -<span class="sourceLineNo">135</span> // edits for all tables go there<a name="line.135"></a> -<span class="sourceLineNo">136</span> utility1.shutdownMiniHBaseCluster();<a name="line.136"></a> -<span class="sourceLineNo">137</span> utility1.startMiniHBaseCluster(1, 1);<a name="line.137"></a> -<span class="sourceLineNo">138</span><a name="line.138"></a> -<span class="sourceLineNo">139</span> TableName tablename = TableName.valueOf(tName);<a name="line.139"></a> -<span class="sourceLineNo">140</span> byte[] familyname = Bytes.toBytes("fam");<a name="line.140"></a> -<span class="sourceLineNo">141</span> byte[] row = Bytes.toBytes("row");<a name="line.141"></a> -<span class="sourceLineNo">142</span><a name="line.142"></a> -<span class="sourceLineNo">143</span> HTableDescriptor table = new HTableDescriptor(tablename);<a name="line.143"></a> -<span class="sourceLineNo">144</span> HColumnDescriptor fam = new HColumnDescriptor(familyname);<a name="line.144"></a> -<span class="sourceLineNo">145</span> fam.setScope(HConstants.REPLICATION_SCOPE_GLOBAL);<a name="line.145"></a> -<span class="sourceLineNo">146</span> table.addFamily(fam);<a name="line.146"></a> -<span class="sourceLineNo">147</span><a name="line.147"></a> -<span class="sourceLineNo">148</span> Connection connection1 = ConnectionFactory.createConnection(conf1);<a name="line.148"></a> -<span class="sourceLineNo">149</span> Connection connection2 = ConnectionFactory.createConnection(conf2);<a name="line.149"></a> -<span class="sourceLineNo">150</span> try (Admin admin1 = connection1.getAdmin()) {<a name="line.150"></a> -<span class="sourceLineNo">151</span> admin1.createTable(table);<a name="line.151"></a> -<span class="sourceLineNo">152</span> }<a name="line.152"></a> -<span class="sourceLineNo">153</span> try (Admin admin2 = connection2.getAdmin()) {<a name="line.153"></a> -<span class="sourceLineNo">154</span> admin2.createTable(table);<a name="line.154"></a> -<span class="sourceLineNo">155</span> }<a name="line.155"></a> -<span class="sourceLineNo">156</span> utility1.waitUntilAllRegionsAssigned(tablename);<a name="line.156"></a> -<span class="sourceLineNo">157</span> utility2.waitUntilAllRegionsAssigned(tablename);<a name="line.157"></a> -<span class="sourceLineNo">158</span><a name="line.158"></a> -<span class="sourceLineNo">159</span> Table lHtable1 = utility1.getConnection().getTable(tablename);<a name="line.159"></a> -<span class="sourceLineNo">160</span><a name="line.160"></a> -<span class="sourceLineNo">161</span> // now suspend replication<a name="line.161"></a> -<span class="sourceLineNo">162</span> admin.disablePeer("2");<a name="line.162"></a> -<span class="sourceLineNo">163</span><a name="line.163"></a> -<span class="sourceLineNo">164</span> // put some data (lead with 0 so the edit gets sorted before the other table's edits<a name="line.164"></a> -<span class="sourceLineNo">165</span> // in the replication batch)<a name="line.165"></a> -<span class="sourceLineNo">166</span> // write a bunch of edits, making sure we fill a batch<a name="line.166"></a> -<span class="sourceLineNo">167</span> byte[] rowkey = Bytes.toBytes(0+" put on table to be dropped");<a name="line.167"></a> -<span class="sourceLineNo">168</span> Put put = new Put(rowkey);<a name="line.168"></a> -<span class="sourceLineNo">169</span> put.addColumn(familyname, row, row);<a name="line.169"></a> -<span class="sourceLineNo">170</span> lHtable1.put(put);<a name="line.170"></a> -<span class="sourceLineNo">171</span><a name="line.171"></a> -<span class="sourceLineNo">172</span> rowkey = Bytes.toBytes("normal put");<a name="line.172"></a> -<span class="sourceLineNo">173</span> put = new Put(rowkey);<a name="line.173"></a> -<span class="sourceLineNo">174</span> put.addColumn(famName, row, row);<a name="line.174"></a> -<span class="sourceLineNo">175</span> htable1.put(put);<a name="line.175"></a> -<span class="sourceLineNo">176</span><a name="line.176"></a> -<span class="sourceLineNo">177</span> try (Admin admin1 = connection1.getAdmin()) {<a name="line.177"></a> -<span class="sourceLineNo">178</span> admin1.disableTable(tablename);<a name="line.178"></a> -<span class="sourceLineNo">179</span> admin1.deleteTable(tablename);<a name="line.179"></a> -<span class="sourceLineNo">180</span> }<a name="line.180"></a> -<span class="sourceLineNo">181</span> try (Admin admin2 = connection2.getAdmin()) {<a name="line.181"></a> -<span class="sourceLineNo">182</span> admin2.disableTable(tablename);<a name="line.182"></a> -<span class="sourceLineNo">183</span> admin2.deleteTable(tablename);<a name="line.183"></a> -<span class="sourceLineNo">184</span> }<a name="line.184"></a> -<span class="sourceLineNo">185</span><a name="line.185"></a> -<span class="sourceLineNo">186</span> admin.enablePeer("2");<a name="line.186"></a> -<span class="sourceLineNo">187</span> if (allowProceeding) {<a name="line.187"></a> -<span class="sourceLineNo">188</span> // in this we'd expect the key to make it over<a name="line.188"></a> -<span class="sourceLineNo">189</span> verifyReplicationProceeded(rowkey);<a name="line.189"></a> -<span class="sourceLineNo">190</span> } else {<a name="line.190"></a> -<span class="sourceLineNo">191</span> verifyReplicationStuck(rowkey);<a name="line.191"></a> +<span class="sourceLineNo">128</span> testEditsBehindDroppedTable(true, "NS:test_dropped");<a name="line.128"></a> +<span class="sourceLineNo">129</span> try (Admin admin1 = connection1.getAdmin()) {<a name="line.129"></a> +<span class="sourceLineNo">130</span> admin1.deleteNamespace("NS");<a name="line.130"></a> +<span class="sourceLineNo">131</span> }<a name="line.131"></a> +<span class="sourceLineNo">132</span> try (Admin admin2 = connection2.getAdmin()) {<a name="line.132"></a> +<span class="sourceLineNo">133</span> admin2.deleteNamespace("NS");<a name="line.133"></a> +<span class="sourceLineNo">134</span> }<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> private void testEditsBehindDroppedTable(boolean allowProceeding, String tName) throws Exception {<a name="line.137"></a> +<span class="sourceLineNo">138</span> conf1.setBoolean(HConstants.REPLICATION_DROP_ON_DELETED_TABLE_KEY, allowProceeding);<a name="line.138"></a> +<span class="sourceLineNo">139</span> conf1.setInt(HConstants.REPLICATION_SOURCE_MAXTHREADS_KEY, 1);<a name="line.139"></a> +<span class="sourceLineNo">140</span><a name="line.140"></a> +<span class="sourceLineNo">141</span> // make sure we have a single region server only, so that all<a name="line.141"></a> +<span class="sourceLineNo">142</span> // edits for all tables go there<a name="line.142"></a> +<span class="sourceLineNo">143</span> utility1.shutdownMiniHBaseCluster();<a name="line.143"></a> +<span class="sourceLineNo">144</span> utility1.startMiniHBaseCluster(1, 1);<a name="line.144"></a> +<span class="sourceLineNo">145</span><a name="line.145"></a> +<span class="sourceLineNo">146</span> TableName tablename = TableName.valueOf(tName);<a name="line.146"></a> +<span class="sourceLineNo">147</span> byte[] familyname = Bytes.toBytes("fam");<a name="line.147"></a> +<span class="sourceLineNo">148</span> byte[] row = Bytes.toBytes("row");<a name="line.148"></a> +<span class="sourceLineNo">149</span><a name="line.149"></a> +<span class="sourceLineNo">150</span> HTableDescriptor table = new HTableDescriptor(tablename);<a name="line.150"></a> +<span class="sourceLineNo">151</span> HColumnDescriptor fam = new HColumnDescriptor(familyname);<a name="line.151"></a> +<span class="sourceLineNo">152</span> fam.setScope(HConstants.REPLICATION_SCOPE_GLOBAL);<a name="line.152"></a> +<span class="sourceLineNo">153</span> table.addFamily(fam);<a name="line.153"></a> +<span class="sourceLineNo">154</span><a name="line.154"></a> +<span class="sourceLineNo">155</span> Connection connection1 = ConnectionFactory.createConnection(conf1);<a name="line.155"></a> +<span class="sourceLineNo">156</span> Connection connection2 = ConnectionFactory.createConnection(conf2);<a name="line.156"></a> +<span class="sourceLineNo">157</span> try (Admin admin1 = connection1.getAdmin()) {<a name="line.157"></a> +<span class="sourceLineNo">158</span> admin1.createTable(table);<a name="line.158"></a> +<span class="sourceLineNo">159</span> }<a name="line.159"></a> +<span class="sourceLineNo">160</span> try (Admin admin2 = connection2.getAdmin()) {<a name="line.160"></a> +<span class="sourceLineNo">161</span> admin2.createTable(table);<a name="line.161"></a> +<span class="sourceLineNo">162</span> }<a name="line.162"></a> +<span class="sourceLineNo">163</span> utility1.waitUntilAllRegionsAssigned(tablename);<a name="line.163"></a> +<span class="sourceLineNo">164</span> utility2.waitUntilAllRegionsAssigned(tablename);<a name="line.164"></a> +<span class="sourceLineNo">165</span><a name="line.165"></a> +<span class="sourceLineNo">166</span> Table lHtable1 = utility1.getConnection().getTable(tablename);<a name="line.166"></a> +<span class="sourceLineNo">167</span><a name="line.167"></a> +<span class="sourceLineNo">168</span> // now suspend replication<a name="line.168"></a> +<span class="sourceLineNo">169</span> admin.disablePeer("2");<a name="line.169"></a> +<span class="sourceLineNo">170</span><a name="line.170"></a> +<span class="sourceLineNo">171</span> // put some data (lead with 0 so the edit gets sorted before the other table's edits<a name="line.171"></a> +<span class="sourceLineNo">172</span> // in the replication batch)<a name="line.172"></a> +<span class="sourceLineNo">173</span> // write a bunch of edits, making sure we fill a batch<a name="line.173"></a> +<span class="sourceLineNo">174</span> byte[] rowKey = Bytes.toBytes(0 + " put on table to be dropped");<a name="line.174"></a> +<span class="sourceLineNo">175</span> Put put = new Put(rowKey);<a name="line.175"></a> +<span class="sourceLineNo">176</span> put.addColumn(familyname, row, row);<a name="line.176"></a> +<span class="sourceLineNo">177</span> lHtable1.put(put);<a name="line.177"></a> +<span class="sourceLineNo">178</span><a name="line.178"></a> +<span class="sourceLineNo">179</span> for (int i = 0; i < 1000; i++) {<a name="line.179"></a> +<span class="sourceLineNo">180</span> rowKey = Bytes.toBytes("NormalPut" + i);<a name="line.180"></a> +<span class="sourceLineNo">181</span> put = new Put(rowKey).addColumn(famName, row, row);<a name="line.181"></a> +<span class="sourceLineNo">182</span> htable1.put(put);<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> try (Admin admin1 = connection1.getAdmin()) {<a name="line.185"></a> +<span class="sourceLineNo">186</span> admin1.disableTable(tablename);<a name="line.186"></a> +<span class="sourceLineNo">187</span> admin1.deleteTable(tablename);<a name="line.187"></a> +<span class="sourceLineNo">188</span> }<a name="line.188"></a> +<span class="sourceLineNo">189</span> try (Admin admin2 = connection2.getAdmin()) {<a name="line.189"></a> +<span class="sourceLineNo">190</span> admin2.disableTable(tablename);<a name="line.190"></a> +<span class="sourceLineNo">191</span> admin2.deleteTable(tablename);<a name="line.191"></a> <span class="sourceLineNo">192</span> }<a name="line.192"></a> -<span class="sourceLineNo">193</span> // just to be safe<a name="line.193"></a> -<span class="sourceLineNo">194</span> conf1.setBoolean(HConstants.REPLICATION_DROP_ON_DELETED_TABLE_KEY, false);<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> @Test<a name="line.197"></a> -<span class="sourceLineNo">198</span> public void testEditsBehindDroppedTableTiming() throws Exception {<a name="line.198"></a> -<span class="sourceLineNo">199</span> conf1.setBoolean(HConstants.REPLICATION_DROP_ON_DELETED_TABLE_KEY, true);<a name="line.199"></a> -<span class="sourceLineNo">200</span> conf1.setInt(HConstants.REPLICATION_SOURCE_MAXTHREADS_KEY, 1);<a name="line.200"></a> -<span class="sourceLineNo">201</span><a name="line.201"></a> -<span class="sourceLineNo">202</span> // make sure we have a single region server only, so that all<a name="line.202"></a> -<span class="sourceLineNo">203</span> // edits for all tables go there<a name="line.203"></a> -<span class="sourceLineNo">204</span> utility1.shutdownMiniHBaseCluster();<a name="line.204"></a> -<span class="sourceLineNo">205</span> utility1.startMiniHBaseCluster(1, 1);<a name="line.205"></a> -<span class="sourceLineNo">206</span><a name="line.206"></a> -<span class="sourceLineNo">207</span> TableName tablename = TableName.valueOf("testdroppedtimed");<a name="line.207"></a> -<span class="sourceLineNo">208</span> byte[] familyname = Bytes.toBytes("fam");<a name="line.208"></a> -<span class="sourceLineNo">209</span> byte[] row = Bytes.toBytes("row");<a name="line.209"></a> -<span class="sourceLineNo">210</span><a name="line.210"></a> -<span class="sourceLineNo">211</span> HTableDescriptor table = new HTableDescriptor(tablename);<a name="line.211"></a> -<span class="sourceLineNo">212</span> HColumnDescriptor fam = new HColumnDescriptor(familyname);<a name="line.212"></a> -<span class="sourceLineNo">213</span> fam.setScope(HConstants.REPLICATION_SCOPE_GLOBAL);<a name="line.213"></a> -<span class="sourceLineNo">214</span> table.addFamily(fam);<a name="line.214"></a> -<span class="sourceLineNo">215</span><a name="line.215"></a> -<span class="sourceLineNo">216</span> Connection connection1 = ConnectionFactory.createConnection(conf1);<a name="line.216"></a> -<span class="sourceLineNo">217</span> Connection connection2 = ConnectionFactory.createConnection(conf2);<a name="line.217"></a> -<span class="sourceLineNo">218</span> try (Admin admin1 = connection1.getAdmin()) {<a name="line.218"></a> -<span class="sourceLineNo">219</span> admin1.createTable(table);<a name="line.219"></a> -<span class="sourceLineNo">220</span> }<a name="line.220"></a> -<span class="sourceLineNo">221</span> try (Admin admin2 = connection2.getAdmin()) {<a name="line.221"></a> -<span class="sourceLineNo">222</span> admin2.createTable(table);<a name="line.222"></a> -<span class="sourceLineNo">223</span> }<a name="line.223"></a> -<span class="sourceLineNo">224</span> utility1.waitUntilAllRegionsAssigned(tablename);<a name="line.224"></a> -<span class="sourceLineNo">225</span> utility2.waitUntilAllRegionsAssigned(tablename);<a name="line.225"></a> -<span class="sourceLineNo">226</span><a name="line.226"></a> -<span class="sourceLineNo">227</span> Table lHtable1 = utility1.getConnection().getTable(tablename);<a name="line.227"></a> -<span class="sourceLineNo">228</span><a name="line.228"></a> -<span class="sourceLineNo">229</span> // now suspend replication<a name="line.229"></a> -<span class="sourceLineNo">230</span> admin.disablePeer("2");<a name="line.230"></a> -<span class="sourceLineNo">231</span><a name="line.231"></a> -<span class="sourceLineNo">232</span> // put some data (lead with 0 so the edit gets sorted before the other table's edits<a name="line.232"></a> -<span class="sourceLineNo">233</span> // in the replication batch)<a name="line.233"></a> -<span class="sourceLineNo">234</span> // write a bunch of edits, making sure we fill a batch<a name="line.234"></a> -<span class="sourceLineNo">235</span> byte[] rowkey = Bytes.toBytes(0+" put on table to be dropped");<a name="line.235"></a> -<span class="sourceLineNo">236</span> Put put = new Put(rowkey);<a name="line.236"></a> -<span class="sourceLineNo">237</span> put.addColumn(familyname, row, row);<a name="line.237"></a> -<span class="sourceLineNo">238</span> lHtable1.put(put);<a name="line.238"></a> +<span class="sourceLineNo">193</span><a name="line.193"></a> +<span class="sourceLineNo">194</span> admin.enablePeer("2");<a name="line.194"></a> +<span class="sourceLineNo">195</span> if (allowProceeding) {<a name="line.195"></a> +<span class="sourceLineNo">196</span> // in this we'd expect the key to make it over<a name="line.196"></a> +<span class="sourceLineNo">197</span> verifyReplicationProceeded(rowKey);<a name="line.197"></a> +<span class="sourceLineNo">198</span> } else {<a name="line.198"></a> +<span class="sourceLineNo">199</span> verifyReplicationStuck(rowKey);<a name="line.199"></a> +<span class="sourceLineNo">200</span> }<a name="line.200"></a> +<span class="sourceLineNo">201</span> // just to be safe<a name="line.201"></a> +<span class="sourceLineNo">202</span> conf1.setBoolean(HConstants.REPLICATION_DROP_ON_DELETED_TABLE_KEY, false);<a name="line.202"></a> +<span class="sourceLineNo">203</span> }<a name="line.203"></a> +<span class="sourceLineNo">204</span><a name="line.204"></a> +<span class="sourceLineNo">205</span> @Test<a name="line.205"></a> +<span class="sourceLineNo">206</span> public void testEditsBehindDroppedTableTiming() throws Exception {<a name="line.206"></a> +<span class="sourceLineNo">207</span> conf1.setBoolean(HConstants.REPLICATION_DROP_ON_DELETED_TABLE_KEY, true);<a name="line.207"></a> +<span class="sourceLineNo">208</span> conf1.setInt(HConstants.REPLICATION_SOURCE_MAXTHREADS_KEY, 1);<a name="line.208"></a> +<span class="sourceLineNo">209</span><a name="line.209"></a> +<span class="sourceLineNo">210</span> // make sure we have a single region server only, so that all<a name="line.210"></a> +<span class="sourceLineNo">211</span> // edits for all tables go there<a name="line.211"></a> +<span class="sourceLineNo">212</span> utility1.shutdownMiniHBaseCluster();<a name="line.212"></a> +<span class="sourceLineNo">213</span> utility1.startMiniHBaseCluster(1, 1);<a name="line.213"></a> +<span class="sourceLineNo">214</span><a name="line.214"></a> +<span class="sourceLineNo">215</span> TableName tablename = TableName.valueOf("testdroppedtimed");<a name="line.215"></a> +<span class="sourceLineNo">216</span> byte[] familyname = Bytes.toBytes("fam");<a name="line.216"></a> +<span class="sourceLineNo">217</span> byte[] row = Bytes.toBytes("row");<a name="line.217"></a> +<span class="sourceLineNo">218</span><a name="line.218"></a> +<span class="sourceLineNo">219</span> HTableDescriptor table = new HTableDescriptor(tablename);<a name="line.219"></a> +<span class="sourceLineNo">220</span> HColumnDescriptor fam = new HColumnDescriptor(familyname);<a name="line.220"></a> +<span class="sourceLineNo">221</span> fam.setScope(HConstants.REPLICATION_SCOPE_GLOBAL);<a name="line.221"></a> +<span class="sourceLineNo">222</span> table.addFamily(fam);<a name="line.222"></a> +<span class="sourceLineNo">223</span><a name="line.223"></a> +<span class="sourceLineNo">224</span> Connection connection1 = ConnectionFactory.createConnection(conf1);<a name="line.224"></a> +<span class="sourceLineNo">225</span> Connection connection2 = ConnectionFactory.createConnection(conf2);<a name="line.225"></a> +<span class="sourceLineNo">226</span> try (Admin admin1 = connection1.getAdmin()) {<a name="line.226"></a> +<span class="sourceLineNo">227</span> admin1.createTable(table);<a name="line.227"></a> +<span class="sourceLineNo">228</span> }<a name="line.228"></a> +<span class="sourceLineNo">229</span> try (Admin admin2 = connection2.getAdmin()) {<a name="line.229"></a> +<span class="sourceLineNo">230</span> admin2.createTable(table);<a name="line.230"></a> +<span class="sourceLineNo">231</span> }<a name="line.231"></a> +<span class="sourceLineNo">232</span> utility1.waitUntilAllRegionsAssigned(tablename);<a name="line.232"></a> +<span class="sourceLineNo">233</span> utility2.waitUntilAllRegionsAssigned(tablename);<a name="line.233"></a> +<span class="sourceLineNo">234</span><a name="line.234"></a> +<span class="sourceLineNo">235</span> Table lHtable1 = utility1.getConnection().getTable(tablename);<a name="line.235"></a> +<span class="sourceLineNo">236</span><a name="line.236"></a> +<span class="sourceLineNo">237</span> // now suspend replication<a name="line.237"></a> +<span class="sourceLineNo">238</span> admin.disablePeer("2");<a name="line.238"></a> <span class="sourceLineNo">239</span><a name="line.239"></a> -<span class="sourceLineNo">240</span> rowkey = Bytes.toBytes("normal put");<a name="line.240"></a> -<span class="sourceLineNo">241</span> put = new Put(rowkey);<a name="line.241"></a> -<span class="sourceLineNo">242</span> put.addColumn(famName, row, row);<a name="line.242"></a> -<span class="sourceLineNo">243</span> htable1.put(put);<a name="line.243"></a> -<span class="sourceLineNo">244</span><a name="line.244"></a> -<span class="sourceLineNo">245</span> try (Admin admin2 = connection2.getAdmin()) {<a name="line.245"></a> -<span class="sourceLineNo">246</span> admin2.disableTable(tablename);<a name="line.246"></a> -<span class="sourceLineNo">247</span> admin2.deleteTable(tablename);<a name="line.247"></a> -<span class="sourceLineNo">248</span> }<a name="line.248"></a> -<span class="sourceLineNo">249</span><a name="line.249"></a> -<span class="sourceLineNo">250</span> admin.enablePeer("2");<a name="line.250"></a> -<span class="sourceLineNo">251</span> // edit should still be stuck<a name="line.251"></a> -<span class="sourceLineNo">252</span><a name="line.252"></a> -<span class="sourceLineNo">253</span> try (Admin admin1 = connection1.getAdmin()) {<a name="line.253"></a> -<span class="sourceLineNo">254</span> // the source table still exists, replication should be stalled<a name="line.254"></a> -<span class="sourceLineNo">255</span> verifyReplicationStuck(rowkey);<a name="line.255"></a> -<span class="sourceLineNo">256</span><a name="line.256"></a> -<span class="sourceLineNo">257</span> admin1.disableTable(tablename);<a name="line.257"></a> -<span class="sourceLineNo">258</span> // still stuck, source table still exists<a name="line.258"></a> -<span class="sourceLineNo">259</span> verifyReplicationStuck(rowkey);<a name="line.259"></a> -<span class="sourceLineNo">260</span><a name="line.260"></a> -<span class="sourceLineNo">261</span> admin1.deleteTable(tablename);<a name="line.261"></a> -<span class="sourceLineNo">262</span> // now the source table is gone, replication should proceed, the<a name="line.262"></a> -<span class="sourceLineNo">263</span> // offending edits be dropped<a name="line.263"></a> -<span class="sourceLineNo">264</span> verifyReplicationProceeded(rowkey);<a name="line.264"></a> -<span class="sourceLineNo">265</span> }<a name="line.265"></a> -<span class="sourceLineNo">266</span> // just to be safe<a name="line.266"></a> -<span class="sourceLineNo">267</span> conf1.setBoolean(HConstants.REPLICATION_DROP_ON_DELETED_TABLE_KEY, false);<a name="line.267"></a> -<span class="sourceLineNo">268</span> }<a name="line.268"></a> +<span class="sourceLineNo">240</span> // put some data (lead with 0 so the edit gets sorted before the other table's edits<a name="line.240"></a> +<span class="sourceLineNo">241</span> // in the replication batch)<a name="line.241"></a> +<span class="sourceLineNo">242</span> // write a bunch of edits, making sure we fill a batch<a name="line.242"></a> +<span class="sourceLineNo">243</span> byte[] rowKey = Bytes.toBytes(0 + " put on table to be dropped");<a name="line.243"></a> +<span class="sourceLineNo">244</span> Put put = new Put(rowKey);<a name="line.244"></a> +<span class="sourceLineNo">245</span> put.addColumn(familyname, row, row);<a name="line.245"></a> +<span class="sourceLineNo">246</span> lHtable1.put(put);<a name="line.246"></a> +<span class="sourceLineNo">247</span><a name="line.247"></a> +<span class="sourceLineNo">248</span> for (int i = 0; i < 1000; i++) {<a name="line.248"></a> +<span class="sourceLineNo">249</span> rowKey = Bytes.toBytes("NormalPut" + i);<a name="line.249"></a> +<span class="sourceLineNo">250</span> put = new Put(rowKey).addColumn(famName, row, row);<a name="line.250"></a> +<span class="sourceLineNo">251</span> htable1.put(put);<a name="line.251"></a> +<span class="sourceLineNo">252</span> }<a name="line.252"></a> +<span class="sourceLineNo">253</span><a name="line.253"></a> +<span class="sourceLineNo">254</span> try (Admin admin2 = connection2.getAdmin()) {<a name="line.254"></a> +<span class="sourceLineNo">255</span> admin2.disableTable(tablename);<a name="line.255"></a> +<span class="sourceLineNo">256</span> admin2.deleteTable(tablename);<a name="line.256"></a> +<span class="sourceLineNo">257</span> }<a name="line.257"></a> +<span class="sourceLineNo">258</span><a name="line.258"></a> +<span class="sourceLineNo">259</span> admin.enablePeer("2");<a name="line.259"></a> +<span class="sourceLineNo">260</span> // edit should still be stuck<a name="line.260"></a> +<span class="sourceLineNo">261</span><a name="line.261"></a> +<span class="sourceLineNo">262</span> try (Admin admin1 = connection1.getAdmin()) {<a name="line.262"></a> +<span class="sourceLineNo">263</span> // the source table still exists, replication should be stalled<a name="line.263"></a> +<span class="sourceLineNo">264</span> verifyReplicationStuck(rowKey);<a name="line.264"></a> +<span class="sourceLineNo">265</span><a name="line.265"></a> +<span class="sourceLineNo">266</span> admin1.disableTable(tablename);<a name="line.266"></a> +<span class="sourceLineNo">267</span> // still stuck, source table still exists<a name="line.267"></a> +<span class="sourceLineNo">268</span> verifyReplicationStuck(rowKey);<a name="line.268"></a> <span class="sourceLineNo">269</span><a name="line.269"></a> -<span class="sourceLineNo">270</span> private void verifyReplicationProceeded(byte[] rowkey) throws Exception {<a name="line.270"></a> -<span class="sourceLineNo">271</span> Get get = new Get(rowkey);<a name="line.271"></a> -<span class="sourceLineNo">272</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.272"></a> -<span class="sourceLineNo">273</span> if (i==NB_RETRIES-1) {<a name="line.273"></a> -<span class="sourceLineNo">274</span> fail("Waited too much time for put replication");<a name="line.274"></a> -<span class="sourceLineNo">275</span> }<a name="line.275"></a> -<span class="sourceLineNo">276</span> Result res = htable2.get(get);<a name="line.276"></a> -<span class="sourceLineNo">277</span> if (res.size() == 0) {<a name="line.277"></a> -<span class="sourceLineNo">278</span> LOG.info("Row not available");<a name="line.278"></a> -<span class="sourceLineNo">279</span> Thread.sleep(SLEEP_TIME);<a name="line.279"></a> -<span class="sourceLineNo">280</span> } else {<a name="line.280"></a> -<span class="sourceLineNo">281</span> assertArrayEquals(res.getRow(), rowkey);<a name="line.281"></a> -<span class="sourceLineNo">282</span> break;<a name="line.282"></a> -<span class="sourceLineNo">283</span> }<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><a name="line.286"></a> -<span class="sourceLineNo">287</span> private void verifyReplicationStuck(byte[] rowkey) throws Exception {<a name="line.287"></a> -<span class="sourceLineNo">288</span> Get get = new Get(rowkey);<a name="line.288"></a> -<span class="sourceLineNo">289</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.289"></a> -<span class="sourceLineNo">290</span> Result res = htable2.get(get);<a name="line.290"></a> -<span class="sourceLineNo">291</span> if (res.size() >= 1) {<a name="line.291"></a> -<span class="sourceLineNo">292</span> fail("Edit should have been stuck behind dropped tables");<a name="line.292"></a> -<span class="sourceLineNo">293</span> } else {<a name="line.293"></a> -<span class="sourceLineNo">294</span> LOG.info("Row not replicated, let's wait a bit more...");<a name="line.294"></a> -<span class="sourceLineNo">295</span> Thread.sleep(SLEEP_TIME);<a name="line.295"></a> -<span class="sourceLineNo">296</span> }<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">270</span> admin1.deleteTable(tablename);<a name="line.270"></a> +<span class="sourceLineNo">271</span> // now the source table is gone, replication should proceed, the<a name="line.271"></a> +<span class="sourceLineNo">272</span> // offending edits be dropped<a name="line.272"></a> +<span class="sourceLineNo">273</span> verifyReplicationProceeded(rowKey);<a name="line.273"></a> +<span class="sourceLineNo">274</span> }<a name="line.274"></a> +<span class="sourceLineNo">275</span> // just to be safe<a name="line.275"></a> +<span class="sourceLineNo">276</span> conf1.setBoolean(HConstants.REPLICATION_DROP_ON_DELETED_TABLE_KEY, false);<a name="line.276"></a> +<span class="sourceLineNo">277</span> }<a name="line.277"></a> +<span class="sourceLineNo">278</span><a name="line.278"></a> +<span class="sourceLineNo">279</span> private void verifyReplicationProceeded(byte[] rowkey) throws Exception {<a name="line.279"></a> +<span class="sourceLineNo">280</span> Get get = new Get(rowkey);<a name="line.280"></a> +<span class="sourceLineNo">281</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.281"></a> +<span class="sourceLineNo">282</span> if (i==NB_RETRIES-1) {<a name="line.282"></a> +<span class="sourceLineNo">283</span> fail("Waited too much time for put replication");<a name="line.283"></a> +<span class="sourceLineNo">284</span> }<a name="line.284"></a> +<span class="sourceLineNo">285</span> Result res = htable2.get(get);<a name="line.285"></a> +<span class="sourceLineNo">286</span> if (res.size() == 0) {<a name="line.286"></a> +<span class="sourceLineNo">287</span> LOG.info("Row not available");<a name="line.287"></a> +<span class="sourceLineNo">288</span> Thread.sleep(SLEEP_TIME);<a name="line.288"></a> +<span class="sourceLineNo">289</span> } else {<a name="line.289"></a> +<span class="sourceLineNo">290</span> assertArrayEquals(res.getRow(), rowkey);<a name="line.290"></a> +<span class="sourceLineNo">291</span> break;<a name="line.291"></a> +<span class="sourceLineNo">292</span> }<a name="line.292"></a> +<span class="sourceLineNo">293</span> }<a name="line.293"></a> +<span class="sourceLineNo">294</span> }<a name="line.294"></a> +<span class="sourceLineNo">295</span><a name="line.295"></a> +<span class="sourceLineNo">296</span> private void verifyReplicationStuck(byte[] rowkey) throws Exception {<a name="line.296"></a> +<span class="sourceLineNo">297</span> Get get = new Get(rowkey);<a name="line.297"></a> +<span class="sourceLineNo">298</span> for (int i = 0; i < NB_RETRIES; i++) {<a name="line.298"></a> +<span class="sourceLineNo">299</span> Result res = htable2.get(get);<a name="line.299"></a> +<span class="sourceLineNo">300</span> if (res.size() >= 1) {<a name="line.300"></a> +<span class="sourceLineNo">301</span> fail("Edit should have been stuck behind dropped tables");<a name="line.301"></a> +<span class="sourceLineNo">302</span> } else {<a name="line.302"></a> +<span class="sourceLineNo">303</span> LOG.info("Row not replicated, let's wait a bit more...");<a name="line.303"></a> +<span class="sourceLineNo">304</span> Thread.sleep(SLEEP_TIME);<a name="line.304"></a> +<span class="sourceLineNo">305</span> }<a name="line.305"></a> +<span class="sourceLineNo">306</span> }<a name="line.306"></a> +<span class="sourceLineNo">307</span> }<a name="line.307"></a> +<span class="sourceLineNo">308</span>}<a name="line.308"></a>
