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/03/19 14:53:42 UTC
[02/26] hbase-site git commit: Published site at
67f013430c9ba051385c45d72ee680c44eb88470.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/fd35fe02/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html
index 630446b..61c78d6 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/replication/regionserver/TestWALEntryStream.PathWatcher.html
@@ -50,424 +50,522 @@
<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.Server;<a name="line.43"></a>
<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.TableName;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.client.RegionInfoBuilder;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.regionserver.MultiVersionConcurrencyControl;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.regionserver.wal.WALActionsListener;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.replication.WALEntryFilter;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.testclassification.ReplicationTests;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.wal.WAL;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.wal.WAL.Entry;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.wal.WALEdit;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.wal.WALFactory;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.wal.WALKeyImpl;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.apache.hadoop.hdfs.MiniDFSCluster;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.junit.After;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>import org.junit.AfterClass;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>import org.junit.Before;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>import org.junit.BeforeClass;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>import org.junit.ClassRule;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>import org.junit.Rule;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>import org.junit.Test;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>import org.junit.experimental.categories.Category;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>import org.junit.rules.TestName;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>import org.mockito.Mockito;<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>@Category({ ReplicationTests.class, LargeTests.class })<a name="line.70"></a>
-<span class="sourceLineNo">071</span>public class TestWALEntryStream {<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span> @ClassRule<a name="line.73"></a>
-<span class="sourceLineNo">074</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.74"></a>
-<span class="sourceLineNo">075</span> HBaseClassTestRule.forClass(TestWALEntryStream.class);<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span> private static HBaseTestingUtility TEST_UTIL;<a name="line.77"></a>
-<span class="sourceLineNo">078</span> private static Configuration conf;<a name="line.78"></a>
-<span class="sourceLineNo">079</span> private static FileSystem fs;<a name="line.79"></a>
-<span class="sourceLineNo">080</span> private static MiniDFSCluster cluster;<a name="line.80"></a>
-<span class="sourceLineNo">081</span> private static final TableName tableName = TableName.valueOf("tablename");<a name="line.81"></a>
-<span class="sourceLineNo">082</span> private static final byte[] family = Bytes.toBytes("column");<a name="line.82"></a>
-<span class="sourceLineNo">083</span> private static final byte[] qualifier = Bytes.toBytes("qualifier");<a name="line.83"></a>
-<span class="sourceLineNo">084</span> private static final RegionInfo info = RegionInfoBuilder.newBuilder(tableName)<a name="line.84"></a>
-<span class="sourceLineNo">085</span> .setStartKey(HConstants.EMPTY_START_ROW).setEndKey(HConstants.LAST_ROW).build();<a name="line.85"></a>
-<span class="sourceLineNo">086</span> private static final NavigableMap<byte[], Integer> scopes = getScopes();<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span> private static NavigableMap<byte[], Integer> getScopes() {<a name="line.88"></a>
-<span class="sourceLineNo">089</span> NavigableMap<byte[], Integer> scopes = new TreeMap<>(Bytes.BYTES_COMPARATOR);<a name="line.89"></a>
-<span class="sourceLineNo">090</span> scopes.put(family, 1);<a name="line.90"></a>
-<span class="sourceLineNo">091</span> return scopes;<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> private WAL log;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> PriorityBlockingQueue<Path> walQueue;<a name="line.95"></a>
-<span class="sourceLineNo">096</span> private PathWatcher pathWatcher;<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 tn = new TestName();<a name="line.99"></a>
-<span class="sourceLineNo">100</span> private final MultiVersionConcurrencyControl mvcc = new MultiVersionConcurrencyControl();<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span> @BeforeClass<a name="line.102"></a>
-<span class="sourceLineNo">103</span> public static void setUpBeforeClass() throws Exception {<a name="line.103"></a>
-<span class="sourceLineNo">104</span> TEST_UTIL = new HBaseTestingUtility();<a name="line.104"></a>
-<span class="sourceLineNo">105</span> conf = TEST_UTIL.getConfiguration();<a name="line.105"></a>
-<span class="sourceLineNo">106</span> TEST_UTIL.startMiniDFSCluster(3);<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span> cluster = TEST_UTIL.getDFSCluster();<a name="line.108"></a>
-<span class="sourceLineNo">109</span> fs = cluster.getFileSystem();<a name="line.109"></a>
-<span class="sourceLineNo">110</span> }<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span> @AfterClass<a name="line.112"></a>
-<span class="sourceLineNo">113</span> public static void tearDownAfterClass() throws Exception {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> TEST_UTIL.shutdownMiniCluster();<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> @Before<a name="line.117"></a>
-<span class="sourceLineNo">118</span> public void setUp() throws Exception {<a name="line.118"></a>
-<span class="sourceLineNo">119</span> walQueue = new PriorityBlockingQueue<>();<a name="line.119"></a>
-<span class="sourceLineNo">120</span> pathWatcher = new PathWatcher();<a name="line.120"></a>
-<span class="sourceLineNo">121</span> final WALFactory wals = new WALFactory(conf, tn.getMethodName());<a name="line.121"></a>
-<span class="sourceLineNo">122</span> wals.getWALProvider().addWALActionsListener(pathWatcher);<a name="line.122"></a>
-<span class="sourceLineNo">123</span> log = wals.getWAL(info);<a name="line.123"></a>
-<span class="sourceLineNo">124</span> }<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span> @After<a name="line.126"></a>
-<span class="sourceLineNo">127</span> public void tearDown() throws Exception {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> log.close();<a name="line.128"></a>
-<span class="sourceLineNo">129</span> }<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span> // Try out different combinations of row count and KeyValue count<a name="line.131"></a>
-<span class="sourceLineNo">132</span> @Test<a name="line.132"></a>
-<span class="sourceLineNo">133</span> public void testDifferentCounts() throws Exception {<a name="line.133"></a>
-<span class="sourceLineNo">134</span> int[] NB_ROWS = { 1500, 60000 };<a name="line.134"></a>
-<span class="sourceLineNo">135</span> int[] NB_KVS = { 1, 100 };<a name="line.135"></a>
-<span class="sourceLineNo">136</span> // whether compression is used<a name="line.136"></a>
-<span class="sourceLineNo">137</span> Boolean[] BOOL_VALS = { false, true };<a name="line.137"></a>
-<span class="sourceLineNo">138</span> // long lastPosition = 0;<a name="line.138"></a>
-<span class="sourceLineNo">139</span> for (int nbRows : NB_ROWS) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span> for (int walEditKVs : NB_KVS) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span> for (boolean isCompressionEnabled : BOOL_VALS) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> TEST_UTIL.getConfiguration().setBoolean(HConstants.ENABLE_WAL_COMPRESSION,<a name="line.142"></a>
-<span class="sourceLineNo">143</span> isCompressionEnabled);<a name="line.143"></a>
-<span class="sourceLineNo">144</span> mvcc.advanceTo(1);<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span> for (int i = 0; i < nbRows; i++) {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> appendToLogPlus(walEditKVs);<a name="line.147"></a>
-<span class="sourceLineNo">148</span> }<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span> log.rollWriter();<a name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span> try (WALEntryStream entryStream =<a name="line.152"></a>
-<span class="sourceLineNo">153</span> new WALEntryStream(walQueue, fs, conf, 0, log, null, new MetricsSource("1"))) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span> int i = 0;<a name="line.154"></a>
-<span class="sourceLineNo">155</span> while (entryStream.hasNext()) {<a name="line.155"></a>
-<span class="sourceLineNo">156</span> assertNotNull(entryStream.next());<a name="line.156"></a>
-<span class="sourceLineNo">157</span> i++;<a name="line.157"></a>
-<span class="sourceLineNo">158</span> }<a name="line.158"></a>
-<span class="sourceLineNo">159</span> assertEquals(nbRows, i);<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span> // should've read all entries<a name="line.161"></a>
-<span class="sourceLineNo">162</span> assertFalse(entryStream.hasNext());<a name="line.162"></a>
-<span class="sourceLineNo">163</span> }<a name="line.163"></a>
-<span class="sourceLineNo">164</span> // reset everything for next loop<a name="line.164"></a>
-<span class="sourceLineNo">165</span> log.close();<a name="line.165"></a>
-<span class="sourceLineNo">166</span> setUp();<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> }<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span> /**<a name="line.172"></a>
-<span class="sourceLineNo">173</span> * Tests basic reading of log appends<a name="line.173"></a>
-<span class="sourceLineNo">174</span> */<a name="line.174"></a>
-<span class="sourceLineNo">175</span> @Test<a name="line.175"></a>
-<span class="sourceLineNo">176</span> public void testAppendsWithRolls() throws Exception {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> appendToLog();<a name="line.177"></a>
-<span class="sourceLineNo">178</span> long oldPos;<a name="line.178"></a>
-<span class="sourceLineNo">179</span> try (WALEntryStream entryStream =<a name="line.179"></a>
-<span class="sourceLineNo">180</span> new WALEntryStream(walQueue, fs, conf, 0, log, null, new MetricsSource("1"))) {<a name="line.180"></a>
-<span class="sourceLineNo">181</span> // There's one edit in the log, read it. Reading past it needs to throw exception<a name="line.181"></a>
-<span class="sourceLineNo">182</span> assertTrue(entryStream.hasNext());<a name="line.182"></a>
-<span class="sourceLineNo">183</span> WAL.Entry entry = entryStream.peek();<a name="line.183"></a>
-<span class="sourceLineNo">184</span> assertSame(entry, entryStream.next());<a name="line.184"></a>
-<span class="sourceLineNo">185</span> assertNotNull(entry);<a name="line.185"></a>
-<span class="sourceLineNo">186</span> assertFalse(entryStream.hasNext());<a name="line.186"></a>
-<span class="sourceLineNo">187</span> assertNull(entryStream.peek());<a name="line.187"></a>
-<span class="sourceLineNo">188</span> assertNull(entryStream.next());<a name="line.188"></a>
-<span class="sourceLineNo">189</span> oldPos = entryStream.getPosition();<a name="line.189"></a>
-<span class="sourceLineNo">190</span> }<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span> appendToLog();<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span> try (WALEntryStream entryStream = new WALEntryStream(walQueue, fs, conf, oldPos,<a name="line.194"></a>
-<span class="sourceLineNo">195</span> log, null, new MetricsSource("1"))) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span> // Read the newly added entry, make sure we made progress<a name="line.196"></a>
-<span class="sourceLineNo">197</span> WAL.Entry entry = entryStream.next();<a name="line.197"></a>
-<span class="sourceLineNo">198</span> assertNotEquals(oldPos, entryStream.getPosition());<a name="line.198"></a>
-<span class="sourceLineNo">199</span> assertNotNull(entry);<a name="line.199"></a>
-<span class="sourceLineNo">200</span> oldPos = entryStream.getPosition();<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> // We rolled but we still should see the end of the first log and get that item<a name="line.203"></a>
-<span class="sourceLineNo">204</span> appendToLog();<a name="line.204"></a>
-<span class="sourceLineNo">205</span> log.rollWriter();<a name="line.205"></a>
-<span class="sourceLineNo">206</span> appendToLog();<a name="line.206"></a>
-<span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span> try (WALEntryStream entryStream = new WALEntryStream(walQueue, fs, conf, oldPos,<a name="line.208"></a>
-<span class="sourceLineNo">209</span> log, null, new MetricsSource("1"))) {<a name="line.209"></a>
-<span class="sourceLineNo">210</span> WAL.Entry entry = entryStream.next();<a name="line.210"></a>
-<span class="sourceLineNo">211</span> assertNotEquals(oldPos, entryStream.getPosition());<a name="line.211"></a>
-<span class="sourceLineNo">212</span> assertNotNull(entry);<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span> // next item should come from the new log<a name="line.214"></a>
-<span class="sourceLineNo">215</span> entry = entryStream.next();<a name="line.215"></a>
-<span class="sourceLineNo">216</span> assertNotEquals(oldPos, entryStream.getPosition());<a name="line.216"></a>
-<span class="sourceLineNo">217</span> assertNotNull(entry);<a name="line.217"></a>
-<span class="sourceLineNo">218</span><a name="line.218"></a>
-<span class="sourceLineNo">219</span> // no more entries to read<a name="line.219"></a>
-<span class="sourceLineNo">220</span> assertFalse(entryStream.hasNext());<a name="line.220"></a>
-<span class="sourceLineNo">221</span> oldPos = entryStream.getPosition();<a name="line.221"></a>
-<span class="sourceLineNo">222</span> }<a name="line.222"></a>
-<span class="sourceLineNo">223</span> }<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> /**<a name="line.225"></a>
-<span class="sourceLineNo">226</span> * Tests that if after a stream is opened, more entries come in and then the log is rolled, we<a name="line.226"></a>
-<span class="sourceLineNo">227</span> * don't mistakenly dequeue the current log thinking we're done with it<a name="line.227"></a>
-<span class="sourceLineNo">228</span> */<a name="line.228"></a>
-<span class="sourceLineNo">229</span> @Test<a name="line.229"></a>
-<span class="sourceLineNo">230</span> public void testLogrollWhileStreaming() throws Exception {<a name="line.230"></a>
-<span class="sourceLineNo">231</span> appendToLog("1");<a name="line.231"></a>
-<span class="sourceLineNo">232</span> appendToLog("2");// 2<a name="line.232"></a>
-<span class="sourceLineNo">233</span> try (WALEntryStream entryStream =<a name="line.233"></a>
-<span class="sourceLineNo">234</span> new WALEntryStream(walQueue, fs, conf, 0, log, null, new MetricsSource("1"))) {<a name="line.234"></a>
-<span class="sourceLineNo">235</span> assertEquals("1", getRow(entryStream.next()));<a name="line.235"></a>
-<span class="sourceLineNo">236</span><a name="line.236"></a>
-<span class="sourceLineNo">237</span> appendToLog("3"); // 3 - comes in after reader opened<a name="line.237"></a>
-<span class="sourceLineNo">238</span> log.rollWriter(); // log roll happening while we're reading<a name="line.238"></a>
-<span class="sourceLineNo">239</span> appendToLog("4"); // 4 - this append is in the rolled log<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span> assertEquals("2", getRow(entryStream.next()));<a name="line.241"></a>
-<span class="sourceLineNo">242</span> assertEquals(2, walQueue.size()); // we should not have dequeued yet since there's still an<a name="line.242"></a>
-<span class="sourceLineNo">243</span> // entry in first log<a name="line.243"></a>
-<span class="sourceLineNo">244</span> assertEquals("3", getRow(entryStream.next())); // if implemented improperly, this would be 4<a name="line.244"></a>
-<span class="sourceLineNo">245</span> // and 3 would be skipped<a name="line.245"></a>
-<span class="sourceLineNo">246</span> assertEquals("4", getRow(entryStream.next())); // 4<a name="line.246"></a>
-<span class="sourceLineNo">247</span> assertEquals(1, walQueue.size()); // now we've dequeued and moved on to next log properly<a name="line.247"></a>
-<span class="sourceLineNo">248</span> assertFalse(entryStream.hasNext());<a name="line.248"></a>
-<span class="sourceLineNo">249</span> }<a name="line.249"></a>
-<span class="sourceLineNo">250</span> }<a name="line.250"></a>
-<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span> /**<a name="line.252"></a>
-<span class="sourceLineNo">253</span> * Tests that if writes come in while we have a stream open, we shouldn't miss them<a name="line.253"></a>
-<span class="sourceLineNo">254</span> */<a name="line.254"></a>
-<span class="sourceLineNo">255</span> @Test<a name="line.255"></a>
-<span class="sourceLineNo">256</span> public void testNewEntriesWhileStreaming() throws Exception {<a name="line.256"></a>
-<span class="sourceLineNo">257</span> appendToLog("1");<a name="line.257"></a>
-<span class="sourceLineNo">258</span> try (WALEntryStream entryStream =<a name="line.258"></a>
-<span class="sourceLineNo">259</span> new WALEntryStream(walQueue, fs, conf, 0, log, null, new MetricsSource("1"))) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> entryStream.next(); // we've hit the end of the stream at this point<a name="line.260"></a>
-<span class="sourceLineNo">261</span><a name="line.261"></a>
-<span class="sourceLineNo">262</span> // some new entries come in while we're streaming<a name="line.262"></a>
-<span class="sourceLineNo">263</span> appendToLog("2");<a name="line.263"></a>
-<span class="sourceLineNo">264</span> appendToLog("3");<a name="line.264"></a>
-<span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span> // don't see them<a name="line.266"></a>
-<span class="sourceLineNo">267</span> assertFalse(entryStream.hasNext());<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span> // But we do if we reset<a name="line.269"></a>
-<span class="sourceLineNo">270</span> entryStream.reset();<a name="line.270"></a>
-<span class="sourceLineNo">271</span> assertEquals("2", getRow(entryStream.next()));<a name="line.271"></a>
-<span class="sourceLineNo">272</span> assertEquals("3", getRow(entryStream.next()));<a name="line.272"></a>
-<span class="sourceLineNo">273</span> assertFalse(entryStream.hasNext());<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><a name="line.276"></a>
-<span class="sourceLineNo">277</span> @Test<a name="line.277"></a>
-<span class="sourceLineNo">278</span> public void testResumeStreamingFromPosition() throws Exception {<a name="line.278"></a>
-<span class="sourceLineNo">279</span> long lastPosition = 0;<a name="line.279"></a>
-<span class="sourceLineNo">280</span> appendToLog("1");<a name="line.280"></a>
-<span class="sourceLineNo">281</span> try (WALEntryStream entryStream =<a name="line.281"></a>
-<span class="sourceLineNo">282</span> new WALEntryStream(walQueue, fs, conf, 0, log, null, new MetricsSource("1"))) {<a name="line.282"></a>
-<span class="sourceLineNo">283</span> entryStream.next(); // we've hit the end of the stream at this point<a name="line.283"></a>
-<span class="sourceLineNo">284</span> appendToLog("2");<a name="line.284"></a>
-<span class="sourceLineNo">285</span> appendToLog("3");<a name="line.285"></a>
-<span class="sourceLineNo">286</span> lastPosition = entryStream.getPosition();<a name="line.286"></a>
-<span class="sourceLineNo">287</span> }<a name="line.287"></a>
-<span class="sourceLineNo">288</span> // next stream should picks up where we left off<a name="line.288"></a>
-<span class="sourceLineNo">289</span> try (WALEntryStream entryStream =<a name="line.289"></a>
-<span class="sourceLineNo">290</span> new WALEntryStream(walQueue, fs, conf, lastPosition, log, null, new MetricsSource("1"))) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span> assertEquals("2", getRow(entryStream.next()));<a name="line.291"></a>
-<span class="sourceLineNo">292</span> assertEquals("3", getRow(entryStream.next()));<a name="line.292"></a>
-<span class="sourceLineNo">293</span> assertFalse(entryStream.hasNext()); // done<a name="line.293"></a>
-<span class="sourceLineNo">294</span> assertEquals(1, walQueue.size());<a name="line.294"></a>
-<span class="sourceLineNo">295</span> }<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> * Tests that if we stop before hitting the end of a stream, we can continue where we left off<a name="line.299"></a>
-<span class="sourceLineNo">300</span> * using the last position<a name="line.300"></a>
-<span class="sourceLineNo">301</span> */<a name="line.301"></a>
-<span class="sourceLineNo">302</span> @Test<a name="line.302"></a>
-<span class="sourceLineNo">303</span> public void testPosition() throws Exception {<a name="line.303"></a>
-<span class="sourceLineNo">304</span> long lastPosition = 0;<a name="line.304"></a>
-<span class="sourceLineNo">305</span> appendEntriesToLog(3);<a name="line.305"></a>
-<span class="sourceLineNo">306</span> // read only one element<a name="line.306"></a>
-<span class="sourceLineNo">307</span> try (WALEntryStream entryStream = new WALEntryStream(walQueue, fs, conf, lastPosition,<a name="line.307"></a>
-<span class="sourceLineNo">308</span> log, null, new MetricsSource("1"))) {<a name="line.308"></a>
-<span class="sourceLineNo">309</span> entryStream.next();<a name="line.309"></a>
-<span class="sourceLineNo">310</span> lastPosition = entryStream.getPosition();<a name="line.310"></a>
-<span class="sourceLineNo">311</span> }<a name="line.311"></a>
-<span class="sourceLineNo">312</span> // there should still be two more entries from where we left off<a name="line.312"></a>
-<span class="sourceLineNo">313</span> try (WALEntryStream entryStream =<a name="line.313"></a>
-<span class="sourceLineNo">314</span> new WALEntryStream(walQueue, fs, conf, lastPosition, log, null, new MetricsSource("1"))) {<a name="line.314"></a>
-<span class="sourceLineNo">315</span> assertNotNull(entryStream.next());<a name="line.315"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.Waiter.ExplainingPredicate;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.client.RegionInfoBuilder;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.regionserver.MultiVersionConcurrencyControl;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.regionserver.wal.WALActionsListener;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.replication.WALEntryFilter;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.hbase.testclassification.ReplicationTests;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.hbase.wal.WAL;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.hbase.wal.WAL.Entry;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.wal.WALEdit;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.wal.WALFactory;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.wal.WALKeyImpl;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.hadoop.hdfs.MiniDFSCluster;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.junit.After;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.junit.AfterClass;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import org.junit.Before;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import org.junit.BeforeClass;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>import org.junit.ClassRule;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>import org.junit.Rule;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>import org.junit.Test;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>import org.junit.experimental.categories.Category;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>import org.junit.rules.TestName;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>import org.mockito.Mockito;<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>@Category({ ReplicationTests.class, LargeTests.class })<a name="line.71"></a>
+<span class="sourceLineNo">072</span>public class TestWALEntryStream {<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span> @ClassRule<a name="line.74"></a>
+<span class="sourceLineNo">075</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.75"></a>
+<span class="sourceLineNo">076</span> HBaseClassTestRule.forClass(TestWALEntryStream.class);<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span> private static HBaseTestingUtility TEST_UTIL;<a name="line.78"></a>
+<span class="sourceLineNo">079</span> private static Configuration CONF;<a name="line.79"></a>
+<span class="sourceLineNo">080</span> private static FileSystem fs;<a name="line.80"></a>
+<span class="sourceLineNo">081</span> private static MiniDFSCluster cluster;<a name="line.81"></a>
+<span class="sourceLineNo">082</span> private static final TableName tableName = TableName.valueOf("tablename");<a name="line.82"></a>
+<span class="sourceLineNo">083</span> private static final byte[] family = Bytes.toBytes("column");<a name="line.83"></a>
+<span class="sourceLineNo">084</span> private static final byte[] qualifier = Bytes.toBytes("qualifier");<a name="line.84"></a>
+<span class="sourceLineNo">085</span> private static final RegionInfo info = RegionInfoBuilder.newBuilder(tableName)<a name="line.85"></a>
+<span class="sourceLineNo">086</span> .setStartKey(HConstants.EMPTY_START_ROW).setEndKey(HConstants.LAST_ROW).build();<a name="line.86"></a>
+<span class="sourceLineNo">087</span> private static final NavigableMap<byte[], Integer> scopes = getScopes();<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span> private static NavigableMap<byte[], Integer> getScopes() {<a name="line.89"></a>
+<span class="sourceLineNo">090</span> NavigableMap<byte[], Integer> scopes = new TreeMap<>(Bytes.BYTES_COMPARATOR);<a name="line.90"></a>
+<span class="sourceLineNo">091</span> scopes.put(family, 1);<a name="line.91"></a>
+<span class="sourceLineNo">092</span> return scopes;<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> private WAL log;<a name="line.95"></a>
+<span class="sourceLineNo">096</span> PriorityBlockingQueue<Path> walQueue;<a name="line.96"></a>
+<span class="sourceLineNo">097</span> private PathWatcher pathWatcher;<a name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span> @Rule<a name="line.99"></a>
+<span class="sourceLineNo">100</span> public TestName tn = new TestName();<a name="line.100"></a>
+<span class="sourceLineNo">101</span> private final MultiVersionConcurrencyControl mvcc = new MultiVersionConcurrencyControl();<a name="line.101"></a>
+<span class="sourceLineNo">102</span><a name="line.102"></a>
+<span class="sourceLineNo">103</span> @BeforeClass<a name="line.103"></a>
+<span class="sourceLineNo">104</span> public static void setUpBeforeClass() throws Exception {<a name="line.104"></a>
+<span class="sourceLineNo">105</span> TEST_UTIL = new HBaseTestingUtility();<a name="line.105"></a>
+<span class="sourceLineNo">106</span> CONF = TEST_UTIL.getConfiguration();<a name="line.106"></a>
+<span class="sourceLineNo">107</span> TEST_UTIL.startMiniDFSCluster(3);<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span> cluster = TEST_UTIL.getDFSCluster();<a name="line.109"></a>
+<span class="sourceLineNo">110</span> fs = cluster.getFileSystem();<a name="line.110"></a>
+<span class="sourceLineNo">111</span> }<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span> @AfterClass<a name="line.113"></a>
+<span class="sourceLineNo">114</span> public static void tearDownAfterClass() throws Exception {<a name="line.114"></a>
+<span class="sourceLineNo">115</span> TEST_UTIL.shutdownMiniCluster();<a name="line.115"></a>
+<span class="sourceLineNo">116</span> }<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span> @Before<a name="line.118"></a>
+<span class="sourceLineNo">119</span> public void setUp() throws Exception {<a name="line.119"></a>
+<span class="sourceLineNo">120</span> walQueue = new PriorityBlockingQueue<>();<a name="line.120"></a>
+<span class="sourceLineNo">121</span> pathWatcher = new PathWatcher();<a name="line.121"></a>
+<span class="sourceLineNo">122</span> final WALFactory wals = new WALFactory(CONF, tn.getMethodName());<a name="line.122"></a>
+<span class="sourceLineNo">123</span> wals.getWALProvider().addWALActionsListener(pathWatcher);<a name="line.123"></a>
+<span class="sourceLineNo">124</span> log = wals.getWAL(info);<a name="line.124"></a>
+<span class="sourceLineNo">125</span> }<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span> @After<a name="line.127"></a>
+<span class="sourceLineNo">128</span> public void tearDown() throws Exception {<a name="line.128"></a>
+<span class="sourceLineNo">129</span> log.close();<a name="line.129"></a>
+<span class="sourceLineNo">130</span> }<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span> // Try out different combinations of row count and KeyValue count<a name="line.132"></a>
+<span class="sourceLineNo">133</span> @Test<a name="line.133"></a>
+<span class="sourceLineNo">134</span> public void testDifferentCounts() throws Exception {<a name="line.134"></a>
+<span class="sourceLineNo">135</span> int[] NB_ROWS = { 1500, 60000 };<a name="line.135"></a>
+<span class="sourceLineNo">136</span> int[] NB_KVS = { 1, 100 };<a name="line.136"></a>
+<span class="sourceLineNo">137</span> // whether compression is used<a name="line.137"></a>
+<span class="sourceLineNo">138</span> Boolean[] BOOL_VALS = { false, true };<a name="line.138"></a>
+<span class="sourceLineNo">139</span> // long lastPosition = 0;<a name="line.139"></a>
+<span class="sourceLineNo">140</span> for (int nbRows : NB_ROWS) {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> for (int walEditKVs : NB_KVS) {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> for (boolean isCompressionEnabled : BOOL_VALS) {<a name="line.142"></a>
+<span class="sourceLineNo">143</span> TEST_UTIL.getConfiguration().setBoolean(HConstants.ENABLE_WAL_COMPRESSION,<a name="line.143"></a>
+<span class="sourceLineNo">144</span> isCompressionEnabled);<a name="line.144"></a>
+<span class="sourceLineNo">145</span> mvcc.advanceTo(1);<a name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span> for (int i = 0; i < nbRows; i++) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> appendToLogAndSync(walEditKVs);<a name="line.148"></a>
+<span class="sourceLineNo">149</span> }<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span> log.rollWriter();<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span> try (WALEntryStream entryStream =<a name="line.153"></a>
+<span class="sourceLineNo">154</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> int i = 0;<a name="line.155"></a>
+<span class="sourceLineNo">156</span> while (entryStream.hasNext()) {<a name="line.156"></a>
+<span class="sourceLineNo">157</span> assertNotNull(entryStream.next());<a name="line.157"></a>
+<span class="sourceLineNo">158</span> i++;<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span> assertEquals(nbRows, i);<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span> // should've read all entries<a name="line.162"></a>
+<span class="sourceLineNo">163</span> assertFalse(entryStream.hasNext());<a name="line.163"></a>
+<span class="sourceLineNo">164</span> }<a name="line.164"></a>
+<span class="sourceLineNo">165</span> // reset everything for next loop<a name="line.165"></a>
+<span class="sourceLineNo">166</span> log.close();<a name="line.166"></a>
+<span class="sourceLineNo">167</span> setUp();<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> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span> }<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span> /**<a name="line.173"></a>
+<span class="sourceLineNo">174</span> * Tests basic reading of log appends<a name="line.174"></a>
+<span class="sourceLineNo">175</span> */<a name="line.175"></a>
+<span class="sourceLineNo">176</span> @Test<a name="line.176"></a>
+<span class="sourceLineNo">177</span> public void testAppendsWithRolls() throws Exception {<a name="line.177"></a>
+<span class="sourceLineNo">178</span> appendToLogAndSync();<a name="line.178"></a>
+<span class="sourceLineNo">179</span> long oldPos;<a name="line.179"></a>
+<span class="sourceLineNo">180</span> try (WALEntryStream entryStream =<a name="line.180"></a>
+<span class="sourceLineNo">181</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> // There's one edit in the log, read it. Reading past it needs to throw exception<a name="line.182"></a>
+<span class="sourceLineNo">183</span> assertTrue(entryStream.hasNext());<a name="line.183"></a>
+<span class="sourceLineNo">184</span> WAL.Entry entry = entryStream.peek();<a name="line.184"></a>
+<span class="sourceLineNo">185</span> assertSame(entry, entryStream.next());<a name="line.185"></a>
+<span class="sourceLineNo">186</span> assertNotNull(entry);<a name="line.186"></a>
+<span class="sourceLineNo">187</span> assertFalse(entryStream.hasNext());<a name="line.187"></a>
+<span class="sourceLineNo">188</span> assertNull(entryStream.peek());<a name="line.188"></a>
+<span class="sourceLineNo">189</span> assertNull(entryStream.next());<a name="line.189"></a>
+<span class="sourceLineNo">190</span> oldPos = entryStream.getPosition();<a name="line.190"></a>
+<span class="sourceLineNo">191</span> }<a name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span> appendToLogAndSync();<a name="line.193"></a>
+<span class="sourceLineNo">194</span><a name="line.194"></a>
+<span class="sourceLineNo">195</span> try (WALEntryStream entryStream = new WALEntryStream(walQueue, fs, CONF, oldPos,<a name="line.195"></a>
+<span class="sourceLineNo">196</span> log, null, new MetricsSource("1"))) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> // Read the newly added entry, make sure we made progress<a name="line.197"></a>
+<span class="sourceLineNo">198</span> WAL.Entry entry = entryStream.next();<a name="line.198"></a>
+<span class="sourceLineNo">199</span> assertNotEquals(oldPos, entryStream.getPosition());<a name="line.199"></a>
+<span class="sourceLineNo">200</span> assertNotNull(entry);<a name="line.200"></a>
+<span class="sourceLineNo">201</span> oldPos = entryStream.getPosition();<a name="line.201"></a>
+<span class="sourceLineNo">202</span> }<a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span> // We rolled but we still should see the end of the first log and get that item<a name="line.204"></a>
+<span class="sourceLineNo">205</span> appendToLogAndSync();<a name="line.205"></a>
+<span class="sourceLineNo">206</span> log.rollWriter();<a name="line.206"></a>
+<span class="sourceLineNo">207</span> appendToLogAndSync();<a name="line.207"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span> try (WALEntryStream entryStream = new WALEntryStream(walQueue, fs, CONF, oldPos,<a name="line.209"></a>
+<span class="sourceLineNo">210</span> log, null, new MetricsSource("1"))) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> WAL.Entry entry = entryStream.next();<a name="line.211"></a>
+<span class="sourceLineNo">212</span> assertNotEquals(oldPos, entryStream.getPosition());<a name="line.212"></a>
+<span class="sourceLineNo">213</span> assertNotNull(entry);<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span> // next item should come from the new log<a name="line.215"></a>
+<span class="sourceLineNo">216</span> entry = entryStream.next();<a name="line.216"></a>
+<span class="sourceLineNo">217</span> assertNotEquals(oldPos, entryStream.getPosition());<a name="line.217"></a>
+<span class="sourceLineNo">218</span> assertNotNull(entry);<a name="line.218"></a>
+<span class="sourceLineNo">219</span><a name="line.219"></a>
+<span class="sourceLineNo">220</span> // no more entries to read<a name="line.220"></a>
+<span class="sourceLineNo">221</span> assertFalse(entryStream.hasNext());<a name="line.221"></a>
+<span class="sourceLineNo">222</span> oldPos = entryStream.getPosition();<a name="line.222"></a>
+<span class="sourceLineNo">223</span> }<a name="line.223"></a>
+<span class="sourceLineNo">224</span> }<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> * Tests that if after a stream is opened, more entries come in and then the log is rolled, we<a name="line.227"></a>
+<span class="sourceLineNo">228</span> * don't mistakenly dequeue the current log thinking we're done with it<a name="line.228"></a>
+<span class="sourceLineNo">229</span> */<a name="line.229"></a>
+<span class="sourceLineNo">230</span> @Test<a name="line.230"></a>
+<span class="sourceLineNo">231</span> public void testLogrollWhileStreaming() throws Exception {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> appendToLog("1");<a name="line.232"></a>
+<span class="sourceLineNo">233</span> appendToLog("2");// 2<a name="line.233"></a>
+<span class="sourceLineNo">234</span> try (WALEntryStream entryStream =<a name="line.234"></a>
+<span class="sourceLineNo">235</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.235"></a>
+<span class="sourceLineNo">236</span> assertEquals("1", getRow(entryStream.next()));<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> appendToLog("3"); // 3 - comes in after reader opened<a name="line.238"></a>
+<span class="sourceLineNo">239</span> log.rollWriter(); // log roll happening while we're reading<a name="line.239"></a>
+<span class="sourceLineNo">240</span> appendToLog("4"); // 4 - this append is in the rolled log<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span> assertEquals("2", getRow(entryStream.next()));<a name="line.242"></a>
+<span class="sourceLineNo">243</span> assertEquals(2, walQueue.size()); // we should not have dequeued yet since there's still an<a name="line.243"></a>
+<span class="sourceLineNo">244</span> // entry in first log<a name="line.244"></a>
+<span class="sourceLineNo">245</span> assertEquals("3", getRow(entryStream.next())); // if implemented improperly, this would be 4<a name="line.245"></a>
+<span class="sourceLineNo">246</span> // and 3 would be skipped<a name="line.246"></a>
+<span class="sourceLineNo">247</span> assertEquals("4", getRow(entryStream.next())); // 4<a name="line.247"></a>
+<span class="sourceLineNo">248</span> assertEquals(1, walQueue.size()); // now we've dequeued and moved on to next log properly<a name="line.248"></a>
+<span class="sourceLineNo">249</span> assertFalse(entryStream.hasNext());<a name="line.249"></a>
+<span class="sourceLineNo">250</span> }<a name="line.250"></a>
+<span class="sourceLineNo">251</span> }<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> * Tests that if writes come in while we have a stream open, we shouldn't miss them<a name="line.254"></a>
+<span class="sourceLineNo">255</span> */<a name="line.255"></a>
+<span class="sourceLineNo">256</span> @Test<a name="line.256"></a>
+<span class="sourceLineNo">257</span> public void testNewEntriesWhileStreaming() throws Exception {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> appendToLog("1");<a name="line.258"></a>
+<span class="sourceLineNo">259</span> try (WALEntryStream entryStream =<a name="line.259"></a>
+<span class="sourceLineNo">260</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.260"></a>
+<span class="sourceLineNo">261</span> entryStream.next(); // we've hit the end of the stream at this point<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span> // some new entries come in while we're streaming<a name="line.263"></a>
+<span class="sourceLineNo">264</span> appendToLog("2");<a name="line.264"></a>
+<span class="sourceLineNo">265</span> appendToLog("3");<a name="line.265"></a>
+<span class="sourceLineNo">266</span><a name="line.266"></a>
+<span class="sourceLineNo">267</span> // don't see them<a name="line.267"></a>
+<span class="sourceLineNo">268</span> assertFalse(entryStream.hasNext());<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> // But we do if we reset<a name="line.270"></a>
+<span class="sourceLineNo">271</span> entryStream.reset();<a name="line.271"></a>
+<span class="sourceLineNo">272</span> assertEquals("2", getRow(entryStream.next()));<a name="line.272"></a>
+<span class="sourceLineNo">273</span> assertEquals("3", getRow(entryStream.next()));<a name="line.273"></a>
+<span class="sourceLineNo">274</span> assertFalse(entryStream.hasNext());<a name="line.274"></a>
+<span class="sourceLineNo">275</span> }<a name="line.275"></a>
+<span class="sourceLineNo">276</span> }<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span> @Test<a name="line.278"></a>
+<span class="sourceLineNo">279</span> public void testResumeStreamingFromPosition() throws Exception {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> long lastPosition = 0;<a name="line.280"></a>
+<span class="sourceLineNo">281</span> appendToLog("1");<a name="line.281"></a>
+<span class="sourceLineNo">282</span> try (WALEntryStream entryStream =<a name="line.282"></a>
+<span class="sourceLineNo">283</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> entryStream.next(); // we've hit the end of the stream at this point<a name="line.284"></a>
+<span class="sourceLineNo">285</span> appendToLog("2");<a name="line.285"></a>
+<span class="sourceLineNo">286</span> appendToLog("3");<a name="line.286"></a>
+<span class="sourceLineNo">287</span> lastPosition = entryStream.getPosition();<a name="line.287"></a>
+<span class="sourceLineNo">288</span> }<a name="line.288"></a>
+<span class="sourceLineNo">289</span> // next stream should picks up where we left off<a name="line.289"></a>
+<span class="sourceLineNo">290</span> try (WALEntryStream entryStream =<a name="line.290"></a>
+<span class="sourceLineNo">291</span> new WALEntryStream(walQueue, fs, CONF, lastPosition, log, null, new MetricsSource("1"))) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> assertEquals("2", getRow(entryStream.next()));<a name="line.292"></a>
+<span class="sourceLineNo">293</span> assertEquals("3", getRow(entryStream.next()));<a name="line.293"></a>
+<span class="sourceLineNo">294</span> assertFalse(entryStream.hasNext()); // done<a name="line.294"></a>
+<span class="sourceLineNo">295</span> assertEquals(1, walQueue.size());<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">300</span> * Tests that if we stop before hitting the end of a stream, we can continue where we left off<a name="line.300"></a>
+<span class="sourceLineNo">301</span> * using the last position<a name="line.301"></a>
+<span class="sourceLineNo">302</span> */<a name="line.302"></a>
+<span class="sourceLineNo">303</span> @Test<a name="line.303"></a>
+<span class="sourceLineNo">304</span> public void testPosition() throws Exception {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> long lastPosition = 0;<a name="line.305"></a>
+<span class="sourceLineNo">306</span> appendEntriesToLogAndSync(3);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> // read only one element<a name="line.307"></a>
+<span class="sourceLineNo">308</span> try (WALEntryStream entryStream = new WALEntryStream(walQueue, fs, CONF, lastPosition,<a name="line.308"></a>
+<span class="sourceLineNo">309</span> log, null, new MetricsSource("1"))) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> entryStream.next();<a name="line.310"></a>
+<span class="sourceLineNo">311</span> lastPosition = entryStream.getPosition();<a name="line.311"></a>
+<span class="sourceLineNo">312</span> }<a name="line.312"></a>
+<span class="sourceLineNo">313</span> // there should still be two more entries from where we left off<a name="line.313"></a>
+<span class="sourceLineNo">314</span> try (WALEntryStream entryStream =<a name="line.314"></a>
+<span class="sourceLineNo">315</span> new WALEntryStream(walQueue, fs, CONF, lastPosition, log, null, new MetricsSource("1"))) {<a name="line.315"></a>
<span class="sourceLineNo">316</span> assertNotNull(entryStream.next());<a name="line.316"></a>
-<span class="sourceLineNo">317</span> assertFalse(entryStream.hasNext());<a name="line.317"></a>
-<span class="sourceLineNo">318</span> }<a name="line.318"></a>
-<span class="sourceLineNo">319</span> }<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
+<span class="sourceLineNo">317</span> assertNotNull(entryStream.next());<a name="line.317"></a>
+<span class="sourceLineNo">318</span> assertFalse(entryStream.hasNext());<a name="line.318"></a>
+<span class="sourceLineNo">319</span> }<a name="line.319"></a>
+<span class="sourceLineNo">320</span> }<a name="line.320"></a>
<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> @Test<a name="line.322"></a>
-<span class="sourceLineNo">323</span> public void testEmptyStream() throws Exception {<a name="line.323"></a>
-<span class="sourceLineNo">324</span> try (WALEntryStream entryStream =<a name="line.324"></a>
-<span class="sourceLineNo">325</span> new WALEntryStream(walQueue, fs, conf, 0, log, null, new MetricsSource("1"))) {<a name="line.325"></a>
-<span class="sourceLineNo">326</span> assertFalse(entryStream.hasNext());<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<a name="line.330"></a>
-<span class="sourceLineNo">331</span> public void testReplicationSourceWALReaderThread() throws Exception {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> appendEntriesToLog(3);<a name="line.332"></a>
-<span class="sourceLineNo">333</span> // get ending position<a name="line.333"></a>
-<span class="sourceLineNo">334</span> long position;<a name="line.334"></a>
-<span class="sourceLineNo">335</span> try (WALEntryStream entryStream =<a name="line.335"></a>
-<span class="sourceLineNo">336</span> new WALEntryStream(walQueue, fs, conf, 0, log, null, new MetricsSource("1"))) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span> entryStream.next();<a name="line.337"></a>
-<span class="sourceLineNo">338</span> entryStream.next();<a name="line.338"></a>
-<span class="sourceLineNo">339</span> entryStream.next();<a name="line.339"></a>
-<span class="sourceLineNo">340</span> position = entryStream.getPosition();<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> // start up a batcher<a name="line.343"></a>
-<span class="sourceLineNo">344</span> ReplicationSourceManager mockSourceManager = Mockito.mock(ReplicationSourceManager.class);<a name="line.344"></a>
-<span class="sourceLineNo">345</span> when(mockSourceManager.getTotalBufferUsed()).thenReturn(new AtomicLong(0));<a name="line.345"></a>
-<span class="sourceLineNo">346</span> Server mockServer= Mockito.mock(Server.class);<a name="line.346"></a>
-<span class="sourceLineNo">347</span> ReplicationSource source = Mockito.mock(ReplicationSource.class);<a name="line.347"></a>
-<span class="sourceLineNo">348</span> when(source.getSourceManager()).thenReturn(mockSourceManager);<a name="line.348"></a>
-<span class="sourceLineNo">349</span> when(source.getSourceMetrics()).thenReturn(new MetricsSource("1"));<a name="line.349"></a>
-<span class="sourceLineNo">350</span> when(source.getWALFileLengthProvider()).thenReturn(log);<a name="line.350"></a>
-<span class="sourceLineNo">351</span> when(source.getServer()).thenReturn(mockServer);<a name="line.351"></a>
-<span class="sourceLineNo">352</span> ReplicationSourceWALReader batcher = new ReplicationSourceWALReader(fs, conf,<a name="line.352"></a>
-<span class="sourceLineNo">353</span> walQueue, 0, getDummyFilter(), source);<a name="line.353"></a>
-<span class="sourceLineNo">354</span> Path walPath = walQueue.peek();<a name="line.354"></a>
-<span class="sourceLineNo">355</span> batcher.start();<a name="line.355"></a>
-<span class="sourceLineNo">356</span> WALEntryBatch entryBatch = batcher.take();<a name="line.356"></a>
-<span class="sourceLineNo">357</span><a name="line.357"></a>
-<span class="sourceLineNo">358</span> // should've batched up our entries<a name="line.358"></a>
-<span class="sourceLineNo">359</span> assertNotNull(entryBatch);<a name="line.359"></a>
-<span class="sourceLineNo">360</span> assertEquals(3, entryBatch.getWalEntries().size());<a name="line.360"></a>
-<span class="sourceLineNo">361</span> assertEquals(position, entryBatch.getLastWalPosition());<a name="line.361"></a>
-<span class="sourceLineNo">362</span> assertEquals(walPath, entryBatch.getLastWalPath());<a name="line.362"></a>
-<span class="sourceLineNo">363</span> assertEquals(3, entryBatch.getNbRowKeys());<a name="line.363"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
+<span class="sourceLineNo">323</span> @Test<a name="line.323"></a>
+<span class="sourceLineNo">324</span> public void testEmptyStream() throws Exception {<a name="line.324"></a>
+<span class="sourceLineNo">325</span> try (WALEntryStream entryStream =<a name="line.325"></a>
+<span class="sourceLineNo">326</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.326"></a>
+<span class="sourceLineNo">327</span> assertFalse(entryStream.hasNext());<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><a name="line.330"></a>
+<span class="sourceLineNo">331</span> private ReplicationSourceWALReader createReader(boolean recovered, Configuration conf) {<a name="line.331"></a>
+<span class="sourceLineNo">332</span> ReplicationSourceManager mockSourceManager = Mockito.mock(ReplicationSourceManager.class);<a name="line.332"></a>
+<span class="sourceLineNo">333</span> when(mockSourceManager.getTotalBufferUsed()).thenReturn(new AtomicLong(0));<a name="line.333"></a>
+<span class="sourceLineNo">334</span> Server mockServer = Mockito.mock(Server.class);<a name="line.334"></a>
+<span class="sourceLineNo">335</span> ReplicationSource source = Mockito.mock(ReplicationSource.class);<a name="line.335"></a>
+<span class="sourceLineNo">336</span> when(source.getSourceManager()).thenReturn(mockSourceManager);<a name="line.336"></a>
+<span class="sourceLineNo">337</span> when(source.getSourceMetrics()).thenReturn(new MetricsSource("1"));<a name="line.337"></a>
+<span class="sourceLineNo">338</span> when(source.getWALFileLengthProvider()).thenReturn(log);<a name="line.338"></a>
+<span class="sourceLineNo">339</span> when(source.getServer()).thenReturn(mockServer);<a name="line.339"></a>
+<span class="sourceLineNo">340</span> when(source.isRecovered()).thenReturn(recovered);<a name="line.340"></a>
+<span class="sourceLineNo">341</span> ReplicationSourceWALReader reader =<a name="line.341"></a>
+<span class="sourceLineNo">342</span> new ReplicationSourceWALReader(fs, conf, walQueue, 0, getDummyFilter(), source);<a name="line.342"></a>
+<span class="sourceLineNo">343</span> reader.start();<a name="line.343"></a>
+<span class="sourceLineNo">344</span> return reader;<a name="line.344"></a>
+<span class="sourceLineNo">345</span> }<a name="line.345"></a>
+<span class="sourceLineNo">346</span><a name="line.346"></a>
+<span class="sourceLineNo">347</span> @Test<a name="line.347"></a>
+<span class="sourceLineNo">348</span> public void testReplicationSourceWALReader() throws Exception {<a name="line.348"></a>
+<span class="sourceLineNo">349</span> appendEntriesToLogAndSync(3);<a name="line.349"></a>
+<span class="sourceLineNo">350</span> // get ending position<a name="line.350"></a>
+<span class="sourceLineNo">351</span> long position;<a name="line.351"></a>
+<span class="sourceLineNo">352</span> try (WALEntryStream entryStream =<a name="line.352"></a>
+<span class="sourceLineNo">353</span> new WALEntryStream(walQueue, fs, CONF, 0, log, null, new MetricsSource("1"))) {<a name="line.353"></a>
+<span class="sourceLineNo">354</span> entryStream.next();<a name="line.354"></a>
+<span class="sourceLineNo">355</span> entryStream.next();<a name="line.355"></a>
+<span class="sourceLineNo">356</span> entryStream.next();<a name="line.356"></a>
+<span class="sourceLineNo">357</span> position = entryStream.getPosition();<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span><a name="line.359"></a>
+<span class="sourceLineNo">360</span> // start up a reader<a name="line.360"></a>
+<span class="sourceLineNo">361</span> Path walPath = walQueue.peek();<a name="line.361"></a>
+<span class="sourceLineNo">362</span> ReplicationSourceWALReader reader = createReader(false, CONF);<a name="line.362"></a>
+<span class="sourceLineNo">363</span> WALEntryBatch entryBatch = reader.take();<a name="line.363"></a>
<span class="sourceLineNo">364</span><a name="line.364"></a>
-<span class="sourceLineNo">365</span> appendToLog("foo");<a name="line.365"></a>
-<span class="sourceLineNo">366</span> entryBatch = batcher.take();<a name="line.366"></a>
-<span class="sourceLineNo">367</span> assertEquals(1, entryBatch.getNbEntries());<a name="line.367"></a>
-<span class="sourceLineNo">368</span> assertEquals("foo", getRow(entryBatch.getWalEntries().get(0)));<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<a name="line.369"></a>
-<span class="sourceLineNo">370</span><a name="line.370"></a>
-<span class="sourceLineNo">371</span> private String getRow(WAL.Entry entry) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span> Cell cell = entry.getEdit().getCells().get(0);<a name="line.372"></a>
-<span class="sourceLineNo">373</span> return Bytes.toString(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.373"></a>
-<span class="sourceLineNo">374</span> }<a name="line.374"></a>
-<span class="sourceLineNo">375</span><a name="line.375"></a>
-<span class="sourceLineNo">376</span> private void appendToLog(String key) throws IOException {<a name="line.376"></a>
-<span class="sourceLineNo">377</span> final long txid = log.append(info,<a name="line.377"></a>
-<span class="sourceLineNo">378</span> new WALKeyImpl(info.getEncodedNameAsBytes(), tableName, System.currentTimeMillis(),<a name="line.378"></a>
-<span class="sourceLineNo">379</span> mvcc, scopes), getWALEdit(key), true);<a name="line.379"></a>
-<span class="sourceLineNo">380</span> log.sync(txid);<a name="line.380"></a>
-<span class="sourceLineNo">381</span> }<a name="line.381"></a>
-<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span> private void appendEntriesToLog(int count) throws IOException {<a name="line.383"></a>
-<span class="sourceLineNo">384</span> for (int i = 0; i < count; i++) {<a name="line.384"></a>
-<span class="sourceLineNo">385</span> appendToLog();<a name="line.385"></a>
-<span class="sourceLineNo">386</span> }<a name="line.386"></a>
-<span class="sourceLineNo">387</span> }<a name="line.387"></a>
+<span class="sourceLineNo">365</span> // should've batched up our entries<a name="line.365"></a>
+<span class="sourceLineNo">366</span> assertNotNull(entryBatch);<a name="line.366"></a>
+<span class="sourceLineNo">367</span> assertEquals(3, entryBatch.getWalEntries().size());<a name="line.367"></a>
+<span class="sourceLineNo">368</span> assertEquals(position, entryBatch.getLastWalPosition());<a name="line.368"></a>
+<span class="sourceLineNo">369</span> assertEquals(walPath, entryBatch.getLastWalPath());<a name="line.369"></a>
+<span class="sourceLineNo">370</span> assertEquals(3, entryBatch.getNbRowKeys());<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span> appendToLog("foo");<a name="line.372"></a>
+<span class="sourceLineNo">373</span> entryBatch = reader.take();<a name="line.373"></a>
+<span class="sourceLineNo">374</span> assertEquals(1, entryBatch.getNbEntries());<a name="line.374"></a>
+<span class="sourceLineNo">375</span> assertEquals("foo", getRow(entryBatch.getWalEntries().get(0)));<a name="line.375"></a>
+<span class="sourceLineNo">376</span> }<a name="line.376"></a>
+<span class="sourceLineNo">377</span><a name="line.377"></a>
+<span class="sourceLineNo">378</span> @Test<a name="line.378"></a>
+<span class="sourceLineNo">379</span> public void testReplicationSourceWALReaderRecovered() throws Exception {<a name="line.379"></a>
+<span class="sourceLineNo">380</span> appendEntriesToLogAndSync(10);<a name="line.380"></a>
+<span class="sourceLineNo">381</span> Path walPath = walQueue.peek();<a name="line.381"></a>
+<span class="sourceLineNo">382</span> log.rollWriter();<a name="line.382"></a>
+<span class="sourceLineNo">383</span> appendEntriesToLogAndSync(5);<a name="line.383"></a>
+<span class="sourceLineNo">384</span> log.shutdown();<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span> Configuration conf = new Configuration(CONF);<a name="line.386"></a>
+<span class="sourceLineNo">387</span> conf.setInt("replication.source.nb.capacity", 10);<a name="line.387"></a>
<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span> private void appendToLog() throws IOException {<a name="line.389"></a>
-<span class="sourceLineNo">390</span> appendToLogPlus(1);<a name="line.390"></a>
-<span class="sourceLineNo">391</span> }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span> private void appendToLogPlus(int count) throws IOException {<a name="line.393"></a>
-<span class="sourceLineNo">394</span> final long txid = log.append(info, new WALKeyImpl(info.getEncodedNameAsBytes(), tableName,<a name="line.394"></a>
-<span class="sourceLineNo">395</span> System.currentTimeMillis(), mvcc, scopes), getWALEdits(count), true);<a name="line.395"></a>
-<span class="sourceLineNo">396</span> log.sync(txid);<a name="line.396"></a>
-<span class="sourceLineNo">397</span> }<a name="line.397"></a>
-<span class="sourceLineNo">398</span><a name="line.398"></a>
-<span class="sourceLineNo">399</span> private WALEdit getWALEdits(int count) {<a name="line.399"></a>
-<span class="sourceLineNo">400</span> WALEdit edit = new WALEdit();<a name="line.400"></a>
-<span class="sourceLineNo">401</span> for (int i = 0; i < count; i++) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span> edit.add(new KeyValue(Bytes.toBytes(System.currentTimeMillis()), family, qualifier,<a name="line.402"></a>
-<span class="sourceLineNo">403</span> System.currentTimeMillis(), qualifier));<a name="line.403"></a>
-<span class="sourceLineNo">404</span> }<a name="line.404"></a>
-<span class="sourceLineNo">405</span> return edit;<a name="line.405"></a>
-<span class="sourceLineNo">406</span> }<a name="line.406"></a>
-<span class="sourceLineNo">407</span><a name="line.407"></a>
-<span class="sourceLineNo">408</span> private WALEdit getWALEdit(String row) {<a name="line.408"></a>
-<span class="sourceLineNo">409</span> WALEdit edit = new WALEdit();<a name="line.409"></a>
-<span class="sourceLineNo">410</span> edit.add(<a name="line.410"></a>
-<span class="sourceLineNo">411</span> new KeyValue(Bytes.toBytes(row), family, qualifier, System.currentTimeMillis(), qualifier));<a name="line.411"></a>
-<span class="sourceLineNo">412</span> return edit;<a name="line.412"></a>
-<span class="sourceLineNo">413</span> }<a name="line.413"></a>
-<span class="sourceLineNo">414</span><a name="line.414"></a>
-<span class="sourceLineNo">415</span> private WALEntryFilter getDummyFilter() {<a name="line.415"></a>
-<span class="sourceLineNo">416</span> return new WALEntryFilter() {<a name="line.416"></a>
-<span class="sourceLineNo">417</span><a name="line.417"></a>
-<span class="sourceLineNo">418</span> @Override<a name="line.418"></a>
-<span class="sourceLineNo">419</span> public Entry filter(Entry entry) {<a name="line.419"></a>
-<span class="sourceLineNo">420</span> return entry;<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> class PathWatcher implements WALActionsListener {<a name="line.425"></a>
-<span class="sourceLineNo">426</span><a name="line.426"></a>
-<span class="sourceLineNo">427</span> Path currentPath;<a name="line.427"></a>
-<span class="sourceLineNo">428</span><a name="line.428"></a>
-<span class="sourceLineNo">429</span> @Override<a name="line.429"></a>
-<span class="sourceLineNo">430</span> public void preLogRoll(Path oldPath, Path newPath) throws IOException {<a name="line.430"></a>
-<span class="sourceLineNo">431</span> walQueue.add(newPath);<a name="line.431"></a>
-<span class="sourceLineNo">432</span> currentPath = newPath;<a name="line.432"></a>
-<span class="sourceLineNo">433</span> }<a name="line.433"></a>
-<span class="sourceLineNo">434</span> }<a name="line.434"></a>
+<span class="sourceLineNo">389</span> ReplicationSourceWALReader reader = createReader(true, conf);<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span> WALEntryBatch batch = reader.take();<a name="line.391"></a>
+<span class="sourceLineNo">392</span> assertEquals(walPath, batch.getLastWalPath());<a name="line.392"></a>
+<span class="sourceLineNo">393</span> assertEquals(10, batch.getNbEntries());<a name="line.393"></a>
+<span class="sourceLineNo">394</span> assertFalse(batch.isEndOfFile());<a name="line.394"></a>
+<span class="sourceLineNo">395</span><a name="line.395"></a>
+<span class="sourceLineNo">396</span> batch = reader.take();<a name="line.396"></a>
+<span class="sourceLineNo">397</span> assertEquals(walPath, batch.getLastWalPath());<a name="line.397"></a>
+<span class="sourceLineNo">398</span> assertEquals(0, batch.getNbEntries());<a name="line.398"></a>
+<span class="sourceLineNo">399</span> assertTrue(batch.isEndOfFile());<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span> walPath = walQueue.peek();<a name="line.401"></a>
+<span class="sourceLineNo">402</span> batch = reader.take();<a name="line.402"></a>
+<span class="sourceLineNo">403</span> assertEquals(walPath, batch.getLastWalPath());<a name="line.403"></a>
+<span class="sourceLineNo">404</span> assertEquals(5, batch.getNbEntries());<a name="line.404"></a>
+<span class="sourceLineNo">405</span> // Actually this should be true but we haven't handled this yet since for a normal queue the<a name="line.405"></a>
+<span class="sourceLineNo">406</span> // last one is always open... Not a big deal for now.<a name="line.406"></a>
+<span class="sourceLineNo">407</span> assertFalse(batch.isEndOfFile());<a name="line.407"></a>
+<span class="sourceLineNo">408</span><a name="line.408"></a>
+<span class="sourceLineNo">409</span> assertSame(WALEntryBatch.NO_MORE_DATA, reader.take());<a name="line.409"></a>
+<span class="sourceLineNo">410</span> }<a name="line.410"></a>
+<span class="sourceLineNo">411</span><a name="line.411"></a>
+<span class="sourceLineNo">412</span> // Testcase for HBASE-20206<a name="line.412"></a>
+<span class="sourceLineNo">413</span> @Test<a name="line.413"></a>
+<span class="sourceLineNo">414</span> public void testReplicationSourceWALReaderWrongPosition() throws Exception {<a name="line.414"></a>
+<span class="sourceLineNo">415</span> appendEntriesToLogAndSync(1);<a name="line.415"></a>
+<span class="sourceLineNo">416</span> Path walPath = walQueue.peek();<a name="line.416"></a>
+<span class="sourceLineNo">417</span> log.rollWriter();<a name="line.417"></a>
+<span class="sourceLineNo">418</span> appendEntriesToLogAndSync(20);<a name="line.418"></a>
+<span class="sourceLineNo">419</span> TEST_UTIL.waitFor(5000, new ExplainingPredicate<Exception>() {<a name="line.419"></a>
+<span class="sourceLineNo">420</span><a name="line.420"></a>
+<span class="sourceLineNo">421</span> @Override<a name="line.421"></a>
+<span class="sourceLineNo">422</span> public boolean evaluate() throws Exception {<a name="line.422"></a>
+<span class="sourceLineNo">423</span> return fs.getFileStatus(walPath).getLen() > 0;<a name="line.423"></a>
+<span class="sourceLineNo">424</span> }<a name="line.424"></a>
+<span class="sourceLineNo">425</span><a name="line.425"></a>
+<span class="sourceLineNo">426</span> @Override<a name="line.426"></a>
+<span class="sourceLineNo">427</span> public String explainFailure() throws Exception {<a name="line.427"></a>
+<span class="sourceLineNo">428</span> return walPath + " has not been closed yet";<a name="line.428"></a>
+<span class="sourceLineNo">429</span> }<a name="line.429"></a>
+<span class="sourceLineNo">430</span><a name="line.430"></a>
+<span class="sourceLineNo">431</span> });<a name="line.431"></a>
+<span class="sourceLineNo">432</span> long walLength = fs.getFileStatus(walPath).getLen();<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> ReplicationSourceWALReader reader = createReader(false, CONF);<a name="line.434"></a>
<span class="sourceLineNo">435</span><a name="line.435"></a>
-<span class="sourceLineNo">436</span> @Test<a name="line.436"></a>
-<span class="sourceLineNo">437</span> public void testReadBeyondCommittedLength() throws IOException, InterruptedException {<a name="line.437"></a>
-<span class="sourceLineNo">438</span> appendToLog("1");<a name="line.438"></a>
-<span class="sourceLineNo">439</span> appendToLog("2");<a name="line.439"></a>
-<span class="sourceLineNo">440</span> long size = log.getLogFileSizeIfBeingWritten(walQueue.peek()).getAsLong();<a name="line.440"></a>
-<span class="sourceLineNo">441</span> AtomicLong fileLength = new AtomicLong(size - 1);<a name="line.441"></a>
-<span class="sourceLineNo">442</span> try (WALEntryStream entryStream = new WALEntryStream(walQueue, fs, conf, 0,<a name="line.442"></a>
-<span class="sourceLineNo">443</span> p -> OptionalLong.of(fileLength.get()), null, new MetricsSource("1"))) {<a name="line.443"></a>
-<span class="sourceLineNo">444</span> assertTrue(entryStream.hasNext());<a name="line.444"></a>
-<span class="sourceLineNo">445</span> assertNotNull(entryStream.next());<a name="line.445"></a>
-<span class="sourceLineNo">446</span> // can not get log 2<a name="line.446"></a>
-<span class="sourceLineNo">447</span> assertFalse(entryStream.hasNext());<a name="line.447"></a>
-<span class="sourceLineNo">448</span> Thread.sleep(1000);<a name="line.448"></a>
-<span class="sourceLineNo">449</span> entryStream.reset();<a name="line.449"></a>
-<span class="sourceLineNo">450</span> // still can not get log 2<a name="line.450"></a>
-<span class="sourceLineNo">451</span> assertFalse(entryStream.hasNext());<a name="line.451"></a>
-<span class="sourceLineNo">452</span><a name="line.452"></a>
-<span class="sourceLineNo">453</span> // can get log 2 now<a name="line.453"></a>
-<span class="sourceLineNo">454</span> fileLength.set(size);<a name="line.454"></a>
-<span class="sourceLineNo">455</span> entryStream.reset();<a name="line.455"></a>
-<span class="sourceLineNo">456</span> assertTrue(entryStream.hasNext());<a name="line.456"></a>
-<span class="sourceLineNo">457</span> assertNotNull(entryStream.next());<a name="line.457"></a>
-<span class="sourceLineNo">458</span><a name="line.458"></a>
-<span class="sourceLineNo">459</span> assertFalse(entryStream.hasNext());<a name="line.459"></a>
-<span class="sourceLineNo">460</span> }<a name="line.460"></a>
+<span class="sourceLineNo">436</span> WALEntryBatch entryBatch = reader.take();<a name="line.436"></a>
+<span class="sourceLineNo">437</span> assertEquals(walPath, entryBatch.getLastWalPath());<a name="line.437"></a>
+<span class="sourceLineNo">438</span> assertTrue("Position " + entryBatch.getLastWalPosition() + " is out of range, file length is " +<a name="line.438"></a>
+<span class="sourceLineNo">439</span> walLength, entryBatch.getLastWalPosition() <= walLength);<a name="line.439"></a>
+<span class="sourceLineNo">440</span> assertEquals(1, entryBatch.getNbEntries());<a name="line.440"></a>
+<span class="sourceLineNo">441</span> assertTrue(entryBatch.isEndOfFile());<a name="line.441"></a>
+<span class="sourceLineNo">442</span><a name="line.442"></a>
+<span class="sourceLineNo">443</span> Path walPath2 = walQueue.peek();<a name="line.443"></a>
+<span class="sourceLineNo">444</span> entryBatch = reader.take();<a name="line.444"></a>
+<span class="sourceLineNo">445</span> assertEquals(walPath2, entryBatch.getLastWalPath());<a name="line.445"></a>
+<span class="sourceLineNo">446</span> assertEquals(20, entryBatch.getNbEntries());<a name="line.446"></a>
+<span class="sourceLineNo">447</span> assertFalse(entryBatch.isEndOfFile());<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span> log.rollWriter();<a name="line.449"></a>
+<span class="sourceLineNo">450</span> appendEntriesToLogAndSync(10);<a name="line.450"></a>
+<span class="sourceLineNo">451</span> entryBatch = reader.take();<a name="line.451"></a>
+<span class="sourceLineNo">452</span> assertEquals(walPath2, entryBatch.getLastWalPath());<a name="line.452"></a>
+<span class="sourceLineNo">453</span> assertEquals(0, entryBatch.getNbEntries());<a name="line.453"></a>
+<span class="sourceLineNo">454</span> assertTrue(entryBatch.isEndOfFile());<a name="line.454"></a>
+<span class="sourceLineNo">455</span><a name="line.455"></a>
+<span class="sourceLineNo">456</span> Path walPath3 = walQueue.peek();<a name="line.456"></a>
+<span class="sourceLineNo">457</span> entryBatch = reader.take();<a name="line.457"></a>
+<span class="sourceLineNo">458</span> assertEquals(walPath3, entryBatch.getLastWalPath());<a name="line.458"></a>
+<span class="sourceLineNo">459</span> assertEquals(10, entryBatch.getNbEntries());<a name="line.459"></a>
+<span class="sourceLineNo">460</span> assertFalse(entryBatch.isEndOfFile());<a name="line.460"></a>
<span class="sourceLineNo">461</span> }<a name="line.461"></a>
-<span class="sourceLineNo">462</span>}<a name="line.462"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
+<span class="sourceLineNo">463</span> private String getRow(WAL.Entry entry) {<a name="line.463"></a>
+<span class="sourceLineNo">464</span> Cell cell = entry.getEdit().getCells().get(0);<a name="line.464"></a>
+<span class="sourceLineNo">465</span> return Bytes.toString(cell.getRowArray(), cell.getRowOffset(), cell.getRowLength());<a name="line.465"></a>
+<span class="sourceLineNo">466</span> }<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span> private void appendToLog(String key) throws IOException {<a name="line.468"></a>
+<span class="sourceLineNo">469</span> final long txid = log.append(info,<a name="line.469"></a>
+<span class="sourceLineNo">470</span> new WALKeyImpl(info.getEncodedNameAsBytes(), tableName, System.currentTimeMillis(),<a name="line.470"></a>
+<span class="sourceLineNo">471</span> mvcc, scopes), getWALEdit(key), true);<a name="line.471"></a>
+<span class="sourceLineNo">472</span> log.sync(txid);<a name="line.472"></a>
+<span class="sourceLineNo">473</span> }<a name="line.473"></a>
+<span class="sourceLineNo">474</span><a name="line.474"></a>
+<span class="sourceLineNo">475</span> private void appendEntriesToLogAndSync(int count) throws IOException {<a name="line.475"></a>
+<span class="sourceLineNo">476</span> long txid = -1L;<a name="line.476"></a>
+<span class="sourceLineNo">477</span> for (int i = 0; i < count; i++) {<a name="line.477"></a>
+<span class="sourceLineNo">478</span> txid = appendToLog(1);<a name="line.478"></a>
+<span class="sourceLineNo">479</span> }<a name="line.479"></a>
+<span class="sourceLineNo">480</span> log.sync(txid);<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> private void appendToLogAndSync() throws IOException {<a name="line.483"></a>
+<span class="sourceLineNo">484</span> appendToLogAndSync(1);<a name="line.484"></a>
+<span class="sourceLineNo">485</span> }<a name="line.485"></a>
+<span class="sourceLineNo">486</span><a name="line.486"></a>
+<span class="sourceLineNo">487</span> private void appendToLogAndSync(int count) throws IOException {<a name="line.487"></a>
+<span class="sourceLineNo">488</span> long txid = appendToLog(count);<a name="line.488"></a>
+<span class="sourceLineNo">489</span> log.sync(txid);<a name="line.489"></a>
+<span class="sourceLineNo">490</span> }<a name="line.490"></a>
+<span class="sourceLineNo">491</span><a name="line.491"></a>
+<span class="sourceLineNo">492</span> private long appendToLog(int count) throws IOException {<a name="line.492"></a>
+<span class="sourceLineNo">493</span> return log.append(info, new WALKeyImpl(info.getEncodedNameAsBytes(), tableName,<a name="line.493"></a>
+<span class="sourceLineNo">494</span> System.currentTimeMillis(), mvcc, scopes), getWALEdits(count), true);<a name="line.494"></a>
+<span class="sourceLineNo">495</span> }<a name="line.495"></a>
+<span class="sourceLineNo">496</span><a name="line.496"></a>
+<span class="sourceLineNo">497</span> private WALEdit getWALEdits(int count) {<a name="line.497"></a>
+<span class="sourceLineNo">498</span> WALEdit edit = new WALEdit();<a name="line.498"></a>
+<span class="sourceLineNo">499</span> for (int i = 0; i < count; i++) {<a name="line.499"></a>
+<span class="sourceLineNo">500</span> edit.add(new KeyValue(Bytes.toBytes(System.currentTimeMillis()), family, qualifier,<a name="line.500"></a>
+<span class="sourceLineNo">501</span> System.currentTimeMillis(), qualifier));<a name="line.501"></a>
+<span class="sourceLineNo">502</span> }<a name="line.502"></a>
+<span class="sourceLineNo">503</span> return edit;<a name="line.503"></a>
+<span class="sourceLineNo">504</span> }<a name="line.504"></a>
+<span class="sourceLineNo">505</span><a name="line.505"></a>
+<span class="sourceLineNo">506</span> private WALEdit getWALEdit(String row) {<a name="line.506"></a>
+<span class="sourceLineNo">507</span> WALEdit edit = new WALEdit();<a name="line.507"></a>
+<span class="sourceLineNo">508</span> edit.add(<a name="line.508"></a>
+<span class="sourceLineNo">509</span> new KeyValue(Bytes.toBytes(row), family, qualifier, System.currentTimeMillis(), qualifier));<a name="line.509"></a>
+<span class="sourceLineNo">510</span> return edit;<a name="line.510"></a>
+<span class="sourceLineNo">511</span> }<a name="line.511"></a>
+<span class="sourceLineNo">512</span><a name="line.512"></a>
+<span class="sourceLineNo">513</span> private WALEntryFilter getDummyFilter() {<a name="line.513"></a>
+<span class="sourceLineNo">514</span> return new WALEntryFilter() {<a name="line.514"></a>
+<span class="sourceLineNo">515</span><a name="line.515"></a>
+<span class="sourceLineNo">516</span> @Override<a name="line.516"></a>
+<span class="sourceLineNo">517</span> public Entry filter(Entry entry) {<a name="line.517"></a>
+<span class="sourceLineNo">518</span> return entry;<a name="line.518"></a>
+<span class="sourceLineNo">519</span> }<a name="line.519"></a>
+<span class="sourceLineNo">520</span> };<a name="line.520"></a>
+<span class="sourceLineNo">521</span> }<a name="line.521"></a>
+<span class="sourceLineNo">522</span><a name="line.522"></a>
+<span class="sourceLineNo">523</span> class PathWatcher implements WALActionsListener {<a name="line.523"></a>
+<span class="sourceLineNo">524</span><a name="line.524"></a>
+<span class="sourceLineNo">525</span> Path currentPath;<a name="line.525"></a>
+<span class="sourceLineNo">526</span><a name="line.526"></a>
+<span class="sourceLineNo">527</span> @Override<a name="line.527"></a>
+<span class="sourceLineNo">528</span> public void preLogRoll(Path oldPath, Path newPath) throws IOException {<a name="line.528"></a>
+<span class="sourceLineNo">529</span> walQueue.add(newPath);<a name="line.529"></a>
+<span class="sourceLineNo">530</span> currentPath = newPath;<a name="line.530"></a>
+<span class="sourceLineNo">531</span> }<a name="line.531"></a>
+<span class="sourceLineNo">532</span> }<a name="line.532"></a>
+<span class="sourceLineNo">533</span><a name="line.533"></a>
+<span class="sourceLineNo">534</span> @Test<a name="line.534"></a>
+<span class="sourceLineNo">535</span> public void testReadBeyondCommittedLength() throws IOException, InterruptedException {<a name="line.535"></a>
+<span class="sourceLineNo">536</span> appendToLog("1");<a name="line.536"></a>
+<span class="sourceLineNo">537</span> appendToLog("2");<a name="line.537"></a>
+<span class="sourceLineNo">538</span> long size = log.getLogFileSizeIfBeingWritten(walQueue.peek()).getAsLong();<a name="line.538"></a>
+<span class="sourceLineNo">539</span> AtomicLong fileLength = new AtomicLong(size - 1);<a name="line.539"></a>
+<span class="sourceLineNo">540</span> try (WALEntryStream entryStream = new WALEntryStream(walQueue, fs, CONF, 0,<a name="line.540"></a>
+<span class="sourceLineNo">541</span> p -> OptionalLong.of(fileLength.get()), null, new MetricsSource("1"))) {<a name="line.541"></a>
+<span class="sourceLineNo">542</span> assertTrue(entryStream.hasNext());<a name="line.542"></a>
+<span class="sourceLineNo">543</span> assertNotNull(entryStream.next());<a name="line.543"></a>
+<span class="sourceLineNo">544</span> // can not get log 2<a name="line.544"></a>
+<span class="sourceLineNo">545</span> assertFalse(entryStream.hasNext());<a name="line.545"></a>
+<span class="sourceLineNo">546</span> Thread.sleep(1000);<a name="line.546"></a>
+<span class="sourceLineNo">547</span> entryStream.reset();<a name="line.547"></a>
+<span class="sourceLineNo">548</span> // still can not get log 2<a name="line.548"></a>
+<span class="sourceLineNo">549</span> assertFalse(entryStream.hasNext());<a name="line.549"></a>
+<span class="sourceLineNo">550</span><a name="line.550"></a>
+<span class="sourceLineNo">551</span> // can get log 2 now<a name="line.551"></a>
+<span class="sourceLineNo">552</span> fileLength.set(size);<a name="line.552"></a>
+<span class="sourceLineNo">553</span> entryStream.reset();<a name="l
<TRUNCATED>