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/09/06 14:53:59 UTC
[10/31] hbase-site git commit: Published site at
f8b12805bbff18fc94e2ac6894f92276b1453350.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/06efc31c/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestHRegion.Appender.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestHRegion.Appender.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestHRegion.Appender.html
index d696d8f..e272ef5 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestHRegion.Appender.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestHRegion.Appender.html
@@ -254,182 +254,182 @@
<span class="sourceLineNo">246</span> }<a name="line.246"></a>
<span class="sourceLineNo">247</span><a name="line.247"></a>
<span class="sourceLineNo">248</span> @After<a name="line.248"></a>
-<span class="sourceLineNo">249</span> public void tearDown() throws Exception {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> EnvironmentEdgeManagerTestHelper.reset();<a name="line.250"></a>
-<span class="sourceLineNo">251</span> LOG.info("Cleaning test directory: " + TEST_UTIL.getDataTestDir());<a name="line.251"></a>
-<span class="sourceLineNo">252</span> TEST_UTIL.cleanupTestDir();<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span> /**<a name="line.255"></a>
-<span class="sourceLineNo">256</span> * Test that I can use the max flushed sequence id after the close.<a name="line.256"></a>
-<span class="sourceLineNo">257</span> * @throws IOException<a name="line.257"></a>
-<span class="sourceLineNo">258</span> */<a name="line.258"></a>
-<span class="sourceLineNo">259</span> @Test<a name="line.259"></a>
-<span class="sourceLineNo">260</span> public void testSequenceId() throws IOException {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> HRegion region = initHRegion(tableName, method, CONF, COLUMN_FAMILY_BYTES);<a name="line.261"></a>
-<span class="sourceLineNo">262</span> assertEquals(HConstants.NO_SEQNUM, region.getMaxFlushedSeqId());<a name="line.262"></a>
-<span class="sourceLineNo">263</span> // Weird. This returns 0 if no store files or no edits. Afraid to change it.<a name="line.263"></a>
-<span class="sourceLineNo">264</span> assertEquals(0, (long)region.getMaxStoreSeqId().get(COLUMN_FAMILY_BYTES));<a name="line.264"></a>
-<span class="sourceLineNo">265</span> region.close();<a name="line.265"></a>
-<span class="sourceLineNo">266</span> assertEquals(HConstants.NO_SEQNUM, region.getMaxFlushedSeqId());<a name="line.266"></a>
-<span class="sourceLineNo">267</span> assertEquals(0, (long)region.getMaxStoreSeqId().get(COLUMN_FAMILY_BYTES));<a name="line.267"></a>
-<span class="sourceLineNo">268</span> // Open region again.<a name="line.268"></a>
-<span class="sourceLineNo">269</span> region = initHRegion(tableName, method, CONF, COLUMN_FAMILY_BYTES);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> byte [] value = Bytes.toBytes(method);<a name="line.270"></a>
-<span class="sourceLineNo">271</span> // Make a random put against our cf.<a name="line.271"></a>
-<span class="sourceLineNo">272</span> Put put = new Put(value);<a name="line.272"></a>
-<span class="sourceLineNo">273</span> put.addColumn(COLUMN_FAMILY_BYTES, null, value);<a name="line.273"></a>
-<span class="sourceLineNo">274</span> region.put(put);<a name="line.274"></a>
-<span class="sourceLineNo">275</span> // No flush yet so init numbers should still be in place.<a name="line.275"></a>
-<span class="sourceLineNo">276</span> assertEquals(HConstants.NO_SEQNUM, region.getMaxFlushedSeqId());<a name="line.276"></a>
-<span class="sourceLineNo">277</span> assertEquals(0, (long)region.getMaxStoreSeqId().get(COLUMN_FAMILY_BYTES));<a name="line.277"></a>
-<span class="sourceLineNo">278</span> region.flush(true);<a name="line.278"></a>
-<span class="sourceLineNo">279</span> long max = region.getMaxFlushedSeqId();<a name="line.279"></a>
-<span class="sourceLineNo">280</span> region.close();<a name="line.280"></a>
-<span class="sourceLineNo">281</span> assertEquals(max, region.getMaxFlushedSeqId());<a name="line.281"></a>
-<span class="sourceLineNo">282</span> }<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> * Test for Bug 2 of HBASE-10466.<a name="line.285"></a>
-<span class="sourceLineNo">286</span> * "Bug 2: Conditions for the first flush of region close (so-called pre-flush) If memstoreSize<a name="line.286"></a>
-<span class="sourceLineNo">287</span> * is smaller than a certain value, or when region close starts a flush is ongoing, the first<a name="line.287"></a>
-<span class="sourceLineNo">288</span> * flush is skipped and only the second flush takes place. However, two flushes are required in<a name="line.288"></a>
-<span class="sourceLineNo">289</span> * case previous flush fails and leaves some data in snapshot. The bug could cause loss of data<a name="line.289"></a>
-<span class="sourceLineNo">290</span> * in current memstore. The fix is removing all conditions except abort check so we ensure 2<a name="line.290"></a>
-<span class="sourceLineNo">291</span> * flushes for region close."<a name="line.291"></a>
-<span class="sourceLineNo">292</span> * @throws IOException<a name="line.292"></a>
-<span class="sourceLineNo">293</span> */<a name="line.293"></a>
-<span class="sourceLineNo">294</span> @Test<a name="line.294"></a>
-<span class="sourceLineNo">295</span> public void testCloseCarryingSnapshot() throws IOException {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> HRegion region = initHRegion(tableName, method, CONF, COLUMN_FAMILY_BYTES);<a name="line.296"></a>
-<span class="sourceLineNo">297</span> HStore store = region.getStore(COLUMN_FAMILY_BYTES);<a name="line.297"></a>
-<span class="sourceLineNo">298</span> // Get some random bytes.<a name="line.298"></a>
-<span class="sourceLineNo">299</span> byte [] value = Bytes.toBytes(method);<a name="line.299"></a>
-<span class="sourceLineNo">300</span> // Make a random put against our cf.<a name="line.300"></a>
-<span class="sourceLineNo">301</span> Put put = new Put(value);<a name="line.301"></a>
-<span class="sourceLineNo">302</span> put.addColumn(COLUMN_FAMILY_BYTES, null, value);<a name="line.302"></a>
-<span class="sourceLineNo">303</span> // First put something in current memstore, which will be in snapshot after flusher.prepare()<a name="line.303"></a>
-<span class="sourceLineNo">304</span> region.put(put);<a name="line.304"></a>
-<span class="sourceLineNo">305</span> StoreFlushContext storeFlushCtx = store.createFlushContext(12345, FlushLifeCycleTracker.DUMMY);<a name="line.305"></a>
-<span class="sourceLineNo">306</span> storeFlushCtx.prepare();<a name="line.306"></a>
-<span class="sourceLineNo">307</span> // Second put something in current memstore<a name="line.307"></a>
-<span class="sourceLineNo">308</span> put.addColumn(COLUMN_FAMILY_BYTES, Bytes.toBytes("abc"), value);<a name="line.308"></a>
-<span class="sourceLineNo">309</span> region.put(put);<a name="line.309"></a>
-<span class="sourceLineNo">310</span> // Close with something in memstore and something in the snapshot. Make sure all is cleared.<a name="line.310"></a>
-<span class="sourceLineNo">311</span> region.close();<a name="line.311"></a>
-<span class="sourceLineNo">312</span> assertEquals(0, region.getMemStoreDataSize());<a name="line.312"></a>
-<span class="sourceLineNo">313</span> HBaseTestingUtility.closeRegionAndWAL(region);<a name="line.313"></a>
-<span class="sourceLineNo">314</span> }<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span> /*<a name="line.316"></a>
-<span class="sourceLineNo">317</span> * This test is for verifying memstore snapshot size is correctly updated in case of rollback<a name="line.317"></a>
-<span class="sourceLineNo">318</span> * See HBASE-10845<a name="line.318"></a>
-<span class="sourceLineNo">319</span> */<a name="line.319"></a>
-<span class="sourceLineNo">320</span> @Test<a name="line.320"></a>
-<span class="sourceLineNo">321</span> public void testMemstoreSnapshotSize() throws IOException {<a name="line.321"></a>
-<span class="sourceLineNo">322</span> class MyFaultyFSLog extends FaultyFSLog {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> StoreFlushContext storeFlushCtx;<a name="line.323"></a>
-<span class="sourceLineNo">324</span> public MyFaultyFSLog(FileSystem fs, Path rootDir, String logName, Configuration conf)<a name="line.324"></a>
-<span class="sourceLineNo">325</span> throws IOException {<a name="line.325"></a>
-<span class="sourceLineNo">326</span> super(fs, rootDir, logName, conf);<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> void setStoreFlushCtx(StoreFlushContext storeFlushCtx) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span> this.storeFlushCtx = storeFlushCtx;<a name="line.330"></a>
-<span class="sourceLineNo">331</span> }<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span> @Override<a name="line.333"></a>
-<span class="sourceLineNo">334</span> public void sync(long txid) throws IOException {<a name="line.334"></a>
-<span class="sourceLineNo">335</span> storeFlushCtx.prepare();<a name="line.335"></a>
-<span class="sourceLineNo">336</span> super.sync(txid);<a name="line.336"></a>
-<span class="sourceLineNo">337</span> }<a name="line.337"></a>
-<span class="sourceLineNo">338</span> }<a name="line.338"></a>
-<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span> FileSystem fs = FileSystem.get(CONF);<a name="line.340"></a>
-<span class="sourceLineNo">341</span> Path rootDir = new Path(dir + "testMemstoreSnapshotSize");<a name="line.341"></a>
-<span class="sourceLineNo">342</span> MyFaultyFSLog faultyLog = new MyFaultyFSLog(fs, rootDir, "testMemstoreSnapshotSize", CONF);<a name="line.342"></a>
-<span class="sourceLineNo">343</span> faultyLog.init();<a name="line.343"></a>
-<span class="sourceLineNo">344</span> HRegion region = initHRegion(tableName, null, null, false, Durability.SYNC_WAL, faultyLog,<a name="line.344"></a>
-<span class="sourceLineNo">345</span> COLUMN_FAMILY_BYTES);<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> HStore store = region.getStore(COLUMN_FAMILY_BYTES);<a name="line.347"></a>
-<span class="sourceLineNo">348</span> // Get some random bytes.<a name="line.348"></a>
-<span class="sourceLineNo">349</span> byte [] value = Bytes.toBytes(method);<a name="line.349"></a>
-<span class="sourceLineNo">350</span> faultyLog.setStoreFlushCtx(store.createFlushContext(12345, FlushLifeCycleTracker.DUMMY));<a name="line.350"></a>
-<span class="sourceLineNo">351</span><a name="line.351"></a>
-<span class="sourceLineNo">352</span> Put put = new Put(value);<a name="line.352"></a>
-<span class="sourceLineNo">353</span> put.addColumn(COLUMN_FAMILY_BYTES, Bytes.toBytes("abc"), value);<a name="line.353"></a>
-<span class="sourceLineNo">354</span> faultyLog.setFailureType(FaultyFSLog.FailureType.SYNC);<a name="line.354"></a>
-<span class="sourceLineNo">355</span> boolean threwIOE = false;<a name="line.355"></a>
-<span class="sourceLineNo">356</span> try {<a name="line.356"></a>
-<span class="sourceLineNo">357</span> region.put(put);<a name="line.357"></a>
-<span class="sourceLineNo">358</span> } catch (IOException ioe) {<a name="line.358"></a>
-<span class="sourceLineNo">359</span> threwIOE = true;<a name="line.359"></a>
-<span class="sourceLineNo">360</span> } finally {<a name="line.360"></a>
-<span class="sourceLineNo">361</span> assertTrue("The regionserver should have thrown an exception", threwIOE);<a name="line.361"></a>
-<span class="sourceLineNo">362</span> }<a name="line.362"></a>
-<span class="sourceLineNo">363</span> MemStoreSize mss = store.getFlushableSize();<a name="line.363"></a>
-<span class="sourceLineNo">364</span> assertTrue("flushable size should be zero, but it is " + mss,<a name="line.364"></a>
-<span class="sourceLineNo">365</span> mss.getDataSize() == 0);<a name="line.365"></a>
-<span class="sourceLineNo">366</span> HBaseTestingUtility.closeRegionAndWAL(region);<a name="line.366"></a>
-<span class="sourceLineNo">367</span> }<a name="line.367"></a>
-<span class="sourceLineNo">368</span><a name="line.368"></a>
-<span class="sourceLineNo">369</span> /**<a name="line.369"></a>
-<span class="sourceLineNo">370</span> * Create a WAL outside of the usual helper in<a name="line.370"></a>
-<span class="sourceLineNo">371</span> * {@link HBaseTestingUtility#createWal(Configuration, Path, RegionInfo)} because that method<a name="line.371"></a>
-<span class="sourceLineNo">372</span> * doesn't play nicely with FaultyFileSystem. Call this method before overriding<a name="line.372"></a>
-<span class="sourceLineNo">373</span> * {@code fs.file.impl}.<a name="line.373"></a>
-<span class="sourceLineNo">374</span> * @param callingMethod a unique component for the path, probably the name of the test method.<a name="line.374"></a>
-<span class="sourceLineNo">375</span> */<a name="line.375"></a>
-<span class="sourceLineNo">376</span> private static WAL createWALCompatibleWithFaultyFileSystem(String callingMethod,<a name="line.376"></a>
-<span class="sourceLineNo">377</span> Configuration conf, TableName tableName) throws IOException {<a name="line.377"></a>
-<span class="sourceLineNo">378</span> final Path logDir = TEST_UTIL.getDataTestDirOnTestFS(callingMethod + ".log");<a name="line.378"></a>
-<span class="sourceLineNo">379</span> final Configuration walConf = new Configuration(conf);<a name="line.379"></a>
-<span class="sourceLineNo">380</span> FSUtils.setRootDir(walConf, logDir);<a name="line.380"></a>
-<span class="sourceLineNo">381</span> return new WALFactory(walConf, callingMethod)<a name="line.381"></a>
-<span class="sourceLineNo">382</span> .getWAL(RegionInfoBuilder.newBuilder(tableName).build());<a name="line.382"></a>
-<span class="sourceLineNo">383</span> }<a name="line.383"></a>
-<span class="sourceLineNo">384</span><a name="line.384"></a>
-<span class="sourceLineNo">385</span> @Test<a name="line.385"></a>
-<span class="sourceLineNo">386</span> public void testMemstoreSizeAccountingWithFailedPostBatchMutate() throws IOException {<a name="line.386"></a>
-<span class="sourceLineNo">387</span> String testName = "testMemstoreSizeAccountingWithFailedPostBatchMutate";<a name="line.387"></a>
-<span class="sourceLineNo">388</span> FileSystem fs = FileSystem.get(CONF);<a name="line.388"></a>
-<span class="sourceLineNo">389</span> Path rootDir = new Path(dir + testName);<a name="line.389"></a>
-<span class="sourceLineNo">390</span> FSHLog hLog = new FSHLog(fs, rootDir, testName, CONF);<a name="line.390"></a>
-<span class="sourceLineNo">391</span> hLog.init();<a name="line.391"></a>
-<span class="sourceLineNo">392</span> HRegion region = initHRegion(tableName, null, null, false, Durability.SYNC_WAL, hLog,<a name="line.392"></a>
-<span class="sourceLineNo">393</span> COLUMN_FAMILY_BYTES);<a name="line.393"></a>
-<span class="sourceLineNo">394</span> HStore store = region.getStore(COLUMN_FAMILY_BYTES);<a name="line.394"></a>
-<span class="sourceLineNo">395</span> assertEquals(0, region.getMemStoreDataSize());<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span> // Put one value<a name="line.397"></a>
-<span class="sourceLineNo">398</span> byte [] value = Bytes.toBytes(method);<a name="line.398"></a>
-<span class="sourceLineNo">399</span> Put put = new Put(value);<a name="line.399"></a>
-<span class="sourceLineNo">400</span> put.addColumn(COLUMN_FAMILY_BYTES, Bytes.toBytes("abc"), value);<a name="line.400"></a>
-<span class="sourceLineNo">401</span> region.put(put);<a name="line.401"></a>
-<span class="sourceLineNo">402</span> long onePutSize = region.getMemStoreDataSize();<a name="line.402"></a>
-<span class="sourceLineNo">403</span> assertTrue(onePutSize > 0);<a name="line.403"></a>
-<span class="sourceLineNo">404</span><a name="line.404"></a>
-<span class="sourceLineNo">405</span> RegionCoprocessorHost mockedCPHost = Mockito.mock(RegionCoprocessorHost.class);<a name="line.405"></a>
-<span class="sourceLineNo">406</span> doThrow(new IOException())<a name="line.406"></a>
-<span class="sourceLineNo">407</span> .when(mockedCPHost).postBatchMutate(Mockito.<MiniBatchOperationInProgress<Mutation>>any());<a name="line.407"></a>
-<span class="sourceLineNo">408</span> region.setCoprocessorHost(mockedCPHost);<a name="line.408"></a>
-<span class="sourceLineNo">409</span><a name="line.409"></a>
-<span class="sourceLineNo">410</span> put = new Put(value);<a name="line.410"></a>
-<span class="sourceLineNo">411</span> put.addColumn(COLUMN_FAMILY_BYTES, Bytes.toBytes("dfg"), value);<a name="line.411"></a>
-<span class="sourceLineNo">412</span> try {<a name="line.412"></a>
-<span class="sourceLineNo">413</span> region.put(put);<a name="line.413"></a>
-<span class="sourceLineNo">414</span> fail("Should have failed with IOException");<a name="line.414"></a>
-<span class="sourceLineNo">415</span> } catch (IOException expected) {<a name="line.415"></a>
-<span class="sourceLineNo">416</span> }<a name="line.416"></a>
-<span class="sourceLineNo">417</span> long expectedSize = onePutSize * 2;<a name="line.417"></a>
-<span class="sourceLineNo">418</span> assertEquals("memstoreSize should be incremented",<a name="line.418"></a>
-<span class="sourceLineNo">419</span> expectedSize, region.getMemStoreDataSize());<a name="line.419"></a>
-<span class="sourceLineNo">420</span> assertEquals("flushable size should be incremented",<a name="line.420"></a>
-<span class="sourceLineNo">421</span> expectedSize, store.getFlushableSize().getDataSize());<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span> region.setCoprocessorHost(null);<a name="line.423"></a>
-<span class="sourceLineNo">424</span> HBaseTestingUtility.closeRegionAndWAL(region);<a name="line.424"></a>
+<span class="sourceLineNo">249</span> public void tearDown() throws IOException {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> // Region may have been closed, but it is still no harm if we close it again here using HTU.<a name="line.250"></a>
+<span class="sourceLineNo">251</span> HBaseTestingUtility.closeRegionAndWAL(region);<a name="line.251"></a>
+<span class="sourceLineNo">252</span> EnvironmentEdgeManagerTestHelper.reset();<a name="line.252"></a>
+<span class="sourceLineNo">253</span> LOG.info("Cleaning test directory: " + TEST_UTIL.getDataTestDir());<a name="line.253"></a>
+<span class="sourceLineNo">254</span> TEST_UTIL.cleanupTestDir();<a name="line.254"></a>
+<span class="sourceLineNo">255</span> }<a name="line.255"></a>
+<span class="sourceLineNo">256</span><a name="line.256"></a>
+<span class="sourceLineNo">257</span> /**<a name="line.257"></a>
+<span class="sourceLineNo">258</span> * Test that I can use the max flushed sequence id after the close.<a name="line.258"></a>
+<span class="sourceLineNo">259</span> * @throws IOException<a name="line.259"></a>
+<span class="sourceLineNo">260</span> */<a name="line.260"></a>
+<span class="sourceLineNo">261</span> @Test<a name="line.261"></a>
+<span class="sourceLineNo">262</span> public void testSequenceId() throws IOException {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> region = initHRegion(tableName, method, CONF, COLUMN_FAMILY_BYTES);<a name="line.263"></a>
+<span class="sourceLineNo">264</span> assertEquals(HConstants.NO_SEQNUM, region.getMaxFlushedSeqId());<a name="line.264"></a>
+<span class="sourceLineNo">265</span> // Weird. This returns 0 if no store files or no edits. Afraid to change it.<a name="line.265"></a>
+<span class="sourceLineNo">266</span> assertEquals(0, (long)region.getMaxStoreSeqId().get(COLUMN_FAMILY_BYTES));<a name="line.266"></a>
+<span class="sourceLineNo">267</span> region.close();<a name="line.267"></a>
+<span class="sourceLineNo">268</span> assertEquals(HConstants.NO_SEQNUM, region.getMaxFlushedSeqId());<a name="line.268"></a>
+<span class="sourceLineNo">269</span> assertEquals(0, (long)region.getMaxStoreSeqId().get(COLUMN_FAMILY_BYTES));<a name="line.269"></a>
+<span class="sourceLineNo">270</span> // Open region again.<a name="line.270"></a>
+<span class="sourceLineNo">271</span> region = initHRegion(tableName, method, CONF, COLUMN_FAMILY_BYTES);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> byte [] value = Bytes.toBytes(method);<a name="line.272"></a>
+<span class="sourceLineNo">273</span> // Make a random put against our cf.<a name="line.273"></a>
+<span class="sourceLineNo">274</span> Put put = new Put(value);<a name="line.274"></a>
+<span class="sourceLineNo">275</span> put.addColumn(COLUMN_FAMILY_BYTES, null, value);<a name="line.275"></a>
+<span class="sourceLineNo">276</span> region.put(put);<a name="line.276"></a>
+<span class="sourceLineNo">277</span> // No flush yet so init numbers should still be in place.<a name="line.277"></a>
+<span class="sourceLineNo">278</span> assertEquals(HConstants.NO_SEQNUM, region.getMaxFlushedSeqId());<a name="line.278"></a>
+<span class="sourceLineNo">279</span> assertEquals(0, (long)region.getMaxStoreSeqId().get(COLUMN_FAMILY_BYTES));<a name="line.279"></a>
+<span class="sourceLineNo">280</span> region.flush(true);<a name="line.280"></a>
+<span class="sourceLineNo">281</span> long max = region.getMaxFlushedSeqId();<a name="line.281"></a>
+<span class="sourceLineNo">282</span> region.close();<a name="line.282"></a>
+<span class="sourceLineNo">283</span> assertEquals(max, region.getMaxFlushedSeqId());<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> * Test for Bug 2 of HBASE-10466.<a name="line.287"></a>
+<span class="sourceLineNo">288</span> * "Bug 2: Conditions for the first flush of region close (so-called pre-flush) If memstoreSize<a name="line.288"></a>
+<span class="sourceLineNo">289</span> * is smaller than a certain value, or when region close starts a flush is ongoing, the first<a name="line.289"></a>
+<span class="sourceLineNo">290</span> * flush is skipped and only the second flush takes place. However, two flushes are required in<a name="line.290"></a>
+<span class="sourceLineNo">291</span> * case previous flush fails and leaves some data in snapshot. The bug could cause loss of data<a name="line.291"></a>
+<span class="sourceLineNo">292</span> * in current memstore. The fix is removing all conditions except abort check so we ensure 2<a name="line.292"></a>
+<span class="sourceLineNo">293</span> * flushes for region close."<a name="line.293"></a>
+<span class="sourceLineNo">294</span> * @throws IOException<a name="line.294"></a>
+<span class="sourceLineNo">295</span> */<a name="line.295"></a>
+<span class="sourceLineNo">296</span> @Test<a name="line.296"></a>
+<span class="sourceLineNo">297</span> public void testCloseCarryingSnapshot() throws IOException {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> region = initHRegion(tableName, method, CONF, COLUMN_FAMILY_BYTES);<a name="line.298"></a>
+<span class="sourceLineNo">299</span> HStore store = region.getStore(COLUMN_FAMILY_BYTES);<a name="line.299"></a>
+<span class="sourceLineNo">300</span> // Get some random bytes.<a name="line.300"></a>
+<span class="sourceLineNo">301</span> byte [] value = Bytes.toBytes(method);<a name="line.301"></a>
+<span class="sourceLineNo">302</span> // Make a random put against our cf.<a name="line.302"></a>
+<span class="sourceLineNo">303</span> Put put = new Put(value);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> put.addColumn(COLUMN_FAMILY_BYTES, null, value);<a name="line.304"></a>
+<span class="sourceLineNo">305</span> // First put something in current memstore, which will be in snapshot after flusher.prepare()<a name="line.305"></a>
+<span class="sourceLineNo">306</span> region.put(put);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> StoreFlushContext storeFlushCtx = store.createFlushContext(12345, FlushLifeCycleTracker.DUMMY);<a name="line.307"></a>
+<span class="sourceLineNo">308</span> storeFlushCtx.prepare();<a name="line.308"></a>
+<span class="sourceLineNo">309</span> // Second put something in current memstore<a name="line.309"></a>
+<span class="sourceLineNo">310</span> put.addColumn(COLUMN_FAMILY_BYTES, Bytes.toBytes("abc"), value);<a name="line.310"></a>
+<span class="sourceLineNo">311</span> region.put(put);<a name="line.311"></a>
+<span class="sourceLineNo">312</span> // Close with something in memstore and something in the snapshot. Make sure all is cleared.<a name="line.312"></a>
+<span class="sourceLineNo">313</span> region.close();<a name="line.313"></a>
+<span class="sourceLineNo">314</span> assertEquals(0, region.getMemStoreDataSize());<a name="line.314"></a>
+<span class="sourceLineNo">315</span> HBaseTestingUtility.closeRegionAndWAL(region);<a name="line.315"></a>
+<span class="sourceLineNo">316</span> }<a name="line.316"></a>
+<span class="sourceLineNo">317</span><a name="line.317"></a>
+<span class="sourceLineNo">318</span> /*<a name="line.318"></a>
+<span class="sourceLineNo">319</span> * This test is for verifying memstore snapshot size is correctly updated in case of rollback<a name="line.319"></a>
+<span class="sourceLineNo">320</span> * See HBASE-10845<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 testMemstoreSnapshotSize() throws IOException {<a name="line.323"></a>
+<span class="sourceLineNo">324</span> class MyFaultyFSLog extends FaultyFSLog {<a name="line.324"></a>
+<span class="sourceLineNo">325</span> StoreFlushContext storeFlushCtx;<a name="line.325"></a>
+<span class="sourceLineNo">326</span> public MyFaultyFSLog(FileSystem fs, Path rootDir, String logName, Configuration conf)<a name="line.326"></a>
+<span class="sourceLineNo">327</span> throws IOException {<a name="line.327"></a>
+<span class="sourceLineNo">328</span> super(fs, rootDir, logName, conf);<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> void setStoreFlushCtx(StoreFlushContext storeFlushCtx) {<a name="line.331"></a>
+<span class="sourceLineNo">332</span> this.storeFlushCtx = storeFlushCtx;<a name="line.332"></a>
+<span class="sourceLineNo">333</span> }<a name="line.333"></a>
+<span class="sourceLineNo">334</span><a name="line.334"></a>
+<span class="sourceLineNo">335</span> @Override<a name="line.335"></a>
+<span class="sourceLineNo">336</span> public void sync(long txid) throws IOException {<a name="line.336"></a>
+<span class="sourceLineNo">337</span> storeFlushCtx.prepare();<a name="line.337"></a>
+<span class="sourceLineNo">338</span> super.sync(txid);<a name="line.338"></a>
+<span class="sourceLineNo">339</span> }<a name="line.339"></a>
+<span class="sourceLineNo">340</span> }<a name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span> FileSystem fs = FileSystem.get(CONF);<a name="line.342"></a>
+<span class="sourceLineNo">343</span> Path rootDir = new Path(dir + "testMemstoreSnapshotSize");<a name="line.343"></a>
+<span class="sourceLineNo">344</span> MyFaultyFSLog faultyLog = new MyFaultyFSLog(fs, rootDir, "testMemstoreSnapshotSize", CONF);<a name="line.344"></a>
+<span class="sourceLineNo">345</span> faultyLog.init();<a name="line.345"></a>
+<span class="sourceLineNo">346</span> region = initHRegion(tableName, null, null, false, Durability.SYNC_WAL, faultyLog,<a name="line.346"></a>
+<span class="sourceLineNo">347</span> COLUMN_FAMILY_BYTES);<a name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span> HStore store = region.getStore(COLUMN_FAMILY_BYTES);<a name="line.349"></a>
+<span class="sourceLineNo">350</span> // Get some random bytes.<a name="line.350"></a>
+<span class="sourceLineNo">351</span> byte [] value = Bytes.toBytes(method);<a name="line.351"></a>
+<span class="sourceLineNo">352</span> faultyLog.setStoreFlushCtx(store.createFlushContext(12345, FlushLifeCycleTracker.DUMMY));<a name="line.352"></a>
+<span class="sourceLineNo">353</span><a name="line.353"></a>
+<span class="sourceLineNo">354</span> Put put = new Put(value);<a name="line.354"></a>
+<span class="sourceLineNo">355</span> put.addColumn(COLUMN_FAMILY_BYTES, Bytes.toBytes("abc"), value);<a name="line.355"></a>
+<span class="sourceLineNo">356</span> faultyLog.setFailureType(FaultyFSLog.FailureType.SYNC);<a name="line.356"></a>
+<span class="sourceLineNo">357</span> boolean threwIOE = false;<a name="line.357"></a>
+<span class="sourceLineNo">358</span> try {<a name="line.358"></a>
+<span class="sourceLineNo">359</span> region.put(put);<a name="line.359"></a>
+<span class="sourceLineNo">360</span> } catch (IOException ioe) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span> threwIOE = true;<a name="line.361"></a>
+<span class="sourceLineNo">362</span> } finally {<a name="line.362"></a>
+<span class="sourceLineNo">363</span> assertTrue("The regionserver should have thrown an exception", threwIOE);<a name="line.363"></a>
+<span class="sourceLineNo">364</span> }<a name="line.364"></a>
+<span class="sourceLineNo">365</span> MemStoreSize mss = store.getFlushableSize();<a name="line.365"></a>
+<span class="sourceLineNo">366</span> assertTrue("flushable size should be zero, but it is " + mss,<a name="line.366"></a>
+<span class="sourceLineNo">367</span> mss.getDataSize() == 0);<a name="line.367"></a>
+<span class="sourceLineNo">368</span> }<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> * Create a WAL outside of the usual helper in<a name="line.371"></a>
+<span class="sourceLineNo">372</span> * {@link HBaseTestingUtility#createWal(Configuration, Path, RegionInfo)} because that method<a name="line.372"></a>
+<span class="sourceLineNo">373</span> * doesn't play nicely with FaultyFileSystem. Call this method before overriding<a name="line.373"></a>
+<span class="sourceLineNo">374</span> * {@code fs.file.impl}.<a name="line.374"></a>
+<span class="sourceLineNo">375</span> * @param callingMethod a unique component for the path, probably the name of the test method.<a name="line.375"></a>
+<span class="sourceLineNo">376</span> */<a name="line.376"></a>
+<span class="sourceLineNo">377</span> private static WAL createWALCompatibleWithFaultyFileSystem(String callingMethod,<a name="line.377"></a>
+<span class="sourceLineNo">378</span> Configuration conf, TableName tableName) throws IOException {<a name="line.378"></a>
+<span class="sourceLineNo">379</span> final Path logDir = TEST_UTIL.getDataTestDirOnTestFS(callingMethod + ".log");<a name="line.379"></a>
+<span class="sourceLineNo">380</span> final Configuration walConf = new Configuration(conf);<a name="line.380"></a>
+<span class="sourceLineNo">381</span> FSUtils.setRootDir(walConf, logDir);<a name="line.381"></a>
+<span class="sourceLineNo">382</span> return new WALFactory(walConf, callingMethod)<a name="line.382"></a>
+<span class="sourceLineNo">383</span> .getWAL(RegionInfoBuilder.newBuilder(tableName).build());<a name="line.383"></a>
+<span class="sourceLineNo">384</span> }<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span> @Test<a name="line.386"></a>
+<span class="sourceLineNo">387</span> public void testMemstoreSizeAccountingWithFailedPostBatchMutate() throws IOException {<a name="line.387"></a>
+<span class="sourceLineNo">388</span> String testName = "testMemstoreSizeAccountingWithFailedPostBatchMutate";<a name="line.388"></a>
+<span class="sourceLineNo">389</span> FileSystem fs = FileSystem.get(CONF);<a name="line.389"></a>
+<span class="sourceLineNo">390</span> Path rootDir = new Path(dir + testName);<a name="line.390"></a>
+<span class="sourceLineNo">391</span> FSHLog hLog = new FSHLog(fs, rootDir, testName, CONF);<a name="line.391"></a>
+<span class="sourceLineNo">392</span> hLog.init();<a name="line.392"></a>
+<span class="sourceLineNo">393</span> region = initHRegion(tableName, null, null, false, Durability.SYNC_WAL, hLog,<a name="line.393"></a>
+<span class="sourceLineNo">394</span> COLUMN_FAMILY_BYTES);<a name="line.394"></a>
+<span class="sourceLineNo">395</span> HStore store = region.getStore(COLUMN_FAMILY_BYTES);<a name="line.395"></a>
+<span class="sourceLineNo">396</span> assertEquals(0, region.getMemStoreDataSize());<a name="line.396"></a>
+<span class="sourceLineNo">397</span><a name="line.397"></a>
+<span class="sourceLineNo">398</span> // Put one value<a name="line.398"></a>
+<span class="sourceLineNo">399</span> byte [] value = Bytes.toBytes(method);<a name="line.399"></a>
+<span class="sourceLineNo">400</span> Put put = new Put(value);<a name="line.400"></a>
+<span class="sourceLineNo">401</span> put.addColumn(COLUMN_FAMILY_BYTES, Bytes.toBytes("abc"), value);<a name="line.401"></a>
+<span class="sourceLineNo">402</span> region.put(put);<a name="line.402"></a>
+<span class="sourceLineNo">403</span> long onePutSize = region.getMemStoreDataSize();<a name="line.403"></a>
+<span class="sourceLineNo">404</span> assertTrue(onePutSize > 0);<a name="line.404"></a>
+<span class="sourceLineNo">405</span><a name="line.405"></a>
+<span class="sourceLineNo">406</span> RegionCoprocessorHost mockedCPHost = Mockito.mock(RegionCoprocessorHost.class);<a name="line.406"></a>
+<span class="sourceLineNo">407</span> doThrow(new IOException())<a name="line.407"></a>
+<span class="sourceLineNo">408</span> .when(mockedCPHost).postBatchMutate(Mockito.<MiniBatchOperationInProgress<Mutation>>any());<a name="line.408"></a>
+<span class="sourceLineNo">409</span> region.setCoprocessorHost(mockedCPHost);<a name="line.409"></a>
+<span class="sourceLineNo">410</span><a name="line.410"></a>
+<span class="sourceLineNo">411</span> put = new Put(value);<a name="line.411"></a>
+<span class="sourceLineNo">412</span> put.addColumn(COLUMN_FAMILY_BYTES, Bytes.toBytes("dfg"), value);<a name="line.412"></a>
+<span class="sourceLineNo">413</span> try {<a name="line.413"></a>
+<span class="sourceLineNo">414</span> region.put(put);<a name="line.414"></a>
+<span class="sourceLineNo">415</span> fail("Should have failed with IOException");<a name="line.415"></a>
+<span class="sourceLineNo">416</span> } catch (IOException expected) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span> }<a name="line.417"></a>
+<span class="sourceLineNo">418</span> long expectedSize = onePutSize * 2;<a name="line.418"></a>
+<span class="sourceLineNo">419</span> assertEquals("memstoreSize should be incremented",<a name="line.419"></a>
+<span class="sourceLineNo">420</span> expectedSize, region.getMemStoreDataSize());<a name="line.420"></a>
+<span class="sourceLineNo">421</span> assertEquals("flushable size should be incremented",<a name="line.421"></a>
+<span class="sourceLineNo">422</span> expectedSize, store.getFlushableSize().getDataSize());<a name="line.422"></a>
+<span class="sourceLineNo">423</span><a name="line.423"></a>
+<span class="sourceLineNo">424</span> region.setCoprocessorHost(null);<a name="line.424"></a>
<span class="sourceLineNo">425</span> }<a name="line.425"></a>
<span class="sourceLineNo">426</span><a name="line.426"></a>
<span class="sourceLineNo">427</span> /**<a name="line.427"></a>
@@ -786,5835 +786,5513 @@
<span class="sourceLineNo">778</span> public void testSkipRecoveredEditsReplayAllIgnored() throws Exception {<a name="line.778"></a>
<span class="sourceLineNo">779</span> byte[] family = Bytes.toBytes("family");<a name="line.779"></a>
<span class="sourceLineNo">780</span> this.region = initHRegion(tableName, method, CONF, family);<a name="line.780"></a>
-<span class="sourceLineNo">781</span> try {<a name="line.781"></a>
-<span class="sourceLineNo">782</span> Path regiondir = region.getRegionFileSystem().getRegionDir();<a name="line.782"></a>
-<span class="sourceLineNo">783</span> FileSystem fs = region.getRegionFileSystem().getFileSystem();<a name="line.783"></a>
-<span class="sourceLineNo">784</span><a name="line.784"></a>
-<span class="sourceLineNo">785</span> Path recoveredEditsDir = WALSplitter.getRegionDirRecoveredEditsDir(regiondir);<a name="line.785"></a>
-<span class="sourceLineNo">786</span> for (int i = 1000; i < 1050; i += 10) {<a name="line.786"></a>
-<span class="sourceLineNo">787</span> Path recoveredEdits = new Path(recoveredEditsDir, String.format("%019d", i));<a name="line.787"></a>
-<span class="sourceLineNo">788</span> FSDataOutputStream dos = fs.create(recoveredEdits);<a name="line.788"></a>
-<span class="sourceLineNo">789</span> dos.writeInt(i);<a name="line.789"></a>
-<span class="sourceLineNo">790</span> dos.close();<a name="line.790"></a>
-<span class="sourceLineNo">791</span> }<a name="line.791"></a>
-<span class="sourceLineNo">792</span> long minSeqId = 2000;<a name="line.792"></a>
-<span class="sourceLineNo">793</span> Path recoveredEdits = new Path(recoveredEditsDir, String.format("%019d", minSeqId - 1));<a name="line.793"></a>
-<span class="sourceLineNo">794</span> FSDataOutputStream dos = fs.create(recoveredEdits);<a name="line.794"></a>
-<span class="sourceLineNo">795</span> dos.close();<a name="line.795"></a>
-<span class="sourceLineNo">796</span><a name="line.796"></a>
-<span class="sourceLineNo">797</span> Map<byte[], Long> maxSeqIdInStores = new TreeMap<>(Bytes.BYTES_COMPARATOR);<a name="line.797"></a>
-<span class="sourceLineNo">798</span> for (HStore store : region.getStores()) {<a name="line.798"></a>
-<span class="sourceLineNo">799</span> maxSeqIdInStores.put(Bytes.toBytes(store.getColumnFamilyName()), minSeqId);<a name="line.799"></a>
-<span class="sourceLineNo">800</span> }<a name="line.800"></a>
-<span class="sourceLineNo">801</span> long seqId = region.replayRecoveredEditsIfAny(regiondir, maxSeqIdInStores, null, null);<a name="line.801"></a>
-<span class="sourceLineNo">802</span> assertEquals(minSeqId, seqId);<a name="line.802"></a>
-<span class="sourceLineNo">803</span> } finally {<a name="line.803"></a>
-<span class="sourceLineNo">804</span> HBaseTestingUtility.closeRegionAndWAL(this.region);<a name="line.804"></a>
-<span class="sourceLineNo">805</span> this.region = null;<a name="line.805"></a>
-<span class="sourceLineNo">806</span> }<a name="line.806"></a>
-<span class="sourceLineNo">807</span> }<a name="line.807"></a>
-<span class="sourceLineNo">808</span><a name="line.808"></a>
-<span class="sourceLineNo">809</span> @Test<a name="line.809"></a>
-<span class="sourceLineNo">810</span> public void testSkipRecoveredEditsReplayTheLastFileIgnored() throws Exception {<a name="line.810"></a>
-<span class="sourceLineNo">811</span> byte[] family = Bytes.toBytes("family");<a name="line.811"></a>
-<span class="sourceLineNo">812</span> this.region = initHRegion(tableName, method, CONF, family);<a name="line.812"></a>
-<span class="sourceLineNo">813</span> final WALFactory wals = new WALFactory(CONF, method);<a name="line.813"></a>
-<span class="sourceLineNo">814</span> try {<a name="line.814"></a>
-<span class="sourceLineNo">815</span> Path regiondir = region.getRegionFileSystem().getRegionDir();<a name="line.815"></a>
-<span class="sourceLineNo">816</span> FileSystem fs = region.getRegionFileSystem().getFileSystem();<a name="line.816"></a>
-<span class="sourceLineNo">817</span> byte[] regionName = region.getRegionInfo().getEncodedNameAsBytes();<a name="line.817"></a>
-<span class="sourceLineNo">818</span> byte[][] columns = region.getTableDescriptor().getColumnFamilyNames().toArray(new byte[0][]);<a name="line.818"></a>
-<span class="sourceLineNo">819</span><a name="line.819"></a>
-<span class="sourceLineNo">820</span> assertEquals(0, region.getStoreFileList(columns).size());<a name="line.820"></a>
+<span class="sourceLineNo">781</span> Path regiondir = region.getRegionFileSystem().getRegionDir();<a name="line.781"></a>
+<span class="sourceLineNo">782</span> FileSystem fs = region.getRegionFileSystem().getFileSystem();<a name="line.782"></a>
+<span class="sourceLineNo">783</span><a name="line.783"></a>
+<span class="sourceLineNo">784</span> Path recoveredEditsDir = WALSplitter.getRegionDirRecoveredEditsDir(regiondir);<a name="line.784"></a>
+<span class="sourceLineNo">785</span> for (int i = 1000; i < 1050; i += 10) {<a name="line.785"></a>
+<span class="sourceLineNo">786</span> Path recoveredEdits = new Path(recoveredEditsDir, String.format("%019d", i));<a name="line.786"></a>
+<span class="sourceLineNo">787</span> FSDataOutputStream dos = fs.create(recoveredEdits);<a name="line.787"></a>
+<span class="sourceLineNo">788</span> dos.writeInt(i);<a name="line.788"></a>
+<span class="sourceLineNo">789</span> dos.close();<a name="line.789"></a>
+<span class="sourceLineNo">790</span> }<a name="line.790"></a>
+<span class="sourceLineNo">791</span> long minSeqId = 2000;<a name="line.791"></a>
+<span class="sourceLineNo">792</span> Path recoveredEdits = new Path(recoveredEditsDir, String.format("%019d", minSeqId - 1));<a name="line.792"></a>
+<span class="sourceLineNo">793</span> FSDataOutputStream dos = fs.create(recoveredEdits);<a name="line.793"></a>
+<span class="sourceLineNo">794</span> dos.close();<a name="line.794"></a>
+<span class="sourceLineNo">795</span><a name="line.795"></a>
+<span class="sourceLineNo">796</span> Map<byte[], Long> maxSeqIdInStores = new TreeMap<>(Bytes.BYTES_COMPARATOR);<a name="line.796"></a>
+<span class="sourceLineNo">797</span> for (HStore store : region.getStores()) {<a name="line.797"></a>
+<span class="sourceLineNo">798</span> maxSeqIdInStores.put(Bytes.toBytes(store.getColumnFamilyName()), minSeqId);<a name="line.798"></a>
+<span class="sourceLineNo">799</span> }<a name="line.799"></a>
+<span class="sourceLineNo">800</span> long seqId = region.replayRecoveredEditsIfAny(regiondir, maxSeqIdInStores, null, null);<a name="line.800"></a>
+<span class="sourceLineNo">801</span> assertEquals(minSeqId, seqId);<a name="line.801"></a>
+<span class="sourceLineNo">802</span> }<a name="line.802"></a>
+<span class="sourceLineNo">803</span><a name="line.803"></a>
+<span class="sourceLineNo">804</span> @Test<a name="line.804"></a>
+<span class="sourceLineNo">805</span> public void testSkipRecoveredEditsReplayTheLastFileIgnored() throws Exception {<a name="line.805"></a>
+<span class="sourceLineNo">806</span> byte[] family = Bytes.toBytes("family");<a name="line.806"></a>
+<span class="sourceLineNo">807</span> this.region = initHRegion(tableName, method, CONF, family);<a name="line.807"></a>
+<span class="sourceLineNo">808</span> final WALFactory wals = new WALFactory(CONF, method);<a name="line.808"></a>
+<span class="sourceLineNo">809</span> try {<a name="line.809"></a>
+<span class="sourceLineNo">810</span> Path regiondir = region.getRegionFileSystem().getRegionDir();<a name="line.810"></a>
+<span class="sourceLineNo">811</span> FileSystem fs = region.getRegionFileSystem().getFileSystem();<a name="line.811"></a>
+<span class="sourceLineNo">812</span> byte[] regionName = region.getRegionInfo().getEncodedNameAsBytes();<a name="line.812"></a>
+<span class="sourceLineNo">813</span> byte[][] columns = region.getTableDescriptor().getColumnFamilyNames().toArray(new byte[0][]);<a name="line.813"></a>
+<span class="sourceLineNo">814</span><a name="line.814"></a>
+<span class="sourceLineNo">815</span> assertEquals(0, region.getStoreFileList(columns).size());<a name="line.815"></a>
+<span class="sourceLineNo">816</span><a name="line.816"></a>
+<span class="sourceLineNo">817</span> Path recoveredEditsDir = WALSplitter.getRegionDirRecoveredEditsDir(regiondir);<a name="line.817"></a>
+<span class="sourceLineNo">818</span><a name="line.818"></a>
+<span class="sourceLineNo">819</span> long maxSeqId = 1050;<a name="line.819"></a>
+<span class="sourceLineNo">820</span> long minSeqId = 1000;<a name="line.820"></a>
<span class="sourceLineNo">821</span><a name="line.821"></a>
-<span class="sourceLineNo">822</span> Path recoveredEditsDir = WALSplitter.getRegionDirRecoveredEditsDir(regiondir);<a name="line.822"></a>
-<span class="sourceLineNo">823</span><a name="line.823"></a>
-<span class="sourceLineNo">824</span> long maxSeqId = 1050;<a name="line.824"></a>
-<span class="sourceLineNo">825</span> long minSeqId = 1000;<a name="line.825"></a>
+<span class="sourceLineNo">822</span> for (long i = minSeqId; i <= maxSeqId; i += 10) {<a name="line.822"></a>
+<span class="sourceLineNo">823</span> Path recoveredEdits = new Path(recoveredEditsDir, String.format("%019d", i));<a name="line.823"></a>
+<span class="sourceLineNo">824</span> fs.create(recoveredEdits);<a name="line.824"></a>
+<span class="sourceLineNo">825</span> WALProvider.Writer writer = wals.createRecoveredEditsWriter(fs, recoveredEdits);<a name="line.825"></a>
<span class="sourceLineNo">826</span><a name="line.826"></a>
-<span class="sourceLineNo">827</span> for (long i = minSeqId; i <= maxSeqId; i += 10) {<a name="line.827"></a>
-<span class="sourceLineNo">828</span> Path recoveredEdits = new Path(recoveredEditsDir, String.format("%019d", i));<a name="line.828"></a>
-<span class="sourceLineNo">829</span> fs.create(recoveredEdits);<a name="line.829"></a>
-<span class="sourceLineNo">830</span> WALProvider.Writer writer = wals.createRecoveredEditsWriter(fs, recoveredEdits);<a name="line.830"></a>
-<span class="sourceLineNo">831</span><a name="line.831"></a>
-<span class="sourceLineNo">832</span> long time = System.nanoTime();<a name="line.832"></a>
-<span class="sourceLineNo">833</span> WALEdit edit = null;<a name="line.833"></a>
-<span class="sourceLineNo">834</span> if (i == maxSeqId) {<a name="line.834"></a>
-<span class="sourceLineNo">835</span> edit = WALEdit.createCompaction(region.getRegionInfo(),<a name="line.835"></a>
-<span class="sourceLineNo">836</span> CompactionDescriptor.newBuilder()<a name="line.836"></a>
-<span class="sourceLineNo">837</span> .setTableName(ByteString.copyFrom(tableName.getName()))<a name="line.837"></a>
-<span class="sourceLineNo">838</span> .setFamilyName(ByteString.copyFrom(regionName))<a name="line.838"></a>
-<span class="sourceLineNo">839</span> .setEncodedRegionName(ByteString.copyFrom(regionName))<a name="line.839"></a>
-<span class="sourceLineNo">840</span> .setStoreHomeDirBytes(ByteString.copyFrom(Bytes.toBytes(regiondir.toString())))<a name="line.840"></a>
-<span class="sourceLineNo">841</span> .setRegionName(ByteString.copyFrom(region.getRegionInfo().getRegionName()))<a name="line.841"></a>
-<span class="sourceLineNo">842</span> .build());<a name="line.842"></a>
-<span class="sourceLineNo">843</span> } else {<a name="line.843"></a>
-<span class="sourceLineNo">844</span> edit = new WALEdit();<a name="line.844"></a>
-<span class="sourceLineNo">845</span> edit.add(new KeyValue(row, family, Bytes.toBytes(i), time, KeyValue.Type.Put, Bytes<a name="line.845"></a>
-<span class="sourceLineNo">846</span> .toBytes(i)));<a name="line.846"></a>
-<span class="sourceLineNo">847</span> }<a name="line.847"></a>
-<span class="sourceLineNo">848</span> writer.append(new WAL.Entry(new WALKeyImpl(regionName, tableName, i, time,<a name="line.848"></a>
-<span class="sourceLineNo">849</span> HConstants.DEFAULT_CLUSTER_ID), edit));<a name="line.849"></a>
-<span class="sourceLineNo">850</span> writer.close();<a name="line.850"></a>
-<span class="sourceLineNo">851</span> }<a name="line.851"></a>
-<span class="sourceLineNo">852</span><a name="line.852"></a>
-<span class="sourceLineNo">853</span> long recoverSeqId = 1030;<a name="line.853"></a>
-<span class="sourceLineNo">854</span> Map<byte[], Long> maxSeqIdInStores = new TreeMap<>(Bytes.BYTES_COMPARATOR);<a name="line.854"></a>
-<span class="sourceLineNo">855</span> MonitoredTask status = TaskMonitor.get().createStatus(method);<a name="line.855"></a>
-<span class="sourceLineNo">856</span> for (HStore store : region.getStores()) {<a name="line.856"></a>
-<span class="sourceLineNo">857</span> maxSeqIdInStores.put(Bytes.toBytes(store.getColumnFamilyName()), recoverSeqId - 1);<a name="line.857"></a>
-<span class="sourceLineNo">858</span> }<a name="line.858"></a>
-<span class="sourceLineNo">859</span> long seqId = region.replayRecoveredEditsIfAny(regiondir, maxSeqIdInStores, null, status);<a name="line.859"></a>
-<span class="sourceLineNo">860</span> assertEquals(maxSeqId, seqId);<a name="line.860"></a>
-<span class="sourceLineNo">861</span><a name="line.861"></a>
-<span class="sourceLineNo">862</span> // assert that the files are flushed<a name="line.862"></a>
-<span class="sourceLineNo">863</span> assertEquals(1, region.getStoreFileList(columns).size());<a name="line.863"></a>
-<span class="sourceLineNo">864</span><a name="line.864"></a>
-<span class="sourceLineNo">865</span> } finally {<a name="line.865"></a>
-<span class="sourceLineNo">866</span> HBaseTestingUtility.closeRegionAndWAL(this.region);<a name="line.866"></a>
-<span class="sourceLineNo">867</span> this.region = null;<a name="line.867"></a>
-<span class="sourceLineNo">868</span> wals.close();<a name="line.868"></a>
-<span class="sourceLineNo">869</span> }<a name="line.869"></a>
-<span class="sourceLineNo">870</span> }<a name="line.870"></a>
-<span class="sourceLineNo">871</span><a name="line.871"></a>
-<span class="sourceLineNo">872</span> @Test<a name="line.872"></a>
-<span class="sourceLineNo">873</span> public void testRecoveredEditsReplayCompaction() throws Exception {<a name="line.873"></a>
-<span class="sourceLineNo">874</span> testRecoveredEditsReplayCompaction(false);<a name="line.874"></a>
-<span class="sourceLineNo">875</span> testRecoveredEditsReplayCompaction(true);<a name="line.875"></a>
-<span class="sourceLineNo">876</span> }<a name="line.876"></a>
-<span class="sourceLineNo">877</span><a name="line.877"></a>
-<span class="sourceLineNo">878</span> public void testRecoveredEditsReplayCompaction(boolean mismatchedRegionName) throws Exception {<a name="line.878"></a>
-<span class="sourceLineNo">879</span> CONF.setClass(HConstants.REGION_IMPL, HRegionForTesting.class, Region.class);<a name="line.879"></a>
-<span class="sourceLineNo">880</span> byte[] family = Bytes.toBytes("family");<a name="line.880"></a>
-<span class="sourceLineNo">881</span> this.region = initHRegion(tableName, method, CONF, family);<a name="line.881"></a>
-<span class="sourceLineNo">882</span> final WALFactory wals = new WALFactory(CONF, method);<a name="line.882"></a>
-<span class="sourceLineNo">883</span> try {<a name="line.883"></a>
-<span class="sourceLineNo">884</span> Path regiondir = region.getRegionFileSystem().getRegionDir();<a name="line.884"></a>
-<span class="sourceLineNo">885</span> FileSystem fs = region.getRegionFileSystem().getFileSystem();<a name="line.885"></a>
-<span class="sourceLineNo">886</span> byte[] regionName = region.getRegionInfo().getEncodedNameAsBytes();<a name="line.886"></a>
-<span class="sourceLineNo">887</span><a name="line.887"></a>
-<span class="sourceLineNo">888</span> long maxSeqId = 3;<a name="line.888"></a>
-<span class="sourceLineNo">889</span> long minSeqId = 0;<a name="line.889"></a>
-<span class="sourceLineNo">890</span><a name="line.890"></a>
-<span class="sourceLineNo">891</span> for (long i = minSeqId; i < maxSeqId; i++) {<a name="line.891"></a>
-<span class="sourceLineNo">892</span> Put put = new Put(Bytes.toBytes(i));<a name="line.892"></a>
-<span class="sourceLineNo">893</span> put.addColumn(family, Bytes.toBytes(i), Bytes.toBytes(i));<a name="line.893"></a>
-<span class="sourceLineNo">894</span> region.put(put);<a name="line.894"></a>
-<span class="sourceLineNo">895</span> region.flush(true);<a name="line.895"></a>
-<span class="sourceLineNo">896</span> }<a name="line.896"></a>
-<span class="sourceLineNo">897</span><a name="line.897"></a>
-<span class="sourceLineNo">898</span> // this will create a region with 3 files<a name="line.898"></a>
-<span class="sourceLineNo">899</span> assertEquals(3, region.getStore(family).getStorefilesCount());<a name="line.899"></a>
-<span class="sourceLineNo">900</span> List<Path> storeFiles = new ArrayList<>(3);<a name="line.900"></a>
-<span class="sourceLineNo">901</span> for (HStoreFile sf : region.getStore(family).getStorefiles()) {<a name="line.901"></a>
-<span class="sourceLineNo">902</span> storeFiles.add(sf.getPath());<a name="line.902"></a>
-<span class="sourceLineNo">903</span> }<a name="line.903"></a>
-<span class="sourceLineNo">904</span><a name="line.904"></a>
-<span class="sourceLineNo">905</span> // disable compaction completion<a name="line.905"></a>
-<span class="sourceLineNo">906</span> CONF.setBoolean("hbase.hstore.compaction.complete", false);<a name="line.906"></a>
-<span class="sourceLineNo">907</span> region.compactStores();<a name="line.907"></a>
-<span class="sourceLineNo">908</span><a name="line.908"></a>
-<span class="sourceLineNo">909</span> // ensure that nothing changed<a name="line.909"></a>
-<span class="sourceLineNo">910</span> assertEquals(3, region.getStore(family).getStorefilesCount());<a name="line.910"></a>
-<span class="sourceLineNo">911</span><a name="line.911"></a>
-<span class="sourceLineNo">912</span> // now find the compacted file, and manually add it to the recovered edits<a name="line.912"></a>
-<span class="sourceLineNo">913</span> Path tmpDir = new Path(region.getRegionFileSystem().getTempDir(), Bytes.toString(family));<a name="line.913"></a>
-<span class="sourceLineNo">914</span> FileStatus[] files = FSUtils.listStatus(fs, tmpDir);<a name="line.914"></a>
-<span class="sourceLineNo">915</span> String errorMsg = "Expected to find 1 file in the region temp directory "<a name="line.915"></a>
-<span class="sourceLineNo">916</span> + "from the compaction, could not find any";<a name="line.916"></a>
-<span class="sourceLineNo">917</span> assertNotNull(errorMsg, files);<a name="line.917"></a>
-<span class="sourceLineNo">918</span> assertEquals(errorMsg, 1, files.length);<a name="line.918"></a>
-<span class="sourceLineNo">919</span> // move the file inside region dir<a name="line.919"></a>
-<span class="sourceLineNo">920</span> Path newFile = region.getRegionFileSystem().commitStoreFile(Bytes.toString(family),<a name="line.920"></a>
-<span class="sourceLineNo">921</span> files[0].getPath());<a name="line.921"></a>
-<span class="sourceLineNo">922</span><a name="line.922"></a>
-<span class="sourceLineNo">923</span> byte[] encodedNameAsBytes = this.region.getRegionInfo().getEncodedNameAsBytes();<a name="line.923"></a>
-<span class="sourceLineNo">924</span> byte[] fakeEncodedNameAsBytes = new byte [encodedNameAsBytes.length];<a name="line.924"></a>
-<span class="sourceLineNo">925</span> for (int i=0; i < encodedNameAsBytes.length; i++) {<a name="line.925"></a>
-<span class="sourceLineNo">926</span> // Mix the byte array to have a new encodedName<a name="line.926"></a>
-<span class="sourceLineNo">927</span> fakeEncodedNameAsBytes[i] = (byte) (encodedNameAsBytes[i] + 1);<a name="line.927"></a>
-<span class="sourceLineNo">928</span> }<a name="line.928"></a>
+<span class="sourceLineNo">827</span> long time = System.nanoTime();<a name="line.827"></a>
+<span class="sourceLineNo">828</span> WALEdit edit = null;<a name="line.828"></a>
+<span class="sourceLineNo">829</span> if (i == maxSeqId) {<a name="line.829"></a>
+<span class="sourceLineNo">830</span> edit = WALEdit.createCompaction(region.getRegionInfo(),<a name="line.830"></a>
+<span class="sourceLineNo">831</span> CompactionDescriptor.newBuilder()<a name="line.831"></a>
+<span class="sourceLineNo">832</span> .setTableName(ByteString.copyFrom(tableName.getName()))<a name="line.832"></a>
+<span class="sourceLineNo">833</span> .setFamilyName(ByteString.copyFrom(regionName))<a name="line.833"></a>
+<span class="sourceLineNo">834</span> .setEncodedRegionName(ByteString.copyFrom(regionName))<a name="line.834"></a>
+<span class="sourceLineNo">835</span> .setStoreHomeDirBytes(ByteString.copyFrom(Bytes.toBytes(regiondir.toString())))<a name="line.835"></a>
+<span class="sourceLineNo">836</span> .setRegionName(ByteString.copyFrom(region.getRegionInfo().getRegionName()))<a name="line.836"></a>
+<span class="sourceLineNo">837</span> .build());<a name="line.837"></a>
+<span class="sourceLineNo">838</span> } else {<a name="line.838"></a>
+<span class="sourceLineNo">839</span> edit = new WALEdit();<a name="line.839"></a>
+<span class="sourceLineNo">840</span> edit.add(new KeyValue(row, family, Bytes.toBytes(i), time, KeyValue.Type.Put, Bytes<a name="line.840"></a>
+<span class="sourceLineNo">841</span> .toBytes(i)));<a name="line.841"></a>
+<span class="sourceLineNo">842</span> }<a name="line.842"></a>
+<span class="sourceLineNo">843</span> writer.append(new WAL.Entry(new WALKeyImpl(regionName, tableName, i, time,<a name="line.843"></a>
+<span class="sourceLineNo">844</span> HConstants.DEFAULT_CLUSTER_ID), edit));<a name="line.844"></a>
+<span class="sourceLineNo">845</span> writer.close();<a name="line.845"></a>
+<span class="sourceLineNo">846</span> }<a name="line.846"></a>
+<span class="sourceLineNo">847</span><a name="line.847"></a>
+<span class="sourceLineNo">848</span> long recoverSeqId = 1030;<a name="line.848"></a>
+<span class="sourceLineNo">849</span> Map<byte[], Long> maxSeqIdInStores = new TreeMap<>(Bytes.BYTES_COMPARATOR);<a name="line.849"></a>
+<span class="sourceLineNo">850</span> MonitoredTask status = TaskMonitor.get().createStatus(method);<a name="line.850"></a>
+<span class="sourceLineNo">851</span> for (HStore store : region.getStores()) {<a name="line.851"></a>
+<span class="sourceLineNo">852</span> maxSeqIdInStores.put(Bytes.toBytes(store.getColumnFamilyName()), recoverSeqId - 1);<a name="line.852"></a>
+<span class="sourceLineNo">853</span> }<a name="line.853"></a>
+<span class="sourceLineNo">854</span> long seqId = region.replayRecoveredEditsIfAny(regiondir, maxSeqIdInStores, null, status);<a name="line.854"></a>
+<span class="sourceLineNo">855</span> assertEquals(maxSeqId, seqId);<a name="line.855"></a>
+<span class="sourceLineNo">856</span><a name="line.856"></a>
+<span class="sourceLineNo">857</span> // assert that the files are flushed<a name="line.857"></a>
+<span class="sourceLineNo">858</span> assertEquals(1, region.getStoreFileList(columns).size());<a name="line.858"></a>
+<span class="sourceLineNo">859</span><a name="line.859"></a>
+<span class="sourceLineNo">860</span> } finally {<a name="line.860"></a>
+<span class="sourceLineNo">861</span> HBaseTestingUtility.closeRegionAndWAL(this.region);<a name="line.861"></a>
+<span class="sourceLineNo">862</span> this.region = null;<a name="line.862"></a>
+<span class="sourceLineNo">863</span> wals.close();<a name="line.863"></a>
+<span class="sourceLineNo">864</span> }<a name="line.864"></a>
+<span class="sourceLineNo">865</span> }<a name="line.865"></a>
+<span class="sourceLineNo">866</span><a name="line.866"></a>
+<span class="sourceLineNo">867</span> @Test<a name="line.867"></a>
+<span class="sourceLineNo">868</span> public void testRecoveredEditsReplayCompaction() throws Exception {<a name="line.868"></a>
+<span class="sourceLineNo">869</span> testRecoveredEditsReplayCompaction(false);<a name="line.869"></a>
+<span class="sourceLineNo">870</span> testRecoveredEditsReplayCompaction(true);<a name="line.870"></a>
+<span class="sourceLineNo">871</span> }<a name="line.871"></a>
+<span class="sourceLineNo">872</span><a name="line.872"></a>
+<span class="sourceLineNo">873</span> public void testRecoveredEditsReplayCompaction(boolean mismatchedRegionName) throws Exception {<a name="line.873"></a>
+<span class="sourceLineNo">874</span> CONF.setClass(HConstants.REGION_IMPL, HRegionForTesting.class, Region.class);<a name="line.874"></a>
+<span class="sourceLineNo">875</span> byte[] family = Bytes.toBytes("family");<a name="line.875"></a>
+<span class="sourceLineNo">876</span> this.region = initHRegion(tableName, method, CONF, family);<a name="line.876"></a>
+<span class="sourceLineNo">877</span> final WALFactory wals = new WALFactory(CONF, method);<a name="line.877"></a>
+<span class="sourceLineNo">878</span> try {<a name="line.878"></a>
+<span class="sourceLineNo">879</span> Path regiondir = region.getRegionFileSystem().getRegionDir();<a name="line.879"></a>
+<span class="sourceLineNo">880</span> FileSystem fs = region.getRegionFileSystem().getFileSystem();<a name="line.880"></a>
+<span class="sourceLineNo">881</span> byte[] regionName = region.getRegionInfo().getEncodedNameAsBytes();<a name="line.881"></a>
+<span class="sourceLineNo">882</span><a name="line.882"></a>
+<span class="sourceLineNo">883</span> long maxSeqId = 3;<a name="line.883"></a>
+<span class="sourceLineNo">884</span> long minSeqId = 0;<a name="line.884"></a>
+<span class="sourceLineNo">885</span><a name="line.885"></a>
+<span class="sourceLineNo">886</span> for (long i = minSeqId; i < maxSeqId; i++) {<a name="line.886"></a>
+<span class="sourceLineNo">887</span> Put put = new Put(Bytes.toBytes(i));<a name="line.887"></a>
+<span class="sourceLineNo">888</span> put.addColumn(family, Bytes.toBytes(i), Bytes.toBytes(i));<a name="line.888"></a>
+<span class="sourceLineNo">889</span> region.put(put);<a name="line.889"></a>
+<span class="sourceLineNo">890</span> region.flush(true);<a name="line.890"></a>
+<span class="sourceLineNo">891</span> }<a name="line.891"></a>
+<span class="sourceLineNo">892</span><a name="line.892"></a>
+<span class="sourceLineNo">893</span> // this will create a region with 3 files<a name="line.893"></a>
+<span class="sourceLineNo">894</span> assertEquals(3, region.getStore(family).getStorefilesCount());<a name="line.894"></a>
+<span class="sourceLineNo">895</span> List<Path> storeFiles = new ArrayList<>(3);<a name="line.895"></a>
+<span class="sourceLineNo">896</span> for (HStoreFile sf : region.getStore(family).getStorefiles()) {<a name="line.896"></a>
+<span class="sourceLineNo">897</span> storeFiles.add(sf.getPath());<a name="line.897"></a>
+<span class="sourceLineNo">898</span> }<a name="line.898"></a>
+<span class="sourceLineNo">899</span><a name="line.899"></a>
+<span class="sourceLineNo">900</span> // disable compaction completion<a name="line.900"></a>
+<span class="sourceLineNo">901</span> CONF.setBoolean("hbase.hstore.compaction.complete", false);<a name="line.901"></a>
+<span class="sourceLineNo">902</span> region.compactStores();<a name="line.902"></a>
+<span class="sourceLineNo">903</span><a name="line.903"></a>
+<span class="sourceLineNo">904</span> // ensure that nothing changed<a name="line.904"></a>
+<span class="sourceLineNo">905</span> assertEquals(3, region.getStore(family).getStorefilesCount());<a name="line.905"></a>
+<span class="sourceLineNo">906</span><a name="line.906"></a>
+<span class="sourceLineNo">907</span> // now find the compacted file, and manually add it to the recovered edits<a name="line.907"></a>
+<span class="sourceLineNo">908</span> Path tmpDir = new Path(region.getRegionFileSystem().getTempDir(), Bytes.toString(family));<a name="line.908"></a>
+<span class="sourceLineNo">909</span> FileStatus[] files = FSUtils.listStatus(fs, tmpDir);<a name="line.909"></a>
+<span class="sourceLineNo">910</span> String errorMsg = "Expected to find 1 file in the region temp directory "<a name="line.910"></a>
+<span class="sourceLineNo">911</span> + "from the compaction, could not find any";<a name="line.911"></a>
+<span class="sourceLineNo">912</span> assertNotNull(errorMsg, files);<a name="line.912"></a>
+<span class="sourceLineNo">913</span> assertEquals(errorMsg, 1, files.length);<a name="line.913"></a>
+<span class="sourceLineNo">914</span> // move the file inside region dir<a name="line.914"></a>
+<span class="sourceLineNo">915</span> Path newFile = region.getRegionFileSystem().commitStoreFile(Bytes.toString(family),<a name="line.915"></a>
+<span class="sourceLineNo">916</span> files[0].getPath());<a name="line.916"></a>
+<span class="sourceLineNo">917</span><a name="line.917"></a>
+<span class="sourceLineNo">918</span> byte[] encodedNameAsBytes = this.region.getRegionInfo().getEncodedNameAsBytes();<a name="line.918"></a>
+<span class="sourceLineNo">919</span> byte[] fakeEncodedNameAsBytes = new byte [encodedNameAsBytes.length];<a name="line.919"></a>
+<span class="sourceLineNo">920</span> for (int i=0; i < encodedNameAsBytes.length; i++) {<a name="line.920"></a>
+<span class="sourceLineNo">921</span> // Mix the byte array to have a new encodedName<a name="line.921"></a>
+<span class="sourceLineNo">922</span> fakeEncodedNameAsBytes[i] = (byte) (encodedNameAsBytes[i] + 1);<a name="line.922"></a>
+<span class="sourceLineNo">923</span> }<a name="line.923"></a>
+<span class="sourceLineNo">924</span><a name="line.924"></a>
+<span class="sourceLineNo">925</span> CompactionDescriptor compactionDescriptor = ProtobufUtil.toCompactionDescriptor(this.region<a name="line.925"></a>
+<span class="sourceLineNo">926</span> .getRegionInfo(), mismatchedRegionName ? fakeEncodedNameAsBytes : null, family,<a name="line.926"></a>
+<span class="sourceLineNo">927</span> storeFiles, Lists.newArrayList(newFile),<a name="line.927"></a>
+<span class="sourceLineNo">928</span> region.getRegionFileSystem().getStoreDir(Bytes.toString(family)));<a name="line.928"></a>
<span class="sourceLineNo">929</span><a name="line.929"></a>
-<span class="sourceLineNo">930</span> CompactionDescriptor compactionDescriptor = ProtobufUtil.toCompactionDescriptor(this.region<a name="line.930"></a>
-<span class="sourceLineNo">931</span> .getRegionInfo(), mismatchedRegionName ? fakeEncodedNameAsBytes : null, family,<a name="line.931"></a>
-<span class="sourceLineNo">932</span> storeFiles, Lists.newArrayList(newFile),<a name="line.932"></a>
-<span class="sourceLineNo">933</span> region.getRegionFileSystem().getStoreDir(Bytes.toString(family)));<a name="line.933"></a>
+<span class="sourceLineNo">930</span> WALUtil.writeCompactionMarker(region.getWAL(), this.region.getReplicationScope(),<a name="line.930"></a>
+<span class="sourceLineNo">931</span> this.region.getRegionInfo(), compactionDescriptor, region.getMVCC());<a name="line.931"></a>
+<span class="sourceLineNo">932</span><a name="line.932"></a>
+<span class="sourceLineNo">933</span> Path recoveredEditsDir = WALSplitter.getRegionDirRecoveredEditsDir(regiondir);<a name="line.933"></a>
<span class="sourceLineNo">934</span><a name="line.934"></a>
-<span class="sourceLineNo">935</span> WALUtil.writeCompactionMarker(region.getWAL(), this.region.getReplicationScope(),<a name="line.935"></a>
-<span class="sourceLineNo">936</span> this.region.getRegionInfo(), compactionDescriptor, region.getMVCC());<a name="line.936"></a>
-<span class="sourceLineNo">937</span><a name="line.937"></a>
-<span class="sourceLineNo">938</span> Path recoveredEditsDir = WALSplitter.getRegionDirRecoveredEditsDir(regiondir);<a name="line.938"></a>
-<span class="sourceLineNo">939</span><a name="line.939"></a>
-<span class="sourceLineNo">940</span> Path recoveredEdits = new Path(recoveredEditsDir, String.format("%019d", 1000));<a name="line.940"></a>
-<span class="sourceLineNo">941</span> fs.create(recoveredEdits);<a name="line.941"></a>
-<span class="sourceLineNo">942</span> WALProvider.Writer writer = wals.createRecoveredEditsWriter(fs, recoveredEdits);<a name="line.942"></a>
-<span class="sourceLineNo">943</span><a name="line.943"></a>
-<span class="sourceLineNo">944</span> long time = System.nanoTime();<a name="line.944"></a>
+<span class="sourceLineNo">935</span> Path recoveredEdits = new Path(recoveredEditsDir, String.format("%019d", 1000));<a name="line.935"></a>
+<span class="sourceLineNo">936</span> fs.create(recoveredEdits);<a name="line.936"></a>
+<span class="sourceLineNo">937</span> WALProvider.Writer writer = wals.createRecoveredEditsWriter(fs, recoveredEdits);<a name="line.937"></a>
+<span class="sourceLineNo">938</span><a name="line.938"></a>
+<span class="sourceLineNo">939</span> long time = System.nanoTime();<a name="line.939"></a>
+<span class="sourceLineNo">940</span><a name="line.940"></a>
+<span class="sourceLineNo">941</span> writer.append(new WAL.Entry(new WALKeyImpl(regionName, tableName, 10, time,<a name="line.941"></a>
+<span class="sourceLineNo">942</span> HConstants.DEFAULT_CLUSTER_ID), WALEdit.createCompaction(region.getRegionInfo(),<a name="line.942"></a>
+<span class="sourceLineNo">943</span> compactionDescriptor)));<a name="line.943"></a>
+<span class="sourceLineNo">944</span> writer.close();<a name="line.944"></a>
<span class="sourceLineNo">945</span><a name="line.945"></a>
-<span class="sourceLineNo">946</span> writer.append(new WAL.Entry(new WALKeyImpl(regionName, tableName, 10, time,<a name="line.946"></a>
-<span class="sourceLineNo">947</span> HConstants.DEFAULT_CLUSTER_ID), WALEdit.createCompaction(region.getRegionInfo(),<a name="line.947"></a>
-<span class="sourceLineNo">948</span> compactionDescriptor)));<a name="line.948"></a>
-<span class="sourceLineNo">949</span> writer.close();<a name="line.949"></a>
-<span class="sourceLineNo">950</span><a name="line.950"></a>
-<span class="sourceLineNo">951</span> // close the region now, and reopen again<a name="line.951"></a>
-<span class="sourceLineNo">952</span> region.getTableDescriptor();<a name="line.952"></a>
-<span class="sourceLineNo">953</span> region.getRegionInfo();<a name="line.953"></a>
-<span class="sourceLineNo">954</span> region.close();<a name="line.954"></a>
-<span class="sourceLineNo">955</span> try {<a name="line.955"></a>
-<span class="sourceLineNo">956</span> region = HRegion.openHRegion(region, null);<a name="line.956"></a>
-<span class="sourceLineNo">957</span> } catch (WrongRegionException wre) {<a name="line.957"></a>
-<span class="sourceLineNo">958</span> fail("Matching encoded region name should not have produced WrongRegionException");<a name="line.958"></a>
-<span class="sourceLineNo">959</span> }<a name="line.959"></a>
-<span class="sourceLineNo">960</span><a name="line.960"></a>
-<span class="sourceLineNo">961</span> // now check whether we have only one store file, the compacted one<a name="line.961"></a>
-<span class="sourceLineNo">962</span> Collection<HStoreFile> sfs = region.getStore(family).getStorefiles();<a name="line.962"></a>
-<span class="sourceLineNo">963</span> for (HStoreFile sf : sfs) {<a name="line.963"></a>
-<span class="sourceLineNo">964</span> LOG.info(Objects.toString(sf.getPath()));<a name="line.964"></a>
-<span class="sourceLineNo">965</span> }<a name="line.965"></a>
-<span class="sourceLineNo">966</span> if (!mismatchedRegionName) {<a name="line.966"></a>
-<span class="sourceLineNo">967</span> assertEquals(1, region.getStore(family).getStorefilesCount());<a name="line.967"></a>
-<span class="sourceLineNo">968</span> }<a name="line.968"></a>
-<span class="sourceLineNo">969</span> files = FSUtils.listStatus(fs, tmpDir);<a name="line.969"></a>
-<span class="sourceLineNo">970</span> assertTrue("Expected to find 0 files inside " + tmpDir, files == null || files.length == 0);<a name="line.970"></a>
-<span class="sourceLineNo">971</span><a name="line.971"></a>
-<span class="sourceLineNo">972</span> for (long i = minSeqId; i < maxSeqId; i++) {<a name="line.972"></a>
-<span class="sourceLineNo">973</span> Get get = new Get(Bytes.toBytes(i));<a name="line.973"></a>
-<span class="sourceLineNo">974</span> Result result = region.get(get);<a name="line.974"></a>
-<span class="sourceLineNo">975</span> byte[] value = result.getValue(family, Bytes.toBytes(i));<a name="line.975"></a>
-<span class="sourceLineNo">976</span> assertArrayEquals(Bytes.toBytes(i), value);<a name="line.976"></a>
-<span class="sourceLineNo">977</span> }<a name="line.977"></a>
-<span class="sourceLineNo">978</span> } finally {<a name="line.978"></a>
-<span class="sourceLineNo">979</span> HBaseTestingUtility.closeRegionAndWAL(this.region);<a name="line.979"></a>
-<span class="sourceLineNo">980</span> this.region = null;<a name="line.980"></a>
-<span class="sourceLineNo">981</span> wals.close();<a name="line.981"></a>
-<span class="sourceLineNo">982</span> CONF.setClass(HConstants.REGION_IMPL, HRegion.class, Region.class);<a name="line.982"></a>
-<span class="sourceLineNo">983</span> }<a name="line.983"></a>
-<span class="sourceLineNo">984</span> }<a name="line.984"></a>
-<span class="sourceLineNo">985</span><a name="line.985"></a>
-<span class="sourceLineNo">986</span> @Test<a name="line.986"></a>
-<span class="sourceLineNo">987</span> public void testFlushMarkers() throws Exception {<a name="line.987"></a>
-<span class="sourceLineNo">988</span> // tests that flush markers are written to WAL and handled at recovered edits<a name="line.988"></a>
-<span class="sourceLineNo">989</span> byte[] family = Bytes.toBytes("family");<a name="line.989"></a>
-<span class="sourceLineNo">990</span> Path logDir = TEST_UTIL.getDataTestDirOnTestFS(method + ".log");<a name="line.990"></a>
-<span class="sourceLineNo">991</span> final Configuration walConf = new Configuration(TEST_UTIL.getConfiguration());<a name="line.991"></a>
-<span class="sourceLineNo">992</span> FSUtils.setRootDir(walConf, logDir);<a name="line.992"></a>
-<span class="sourceLineNo">993</span> final WALFactory wals = new WALFactory(walConf, method);<a name="line.993"></a>
-<span class="sourceLineNo">994</span> final WAL wal = wals.getWAL(RegionInfoBuilder.newBuilder(tableName).build());<a name="line.994"></a>
-<span class="sourceLineNo">995</span><a name="line.995"></a>
-<span class="sourceLineNo">996</span> this.region = initHRegion(tableName, HConstants.EMPTY_START_ROW,<a name="line.996"></a>
-<span class="sourceLineNo">997</span> HConstants.EMPTY_END_ROW, false, Durability.USE_DEFAULT, wal, family);<a name="line.997"></a>
-<span class="sourceLineNo">998</span> try {<a name="line.998"></a>
-<span class="sourceLineNo">999</span> Path regiondir = region.getRegionFileSystem().getRegionDir();<a name="line.999"></a>
-<span class="sourceLineNo">1000</span> FileSystem fs = region.getRegionFileSystem().getFileSystem();<a name="line.1000"></a>
-<span class="sourceLineNo">1001</span> byte[] regionName = region.getRegionInfo().getEncodedNameAsBytes();<a name="line.1001"></a>
-<span class="sourceLineNo">1002</span><a name="line.1002"></a>
-<span class="sourceLineNo">1003</span> long maxSeqId = 3;<a name="line.1003"></a>
-<span class="sourceLineNo">1004</span> long minSeqId = 0;<a name="line.1004"></a>
-<span class="sourceLineNo">1005</span><a name="line.1005"></a>
-<span class="sourceLineNo">1006</span> for (long i = minSeqId; i < maxSeqId; i++) {<a name="line.1006"></a>
-<span class="sourceLineNo">1007</span> Put put = new Put(Bytes.toBytes(i));<a name="line.1007"></a>
-<span class="sourceLineNo">1008</span> put.addColumn(family, Bytes.toBytes(i), Bytes.toBytes(i));<a name="line.1008"></a>
-<span class="sourceLineNo">1009</span> region.put(put);<a name="line.1009"></a>
-<span class="sourceLineNo">1010</span> region.flush(true);<a name="line.1010"></a>
-<span class="sourceLineNo">1011</span> }<a name="line.1011"></a>
-<span class="sourceLineNo">1012</span><a name="line.1012"></a>
-<span class="sourceLineNo">1013</span> // this will create a region with 3 files from flush<a name="line.1013"></a>
-<span class="sourceLineNo">1014</span> assertEquals(3, region.getStore(family).getStorefilesCount());<a name="line.1014"></a>
-<span class="sourceLineNo">1015</span> List<String> storeFiles = new ArrayList<>(3);<a name="line.1015"></a>
-<span class="sourceLineNo">1016</span> for (HStoreFile sf : region.getStore(family).getStorefiles()) {<a name="line.1016"></a>
-<span class="sourceLineNo">1017</span> storeFiles.add(sf.getPath().getName());<a name="line.1017"></a>
-<span class="sourceLineNo">1018</span> }<a name="line.1018"></a>
-<span class="sourceLineNo">1019</span><a name="line.1019"></a>
-<span class="sourceLineNo">1020</span> // now verify that the flush markers are written<a name="line.1020"></a>
-<span class="sourceLineNo">1021</span> wal.shutdown();<a name="line.1021"></a>
-<span class="sourceLineNo">1022</span> WAL.Reader reader = WALFactory.createReader(fs, AbstractFSWALProvider.getCurrentFileName(wal),<a name="line.1022"></a>
-<span class="sourceLineNo">1023</span> TEST_UTIL.getConfiguration());<a name="line.1023"></a>
-<span class="sourceLineNo">1024</span> try {<a name="line.1024"></a>
-<span class="sourceLineNo">1025</span> List<WAL.Entry> flushDescriptors = new ArrayList<>();<a name="line.1025"></a>
-<span class="sourceLineNo">1026</span> long lastFlushSeqId = -1;<a name="line.1026"></a>
-<span class="sourceLineNo">1027</span> while (true) {<a name="line.1027"></a>
-<span class="sourceLineNo">1028</span> WAL.Entry entry = reader.next();<a name="line.1028"></a>
-<span class="sourceLineNo">1029</span> if (entry == null) {<a name="line.1029"></a>
-<span class="sourceLineNo">1030</span> break;<a name="line.1030"></a>
-<span class="sourceLineNo">1031</span> }<a name="line.1031"></a>
-<span class="sourceLineNo">1032</span> Cell cell = entry.getEdit().getCells().get(0);<a name="line.1032"></a>
-<span class="sourceLineNo">1033</span> if (WALEdit.isMetaEditFamily(cell)) {<a name="line.1033"></a>
-<span class="sourceLineNo">1034</span> FlushDescriptor flushDesc = WALEdit.getFlushDescriptor(cell);<a name="line.1034"></a>
-<span class="sourceLineNo">1035</span> assertNotNull(flushDesc);<a name="line.1035"></a>
-<span class="sourceLineNo">1036</span> assertArrayEquals(tableName.getName(), flushDesc.getTableName().toByteArray());<a name="line.1036"></a>
-<span class="sourceLineNo">1037</span> if (flushDesc.getAction() == FlushAction.START_FLUSH) {<a name="line.1037"></a>
-<span class="sourceLineNo">1038</span> assertTrue(flushDesc.getFlushSequenceNumber() > lastFlushSeqId);<a name="line.1038"></a>
-<span class="sourceLineNo">1039</span> } else if (flushDesc.getAction() == FlushAction.COMMIT_FLUSH) {<a name="line.1039"></a>
-<span class="sourceLineNo">1040</span> assertTrue(flushDesc.getFlushSequenceNumber() == lastFlushSeqId);<a name="line.1040"></a>
-<span class="sourceLineNo">1041</span> }<a name="line.1041"></a>
-<span class="sourceLineNo">1042</span> lastFlushSeqId = flushDesc.getFlushSequenceNumber();<a name="line.1042"></a>
-<span class="sourceLineNo">1043</span> assertArrayEquals(regionName, flushDesc.getEncodedRegionName().toByteArray());<a name="line.1043"></a>
-<span class="sourceLineNo">1044</span> assertEquals(1, flushDesc.getStoreFlushesCount()); //only one store<a name="line.1044"></a>
-<span class="sourceLineNo">1045</span> StoreFlushDescriptor storeFlushDesc = flushDesc.getStoreFlushes(0);<a name="line.1045"></a>
-<span class="sourceLineNo">1046</span> assertArrayEquals(family, storeFlushDesc.getFamilyName().toByteArray());<a name="line.1046"></a>
-<span class="sourceLineNo">1047</span> assertEquals("family", storeFlushDesc.getStoreHomeDir());<a name="line.1047"></a>
-<span class="sourceLineNo">1048</span> if (flushDesc.getAction() == FlushAction.START_FLUSH) {<a name="line.1048"></a>
-<span class="sourceLineNo">1049</span> assertEquals(0, storeFlushDesc.getFlushOutputCount());<a name="line.1049"></a>
-<span class="sourceLineNo">1050</span> } else {<a name="line.1050"></a>
-<span class="sourceLineNo">1051</span> assertEquals(1, storeFlushDesc.getFlushOutputCount()); //only one file from flush<a name="line.1051"></a>
-<span class="sourceLineNo">1052</span> assertTrue(storeFiles.contains(storeFlushDesc.getFlushOutput(0)));<a name="line.1052"></a>
-<span class="sourceLineNo">1053</span> }<a name="line.1053"></a>
-<span class="sourceLineNo">1054</span><a name="line.1054"></a>
-<span class="sourceLineNo">1055</span> flushDescriptors.add(entry);<a name="line.1055"></a>
-<span class="sourceLineNo">1056</span> }<a name="line.1056"></a>
-<span class="sourceLineNo">1057</span> }<a name="line.1057"></a>
-<span class="sourceLineNo">1058</span><a name="line.1058"></a>
-<span class="sourceLineNo">1059</span> assertEquals(3 * 2, flushDescriptors.size()); // START_FLUSH and COMMIT_FLUSH per flush<a name="line.1059"></a>
-<span class="sourceLineNo">1060</span><a name="line.1060"></a>
-<span class="sourceLineNo">1061</span> // now write those markers to the recovered edits again.<a name="line.1061"></a>
-<span class="sourceLineNo">1062</span><a name="line.1062"></a>
-<span class="sourceLineNo">1063</span> Path recoveredEditsDir = WALSplitter.getRegionDirRecoveredEditsDir(regiondir);<a name="line.1063"></a>
-<span class="sourceLineNo">1064</span><a name="line.1064"></a>
-<span class="sourceLineNo">1065</span> Path recoveredEdits = new Path(recoveredEditsDir, String.format("%019d", 1000));<a name="line.1065"></a>
-<span class="sourceLineNo">1066</span> fs.create(recoveredEdits);<a name="line.1066"></a>
-<span class="sourceLineNo">1067</span> WALProvider.Writer writer = wals.createRecoveredEditsWriter(fs, recoveredEdits);<a name="line.1067"></a>
-<span class="sourceLineNo">1068</span><a name="line.1068"></a>
-<span class="sourceLineNo">1069</span> for (WAL.Entry entry : flushDescriptors) {<a name="line.1069"></a>
-<span class="sourceLineNo">1070</span> writer.append(entry);<a name="line.1070"></a>
-<span class="sourceLineNo">1071</span> }<a name="line.1071"></a>
-<span class="sourceLineNo">1072</span> writer.close();<a name="line.1072"></a>
-<span class="sourceLineNo">1073</span> } finally {<a name="line.1073"></a>
-<span class="sourceLineNo">1074</span> if (null != reader) {<a name="line.1074"></a>
-<span class="sourceLineNo">1075</span> try {<a name="line.1075"></a>
-<span class="sourceLineNo">1076</span> reader.close();<a name="line.1076"></a>
-<span class="sourceLineNo">1077</span> } catch (IOException exception) {<a name="line.1077"></a>
-<span class="sourceLineNo">1078</span> LOG.warn("Problem closing wal: " + exception.getMessage());<a name="line.1078"></a>
-<span class="sourceLineNo">1079</span> LOG.debug("exception details", exception);<a name="line.1079"></a>
-<span class="sourceLineNo">1080</span> }<a name="line.1080"></a>
-<span class="sourceLineNo">1081</span> }<a name="line.1081"></a>
-<span class="sourceLineNo">1082</span> }<a name="line.1082"></a>
+<span class="sourceLineNo">946</span> // close the region now, and reopen again<a name="line.946"></a>
+<span class="sourceLineNo">947</span> region.getTableDescriptor();<a name="line.947"></a>
+<span class="sourceLineNo">948</span> region.getRegionInfo();<a name="line.948"></a>
+<span class="sourceLineNo">949</span> region.close();<a name="line.949"></a>
+<span class="sourceLineNo">950</span> try {<a name="line.950"></a>
+<span class="sourceLineNo">951</span> region = HRegion.openHRegion(region, null);<a name="line.951"></a>
+<span class="sourceLineNo">952</span> } catch (WrongRegionException wre) {<a name="line.952"></a>
+<span class="sourceLineNo">953</span> fail("Matching encoded region name should not have produced WrongRegionException");<a name="line.953"></a>
+<span class="sourceLineNo">954</span> }<a name="line.954"></a>
+<span class="sourceLineNo">955</span><a name="line.955"></a>
+<span class="sourceLineNo">956</span> // now check whether we have only one store file, the compacted one<a name="line.956"></a>
+<span class="sourceLineNo">957</span> Collection<HStoreFile> sfs = region.getStore(family).getStorefiles();<a name="line.957"></a>
+<span class="sourceLineNo">958</span> for (HStoreFile sf : sfs) {<a name="line.958"></a>
+<span class="sourceLineNo">959</span> LOG.info(Objects.toString(sf.getPath()));<a name="line.959"></a>
+<span class="sourceLineNo">960</span> }<a name="line.960"></a>
+<span class="sourceLineNo">961</span> if (!mismatchedRegionName) {<a name="line.961"></a>
+<span class="sourceLineNo">962</span> assertEquals(1, region.getStore(family).getStorefilesCount());<a name="line.962"></a>
+<span class="sourceLineNo">963</span> }<a name="line.963"></a>
+<span class="sourceLineNo">964</span> files = FSUtils.listStatus(fs, tmpDir);<a name="line.964"></a>
+<span class="sourceLineNo">965</span> assertTrue("Expected to find 0 files inside " + tmpDir, files == null || files.length == 0);<a name="line.965"></a>
+<span class="sourceLineNo">966</span><a name="line.966"></a>
+<span class="sourceLineNo">967</span> for (long i = minSeqId; i < maxSeqId; i++) {<a name="line.967"></a>
+<span class="sourceLineNo">968</span> Get get = new Get(Bytes.toBytes(i));<a name="line.968"></a>
+<span class="sourceLineNo">969</span> Result result = region.get(get);<a name="line.969"></a>
+<span class="sourceLineNo">970</span> byte[] value = result.getValue(family, Bytes.toBytes(i));<a name="line.970"></a>
+<span class="sourceLineNo">971</span> assertArrayEquals(Bytes.toBytes(i), value);<a name="line.971"></a>
+<span class="sourceLineNo">972</span> }<a name="line.972"></a>
+<span class="sourceLineNo">973</span> } finally {<a name="line.973">
<TRUNCATED>