You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2015/12/16 17:50:52 UTC
[07/51] [partial] hbase-site git commit: Published site at
60d33ce34191533bb858852584bd9bddfeb16a23.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/539ad177/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.LoadCounter.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.LoadCounter.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.LoadCounter.html
index 5abbadd..7bf2314 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.LoadCounter.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.LoadCounter.html
@@ -110,7 +110,7 @@
<span class="sourceLineNo">102</span> @Test<a name="line.102"></a>
<span class="sourceLineNo">103</span> public void testEmptyRoll() throws Exception {<a name="line.103"></a>
<span class="sourceLineNo">104</span> for (int i = 0; i < 10; ++i) {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> procStore.periodicRoll();<a name="line.105"></a>
+<span class="sourceLineNo">105</span> procStore.periodicRollForTesting();<a name="line.105"></a>
<span class="sourceLineNo">106</span> }<a name="line.106"></a>
<span class="sourceLineNo">107</span> FileStatus[] status = fs.listStatus(logDir);<a name="line.107"></a>
<span class="sourceLineNo">108</span> assertEquals(1, status.length);<a name="line.108"></a>
@@ -222,14 +222,14 @@
<span class="sourceLineNo">214</span> procStore.update(rootProcs[i-1]);<a name="line.214"></a>
<span class="sourceLineNo">215</span> }<a name="line.215"></a>
<span class="sourceLineNo">216</span> // insert root-child txn<a name="line.216"></a>
-<span class="sourceLineNo">217</span> procStore.rollWriter();<a name="line.217"></a>
+<span class="sourceLineNo">217</span> procStore.rollWriterForTesting();<a name="line.217"></a>
<span class="sourceLineNo">218</span> for (int i = 1; i <= rootProcs.length; i++) {<a name="line.218"></a>
<span class="sourceLineNo">219</span> TestProcedure b = new TestProcedure(rootProcs.length + i, i);<a name="line.219"></a>
<span class="sourceLineNo">220</span> rootProcs[i-1].addStackId(1);<a name="line.220"></a>
<span class="sourceLineNo">221</span> procStore.insert(rootProcs[i-1], new Procedure[] { b });<a name="line.221"></a>
<span class="sourceLineNo">222</span> }<a name="line.222"></a>
<span class="sourceLineNo">223</span> // insert child updates<a name="line.223"></a>
-<span class="sourceLineNo">224</span> procStore.rollWriter();<a name="line.224"></a>
+<span class="sourceLineNo">224</span> procStore.rollWriterForTesting();<a name="line.224"></a>
<span class="sourceLineNo">225</span> for (int i = 1; i <= rootProcs.length; i++) {<a name="line.225"></a>
<span class="sourceLineNo">226</span> procStore.update(new TestProcedure(rootProcs.length + i, i));<a name="line.226"></a>
<span class="sourceLineNo">227</span> }<a name="line.227"></a>
@@ -237,347 +237,376 @@
<span class="sourceLineNo">229</span> // Stop the store<a name="line.229"></a>
<span class="sourceLineNo">230</span> procStore.stop(false);<a name="line.230"></a>
<span class="sourceLineNo">231</span><a name="line.231"></a>
-<span class="sourceLineNo">232</span> // Remove 4 byte from the trailer<a name="line.232"></a>
-<span class="sourceLineNo">233</span> FileStatus[] logs = fs.listStatus(logDir);<a name="line.233"></a>
-<span class="sourceLineNo">234</span> assertEquals(3, logs.length);<a name="line.234"></a>
-<span class="sourceLineNo">235</span> Arrays.sort(logs, new Comparator<FileStatus>() {<a name="line.235"></a>
-<span class="sourceLineNo">236</span> @Override<a name="line.236"></a>
-<span class="sourceLineNo">237</span> public int compare(FileStatus o1, FileStatus o2) {<a name="line.237"></a>
-<span class="sourceLineNo">238</span> return o1.getPath().getName().compareTo(o2.getPath().getName());<a name="line.238"></a>
-<span class="sourceLineNo">239</span> }<a name="line.239"></a>
-<span class="sourceLineNo">240</span> });<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span> // Remove the first log, we have insert-txn and updates in the others so everything is fine.<a name="line.242"></a>
-<span class="sourceLineNo">243</span> fs.delete(logs[0].getPath(), false);<a name="line.243"></a>
-<span class="sourceLineNo">244</span> LoadCounter loader = new LoadCounter();<a name="line.244"></a>
-<span class="sourceLineNo">245</span> storeRestart(loader);<a name="line.245"></a>
-<span class="sourceLineNo">246</span> assertEquals(rootProcs.length * 2, loader.getLoadedCount());<a name="line.246"></a>
-<span class="sourceLineNo">247</span> assertEquals(0, loader.getCorruptedCount());<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span> // Remove the second log, we have lost any root/parent references<a name="line.249"></a>
-<span class="sourceLineNo">250</span> fs.delete(logs[1].getPath(), false);<a name="line.250"></a>
-<span class="sourceLineNo">251</span> loader.reset();<a name="line.251"></a>
-<span class="sourceLineNo">252</span> storeRestart(loader);<a name="line.252"></a>
-<span class="sourceLineNo">253</span> assertEquals(0, loader.getLoadedCount());<a name="line.253"></a>
-<span class="sourceLineNo">254</span> assertEquals(rootProcs.length, loader.getCorruptedCount());<a name="line.254"></a>
-<span class="sourceLineNo">255</span> for (Procedure proc: loader.getCorrupted()) {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> assertTrue(proc.toString(), proc.getParentProcId() <= rootProcs.length);<a name="line.256"></a>
-<span class="sourceLineNo">257</span> assertTrue(proc.toString(),<a name="line.257"></a>
-<span class="sourceLineNo">258</span> proc.getProcId() > rootProcs.length &&<a name="line.258"></a>
-<span class="sourceLineNo">259</span> proc.getProcId() <= (rootProcs.length * 2));<a name="line.259"></a>
-<span class="sourceLineNo">260</span> }<a name="line.260"></a>
-<span class="sourceLineNo">261</span> }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span> @Test(timeout=60000)<a name="line.263"></a>
-<span class="sourceLineNo">264</span> public void testWalReplayOrder_AB_A() throws Exception {<a name="line.264"></a>
-<span class="sourceLineNo">265</span> /*<a name="line.265"></a>
-<span class="sourceLineNo">266</span> * | A B | -> | A |<a name="line.266"></a>
-<span class="sourceLineNo">267</span> */<a name="line.267"></a>
-<span class="sourceLineNo">268</span> TestProcedure a = new TestProcedure(1, 0);<a name="line.268"></a>
-<span class="sourceLineNo">269</span> TestProcedure b = new TestProcedure(2, 1);<a name="line.269"></a>
-<span class="sourceLineNo">270</span><a name="line.270"></a>
-<span class="sourceLineNo">271</span> procStore.insert(a, null);<a name="line.271"></a>
-<span class="sourceLineNo">272</span> a.addStackId(0);<a name="line.272"></a>
-<span class="sourceLineNo">273</span> procStore.update(a);<a name="line.273"></a>
-<span class="sourceLineNo">274</span><a name="line.274"></a>
-<span class="sourceLineNo">275</span> procStore.insert(a, new Procedure[] { b });<a name="line.275"></a>
-<span class="sourceLineNo">276</span> b.addStackId(1);<a name="line.276"></a>
-<span class="sourceLineNo">277</span> procStore.update(b);<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span> procStore.rollWriter();<a name="line.279"></a>
-<span class="sourceLineNo">280</span><a name="line.280"></a>
-<span class="sourceLineNo">281</span> a.addStackId(2);<a name="line.281"></a>
-<span class="sourceLineNo">282</span> procStore.update(a);<a name="line.282"></a>
-<span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span> storeRestart(new ProcedureStore.ProcedureLoader() {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> @Override<a name="line.285"></a>
-<span class="sourceLineNo">286</span> public void setMaxProcId(long maxProcId) {<a name="line.286"></a>
-<span class="sourceLineNo">287</span> assertEquals(2, maxProcId);<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span><a name="line.289"></a>
-<span class="sourceLineNo">290</span> @Override<a name="line.290"></a>
-<span class="sourceLineNo">291</span> public void load(ProcedureIterator procIter) throws IOException {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> assertTrue(procIter.hasNext());<a name="line.292"></a>
-<span class="sourceLineNo">293</span> assertEquals(1, procIter.next().getProcId());<a name="line.293"></a>
-<span class="sourceLineNo">294</span> assertTrue(procIter.hasNext());<a name="line.294"></a>
-<span class="sourceLineNo">295</span> assertEquals(2, procIter.next().getProcId());<a name="line.295"></a>
-<span class="sourceLineNo">296</span> assertFalse(procIter.hasNext());<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> @Override<a name="line.299"></a>
-<span class="sourceLineNo">300</span> public void handleCorrupted(ProcedureIterator procIter) throws IOException {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> assertFalse(procIter.hasNext());<a name="line.301"></a>
-<span class="sourceLineNo">302</span> }<a name="line.302"></a>
-<span class="sourceLineNo">303</span> });<a name="line.303"></a>
-<span class="sourceLineNo">304</span> }<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span> @Test(timeout=60000)<a name="line.306"></a>
-<span class="sourceLineNo">307</span> public void testWalReplayOrder_ABC_BAD() throws Exception {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> /*<a name="line.308"></a>
-<span class="sourceLineNo">309</span> * | A B C | -> | B A D |<a name="line.309"></a>
-<span class="sourceLineNo">310</span> */<a name="line.310"></a>
-<span class="sourceLineNo">311</span> TestProcedure a = new TestProcedure(1, 0);<a name="line.311"></a>
-<span class="sourceLineNo">312</span> TestProcedure b = new TestProcedure(2, 1);<a name="line.312"></a>
-<span class="sourceLineNo">313</span> TestProcedure c = new TestProcedure(3, 2);<a name="line.313"></a>
-<span class="sourceLineNo">314</span> TestProcedure d = new TestProcedure(4, 0);<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span> procStore.insert(a, null);<a name="line.316"></a>
-<span class="sourceLineNo">317</span> a.addStackId(0);<a name="line.317"></a>
-<span class="sourceLineNo">318</span> procStore.update(a);<a name="line.318"></a>
-<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span> procStore.insert(a, new Procedure[] { b });<a name="line.320"></a>
-<span class="sourceLineNo">321</span> b.addStackId(1);<a name="line.321"></a>
-<span class="sourceLineNo">322</span> procStore.update(b);<a name="line.322"></a>
-<span class="sourceLineNo">323</span><a name="line.323"></a>
-<span class="sourceLineNo">324</span> procStore.insert(b, new Procedure[] { c });<a name="line.324"></a>
-<span class="sourceLineNo">325</span> b.addStackId(2);<a name="line.325"></a>
-<span class="sourceLineNo">326</span> procStore.update(b);<a name="line.326"></a>
-<span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span> procStore.rollWriter();<a name="line.328"></a>
-<span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span> b.addStackId(3);<a name="line.330"></a>
-<span class="sourceLineNo">331</span> procStore.update(b);<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span> a.addStackId(4);<a name="line.333"></a>
-<span class="sourceLineNo">334</span> procStore.update(a);<a name="line.334"></a>
-<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span> procStore.insert(d, null);<a name="line.336"></a>
-<span class="sourceLineNo">337</span> d.addStackId(0);<a name="line.337"></a>
-<span class="sourceLineNo">338</span> procStore.update(d);<a name="line.338"></a>
-<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span> storeRestart(new ProcedureStore.ProcedureLoader() {<a name="line.340"></a>
-<span class="sourceLineNo">341</span> @Override<a name="line.341"></a>
-<span class="sourceLineNo">342</span> public void setMaxProcId(long maxProcId) {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> assertEquals(4, maxProcId);<a name="line.343"></a>
-<span class="sourceLineNo">344</span> }<a name="line.344"></a>
-<span class="sourceLineNo">345</span><a name="line.345"></a>
-<span class="sourceLineNo">346</span> @Override<a name="line.346"></a>
-<span class="sourceLineNo">347</span> public void load(ProcedureIterator procIter) throws IOException {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> assertTrue(procIter.hasNext());<a name="line.348"></a>
-<span class="sourceLineNo">349</span> assertEquals(4, procIter.next().getProcId());<a name="line.349"></a>
-<span class="sourceLineNo">350</span> // TODO: This will be multiple call once we do fast-start<a name="line.350"></a>
-<span class="sourceLineNo">351</span> //assertFalse(procIter.hasNext());<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> assertTrue(procIter.hasNext());<a name="line.353"></a>
-<span class="sourceLineNo">354</span> assertEquals(1, procIter.next().getProcId());<a name="line.354"></a>
-<span class="sourceLineNo">355</span> assertTrue(procIter.hasNext());<a name="line.355"></a>
-<span class="sourceLineNo">356</span> assertEquals(2, procIter.next().getProcId());<a name="line.356"></a>
-<span class="sourceLineNo">357</span> assertTrue(procIter.hasNext());<a name="line.357"></a>
-<span class="sourceLineNo">358</span> assertEquals(3, procIter.next().getProcId());<a name="line.358"></a>
-<span class="sourceLineNo">359</span> assertFalse(procIter.hasNext());<a name="line.359"></a>
-<span class="sourceLineNo">360</span> }<a name="line.360"></a>
-<span class="sourceLineNo">361</span><a name="line.361"></a>
-<span class="sourceLineNo">362</span> @Override<a name="line.362"></a>
-<span class="sourceLineNo">363</span> public void handleCorrupted(ProcedureIterator procIter) throws IOException {<a name="line.363"></a>
-<span class="sourceLineNo">364</span> assertFalse(procIter.hasNext());<a name="line.364"></a>
-<span class="sourceLineNo">365</span> }<a name="line.365"></a>
-<span class="sourceLineNo">366</span> });<a name="line.366"></a>
-<span class="sourceLineNo">367</span> }<a name="line.367"></a>
-<span class="sourceLineNo">368</span><a name="line.368"></a>
-<span class="sourceLineNo">369</span> @Test<a name="line.369"></a>
-<span class="sourceLineNo">370</span> public void testInsertUpdateDelete() throws Exception {<a name="line.370"></a>
-<span class="sourceLineNo">371</span> final int NTHREAD = 2;<a name="line.371"></a>
-<span class="sourceLineNo">372</span><a name="line.372"></a>
-<span class="sourceLineNo">373</span> procStore.stop(false);<a name="line.373"></a>
-<span class="sourceLineNo">374</span> fs.delete(logDir, true);<a name="line.374"></a>
-<span class="sourceLineNo">375</span><a name="line.375"></a>
-<span class="sourceLineNo">376</span> org.apache.hadoop.conf.Configuration conf =<a name="line.376"></a>
-<span class="sourceLineNo">377</span> new org.apache.hadoop.conf.Configuration(htu.getConfiguration());<a name="line.377"></a>
-<span class="sourceLineNo">378</span> conf.setBoolean("hbase.procedure.store.wal.use.hsync", false);<a name="line.378"></a>
-<span class="sourceLineNo">379</span> conf.setInt("hbase.procedure.store.wal.periodic.roll.msec", 10000);<a name="line.379"></a>
-<span class="sourceLineNo">380</span> conf.setInt("hbase.procedure.store.wal.roll.threshold", 128 * 1024);<a name="line.380"></a>
-<span class="sourceLineNo">381</span><a name="line.381"></a>
-<span class="sourceLineNo">382</span> fs.mkdirs(logDir);<a name="line.382"></a>
-<span class="sourceLineNo">383</span> procStore = ProcedureTestingUtility.createWalStore(conf, fs, logDir);<a name="line.383"></a>
-<span class="sourceLineNo">384</span> procStore.start(NTHREAD);<a name="line.384"></a>
-<span class="sourceLineNo">385</span> procStore.recoverLease();<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span> LoadCounter loader = new LoadCounter();<a name="line.387"></a>
-<span class="sourceLineNo">388</span> procStore.load(loader);<a name="line.388"></a>
-<span class="sourceLineNo">389</span> assertEquals(0, loader.getMaxProcId());<a name="line.389"></a>
-<span class="sourceLineNo">390</span> assertEquals(0, loader.getLoadedCount());<a name="line.390"></a>
-<span class="sourceLineNo">391</span> assertEquals(0, loader.getCorruptedCount());<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span> final long LAST_PROC_ID = 9999;<a name="line.393"></a>
-<span class="sourceLineNo">394</span> final Thread[] thread = new Thread[NTHREAD];<a name="line.394"></a>
-<span class="sourceLineNo">395</span> final AtomicLong procCounter = new AtomicLong((long)Math.round(Math.random() * 100));<a name="line.395"></a>
-<span class="sourceLineNo">396</span> for (int i = 0; i < thread.length; ++i) {<a name="line.396"></a>
-<span class="sourceLineNo">397</span> thread[i] = new Thread() {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> @Override<a name="line.398"></a>
-<span class="sourceLineNo">399</span> public void run() {<a name="line.399"></a>
-<span class="sourceLineNo">400</span> Random rand = new Random();<a name="line.400"></a>
-<span class="sourceLineNo">401</span> TestProcedure proc;<a name="line.401"></a>
-<span class="sourceLineNo">402</span> do {<a name="line.402"></a>
-<span class="sourceLineNo">403</span> proc = new TestProcedure(procCounter.addAndGet(1));<a name="line.403"></a>
-<span class="sourceLineNo">404</span> // Insert<a name="line.404"></a>
-<span class="sourceLineNo">405</span> procStore.insert(proc, null);<a name="line.405"></a>
-<span class="sourceLineNo">406</span> // Update<a name="line.406"></a>
-<span class="sourceLineNo">407</span> for (int i = 0, nupdates = rand.nextInt(10); i <= nupdates; ++i) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span> try { Thread.sleep(0, rand.nextInt(15)); } catch (InterruptedException e) {}<a name="line.408"></a>
-<span class="sourceLineNo">409</span> procStore.update(proc);<a name="line.409"></a>
-<span class="sourceLineNo">410</span> }<a name="line.410"></a>
-<span class="sourceLineNo">411</span> // Delete<a name="line.411"></a>
-<span class="sourceLineNo">412</span> procStore.delete(proc.getProcId());<a name="line.412"></a>
-<span class="sourceLineNo">413</span> } while (proc.getProcId() < LAST_PROC_ID);<a name="line.413"></a>
-<span class="sourceLineNo">414</span> }<a name="line.414"></a>
-<span class="sourceLineNo">415</span> };<a name="line.415"></a>
-<span class="sourceLineNo">416</span> thread[i].start();<a name="line.416"></a>
-<span class="sourceLineNo">417</span> }<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span> for (int i = 0; i < thread.length; ++i) {<a name="line.419"></a>
-<span class="sourceLineNo">420</span> thread[i].join();<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> procStore.getStoreTracker().dump();<a name="line.423"></a>
-<span class="sourceLineNo">424</span> assertTrue(procCounter.get() >= LAST_PROC_ID);<a name="line.424"></a>
-<span class="sourceLineNo">425</span> assertTrue(procStore.getStoreTracker().isEmpty());<a name="line.425"></a>
-<span class="sourceLineNo">426</span> assertEquals(1, procStore.getActiveLogs().size());<a name="line.426"></a>
-<span class="sourceLineNo">427</span> }<a name="line.427"></a>
-<span class="sourceLineNo">428</span><a name="line.428"></a>
-<span class="sourceLineNo">429</span> private void corruptLog(final FileStatus logFile, final long dropBytes)<a name="line.429"></a>
-<span class="sourceLineNo">430</span> throws IOException {<a name="line.430"></a>
-<span class="sourceLineNo">431</span> assertTrue(logFile.getLen() > dropBytes);<a name="line.431"></a>
-<span class="sourceLineNo">432</span> LOG.debug("corrupt log " + logFile.getPath() +<a name="line.432"></a>
-<span class="sourceLineNo">433</span> " size=" + logFile.getLen() + " drop=" + dropBytes);<a name="line.433"></a>
-<span class="sourceLineNo">434</span> Path tmpPath = new Path(testDir, "corrupted.log");<a name="line.434"></a>
-<span class="sourceLineNo">435</span> InputStream in = fs.open(logFile.getPath());<a name="line.435"></a>
-<span class="sourceLineNo">436</span> OutputStream out = fs.create(tmpPath);<a name="line.436"></a>
-<span class="sourceLineNo">437</span> IOUtils.copyBytes(in, out, logFile.getLen() - dropBytes, true);<a name="line.437"></a>
-<span class="sourceLineNo">438</span> if (!fs.rename(tmpPath, logFile.getPath())) {<a name="line.438"></a>
-<span class="sourceLineNo">439</span> throw new IOException("Unable to rename");<a name="line.439"></a>
-<span class="sourceLineNo">440</span> }<a name="line.440"></a>
-<span class="sourceLineNo">441</span> }<a name="line.441"></a>
-<span class="sourceLineNo">442</span><a name="line.442"></a>
-<span class="sourceLineNo">443</span> private void verifyProcIdsOnRestart(final Set<Long> procIds) throws Exception {<a name="line.443"></a>
-<span class="sourceLineNo">444</span> LOG.debug("expected: " + procIds);<a name="line.444"></a>
-<span class="sourceLineNo">445</span> LoadCounter loader = new LoadCounter();<a name="line.445"></a>
-<span class="sourceLineNo">446</span> storeRestart(loader);<a name="line.446"></a>
-<span class="sourceLineNo">447</span> assertEquals(procIds.size(), loader.getLoadedCount());<a name="line.447"></a>
-<span class="sourceLineNo">448</span> assertEquals(0, loader.getCorruptedCount());<a name="line.448"></a>
-<span class="sourceLineNo">449</span> }<a name="line.449"></a>
+<span class="sourceLineNo">232</span> // the first log was removed,<a name="line.232"></a>
+<span class="sourceLineNo">233</span> // we have insert-txn and updates in the others so everything is fine<a name="line.233"></a>
+<span class="sourceLineNo">234</span> FileStatus[] logs = fs.listStatus(logDir);<a name="line.234"></a>
+<span class="sourceLineNo">235</span> assertEquals(Arrays.toString(logs), 2, logs.length);<a name="line.235"></a>
+<span class="sourceLineNo">236</span> Arrays.sort(logs, new Comparator<FileStatus>() {<a name="line.236"></a>
+<span class="sourceLineNo">237</span> @Override<a name="line.237"></a>
+<span class="sourceLineNo">238</span> public int compare(FileStatus o1, FileStatus o2) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span> return o1.getPath().getName().compareTo(o2.getPath().getName());<a name="line.239"></a>
+<span class="sourceLineNo">240</span> }<a name="line.240"></a>
+<span class="sourceLineNo">241</span> });<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span> LoadCounter loader = new LoadCounter();<a name="line.243"></a>
+<span class="sourceLineNo">244</span> storeRestart(loader);<a name="line.244"></a>
+<span class="sourceLineNo">245</span> assertEquals(rootProcs.length * 2, loader.getLoadedCount());<a name="line.245"></a>
+<span class="sourceLineNo">246</span> assertEquals(0, loader.getCorruptedCount());<a name="line.246"></a>
+<span class="sourceLineNo">247</span><a name="line.247"></a>
+<span class="sourceLineNo">248</span> // Remove the second log, we have lost all the root/parent references<a name="line.248"></a>
+<span class="sourceLineNo">249</span> fs.delete(logs[0].getPath(), false);<a name="line.249"></a>
+<span class="sourceLineNo">250</span> loader.reset();<a name="line.250"></a>
+<span class="sourceLineNo">251</span> storeRestart(loader);<a name="line.251"></a>
+<span class="sourceLineNo">252</span> assertEquals(0, loader.getLoadedCount());<a name="line.252"></a>
+<span class="sourceLineNo">253</span> assertEquals(rootProcs.length, loader.getCorruptedCount());<a name="line.253"></a>
+<span class="sourceLineNo">254</span> for (Procedure proc: loader.getCorrupted()) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span> assertTrue(proc.toString(), proc.getParentProcId() <= rootProcs.length);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> assertTrue(proc.toString(),<a name="line.256"></a>
+<span class="sourceLineNo">257</span> proc.getProcId() > rootProcs.length &&<a name="line.257"></a>
+<span class="sourceLineNo">258</span> proc.getProcId() <= (rootProcs.length * 2));<a name="line.258"></a>
+<span class="sourceLineNo">259</span> }<a name="line.259"></a>
+<span class="sourceLineNo">260</span> }<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span> @Test(timeout=60000)<a name="line.262"></a>
+<span class="sourceLineNo">263</span> public void testWalReplayOrder_AB_A() throws Exception {<a name="line.263"></a>
+<span class="sourceLineNo">264</span> /*<a name="line.264"></a>
+<span class="sourceLineNo">265</span> * | A B | -> | A |<a name="line.265"></a>
+<span class="sourceLineNo">266</span> */<a name="line.266"></a>
+<span class="sourceLineNo">267</span> TestProcedure a = new TestProcedure(1, 0);<a name="line.267"></a>
+<span class="sourceLineNo">268</span> TestProcedure b = new TestProcedure(2, 1);<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> procStore.insert(a, null);<a name="line.270"></a>
+<span class="sourceLineNo">271</span> a.addStackId(0);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> procStore.update(a);<a name="line.272"></a>
+<span class="sourceLineNo">273</span><a name="line.273"></a>
+<span class="sourceLineNo">274</span> procStore.insert(a, new Procedure[] { b });<a name="line.274"></a>
+<span class="sourceLineNo">275</span> b.addStackId(1);<a name="line.275"></a>
+<span class="sourceLineNo">276</span> procStore.update(b);<a name="line.276"></a>
+<span class="sourceLineNo">277</span><a name="line.277"></a>
+<span class="sourceLineNo">278</span> procStore.rollWriterForTesting();<a name="line.278"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span> a.addStackId(2);<a name="line.280"></a>
+<span class="sourceLineNo">281</span> procStore.update(a);<a name="line.281"></a>
+<span class="sourceLineNo">282</span><a name="line.282"></a>
+<span class="sourceLineNo">283</span> storeRestart(new ProcedureStore.ProcedureLoader() {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> @Override<a name="line.284"></a>
+<span class="sourceLineNo">285</span> public void setMaxProcId(long maxProcId) {<a name="line.285"></a>
+<span class="sourceLineNo">286</span> assertEquals(2, maxProcId);<a name="line.286"></a>
+<span class="sourceLineNo">287</span> }<a name="line.287"></a>
+<span class="sourceLineNo">288</span><a name="line.288"></a>
+<span class="sourceLineNo">289</span> @Override<a name="line.289"></a>
+<span class="sourceLineNo">290</span> public void load(ProcedureIterator procIter) throws IOException {<a name="line.290"></a>
+<span class="sourceLineNo">291</span> assertTrue(procIter.hasNext());<a name="line.291"></a>
+<span class="sourceLineNo">292</span> assertEquals(1, procIter.next().getProcId());<a name="line.292"></a>
+<span class="sourceLineNo">293</span> assertTrue(procIter.hasNext());<a name="line.293"></a>
+<span class="sourceLineNo">294</span> assertEquals(2, procIter.next().getProcId());<a name="line.294"></a>
+<span class="sourceLineNo">295</span> assertFalse(procIter.hasNext());<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> @Override<a name="line.298"></a>
+<span class="sourceLineNo">299</span> public void handleCorrupted(ProcedureIterator procIter) throws IOException {<a name="line.299"></a>
+<span class="sourceLineNo">300</span> assertFalse(procIter.hasNext());<a name="line.300"></a>
+<span class="sourceLineNo">301</span> }<a name="line.301"></a>
+<span class="sourceLineNo">302</span> });<a name="line.302"></a>
+<span class="sourceLineNo">303</span> }<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span> @Test(timeout=60000)<a name="line.305"></a>
+<span class="sourceLineNo">306</span> public void testWalReplayOrder_ABC_BAD() throws Exception {<a name="line.306"></a>
+<span class="sourceLineNo">307</span> /*<a name="line.307"></a>
+<span class="sourceLineNo">308</span> * | A B C | -> | B A D |<a name="line.308"></a>
+<span class="sourceLineNo">309</span> */<a name="line.309"></a>
+<span class="sourceLineNo">310</span> TestProcedure a = new TestProcedure(1, 0);<a name="line.310"></a>
+<span class="sourceLineNo">311</span> TestProcedure b = new TestProcedure(2, 1);<a name="line.311"></a>
+<span class="sourceLineNo">312</span> TestProcedure c = new TestProcedure(3, 2);<a name="line.312"></a>
+<span class="sourceLineNo">313</span> TestProcedure d = new TestProcedure(4, 0);<a name="line.313"></a>
+<span class="sourceLineNo">314</span><a name="line.314"></a>
+<span class="sourceLineNo">315</span> procStore.insert(a, null);<a name="line.315"></a>
+<span class="sourceLineNo">316</span> a.addStackId(0);<a name="line.316"></a>
+<span class="sourceLineNo">317</span> procStore.update(a);<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span> procStore.insert(a, new Procedure[] { b });<a name="line.319"></a>
+<span class="sourceLineNo">320</span> b.addStackId(1);<a name="line.320"></a>
+<span class="sourceLineNo">321</span> procStore.update(b);<a name="line.321"></a>
+<span class="sourceLineNo">322</span><a name="line.322"></a>
+<span class="sourceLineNo">323</span> procStore.insert(b, new Procedure[] { c });<a name="line.323"></a>
+<span class="sourceLineNo">324</span> b.addStackId(2);<a name="line.324"></a>
+<span class="sourceLineNo">325</span> procStore.update(b);<a name="line.325"></a>
+<span class="sourceLineNo">326</span><a name="line.326"></a>
+<span class="sourceLineNo">327</span> procStore.rollWriterForTesting();<a name="line.327"></a>
+<span class="sourceLineNo">328</span><a name="line.328"></a>
+<span class="sourceLineNo">329</span> b.addStackId(3);<a name="line.329"></a>
+<span class="sourceLineNo">330</span> procStore.update(b);<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span> a.addStackId(4);<a name="line.332"></a>
+<span class="sourceLineNo">333</span> procStore.update(a);<a name="line.333"></a>
+<span class="sourceLineNo">334</span><a name="line.334"></a>
+<span class="sourceLineNo">335</span> procStore.insert(d, null);<a name="line.335"></a>
+<span class="sourceLineNo">336</span> d.addStackId(0);<a name="line.336"></a>
+<span class="sourceLineNo">337</span> procStore.update(d);<a name="line.337"></a>
+<span class="sourceLineNo">338</span><a name="line.338"></a>
+<span class="sourceLineNo">339</span> storeRestart(new ProcedureStore.ProcedureLoader() {<a name="line.339"></a>
+<span class="sourceLineNo">340</span> @Override<a name="line.340"></a>
+<span class="sourceLineNo">341</span> public void setMaxProcId(long maxProcId) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span> assertEquals(4, maxProcId);<a name="line.342"></a>
+<span class="sourceLineNo">343</span> }<a name="line.343"></a>
+<span class="sourceLineNo">344</span><a name="line.344"></a>
+<span class="sourceLineNo">345</span> @Override<a name="line.345"></a>
+<span class="sourceLineNo">346</span> public void load(ProcedureIterator procIter) throws IOException {<a name="line.346"></a>
+<span class="sourceLineNo">347</span> assertTrue(procIter.hasNext());<a name="line.347"></a>
+<span class="sourceLineNo">348</span> assertEquals(4, procIter.next().getProcId());<a name="line.348"></a>
+<span class="sourceLineNo">349</span> // TODO: This will be multiple call once we do fast-start<a name="line.349"></a>
+<span class="sourceLineNo">350</span> //assertFalse(procIter.hasNext());<a name="line.350"></a>
+<span class="sourceLineNo">351</span><a name="line.351"></a>
+<span class="sourceLineNo">352</span> assertTrue(procIter.hasNext());<a name="line.352"></a>
+<span class="sourceLineNo">353</span> assertEquals(1, procIter.next().getProcId());<a name="line.353"></a>
+<span class="sourceLineNo">354</span> assertTrue(procIter.hasNext());<a name="line.354"></a>
+<span class="sourceLineNo">355</span> assertEquals(2, procIter.next().getProcId());<a name="line.355"></a>
+<span class="sourceLineNo">356</span> assertTrue(procIter.hasNext());<a name="line.356"></a>
+<span class="sourceLineNo">357</span> assertEquals(3, procIter.next().getProcId());<a name="line.357"></a>
+<span class="sourceLineNo">358</span> assertFalse(procIter.hasNext());<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span> @Override<a name="line.361"></a>
+<span class="sourceLineNo">362</span> public void handleCorrupted(ProcedureIterator procIter) throws IOException {<a name="line.362"></a>
+<span class="sourceLineNo">363</span> assertFalse(procIter.hasNext());<a name="line.363"></a>
+<span class="sourceLineNo">364</span> }<a name="line.364"></a>
+<span class="sourceLineNo">365</span> });<a name="line.365"></a>
+<span class="sourceLineNo">366</span> }<a name="line.366"></a>
+<span class="sourceLineNo">367</span><a name="line.367"></a>
+<span class="sourceLineNo">368</span> @Test<a name="line.368"></a>
+<span class="sourceLineNo">369</span> public void testInsertUpdateDelete() throws Exception {<a name="line.369"></a>
+<span class="sourceLineNo">370</span> final int NTHREAD = 2;<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span> procStore.stop(false);<a name="line.372"></a>
+<span class="sourceLineNo">373</span> fs.delete(logDir, true);<a name="line.373"></a>
+<span class="sourceLineNo">374</span><a name="line.374"></a>
+<span class="sourceLineNo">375</span> org.apache.hadoop.conf.Configuration conf =<a name="line.375"></a>
+<span class="sourceLineNo">376</span> new org.apache.hadoop.conf.Configuration(htu.getConfiguration());<a name="line.376"></a>
+<span class="sourceLineNo">377</span> conf.setBoolean("hbase.procedure.store.wal.use.hsync", false);<a name="line.377"></a>
+<span class="sourceLineNo">378</span> conf.setInt("hbase.procedure.store.wal.periodic.roll.msec", 10000);<a name="line.378"></a>
+<span class="sourceLineNo">379</span> conf.setInt("hbase.procedure.store.wal.roll.threshold", 128 * 1024);<a name="line.379"></a>
+<span class="sourceLineNo">380</span><a name="line.380"></a>
+<span class="sourceLineNo">381</span> fs.mkdirs(logDir);<a name="line.381"></a>
+<span class="sourceLineNo">382</span> procStore = ProcedureTestingUtility.createWalStore(conf, fs, logDir);<a name="line.382"></a>
+<span class="sourceLineNo">383</span> procStore.start(NTHREAD);<a name="line.383"></a>
+<span class="sourceLineNo">384</span> procStore.recoverLease();<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span> LoadCounter loader = new LoadCounter();<a name="line.386"></a>
+<span class="sourceLineNo">387</span> procStore.load(loader);<a name="line.387"></a>
+<span class="sourceLineNo">388</span> assertEquals(0, loader.getMaxProcId());<a name="line.388"></a>
+<span class="sourceLineNo">389</span> assertEquals(0, loader.getLoadedCount());<a name="line.389"></a>
+<span class="sourceLineNo">390</span> assertEquals(0, loader.getCorruptedCount());<a name="line.390"></a>
+<span class="sourceLineNo">391</span><a name="line.391"></a>
+<span class="sourceLineNo">392</span> final long LAST_PROC_ID = 9999;<a name="line.392"></a>
+<span class="sourceLineNo">393</span> final Thread[] thread = new Thread[NTHREAD];<a name="line.393"></a>
+<span class="sourceLineNo">394</span> final AtomicLong procCounter = new AtomicLong((long)Math.round(Math.random() * 100));<a name="line.394"></a>
+<span class="sourceLineNo">395</span> for (int i = 0; i < thread.length; ++i) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span> thread[i] = new Thread() {<a name="line.396"></a>
+<span class="sourceLineNo">397</span> @Override<a name="line.397"></a>
+<span class="sourceLineNo">398</span> public void run() {<a name="line.398"></a>
+<span class="sourceLineNo">399</span> Random rand = new Random();<a name="line.399"></a>
+<span class="sourceLineNo">400</span> TestProcedure proc;<a name="line.400"></a>
+<span class="sourceLineNo">401</span> do {<a name="line.401"></a>
+<span class="sourceLineNo">402</span> proc = new TestProcedure(procCounter.addAndGet(1));<a name="line.402"></a>
+<span class="sourceLineNo">403</span> // Insert<a name="line.403"></a>
+<span class="sourceLineNo">404</span> procStore.insert(proc, null);<a name="line.404"></a>
+<span class="sourceLineNo">405</span> // Update<a name="line.405"></a>
+<span class="sourceLineNo">406</span> for (int i = 0, nupdates = rand.nextInt(10); i <= nupdates; ++i) {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> try { Thread.sleep(0, rand.nextInt(15)); } catch (InterruptedException e) {}<a name="line.407"></a>
+<span class="sourceLineNo">408</span> procStore.update(proc);<a name="line.408"></a>
+<span class="sourceLineNo">409</span> }<a name="line.409"></a>
+<span class="sourceLineNo">410</span> // Delete<a name="line.410"></a>
+<span class="sourceLineNo">411</span> procStore.delete(proc.getProcId());<a name="line.411"></a>
+<span class="sourceLineNo">412</span> } while (proc.getProcId() < LAST_PROC_ID);<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> thread[i].start();<a name="line.415"></a>
+<span class="sourceLineNo">416</span> }<a name="line.416"></a>
+<span class="sourceLineNo">417</span><a name="line.417"></a>
+<span class="sourceLineNo">418</span> for (int i = 0; i < thread.length; ++i) {<a name="line.418"></a>
+<span class="sourceLineNo">419</span> thread[i].join();<a name="line.419"></a>
+<span class="sourceLineNo">420</span> }<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span> procStore.getStoreTracker().dump();<a name="line.422"></a>
+<span class="sourceLineNo">423</span> assertTrue(procCounter.get() >= LAST_PROC_ID);<a name="line.423"></a>
+<span class="sourceLineNo">424</span> assertTrue(procStore.getStoreTracker().isEmpty());<a name="line.424"></a>
+<span class="sourceLineNo">425</span> assertEquals(1, procStore.getActiveLogs().size());<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>
+<span class="sourceLineNo">428</span> @Test<a name="line.428"></a>
+<span class="sourceLineNo">429</span> public void testRollAndRemove() throws IOException {<a name="line.429"></a>
+<span class="sourceLineNo">430</span> // Insert something in the log<a name="line.430"></a>
+<span class="sourceLineNo">431</span> Procedure proc1 = new TestSequentialProcedure();<a name="line.431"></a>
+<span class="sourceLineNo">432</span> procStore.insert(proc1, null);<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> Procedure proc2 = new TestSequentialProcedure();<a name="line.434"></a>
+<span class="sourceLineNo">435</span> procStore.insert(proc2, null);<a name="line.435"></a>
+<span class="sourceLineNo">436</span><a name="line.436"></a>
+<span class="sourceLineNo">437</span> // roll the log, now we have 2<a name="line.437"></a>
+<span class="sourceLineNo">438</span> procStore.rollWriterForTesting();<a name="line.438"></a>
+<span class="sourceLineNo">439</span> assertEquals(2, procStore.getActiveLogs().size());<a name="line.439"></a>
+<span class="sourceLineNo">440</span><a name="line.440"></a>
+<span class="sourceLineNo">441</span> // everything will be up to date in the second log<a name="line.441"></a>
+<span class="sourceLineNo">442</span> // so we can remove the first one<a name="line.442"></a>
+<span class="sourceLineNo">443</span> procStore.update(proc1);<a name="line.443"></a>
+<span class="sourceLineNo">444</span> procStore.update(proc2);<a name="line.444"></a>
+<span class="sourceLineNo">445</span> assertEquals(1, procStore.getActiveLogs().size());<a name="line.445"></a>
+<span class="sourceLineNo">446</span><a name="line.446"></a>
+<span class="sourceLineNo">447</span> // roll the log, now we have 2<a name="line.447"></a>
+<span class="sourceLineNo">448</span> procStore.rollWriterForTesting();<a name="line.448"></a>
+<span class="sourceLineNo">449</span> assertEquals(2, procStore.getActiveLogs().size());<a name="line.449"></a>
<span class="sourceLineNo">450</span><a name="line.450"></a>
-<span class="sourceLineNo">451</span> private void assertEmptyLogDir() {<a name="line.451"></a>
-<span class="sourceLineNo">452</span> try {<a name="line.452"></a>
-<span class="sourceLineNo">453</span> FileStatus[] status = fs.listStatus(logDir);<a name="line.453"></a>
-<span class="sourceLineNo">454</span> assertTrue("expected empty state-log dir", status == null || status.length == 0);<a name="line.454"></a>
-<span class="sourceLineNo">455</span> } catch (FileNotFoundException e) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span> fail("expected the state-log dir to be present: " + logDir);<a name="line.456"></a>
-<span class="sourceLineNo">457</span> } catch (IOException e) {<a name="line.457"></a>
-<span class="sourceLineNo">458</span> fail("got en exception on state-log dir list: " + e.getMessage());<a name="line.458"></a>
-<span class="sourceLineNo">459</span> }<a name="line.459"></a>
-<span class="sourceLineNo">460</span> }<a name="line.460"></a>
-<span class="sourceLineNo">461</span><a name="line.461"></a>
-<span class="sourceLineNo">462</span> public static class TestSequentialProcedure extends SequentialProcedure<Void> {<a name="line.462"></a>
-<span class="sourceLineNo">463</span> private static long seqid = 0;<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span> public TestSequentialProcedure() {<a name="line.465"></a>
-<span class="sourceLineNo">466</span> setProcId(++seqid);<a name="line.466"></a>
-<span class="sourceLineNo">467</span> }<a name="line.467"></a>
-<span class="sourceLineNo">468</span><a name="line.468"></a>
-<span class="sourceLineNo">469</span> @Override<a name="line.469"></a>
-<span class="sourceLineNo">470</span> protected Procedure[] execute(Void env) { return null; }<a name="line.470"></a>
+<span class="sourceLineNo">451</span> // remove everything active<a name="line.451"></a>
+<span class="sourceLineNo">452</span> // so we can remove all the logs<a name="line.452"></a>
+<span class="sourceLineNo">453</span> procStore.delete(proc1.getProcId());<a name="line.453"></a>
+<span class="sourceLineNo">454</span> procStore.delete(proc2.getProcId());<a name="line.454"></a>
+<span class="sourceLineNo">455</span> assertEquals(1, procStore.getActiveLogs().size());<a name="line.455"></a>
+<span class="sourceLineNo">456</span> }<a name="line.456"></a>
+<span class="sourceLineNo">457</span><a name="line.457"></a>
+<span class="sourceLineNo">458</span> private void corruptLog(final FileStatus logFile, final long dropBytes)<a name="line.458"></a>
+<span class="sourceLineNo">459</span> throws IOException {<a name="line.459"></a>
+<span class="sourceLineNo">460</span> assertTrue(logFile.getLen() > dropBytes);<a name="line.460"></a>
+<span class="sourceLineNo">461</span> LOG.debug("corrupt log " + logFile.getPath() +<a name="line.461"></a>
+<span class="sourceLineNo">462</span> " size=" + logFile.getLen() + " drop=" + dropBytes);<a name="line.462"></a>
+<span class="sourceLineNo">463</span> Path tmpPath = new Path(testDir, "corrupted.log");<a name="line.463"></a>
+<span class="sourceLineNo">464</span> InputStream in = fs.open(logFile.getPath());<a name="line.464"></a>
+<span class="sourceLineNo">465</span> OutputStream out = fs.create(tmpPath);<a name="line.465"></a>
+<span class="sourceLineNo">466</span> IOUtils.copyBytes(in, out, logFile.getLen() - dropBytes, true);<a name="line.466"></a>
+<span class="sourceLineNo">467</span> if (!fs.rename(tmpPath, logFile.getPath())) {<a name="line.467"></a>
+<span class="sourceLineNo">468</span> throw new IOException("Unable to rename");<a name="line.468"></a>
+<span class="sourceLineNo">469</span> }<a name="line.469"></a>
+<span class="sourceLineNo">470</span> }<a name="line.470"></a>
<span class="sourceLineNo">471</span><a name="line.471"></a>
-<span class="sourceLineNo">472</span> @Override<a name="line.472"></a>
-<span class="sourceLineNo">473</span> protected void rollback(Void env) { }<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span> @Override<a name="line.475"></a>
-<span class="sourceLineNo">476</span> protected boolean abort(Void env) { return false; }<a name="line.476"></a>
-<span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span> @Override<a name="line.478"></a>
-<span class="sourceLineNo">479</span> protected void serializeStateData(final OutputStream stream) throws IOException {<a name="line.479"></a>
-<span class="sourceLineNo">480</span> long procId = getProcId();<a name="line.480"></a>
-<span class="sourceLineNo">481</span> if (procId % 2 == 0) {<a name="line.481"></a>
-<span class="sourceLineNo">482</span> stream.write(Bytes.toBytes(procId));<a name="line.482"></a>
-<span class="sourceLineNo">483</span> }<a name="line.483"></a>
-<span class="sourceLineNo">484</span> }<a name="line.484"></a>
-<span class="sourceLineNo">485</span><a name="line.485"></a>
-<span class="sourceLineNo">486</span> @Override<a name="line.486"></a>
-<span class="sourceLineNo">487</span> protected void deserializeStateData(InputStream stream) throws IOException {<a name="line.487"></a>
-<span class="sourceLineNo">488</span> long procId = getProcId();<a name="line.488"></a>
-<span class="sourceLineNo">489</span> if (procId % 2 == 0) {<a name="line.489"></a>
-<span class="sourceLineNo">490</span> byte[] bProcId = new byte[8];<a name="line.490"></a>
-<span class="sourceLineNo">491</span> assertEquals(8, stream.read(bProcId));<a name="line.491"></a>
-<span class="sourceLineNo">492</span> assertEquals(procId, Bytes.toLong(bProcId));<a name="line.492"></a>
-<span class="sourceLineNo">493</span> } else {<a name="line.493"></a>
-<span class="sourceLineNo">494</span> assertEquals(0, stream.available());<a name="line.494"></a>
-<span class="sourceLineNo">495</span> }<a name="line.495"></a>
+<span class="sourceLineNo">472</span> private void verifyProcIdsOnRestart(final Set<Long> procIds) throws Exception {<a name="line.472"></a>
+<span class="sourceLineNo">473</span> LOG.debug("expected: " + procIds);<a name="line.473"></a>
+<span class="sourceLineNo">474</span> LoadCounter loader = new LoadCounter();<a name="line.474"></a>
+<span class="sourceLineNo">475</span> storeRestart(loader);<a name="line.475"></a>
+<span class="sourceLineNo">476</span> assertEquals(procIds.size(), loader.getLoadedCount());<a name="line.476"></a>
+<span class="sourceLineNo">477</span> assertEquals(0, loader.getCorruptedCount());<a name="line.477"></a>
+<span class="sourceLineNo">478</span> }<a name="line.478"></a>
+<span class="sourceLineNo">479</span><a name="line.479"></a>
+<span class="sourceLineNo">480</span> private void assertEmptyLogDir() {<a name="line.480"></a>
+<span class="sourceLineNo">481</span> try {<a name="line.481"></a>
+<span class="sourceLineNo">482</span> FileStatus[] status = fs.listStatus(logDir);<a name="line.482"></a>
+<span class="sourceLineNo">483</span> assertTrue("expected empty state-log dir", status == null || status.length == 0);<a name="line.483"></a>
+<span class="sourceLineNo">484</span> } catch (FileNotFoundException e) {<a name="line.484"></a>
+<span class="sourceLineNo">485</span> fail("expected the state-log dir to be present: " + logDir);<a name="line.485"></a>
+<span class="sourceLineNo">486</span> } catch (IOException e) {<a name="line.486"></a>
+<span class="sourceLineNo">487</span> fail("got en exception on state-log dir list: " + e.getMessage());<a name="line.487"></a>
+<span class="sourceLineNo">488</span> }<a name="line.488"></a>
+<span class="sourceLineNo">489</span> }<a name="line.489"></a>
+<span class="sourceLineNo">490</span><a name="line.490"></a>
+<span class="sourceLineNo">491</span> public static class TestSequentialProcedure extends SequentialProcedure<Void> {<a name="line.491"></a>
+<span class="sourceLineNo">492</span> private static long seqid = 0;<a name="line.492"></a>
+<span class="sourceLineNo">493</span><a name="line.493"></a>
+<span class="sourceLineNo">494</span> public TestSequentialProcedure() {<a name="line.494"></a>
+<span class="sourceLineNo">495</span> setProcId(++seqid);<a name="line.495"></a>
<span class="sourceLineNo">496</span> }<a name="line.496"></a>
-<span class="sourceLineNo">497</span> }<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span> private class LoadCounter implements ProcedureStore.ProcedureLoader {<a name="line.499"></a>
-<span class="sourceLineNo">500</span> private final ArrayList<Procedure> corrupted = new ArrayList<Procedure>();<a name="line.500"></a>
-<span class="sourceLineNo">501</span> private final ArrayList<Procedure> loaded = new ArrayList<Procedure>();<a name="line.501"></a>
-<span class="sourceLineNo">502</span><a name="line.502"></a>
-<span class="sourceLineNo">503</span> private Set<Long> procIds;<a name="line.503"></a>
-<span class="sourceLineNo">504</span> private long maxProcId = 0;<a name="line.504"></a>
-<span class="sourceLineNo">505</span><a name="line.505"></a>
-<span class="sourceLineNo">506</span> public LoadCounter() {<a name="line.506"></a>
-<span class="sourceLineNo">507</span> this(null);<a name="line.507"></a>
-<span class="sourceLineNo">508</span> }<a name="line.508"></a>
-<span class="sourceLineNo">509</span><a name="line.509"></a>
-<span class="sourceLineNo">510</span> public LoadCounter(final Set<Long> procIds) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span> this.procIds = procIds;<a name="line.511"></a>
-<span class="sourceLineNo">512</span> }<a name="line.512"></a>
-<span class="sourceLineNo">513</span><a name="line.513"></a>
-<span class="sourceLineNo">514</span> public void reset() {<a name="line.514"></a>
-<span class="sourceLineNo">515</span> reset(null);<a name="line.515"></a>
-<span class="sourceLineNo">516</span> }<a name="line.516"></a>
-<span class="sourceLineNo">517</span><a name="line.517"></a>
-<span class="sourceLineNo">518</span> public void reset(final Set<Long> procIds) {<a name="line.518"></a>
-<span class="sourceLineNo">519</span> corrupted.clear();<a name="line.519"></a>
-<span class="sourceLineNo">520</span> loaded.clear();<a name="line.520"></a>
-<span class="sourceLineNo">521</span> this.procIds = procIds;<a name="line.521"></a>
-<span class="sourceLineNo">522</span> this.maxProcId = 0;<a name="line.522"></a>
-<span class="sourceLineNo">523</span> }<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span> public long getMaxProcId() {<a name="line.525"></a>
-<span class="sourceLineNo">526</span> return maxProcId;<a name="line.526"></a>
-<span class="sourceLineNo">527</span> }<a name="line.527"></a>
-<span class="sourceLineNo">528</span><a name="line.528"></a>
-<span class="sourceLineNo">529</span> public ArrayList<Procedure> getLoaded() {<a name="line.529"></a>
-<span class="sourceLineNo">530</span> return loaded;<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> public int getLoadedCount() {<a name="line.533"></a>
-<span class="sourceLineNo">534</span> return loaded.size();<a name="line.534"></a>
-<span class="sourceLineNo">535</span> }<a name="line.535"></a>
-<span class="sourceLineNo">536</span><a name="line.536"></a>
-<span class="sourceLineNo">537</span> public ArrayList<Procedure> getCorrupted() {<a name="line.537"></a>
-<span class="sourceLineNo">538</span> return corrupted;<a name="line.538"></a>
-<span class="sourceLineNo">539</span> }<a name="line.539"></a>
-<span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span> public int getCorruptedCount() {<a name="line.541"></a>
-<span class="sourceLineNo">542</span> return corrupted.size();<a name="line.542"></a>
-<span class="sourceLineNo">543</span> }<a name="line.543"></a>
-<span class="sourceLineNo">544</span><a name="line.544"></a>
-<span class="sourceLineNo">545</span> @Override<a name="line.545"></a>
-<span class="sourceLineNo">546</span> public void setMaxProcId(long maxProcId) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> maxProcId = maxProcId;<a name="line.547"></a>
-<span class="sourceLineNo">548</span> }<a name="line.548"></a>
-<span class="sourceLineNo">549</span><a name="line.549"></a>
-<span class="sourceLineNo">550</span> @Override<a name="line.550"></a>
-<span class="sourceLineNo">551</span> public void load(ProcedureIterator procIter) throws IOException {<a name="line.551"></a>
-<span class="sourceLineNo">552</span> while (procIter.hasNext()) {<a name="line.552"></a>
-<span class="sourceLineNo">553</span> Procedure proc = procIter.next();<a name="line.553"></a>
-<span class="sourceLineNo">554</span> LOG.debug("loading procId=" + proc.getProcId() + ": " + proc);<a name="line.554"></a>
-<span class="sourceLineNo">555</span> if (procIds != null) {<a name="line.555"></a>
-<span class="sourceLineNo">556</span> assertTrue("procId=" + proc.getProcId() + " unexpected",<a name="line.556"></a>
-<span class="sourceLineNo">557</span> procIds.contains(proc.getProcId()));<a name="line.557"></a>
-<span class="sourceLineNo">558</span> }<a name="line.558"></a>
-<span class="sourceLineNo">559</span> loaded.add(proc);<a name="line.559"></a>
-<span class="sourceLineNo">560</span> }<a name="line.560"></a>
-<span class="sourceLineNo">561</span> }<a name="line.561"></a>
-<span class="sourceLineNo">562</span><a name="line.562"></a>
-<span class="sourceLineNo">563</span> @Override<a name="line.563"></a>
-<span class="sourceLineNo">564</span> public void handleCorrupted(ProcedureIterator procIter) throws IOException {<a name="line.564"></a>
-<span class="sourceLineNo">565</span> while (procIter.hasNext()) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span> Procedure proc = procIter.next();<a name="line.566"></a>
-<span class="sourceLineNo">567</span> LOG.debug("corrupted procId=" + proc.getProcId() + ": " + proc);<a name="line.567"></a>
-<span class="sourceLineNo">568</span> corrupted.add(proc);<a name="line.568"></a>
-<span class="sourceLineNo">569</span> }<a name="line.569"></a>
-<span class="sourceLineNo">570</span> }<a name="line.570"></a>
-<span class="sourceLineNo">571</span> }<a name="line.571"></a>
-<span class="sourceLineNo">572</span>}<a name="line.572"></a>
+<span class="sourceLineNo">497</span><a name="line.497"></a>
+<span class="sourceLineNo">498</span> @Override<a name="line.498"></a>
+<span class="sourceLineNo">499</span> protected Procedure[] execute(Void env) { return null; }<a name="line.499"></a>
+<span class="sourceLineNo">500</span><a name="line.500"></a>
+<span class="sourceLineNo">501</span> @Override<a name="line.501"></a>
+<span class="sourceLineNo">502</span> protected void rollback(Void env) { }<a name="line.502"></a>
+<span class="sourceLineNo">503</span><a name="line.503"></a>
+<span class="sourceLineNo">504</span> @Override<a name="line.504"></a>
+<span class="sourceLineNo">505</span> protected boolean abort(Void env) { return false; }<a name="line.505"></a>
+<span class="sourceLineNo">506</span><a name="line.506"></a>
+<span class="sourceLineNo">507</span> @Override<a name="line.507"></a>
+<span class="sourceLineNo">508</span> protected void serializeStateData(final OutputStream stream) throws IOException {<a name="line.508"></a>
+<span class="sourceLineNo">509</span> long procId = getProcId();<a name="line.509"></a>
+<span class="sourceLineNo">510</span> if (procId % 2 == 0) {<a name="line.510"></a>
+<span class="sourceLineNo">511</span> stream.write(Bytes.toBytes(procId));<a name="line.511"></a>
+<span class="sourceLineNo">512</span> }<a name="line.512"></a>
+<span class="sourceLineNo">513</span> }<a name="line.513"></a>
+<span class="sourceLineNo">514</span><a name="line.514"></a>
+<span class="sourceLineNo">515</span> @Override<a name="line.515"></a>
+<span class="sourceLineNo">516</span> protected void deserializeStateData(InputStream stream) throws IOException {<a name="line.516"></a>
+<span class="sourceLineNo">517</span> long procId = getProcId();<a name="line.517"></a>
+<span class="sourceLineNo">518</span> if (procId % 2 == 0) {<a name="line.518"></a>
+<span class="sourceLineNo">519</span> byte[] bProcId = new byte[8];<a name="line.519"></a>
+<span class="sourceLineNo">520</span> assertEquals(8, stream.read(bProcId));<a name="line.520"></a>
+<span class="sourceLineNo">521</span> assertEquals(procId, Bytes.toLong(bProcId));<a name="line.521"></a>
+<span class="sourceLineNo">522</span> } else {<a name="line.522"></a>
+<span class="sourceLineNo">523</span> assertEquals(0, stream.available());<a name="line.523"></a>
+<span class="sourceLineNo">524</span> }<a name="line.524"></a>
+<span class="sourceLineNo">525</span> }<a name="line.525"></a>
+<span class="sourceLineNo">526</span> }<a name="line.526"></a>
+<span class="sourceLineNo">527</span><a name="line.527"></a>
+<span class="sourceLineNo">528</span> private class LoadCounter implements ProcedureStore.ProcedureLoader {<a name="line.528"></a>
+<span class="sourceLineNo">529</span> private final ArrayList<Procedure> corrupted = new ArrayList<Procedure>();<a name="line.529"></a>
+<span class="sourceLineNo">530</span> private final ArrayList<Procedure> loaded = new ArrayList<Procedure>();<a name="line.530"></a>
+<span class="sourceLineNo">531</span><a name="line.531"></a>
+<span class="sourceLineNo">532</span> private Set<Long> procIds;<a name="line.532"></a>
+<span class="sourceLineNo">533</span> private long maxProcId = 0;<a name="line.533"></a>
+<span class="sourceLineNo">534</span><a name="line.534"></a>
+<span class="sourceLineNo">535</span> public LoadCounter() {<a name="line.535"></a>
+<span class="sourceLineNo">536</span> this(null);<a name="line.536"></a>
+<span class="sourceLineNo">537</span> }<a name="line.537"></a>
+<span class="sourceLineNo">538</span><a name="line.538"></a>
+<span class="sourceLineNo">539</span> public LoadCounter(final Set<Long> procIds) {<a name="line.539"></a>
+<span class="sourceLineNo">540</span> this.procIds = procIds;<a name="line.540"></a>
+<span class="sourceLineNo">541</span> }<a name="line.541"></a>
+<span class="sourceLineNo">542</span><a name="line.542"></a>
+<span class="sourceLineNo">543</span> public void reset() {<a name="line.543"></a>
+<span class="sourceLineNo">544</span> reset(null);<a name="line.544"></a>
+<span class="sourceLineNo">545</span> }<a name="line.545"></a>
+<span class="sourceLineNo">546</span><a name="line.546"></a>
+<span class="sourceLineNo">547</span> public void reset(final Set<Long> procIds) {<a name="line.547"></a>
+<span class="sourceLineNo">548</span> corrupted.clear();<a name="line.548"></a>
+<span class="sourceLineNo">549</span> loaded.clear();<a name="line.549"></a>
+<span class="sourceLineNo">550</span> this.procIds = procIds;<a name="line.550"></a>
+<span class="sourceLineNo">551</span> this.maxProcId = 0;<a name="line.551"></a>
+<span class="sourceLineNo">552</span> }<a name="line.552"></a>
+<span class="sourceLineNo">553</span><a name="line.553"></a>
+<span class="sourceLineNo">554</span> public long getMaxProcId() {<a name="line.554"></a>
+<span class="sourceLineNo">555</span> return maxProcId;<a name="line.555"></a>
+<span class="sourceLineNo">556</span> }<a name="line.556"></a>
+<span class="sourceLineNo">557</span><a name="line.557"></a>
+<span class="sourceLineNo">558</span> public ArrayList<Procedure> getLoaded() {<a name="line.558"></a>
+<span class="sourceLineNo">559</span> return loaded;<a name="line.559"></a>
+<span class="sourceLineNo">560</span> }<a name="line.560"></a>
+<span class="sourceLineNo">561</span><a name="line.561"></a>
+<span class="sourceLineNo">562</span> public int getLoadedCount() {<a name="line.562"></a>
+<span class="sourceLineNo">563</span> return loaded.size();<a name="line.563"></a>
+<span class="sourceLineNo">564</span> }<a name="line.564"></a>
+<span class="sourceLineNo">565</span><a name="line.565"></a>
+<span class="sourceLineNo">566</span> public ArrayList<Procedure> getCorrupted() {<a name="line.566"></a>
+<span class="sourceLineNo">567</span> return corrupted;<a name="line.567"></a>
+<span class="sourceLineNo">568</span> }<a name="line.568"></a>
+<span class="sourceLineNo">569</span><a name="line.569"></a>
+<span class="sourceLineNo">570</span> public int getCorruptedCount() {<a name="line.570"></a>
+<span class="sourceLineNo">571</span> return corrupted.size();<a name="line.571"></a>
+<span class="sourceLineNo">572</span> }<a name="line.572"></a>
+<span class="sourceLineNo">573</span><a name="line.573"></a>
+<span class="sourceLineNo">574</span> @Override<a name="line.574"></a>
+<span class="sourceLineNo">575</span> public void setMaxProcId(long maxProcId) {<a name="line.575"></a>
+<span class="sourceLineNo">576</span> maxProcId = maxProcId;<a name="line.576"></a>
+<span class="sourceLineNo">577</span> }<a name="line.577"></a>
+<span class="sourceLineNo">578</span><a name="line.578"></a>
+<span class="sourceLineNo">579</span> @Override<a name="line.579"></a>
+<span class="sourceLineNo">580</span> public void load(ProcedureIterator procIter) throws IOException {<a name="line.580"></a>
+<span class="sourceLineNo">581</span> while (procIter.hasNext()) {<a name="line.581"></a>
+<span class="sourceLineNo">582</span> Procedure proc = procIter.next();<a name="line.582"></a>
+<span class="sourceLineNo">583</span> LOG.debug("loading procId=" + proc.getProcId() + ": " + proc);<a name="line.583"></a>
+<span class="sourceLineNo">584</span> if (procIds != null) {<a name="line.584"></a>
+<span class="sourceLineNo">585</span> assertTrue("procId=" + proc.getProcId() + " unexpected",<a name="line.585"></a>
+<span class="sourceLineNo">586</span> procIds.contains(proc.getProcId()));<a name="line.586"></a>
+<span class="sourceLineNo">587</span> }<a name="line.587"></a>
+<span class="sourceLineNo">588</span> loaded.add(proc);<a name="line.588"></a>
+<span class="sourceLineNo">589</span> }<a name="line.589"></a>
+<span class="sourceLineNo">590</span> }<a name="line.590"></a>
+<span class="sourceLineNo">591</span><a name="line.591"></a>
+<span class="sourceLineNo">592</span> @Override<a name="line.592"></a>
+<span class="sourceLineNo">593</span> public void handleCorrupted(ProcedureIterator procIter) throws IOException {<a name="line.593"></a>
+<span class="sourceLineNo">594</span> while (procIter.hasNext()) {<a name="line.594"></a>
+<span class="sourceLineNo">595</span> Procedure proc = procIter.next();<a name="line.595"></a>
+<span class="sourceLineNo">596</span> LOG.debug("corrupted procId=" + proc.getProcId() + ": " + proc);<a name="line.596"></a>
+<span class="sourceLineNo">597</span> corrupted.add(proc);<a name="line.597"></a>
+<span class="sourceLineNo">598</span> }<a name="line.598"></a>
+<span class="sourceLineNo">599</span> }<a name="line.599"></a>
+<span class="sourceLineNo">600</span> }<a name="line.600"></a>
+<span class="sourceLineNo">601</span>}<a name="line.601"></a>