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/23 14:55:35 UTC
[09/37] hbase-site git commit: Published site at
3b68e5393edba011146962c7457faffc1e3c0ee7.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3b2f2cea/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureTestingUtility.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureTestingUtility.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureTestingUtility.html
index eb90a1f..e3d6f54 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureTestingUtility.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/ProcedureTestingUtility.html
@@ -75,557 +75,583 @@
<span class="sourceLineNo">067</span> });<a name="line.67"></a>
<span class="sourceLineNo">068</span> }<a name="line.68"></a>
<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span> public static <TEnv> void restart(final ProcedureExecutor<TEnv> procExecutor) throws Exception {<a name="line.70"></a>
-<span class="sourceLineNo">071</span> restart(procExecutor, false, true, null, null, null);<a name="line.71"></a>
-<span class="sourceLineNo">072</span> }<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span> public static void initAndStartWorkers(ProcedureExecutor<?> procExecutor, int numThreads,<a name="line.74"></a>
-<span class="sourceLineNo">075</span> boolean abortOnCorruption) throws IOException {<a name="line.75"></a>
-<span class="sourceLineNo">076</span> procExecutor.init(numThreads, abortOnCorruption);<a name="line.76"></a>
-<span class="sourceLineNo">077</span> procExecutor.startWorkers();<a name="line.77"></a>
+<span class="sourceLineNo">070</span> public static <TEnv> void restart(final ProcedureExecutor<TEnv> procExecutor,<a name="line.70"></a>
+<span class="sourceLineNo">071</span> boolean abort, boolean startWorkers) throws Exception {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> restart(procExecutor, false, true, null, null, null, abort, startWorkers);<a name="line.72"></a>
+<span class="sourceLineNo">073</span> }<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span> public static <TEnv> void restart(final ProcedureExecutor<TEnv> procExecutor,<a name="line.75"></a>
+<span class="sourceLineNo">076</span> boolean abort) throws Exception {<a name="line.76"></a>
+<span class="sourceLineNo">077</span> restart(procExecutor, false, true, null, null, null, abort, true);<a name="line.77"></a>
<span class="sourceLineNo">078</span> }<a name="line.78"></a>
<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span> public static <TEnv> void restart(ProcedureExecutor<TEnv> procExecutor,<a name="line.80"></a>
-<span class="sourceLineNo">081</span> boolean avoidTestKillDuringRestart, boolean failOnCorrupted, Callable<Void> stopAction,<a name="line.81"></a>
-<span class="sourceLineNo">082</span> Callable<Void> actionBeforeStartWorker, Callable<Void> startAction)<a name="line.82"></a>
-<span class="sourceLineNo">083</span> throws Exception {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> final ProcedureStore procStore = procExecutor.getStore();<a name="line.84"></a>
-<span class="sourceLineNo">085</span> final int storeThreads = procExecutor.getCorePoolSize();<a name="line.85"></a>
-<span class="sourceLineNo">086</span> final int execThreads = procExecutor.getCorePoolSize();<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span> final ProcedureExecutor.Testing testing = procExecutor.testing;<a name="line.88"></a>
-<span class="sourceLineNo">089</span> if (avoidTestKillDuringRestart) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span> procExecutor.testing = null;<a name="line.90"></a>
-<span class="sourceLineNo">091</span> }<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span> // stop<a name="line.93"></a>
-<span class="sourceLineNo">094</span> LOG.info("RESTART - Stop");<a name="line.94"></a>
-<span class="sourceLineNo">095</span> procExecutor.stop();<a name="line.95"></a>
-<span class="sourceLineNo">096</span> procStore.stop(false);<a name="line.96"></a>
-<span class="sourceLineNo">097</span> if (stopAction != null) {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> stopAction.call();<a name="line.98"></a>
-<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span> procExecutor.join();<a name="line.100"></a>
-<span class="sourceLineNo">101</span> procExecutor.getScheduler().clear();<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span> // nothing running...<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span> // re-start<a name="line.105"></a>
-<span class="sourceLineNo">106</span> LOG.info("RESTART - Start");<a name="line.106"></a>
-<span class="sourceLineNo">107</span> procStore.start(storeThreads);<a name="line.107"></a>
-<span class="sourceLineNo">108</span> procExecutor.init(execThreads, failOnCorrupted);<a name="line.108"></a>
-<span class="sourceLineNo">109</span> if (actionBeforeStartWorker != null) {<a name="line.109"></a>
-<span class="sourceLineNo">110</span> actionBeforeStartWorker.call();<a name="line.110"></a>
-<span class="sourceLineNo">111</span> }<a name="line.111"></a>
-<span class="sourceLineNo">112</span> procExecutor.startWorkers();<a name="line.112"></a>
-<span class="sourceLineNo">113</span> if (startAction != null) {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> startAction.call();<a name="line.114"></a>
+<span class="sourceLineNo">080</span> public static <TEnv> void restart(final ProcedureExecutor<TEnv> procExecutor) throws Exception {<a name="line.80"></a>
+<span class="sourceLineNo">081</span> restart(procExecutor, false, true, null, null, null, false, true);<a name="line.81"></a>
+<span class="sourceLineNo">082</span> }<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span> public static void initAndStartWorkers(ProcedureExecutor<?> procExecutor, int numThreads,<a name="line.84"></a>
+<span class="sourceLineNo">085</span> boolean abortOnCorruption) throws IOException {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> initAndStartWorkers(procExecutor, numThreads, abortOnCorruption, true);<a name="line.86"></a>
+<span class="sourceLineNo">087</span> }<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span> public static void initAndStartWorkers(ProcedureExecutor<?> procExecutor, int numThreads,<a name="line.89"></a>
+<span class="sourceLineNo">090</span> boolean abortOnCorruption, boolean startWorkers) throws IOException {<a name="line.90"></a>
+<span class="sourceLineNo">091</span> procExecutor.init(numThreads, abortOnCorruption);<a name="line.91"></a>
+<span class="sourceLineNo">092</span> if (startWorkers) {<a name="line.92"></a>
+<span class="sourceLineNo">093</span> procExecutor.startWorkers();<a name="line.93"></a>
+<span class="sourceLineNo">094</span> }<a name="line.94"></a>
+<span class="sourceLineNo">095</span> }<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span> public static <TEnv> void restart(ProcedureExecutor<TEnv> procExecutor,<a name="line.97"></a>
+<span class="sourceLineNo">098</span> boolean avoidTestKillDuringRestart, boolean failOnCorrupted, Callable<Void> stopAction,<a name="line.98"></a>
+<span class="sourceLineNo">099</span> Callable<Void> actionBeforeStartWorker, Callable<Void> startAction) throws Exception {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> restart(procExecutor, avoidTestKillDuringRestart, failOnCorrupted, stopAction,<a name="line.100"></a>
+<span class="sourceLineNo">101</span> actionBeforeStartWorker, startAction, false, true);<a name="line.101"></a>
+<span class="sourceLineNo">102</span> }<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span> public static <TEnv> void restart(ProcedureExecutor<TEnv> procExecutor,<a name="line.104"></a>
+<span class="sourceLineNo">105</span> boolean avoidTestKillDuringRestart, boolean failOnCorrupted, Callable<Void> stopAction,<a name="line.105"></a>
+<span class="sourceLineNo">106</span> Callable<Void> actionBeforeStartWorker, Callable<Void> startAction, boolean abort,<a name="line.106"></a>
+<span class="sourceLineNo">107</span> boolean startWorkers) throws Exception {<a name="line.107"></a>
+<span class="sourceLineNo">108</span> final ProcedureStore procStore = procExecutor.getStore();<a name="line.108"></a>
+<span class="sourceLineNo">109</span> final int storeThreads = procExecutor.getCorePoolSize();<a name="line.109"></a>
+<span class="sourceLineNo">110</span> final int execThreads = procExecutor.getCorePoolSize();<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span> final ProcedureExecutor.Testing testing = procExecutor.testing;<a name="line.112"></a>
+<span class="sourceLineNo">113</span> if (avoidTestKillDuringRestart) {<a name="line.113"></a>
+<span class="sourceLineNo">114</span> procExecutor.testing = null;<a name="line.114"></a>
<span class="sourceLineNo">115</span> }<a name="line.115"></a>
<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span> if (avoidTestKillDuringRestart) {<a name="line.117"></a>
-<span class="sourceLineNo">118</span> procExecutor.testing = testing;<a name="line.118"></a>
-<span class="sourceLineNo">119</span> }<a name="line.119"></a>
-<span class="sourceLineNo">120</span> }<a name="line.120"></a>
-<span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span> public static void storeRestart(ProcedureStore procStore, ProcedureStore.ProcedureLoader loader)<a name="line.122"></a>
-<span class="sourceLineNo">123</span> throws Exception {<a name="line.123"></a>
-<span class="sourceLineNo">124</span> procStore.stop(false);<a name="line.124"></a>
-<span class="sourceLineNo">125</span> procStore.start(procStore.getNumThreads());<a name="line.125"></a>
-<span class="sourceLineNo">126</span> procStore.recoverLease();<a name="line.126"></a>
-<span class="sourceLineNo">127</span> procStore.load(loader);<a name="line.127"></a>
-<span class="sourceLineNo">128</span> }<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span> public static LoadCounter storeRestartAndAssert(ProcedureStore procStore, long maxProcId,<a name="line.130"></a>
-<span class="sourceLineNo">131</span> long runnableCount, int completedCount, int corruptedCount) throws Exception {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> final LoadCounter loader = new LoadCounter();<a name="line.132"></a>
-<span class="sourceLineNo">133</span> storeRestart(procStore, loader);<a name="line.133"></a>
-<span class="sourceLineNo">134</span> assertEquals(maxProcId, loader.getMaxProcId());<a name="line.134"></a>
-<span class="sourceLineNo">135</span> assertEquals(runnableCount, loader.getRunnableCount());<a name="line.135"></a>
-<span class="sourceLineNo">136</span> assertEquals(completedCount, loader.getCompletedCount());<a name="line.136"></a>
-<span class="sourceLineNo">137</span> assertEquals(corruptedCount, loader.getCorruptedCount());<a name="line.137"></a>
-<span class="sourceLineNo">138</span> return loader;<a name="line.138"></a>
-<span class="sourceLineNo">139</span> }<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span> private static <TEnv> void createExecutorTesting(final ProcedureExecutor<TEnv> procExecutor) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> if (procExecutor.testing == null) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> procExecutor.testing = new ProcedureExecutor.Testing();<a name="line.143"></a>
-<span class="sourceLineNo">144</span> }<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> public static <TEnv> void setKillIfHasParent(ProcedureExecutor<TEnv> procExecutor,<a name="line.147"></a>
-<span class="sourceLineNo">148</span> boolean value) {<a name="line.148"></a>
-<span class="sourceLineNo">149</span> createExecutorTesting(procExecutor);<a name="line.149"></a>
-<span class="sourceLineNo">150</span> procExecutor.testing.killIfHasParent = value;<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> public static <TEnv> void setKillIfSuspended(ProcedureExecutor<TEnv> procExecutor,<a name="line.153"></a>
-<span class="sourceLineNo">154</span> boolean value) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> createExecutorTesting(procExecutor);<a name="line.155"></a>
-<span class="sourceLineNo">156</span> procExecutor.testing.killIfSuspended = value;<a name="line.156"></a>
-<span class="sourceLineNo">157</span> }<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span> public static <TEnv> void setKillBeforeStoreUpdate(ProcedureExecutor<TEnv> procExecutor,<a name="line.159"></a>
-<span class="sourceLineNo">160</span> boolean value) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> createExecutorTesting(procExecutor);<a name="line.161"></a>
-<span class="sourceLineNo">162</span> procExecutor.testing.killBeforeStoreUpdate = value;<a name="line.162"></a>
-<span class="sourceLineNo">163</span> LOG.warn("Set Kill before store update to: " + procExecutor.testing.killBeforeStoreUpdate);<a name="line.163"></a>
-<span class="sourceLineNo">164</span> assertSingleExecutorForKillTests(procExecutor);<a name="line.164"></a>
+<span class="sourceLineNo">117</span> // stop<a name="line.117"></a>
+<span class="sourceLineNo">118</span> LOG.info("RESTART - Stop");<a name="line.118"></a>
+<span class="sourceLineNo">119</span> procExecutor.stop();<a name="line.119"></a>
+<span class="sourceLineNo">120</span> procStore.stop(abort);<a name="line.120"></a>
+<span class="sourceLineNo">121</span> if (stopAction != null) {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> stopAction.call();<a name="line.122"></a>
+<span class="sourceLineNo">123</span> }<a name="line.123"></a>
+<span class="sourceLineNo">124</span> procExecutor.join();<a name="line.124"></a>
+<span class="sourceLineNo">125</span> procExecutor.getScheduler().clear();<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span> // nothing running...<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> // re-start<a name="line.129"></a>
+<span class="sourceLineNo">130</span> LOG.info("RESTART - Start");<a name="line.130"></a>
+<span class="sourceLineNo">131</span> procStore.start(storeThreads);<a name="line.131"></a>
+<span class="sourceLineNo">132</span> procExecutor.init(execThreads, failOnCorrupted);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> if (actionBeforeStartWorker != null) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> actionBeforeStartWorker.call();<a name="line.134"></a>
+<span class="sourceLineNo">135</span> }<a name="line.135"></a>
+<span class="sourceLineNo">136</span> if (startWorkers) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span> procExecutor.startWorkers();<a name="line.137"></a>
+<span class="sourceLineNo">138</span> }<a name="line.138"></a>
+<span class="sourceLineNo">139</span> if (startAction != null) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> startAction.call();<a name="line.140"></a>
+<span class="sourceLineNo">141</span> }<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span> if (avoidTestKillDuringRestart) {<a name="line.143"></a>
+<span class="sourceLineNo">144</span> procExecutor.testing = testing;<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><a name="line.147"></a>
+<span class="sourceLineNo">148</span> public static void storeRestart(ProcedureStore procStore, ProcedureStore.ProcedureLoader loader)<a name="line.148"></a>
+<span class="sourceLineNo">149</span> throws Exception {<a name="line.149"></a>
+<span class="sourceLineNo">150</span> procStore.stop(false);<a name="line.150"></a>
+<span class="sourceLineNo">151</span> procStore.start(procStore.getNumThreads());<a name="line.151"></a>
+<span class="sourceLineNo">152</span> procStore.recoverLease();<a name="line.152"></a>
+<span class="sourceLineNo">153</span> procStore.load(loader);<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span> public static LoadCounter storeRestartAndAssert(ProcedureStore procStore, long maxProcId,<a name="line.156"></a>
+<span class="sourceLineNo">157</span> long runnableCount, int completedCount, int corruptedCount) throws Exception {<a name="line.157"></a>
+<span class="sourceLineNo">158</span> final LoadCounter loader = new LoadCounter();<a name="line.158"></a>
+<span class="sourceLineNo">159</span> storeRestart(procStore, loader);<a name="line.159"></a>
+<span class="sourceLineNo">160</span> assertEquals(maxProcId, loader.getMaxProcId());<a name="line.160"></a>
+<span class="sourceLineNo">161</span> assertEquals(runnableCount, loader.getRunnableCount());<a name="line.161"></a>
+<span class="sourceLineNo">162</span> assertEquals(completedCount, loader.getCompletedCount());<a name="line.162"></a>
+<span class="sourceLineNo">163</span> assertEquals(corruptedCount, loader.getCorruptedCount());<a name="line.163"></a>
+<span class="sourceLineNo">164</span> return loader;<a name="line.164"></a>
<span class="sourceLineNo">165</span> }<a name="line.165"></a>
<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span> public static <TEnv> void setToggleKillBeforeStoreUpdate(ProcedureExecutor<TEnv> procExecutor,<a name="line.167"></a>
-<span class="sourceLineNo">168</span> boolean value) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span> createExecutorTesting(procExecutor);<a name="line.169"></a>
-<span class="sourceLineNo">170</span> procExecutor.testing.toggleKillBeforeStoreUpdate = value;<a name="line.170"></a>
-<span class="sourceLineNo">171</span> assertSingleExecutorForKillTests(procExecutor);<a name="line.171"></a>
-<span class="sourceLineNo">172</span> }<a name="line.172"></a>
-<span class="sourceLineNo">173</span><a name="line.173"></a>
-<span class="sourceLineNo">174</span> public static <TEnv> void toggleKillBeforeStoreUpdate(ProcedureExecutor<TEnv> procExecutor) {<a name="line.174"></a>
+<span class="sourceLineNo">167</span> private static <TEnv> void createExecutorTesting(final ProcedureExecutor<TEnv> procExecutor) {<a name="line.167"></a>
+<span class="sourceLineNo">168</span> if (procExecutor.testing == null) {<a name="line.168"></a>
+<span class="sourceLineNo">169</span> procExecutor.testing = new ProcedureExecutor.Testing();<a name="line.169"></a>
+<span class="sourceLineNo">170</span> }<a name="line.170"></a>
+<span class="sourceLineNo">171</span> }<a name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span> public static <TEnv> void setKillIfHasParent(ProcedureExecutor<TEnv> procExecutor,<a name="line.173"></a>
+<span class="sourceLineNo">174</span> boolean value) {<a name="line.174"></a>
<span class="sourceLineNo">175</span> createExecutorTesting(procExecutor);<a name="line.175"></a>
-<span class="sourceLineNo">176</span> procExecutor.testing.killBeforeStoreUpdate = !procExecutor.testing.killBeforeStoreUpdate;<a name="line.176"></a>
-<span class="sourceLineNo">177</span> LOG.warn("Set Kill before store update to: " + procExecutor.testing.killBeforeStoreUpdate);<a name="line.177"></a>
-<span class="sourceLineNo">178</span> assertSingleExecutorForKillTests(procExecutor);<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> public static <TEnv> void toggleKillAfterStoreUpdate(ProcedureExecutor<TEnv> procExecutor) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> createExecutorTesting(procExecutor);<a name="line.182"></a>
-<span class="sourceLineNo">183</span> procExecutor.testing.killAfterStoreUpdate = !procExecutor.testing.killAfterStoreUpdate;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> LOG.warn("Set Kill after store update to: " + procExecutor.testing.killAfterStoreUpdate);<a name="line.184"></a>
-<span class="sourceLineNo">185</span> assertSingleExecutorForKillTests(procExecutor);<a name="line.185"></a>
-<span class="sourceLineNo">186</span> }<a name="line.186"></a>
-<span class="sourceLineNo">187</span><a name="line.187"></a>
-<span class="sourceLineNo">188</span> public static <TEnv> void setKillAndToggleBeforeStoreUpdate(ProcedureExecutor<TEnv> procExecutor,<a name="line.188"></a>
-<span class="sourceLineNo">189</span> boolean value) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> ProcedureTestingUtility.setKillBeforeStoreUpdate(procExecutor, value);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> ProcedureTestingUtility.setToggleKillBeforeStoreUpdate(procExecutor, value);<a name="line.191"></a>
-<span class="sourceLineNo">192</span> assertSingleExecutorForKillTests(procExecutor);<a name="line.192"></a>
-<span class="sourceLineNo">193</span> }<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span> private static <TEnv> void assertSingleExecutorForKillTests(<a name="line.195"></a>
-<span class="sourceLineNo">196</span> final ProcedureExecutor<TEnv> procExecutor) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span> if (procExecutor.testing == null) return;<a name="line.197"></a>
-<span class="sourceLineNo">198</span> if (procExecutor.testing.killBeforeStoreUpdate ||<a name="line.198"></a>
-<span class="sourceLineNo">199</span> procExecutor.testing.toggleKillBeforeStoreUpdate) {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> assertEquals("expected only one executor running during test with kill/restart",<a name="line.200"></a>
-<span class="sourceLineNo">201</span> 1, procExecutor.getCorePoolSize());<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><a name="line.204"></a>
-<span class="sourceLineNo">205</span> public static <TEnv> long submitAndWait(Configuration conf, TEnv env, Procedure<TEnv> proc)<a name="line.205"></a>
-<span class="sourceLineNo">206</span> throws IOException {<a name="line.206"></a>
-<span class="sourceLineNo">207</span> NoopProcedureStore procStore = new NoopProcedureStore();<a name="line.207"></a>
-<span class="sourceLineNo">208</span> ProcedureExecutor<TEnv> procExecutor = new ProcedureExecutor<>(conf, env, procStore);<a name="line.208"></a>
-<span class="sourceLineNo">209</span> procStore.start(1);<a name="line.209"></a>
-<span class="sourceLineNo">210</span> initAndStartWorkers(procExecutor, 1, false);<a name="line.210"></a>
-<span class="sourceLineNo">211</span> try {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> return submitAndWait(procExecutor, proc, HConstants.NO_NONCE, HConstants.NO_NONCE);<a name="line.212"></a>
-<span class="sourceLineNo">213</span> } finally {<a name="line.213"></a>
-<span class="sourceLineNo">214</span> procStore.stop(false);<a name="line.214"></a>
-<span class="sourceLineNo">215</span> procExecutor.stop();<a name="line.215"></a>
-<span class="sourceLineNo">216</span> }<a name="line.216"></a>
-<span class="sourceLineNo">217</span> }<a name="line.217"></a>
-<span class="sourceLineNo">218</span><a name="line.218"></a>
-<span class="sourceLineNo">219</span> public static <TEnv> long submitAndWait(ProcedureExecutor<TEnv> procExecutor, Procedure proc) {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> return submitAndWait(procExecutor, proc, HConstants.NO_NONCE, HConstants.NO_NONCE);<a name="line.220"></a>
-<span class="sourceLineNo">221</span> }<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span> public static <TEnv> long submitAndWait(ProcedureExecutor<TEnv> procExecutor, Procedure proc,<a name="line.223"></a>
-<span class="sourceLineNo">224</span> final long nonceGroup, final long nonce) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span> long procId = submitProcedure(procExecutor, proc, nonceGroup, nonce);<a name="line.225"></a>
-<span class="sourceLineNo">226</span> waitProcedure(procExecutor, procId);<a name="line.226"></a>
-<span class="sourceLineNo">227</span> return procId;<a name="line.227"></a>
-<span class="sourceLineNo">228</span> }<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span> public static <TEnv> long submitProcedure(ProcedureExecutor<TEnv> procExecutor, Procedure proc,<a name="line.230"></a>
-<span class="sourceLineNo">231</span> final long nonceGroup, final long nonce) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> final NonceKey nonceKey = procExecutor.createNonceKey(nonceGroup, nonce);<a name="line.232"></a>
-<span class="sourceLineNo">233</span> long procId = procExecutor.registerNonce(nonceKey);<a name="line.233"></a>
-<span class="sourceLineNo">234</span> assertFalse(procId >= 0);<a name="line.234"></a>
-<span class="sourceLineNo">235</span> return procExecutor.submitProcedure(proc, nonceKey);<a name="line.235"></a>
-<span class="sourceLineNo">236</span> }<a name="line.236"></a>
-<span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span> public static <TEnv> void waitProcedure(ProcedureExecutor<TEnv> procExecutor, Procedure proc) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> while (proc.getState() == ProcedureState.INITIALIZING) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span> Threads.sleepWithoutInterrupt(250);<a name="line.240"></a>
-<span class="sourceLineNo">241</span> }<a name="line.241"></a>
-<span class="sourceLineNo">242</span> waitProcedure(procExecutor, proc.getProcId());<a name="line.242"></a>
+<span class="sourceLineNo">176</span> procExecutor.testing.killIfHasParent = value;<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> public static <TEnv> void setKillIfSuspended(ProcedureExecutor<TEnv> procExecutor,<a name="line.179"></a>
+<span class="sourceLineNo">180</span> boolean value) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> createExecutorTesting(procExecutor);<a name="line.181"></a>
+<span class="sourceLineNo">182</span> procExecutor.testing.killIfSuspended = value;<a name="line.182"></a>
+<span class="sourceLineNo">183</span> }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span> public static <TEnv> void setKillBeforeStoreUpdate(ProcedureExecutor<TEnv> procExecutor,<a name="line.185"></a>
+<span class="sourceLineNo">186</span> boolean value) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> createExecutorTesting(procExecutor);<a name="line.187"></a>
+<span class="sourceLineNo">188</span> procExecutor.testing.killBeforeStoreUpdate = value;<a name="line.188"></a>
+<span class="sourceLineNo">189</span> LOG.warn("Set Kill before store update to: " + procExecutor.testing.killBeforeStoreUpdate);<a name="line.189"></a>
+<span class="sourceLineNo">190</span> assertSingleExecutorForKillTests(procExecutor);<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> public static <TEnv> void setToggleKillBeforeStoreUpdate(ProcedureExecutor<TEnv> procExecutor,<a name="line.193"></a>
+<span class="sourceLineNo">194</span> boolean value) {<a name="line.194"></a>
+<span class="sourceLineNo">195</span> createExecutorTesting(procExecutor);<a name="line.195"></a>
+<span class="sourceLineNo">196</span> procExecutor.testing.toggleKillBeforeStoreUpdate = value;<a name="line.196"></a>
+<span class="sourceLineNo">197</span> assertSingleExecutorForKillTests(procExecutor);<a name="line.197"></a>
+<span class="sourceLineNo">198</span> }<a name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span> public static <TEnv> void toggleKillBeforeStoreUpdate(ProcedureExecutor<TEnv> procExecutor) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> createExecutorTesting(procExecutor);<a name="line.201"></a>
+<span class="sourceLineNo">202</span> procExecutor.testing.killBeforeStoreUpdate = !procExecutor.testing.killBeforeStoreUpdate;<a name="line.202"></a>
+<span class="sourceLineNo">203</span> LOG.warn("Set Kill before store update to: " + procExecutor.testing.killBeforeStoreUpdate);<a name="line.203"></a>
+<span class="sourceLineNo">204</span> assertSingleExecutorForKillTests(procExecutor);<a name="line.204"></a>
+<span class="sourceLineNo">205</span> }<a name="line.205"></a>
+<span class="sourceLineNo">206</span><a name="line.206"></a>
+<span class="sourceLineNo">207</span> public static <TEnv> void toggleKillAfterStoreUpdate(ProcedureExecutor<TEnv> procExecutor) {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> createExecutorTesting(procExecutor);<a name="line.208"></a>
+<span class="sourceLineNo">209</span> procExecutor.testing.killAfterStoreUpdate = !procExecutor.testing.killAfterStoreUpdate;<a name="line.209"></a>
+<span class="sourceLineNo">210</span> LOG.warn("Set Kill after store update to: " + procExecutor.testing.killAfterStoreUpdate);<a name="line.210"></a>
+<span class="sourceLineNo">211</span> assertSingleExecutorForKillTests(procExecutor);<a name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span> public static <TEnv> void setKillAndToggleBeforeStoreUpdate(ProcedureExecutor<TEnv> procExecutor,<a name="line.214"></a>
+<span class="sourceLineNo">215</span> boolean value) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> ProcedureTestingUtility.setKillBeforeStoreUpdate(procExecutor, value);<a name="line.216"></a>
+<span class="sourceLineNo">217</span> ProcedureTestingUtility.setToggleKillBeforeStoreUpdate(procExecutor, value);<a name="line.217"></a>
+<span class="sourceLineNo">218</span> assertSingleExecutorForKillTests(procExecutor);<a name="line.218"></a>
+<span class="sourceLineNo">219</span> }<a name="line.219"></a>
+<span class="sourceLineNo">220</span><a name="line.220"></a>
+<span class="sourceLineNo">221</span> private static <TEnv> void assertSingleExecutorForKillTests(<a name="line.221"></a>
+<span class="sourceLineNo">222</span> final ProcedureExecutor<TEnv> procExecutor) {<a name="line.222"></a>
+<span class="sourceLineNo">223</span> if (procExecutor.testing == null) return;<a name="line.223"></a>
+<span class="sourceLineNo">224</span> if (procExecutor.testing.killBeforeStoreUpdate ||<a name="line.224"></a>
+<span class="sourceLineNo">225</span> procExecutor.testing.toggleKillBeforeStoreUpdate) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> assertEquals("expected only one executor running during test with kill/restart",<a name="line.226"></a>
+<span class="sourceLineNo">227</span> 1, procExecutor.getCorePoolSize());<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span> }<a name="line.229"></a>
+<span class="sourceLineNo">230</span><a name="line.230"></a>
+<span class="sourceLineNo">231</span> public static <TEnv> long submitAndWait(Configuration conf, TEnv env, Procedure<TEnv> proc)<a name="line.231"></a>
+<span class="sourceLineNo">232</span> throws IOException {<a name="line.232"></a>
+<span class="sourceLineNo">233</span> NoopProcedureStore procStore = new NoopProcedureStore();<a name="line.233"></a>
+<span class="sourceLineNo">234</span> ProcedureExecutor<TEnv> procExecutor = new ProcedureExecutor<>(conf, env, procStore);<a name="line.234"></a>
+<span class="sourceLineNo">235</span> procStore.start(1);<a name="line.235"></a>
+<span class="sourceLineNo">236</span> initAndStartWorkers(procExecutor, 1, false, true);<a name="line.236"></a>
+<span class="sourceLineNo">237</span> try {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> return submitAndWait(procExecutor, proc, HConstants.NO_NONCE, HConstants.NO_NONCE);<a name="line.238"></a>
+<span class="sourceLineNo">239</span> } finally {<a name="line.239"></a>
+<span class="sourceLineNo">240</span> procStore.stop(false);<a name="line.240"></a>
+<span class="sourceLineNo">241</span> procExecutor.stop();<a name="line.241"></a>
+<span class="sourceLineNo">242</span> }<a name="line.242"></a>
<span class="sourceLineNo">243</span> }<a name="line.243"></a>
<span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span> public static <TEnv> void waitProcedure(ProcedureExecutor<TEnv> procExecutor, long procId) {<a name="line.245"></a>
-<span class="sourceLineNo">246</span> while (!procExecutor.isFinished(procId) && procExecutor.isRunning()) {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> Threads.sleepWithoutInterrupt(250);<a name="line.247"></a>
-<span class="sourceLineNo">248</span> }<a name="line.248"></a>
-<span class="sourceLineNo">249</span> }<a name="line.249"></a>
-<span class="sourceLineNo">250</span><a name="line.250"></a>
-<span class="sourceLineNo">251</span> public static <TEnv> void waitProcedures(ProcedureExecutor<TEnv> procExecutor, long... procIds) {<a name="line.251"></a>
-<span class="sourceLineNo">252</span> for (int i = 0; i < procIds.length; ++i) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> waitProcedure(procExecutor, procIds[i]);<a name="line.253"></a>
-<span class="sourceLineNo">254</span> }<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span> public static <TEnv> void waitAllProcedures(ProcedureExecutor<TEnv> procExecutor) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span> for (long procId : procExecutor.getActiveProcIds()) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span> waitProcedure(procExecutor, procId);<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> public static <TEnv> void waitNoProcedureRunning(ProcedureExecutor<TEnv> procExecutor) {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> int stableRuns = 0;<a name="line.264"></a>
-<span class="sourceLineNo">265</span> while (stableRuns < 10) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> if (procExecutor.getActiveExecutorCount() > 0 || procExecutor.getScheduler().size() > 0) {<a name="line.266"></a>
-<span class="sourceLineNo">267</span> stableRuns = 0;<a name="line.267"></a>
-<span class="sourceLineNo">268</span> Threads.sleepWithoutInterrupt(100);<a name="line.268"></a>
-<span class="sourceLineNo">269</span> } else {<a name="line.269"></a>
-<span class="sourceLineNo">270</span> stableRuns++;<a name="line.270"></a>
-<span class="sourceLineNo">271</span> Threads.sleepWithoutInterrupt(25);<a name="line.271"></a>
-<span class="sourceLineNo">272</span> }<a name="line.272"></a>
-<span class="sourceLineNo">273</span> }<a name="line.273"></a>
-<span class="sourceLineNo">274</span> }<a name="line.274"></a>
-<span class="sourceLineNo">275</span><a name="line.275"></a>
-<span class="sourceLineNo">276</span> public static <TEnv> void assertProcNotYetCompleted(ProcedureExecutor<TEnv> procExecutor,<a name="line.276"></a>
-<span class="sourceLineNo">277</span> long procId) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> assertFalse("expected a running proc", procExecutor.isFinished(procId));<a name="line.278"></a>
-<span class="sourceLineNo">279</span> assertEquals(null, procExecutor.getResult(procId));<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> public static <TEnv> void assertProcNotFailed(ProcedureExecutor<TEnv> procExecutor,<a name="line.282"></a>
-<span class="sourceLineNo">283</span> long procId) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> Procedure<?> result = procExecutor.getResult(procId);<a name="line.284"></a>
-<span class="sourceLineNo">285</span> assertTrue("expected procedure result", result != null);<a name="line.285"></a>
-<span class="sourceLineNo">286</span> assertProcNotFailed(result);<a name="line.286"></a>
+<span class="sourceLineNo">245</span> public static <TEnv> long submitAndWait(ProcedureExecutor<TEnv> procExecutor, Procedure proc) {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> return submitAndWait(procExecutor, proc, HConstants.NO_NONCE, HConstants.NO_NONCE);<a name="line.246"></a>
+<span class="sourceLineNo">247</span> }<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span> public static <TEnv> long submitAndWait(ProcedureExecutor<TEnv> procExecutor, Procedure proc,<a name="line.249"></a>
+<span class="sourceLineNo">250</span> final long nonceGroup, final long nonce) {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> long procId = submitProcedure(procExecutor, proc, nonceGroup, nonce);<a name="line.251"></a>
+<span class="sourceLineNo">252</span> waitProcedure(procExecutor, procId);<a name="line.252"></a>
+<span class="sourceLineNo">253</span> return procId;<a name="line.253"></a>
+<span class="sourceLineNo">254</span> }<a name="line.254"></a>
+<span class="sourceLineNo">255</span><a name="line.255"></a>
+<span class="sourceLineNo">256</span> public static <TEnv> long submitProcedure(ProcedureExecutor<TEnv> procExecutor, Procedure proc,<a name="line.256"></a>
+<span class="sourceLineNo">257</span> final long nonceGroup, final long nonce) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> final NonceKey nonceKey = procExecutor.createNonceKey(nonceGroup, nonce);<a name="line.258"></a>
+<span class="sourceLineNo">259</span> long procId = procExecutor.registerNonce(nonceKey);<a name="line.259"></a>
+<span class="sourceLineNo">260</span> assertFalse(procId >= 0);<a name="line.260"></a>
+<span class="sourceLineNo">261</span> return procExecutor.submitProcedure(proc, nonceKey);<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> public static <TEnv> void waitProcedure(ProcedureExecutor<TEnv> procExecutor, Procedure proc) {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> while (proc.getState() == ProcedureState.INITIALIZING) {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> Threads.sleepWithoutInterrupt(250);<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span> waitProcedure(procExecutor, proc.getProcId());<a name="line.268"></a>
+<span class="sourceLineNo">269</span> }<a name="line.269"></a>
+<span class="sourceLineNo">270</span><a name="line.270"></a>
+<span class="sourceLineNo">271</span> public static <TEnv> void waitProcedure(ProcedureExecutor<TEnv> procExecutor, long procId) {<a name="line.271"></a>
+<span class="sourceLineNo">272</span> while (!procExecutor.isFinished(procId) && procExecutor.isRunning()) {<a name="line.272"></a>
+<span class="sourceLineNo">273</span> Threads.sleepWithoutInterrupt(250);<a name="line.273"></a>
+<span class="sourceLineNo">274</span> }<a name="line.274"></a>
+<span class="sourceLineNo">275</span> }<a name="line.275"></a>
+<span class="sourceLineNo">276</span><a name="line.276"></a>
+<span class="sourceLineNo">277</span> public static <TEnv> void waitProcedures(ProcedureExecutor<TEnv> procExecutor, long... procIds) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> for (int i = 0; i < procIds.length; ++i) {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> waitProcedure(procExecutor, procIds[i]);<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><a name="line.282"></a>
+<span class="sourceLineNo">283</span> public static <TEnv> void waitAllProcedures(ProcedureExecutor<TEnv> procExecutor) {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> for (long procId : procExecutor.getActiveProcIds()) {<a name="line.284"></a>
+<span class="sourceLineNo">285</span> waitProcedure(procExecutor, procId);<a name="line.285"></a>
+<span class="sourceLineNo">286</span> }<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> public static void assertProcNotFailed(final Procedure<?> result) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> assertFalse("found exception: " + result.getException(), result.isFailed());<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span> public static <TEnv> Throwable assertProcFailed(final ProcedureExecutor<TEnv> procExecutor,<a name="line.293"></a>
-<span class="sourceLineNo">294</span> final long procId) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> Procedure<?> result = procExecutor.getResult(procId);<a name="line.295"></a>
-<span class="sourceLineNo">296</span> assertTrue("expected procedure result", result != null);<a name="line.296"></a>
-<span class="sourceLineNo">297</span> return assertProcFailed(result);<a name="line.297"></a>
-<span class="sourceLineNo">298</span> }<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span> public static Throwable assertProcFailed(final Procedure<?> result) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> assertEquals(true, result.isFailed());<a name="line.301"></a>
-<span class="sourceLineNo">302</span> LOG.info("procId=" + result.getProcId() + " exception: " + result.getException().getMessage());<a name="line.302"></a>
-<span class="sourceLineNo">303</span> return getExceptionCause(result);<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> public static void assertIsAbortException(final Procedure<?> result) {<a name="line.306"></a>
-<span class="sourceLineNo">307</span> Throwable cause = assertProcFailed(result);<a name="line.307"></a>
-<span class="sourceLineNo">308</span> assertTrue("expected abort exception, got "+ cause, cause instanceof ProcedureAbortedException);<a name="line.308"></a>
-<span class="sourceLineNo">309</span> }<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span> public static void assertIsTimeoutException(final Procedure<?> result) {<a name="line.311"></a>
-<span class="sourceLineNo">312</span> Throwable cause = assertProcFailed(result);<a name="line.312"></a>
-<span class="sourceLineNo">313</span> assertTrue("expected TimeoutIOException, got " + cause, cause instanceof TimeoutIOException);<a name="line.313"></a>
-<span class="sourceLineNo">314</span> }<a name="line.314"></a>
-<span class="sourceLineNo">315</span><a name="line.315"></a>
-<span class="sourceLineNo">316</span> public static void assertIsIllegalArgumentException(final Procedure<?> result) {<a name="line.316"></a>
-<span class="sourceLineNo">317</span> Throwable cause = assertProcFailed(result);<a name="line.317"></a>
-<span class="sourceLineNo">318</span> assertTrue("expected IllegalArgumentIOException, got " + cause,<a name="line.318"></a>
-<span class="sourceLineNo">319</span> cause instanceof IllegalArgumentIOException);<a name="line.319"></a>
-<span class="sourceLineNo">320</span> }<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span> public static Throwable getExceptionCause(final Procedure<?> procInfo) {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> assert procInfo.isFailed();<a name="line.323"></a>
-<span class="sourceLineNo">324</span> Throwable cause = procInfo.getException().getCause();<a name="line.324"></a>
-<span class="sourceLineNo">325</span> return cause == null ? procInfo.getException() : cause;<a name="line.325"></a>
-<span class="sourceLineNo">326</span> }<a name="line.326"></a>
-<span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span> /**<a name="line.328"></a>
-<span class="sourceLineNo">329</span> * Run through all procedure flow states TWICE while also restarting<a name="line.329"></a>
-<span class="sourceLineNo">330</span> * procedure executor at each step; i.e force a reread of procedure store.<a name="line.330"></a>
-<span class="sourceLineNo">331</span> *<a name="line.331"></a>
-<span class="sourceLineNo">332</span> *<p>It does<a name="line.332"></a>
-<span class="sourceLineNo">333</span> * <ol><li>Execute step N - kill the executor before store update<a name="line.333"></a>
-<span class="sourceLineNo">334</span> * <li>Restart executor/store<a name="line.334"></a>
-<span class="sourceLineNo">335</span> * <li>Execute step N - and then save to store<a name="line.335"></a>
-<span class="sourceLineNo">336</span> * </ol><a name="line.336"></a>
-<span class="sourceLineNo">337</span> *<a name="line.337"></a>
-<span class="sourceLineNo">338</span> *<p>This is a good test for finding state that needs persisting and steps that are not<a name="line.338"></a>
-<span class="sourceLineNo">339</span> * idempotent.<a name="line.339"></a>
-<span class="sourceLineNo">340</span> */<a name="line.340"></a>
-<span class="sourceLineNo">341</span> public static <TEnv> void testRecoveryAndDoubleExecution(final ProcedureExecutor<TEnv> procExec,<a name="line.341"></a>
-<span class="sourceLineNo">342</span> final long procId) throws Exception {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> testRecoveryAndDoubleExecution(procExec, procId, false);<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> public static <TEnv> void testRecoveryAndDoubleExecution(final ProcedureExecutor<TEnv> procExec,<a name="line.346"></a>
-<span class="sourceLineNo">347</span> final long procId, final boolean expectFailure) throws Exception {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> testRecoveryAndDoubleExecution(procExec, procId, expectFailure, null);<a name="line.348"></a>
-<span class="sourceLineNo">349</span> }<a name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span> public static <TEnv> void testRecoveryAndDoubleExecution(final ProcedureExecutor<TEnv> procExec,<a name="line.351"></a>
-<span class="sourceLineNo">352</span> final long procId, final boolean expectFailure, final Runnable customRestart)<a name="line.352"></a>
-<span class="sourceLineNo">353</span> throws Exception {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> Procedure proc = procExec.getProcedure(procId);<a name="line.354"></a>
-<span class="sourceLineNo">355</span> waitProcedure(procExec, procId);<a name="line.355"></a>
-<span class="sourceLineNo">356</span> assertEquals(false, procExec.isRunning());<a name="line.356"></a>
-<span class="sourceLineNo">357</span> for (int i = 0; !procExec.isFinished(procId); ++i) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span> proc = procExec.getProcedure(procId);<a name="line.358"></a>
-<span class="sourceLineNo">359</span> LOG.info("Restart " + i + " exec state: " + proc);<a name="line.359"></a>
-<span class="sourceLineNo">360</span> if (customRestart != null) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span> customRestart.run();<a name="line.361"></a>
-<span class="sourceLineNo">362</span> } else {<a name="line.362"></a>
-<span class="sourceLineNo">363</span> restart(procExec);<a name="line.363"></a>
-<span class="sourceLineNo">364</span> }<a name="line.364"></a>
-<span class="sourceLineNo">365</span> waitProcedure(procExec, procId);<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> assertEquals(true, procExec.isRunning());<a name="line.368"></a>
-<span class="sourceLineNo">369</span> if (expectFailure) {<a name="line.369"></a>
-<span class="sourceLineNo">370</span> assertProcFailed(procExec, procId);<a name="line.370"></a>
-<span class="sourceLineNo">371</span> } else {<a name="line.371"></a>
-<span class="sourceLineNo">372</span> assertProcNotFailed(procExec, procId);<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><a name="line.375"></a>
-<span class="sourceLineNo">376</span> public static class NoopProcedure<TEnv> extends Procedure<TEnv> {<a name="line.376"></a>
-<span class="sourceLineNo">377</span> public NoopProcedure() {}<a name="line.377"></a>
-<span class="sourceLineNo">378</span><a name="line.378"></a>
-<span class="sourceLineNo">379</span> @Override<a name="line.379"></a>
-<span class="sourceLineNo">380</span> protected Procedure[] execute(TEnv env)<a name="line.380"></a>
-<span class="sourceLineNo">381</span> throws ProcedureYieldException, ProcedureSuspendedException, InterruptedException {<a name="line.381"></a>
-<span class="sourceLineNo">382</span> return null;<a name="line.382"></a>
-<span class="sourceLineNo">383</span> }<a name="line.383"></a>
-<span class="sourceLineNo">384</span><a name="line.384"></a>
-<span class="sourceLineNo">385</span> @Override<a name="line.385"></a>
-<span class="sourceLineNo">386</span> protected void rollback(TEnv env) throws IOException, InterruptedException {<a name="line.386"></a>
-<span class="sourceLineNo">387</span> }<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span> @Override<a name="line.389"></a>
-<span class="sourceLineNo">390</span> protected boolean abort(TEnv env) { return false; }<a name="line.390"></a>
-<span class="sourceLineNo">391</span><a name="line.391"></a>
-<span class="sourceLineNo">392</span> @Override<a name="line.392"></a>
-<span class="sourceLineNo">393</span> protected void serializeStateData(ProcedureStateSerializer serializer)<a name="line.393"></a>
-<span class="sourceLineNo">394</span> throws IOException {<a name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span><a name="line.396"></a>
-<span class="sourceLineNo">397</span> @Override<a name="line.397"></a>
-<span class="sourceLineNo">398</span> protected void deserializeStateData(ProcedureStateSerializer serializer)<a name="line.398"></a>
-<span class="sourceLineNo">399</span> throws IOException {<a name="line.399"></a>
-<span class="sourceLineNo">400</span> }<a name="line.400"></a>
-<span class="sourceLineNo">401</span> }<a name="line.401"></a>
-<span class="sourceLineNo">402</span><a name="line.402"></a>
-<span class="sourceLineNo">403</span> public static class NoopStateMachineProcedure<TEnv, TState><a name="line.403"></a>
-<span class="sourceLineNo">404</span> extends StateMachineProcedure<TEnv, TState> {<a name="line.404"></a>
-<span class="sourceLineNo">405</span> private TState initialState;<a name="line.405"></a>
-<span class="sourceLineNo">406</span> private TEnv env;<a name="line.406"></a>
-<span class="sourceLineNo">407</span><a name="line.407"></a>
-<span class="sourceLineNo">408</span> public NoopStateMachineProcedure() {<a name="line.408"></a>
+<span class="sourceLineNo">289</span> public static <TEnv> void waitNoProcedureRunning(ProcedureExecutor<TEnv> procExecutor) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> int stableRuns = 0;<a name="line.290"></a>
+<span class="sourceLineNo">291</span> while (stableRuns < 10) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> if (procExecutor.getActiveExecutorCount() > 0 || procExecutor.getScheduler().size() > 0) {<a name="line.292"></a>
+<span class="sourceLineNo">293</span> stableRuns = 0;<a name="line.293"></a>
+<span class="sourceLineNo">294</span> Threads.sleepWithoutInterrupt(100);<a name="line.294"></a>
+<span class="sourceLineNo">295</span> } else {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> stableRuns++;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> Threads.sleepWithoutInterrupt(25);<a name="line.297"></a>
+<span class="sourceLineNo">298</span> }<a name="line.298"></a>
+<span class="sourceLineNo">299</span> }<a name="line.299"></a>
+<span class="sourceLineNo">300</span> }<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span> public static <TEnv> void assertProcNotYetCompleted(ProcedureExecutor<TEnv> procExecutor,<a name="line.302"></a>
+<span class="sourceLineNo">303</span> long procId) {<a name="line.303"></a>
+<span class="sourceLineNo">304</span> assertFalse("expected a running proc", procExecutor.isFinished(procId));<a name="line.304"></a>
+<span class="sourceLineNo">305</span> assertEquals(null, procExecutor.getResult(procId));<a name="line.305"></a>
+<span class="sourceLineNo">306</span> }<a name="line.306"></a>
+<span class="sourceLineNo">307</span><a name="line.307"></a>
+<span class="sourceLineNo">308</span> public static <TEnv> void assertProcNotFailed(ProcedureExecutor<TEnv> procExecutor,<a name="line.308"></a>
+<span class="sourceLineNo">309</span> long procId) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> Procedure<?> result = procExecutor.getResult(procId);<a name="line.310"></a>
+<span class="sourceLineNo">311</span> assertTrue("expected procedure result", result != null);<a name="line.311"></a>
+<span class="sourceLineNo">312</span> assertProcNotFailed(result);<a name="line.312"></a>
+<span class="sourceLineNo">313</span> }<a name="line.313"></a>
+<span class="sourceLineNo">314</span><a name="line.314"></a>
+<span class="sourceLineNo">315</span> public static void assertProcNotFailed(final Procedure<?> result) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> assertFalse("found exception: " + result.getException(), result.isFailed());<a name="line.316"></a>
+<span class="sourceLineNo">317</span> }<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span> public static <TEnv> Throwable assertProcFailed(final ProcedureExecutor<TEnv> procExecutor,<a name="line.319"></a>
+<span class="sourceLineNo">320</span> final long procId) {<a name="line.320"></a>
+<span class="sourceLineNo">321</span> Procedure<?> result = procExecutor.getResult(procId);<a name="line.321"></a>
+<span class="sourceLineNo">322</span> assertTrue("expected procedure result", result != null);<a name="line.322"></a>
+<span class="sourceLineNo">323</span> return assertProcFailed(result);<a name="line.323"></a>
+<span class="sourceLineNo">324</span> }<a name="line.324"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span> public static Throwable assertProcFailed(final Procedure<?> result) {<a name="line.326"></a>
+<span class="sourceLineNo">327</span> assertEquals(true, result.isFailed());<a name="line.327"></a>
+<span class="sourceLineNo">328</span> LOG.info("procId=" + result.getProcId() + " exception: " + result.getException().getMessage());<a name="line.328"></a>
+<span class="sourceLineNo">329</span> return getExceptionCause(result);<a name="line.329"></a>
+<span class="sourceLineNo">330</span> }<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span> public static void assertIsAbortException(final Procedure<?> result) {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> Throwable cause = assertProcFailed(result);<a name="line.333"></a>
+<span class="sourceLineNo">334</span> assertTrue("expected abort exception, got "+ cause, cause instanceof ProcedureAbortedException);<a name="line.334"></a>
+<span class="sourceLineNo">335</span> }<a name="line.335"></a>
+<span class="sourceLineNo">336</span><a name="line.336"></a>
+<span class="sourceLineNo">337</span> public static void assertIsTimeoutException(final Procedure<?> result) {<a name="line.337"></a>
+<span class="sourceLineNo">338</span> Throwable cause = assertProcFailed(result);<a name="line.338"></a>
+<span class="sourceLineNo">339</span> assertTrue("expected TimeoutIOException, got " + cause, cause instanceof TimeoutIOException);<a name="line.339"></a>
+<span class="sourceLineNo">340</span> }<a name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span> public static void assertIsIllegalArgumentException(final Procedure<?> result) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> Throwable cause = assertProcFailed(result);<a name="line.343"></a>
+<span class="sourceLineNo">344</span> assertTrue("expected IllegalArgumentIOException, got " + cause,<a name="line.344"></a>
+<span class="sourceLineNo">345</span> cause instanceof IllegalArgumentIOException);<a name="line.345"></a>
+<span class="sourceLineNo">346</span> }<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span> public static Throwable getExceptionCause(final Procedure<?> procInfo) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span> assert procInfo.isFailed();<a name="line.349"></a>
+<span class="sourceLineNo">350</span> Throwable cause = procInfo.getException().getCause();<a name="line.350"></a>
+<span class="sourceLineNo">351</span> return cause == null ? procInfo.getException() : cause;<a name="line.351"></a>
+<span class="sourceLineNo">352</span> }<a name="line.352"></a>
+<span class="sourceLineNo">353</span><a name="line.353"></a>
+<span class="sourceLineNo">354</span> /**<a name="line.354"></a>
+<span class="sourceLineNo">355</span> * Run through all procedure flow states TWICE while also restarting<a name="line.355"></a>
+<span class="sourceLineNo">356</span> * procedure executor at each step; i.e force a reread of procedure store.<a name="line.356"></a>
+<span class="sourceLineNo">357</span> *<a name="line.357"></a>
+<span class="sourceLineNo">358</span> *<p>It does<a name="line.358"></a>
+<span class="sourceLineNo">359</span> * <ol><li>Execute step N - kill the executor before store update<a name="line.359"></a>
+<span class="sourceLineNo">360</span> * <li>Restart executor/store<a name="line.360"></a>
+<span class="sourceLineNo">361</span> * <li>Execute step N - and then save to store<a name="line.361"></a>
+<span class="sourceLineNo">362</span> * </ol><a name="line.362"></a>
+<span class="sourceLineNo">363</span> *<a name="line.363"></a>
+<span class="sourceLineNo">364</span> *<p>This is a good test for finding state that needs persisting and steps that are not<a name="line.364"></a>
+<span class="sourceLineNo">365</span> * idempotent.<a name="line.365"></a>
+<span class="sourceLineNo">366</span> */<a name="line.366"></a>
+<span class="sourceLineNo">367</span> public static <TEnv> void testRecoveryAndDoubleExecution(final ProcedureExecutor<TEnv> procExec,<a name="line.367"></a>
+<span class="sourceLineNo">368</span> final long procId) throws Exception {<a name="line.368"></a>
+<span class="sourceLineNo">369</span> testRecoveryAndDoubleExecution(procExec, procId, false);<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> public static <TEnv> void testRecoveryAndDoubleExecution(final ProcedureExecutor<TEnv> procExec,<a name="line.372"></a>
+<span class="sourceLineNo">373</span> final long procId, final boolean expectFailure) throws Exception {<a name="line.373"></a>
+<span class="sourceLineNo">374</span> testRecoveryAndDoubleExecution(procExec, procId, expectFailure, null);<a name="line.374"></a>
+<span class="sourceLineNo">375</span> }<a name="line.375"></a>
+<span class="sourceLineNo">376</span><a name="line.376"></a>
+<span class="sourceLineNo">377</span> public static <TEnv> void testRecoveryAndDoubleExecution(final ProcedureExecutor<TEnv> procExec,<a name="line.377"></a>
+<span class="sourceLineNo">378</span> final long procId, final boolean expectFailure, final Runnable customRestart)<a name="line.378"></a>
+<span class="sourceLineNo">379</span> throws Exception {<a name="line.379"></a>
+<span class="sourceLineNo">380</span> Procedure proc = procExec.getProcedure(procId);<a name="line.380"></a>
+<span class="sourceLineNo">381</span> waitProcedure(procExec, procId);<a name="line.381"></a>
+<span class="sourceLineNo">382</span> assertEquals(false, procExec.isRunning());<a name="line.382"></a>
+<span class="sourceLineNo">383</span> for (int i = 0; !procExec.isFinished(procId); ++i) {<a name="line.383"></a>
+<span class="sourceLineNo">384</span> proc = procExec.getProcedure(procId);<a name="line.384"></a>
+<span class="sourceLineNo">385</span> LOG.info("Restart " + i + " exec state: " + proc);<a name="line.385"></a>
+<span class="sourceLineNo">386</span> if (customRestart != null) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> customRestart.run();<a name="line.387"></a>
+<span class="sourceLineNo">388</span> } else {<a name="line.388"></a>
+<span class="sourceLineNo">389</span> restart(procExec);<a name="line.389"></a>
+<span class="sourceLineNo">390</span> }<a name="line.390"></a>
+<span class="sourceLineNo">391</span> waitProcedure(procExec, procId);<a name="line.391"></a>
+<span class="sourceLineNo">392</span> }<a name="line.392"></a>
+<span class="sourceLineNo">393</span><a name="line.393"></a>
+<span class="sourceLineNo">394</span> assertEquals(true, procExec.isRunning());<a name="line.394"></a>
+<span class="sourceLineNo">395</span> if (expectFailure) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span> assertProcFailed(procExec, procId);<a name="line.396"></a>
+<span class="sourceLineNo">397</span> } else {<a name="line.397"></a>
+<span class="sourceLineNo">398</span> assertProcNotFailed(procExec, procId);<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><a name="line.401"></a>
+<span class="sourceLineNo">402</span> public static class NoopProcedure<TEnv> extends Procedure<TEnv> {<a name="line.402"></a>
+<span class="sourceLineNo">403</span> public NoopProcedure() {}<a name="line.403"></a>
+<span class="sourceLineNo">404</span><a name="line.404"></a>
+<span class="sourceLineNo">405</span> @Override<a name="line.405"></a>
+<span class="sourceLineNo">406</span> protected Procedure[] execute(TEnv env)<a name="line.406"></a>
+<span class="sourceLineNo">407</span> throws ProcedureYieldException, ProcedureSuspendedException, InterruptedException {<a name="line.407"></a>
+<span class="sourceLineNo">408</span> return null;<a name="line.408"></a>
<span class="sourceLineNo">409</span> }<a name="line.409"></a>
<span class="sourceLineNo">410</span><a name="line.410"></a>
-<span class="sourceLineNo">411</span> public NoopStateMachineProcedure(TEnv env, TState initialState) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span> this.env = env;<a name="line.412"></a>
-<span class="sourceLineNo">413</span> this.initialState = initialState;<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> @Override<a name="line.416"></a>
-<span class="sourceLineNo">417</span> protected Flow executeFromState(TEnv env, TState tState)<a name="line.417"></a>
-<span class="sourceLineNo">418</span> throws ProcedureSuspendedException, ProcedureYieldException, InterruptedException {<a name="line.418"></a>
-<span class="sourceLineNo">419</span> return null;<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> @Override<a name="line.422"></a>
-<span class="sourceLineNo">423</span> protected void rollbackState(TEnv env, TState tState) throws IOException, InterruptedException {<a name="line.423"></a>
-<span class="sourceLineNo">424</span><a name="line.424"></a>
-<span class="sourceLineNo">425</span> }<a name="line.425"></a>
-<span class="sourceLineNo">426</span><a name="line.426"></a>
-<span class="sourceLineNo">427</span> @Override<a name="line.427"></a>
-<span class="sourceLineNo">428</span> protected TState getState(int stateId) {<a name="line.428"></a>
-<span class="sourceLineNo">429</span> return null;<a name="line.429"></a>
-<span class="sourceLineNo">430</span> }<a name="line.430"></a>
-<span class="sourceLineNo">431</span><a name="line.431"></a>
-<span class="sourceLineNo">432</span> @Override<a name="line.432"></a>
-<span class="sourceLineNo">433</span> protected int getStateId(TState tState) {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> return 0;<a name="line.434"></a>
+<span class="sourceLineNo">411</span> @Override<a name="line.411"></a>
+<span class="sourceLineNo">412</span> protected void rollback(TEnv env) throws IOException, InterruptedException {<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> @Override<a name="line.415"></a>
+<span class="sourceLineNo">416</span> protected boolean abort(TEnv env) { return false; }<a name="line.416"></a>
+<span class="sourceLineNo">417</span><a name="line.417"></a>
+<span class="sourceLineNo">418</span> @Override<a name="line.418"></a>
+<span class="sourceLineNo">419</span> protected void serializeStateData(ProcedureStateSerializer serializer)<a name="line.419"></a>
+<span class="sourceLineNo">420</span> throws IOException {<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> @Override<a name="line.423"></a>
+<span class="sourceLineNo">424</span> protected void deserializeStateData(ProcedureStateSerializer serializer)<a name="line.424"></a>
+<span class="sourceLineNo">425</span> throws IOException {<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><a name="line.428"></a>
+<span class="sourceLineNo">429</span> public static class NoopStateMachineProcedure<TEnv, TState><a name="line.429"></a>
+<span class="sourceLineNo">430</span> extends StateMachineProcedure<TEnv, TState> {<a name="line.430"></a>
+<span class="sourceLineNo">431</span> private TState initialState;<a name="line.431"></a>
+<span class="sourceLineNo">432</span> private TEnv env;<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span> public NoopStateMachineProcedure() {<a name="line.434"></a>
<span class="sourceLineNo">435</span> }<a name="line.435"></a>
<span class="sourceLineNo">436</span><a name="line.436"></a>
-<span class="sourceLineNo">437</span> @Override<a name="line.437"></a>
-<span class="sourceLineNo">438</span> protected TState getInitialState() {<a name="line.438"></a>
-<span class="sourceLineNo">439</span> return initialState;<a name="line.439"></a>
+<span class="sourceLineNo">437</span> public NoopStateMachineProcedure(TEnv env, TState initialState) {<a name="line.437"></a>
+<span class="sourceLineNo">438</span> this.env = env;<a name="line.438"></a>
+<span class="sourceLineNo">439</span> this.initialState = initialState;<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> public static class TestProcedure extends NoopProcedure<Void> {<a name="line.443"></a>
-<span class="sourceLineNo">444</span> private byte[] data = null;<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span> public TestProcedure() {}<a name="line.446"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span> @Override<a name="line.442"></a>
+<span class="sourceLineNo">443</span> protected Flow executeFromState(TEnv env, TState tState)<a name="line.443"></a>
+<span class="sourceLineNo">444</span> throws ProcedureSuspendedException, ProcedureYieldException, InterruptedException {<a name="line.444"></a>
+<span class="sourceLineNo">445</span> return null;<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> public TestProcedure(long procId) {<a name="line.448"></a>
-<span class="sourceLineNo">449</span> this(procId, 0);<a name="line.449"></a>
-<span class="sourceLineNo">450</span> }<a name="line.450"></a>
-<span class="sourceLineNo">451</span><a name="line.451"></a>
-<span class="sourceLineNo">452</span> public TestProcedure(long procId, long parentId) {<a name="line.452"></a>
-<span class="sourceLineNo">453</span> this(procId, parentId, null);<a name="line.453"></a>
-<span class="sourceLineNo">454</span> }<a name="line.454"></a>
-<span class="sourceLineNo">455</span><a name="line.455"></a>
-<span class="sourceLineNo">456</span> public TestProcedure(long procId, long parentId, byte[] data) {<a name="line.456"></a>
-<span class="sourceLineNo">457</span> this(procId, parentId, parentId, data);<a name="line.457"></a>
-<span class="sourceLineNo">458</span> }<a name="line.458"></a>
-<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span> public TestProcedure(long procId, long parentId, long rootId, byte[] data) {<a name="line.460"></a>
-<span class="sourceLineNo">461</span> setData(data);<a name="line.461"></a>
-<span class="sourceLineNo">462</span> setProcId(procId);<a name="line.462"></a>
-<span class="sourceLineNo">463</span> if (parentId > 0) {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> setParentProcId(parentId);<a name="line.464"></a>
-<span class="sourceLineNo">465</span> }<a name="line.465"></a>
-<span class="sourceLineNo">466</span> if (rootId > 0 || parentId > 0) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> setRootProcId(rootId);<a name="line.467"></a>
-<span class="sourceLineNo">468</span> }<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> public void addStackId(final int index) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> addStackIndex(index);<a name="line.472"></a>
-<span class="sourceLineNo">473</span> }<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span> public void setSuccessState() {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> setState(ProcedureState.SUCCESS);<a name="line.476"></a>
-<span class="sourceLineNo">477</span> }<a name="line.477"></a>
-<span class="sourceLineNo">478</span><a name="line.478"></a>
-<span class="sourceLineNo">479</span> public void setData(final byte[] data) {<a name="line.479"></a>
-<span class="sourceLineNo">480</span> this.data = data;<a name="line.480"></a>
-<span class="sourceLineNo">481</span> }<a name="line.481"></a>
-<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span> @Override<a name="line.483"></a>
-<span class="sourceLineNo">484</span> protected void serializeStateData(ProcedureStateSerializer serializer)<a name="line.484"></a>
-<span class="sourceLineNo">485</span> throws IOException {<a name="line.485"></a>
-<span class="sourceLineNo">486</span> ByteString dataString = ByteString.copyFrom((data == null) ? new byte[0] : data);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> BytesValue.Builder builder = BytesValue.newBuilder().setValue(dataString);<a name="line.487"></a>
-<span class="sourceLineNo">488</span> serializer.serialize(builder.build());<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> @Override<a name="line.491"></a>
-<span class="sourceLineNo">492</span> protected void deserializeStateData(ProcedureStateSerializer serializer)<a name="line.492"></a>
-<span class="sourceLineNo">493</span> throws IOException {<a name="line.493"></a>
-<span class="sourceLineNo">494</span> BytesValue bytesValue = serializer.deserialize(BytesValue.class);<a name="line.494"></a>
-<span class="sourceLineNo">495</span> ByteString dataString = bytesValue.getValue();<a name="line.495"></a>
+<span class="sourceLineNo">448</span> @Override<a name="line.448"></a>
+<span class="sourceLineNo">449</span> protected void rollbackState(TEnv env, TState tState) throws IOException, InterruptedException {<a name="line.449"></a>
+<span class="sourceLineNo">450</span><a name="line.450"></a>
+<span class="sourceLineNo">451</span> }<a name="line.451"></a>
+<span class="sourceLineNo">452</span><a name="line.452"></a>
+<span class="sourceLineNo">453</span> @Override<a name="line.453"></a>
+<span class="sourceLineNo">454</span> protected TState getState(int stateId) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> return null;<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> @Override<a name="line.458"></a>
+<span class="sourceLineNo">459</span> protected int getStateId(TState tState) {<a name="line.459"></a>
+<span class="sourceLineNo">460</span> return 0;<a name="line.460"></a>
+<span class="sourceLineNo">461</span> }<a name="line.461"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
+<span class="sourceLineNo">463</span> @Override<a name="line.463"></a>
+<span class="sourceLineNo">464</span> protected TState getInitialState() {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> return initialState;<a name="line.465"></a>
+<span class="sourceLineNo">466</span> }<a name="line.466"></a>
+<span class="sourceLineNo">467</span> }<a name="line.467"></a>
+<span class="sourceLineNo">468</span><a name="line.468"></a>
+<span class="sourceLineNo">469</span> public static class TestProcedure extends NoopProcedure<Void> {<a name="line.469"></a>
+<span class="sourceLineNo">470</span> private byte[] data = null;<a name="line.470"></a>
+<span class="sourceLineNo">471</span><a name="line.471"></a>
+<span class="sourceLineNo">472</span> public TestProcedure() {}<a name="line.472"></a>
+<span class="sourceLineNo">473</span><a name="line.473"></a>
+<span class="sourceLineNo">474</span> public TestProcedure(long procId) {<a name="line.474"></a>
+<span class="sourceLineNo">475</span> this(procId, 0);<a name="line.475"></a>
+<span class="sourceLineNo">476</span> }<a name="line.476"></a>
+<span class="sourceLineNo">477</span><a name="line.477"></a>
+<span class="sourceLineNo">478</span> public TestProcedure(long procId, long parentId) {<a name="line.478"></a>
+<span class="sourceLineNo">479</span> this(procId, parentId, null);<a name="line.479"></a>
+<span class="sourceLineNo">480</span> }<a name="line.480"></a>
+<span class="sourceLineNo">481</span><a name="line.481"></a>
+<span class="sourceLineNo">482</span> public TestProcedure(long procId, long parentId, byte[] data) {<a name="line.482"></a>
+<span class="sourceLineNo">483</span> this(procId, parentId, parentId, data);<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> public TestProcedure(long procId, long parentId, long rootId, byte[] data) {<a name="line.486"></a>
+<span class="sourceLineNo">487</span> setData(data);<a name="line.487"></a>
+<span class="sourceLineNo">488</span> setProcId(procId);<a name="line.488"></a>
+<span class="sourceLineNo">489</span> if (parentId > 0) {<a name="line.489"></a>
+<span class="sourceLineNo">490</span> setParentProcId(parentId);<a name="line.490"></a>
+<span class="sourceLineNo">491</span> }<a name="line.491"></a>
+<span class="sourceLineNo">492</span> if (rootId > 0 || parentId > 0) {<a name="line.492"></a>
+<span class="sourceLineNo">493</span> setRootProcId(rootId);<a name="line.493"></a>
+<span class="sourceLineNo">494</span> }<a name="line.494"></a>
+<span class="sourceLineNo">495</span> }<a name="line.495"></a>
<span class="sourceLineNo">496</span><a name="line.496"></a>
-<span class="sourceLineNo">497</span> if (dataString.isEmpty()) {<a name="line.497"></a>
-<span class="sourceLineNo">498</span> data = null;<a name="line.498"></a>
-<span class="sourceLineNo">499</span> } else {<a name="line.499"></a>
-<span class="sourceLineNo">500</span> data = dataString.toByteArray();<a name="line.500"></a>
-<span class="sourceLineNo">501</span> }<a name="line.501"></a>
-<span class="sourceLineNo">502</span> }<a name="line.502"></a>
-<span class="sourceLineNo">503</span><a name="line.503"></a>
-<span class="sourceLineNo">504</span> // Mark acquire/release lock functions public for test uses.<a name="line.504"></a>
-<span class="sourceLineNo">505</span> @Override<a name="line.505"></a>
-<span class="sourceLineNo">506</span> public LockState acquireLock(Void env) {<a name="line.506"></a>
-<span class="sourceLineNo">507</span> return LockState.LOCK_ACQUIRED;<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> @Override<a name="line.510"></a>
-<span class="sourceLineNo">511</span> public void releaseLock(Void env) {<a name="line.511"></a>
-<span class="sourceLineNo">512</span> // no-op<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><a name="line.515"></a>
-<span class="sourceLineNo">516</span> public static class LoadCounter implements ProcedureStore.ProcedureLoader {<a name="line.516"></a>
-<span class="sourceLineNo">517</span> private final ArrayList<Procedure> corrupted = new ArrayList<>();<a name="line.517"></a>
-<span class="sourceLineNo">518</span> private final ArrayList<Procedure> completed = new ArrayList<>();<a name="line.518"></a>
-<span class="sourceLineNo">519</span> private final ArrayList<Procedure> runnable = new ArrayList<>();<a name="line.519"></a>
-<span class="sourceLineNo">520</span><a name="line.520"></a>
-<span class="sourceLineNo">521</span> private Set<Long> procIds;<a name="line.521"></a>
-<span class="sourceLineNo">522</span> private long maxProcId = 0;<a name="line.522"></a>
-<span class="sourceLineNo">523</span><a name="line.523"></a>
-<span class="sourceLineNo">524</span> public LoadCounter() {<a name="line.524"></a>
-<span class="sourceLineNo">525</span> this(null);<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> public LoadCounter(final Set<Long> procIds) {<a name="line.528"></a>
-<span class="sourceLineNo">529</span> this.procIds = procIds;<a name="line.529"></a>
-<span class="sourceLineNo">530</span> }<a name="line.530"></a>
-<span class="sourceLineNo">531</span><a name="line.531"></a>
-<span class="sourceLineNo">532</span> public void reset() {<a name="line.532"></a>
-<span class="sourceLineNo">533</span> reset(null);<a name="line.533"></a>
+<span class="sourceLineNo">497</span> public void addStackId(final int index) {<a name="line.497"></a>
+<span class="sourceLineNo">498</span> addStackIndex(index);<a name="line.498"></a>
+<span class="sourceLineNo">499</span> }<a name="line.499"></a>
+<span class="sourceLineNo">500</span><a name="line.500"></a>
+<span class="sourceLineNo">501</span> public void setSuccessState() {<a name="line.501"></a>
+<span class="sourceLineNo">502</span> setState(ProcedureState.SUCCESS);<a name="line.502"></a>
+<span class="sourceLineNo">503</span> }<a name="line.503"></a>
+<span class="sourceLineNo">504</span><a name="line.504"></a>
+<span class="sourceLineNo">505</span> public void setData(final byte[] data) {<a name="line.505"></a>
+<span class="sourceLineNo">506</span> this.data = data;<a name="line.506"></a>
+<span class="sourceLineNo">507</span> }<a name="line.507"></a>
+<span class="sourceLineNo">508</span><a name="line.508"></a>
+<span class="sourceLineNo">509</span> @Override<a name="line.509"></a>
+<span class="sourceLineNo">510</span> protected void serializeStateData(ProcedureStateSerializer serializer)<a name="line.510"></a>
+<span class="sourceLineNo">511</span> throws IOException {<a name="line.511"></a>
+<span class="sourceLineNo">512</span> ByteString dataString = ByteString.copyFrom((data == null) ? new byte[0] : data);<a name="line.512"></a>
+<span class="sourceLineNo">513</span> BytesValue.Builder builder = BytesValue.newBuilder().setValue(dataString);<a name="line.513"></a>
+<span class="sourceLineNo">514</span> serializer.serialize(builder.build());<a name="line.514"></a>
+<span class="sourceLineNo">515</span> }<a name="line.515"></a>
+<span class="sourceLineNo">516</span><a name="line.516"></a>
+<span class="sourceLineNo">517</span> @Override<a name="line.517"></a>
+<span class="sourceLineNo">518</span> protected void deserializeStateData(ProcedureStateSerializer serializer)<a name="line.518"></a>
+<span class="sourceLineNo">519</span> throws IOException {<a name="line.519"></a>
+<span class="sourceLineNo">520</span> BytesValue bytesValue = serializer.deserialize(BytesValue.class);<a name="line.520"></a>
+<span class="sourceLineNo">521</span> ByteString dataString = bytesValue.getValue();<a name="line.521"></a>
+<span class="sourceLineNo">522</span><a name="line.522"></a>
+<span class="sourceLineNo">523</span> if (dataString.isEmpty()) {<a name="line.523"></a>
+<span class="sourceLineNo">524</span> data = null;<a name="line.524"></a>
+<span class="sourceLineNo">525</span> } else {<a name="line.525"></a>
+<span class="sourceLineNo">526</span> data = dataString.toByteArray();<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><a name="line.529"></a>
+<span class="sourceLineNo">530</span> // Mark acquire/release lock functions public for test uses.<a name="line.530"></a>
+<span class="sourceLineNo">531</span> @Override<a name="line.531"></a>
+<span class="sourceLineNo">532</span> pu
<TRUNCATED>