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/08/12 14:49:25 UTC
[09/21] hbase-site git commit: Published site at
953e5aa88c992cec213bc57c2db12b78908f357f.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8e1d7469/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.SimpleChildProcedure.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.SimpleChildProcedure.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.SimpleChildProcedure.html
index 5c35fe1..2012242 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.SimpleChildProcedure.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.SimpleChildProcedure.html
@@ -150,85 +150,161 @@
<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> @Test<a name="line.144"></a>
-<span class="sourceLineNo">145</span> public void testChildOnLastStepWithRollbackDoubleExecution() throws Exception {<a name="line.145"></a>
+<span class="sourceLineNo">145</span> public void testChildNormalRollbackStateCount() {<a name="line.145"></a>
<span class="sourceLineNo">146</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.146"></a>
-<span class="sourceLineNo">147</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.147"></a>
-<span class="sourceLineNo">148</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.148"></a>
-<span class="sourceLineNo">149</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId, true);<a name="line.149"></a>
-<span class="sourceLineNo">150</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.150"></a>
-<span class="sourceLineNo">151</span> assertEquals(6, procExecutor.getEnvironment().rollbackCount.get());<a name="line.151"></a>
-<span class="sourceLineNo">152</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.152"></a>
-<span class="sourceLineNo">153</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<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 enum TestSMProcedureState { STEP_1, STEP_2 }<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span> public static class TestSMProcedure<a name="line.158"></a>
-<span class="sourceLineNo">159</span> extends StateMachineProcedure<TestProcEnv, TestSMProcedureState> {<a name="line.159"></a>
-<span class="sourceLineNo">160</span> @Override<a name="line.160"></a>
-<span class="sourceLineNo">161</span> protected Flow executeFromState(TestProcEnv env, TestSMProcedureState state) {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> LOG.info("EXEC " + state + " " + this);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> env.execCount.incrementAndGet();<a name="line.163"></a>
-<span class="sourceLineNo">164</span> switch (state) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> case STEP_1:<a name="line.165"></a>
-<span class="sourceLineNo">166</span> if (!env.loop) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> setNextState(TestSMProcedureState.STEP_2);<a name="line.167"></a>
-<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span> break;<a name="line.169"></a>
-<span class="sourceLineNo">170</span> case STEP_2:<a name="line.170"></a>
-<span class="sourceLineNo">171</span> addChildProcedure(new SimpleChildProcedure());<a name="line.171"></a>
-<span class="sourceLineNo">172</span> return Flow.NO_MORE_STATE;<a name="line.172"></a>
-<span class="sourceLineNo">173</span> }<a name="line.173"></a>
-<span class="sourceLineNo">174</span> return Flow.HAS_MORE_STATE;<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> @Override<a name="line.177"></a>
-<span class="sourceLineNo">178</span> protected void rollbackState(TestProcEnv env, TestSMProcedureState state) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> LOG.info("ROLLBACK " + state + " " + this);<a name="line.179"></a>
-<span class="sourceLineNo">180</span> env.rollbackCount.incrementAndGet();<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span> @Override<a name="line.183"></a>
-<span class="sourceLineNo">184</span> protected TestSMProcedureState getState(int stateId) {<a name="line.184"></a>
-<span class="sourceLineNo">185</span> return TestSMProcedureState.values()[stateId];<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> @Override<a name="line.188"></a>
-<span class="sourceLineNo">189</span> protected int getStateId(TestSMProcedureState state) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> return state.ordinal();<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> @Override<a name="line.193"></a>
-<span class="sourceLineNo">194</span> protected TestSMProcedureState getInitialState() {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> return TestSMProcedureState.STEP_1;<a name="line.195"></a>
-<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span> }<a name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span> public static class SimpleChildProcedure extends NoopProcedure<TestProcEnv> {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> @Override<a name="line.200"></a>
-<span class="sourceLineNo">201</span> protected Procedure[] execute(TestProcEnv env) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> LOG.info("EXEC " + this);<a name="line.202"></a>
-<span class="sourceLineNo">203</span> env.execCount.incrementAndGet();<a name="line.203"></a>
-<span class="sourceLineNo">204</span> if (env.triggerChildRollback) {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> setFailure("test-failure", TEST_FAILURE_EXCEPTION);<a name="line.205"></a>
-<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> return null;<a name="line.207"></a>
-<span class="sourceLineNo">208</span> }<a name="line.208"></a>
-<span class="sourceLineNo">209</span><a name="line.209"></a>
-<span class="sourceLineNo">210</span> @Override<a name="line.210"></a>
-<span class="sourceLineNo">211</span> protected void rollback(TestProcEnv env) {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> LOG.info("ROLLBACK " + this);<a name="line.212"></a>
-<span class="sourceLineNo">213</span> env.rollbackCount.incrementAndGet();<a name="line.213"></a>
+<span class="sourceLineNo">147</span> TestSMProcedureBadRollback testNormalRollback = new TestSMProcedureBadRollback();<a name="line.147"></a>
+<span class="sourceLineNo">148</span> long procId = procExecutor.submitProcedure(testNormalRollback);<a name="line.148"></a>
+<span class="sourceLineNo">149</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> assertEquals(0, testNormalRollback.stateCount);<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> @Test<a name="line.153"></a>
+<span class="sourceLineNo">154</span> public void testChildBadRollbackStateCount() {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.155"></a>
+<span class="sourceLineNo">156</span> TestSMProcedureBadRollback testBadRollback = new TestSMProcedureBadRollback();<a name="line.156"></a>
+<span class="sourceLineNo">157</span> long procId = procExecutor.submitProcedure(testBadRollback);<a name="line.157"></a>
+<span class="sourceLineNo">158</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.158"></a>
+<span class="sourceLineNo">159</span> assertEquals(0, testBadRollback.stateCount);<a name="line.159"></a>
+<span class="sourceLineNo">160</span> }<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span> @Test<a name="line.162"></a>
+<span class="sourceLineNo">163</span> public void testChildOnLastStepWithRollbackDoubleExecution() throws Exception {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.164"></a>
+<span class="sourceLineNo">165</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.166"></a>
+<span class="sourceLineNo">167</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId, true);<a name="line.167"></a>
+<span class="sourceLineNo">168</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.168"></a>
+<span class="sourceLineNo">169</span> assertEquals(6, procExecutor.getEnvironment().rollbackCount.get());<a name="line.169"></a>
+<span class="sourceLineNo">170</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.170"></a>
+<span class="sourceLineNo">171</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<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 enum TestSMProcedureState { STEP_1, STEP_2 }<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span> public static class TestSMProcedure<a name="line.176"></a>
+<span class="sourceLineNo">177</span> extends StateMachineProcedure<TestProcEnv, TestSMProcedureState> {<a name="line.177"></a>
+<span class="sourceLineNo">178</span> @Override<a name="line.178"></a>
+<span class="sourceLineNo">179</span> protected Flow executeFromState(TestProcEnv env, TestSMProcedureState state) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> LOG.info("EXEC " + state + " " + this);<a name="line.180"></a>
+<span class="sourceLineNo">181</span> env.execCount.incrementAndGet();<a name="line.181"></a>
+<span class="sourceLineNo">182</span> switch (state) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> case STEP_1:<a name="line.183"></a>
+<span class="sourceLineNo">184</span> if (!env.loop) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> setNextState(TestSMProcedureState.STEP_2);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> }<a name="line.186"></a>
+<span class="sourceLineNo">187</span> break;<a name="line.187"></a>
+<span class="sourceLineNo">188</span> case STEP_2:<a name="line.188"></a>
+<span class="sourceLineNo">189</span> addChildProcedure(new SimpleChildProcedure());<a name="line.189"></a>
+<span class="sourceLineNo">190</span> return Flow.NO_MORE_STATE;<a name="line.190"></a>
+<span class="sourceLineNo">191</span> }<a name="line.191"></a>
+<span class="sourceLineNo">192</span> return Flow.HAS_MORE_STATE;<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> @Override<a name="line.195"></a>
+<span class="sourceLineNo">196</span> protected void rollbackState(TestProcEnv env, TestSMProcedureState state) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> LOG.info("ROLLBACK " + state + " " + this);<a name="line.197"></a>
+<span class="sourceLineNo">198</span> env.rollbackCount.incrementAndGet();<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> @Override<a name="line.201"></a>
+<span class="sourceLineNo">202</span> protected TestSMProcedureState getState(int stateId) {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> return TestSMProcedureState.values()[stateId];<a name="line.203"></a>
+<span class="sourceLineNo">204</span> }<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span> @Override<a name="line.206"></a>
+<span class="sourceLineNo">207</span> protected int getStateId(TestSMProcedureState state) {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> return state.ordinal();<a name="line.208"></a>
+<span class="sourceLineNo">209</span> }<a name="line.209"></a>
+<span class="sourceLineNo">210</span><a name="line.210"></a>
+<span class="sourceLineNo">211</span> @Override<a name="line.211"></a>
+<span class="sourceLineNo">212</span> protected TestSMProcedureState getInitialState() {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> return TestSMProcedureState.STEP_1;<a name="line.213"></a>
<span class="sourceLineNo">214</span> }<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> public static class TestProcEnv {<a name="line.217"></a>
-<span class="sourceLineNo">218</span> AtomicInteger execCount = new AtomicInteger(0);<a name="line.218"></a>
-<span class="sourceLineNo">219</span> AtomicInteger rollbackCount = new AtomicInteger(0);<a name="line.219"></a>
-<span class="sourceLineNo">220</span> boolean triggerChildRollback = false;<a name="line.220"></a>
-<span class="sourceLineNo">221</span> boolean loop = false;<a name="line.221"></a>
-<span class="sourceLineNo">222</span> }<a name="line.222"></a>
-<span class="sourceLineNo">223</span>}<a name="line.223"></a>
+<span class="sourceLineNo">217</span> public static class TestSMProcedureBadRollback<a name="line.217"></a>
+<span class="sourceLineNo">218</span> extends StateMachineProcedure<TestProcEnv, TestSMProcedureState> {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> @Override<a name="line.219"></a>
+<span class="sourceLineNo">220</span> protected Flow executeFromState(TestProcEnv env, TestSMProcedureState state) {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> LOG.info("EXEC " + state + " " + this);<a name="line.221"></a>
+<span class="sourceLineNo">222</span> env.execCount.incrementAndGet();<a name="line.222"></a>
+<span class="sourceLineNo">223</span> switch (state) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> case STEP_1:<a name="line.224"></a>
+<span class="sourceLineNo">225</span> if (!env.loop) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> setNextState(TestSMProcedureState.STEP_2);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span> break;<a name="line.228"></a>
+<span class="sourceLineNo">229</span> case STEP_2:<a name="line.229"></a>
+<span class="sourceLineNo">230</span> addChildProcedure(new SimpleChildProcedure());<a name="line.230"></a>
+<span class="sourceLineNo">231</span> return Flow.NO_MORE_STATE;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> }<a name="line.232"></a>
+<span class="sourceLineNo">233</span> return Flow.HAS_MORE_STATE;<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span> @Override<a name="line.235"></a>
+<span class="sourceLineNo">236</span> protected void rollbackState(TestProcEnv env, TestSMProcedureState state) {<a name="line.236"></a>
+<span class="sourceLineNo">237</span> LOG.info("ROLLBACK " + state + " " + this);<a name="line.237"></a>
+<span class="sourceLineNo">238</span> env.rollbackCount.incrementAndGet();<a name="line.238"></a>
+<span class="sourceLineNo">239</span> }<a name="line.239"></a>
+<span class="sourceLineNo">240</span><a name="line.240"></a>
+<span class="sourceLineNo">241</span> @Override<a name="line.241"></a>
+<span class="sourceLineNo">242</span> protected TestSMProcedureState getState(int stateId) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> return TestSMProcedureState.values()[stateId];<a name="line.243"></a>
+<span class="sourceLineNo">244</span> }<a name="line.244"></a>
+<span class="sourceLineNo">245</span><a name="line.245"></a>
+<span class="sourceLineNo">246</span> @Override<a name="line.246"></a>
+<span class="sourceLineNo">247</span> protected int getStateId(TestSMProcedureState state) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span> return state.ordinal();<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> @Override<a name="line.251"></a>
+<span class="sourceLineNo">252</span> protected TestSMProcedureState getInitialState() {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> return TestSMProcedureState.STEP_1;<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> @Override<a name="line.256"></a>
+<span class="sourceLineNo">257</span> protected void rollback(final TestProcEnv env)<a name="line.257"></a>
+<span class="sourceLineNo">258</span> throws IOException, InterruptedException {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> if (isEofState()) {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> stateCount--;<a name="line.260"></a>
+<span class="sourceLineNo">261</span> }<a name="line.261"></a>
+<span class="sourceLineNo">262</span> try {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> updateTimestamp();<a name="line.263"></a>
+<span class="sourceLineNo">264</span> rollbackState(env, getCurrentState());<a name="line.264"></a>
+<span class="sourceLineNo">265</span> throw new IOException();<a name="line.265"></a>
+<span class="sourceLineNo">266</span> } catch(IOException e) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> //do nothing for now<a name="line.267"></a>
+<span class="sourceLineNo">268</span> } finally {<a name="line.268"></a>
+<span class="sourceLineNo">269</span> stateCount--;<a name="line.269"></a>
+<span class="sourceLineNo">270</span> updateTimestamp();<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> }<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span> public static class SimpleChildProcedure extends NoopProcedure<TestProcEnv> {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> @Override<a name="line.276"></a>
+<span class="sourceLineNo">277</span> protected Procedure[] execute(TestProcEnv env) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> LOG.info("EXEC " + this);<a name="line.278"></a>
+<span class="sourceLineNo">279</span> env.execCount.incrementAndGet();<a name="line.279"></a>
+<span class="sourceLineNo">280</span> if (env.triggerChildRollback) {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> setFailure("test-failure", TEST_FAILURE_EXCEPTION);<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span> return null;<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span> @Override<a name="line.286"></a>
+<span class="sourceLineNo">287</span> protected void rollback(TestProcEnv env) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> LOG.info("ROLLBACK " + this);<a name="line.288"></a>
+<span class="sourceLineNo">289</span> env.rollbackCount.incrementAndGet();<a name="line.289"></a>
+<span class="sourceLineNo">290</span> }<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 class TestProcEnv {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> AtomicInteger execCount = new AtomicInteger(0);<a name="line.294"></a>
+<span class="sourceLineNo">295</span> AtomicInteger rollbackCount = new AtomicInteger(0);<a name="line.295"></a>
+<span class="sourceLineNo">296</span> boolean triggerChildRollback = false;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> boolean loop = false;<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8e1d7469/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestProcEnv.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestProcEnv.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestProcEnv.html
index 5c35fe1..2012242 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestProcEnv.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestProcEnv.html
@@ -150,85 +150,161 @@
<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> @Test<a name="line.144"></a>
-<span class="sourceLineNo">145</span> public void testChildOnLastStepWithRollbackDoubleExecution() throws Exception {<a name="line.145"></a>
+<span class="sourceLineNo">145</span> public void testChildNormalRollbackStateCount() {<a name="line.145"></a>
<span class="sourceLineNo">146</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.146"></a>
-<span class="sourceLineNo">147</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.147"></a>
-<span class="sourceLineNo">148</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.148"></a>
-<span class="sourceLineNo">149</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId, true);<a name="line.149"></a>
-<span class="sourceLineNo">150</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.150"></a>
-<span class="sourceLineNo">151</span> assertEquals(6, procExecutor.getEnvironment().rollbackCount.get());<a name="line.151"></a>
-<span class="sourceLineNo">152</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.152"></a>
-<span class="sourceLineNo">153</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<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 enum TestSMProcedureState { STEP_1, STEP_2 }<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span> public static class TestSMProcedure<a name="line.158"></a>
-<span class="sourceLineNo">159</span> extends StateMachineProcedure<TestProcEnv, TestSMProcedureState> {<a name="line.159"></a>
-<span class="sourceLineNo">160</span> @Override<a name="line.160"></a>
-<span class="sourceLineNo">161</span> protected Flow executeFromState(TestProcEnv env, TestSMProcedureState state) {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> LOG.info("EXEC " + state + " " + this);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> env.execCount.incrementAndGet();<a name="line.163"></a>
-<span class="sourceLineNo">164</span> switch (state) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> case STEP_1:<a name="line.165"></a>
-<span class="sourceLineNo">166</span> if (!env.loop) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> setNextState(TestSMProcedureState.STEP_2);<a name="line.167"></a>
-<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span> break;<a name="line.169"></a>
-<span class="sourceLineNo">170</span> case STEP_2:<a name="line.170"></a>
-<span class="sourceLineNo">171</span> addChildProcedure(new SimpleChildProcedure());<a name="line.171"></a>
-<span class="sourceLineNo">172</span> return Flow.NO_MORE_STATE;<a name="line.172"></a>
-<span class="sourceLineNo">173</span> }<a name="line.173"></a>
-<span class="sourceLineNo">174</span> return Flow.HAS_MORE_STATE;<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> @Override<a name="line.177"></a>
-<span class="sourceLineNo">178</span> protected void rollbackState(TestProcEnv env, TestSMProcedureState state) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> LOG.info("ROLLBACK " + state + " " + this);<a name="line.179"></a>
-<span class="sourceLineNo">180</span> env.rollbackCount.incrementAndGet();<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span> @Override<a name="line.183"></a>
-<span class="sourceLineNo">184</span> protected TestSMProcedureState getState(int stateId) {<a name="line.184"></a>
-<span class="sourceLineNo">185</span> return TestSMProcedureState.values()[stateId];<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> @Override<a name="line.188"></a>
-<span class="sourceLineNo">189</span> protected int getStateId(TestSMProcedureState state) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> return state.ordinal();<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> @Override<a name="line.193"></a>
-<span class="sourceLineNo">194</span> protected TestSMProcedureState getInitialState() {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> return TestSMProcedureState.STEP_1;<a name="line.195"></a>
-<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span> }<a name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span> public static class SimpleChildProcedure extends NoopProcedure<TestProcEnv> {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> @Override<a name="line.200"></a>
-<span class="sourceLineNo">201</span> protected Procedure[] execute(TestProcEnv env) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> LOG.info("EXEC " + this);<a name="line.202"></a>
-<span class="sourceLineNo">203</span> env.execCount.incrementAndGet();<a name="line.203"></a>
-<span class="sourceLineNo">204</span> if (env.triggerChildRollback) {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> setFailure("test-failure", TEST_FAILURE_EXCEPTION);<a name="line.205"></a>
-<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> return null;<a name="line.207"></a>
-<span class="sourceLineNo">208</span> }<a name="line.208"></a>
-<span class="sourceLineNo">209</span><a name="line.209"></a>
-<span class="sourceLineNo">210</span> @Override<a name="line.210"></a>
-<span class="sourceLineNo">211</span> protected void rollback(TestProcEnv env) {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> LOG.info("ROLLBACK " + this);<a name="line.212"></a>
-<span class="sourceLineNo">213</span> env.rollbackCount.incrementAndGet();<a name="line.213"></a>
+<span class="sourceLineNo">147</span> TestSMProcedureBadRollback testNormalRollback = new TestSMProcedureBadRollback();<a name="line.147"></a>
+<span class="sourceLineNo">148</span> long procId = procExecutor.submitProcedure(testNormalRollback);<a name="line.148"></a>
+<span class="sourceLineNo">149</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> assertEquals(0, testNormalRollback.stateCount);<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> @Test<a name="line.153"></a>
+<span class="sourceLineNo">154</span> public void testChildBadRollbackStateCount() {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.155"></a>
+<span class="sourceLineNo">156</span> TestSMProcedureBadRollback testBadRollback = new TestSMProcedureBadRollback();<a name="line.156"></a>
+<span class="sourceLineNo">157</span> long procId = procExecutor.submitProcedure(testBadRollback);<a name="line.157"></a>
+<span class="sourceLineNo">158</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.158"></a>
+<span class="sourceLineNo">159</span> assertEquals(0, testBadRollback.stateCount);<a name="line.159"></a>
+<span class="sourceLineNo">160</span> }<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span> @Test<a name="line.162"></a>
+<span class="sourceLineNo">163</span> public void testChildOnLastStepWithRollbackDoubleExecution() throws Exception {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.164"></a>
+<span class="sourceLineNo">165</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.166"></a>
+<span class="sourceLineNo">167</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId, true);<a name="line.167"></a>
+<span class="sourceLineNo">168</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.168"></a>
+<span class="sourceLineNo">169</span> assertEquals(6, procExecutor.getEnvironment().rollbackCount.get());<a name="line.169"></a>
+<span class="sourceLineNo">170</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.170"></a>
+<span class="sourceLineNo">171</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<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 enum TestSMProcedureState { STEP_1, STEP_2 }<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span> public static class TestSMProcedure<a name="line.176"></a>
+<span class="sourceLineNo">177</span> extends StateMachineProcedure<TestProcEnv, TestSMProcedureState> {<a name="line.177"></a>
+<span class="sourceLineNo">178</span> @Override<a name="line.178"></a>
+<span class="sourceLineNo">179</span> protected Flow executeFromState(TestProcEnv env, TestSMProcedureState state) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> LOG.info("EXEC " + state + " " + this);<a name="line.180"></a>
+<span class="sourceLineNo">181</span> env.execCount.incrementAndGet();<a name="line.181"></a>
+<span class="sourceLineNo">182</span> switch (state) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> case STEP_1:<a name="line.183"></a>
+<span class="sourceLineNo">184</span> if (!env.loop) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> setNextState(TestSMProcedureState.STEP_2);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> }<a name="line.186"></a>
+<span class="sourceLineNo">187</span> break;<a name="line.187"></a>
+<span class="sourceLineNo">188</span> case STEP_2:<a name="line.188"></a>
+<span class="sourceLineNo">189</span> addChildProcedure(new SimpleChildProcedure());<a name="line.189"></a>
+<span class="sourceLineNo">190</span> return Flow.NO_MORE_STATE;<a name="line.190"></a>
+<span class="sourceLineNo">191</span> }<a name="line.191"></a>
+<span class="sourceLineNo">192</span> return Flow.HAS_MORE_STATE;<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> @Override<a name="line.195"></a>
+<span class="sourceLineNo">196</span> protected void rollbackState(TestProcEnv env, TestSMProcedureState state) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> LOG.info("ROLLBACK " + state + " " + this);<a name="line.197"></a>
+<span class="sourceLineNo">198</span> env.rollbackCount.incrementAndGet();<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> @Override<a name="line.201"></a>
+<span class="sourceLineNo">202</span> protected TestSMProcedureState getState(int stateId) {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> return TestSMProcedureState.values()[stateId];<a name="line.203"></a>
+<span class="sourceLineNo">204</span> }<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span> @Override<a name="line.206"></a>
+<span class="sourceLineNo">207</span> protected int getStateId(TestSMProcedureState state) {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> return state.ordinal();<a name="line.208"></a>
+<span class="sourceLineNo">209</span> }<a name="line.209"></a>
+<span class="sourceLineNo">210</span><a name="line.210"></a>
+<span class="sourceLineNo">211</span> @Override<a name="line.211"></a>
+<span class="sourceLineNo">212</span> protected TestSMProcedureState getInitialState() {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> return TestSMProcedureState.STEP_1;<a name="line.213"></a>
<span class="sourceLineNo">214</span> }<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> public static class TestProcEnv {<a name="line.217"></a>
-<span class="sourceLineNo">218</span> AtomicInteger execCount = new AtomicInteger(0);<a name="line.218"></a>
-<span class="sourceLineNo">219</span> AtomicInteger rollbackCount = new AtomicInteger(0);<a name="line.219"></a>
-<span class="sourceLineNo">220</span> boolean triggerChildRollback = false;<a name="line.220"></a>
-<span class="sourceLineNo">221</span> boolean loop = false;<a name="line.221"></a>
-<span class="sourceLineNo">222</span> }<a name="line.222"></a>
-<span class="sourceLineNo">223</span>}<a name="line.223"></a>
+<span class="sourceLineNo">217</span> public static class TestSMProcedureBadRollback<a name="line.217"></a>
+<span class="sourceLineNo">218</span> extends StateMachineProcedure<TestProcEnv, TestSMProcedureState> {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> @Override<a name="line.219"></a>
+<span class="sourceLineNo">220</span> protected Flow executeFromState(TestProcEnv env, TestSMProcedureState state) {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> LOG.info("EXEC " + state + " " + this);<a name="line.221"></a>
+<span class="sourceLineNo">222</span> env.execCount.incrementAndGet();<a name="line.222"></a>
+<span class="sourceLineNo">223</span> switch (state) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> case STEP_1:<a name="line.224"></a>
+<span class="sourceLineNo">225</span> if (!env.loop) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> setNextState(TestSMProcedureState.STEP_2);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span> break;<a name="line.228"></a>
+<span class="sourceLineNo">229</span> case STEP_2:<a name="line.229"></a>
+<span class="sourceLineNo">230</span> addChildProcedure(new SimpleChildProcedure());<a name="line.230"></a>
+<span class="sourceLineNo">231</span> return Flow.NO_MORE_STATE;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> }<a name="line.232"></a>
+<span class="sourceLineNo">233</span> return Flow.HAS_MORE_STATE;<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span> @Override<a name="line.235"></a>
+<span class="sourceLineNo">236</span> protected void rollbackState(TestProcEnv env, TestSMProcedureState state) {<a name="line.236"></a>
+<span class="sourceLineNo">237</span> LOG.info("ROLLBACK " + state + " " + this);<a name="line.237"></a>
+<span class="sourceLineNo">238</span> env.rollbackCount.incrementAndGet();<a name="line.238"></a>
+<span class="sourceLineNo">239</span> }<a name="line.239"></a>
+<span class="sourceLineNo">240</span><a name="line.240"></a>
+<span class="sourceLineNo">241</span> @Override<a name="line.241"></a>
+<span class="sourceLineNo">242</span> protected TestSMProcedureState getState(int stateId) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> return TestSMProcedureState.values()[stateId];<a name="line.243"></a>
+<span class="sourceLineNo">244</span> }<a name="line.244"></a>
+<span class="sourceLineNo">245</span><a name="line.245"></a>
+<span class="sourceLineNo">246</span> @Override<a name="line.246"></a>
+<span class="sourceLineNo">247</span> protected int getStateId(TestSMProcedureState state) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span> return state.ordinal();<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> @Override<a name="line.251"></a>
+<span class="sourceLineNo">252</span> protected TestSMProcedureState getInitialState() {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> return TestSMProcedureState.STEP_1;<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> @Override<a name="line.256"></a>
+<span class="sourceLineNo">257</span> protected void rollback(final TestProcEnv env)<a name="line.257"></a>
+<span class="sourceLineNo">258</span> throws IOException, InterruptedException {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> if (isEofState()) {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> stateCount--;<a name="line.260"></a>
+<span class="sourceLineNo">261</span> }<a name="line.261"></a>
+<span class="sourceLineNo">262</span> try {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> updateTimestamp();<a name="line.263"></a>
+<span class="sourceLineNo">264</span> rollbackState(env, getCurrentState());<a name="line.264"></a>
+<span class="sourceLineNo">265</span> throw new IOException();<a name="line.265"></a>
+<span class="sourceLineNo">266</span> } catch(IOException e) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> //do nothing for now<a name="line.267"></a>
+<span class="sourceLineNo">268</span> } finally {<a name="line.268"></a>
+<span class="sourceLineNo">269</span> stateCount--;<a name="line.269"></a>
+<span class="sourceLineNo">270</span> updateTimestamp();<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> }<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span> public static class SimpleChildProcedure extends NoopProcedure<TestProcEnv> {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> @Override<a name="line.276"></a>
+<span class="sourceLineNo">277</span> protected Procedure[] execute(TestProcEnv env) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> LOG.info("EXEC " + this);<a name="line.278"></a>
+<span class="sourceLineNo">279</span> env.execCount.incrementAndGet();<a name="line.279"></a>
+<span class="sourceLineNo">280</span> if (env.triggerChildRollback) {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> setFailure("test-failure", TEST_FAILURE_EXCEPTION);<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span> return null;<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span> @Override<a name="line.286"></a>
+<span class="sourceLineNo">287</span> protected void rollback(TestProcEnv env) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> LOG.info("ROLLBACK " + this);<a name="line.288"></a>
+<span class="sourceLineNo">289</span> env.rollbackCount.incrementAndGet();<a name="line.289"></a>
+<span class="sourceLineNo">290</span> }<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 class TestProcEnv {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> AtomicInteger execCount = new AtomicInteger(0);<a name="line.294"></a>
+<span class="sourceLineNo">295</span> AtomicInteger rollbackCount = new AtomicInteger(0);<a name="line.295"></a>
+<span class="sourceLineNo">296</span> boolean triggerChildRollback = false;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> boolean loop = false;<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8e1d7469/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedure.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedure.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedure.html
index 5c35fe1..2012242 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedure.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedure.html
@@ -150,85 +150,161 @@
<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> @Test<a name="line.144"></a>
-<span class="sourceLineNo">145</span> public void testChildOnLastStepWithRollbackDoubleExecution() throws Exception {<a name="line.145"></a>
+<span class="sourceLineNo">145</span> public void testChildNormalRollbackStateCount() {<a name="line.145"></a>
<span class="sourceLineNo">146</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.146"></a>
-<span class="sourceLineNo">147</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.147"></a>
-<span class="sourceLineNo">148</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.148"></a>
-<span class="sourceLineNo">149</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId, true);<a name="line.149"></a>
-<span class="sourceLineNo">150</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.150"></a>
-<span class="sourceLineNo">151</span> assertEquals(6, procExecutor.getEnvironment().rollbackCount.get());<a name="line.151"></a>
-<span class="sourceLineNo">152</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.152"></a>
-<span class="sourceLineNo">153</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<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 enum TestSMProcedureState { STEP_1, STEP_2 }<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span> public static class TestSMProcedure<a name="line.158"></a>
-<span class="sourceLineNo">159</span> extends StateMachineProcedure<TestProcEnv, TestSMProcedureState> {<a name="line.159"></a>
-<span class="sourceLineNo">160</span> @Override<a name="line.160"></a>
-<span class="sourceLineNo">161</span> protected Flow executeFromState(TestProcEnv env, TestSMProcedureState state) {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> LOG.info("EXEC " + state + " " + this);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> env.execCount.incrementAndGet();<a name="line.163"></a>
-<span class="sourceLineNo">164</span> switch (state) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> case STEP_1:<a name="line.165"></a>
-<span class="sourceLineNo">166</span> if (!env.loop) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> setNextState(TestSMProcedureState.STEP_2);<a name="line.167"></a>
-<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span> break;<a name="line.169"></a>
-<span class="sourceLineNo">170</span> case STEP_2:<a name="line.170"></a>
-<span class="sourceLineNo">171</span> addChildProcedure(new SimpleChildProcedure());<a name="line.171"></a>
-<span class="sourceLineNo">172</span> return Flow.NO_MORE_STATE;<a name="line.172"></a>
-<span class="sourceLineNo">173</span> }<a name="line.173"></a>
-<span class="sourceLineNo">174</span> return Flow.HAS_MORE_STATE;<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> @Override<a name="line.177"></a>
-<span class="sourceLineNo">178</span> protected void rollbackState(TestProcEnv env, TestSMProcedureState state) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> LOG.info("ROLLBACK " + state + " " + this);<a name="line.179"></a>
-<span class="sourceLineNo">180</span> env.rollbackCount.incrementAndGet();<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span> @Override<a name="line.183"></a>
-<span class="sourceLineNo">184</span> protected TestSMProcedureState getState(int stateId) {<a name="line.184"></a>
-<span class="sourceLineNo">185</span> return TestSMProcedureState.values()[stateId];<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> @Override<a name="line.188"></a>
-<span class="sourceLineNo">189</span> protected int getStateId(TestSMProcedureState state) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> return state.ordinal();<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> @Override<a name="line.193"></a>
-<span class="sourceLineNo">194</span> protected TestSMProcedureState getInitialState() {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> return TestSMProcedureState.STEP_1;<a name="line.195"></a>
-<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span> }<a name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span> public static class SimpleChildProcedure extends NoopProcedure<TestProcEnv> {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> @Override<a name="line.200"></a>
-<span class="sourceLineNo">201</span> protected Procedure[] execute(TestProcEnv env) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> LOG.info("EXEC " + this);<a name="line.202"></a>
-<span class="sourceLineNo">203</span> env.execCount.incrementAndGet();<a name="line.203"></a>
-<span class="sourceLineNo">204</span> if (env.triggerChildRollback) {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> setFailure("test-failure", TEST_FAILURE_EXCEPTION);<a name="line.205"></a>
-<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> return null;<a name="line.207"></a>
-<span class="sourceLineNo">208</span> }<a name="line.208"></a>
-<span class="sourceLineNo">209</span><a name="line.209"></a>
-<span class="sourceLineNo">210</span> @Override<a name="line.210"></a>
-<span class="sourceLineNo">211</span> protected void rollback(TestProcEnv env) {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> LOG.info("ROLLBACK " + this);<a name="line.212"></a>
-<span class="sourceLineNo">213</span> env.rollbackCount.incrementAndGet();<a name="line.213"></a>
+<span class="sourceLineNo">147</span> TestSMProcedureBadRollback testNormalRollback = new TestSMProcedureBadRollback();<a name="line.147"></a>
+<span class="sourceLineNo">148</span> long procId = procExecutor.submitProcedure(testNormalRollback);<a name="line.148"></a>
+<span class="sourceLineNo">149</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> assertEquals(0, testNormalRollback.stateCount);<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> @Test<a name="line.153"></a>
+<span class="sourceLineNo">154</span> public void testChildBadRollbackStateCount() {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.155"></a>
+<span class="sourceLineNo">156</span> TestSMProcedureBadRollback testBadRollback = new TestSMProcedureBadRollback();<a name="line.156"></a>
+<span class="sourceLineNo">157</span> long procId = procExecutor.submitProcedure(testBadRollback);<a name="line.157"></a>
+<span class="sourceLineNo">158</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.158"></a>
+<span class="sourceLineNo">159</span> assertEquals(0, testBadRollback.stateCount);<a name="line.159"></a>
+<span class="sourceLineNo">160</span> }<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span> @Test<a name="line.162"></a>
+<span class="sourceLineNo">163</span> public void testChildOnLastStepWithRollbackDoubleExecution() throws Exception {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.164"></a>
+<span class="sourceLineNo">165</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.165"></a>
+<span class="sourceLineNo">166</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.166"></a>
+<span class="sourceLineNo">167</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId, true);<a name="line.167"></a>
+<span class="sourceLineNo">168</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.168"></a>
+<span class="sourceLineNo">169</span> assertEquals(6, procExecutor.getEnvironment().rollbackCount.get());<a name="line.169"></a>
+<span class="sourceLineNo">170</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.170"></a>
+<span class="sourceLineNo">171</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<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 enum TestSMProcedureState { STEP_1, STEP_2 }<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span> public static class TestSMProcedure<a name="line.176"></a>
+<span class="sourceLineNo">177</span> extends StateMachineProcedure<TestProcEnv, TestSMProcedureState> {<a name="line.177"></a>
+<span class="sourceLineNo">178</span> @Override<a name="line.178"></a>
+<span class="sourceLineNo">179</span> protected Flow executeFromState(TestProcEnv env, TestSMProcedureState state) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> LOG.info("EXEC " + state + " " + this);<a name="line.180"></a>
+<span class="sourceLineNo">181</span> env.execCount.incrementAndGet();<a name="line.181"></a>
+<span class="sourceLineNo">182</span> switch (state) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> case STEP_1:<a name="line.183"></a>
+<span class="sourceLineNo">184</span> if (!env.loop) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> setNextState(TestSMProcedureState.STEP_2);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> }<a name="line.186"></a>
+<span class="sourceLineNo">187</span> break;<a name="line.187"></a>
+<span class="sourceLineNo">188</span> case STEP_2:<a name="line.188"></a>
+<span class="sourceLineNo">189</span> addChildProcedure(new SimpleChildProcedure());<a name="line.189"></a>
+<span class="sourceLineNo">190</span> return Flow.NO_MORE_STATE;<a name="line.190"></a>
+<span class="sourceLineNo">191</span> }<a name="line.191"></a>
+<span class="sourceLineNo">192</span> return Flow.HAS_MORE_STATE;<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> @Override<a name="line.195"></a>
+<span class="sourceLineNo">196</span> protected void rollbackState(TestProcEnv env, TestSMProcedureState state) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span> LOG.info("ROLLBACK " + state + " " + this);<a name="line.197"></a>
+<span class="sourceLineNo">198</span> env.rollbackCount.incrementAndGet();<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> @Override<a name="line.201"></a>
+<span class="sourceLineNo">202</span> protected TestSMProcedureState getState(int stateId) {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> return TestSMProcedureState.values()[stateId];<a name="line.203"></a>
+<span class="sourceLineNo">204</span> }<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span> @Override<a name="line.206"></a>
+<span class="sourceLineNo">207</span> protected int getStateId(TestSMProcedureState state) {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> return state.ordinal();<a name="line.208"></a>
+<span class="sourceLineNo">209</span> }<a name="line.209"></a>
+<span class="sourceLineNo">210</span><a name="line.210"></a>
+<span class="sourceLineNo">211</span> @Override<a name="line.211"></a>
+<span class="sourceLineNo">212</span> protected TestSMProcedureState getInitialState() {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> return TestSMProcedureState.STEP_1;<a name="line.213"></a>
<span class="sourceLineNo">214</span> }<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> public static class TestProcEnv {<a name="line.217"></a>
-<span class="sourceLineNo">218</span> AtomicInteger execCount = new AtomicInteger(0);<a name="line.218"></a>
-<span class="sourceLineNo">219</span> AtomicInteger rollbackCount = new AtomicInteger(0);<a name="line.219"></a>
-<span class="sourceLineNo">220</span> boolean triggerChildRollback = false;<a name="line.220"></a>
-<span class="sourceLineNo">221</span> boolean loop = false;<a name="line.221"></a>
-<span class="sourceLineNo">222</span> }<a name="line.222"></a>
-<span class="sourceLineNo">223</span>}<a name="line.223"></a>
+<span class="sourceLineNo">217</span> public static class TestSMProcedureBadRollback<a name="line.217"></a>
+<span class="sourceLineNo">218</span> extends StateMachineProcedure<TestProcEnv, TestSMProcedureState> {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> @Override<a name="line.219"></a>
+<span class="sourceLineNo">220</span> protected Flow executeFromState(TestProcEnv env, TestSMProcedureState state) {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> LOG.info("EXEC " + state + " " + this);<a name="line.221"></a>
+<span class="sourceLineNo">222</span> env.execCount.incrementAndGet();<a name="line.222"></a>
+<span class="sourceLineNo">223</span> switch (state) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> case STEP_1:<a name="line.224"></a>
+<span class="sourceLineNo">225</span> if (!env.loop) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> setNextState(TestSMProcedureState.STEP_2);<a name="line.226"></a>
+<span class="sourceLineNo">227</span> }<a name="line.227"></a>
+<span class="sourceLineNo">228</span> break;<a name="line.228"></a>
+<span class="sourceLineNo">229</span> case STEP_2:<a name="line.229"></a>
+<span class="sourceLineNo">230</span> addChildProcedure(new SimpleChildProcedure());<a name="line.230"></a>
+<span class="sourceLineNo">231</span> return Flow.NO_MORE_STATE;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> }<a name="line.232"></a>
+<span class="sourceLineNo">233</span> return Flow.HAS_MORE_STATE;<a name="line.233"></a>
+<span class="sourceLineNo">234</span> }<a name="line.234"></a>
+<span class="sourceLineNo">235</span> @Override<a name="line.235"></a>
+<span class="sourceLineNo">236</span> protected void rollbackState(TestProcEnv env, TestSMProcedureState state) {<a name="line.236"></a>
+<span class="sourceLineNo">237</span> LOG.info("ROLLBACK " + state + " " + this);<a name="line.237"></a>
+<span class="sourceLineNo">238</span> env.rollbackCount.incrementAndGet();<a name="line.238"></a>
+<span class="sourceLineNo">239</span> }<a name="line.239"></a>
+<span class="sourceLineNo">240</span><a name="line.240"></a>
+<span class="sourceLineNo">241</span> @Override<a name="line.241"></a>
+<span class="sourceLineNo">242</span> protected TestSMProcedureState getState(int stateId) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> return TestSMProcedureState.values()[stateId];<a name="line.243"></a>
+<span class="sourceLineNo">244</span> }<a name="line.244"></a>
+<span class="sourceLineNo">245</span><a name="line.245"></a>
+<span class="sourceLineNo">246</span> @Override<a name="line.246"></a>
+<span class="sourceLineNo">247</span> protected int getStateId(TestSMProcedureState state) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span> return state.ordinal();<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> @Override<a name="line.251"></a>
+<span class="sourceLineNo">252</span> protected TestSMProcedureState getInitialState() {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> return TestSMProcedureState.STEP_1;<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> @Override<a name="line.256"></a>
+<span class="sourceLineNo">257</span> protected void rollback(final TestProcEnv env)<a name="line.257"></a>
+<span class="sourceLineNo">258</span> throws IOException, InterruptedException {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> if (isEofState()) {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> stateCount--;<a name="line.260"></a>
+<span class="sourceLineNo">261</span> }<a name="line.261"></a>
+<span class="sourceLineNo">262</span> try {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> updateTimestamp();<a name="line.263"></a>
+<span class="sourceLineNo">264</span> rollbackState(env, getCurrentState());<a name="line.264"></a>
+<span class="sourceLineNo">265</span> throw new IOException();<a name="line.265"></a>
+<span class="sourceLineNo">266</span> } catch(IOException e) {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> //do nothing for now<a name="line.267"></a>
+<span class="sourceLineNo">268</span> } finally {<a name="line.268"></a>
+<span class="sourceLineNo">269</span> stateCount--;<a name="line.269"></a>
+<span class="sourceLineNo">270</span> updateTimestamp();<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> }<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span> public static class SimpleChildProcedure extends NoopProcedure<TestProcEnv> {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> @Override<a name="line.276"></a>
+<span class="sourceLineNo">277</span> protected Procedure[] execute(TestProcEnv env) {<a name="line.277"></a>
+<span class="sourceLineNo">278</span> LOG.info("EXEC " + this);<a name="line.278"></a>
+<span class="sourceLineNo">279</span> env.execCount.incrementAndGet();<a name="line.279"></a>
+<span class="sourceLineNo">280</span> if (env.triggerChildRollback) {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> setFailure("test-failure", TEST_FAILURE_EXCEPTION);<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span> return null;<a name="line.283"></a>
+<span class="sourceLineNo">284</span> }<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span> @Override<a name="line.286"></a>
+<span class="sourceLineNo">287</span> protected void rollback(TestProcEnv env) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> LOG.info("ROLLBACK " + this);<a name="line.288"></a>
+<span class="sourceLineNo">289</span> env.rollbackCount.incrementAndGet();<a name="line.289"></a>
+<span class="sourceLineNo">290</span> }<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 class TestProcEnv {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> AtomicInteger execCount = new AtomicInteger(0);<a name="line.294"></a>
+<span class="sourceLineNo">295</span> AtomicInteger rollbackCount = new AtomicInteger(0);<a name="line.295"></a>
+<span class="sourceLineNo">296</span> boolean triggerChildRollback = false;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> boolean loop = false;<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>