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/10/20 14:53:10 UTC
[11/51] [partial] hbase-site git commit: Published site at
7adf590106826b9e4432cfeee06acdc0ccff8c6e.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/425db230/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.html
index 8c65786..3a1281c 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.html
@@ -28,976 +28,860 @@
<span class="sourceLineNo">020</span>import static org.junit.Assert.assertEquals;<a name="line.20"></a>
<span class="sourceLineNo">021</span>import static org.junit.Assert.assertFalse;<a name="line.21"></a>
<span class="sourceLineNo">022</span>import static org.junit.Assert.assertTrue;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import static org.junit.Assert.fail;<a name="line.23"></a>
-<span class="sourceLineNo">024</span><a name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.io.FileNotFoundException;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.io.IOException;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import java.io.InputStream;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import java.io.OutputStream;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import java.util.ArrayList;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import java.util.Arrays;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import java.util.Comparator;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import java.util.HashSet;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import java.util.Set;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.conf.Configuration;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.fs.FileStatus;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.fs.FileSystem;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.fs.Path;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.HBaseCommonTestingUtility;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility.LoadCounter;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility.TestProcedure;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.procedure2.SequentialProcedure;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.procedure2.store.ProcedureStore;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.procedure2.store.ProcedureStore.ProcedureIterator;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.procedure2.store.ProcedureStoreTracker;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.hadoop.io.IOUtils;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.junit.After;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.junit.Before;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.junit.ClassRule;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.junit.Test;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.junit.experimental.categories.Category;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.mockito.Mockito;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.mockito.invocation.InvocationOnMock;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.mockito.stubbing.Answer;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>import org.slf4j.Logger;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>import org.slf4j.LoggerFactory;<a name="line.61"></a>
+<span class="sourceLineNo">023</span><a name="line.23"></a>
+<span class="sourceLineNo">024</span>import java.io.FileNotFoundException;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.io.IOException;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.io.InputStream;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.io.OutputStream;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import java.util.ArrayList;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import java.util.Arrays;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import java.util.Comparator;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import java.util.HashSet;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import java.util.Set;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.conf.Configuration;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.fs.FileStatus;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.fs.FileSystem;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.fs.Path;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.HBaseCommonTestingUtility;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility.LoadCounter;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility.TestProcedure;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.procedure2.SequentialProcedure;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.procedure2.store.ProcedureStore;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.procedure2.store.ProcedureStoreTracker;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.hadoop.io.IOUtils;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.junit.After;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.junit.Before;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.junit.ClassRule;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.junit.Test;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.junit.experimental.categories.Category;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.mockito.Mockito;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.mockito.invocation.InvocationOnMock;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.mockito.stubbing.Answer;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.slf4j.Logger;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.slf4j.LoggerFactory;<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.apache.hbase.thirdparty.com.google.protobuf.Int64Value;<a name="line.61"></a>
<span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span>import org.apache.hbase.thirdparty.com.google.protobuf.Int64Value;<a name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span>@Category({MasterTests.class, SmallTests.class})<a name="line.65"></a>
-<span class="sourceLineNo">066</span>public class TestWALProcedureStore {<a name="line.66"></a>
-<span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span> @ClassRule<a name="line.68"></a>
-<span class="sourceLineNo">069</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.69"></a>
-<span class="sourceLineNo">070</span> HBaseClassTestRule.forClass(TestWALProcedureStore.class);<a name="line.70"></a>
+<span class="sourceLineNo">063</span>@Category({MasterTests.class, SmallTests.class})<a name="line.63"></a>
+<span class="sourceLineNo">064</span>public class TestWALProcedureStore {<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span> @ClassRule<a name="line.66"></a>
+<span class="sourceLineNo">067</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.67"></a>
+<span class="sourceLineNo">068</span> HBaseClassTestRule.forClass(TestWALProcedureStore.class);<a name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span> private static final Logger LOG = LoggerFactory.getLogger(TestWALProcedureStore.class);<a name="line.70"></a>
<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span> private static final Logger LOG = LoggerFactory.getLogger(TestWALProcedureStore.class);<a name="line.72"></a>
+<span class="sourceLineNo">072</span> private static final int PROCEDURE_STORE_SLOTS = 1;<a name="line.72"></a>
<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span> private static final int PROCEDURE_STORE_SLOTS = 1;<a name="line.74"></a>
-<span class="sourceLineNo">075</span> private static final Procedure NULL_PROC = null;<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span> private WALProcedureStore procStore;<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span> private HBaseCommonTestingUtility htu;<a name="line.79"></a>
-<span class="sourceLineNo">080</span> private FileSystem fs;<a name="line.80"></a>
-<span class="sourceLineNo">081</span> private Path testDir;<a name="line.81"></a>
-<span class="sourceLineNo">082</span> private Path logDir;<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span> private void setupConfig(final Configuration conf) {<a name="line.84"></a>
-<span class="sourceLineNo">085</span> conf.setBoolean(WALProcedureStore.EXEC_WAL_CLEANUP_ON_LOAD_CONF_KEY, true);<a name="line.85"></a>
-<span class="sourceLineNo">086</span> }<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span> @Before<a name="line.88"></a>
-<span class="sourceLineNo">089</span> public void setUp() throws IOException {<a name="line.89"></a>
-<span class="sourceLineNo">090</span> htu = new HBaseCommonTestingUtility();<a name="line.90"></a>
-<span class="sourceLineNo">091</span> testDir = htu.getDataTestDir();<a name="line.91"></a>
-<span class="sourceLineNo">092</span> fs = testDir.getFileSystem(htu.getConfiguration());<a name="line.92"></a>
-<span class="sourceLineNo">093</span> assertTrue(testDir.depth() > 1);<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span> setupConfig(htu.getConfiguration());<a name="line.95"></a>
-<span class="sourceLineNo">096</span> logDir = new Path(testDir, "proc-logs");<a name="line.96"></a>
-<span class="sourceLineNo">097</span> procStore = ProcedureTestingUtility.createWalStore(htu.getConfiguration(), logDir);<a name="line.97"></a>
-<span class="sourceLineNo">098</span> procStore.start(PROCEDURE_STORE_SLOTS);<a name="line.98"></a>
-<span class="sourceLineNo">099</span> procStore.recoverLease();<a name="line.99"></a>
-<span class="sourceLineNo">100</span> procStore.load(new LoadCounter());<a name="line.100"></a>
-<span class="sourceLineNo">101</span> }<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span> @After<a name="line.103"></a>
-<span class="sourceLineNo">104</span> public void tearDown() throws IOException {<a name="line.104"></a>
-<span class="sourceLineNo">105</span> procStore.stop(false);<a name="line.105"></a>
-<span class="sourceLineNo">106</span> fs.delete(logDir, true);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> }<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span> private void storeRestart(ProcedureStore.ProcedureLoader loader) throws Exception {<a name="line.109"></a>
-<span class="sourceLineNo">110</span> ProcedureTestingUtility.storeRestart(procStore, loader);<a name="line.110"></a>
-<span class="sourceLineNo">111</span> }<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span> @Test<a name="line.113"></a>
-<span class="sourceLineNo">114</span> public void testEmptyRoll() throws Exception {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> for (int i = 0; i < 10; ++i) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span> procStore.periodicRollForTesting();<a name="line.116"></a>
-<span class="sourceLineNo">117</span> }<a name="line.117"></a>
-<span class="sourceLineNo">118</span> assertEquals(1, procStore.getActiveLogs().size());<a name="line.118"></a>
-<span class="sourceLineNo">119</span> FileStatus[] status = fs.listStatus(logDir);<a name="line.119"></a>
-<span class="sourceLineNo">120</span> assertEquals(1, status.length);<a name="line.120"></a>
-<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span> @Test<a name="line.123"></a>
-<span class="sourceLineNo">124</span> public void testRestartWithoutData() throws Exception {<a name="line.124"></a>
-<span class="sourceLineNo">125</span> for (int i = 0; i < 10; ++i) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> final LoadCounter loader = new LoadCounter();<a name="line.126"></a>
-<span class="sourceLineNo">127</span> storeRestart(loader);<a name="line.127"></a>
-<span class="sourceLineNo">128</span> }<a name="line.128"></a>
-<span class="sourceLineNo">129</span> LOG.info("ACTIVE WALs " + procStore.getActiveLogs());<a name="line.129"></a>
-<span class="sourceLineNo">130</span> assertEquals(1, procStore.getActiveLogs().size());<a name="line.130"></a>
-<span class="sourceLineNo">131</span> FileStatus[] status = fs.listStatus(logDir);<a name="line.131"></a>
-<span class="sourceLineNo">132</span> assertEquals(1, status.length);<a name="line.132"></a>
-<span class="sourceLineNo">133</span> }<a name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span> /**<a name="line.135"></a>
-<span class="sourceLineNo">136</span> * Tests that tracker for all old logs are loaded back after procedure store is restarted.<a name="line.136"></a>
-<span class="sourceLineNo">137</span> */<a name="line.137"></a>
-<span class="sourceLineNo">138</span> @Test<a name="line.138"></a>
-<span class="sourceLineNo">139</span> public void trackersLoadedForAllOldLogs() throws Exception {<a name="line.139"></a>
-<span class="sourceLineNo">140</span> for (int i = 0; i <= 20; ++i) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span> procStore.insert(new TestProcedure(i), null);<a name="line.141"></a>
-<span class="sourceLineNo">142</span> if (i > 0 && (i % 5) == 0) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> LoadCounter loader = new LoadCounter();<a name="line.143"></a>
-<span class="sourceLineNo">144</span> storeRestart(loader);<a name="line.144"></a>
-<span class="sourceLineNo">145</span> }<a name="line.145"></a>
-<span class="sourceLineNo">146</span> }<a name="line.146"></a>
-<span class="sourceLineNo">147</span> assertEquals(5, procStore.getActiveLogs().size());<a name="line.147"></a>
-<span class="sourceLineNo">148</span> for (int i = 0; i < procStore.getActiveLogs().size() - 1; ++i) {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> ProcedureStoreTracker tracker = procStore.getActiveLogs().get(i).getTracker();<a name="line.149"></a>
-<span class="sourceLineNo">150</span> assertTrue(tracker != null && !tracker.isEmpty());<a name="line.150"></a>
-<span class="sourceLineNo">151</span> }<a name="line.151"></a>
-<span class="sourceLineNo">152</span> }<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span> @Test<a name="line.154"></a>
-<span class="sourceLineNo">155</span> public void testWalCleanerSequentialClean() throws Exception {<a name="line.155"></a>
-<span class="sourceLineNo">156</span> final Procedure[] procs = new Procedure[5];<a name="line.156"></a>
-<span class="sourceLineNo">157</span> ArrayList<ProcedureWALFile> logs = null;<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span> // Insert procedures and roll wal after every insert.<a name="line.159"></a>
-<span class="sourceLineNo">160</span> for (int i = 0; i < procs.length; i++) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> procs[i] = new TestSequentialProcedure();<a name="line.161"></a>
-<span class="sourceLineNo">162</span> procStore.insert(procs[i], null);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> procStore.rollWriterForTesting();<a name="line.163"></a>
-<span class="sourceLineNo">164</span> logs = procStore.getActiveLogs();<a name="line.164"></a>
-<span class="sourceLineNo">165</span> assertEquals(logs.size(), i + 2); // Extra 1 for current ongoing wal.<a name="line.165"></a>
-<span class="sourceLineNo">166</span> }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> // Delete procedures in sequential order make sure that only the corresponding wal is deleted<a name="line.168"></a>
-<span class="sourceLineNo">169</span> // from logs list.<a name="line.169"></a>
-<span class="sourceLineNo">170</span> final int[] deleteOrder = new int[] { 0, 1, 2, 3, 4 };<a name="line.170"></a>
-<span class="sourceLineNo">171</span> for (int i = 0; i < deleteOrder.length; i++) {<a name="line.171"></a>
-<span class="sourceLineNo">172</span> procStore.delete(procs[deleteOrder[i]].getProcId());<a name="line.172"></a>
-<span class="sourceLineNo">173</span> procStore.removeInactiveLogsForTesting();<a name="line.173"></a>
-<span class="sourceLineNo">174</span> assertFalse(logs.get(deleteOrder[i]).toString(),<a name="line.174"></a>
-<span class="sourceLineNo">175</span> procStore.getActiveLogs().contains(logs.get(deleteOrder[i])));<a name="line.175"></a>
-<span class="sourceLineNo">176</span> assertEquals(procStore.getActiveLogs().size(), procs.length - i);<a name="line.176"></a>
-<span class="sourceLineNo">177</span> }<a name="line.177"></a>
-<span class="sourceLineNo">178</span> }<a name="line.178"></a>
-<span class="sourceLineNo">179</span><a name="line.179"></a>
-<span class="sourceLineNo">180</span><a name="line.180"></a>
-<span class="sourceLineNo">181</span> // Test that wal cleaner doesn't create holes in wal files list i.e. it only deletes files if<a name="line.181"></a>
-<span class="sourceLineNo">182</span> // they are in the starting of the list.<a name="line.182"></a>
-<span class="sourceLineNo">183</span> @Test<a name="line.183"></a>
-<span class="sourceLineNo">184</span> public void testWalCleanerNoHoles() throws Exception {<a name="line.184"></a>
-<span class="sourceLineNo">185</span> final Procedure[] procs = new Procedure[5];<a name="line.185"></a>
-<span class="sourceLineNo">186</span> ArrayList<ProcedureWALFile> logs = null;<a name="line.186"></a>
-<span class="sourceLineNo">187</span> // Insert procedures and roll wal after every insert.<a name="line.187"></a>
-<span class="sourceLineNo">188</span> for (int i = 0; i < procs.length; i++) {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> procs[i] = new TestSequentialProcedure();<a name="line.189"></a>
-<span class="sourceLineNo">190</span> procStore.insert(procs[i], null);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> procStore.rollWriterForTesting();<a name="line.191"></a>
-<span class="sourceLineNo">192</span> logs = procStore.getActiveLogs();<a name="line.192"></a>
-<span class="sourceLineNo">193</span> assertEquals(i + 2, logs.size()); // Extra 1 for current ongoing wal.<a name="line.193"></a>
-<span class="sourceLineNo">194</span> }<a name="line.194"></a>
-<span class="sourceLineNo">195</span><a name="line.195"></a>
-<span class="sourceLineNo">196</span> for (int i = 1; i < procs.length; i++) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span> procStore.delete(procs[i].getProcId());<a name="line.197"></a>
-<span class="sourceLineNo">198</span> }<a name="line.198"></a>
-<span class="sourceLineNo">199</span> assertEquals(procs.length + 1, procStore.getActiveLogs().size());<a name="line.199"></a>
-<span class="sourceLineNo">200</span> procStore.delete(procs[0].getProcId());<a name="line.200"></a>
-<span class="sourceLineNo">201</span> assertEquals(1, procStore.getActiveLogs().size());<a name="line.201"></a>
-<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span> @Test<a name="line.204"></a>
-<span class="sourceLineNo">205</span> public void testWalCleanerUpdates() throws Exception {<a name="line.205"></a>
-<span class="sourceLineNo">206</span> TestSequentialProcedure p1 = new TestSequentialProcedure();<a name="line.206"></a>
-<span class="sourceLineNo">207</span> TestSequentialProcedure p2 = new TestSequentialProcedure();<a name="line.207"></a>
-<span class="sourceLineNo">208</span> procStore.insert(p1, null);<a name="line.208"></a>
-<span class="sourceLineNo">209</span> procStore.insert(p2, null);<a name="line.209"></a>
+<span class="sourceLineNo">074</span> private WALProcedureStore procStore;<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span> private HBaseCommonTestingUtility htu;<a name="line.76"></a>
+<span class="sourceLineNo">077</span> private FileSystem fs;<a name="line.77"></a>
+<span class="sourceLineNo">078</span> private Path testDir;<a name="line.78"></a>
+<span class="sourceLineNo">079</span> private Path logDir;<a name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span> private void setupConfig(final Configuration conf) {<a name="line.81"></a>
+<span class="sourceLineNo">082</span> conf.setBoolean(WALProcedureStore.EXEC_WAL_CLEANUP_ON_LOAD_CONF_KEY, true);<a name="line.82"></a>
+<span class="sourceLineNo">083</span> }<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span> @Before<a name="line.85"></a>
+<span class="sourceLineNo">086</span> public void setUp() throws IOException {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> htu = new HBaseCommonTestingUtility();<a name="line.87"></a>
+<span class="sourceLineNo">088</span> testDir = htu.getDataTestDir();<a name="line.88"></a>
+<span class="sourceLineNo">089</span> fs = testDir.getFileSystem(htu.getConfiguration());<a name="line.89"></a>
+<span class="sourceLineNo">090</span> assertTrue(testDir.depth() > 1);<a name="line.90"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span> setupConfig(htu.getConfiguration());<a name="line.92"></a>
+<span class="sourceLineNo">093</span> logDir = new Path(testDir, "proc-logs");<a name="line.93"></a>
+<span class="sourceLineNo">094</span> procStore = ProcedureTestingUtility.createWalStore(htu.getConfiguration(), logDir);<a name="line.94"></a>
+<span class="sourceLineNo">095</span> procStore.start(PROCEDURE_STORE_SLOTS);<a name="line.95"></a>
+<span class="sourceLineNo">096</span> procStore.recoverLease();<a name="line.96"></a>
+<span class="sourceLineNo">097</span> procStore.load(new LoadCounter());<a name="line.97"></a>
+<span class="sourceLineNo">098</span> }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span> @After<a name="line.100"></a>
+<span class="sourceLineNo">101</span> public void tearDown() throws IOException {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> procStore.stop(false);<a name="line.102"></a>
+<span class="sourceLineNo">103</span> fs.delete(logDir, true);<a name="line.103"></a>
+<span class="sourceLineNo">104</span> }<a name="line.104"></a>
+<span class="sourceLineNo">105</span><a name="line.105"></a>
+<span class="sourceLineNo">106</span> private void storeRestart(ProcedureStore.ProcedureLoader loader) throws Exception {<a name="line.106"></a>
+<span class="sourceLineNo">107</span> ProcedureTestingUtility.storeRestart(procStore, loader);<a name="line.107"></a>
+<span class="sourceLineNo">108</span> }<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span> @Test<a name="line.110"></a>
+<span class="sourceLineNo">111</span> public void testEmptyRoll() throws Exception {<a name="line.111"></a>
+<span class="sourceLineNo">112</span> for (int i = 0; i < 10; ++i) {<a name="line.112"></a>
+<span class="sourceLineNo">113</span> procStore.periodicRollForTesting();<a name="line.113"></a>
+<span class="sourceLineNo">114</span> }<a name="line.114"></a>
+<span class="sourceLineNo">115</span> assertEquals(1, procStore.getActiveLogs().size());<a name="line.115"></a>
+<span class="sourceLineNo">116</span> FileStatus[] status = fs.listStatus(logDir);<a name="line.116"></a>
+<span class="sourceLineNo">117</span> assertEquals(1, status.length);<a name="line.117"></a>
+<span class="sourceLineNo">118</span> }<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span> @Test<a name="line.120"></a>
+<span class="sourceLineNo">121</span> public void testRestartWithoutData() throws Exception {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> for (int i = 0; i < 10; ++i) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span> final LoadCounter loader = new LoadCounter();<a name="line.123"></a>
+<span class="sourceLineNo">124</span> storeRestart(loader);<a name="line.124"></a>
+<span class="sourceLineNo">125</span> }<a name="line.125"></a>
+<span class="sourceLineNo">126</span> LOG.info("ACTIVE WALs " + procStore.getActiveLogs());<a name="line.126"></a>
+<span class="sourceLineNo">127</span> assertEquals(1, procStore.getActiveLogs().size());<a name="line.127"></a>
+<span class="sourceLineNo">128</span> FileStatus[] status = fs.listStatus(logDir);<a name="line.128"></a>
+<span class="sourceLineNo">129</span> assertEquals(1, status.length);<a name="line.129"></a>
+<span class="sourceLineNo">130</span> }<a name="line.130"></a>
+<span class="sourceLineNo">131</span><a name="line.131"></a>
+<span class="sourceLineNo">132</span> /**<a name="line.132"></a>
+<span class="sourceLineNo">133</span> * Tests that tracker for all old logs are loaded back after procedure store is restarted.<a name="line.133"></a>
+<span class="sourceLineNo">134</span> */<a name="line.134"></a>
+<span class="sourceLineNo">135</span> @Test<a name="line.135"></a>
+<span class="sourceLineNo">136</span> public void trackersLoadedForAllOldLogs() throws Exception {<a name="line.136"></a>
+<span class="sourceLineNo">137</span> for (int i = 0; i <= 20; ++i) {<a name="line.137"></a>
+<span class="sourceLineNo">138</span> procStore.insert(new TestProcedure(i), null);<a name="line.138"></a>
+<span class="sourceLineNo">139</span> if (i > 0 && (i % 5) == 0) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> LoadCounter loader = new LoadCounter();<a name="line.140"></a>
+<span class="sourceLineNo">141</span> storeRestart(loader);<a name="line.141"></a>
+<span class="sourceLineNo">142</span> }<a name="line.142"></a>
+<span class="sourceLineNo">143</span> }<a name="line.143"></a>
+<span class="sourceLineNo">144</span> assertEquals(5, procStore.getActiveLogs().size());<a name="line.144"></a>
+<span class="sourceLineNo">145</span> for (int i = 0; i < procStore.getActiveLogs().size() - 1; ++i) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> ProcedureStoreTracker tracker = procStore.getActiveLogs().get(i).getTracker();<a name="line.146"></a>
+<span class="sourceLineNo">147</span> assertTrue(tracker != null && !tracker.isEmpty());<a name="line.147"></a>
+<span class="sourceLineNo">148</span> }<a name="line.148"></a>
+<span class="sourceLineNo">149</span> }<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span> @Test<a name="line.151"></a>
+<span class="sourceLineNo">152</span> public void testWalCleanerSequentialClean() throws Exception {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> final Procedure<?>[] procs = new Procedure[5];<a name="line.153"></a>
+<span class="sourceLineNo">154</span> ArrayList<ProcedureWALFile> logs = null;<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span> // Insert procedures and roll wal after every insert.<a name="line.156"></a>
+<span class="sourceLineNo">157</span> for (int i = 0; i < procs.length; i++) {<a name="line.157"></a>
+<span class="sourceLineNo">158</span> procs[i] = new TestSequentialProcedure();<a name="line.158"></a>
+<span class="sourceLineNo">159</span> procStore.insert(procs[i], null);<a name="line.159"></a>
+<span class="sourceLineNo">160</span> procStore.rollWriterForTesting();<a name="line.160"></a>
+<span class="sourceLineNo">161</span> logs = procStore.getActiveLogs();<a name="line.161"></a>
+<span class="sourceLineNo">162</span> assertEquals(logs.size(), i + 2); // Extra 1 for current ongoing wal.<a name="line.162"></a>
+<span class="sourceLineNo">163</span> }<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span> // Delete procedures in sequential order make sure that only the corresponding wal is deleted<a name="line.165"></a>
+<span class="sourceLineNo">166</span> // from logs list.<a name="line.166"></a>
+<span class="sourceLineNo">167</span> final int[] deleteOrder = new int[] { 0, 1, 2, 3, 4 };<a name="line.167"></a>
+<span class="sourceLineNo">168</span> for (int i = 0; i < deleteOrder.length; i++) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span> procStore.delete(procs[deleteOrder[i]].getProcId());<a name="line.169"></a>
+<span class="sourceLineNo">170</span> procStore.removeInactiveLogsForTesting();<a name="line.170"></a>
+<span class="sourceLineNo">171</span> assertFalse(logs.get(deleteOrder[i]).toString(),<a name="line.171"></a>
+<span class="sourceLineNo">172</span> procStore.getActiveLogs().contains(logs.get(deleteOrder[i])));<a name="line.172"></a>
+<span class="sourceLineNo">173</span> assertEquals(procStore.getActiveLogs().size(), procs.length - i);<a name="line.173"></a>
+<span class="sourceLineNo">174</span> }<a name="line.174"></a>
+<span class="sourceLineNo">175</span> }<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> // Test that wal cleaner doesn't create holes in wal files list i.e. it only deletes files if<a name="line.178"></a>
+<span class="sourceLineNo">179</span> // they are in the starting of the list.<a name="line.179"></a>
+<span class="sourceLineNo">180</span> @Test<a name="line.180"></a>
+<span class="sourceLineNo">181</span> public void testWalCleanerNoHoles() throws Exception {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> final Procedure<?>[] procs = new Procedure[5];<a name="line.182"></a>
+<span class="sourceLineNo">183</span> ArrayList<ProcedureWALFile> logs = null;<a name="line.183"></a>
+<span class="sourceLineNo">184</span> // Insert procedures and roll wal after every insert.<a name="line.184"></a>
+<span class="sourceLineNo">185</span> for (int i = 0; i < procs.length; i++) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span> procs[i] = new TestSequentialProcedure();<a name="line.186"></a>
+<span class="sourceLineNo">187</span> procStore.insert(procs[i], null);<a name="line.187"></a>
+<span class="sourceLineNo">188</span> procStore.rollWriterForTesting();<a name="line.188"></a>
+<span class="sourceLineNo">189</span> logs = procStore.getActiveLogs();<a name="line.189"></a>
+<span class="sourceLineNo">190</span> assertEquals(i + 2, logs.size()); // Extra 1 for current ongoing wal.<a name="line.190"></a>
+<span class="sourceLineNo">191</span> }<a name="line.191"></a>
+<span class="sourceLineNo">192</span><a name="line.192"></a>
+<span class="sourceLineNo">193</span> for (int i = 1; i < procs.length; i++) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> procStore.delete(procs[i].getProcId());<a name="line.194"></a>
+<span class="sourceLineNo">195</span> }<a name="line.195"></a>
+<span class="sourceLineNo">196</span> assertEquals(procs.length + 1, procStore.getActiveLogs().size());<a name="line.196"></a>
+<span class="sourceLineNo">197</span> procStore.delete(procs[0].getProcId());<a name="line.197"></a>
+<span class="sourceLineNo">198</span> assertEquals(1, procStore.getActiveLogs().size());<a name="line.198"></a>
+<span class="sourceLineNo">199</span> }<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span> @Test<a name="line.201"></a>
+<span class="sourceLineNo">202</span> public void testWalCleanerUpdates() throws Exception {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> TestSequentialProcedure p1 = new TestSequentialProcedure();<a name="line.203"></a>
+<span class="sourceLineNo">204</span> TestSequentialProcedure p2 = new TestSequentialProcedure();<a name="line.204"></a>
+<span class="sourceLineNo">205</span> procStore.insert(p1, null);<a name="line.205"></a>
+<span class="sourceLineNo">206</span> procStore.insert(p2, null);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> procStore.rollWriterForTesting();<a name="line.207"></a>
+<span class="sourceLineNo">208</span> ProcedureWALFile firstLog = procStore.getActiveLogs().get(0);<a name="line.208"></a>
+<span class="sourceLineNo">209</span> procStore.update(p1);<a name="line.209"></a>
<span class="sourceLineNo">210</span> procStore.rollWriterForTesting();<a name="line.210"></a>
-<span class="sourceLineNo">211</span> ProcedureWALFile firstLog = procStore.getActiveLogs().get(0);<a name="line.211"></a>
-<span class="sourceLineNo">212</span> procStore.update(p1);<a name="line.212"></a>
-<span class="sourceLineNo">213</span> procStore.rollWriterForTesting();<a name="line.213"></a>
-<span class="sourceLineNo">214</span> procStore.update(p2);<a name="line.214"></a>
-<span class="sourceLineNo">215</span> procStore.rollWriterForTesting();<a name="line.215"></a>
-<span class="sourceLineNo">216</span> procStore.removeInactiveLogsForTesting();<a name="line.216"></a>
-<span class="sourceLineNo">217</span> assertFalse(procStore.getActiveLogs().contains(firstLog));<a name="line.217"></a>
-<span class="sourceLineNo">218</span> }<a name="line.218"></a>
-<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span> @Test<a name="line.220"></a>
-<span class="sourceLineNo">221</span> public void testWalCleanerUpdatesDontLeaveHoles() throws Exception {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> TestSequentialProcedure p1 = new TestSequentialProcedure();<a name="line.222"></a>
-<span class="sourceLineNo">223</span> TestSequentialProcedure p2 = new TestSequentialProcedure();<a name="line.223"></a>
-<span class="sourceLineNo">224</span> procStore.insert(p1, null);<a name="line.224"></a>
-<span class="sourceLineNo">225</span> procStore.insert(p2, null);<a name="line.225"></a>
-<span class="sourceLineNo">226</span> procStore.rollWriterForTesting(); // generates first log with p1 + p2<a name="line.226"></a>
-<span class="sourceLineNo">227</span> ProcedureWALFile log1 = procStore.getActiveLogs().get(0);<a name="line.227"></a>
+<span class="sourceLineNo">211</span> procStore.update(p2);<a name="line.211"></a>
+<span class="sourceLineNo">212</span> procStore.rollWriterForTesting();<a name="line.212"></a>
+<span class="sourceLineNo">213</span> procStore.removeInactiveLogsForTesting();<a name="line.213"></a>
+<span class="sourceLineNo">214</span> assertFalse(procStore.getActiveLogs().contains(firstLog));<a name="line.214"></a>
+<span class="sourceLineNo">215</span> }<a name="line.215"></a>
+<span class="sourceLineNo">216</span><a name="line.216"></a>
+<span class="sourceLineNo">217</span> @Test<a name="line.217"></a>
+<span class="sourceLineNo">218</span> public void testWalCleanerUpdatesDontLeaveHoles() throws Exception {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> TestSequentialProcedure p1 = new TestSequentialProcedure();<a name="line.219"></a>
+<span class="sourceLineNo">220</span> TestSequentialProcedure p2 = new TestSequentialProcedure();<a name="line.220"></a>
+<span class="sourceLineNo">221</span> procStore.insert(p1, null);<a name="line.221"></a>
+<span class="sourceLineNo">222</span> procStore.insert(p2, null);<a name="line.222"></a>
+<span class="sourceLineNo">223</span> procStore.rollWriterForTesting(); // generates first log with p1 + p2<a name="line.223"></a>
+<span class="sourceLineNo">224</span> ProcedureWALFile log1 = procStore.getActiveLogs().get(0);<a name="line.224"></a>
+<span class="sourceLineNo">225</span> procStore.update(p2);<a name="line.225"></a>
+<span class="sourceLineNo">226</span> procStore.rollWriterForTesting(); // generates second log with p2<a name="line.226"></a>
+<span class="sourceLineNo">227</span> ProcedureWALFile log2 = procStore.getActiveLogs().get(1);<a name="line.227"></a>
<span class="sourceLineNo">228</span> procStore.update(p2);<a name="line.228"></a>
-<span class="sourceLineNo">229</span> procStore.rollWriterForTesting(); // generates second log with p2<a name="line.229"></a>
-<span class="sourceLineNo">230</span> ProcedureWALFile log2 = procStore.getActiveLogs().get(1);<a name="line.230"></a>
-<span class="sourceLineNo">231</span> procStore.update(p2);<a name="line.231"></a>
-<span class="sourceLineNo">232</span> procStore.rollWriterForTesting(); // generates third log with p2<a name="line.232"></a>
-<span class="sourceLineNo">233</span> procStore.removeInactiveLogsForTesting(); // Shouldn't remove 2nd log.<a name="line.233"></a>
-<span class="sourceLineNo">234</span> assertEquals(4, procStore.getActiveLogs().size());<a name="line.234"></a>
-<span class="sourceLineNo">235</span> procStore.update(p1);<a name="line.235"></a>
-<span class="sourceLineNo">236</span> procStore.rollWriterForTesting(); // generates fourth log with p1<a name="line.236"></a>
-<span class="sourceLineNo">237</span> procStore.removeInactiveLogsForTesting(); // Should remove first two logs.<a name="line.237"></a>
-<span class="sourceLineNo">238</span> assertEquals(3, procStore.getActiveLogs().size());<a name="line.238"></a>
-<span class="sourceLineNo">239</span> assertFalse(procStore.getActiveLogs().contains(log1));<a name="line.239"></a>
-<span class="sourceLineNo">240</span> assertFalse(procStore.getActiveLogs().contains(log2));<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> @Test<a name="line.243"></a>
-<span class="sourceLineNo">244</span> public void testWalCleanerWithEmptyRolls() throws Exception {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> final Procedure[] procs = new Procedure[3];<a name="line.245"></a>
-<span class="sourceLineNo">246</span> for (int i = 0; i < procs.length; ++i) {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> procs[i] = new TestSequentialProcedure();<a name="line.247"></a>
-<span class="sourceLineNo">248</span> procStore.insert(procs[i], null);<a name="line.248"></a>
-<span class="sourceLineNo">249</span> }<a name="line.249"></a>
-<span class="sourceLineNo">250</span> assertEquals(1, procStore.getActiveLogs().size());<a name="line.250"></a>
-<span class="sourceLineNo">251</span> procStore.rollWriterForTesting();<a name="line.251"></a>
-<span class="sourceLineNo">252</span> assertEquals(2, procStore.getActiveLogs().size());<a name="line.252"></a>
-<span class="sourceLineNo">253</span> procStore.rollWriterForTesting();<a name="line.253"></a>
-<span class="sourceLineNo">254</span> assertEquals(3, procStore.getActiveLogs().size());<a name="line.254"></a>
-<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span> for (int i = 0; i < procs.length; ++i) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span> procStore.update(procs[i]);<a name="line.257"></a>
-<span class="sourceLineNo">258</span> procStore.rollWriterForTesting();<a name="line.258"></a>
-<span class="sourceLineNo">259</span> procStore.rollWriterForTesting();<a name="line.259"></a>
-<span class="sourceLineNo">260</span> if (i < (procs.length - 1)) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> assertEquals(3 + ((i + 1) * 2), procStore.getActiveLogs().size());<a name="line.261"></a>
-<span class="sourceLineNo">262</span> }<a name="line.262"></a>
-<span class="sourceLineNo">263</span> }<a name="line.263"></a>
-<span class="sourceLineNo">264</span> assertEquals(7, procStore.getActiveLogs().size());<a name="line.264"></a>
-<span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span> for (int i = 0; i < procs.length; ++i) {<a name="line.266"></a>
-<span class="sourceLineNo">267</span> procStore.delete(procs[i].getProcId());<a name="line.267"></a>
-<span class="sourceLineNo">268</span> assertEquals(7 - ((i + 1) * 2), procStore.getActiveLogs().size());<a name="line.268"></a>
-<span class="sourceLineNo">269</span> }<a name="line.269"></a>
-<span class="sourceLineNo">270</span> assertEquals(1, procStore.getActiveLogs().size());<a name="line.270"></a>
-<span class="sourceLineNo">271</span> }<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span> @Test<a name="line.273"></a>
-<span class="sourceLineNo">274</span> public void testEmptyLogLoad() throws Exception {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> LoadCounter loader = new LoadCounter();<a name="line.275"></a>
-<span class="sourceLineNo">276</span> storeRestart(loader);<a name="line.276"></a>
-<span class="sourceLineNo">277</span> assertEquals(0, loader.getMaxProcId());<a name="line.277"></a>
-<span class="sourceLineNo">278</span> assertEquals(0, loader.getLoadedCount());<a name="line.278"></a>
-<span class="sourceLineNo">279</span> assertEquals(0, loader.getCorruptedCount());<a name="line.279"></a>
-<span class="sourceLineNo">280</span> }<a name="line.280"></a>
-<span class="sourceLineNo">281</span><a name="line.281"></a>
-<span class="sourceLineNo">282</span> @Test<a name="line.282"></a>
-<span class="sourceLineNo">283</span> public void testLoad() throws Exception {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> Set<Long> procIds = new HashSet<>();<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span> // Insert something in the log<a name="line.286"></a>
-<span class="sourceLineNo">287</span> Procedure proc1 = new TestSequentialProcedure();<a name="line.287"></a>
-<span class="sourceLineNo">288</span> procIds.add(proc1.getProcId());<a name="line.288"></a>
-<span class="sourceLineNo">289</span> procStore.insert(proc1, null);<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span> Procedure proc2 = new TestSequentialProcedure();<a name="line.291"></a>
-<span class="sourceLineNo">292</span> Procedure[] child2 = new Procedure[2];<a name="line.292"></a>
-<span class="sourceLineNo">293</span> child2[0] = new TestSequentialProcedure();<a name="line.293"></a>
-<span class="sourceLineNo">294</span> child2[1] = new TestSequentialProcedure();<a name="line.294"></a>
-<span class="sourceLineNo">295</span><a name="line.295"></a>
-<span class="sourceLineNo">296</span> procIds.add(proc2.getProcId());<a name="line.296"></a>
-<span class="sourceLineNo">297</span> procIds.add(child2[0].getProcId());<a name="line.297"></a>
-<span class="sourceLineNo">298</span> procIds.add(child2[1].getProcId());<a name="line.298"></a>
-<span class="sourceLineNo">299</span> procStore.insert(proc2, child2);<a name="line.299"></a>
+<span class="sourceLineNo">229</span> procStore.rollWriterForTesting(); // generates third log with p2<a name="line.229"></a>
+<span class="sourceLineNo">230</span> procStore.removeInactiveLogsForTesting(); // Shouldn't remove 2nd log.<a name="line.230"></a>
+<span class="sourceLineNo">231</span> assertEquals(4, procStore.getActiveLogs().size());<a name="line.231"></a>
+<span class="sourceLineNo">232</span> procStore.update(p1);<a name="line.232"></a>
+<span class="sourceLineNo">233</span> procStore.rollWriterForTesting(); // generates fourth log with p1<a name="line.233"></a>
+<span class="sourceLineNo">234</span> procStore.removeInactiveLogsForTesting(); // Should remove first two logs.<a name="line.234"></a>
+<span class="sourceLineNo">235</span> assertEquals(3, procStore.getActiveLogs().size());<a name="line.235"></a>
+<span class="sourceLineNo">236</span> assertFalse(procStore.getActiveLogs().contains(log1));<a name="line.236"></a>
+<span class="sourceLineNo">237</span> assertFalse(procStore.getActiveLogs().contains(log2));<a name="line.237"></a>
+<span class="sourceLineNo">238</span> }<a name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span> @Test<a name="line.240"></a>
+<span class="sourceLineNo">241</span> public void testWalCleanerWithEmptyRolls() throws Exception {<a name="line.241"></a>
+<span class="sourceLineNo">242</span> final Procedure<?>[] procs = new Procedure[3];<a name="line.242"></a>
+<span class="sourceLineNo">243</span> for (int i = 0; i < procs.length; ++i) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span> procs[i] = new TestSequentialProcedure();<a name="line.244"></a>
+<span class="sourceLineNo">245</span> procStore.insert(procs[i], null);<a name="line.245"></a>
+<span class="sourceLineNo">246</span> }<a name="line.246"></a>
+<span class="sourceLineNo">247</span> assertEquals(1, procStore.getActiveLogs().size());<a name="line.247"></a>
+<span class="sourceLineNo">248</span> procStore.rollWriterForTesting();<a name="line.248"></a>
+<span class="sourceLineNo">249</span> assertEquals(2, procStore.getActiveLogs().size());<a name="line.249"></a>
+<span class="sourceLineNo">250</span> procStore.rollWriterForTesting();<a name="line.250"></a>
+<span class="sourceLineNo">251</span> assertEquals(3, procStore.getActiveLogs().size());<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span> for (int i = 0; i < procs.length; ++i) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> procStore.update(procs[i]);<a name="line.254"></a>
+<span class="sourceLineNo">255</span> procStore.rollWriterForTesting();<a name="line.255"></a>
+<span class="sourceLineNo">256</span> procStore.rollWriterForTesting();<a name="line.256"></a>
+<span class="sourceLineNo">257</span> if (i < (procs.length - 1)) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> assertEquals(3 + ((i + 1) * 2), procStore.getActiveLogs().size());<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> assertEquals(7, procStore.getActiveLogs().size());<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span> for (int i = 0; i < procs.length; ++i) {<a name="line.263"></a>
+<span class="sourceLineNo">264</span> procStore.delete(procs[i].getProcId());<a name="line.264"></a>
+<span class="sourceLineNo">265</span> assertEquals(7 - ((i + 1) * 2), procStore.getActiveLogs().size());<a name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span> assertEquals(1, procStore.getActiveLogs().size());<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> @Test<a name="line.270"></a>
+<span class="sourceLineNo">271</span> public void testEmptyLogLoad() throws Exception {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> LoadCounter loader = new LoadCounter();<a name="line.272"></a>
+<span class="sourceLineNo">273</span> storeRestart(loader);<a name="line.273"></a>
+<span class="sourceLineNo">274</span> assertEquals(0, loader.getMaxProcId());<a name="line.274"></a>
+<span class="sourceLineNo">275</span> assertEquals(0, loader.getLoadedCount());<a name="line.275"></a>
+<span class="sourceLineNo">276</span> assertEquals(0, loader.getCorruptedCount());<a name="line.276"></a>
+<span class="sourceLineNo">277</span> }<a name="line.277"></a>
+<span class="sourceLineNo">278</span><a name="line.278"></a>
+<span class="sourceLineNo">279</span> @Test<a name="line.279"></a>
+<span class="sourceLineNo">280</span> public void testLoad() throws Exception {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> Set<Long> procIds = new HashSet<>();<a name="line.281"></a>
+<span class="sourceLineNo">282</span><a name="line.282"></a>
+<span class="sourceLineNo">283</span> // Insert something in the log<a name="line.283"></a>
+<span class="sourceLineNo">284</span> Procedure<?> proc1 = new TestSequentialProcedure();<a name="line.284"></a>
+<span class="sourceLineNo">285</span> procIds.add(proc1.getProcId());<a name="line.285"></a>
+<span class="sourceLineNo">286</span> procStore.insert(proc1, null);<a name="line.286"></a>
+<span class="sourceLineNo">287</span><a name="line.287"></a>
+<span class="sourceLineNo">288</span> Procedure<?> proc2 = new TestSequentialProcedure();<a name="line.288"></a>
+<span class="sourceLineNo">289</span> Procedure<?>[] child2 = new Procedure[2];<a name="line.289"></a>
+<span class="sourceLineNo">290</span> child2[0] = new TestSequentialProcedure();<a name="line.290"></a>
+<span class="sourceLineNo">291</span> child2[1] = new TestSequentialProcedure();<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span> procIds.add(proc2.getProcId());<a name="line.293"></a>
+<span class="sourceLineNo">294</span> procIds.add(child2[0].getProcId());<a name="line.294"></a>
+<span class="sourceLineNo">295</span> procIds.add(child2[1].getProcId());<a name="line.295"></a>
+<span class="sourceLineNo">296</span> procStore.insert(proc2, child2);<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span> // Verify that everything is there<a name="line.298"></a>
+<span class="sourceLineNo">299</span> verifyProcIdsOnRestart(procIds);<a name="line.299"></a>
<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span> // Verify that everything is there<a name="line.301"></a>
-<span class="sourceLineNo">302</span> verifyProcIdsOnRestart(procIds);<a name="line.302"></a>
-<span class="sourceLineNo">303</span><a name="line.303"></a>
-<span class="sourceLineNo">304</span> // Update and delete something<a name="line.304"></a>
-<span class="sourceLineNo">305</span> procStore.update(proc1);<a name="line.305"></a>
-<span class="sourceLineNo">306</span> procStore.update(child2[1]);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> procStore.delete(child2[1].getProcId());<a name="line.307"></a>
-<span class="sourceLineNo">308</span> procIds.remove(child2[1].getProcId());<a name="line.308"></a>
+<span class="sourceLineNo">301</span> // Update and delete something<a name="line.301"></a>
+<span class="sourceLineNo">302</span> procStore.update(proc1);<a name="line.302"></a>
+<span class="sourceLineNo">303</span> procStore.update(child2[1]);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> procStore.delete(child2[1].getProcId());<a name="line.304"></a>
+<span class="sourceLineNo">305</span> procIds.remove(child2[1].getProcId());<a name="line.305"></a>
+<span class="sourceLineNo">306</span><a name="line.306"></a>
+<span class="sourceLineNo">307</span> // Verify that everything is there<a name="line.307"></a>
+<span class="sourceLineNo">308</span> verifyProcIdsOnRestart(procIds);<a name="line.308"></a>
<span class="sourceLineNo">309</span><a name="line.309"></a>
-<span class="sourceLineNo">310</span> // Verify that everything is there<a name="line.310"></a>
-<span class="sourceLineNo">311</span> verifyProcIdsOnRestart(procIds);<a name="line.311"></a>
-<span class="sourceLineNo">312</span><a name="line.312"></a>
-<span class="sourceLineNo">313</span> // Remove 4 byte from the trailers<a name="line.313"></a>
-<span class="sourceLineNo">314</span> procStore.stop(false);<a name="line.314"></a>
-<span class="sourceLineNo">315</span> FileStatus[] logs = fs.listStatus(logDir);<a name="line.315"></a>
-<span class="sourceLineNo">316</span> assertEquals(3, logs.length);<a name="line.316"></a>
-<span class="sourceLineNo">317</span> for (int i = 0; i < logs.length; ++i) {<a name="line.317"></a>
-<span class="sourceLineNo">318</span> corruptLog(logs[i], 4);<a name="line.318"></a>
-<span class="sourceLineNo">319</span> }<a name="line.319"></a>
-<span class="sourceLineNo">320</span> verifyProcIdsOnRestart(procIds);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> }<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span> @Test<a name="line.323"></a>
-<span class="sourceLineNo">324</span> public void testNoTrailerDoubleRestart() throws Exception {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> // log-0001: proc 0, 1 and 2 are inserted<a name="line.325"></a>
-<span class="sourceLineNo">326</span> Procedure proc0 = new TestSequentialProcedure();<a name="line.326"></a>
-<span class="sourceLineNo">327</span> procStore.insert(proc0, null);<a name="line.327"></a>
-<span class="sourceLineNo">328</span> Procedure proc1 = new TestSequentialProcedure();<a name="line.328"></a>
-<span class="sourceLineNo">329</span> procStore.insert(proc1, null);<a name="line.329"></a>
-<span class="sourceLineNo">330</span> Procedure proc2 = new TestSequentialProcedure();<a name="line.330"></a>
-<span class="sourceLineNo">331</span> procStore.insert(proc2, null);<a name="line.331"></a>
-<span class="sourceLineNo">332</span> procStore.rollWriterForTesting();<a name="line.332"></a>
-<span class="sourceLineNo">333</span><a name="line.333"></a>
-<span class="sourceLineNo">334</span> // log-0002: proc 1 deleted<a name="line.334"></a>
-<span class="sourceLineNo">335</span> procStore.delete(proc1.getProcId());<a name="line.335"></a>
-<span class="sourceLineNo">336</span> procStore.rollWriterForTesting();<a name="line.336"></a>
-<span class="sourceLineNo">337</span><a name="line.337"></a>
-<span class="sourceLineNo">338</span> // log-0003: proc 2 is update<a name="line.338"></a>
-<span class="sourceLineNo">339</span> procStore.update(proc2);<a name="line.339"></a>
-<span class="sourceLineNo">340</span> procStore.rollWriterForTesting();<a name="line.340"></a>
+<span class="sourceLineNo">310</span> // Remove 4 byte from the trailers<a name="line.310"></a>
+<span class="sourceLineNo">311</span> procStore.stop(false);<a name="line.311"></a>
+<span class="sourceLineNo">312</span> FileStatus[] logs = fs.listStatus(logDir);<a name="line.312"></a>
+<span class="sourceLineNo">313</span> assertEquals(3, logs.length);<a name="line.313"></a>
+<span class="sourceLineNo">314</span> for (int i = 0; i < logs.length; ++i) {<a name="line.314"></a>
+<span class="sourceLineNo">315</span> corruptLog(logs[i], 4);<a name="line.315"></a>
+<span class="sourceLineNo">316</span> }<a name="line.316"></a>
+<span class="sourceLineNo">317</span> verifyProcIdsOnRestart(procIds);<a name="line.317"></a>
+<span class="sourceLineNo">318</span> }<a name="line.318"></a>
+<span class="sourceLineNo">319</span><a name="line.319"></a>
+<span class="sourceLineNo">320</span> @Test<a name="line.320"></a>
+<span class="sourceLineNo">321</span> public void testNoTrailerDoubleRestart() throws Exception {<a name="line.321"></a>
+<span class="sourceLineNo">322</span> // log-0001: proc 0, 1 and 2 are inserted<a name="line.322"></a>
+<span class="sourceLineNo">323</span> Procedure<?> proc0 = new TestSequentialProcedure();<a name="line.323"></a>
+<span class="sourceLineNo">324</span> procStore.insert(proc0, null);<a name="line.324"></a>
+<span class="sourceLineNo">325</span> Procedure<?> proc1 = new TestSequentialProcedure();<a name="line.325"></a>
+<span class="sourceLineNo">326</span> procStore.insert(proc1, null);<a name="line.326"></a>
+<span class="sourceLineNo">327</span> Procedure<?> proc2 = new TestSequentialProcedure();<a name="line.327"></a>
+<span class="sourceLineNo">328</span> procStore.insert(proc2, null);<a name="line.328"></a>
+<span class="sourceLineNo">329</span> procStore.rollWriterForTesting();<a name="line.329"></a>
+<span class="sourceLineNo">330</span><a name="line.330"></a>
+<span class="sourceLineNo">331</span> // log-0002: proc 1 deleted<a name="line.331"></a>
+<span class="sourceLineNo">332</span> procStore.delete(proc1.getProcId());<a name="line.332"></a>
+<span class="sourceLineNo">333</span> procStore.rollWriterForTesting();<a name="line.333"></a>
+<span class="sourceLineNo">334</span><a name="line.334"></a>
+<span class="sourceLineNo">335</span> // log-0003: proc 2 is update<a name="line.335"></a>
+<span class="sourceLineNo">336</span> procStore.update(proc2);<a name="line.336"></a>
+<span class="sourceLineNo">337</span> procStore.rollWriterForTesting();<a name="line.337"></a>
+<span class="sourceLineNo">338</span><a name="line.338"></a>
+<span class="sourceLineNo">339</span> // log-0004: proc 2 deleted<a name="line.339"></a>
+<span class="sourceLineNo">340</span> procStore.delete(proc2.getProcId());<a name="line.340"></a>
<span class="sourceLineNo">341</span><a name="line.341"></a>
-<span class="sourceLineNo">342</span> // log-0004: proc 2 deleted<a name="line.342"></a>
-<span class="sourceLineNo">343</span> procStore.delete(proc2.getProcId());<a name="line.343"></a>
-<span class="sourceLineNo">344</span><a name="line.344"></a>
-<span class="sourceLineNo">345</span> // stop the store and remove the trailer<a name="line.345"></a>
-<span class="sourceLineNo">346</span> procStore.stop(false);<a name="line.346"></a>
-<span class="sourceLineNo">347</span> FileStatus[] logs = fs.listStatus(logDir);<a name="line.347"></a>
-<span class="sourceLineNo">348</span> assertEquals(4, logs.length);<a name="line.348"></a>
-<span class="sourceLineNo">349</span> for (int i = 0; i < logs.length; ++i) {<a name="line.349"></a>
-<span class="sourceLineNo">350</span> corruptLog(logs[i], 4);<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span><a name="line.352"></a>
-<span class="sourceLineNo">353</span> // Test Load 1<a name="line.353"></a>
-<span class="sourceLineNo">354</span> // Restart the store (avoid cleaning up the files, to check the rebuilded trackers)<a name="line.354"></a>
-<span class="sourceLineNo">355</span> htu.getConfiguration().setBoolean(WALProcedureStore.EXEC_WAL_CLEANUP_ON_LOAD_CONF_KEY, false);<a name="line.355"></a>
-<span class="sourceLineNo">356</span> LoadCounter loader = new LoadCounter();<a name="line.356"></a>
-<span class="sourceLineNo">357</span> storeRestart(loader);<a name="line.357"></a>
-<span class="sourceLineNo">358</span> assertEquals(1, loader.getLoadedCount());<a name="line.358"></a>
-<span class="sourceLineNo">359</span> assertEquals(0, loader.getCorruptedCount());<a name="line.359"></a>
-<span class="sourceLineNo">360</span><a name="line.360"></a>
-<span class="sourceLineNo">361</span> // Test Load 2<a name="line.361"></a>
-<span class="sourceLineNo">362</span> assertEquals(5, fs.listStatus(logDir).length);<a name="line.362"></a>
-<span class="sourceLineNo">363</span> loader = new LoadCounter();<a name="line.363"></a>
-<span class="sourceLineNo">364</span> storeRestart(loader);<a name="line.364"></a>
-<span class="sourceLineNo">365</span> assertEquals(1, loader.getLoadedCount());<a name="line.365"></a>
-<span class="sourceLineNo">366</span> assertEquals(0, loader.getCorruptedCount());<a name="line.366"></a>
-<span class="sourceLineNo">367</span><a name="line.367"></a>
-<span class="sourceLineNo">368</span> // remove proc-0<a name="line.368"></a>
-<span class="sourceLineNo">369</span> procStore.delete(proc0.getProcId());<a name="line.369"></a>
-<span class="sourceLineNo">370</span> procStore.periodicRollForTesting();<a name="line.370"></a>
-<span class="sourceLineNo">371</span> assertEquals(1, fs.listStatus(logDir).length);<a name="line.371"></a>
-<span class="sourceLineNo">372</span> storeRestart(loader);<a name="line.372"></a>
-<span class="sourceLineNo">373</span> }<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span> @Test<a name="line.375"></a>
-<span class="sourceLineNo">376</span> public void testProcIdHoles() throws Exception {<a name="line.376"></a>
-<span class="sourceLineNo">377</span> // Insert<a name="line.377"></a>
-<span class="sourceLineNo">378</span> for (int i = 0; i < 100; i += 2) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span> procStore.insert(new TestProcedure(i), null);<a name="line.379"></a>
-<span class="sourceLineNo">380</span> if (i > 0 && (i % 10) == 0) {<a name="line.380"></a>
-<span class="sourceLineNo">381</span> LoadCounter loader = new LoadCounter();<a name="line.381"></a>
-<span class="sourceLineNo">382</span> storeRestart(loader);<a name="line.382"></a>
-<span class="sourceLineNo">383</span> assertEquals(0, loader.getCorruptedCount());<a name="line.383"></a>
-<span class="sourceLineNo">384</span> assertEquals((i / 2) + 1, loader.getLoadedCount());<a name="line.384"></a>
-<span class="sourceLineNo">385</span> }<a name="line.385"></a>
-<span class="sourceLineNo">386</span> }<a name="line.386"></a>
-<span class="sourceLineNo">387</span> assertEquals(10, procStore.getActiveLogs().size());<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span> // Delete<a name="line.389"></a>
-<span class="sourceLineNo">390</span> for (int i = 0; i < 100; i += 2) {<a name="line.390"></a>
-<span class="sourceLineNo">391</span> procStore.delete(i);<a name="line.391"></a>
-<span class="sourceLineNo">392</span> }<a name="line.392"></a>
-<span class="sourceLineNo">393</span> assertEquals(1, procStore.getActiveLogs().size());<a name="line.393"></a>
-<span class="sourceLineNo">394</span><a name="line.394"></a>
-<span class="sourceLineNo">395</span> LoadCounter loader = new LoadCounter();<a name="line.395"></a>
-<span class="sourceLineNo">396</span> storeRestart(loader);<a name="line.396"></a>
-<span class="sourceLineNo">397</span> assertEquals(0, loader.getLoadedCount());<a name="line.397"></a>
-<span class="sourceLineNo">398</span> assertEquals(0, loader.getCorruptedCount());<a name="line.398"></a>
-<span class="sourceLineNo">399</span> }<a name="line.399"></a>
-<span class="sourceLineNo">400</span><a name="line.400"></a>
-<span class="sourceLineNo">401</span> @Test<a name="line.401"></a>
-<span class="sourceLineNo">402</span> public void testCorruptedTrailer() throws Exception {<a name="line.402"></a>
-<span class="sourceLineNo">403</span> // Insert something<a name="line.403"></a>
-<span class="sourceLineNo">404</span> for (int i = 0; i < 100; ++i) {<a name="line.404"></a>
-<span class="sourceLineNo">405</span> procStore.insert(new TestSequentialProcedure(), null);<a name="line.405"></a>
-<span class="sourceLineNo">406</span> }<a name="line.406"></a>
+<span class="sourceLineNo">342</span> // stop the store and remove the trailer<a name="line.342"></a>
+<span class="sourceLineNo">343</span> procStore.stop(false);<a name="line.343"></a>
+<span class="sourceLineNo">344</span> FileStatus[] logs = fs.listStatus(logDir);<a name="line.344"></a>
+<span class="sourceLineNo">345</span> assertEquals(4, logs.length);<a name="line.345"></a>
+<span class="sourceLineNo">346</span> for (int i = 0; i < logs.length; ++i) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span> corruptLog(logs[i], 4);<a name="line.347"></a>
+<span class="sourceLineNo">348</span> }<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span> // Test Load 1<a name="line.350"></a>
+<span class="sourceLineNo">351</span> // Restart the store (avoid cleaning up the files, to check the rebuilded trackers)<a name="line.351"></a>
+<span class="sourceLineNo">352</span> htu.getConfiguration().setBoolean(WALProcedureStore.EXEC_WAL_CLEANUP_ON_LOAD_CONF_KEY, false);<a name="line.352"></a>
+<span class="sourceLineNo">353</span> LoadCounter loader = new LoadCounter();<a name="line.353"></a>
+<span class="sourceLineNo">354</span> storeRestart(loader);<a name="line.354"></a>
+<span class="sourceLineNo">355</span> assertEquals(1, loader.getLoadedCount());<a name="line.355"></a>
+<span class="sourceLineNo">356</span> assertEquals(0, loader.getCorruptedCount());<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span> // Test Load 2<a name="line.358"></a>
+<span class="sourceLineNo">359</span> assertEquals(5, fs.listStatus(logDir).length);<a name="line.359"></a>
+<span class="sourceLineNo">360</span> loader = new LoadCounter();<a name="line.360"></a>
+<span class="sourceLineNo">361</span> storeRestart(loader);<a name="line.361"></a>
+<span class="sourceLineNo">362</span> assertEquals(1, loader.getLoadedCount());<a name="line.362"></a>
+<span class="sourceLineNo">363</span> assertEquals(0, loader.getCorruptedCount());<a name="line.363"></a>
+<span class="sourceLineNo">364</span><a name="line.364"></a>
+<span class="sourceLineNo">365</span> // remove proc-0<a name="line.365"></a>
+<span class="sourceLineNo">366</span> procStore.delete(proc0.getProcId());<a name="line.366"></a>
+<span class="sourceLineNo">367</span> procStore.periodicRollForTesting();<a name="line.367"></a>
+<span class="sourceLineNo">368</span> assertEquals(1, fs.listStatus(logDir).length);<a name="line.368"></a>
+<span class="sourceLineNo">369</span> storeRestart(loader);<a name="line.369"></a>
+<span class="sourceLineNo">370</span> }<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span> @Test<a name="line.372"></a>
+<span class="sourceLineNo">373</span> public void testProcIdHoles() throws Exception {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> // Insert<a name="line.374"></a>
+<span class="sourceLineNo">375</span> for (int i = 0; i < 100; i += 2) {<a name="line.375"></a>
+<span class="sourceLineNo">376</span> procStore.insert(new TestProcedure(i), null);<a name="line.376"></a>
+<span class="sourceLineNo">377</span> if (i > 0 && (i % 10) == 0) {<a name="line.377"></a>
+<span class="sourceLineNo">378</span> LoadCounter loader = new LoadCounter();<a name="line.378"></a>
+<span class="sourceLineNo">379</span> storeRestart(loader);<a name="line.379"></a>
+<span class="sourceLineNo">380</span> assertEquals(0, loader.getCorruptedCount());<a name="line.380"></a>
+<span class="sourceLineNo">381</span> assertEquals((i / 2) + 1, loader.getLoadedCount());<a name="line.381"></a>
+<span class="sourceLineNo">382</span> }<a name="line.382"></a>
+<span class="sourceLineNo">383</span> }<a name="line.383"></a>
+<span class="sourceLineNo">384</span> assertEquals(10, procStore.getActiveLogs().size());<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span> // Delete<a name="line.386"></a>
+<span class="sourceLineNo">387</span> for (int i = 0; i < 100; i += 2) {<a name="line.387"></a>
+<span class="sourceLineNo">388</span> procStore.delete(i);<a name="line.388"></a>
+<span class="sourceLineNo">389</span> }<a name="line.389"></a>
+<span class="sourceLineNo">390</span> assertEquals(1, procStore.getActiveLogs().size());<a name="line.390"></a>
+<span class="sourceLineNo">391</span><a name="line.391"></a>
+<span class="sourceLineNo">392</span> LoadCounter loader = new LoadCounter();<a name="line.392"></a>
+<span class="sourceLineNo">393</span> storeRestart(loader);<a name="line.393"></a>
+<span class="sourceLineNo">394</span> assertEquals(0, loader.getLoadedCount());<a name="line.394"></a>
+<span class="sourceLineNo">395</span> assertEquals(0, loader.getCorruptedCount());<a name="line.395"></a>
+<span class="sourceLineNo">396</span> }<a name="line.396"></a>
+<span class="sourceLineNo">397</span><a name="line.397"></a>
+<span class="sourceLineNo">398</span> @Test<a name="line.398"></a>
+<span class="sourceLineNo">399</span> public void testCorruptedTrailer() throws Exception {<a name="line.399"></a>
+<span class="sourceLineNo">400</span> // Insert something<a name="line.400"></a>
+<span class="sourceLineNo">401</span> for (int i = 0; i < 100; ++i) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span> procStore.insert(new TestSequentialProcedure(), null);<a name="line.402"></a>
+<span class="sourceLineNo">403</span> }<a name="line.403"></a>
+<span class="sourceLineNo">404</span><a name="line.404"></a>
+<span class="sourceLineNo">405</span> // Stop the store<a name="line.405"></a>
+<span class="sourceLineNo">406</span> procStore.stop(false);<a name="line.406"></a>
<span class="sourceLineNo">407</span><a name="line.407"></a>
-<span class="sourceLineNo">408</span> // Stop the store<a name="line.408"></a>
-<span class="sourceLineNo">409</span> procStore.stop(false);<a name="line.409"></a>
-<span class="sourceLineNo">410</span><a name="line.410"></a>
-<span class="sourceLineNo">411</span> // Remove 4 byte from the trailer<a name="line.411"></a>
-<span class="sourceLineNo">412</span> FileStatus[] logs = fs.listStatus(logDir);<a name="line.412"></a>
-<span class="sourceLineNo">413</span> assertEquals(1, logs.length);<a name="line.413"></a>
-<span class="sourceLineNo">414</span> corruptLog(logs[0], 4);<a name="line.414"></a>
-<span class="sourceLineNo">415</span><a name="line.415"></a>
-<span class="sourceLineNo">416</span> LoadCounter loader = new LoadCounter();<a name="line.416"></a>
-<span class="sourceLineNo">417</span> storeRestart(loader);<a name="line.417"></a>
-<span class="sourceLineNo">418</span> assertEquals(100, loader.getLoadedCount());<a name="line.418"></a>
-<span class="sourceLineNo">419</span> assertEquals(0, loader.getCorruptedCount());<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> private static void assertUpdated(final ProcedureStoreTracker tracker,<a name="line.422"></a>
-<span class="sourceLineNo">423</span> final Procedure[] procs, final int[] updatedProcs, final int[] nonUpdatedProcs) {<a name="line.423"></a>
-<span class="sourceLineNo">424</span> for (int index : updatedProcs) {<a name="line.424"></a>
-<span class="sourceLineNo">425</span> long procId = procs[index].getProcId();<a name="line.425"></a>
-<span class="sourceLineNo">426</span> assertTrue("Procedure id : " + procId, tracker.isModified(procId));<a name="line.426"></a>
-<span class="sourceLineNo">427</span> }<a name="line.427"></a>
-<span class="sourceLineNo">428</span> for (int index : nonUpdatedProcs) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span> long procId = procs[index].getProcId();<a name="line.429"></a>
-<span class="sourceLineNo">430</span> assertFalse("Procedure id : " + procId, tracker.isModified(procId));<a name="line.430"></a>
-<span class="sourceLineNo">431</span> }<a name="line.431"></a>
-<span class="sourceLineNo">432</span> }<a name="line.432"></a>
-<span class="sourceLineNo">433</span><a name="line.433"></a>
-<span class="sourceLineNo">434</span> private static void assertDeleted(final ProcedureStoreTracker tracker,<a name="line.434"></a>
-<span class="sourceLineNo">435</span> final Procedure[] procs, final int[] deletedProcs, final int[] nonDeletedProcs) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> for (int index : deletedProcs) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> long procId = procs[index].getProcId();<a name="line.437"></a>
-<span class="sourceLineNo">438</span> assertEquals("Procedure id : " + procId,<a name="line.438"></a>
-<span class="sourceLineNo">439</span> ProcedureStoreTracker.DeleteState.YES, tracker.isDeleted(procId));<a name="line.439"></a>
-<span class="sourceLineNo">440</span> }<a name="line.440"></a>
-<span class="sourceLineNo">441</span> for (int index : nonDeletedProcs) {<a name="line.441"></a>
-<span class="sourceLineNo">442</span> long procId = procs[index].getProcId();<a name="line.442"></a>
-<span class="sourceLineNo">443</span> assertEquals("Procedure id : " + procId,<a name="line.443"></a>
-<span class="sourceLineNo">444</span> ProcedureStoreTracker.DeleteState.NO, tracker.isDeleted(procId));<a name="line.444"></a>
-<span class="sourceLineNo">445</span> }<a name="line.445"></a>
-<span class="sourceLineNo">446</span> }<a name="line.446"></a>
-<span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span> @Test<a name="line.448"></a>
-<span class="sourceLineNo">449</span> public void testCorruptedTrailersRebuild() throws Exception {<a name="line.449"></a>
-<span class="sourceLineNo">450</span> final Procedure[] procs = new Procedure[6];<a name="line.450"></a>
-<span class="sourceLineNo">451</span> for (int i = 0; i < procs.length; ++i) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span> procs[i] = new TestSequentialProcedure();<a name="line.452"></a>
-<span class="sourceLineNo">453</span> }<a name="line.453"></a>
-<span class="sourceLineNo">454</span> // Log State (I=insert, U=updated, D=delete)<a name="line.454"></a>
-<span class="sourceLineNo">455</span> // | log 1 | log 2 | log 3 |<a name="line.455"></a>
-<span class="sourceLineNo">456</span> // 0 | I, D | | |<a name="line.456"></a>
-<span class="sourceLineNo">457</span> // 1 | I | | |<a name="line.457"></a>
-<span class="sourceLineNo">458</span> // 2 | I | D | |<a name="line.458"></a>
-<span class="sourceLineNo">459</span> // 3 | I | U | |<a name="line.459"></a>
-<span class="sourceLineNo">460</span> // 4 | | I | D |<a name="line.460"></a>
-<span class="sourceLineNo">461</span> // 5 | | | I |<a name="line.461"></a>
-<span class="sourceLineNo">462</span> procStore.insert(procs[0], null);<a name="line.462"></a>
-<span class="sourceLineNo">463</span> procStore.insert(procs[1], null);<a name="line.463"></a>
-<span class="sourceLineNo">464</span> procStore.insert(procs[2], null);<a name="line.464"></a>
-<span class="sourceLineNo">465</span> procStore.insert(procs[3], null);<a name="line.465"></a>
-<span class="sourceLineNo">466</span> procStore.delete(procs[0].getProcId());<a name="line.466"></a>
-<span class="sourceLineNo">467</span> procStore.rollWriterForTesting();<a name="line.467"></a>
-<span class="sourceLineNo">468</span> procStore.delete(procs[2].getProcId());<a name="line.468"></a>
-<span class="sourceLineNo">469</span> procStore.update(procs[3]);<a name="line.469"></a>
-<span class="sourceLineNo">470</span> procStore.insert(procs[4], null);<a name="line.470"></a>
-<span class="sourceLineNo">471</span> procStore.rollWriterForTesting();<a name="line.471"></a>
-<span class="sourceLineNo">472</span> procStore.delete(procs[4].getProcId());<a name="line.472"></a>
-<span class="sourceLineNo">473</span> procStore.insert(procs[5], null);<a name="line.473"></a>
+<span class="sourceLineNo">408</span> // Remove 4 byte from the trailer<a name="line.408"></a>
+<span class="sourceLineNo">409</span> FileStatus[] logs = fs.listStatus(logDir);<a name="line.409"></a>
+<span class="sourceLineNo">410</span> assertEquals(1, logs.length);<a name="line.410"></a>
+<span class="sourceLineNo">411</span> corruptLog(logs[0], 4);<a name="line.411"></a>
+<span class="sourceLineNo">412</span><a name="line.412"></a>
+<span class="sourceLineNo">413</span> LoadCounter loader = new LoadCounter();<a name="line.413"></a>
+<span class="sourceLineNo">414</span> storeRestart(loader);<a name="line.414"></a>
+<span class="sourceLineNo">415</span> assertEquals(100, loader.getLoadedCount());<a name="line.415"></a>
+<span class="sourceLineNo">416</span> assertEquals(0, loader.getCorruptedCount());<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> private static void assertUpdated(final ProcedureStoreTracker tracker,<a name="line.419"></a>
+<span class="sourceLineNo">420</span> final Procedure<?>[] procs, final int[] updatedProcs, final int[] nonUpdatedProcs) {<a name="line.420"></a>
+<span class="sourceLineNo">421</span> for (int index : updatedProcs) {<a name="line.421"></a>
+<span class="sourceLineNo">422</span> long procId = procs[index].getProcId();<a name="line.422"></a>
+<span class="sourceLineNo">423</span> assertTrue("Procedure id : " + procId, tracker.isModified(procId));<a name="line.423"></a>
+<span class="sourceLineNo">424</span> }<a name="line.424"></a>
+<span class="sourceLineNo">425</span> for (int index : nonUpdatedProcs) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span> long procId = procs[index].getProcId();<a name="line.426"></a>
+<span class="sourceLineNo">427</span> assertFalse("Procedure id : " + procId, tracker.isModified(procId));<a name="line.427"></a>
+<span class="sourceLineNo">428</span> }<a name="line.428"></a>
+<span class="sourceLineNo">429</span> }<a name="line.429"></a>
+<span class="sourceLineNo">430</span><a name="line.430"></a>
+<span class="sourceLineNo">431</span> private static void assertDeleted(final ProcedureStoreTracker tracker,<a name="line.431"></a>
+<span class="sourceLineNo">432</span> final Procedure<?>[] procs, final int[] deletedProcs, final int[] nonDeletedProcs) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span> for (int index : deletedProcs) {<a name="line.433"></a>
+<span class="sourceLineNo">434</span> long procId = procs[index].getProcId();<a name="line.434"></a>
+<span class="sourceLineNo">435</span> assertEquals("Procedure id : " + procId,<a name="line.435"></a>
+<span class="sourceLineNo">436</span> ProcedureStoreTracker.DeleteState.YES, tracker.isDeleted(procId));<a name="line.436"></a>
+<span class="sourceLineNo">437</span> }<a name="line.437"></a>
+<span class="sourceLineNo">438</span> for (int index : nonDeletedProcs) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> long procId = procs[index].getProcId();<a name="line.439"></a>
+<span class="sourceLineNo">440</span> assertEquals("Procedure id : " + procId,<a name="line.440"></a>
+<span class="sourceLineNo">441</span> ProcedureStoreTracker.DeleteState.NO, tracker.isDeleted(procId));<a name="line.441"></a>
+<span class="sourceLineNo">442</span> }<a name="line.442"></a>
+<span class="sourceLineNo">443</span> }<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span> @Test<a name="line.445"></a>
+<span class="sourceLineNo">446</span> public void testCorruptedTrailersRebuild() throws Exception {<a name="line.446"></a>
+<span class="sourceLineNo">447</span> final Procedure<?>[] procs = new Procedure[6];<a name="line.447"></a>
+<span class="sourceLineNo">448</span> for (int i = 0; i < procs.length; ++i) {<a name="line.448"></a>
+<span class="sourceLineNo">449</span> procs[i] = new TestSequentialProcedure();<a name="line.449"></a>
+<span class="sourceLineNo">450</span> }<a name="line.450"></a>
+<span class="sourceLineNo">451</span> // Log State (I=insert, U=updated, D=delete)<a name="line.451"></a>
+<span class="sourceLineNo">452</span> // | log 1 | log 2 | log 3 |<a name="line.452"></a>
+<span class="sourceLineNo">453</span> // 0 | I, D | | |<a name="line.453"></a>
+<span class="sourceLineNo">454</span> // 1 | I | | |<a name="line.454"></a>
+<span class="sourceLineNo">455</span> // 2 | I | D | |<a name="line.455"></a>
+<span class="sourceLineNo">456</span> // 3 | I | U | |<a name="line.456"></a>
+<span class="sourceLineNo">457</span> // 4 | | I | D |<a name="line.457"></a>
+<span class="sourceLineNo">458</span> // 5 | | | I |<a name="line.458"></a>
+<span class="sourceLineNo">459</span> procStore.insert(procs[0], null);<a name="line.459"></a>
+<span class="sourceLineNo">460</span> procStore.insert(procs[1], null);<a name="line.460"></a>
+<span class="sourceLineNo">461</span> procStore.insert(procs[2], null);<a name="line.461"></a>
+<span class="sourceLineNo">462</span> procStore.insert(procs[3], null);<a name="line.462"></a>
+<span class="sourceLineNo">463</span> procStore.delete(procs[0].getProcId());<a name="line.463"></a>
+<span class="sourceLineNo">464</span> procStore.rollWriterForTesting();<a name="line.464"></a>
+<span class="sourceLineNo">465</span> procStore.delete(procs[2].getProcId());<a name="line.465"></a>
+<span class="sourceLineNo">466</span> procStore.update(procs[3]);<a name="line.466"></a>
+<span class="sourceLineNo">467</span> procStore.insert(procs[4], null);<a name="line.467"></a>
+<span class="sourceLineNo">468</span> procStore.rollWriterForTesting();<a name="line.468"></a>
+<span class="sourceLineNo">469</span> procStore.delete(procs[4].getProcId());<a name="line.469"></a>
+<span class="sourceLineNo">470</span> procStore.insert(procs[5], null);<a name="line.470"></a>
+<span class="sourceLineNo">471</span><a name="line.471"></a>
+<span class="sourceLineNo">472</span> // Stop the store<a name="line.472"></a>
+<span class="sourceLineNo">473</span> procStore.stop(false);<a name="line.473"></a>
<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span> // Stop the store<a name="line.475"></a>
-<span class="sourceLineNo">476</span> procStore.stop(false);<a name="line.476"></a>
-<span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span> // Remove 4 byte from the trailers<a name="line.478"></a>
-<span class="sourceLineNo">479</span> final FileStatus[] logs = fs.listStatus(logDir);<a name="line.479"></a>
-<span class="sourceLineNo">480</span> assertEquals(3, logs.length);<a name="line.480"></a>
-<span class="sourceLineNo">481</span> for (int i = 0; i < logs.length; ++i) {<a name="line.481"></a>
-<span class="sourceLineNo">482</span> corruptLog(logs[i], 4);<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> // Restart the store (avoid cleaning up the files, to check the rebuilded trackers)<a name="line.485"></a>
-<span class="sourceLineNo">486</span> htu.getConfiguration().setBoolean(WALProcedureStore.EXEC_WAL_CLEANUP_ON_LOAD_CONF_KEY, false);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> final LoadCounter loader = new LoadCounter();<a name="line.487"></a>
-<span class="sourceLineNo">488</span> storeRestart(loader);<a name="line.488"></a>
-<span class="sourceLineNo">489</span> assertEquals(3, loader.getLoadedCount()); // procs 1, 3 and 5<a name="line.489"></a>
-<span class="sourceLineNo">490</span> assertEquals(0, loader.getCorruptedCount());<a name="line.490"></a>
-<span class="sourceLineNo">491</span><a name="line.491"></a>
-<span class="sourceLineNo">492</span> // Check the Trackers<a name="line.492"></a>
-<span class="sourceLineNo">493</span> final ArrayList<ProcedureWALFile> walFiles = procStore.getActiveLogs();<a name="line.493"></a>
-<span class="sourceLineNo">494</span> LOG.
<TRUNCATED>