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 2017/05/17 14:58:11 UTC
[03/20] hbase-site git commit: Published site at
82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/986c93ca/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 9e2d08d..60a7ac6 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
@@ -101,105 +101,123 @@
<span class="sourceLineNo">093</span> }<a name="line.93"></a>
<span class="sourceLineNo">094</span><a name="line.94"></a>
<span class="sourceLineNo">095</span> @Test<a name="line.95"></a>
-<span class="sourceLineNo">096</span> public void testChildOnLastStep() {<a name="line.96"></a>
-<span class="sourceLineNo">097</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.97"></a>
-<span class="sourceLineNo">098</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.98"></a>
-<span class="sourceLineNo">099</span> assertEquals(3, procExecutor.getEnvironment().execCount.get());<a name="line.99"></a>
-<span class="sourceLineNo">100</span> assertEquals(0, procExecutor.getEnvironment().rollbackCount.get());<a name="line.100"></a>
-<span class="sourceLineNo">101</span> ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<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> @Test<a name="line.104"></a>
-<span class="sourceLineNo">105</span> public void testChildOnLastStepDoubleExecution() throws Exception {<a name="line.105"></a>
-<span class="sourceLineNo">106</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.107"></a>
-<span class="sourceLineNo">108</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId);<a name="line.108"></a>
-<span class="sourceLineNo">109</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.109"></a>
-<span class="sourceLineNo">110</span> assertEquals(0, procExecutor.getEnvironment().rollbackCount.get());<a name="line.110"></a>
-<span class="sourceLineNo">111</span> ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<a name="line.111"></a>
-<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span> @Test<a name="line.114"></a>
-<span class="sourceLineNo">115</span> public void testChildOnLastStepWithRollback() {<a name="line.115"></a>
-<span class="sourceLineNo">116</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.116"></a>
-<span class="sourceLineNo">117</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.117"></a>
-<span class="sourceLineNo">118</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.118"></a>
-<span class="sourceLineNo">119</span> assertEquals(3, procExecutor.getEnvironment().execCount.get());<a name="line.119"></a>
-<span class="sourceLineNo">120</span> assertEquals(3, procExecutor.getEnvironment().rollbackCount.get());<a name="line.120"></a>
-<span class="sourceLineNo">121</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.121"></a>
-<span class="sourceLineNo">122</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<a name="line.122"></a>
-<span class="sourceLineNo">123</span> }<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> @Test<a name="line.125"></a>
-<span class="sourceLineNo">126</span> public void testChildOnLastStepWithRollbackDoubleExecution() throws Exception {<a name="line.126"></a>
-<span class="sourceLineNo">127</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.128"></a>
-<span class="sourceLineNo">129</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.129"></a>
-<span class="sourceLineNo">130</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId, true);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.131"></a>
-<span class="sourceLineNo">132</span> assertEquals(6, procExecutor.getEnvironment().rollbackCount.get());<a name="line.132"></a>
-<span class="sourceLineNo">133</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.133"></a>
-<span class="sourceLineNo">134</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<a name="line.134"></a>
-<span class="sourceLineNo">135</span> }<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span> public enum TestSMProcedureState { STEP_1, STEP_2 };<a name="line.137"></a>
-<span class="sourceLineNo">138</span> public static class TestSMProcedure<a name="line.138"></a>
-<span class="sourceLineNo">139</span> extends StateMachineProcedure<TestProcEnv, TestSMProcedureState> {<a name="line.139"></a>
-<span class="sourceLineNo">140</span> protected Flow executeFromState(TestProcEnv env, TestSMProcedureState state) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span> LOG.info("EXEC " + state + " " + this);<a name="line.141"></a>
-<span class="sourceLineNo">142</span> env.execCount.incrementAndGet();<a name="line.142"></a>
-<span class="sourceLineNo">143</span> switch (state) {<a name="line.143"></a>
-<span class="sourceLineNo">144</span> case STEP_1:<a name="line.144"></a>
-<span class="sourceLineNo">145</span> setNextState(TestSMProcedureState.STEP_2);<a name="line.145"></a>
-<span class="sourceLineNo">146</span> break;<a name="line.146"></a>
-<span class="sourceLineNo">147</span> case STEP_2:<a name="line.147"></a>
-<span class="sourceLineNo">148</span> addChildProcedure(new SimpleChildProcedure());<a name="line.148"></a>
-<span class="sourceLineNo">149</span> return Flow.NO_MORE_STATE;<a name="line.149"></a>
-<span class="sourceLineNo">150</span> }<a name="line.150"></a>
-<span class="sourceLineNo">151</span> return Flow.HAS_MORE_STATE;<a name="line.151"></a>
-<span class="sourceLineNo">152</span> }<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span> protected void rollbackState(TestProcEnv env, TestSMProcedureState state) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> LOG.info("ROLLBACK " + state + " " + this);<a name="line.155"></a>
-<span class="sourceLineNo">156</span> env.rollbackCount.incrementAndGet();<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> protected TestSMProcedureState getState(int stateId) {<a name="line.159"></a>
-<span class="sourceLineNo">160</span> return TestSMProcedureState.values()[stateId];<a name="line.160"></a>
-<span class="sourceLineNo">161</span> }<a name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span> protected int getStateId(TestSMProcedureState state) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span> return state.ordinal();<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> protected TestSMProcedureState getInitialState() {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> return TestSMProcedureState.STEP_1;<a name="line.168"></a>
+<span class="sourceLineNo">096</span> public void testAbortStuckProcedure() throws InterruptedException {<a name="line.96"></a>
+<span class="sourceLineNo">097</span> try {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> procExecutor.getEnvironment().loop = true;<a name="line.98"></a>
+<span class="sourceLineNo">099</span> TestSMProcedure proc = new TestSMProcedure();<a name="line.99"></a>
+<span class="sourceLineNo">100</span> long procId = procExecutor.submitProcedure(proc);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> Thread.sleep(1000 + (int) (Math.random() * 4001));<a name="line.101"></a>
+<span class="sourceLineNo">102</span> proc.abort(procExecutor.getEnvironment());<a name="line.102"></a>
+<span class="sourceLineNo">103</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.103"></a>
+<span class="sourceLineNo">104</span> assertEquals(true, proc.isFailed());<a name="line.104"></a>
+<span class="sourceLineNo">105</span> } finally {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> procExecutor.getEnvironment().loop = false;<a name="line.106"></a>
+<span class="sourceLineNo">107</span> }<a name="line.107"></a>
+<span class="sourceLineNo">108</span> }<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span> @Test<a name="line.110"></a>
+<span class="sourceLineNo">111</span> public void testChildOnLastStep() {<a name="line.111"></a>
+<span class="sourceLineNo">112</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.112"></a>
+<span class="sourceLineNo">113</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.113"></a>
+<span class="sourceLineNo">114</span> assertEquals(3, procExecutor.getEnvironment().execCount.get());<a name="line.114"></a>
+<span class="sourceLineNo">115</span> assertEquals(0, procExecutor.getEnvironment().rollbackCount.get());<a name="line.115"></a>
+<span class="sourceLineNo">116</span> ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<a name="line.116"></a>
+<span class="sourceLineNo">117</span> }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> @Test<a name="line.119"></a>
+<span class="sourceLineNo">120</span> public void testChildOnLastStepDoubleExecution() throws Exception {<a name="line.120"></a>
+<span class="sourceLineNo">121</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.121"></a>
+<span class="sourceLineNo">122</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.122"></a>
+<span class="sourceLineNo">123</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId);<a name="line.123"></a>
+<span class="sourceLineNo">124</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.124"></a>
+<span class="sourceLineNo">125</span> assertEquals(0, procExecutor.getEnvironment().rollbackCount.get());<a name="line.125"></a>
+<span class="sourceLineNo">126</span> ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> }<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> @Test<a name="line.129"></a>
+<span class="sourceLineNo">130</span> public void testChildOnLastStepWithRollback() {<a name="line.130"></a>
+<span class="sourceLineNo">131</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.131"></a>
+<span class="sourceLineNo">132</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.132"></a>
+<span class="sourceLineNo">133</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.133"></a>
+<span class="sourceLineNo">134</span> assertEquals(3, procExecutor.getEnvironment().execCount.get());<a name="line.134"></a>
+<span class="sourceLineNo">135</span> assertEquals(3, procExecutor.getEnvironment().rollbackCount.get());<a name="line.135"></a>
+<span class="sourceLineNo">136</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.136"></a>
+<span class="sourceLineNo">137</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<a name="line.137"></a>
+<span class="sourceLineNo">138</span> }<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span> @Test<a name="line.140"></a>
+<span class="sourceLineNo">141</span> public void testChildOnLastStepWithRollbackDoubleExecution() throws Exception {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.142"></a>
+<span class="sourceLineNo">143</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.143"></a>
+<span class="sourceLineNo">144</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.144"></a>
+<span class="sourceLineNo">145</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId, true);<a name="line.145"></a>
+<span class="sourceLineNo">146</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.146"></a>
+<span class="sourceLineNo">147</span> assertEquals(6, procExecutor.getEnvironment().rollbackCount.get());<a name="line.147"></a>
+<span class="sourceLineNo">148</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.148"></a>
+<span class="sourceLineNo">149</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> }<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span> public enum TestSMProcedureState { STEP_1, STEP_2 };<a name="line.152"></a>
+<span class="sourceLineNo">153</span> public static class TestSMProcedure<a name="line.153"></a>
+<span class="sourceLineNo">154</span> extends StateMachineProcedure<TestProcEnv, TestSMProcedureState> {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> protected Flow executeFromState(TestProcEnv env, TestSMProcedureState state) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span> LOG.info("EXEC " + state + " " + this);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> env.execCount.incrementAndGet();<a name="line.157"></a>
+<span class="sourceLineNo">158</span> switch (state) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> case STEP_1:<a name="line.159"></a>
+<span class="sourceLineNo">160</span> if (!env.loop) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> setNextState(TestSMProcedureState.STEP_2);<a name="line.161"></a>
+<span class="sourceLineNo">162</span> }<a name="line.162"></a>
+<span class="sourceLineNo">163</span> break;<a name="line.163"></a>
+<span class="sourceLineNo">164</span> case STEP_2:<a name="line.164"></a>
+<span class="sourceLineNo">165</span> addChildProcedure(new SimpleChildProcedure());<a name="line.165"></a>
+<span class="sourceLineNo">166</span> return Flow.NO_MORE_STATE;<a name="line.166"></a>
+<span class="sourceLineNo">167</span> }<a name="line.167"></a>
+<span class="sourceLineNo">168</span> return Flow.HAS_MORE_STATE;<a name="line.168"></a>
<span class="sourceLineNo">169</span> }<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> public static class SimpleChildProcedure extends NoopProcedure<TestProcEnv> {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> protected Procedure[] execute(TestProcEnv env) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span> LOG.info("EXEC " + this);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> env.execCount.incrementAndGet();<a name="line.175"></a>
-<span class="sourceLineNo">176</span> if (env.triggerChildRollback) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> setFailure("test-failure", TEST_FAILURE_EXCEPTION);<a name="line.177"></a>
-<span class="sourceLineNo">178</span> }<a name="line.178"></a>
-<span class="sourceLineNo">179</span> return null;<a name="line.179"></a>
-<span class="sourceLineNo">180</span> }<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span> @Override<a name="line.182"></a>
-<span class="sourceLineNo">183</span> protected void rollback(TestProcEnv env) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span> LOG.info("ROLLBACK " + this);<a name="line.184"></a>
-<span class="sourceLineNo">185</span> env.rollbackCount.incrementAndGet();<a name="line.185"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span> protected void rollbackState(TestProcEnv env, TestSMProcedureState state) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> LOG.info("ROLLBACK " + state + " " + this);<a name="line.172"></a>
+<span class="sourceLineNo">173</span> env.rollbackCount.incrementAndGet();<a name="line.173"></a>
+<span class="sourceLineNo">174</span> }<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span> protected TestSMProcedureState getState(int stateId) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span> return TestSMProcedureState.values()[stateId];<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span><a name="line.179"></a>
+<span class="sourceLineNo">180</span> protected int getStateId(TestSMProcedureState state) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> return state.ordinal();<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span> protected TestSMProcedureState getInitialState() {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> return TestSMProcedureState.STEP_1;<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><a name="line.188"></a>
-<span class="sourceLineNo">189</span> public class TestProcEnv {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> AtomicInteger execCount = new AtomicInteger(0);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> AtomicInteger rollbackCount = new AtomicInteger(0);<a name="line.191"></a>
-<span class="sourceLineNo">192</span> boolean triggerChildRollback = false;<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">189</span> public static class SimpleChildProcedure extends NoopProcedure<TestProcEnv> {<a name="line.189"></a>
+<span class="sourceLineNo">190</span> protected Procedure[] execute(TestProcEnv env) {<a name="line.190"></a>
+<span class="sourceLineNo">191</span> LOG.info("EXEC " + this);<a name="line.191"></a>
+<span class="sourceLineNo">192</span> env.execCount.incrementAndGet();<a name="line.192"></a>
+<span class="sourceLineNo">193</span> if (env.triggerChildRollback) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> setFailure("test-failure", TEST_FAILURE_EXCEPTION);<a name="line.194"></a>
+<span class="sourceLineNo">195</span> }<a name="line.195"></a>
+<span class="sourceLineNo">196</span> return null;<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> @Override<a name="line.199"></a>
+<span class="sourceLineNo">200</span> protected void rollback(TestProcEnv env) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> LOG.info("ROLLBACK " + this);<a name="line.201"></a>
+<span class="sourceLineNo">202</span> env.rollbackCount.incrementAndGet();<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><a name="line.205"></a>
+<span class="sourceLineNo">206</span> public class TestProcEnv {<a name="line.206"></a>
+<span class="sourceLineNo">207</span> AtomicInteger execCount = new AtomicInteger(0);<a name="line.207"></a>
+<span class="sourceLineNo">208</span> AtomicInteger rollbackCount = new AtomicInteger(0);<a name="line.208"></a>
+<span class="sourceLineNo">209</span> boolean triggerChildRollback = false;<a name="line.209"></a>
+<span class="sourceLineNo">210</span> boolean loop = false;<a name="line.210"></a>
+<span class="sourceLineNo">211</span> }<a name="line.211"></a>
+<span class="sourceLineNo">212</span>}<a name="line.212"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/986c93ca/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 9e2d08d..60a7ac6 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
@@ -101,105 +101,123 @@
<span class="sourceLineNo">093</span> }<a name="line.93"></a>
<span class="sourceLineNo">094</span><a name="line.94"></a>
<span class="sourceLineNo">095</span> @Test<a name="line.95"></a>
-<span class="sourceLineNo">096</span> public void testChildOnLastStep() {<a name="line.96"></a>
-<span class="sourceLineNo">097</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.97"></a>
-<span class="sourceLineNo">098</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.98"></a>
-<span class="sourceLineNo">099</span> assertEquals(3, procExecutor.getEnvironment().execCount.get());<a name="line.99"></a>
-<span class="sourceLineNo">100</span> assertEquals(0, procExecutor.getEnvironment().rollbackCount.get());<a name="line.100"></a>
-<span class="sourceLineNo">101</span> ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<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> @Test<a name="line.104"></a>
-<span class="sourceLineNo">105</span> public void testChildOnLastStepDoubleExecution() throws Exception {<a name="line.105"></a>
-<span class="sourceLineNo">106</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.107"></a>
-<span class="sourceLineNo">108</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId);<a name="line.108"></a>
-<span class="sourceLineNo">109</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.109"></a>
-<span class="sourceLineNo">110</span> assertEquals(0, procExecutor.getEnvironment().rollbackCount.get());<a name="line.110"></a>
-<span class="sourceLineNo">111</span> ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<a name="line.111"></a>
-<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span> @Test<a name="line.114"></a>
-<span class="sourceLineNo">115</span> public void testChildOnLastStepWithRollback() {<a name="line.115"></a>
-<span class="sourceLineNo">116</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.116"></a>
-<span class="sourceLineNo">117</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.117"></a>
-<span class="sourceLineNo">118</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.118"></a>
-<span class="sourceLineNo">119</span> assertEquals(3, procExecutor.getEnvironment().execCount.get());<a name="line.119"></a>
-<span class="sourceLineNo">120</span> assertEquals(3, procExecutor.getEnvironment().rollbackCount.get());<a name="line.120"></a>
-<span class="sourceLineNo">121</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.121"></a>
-<span class="sourceLineNo">122</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<a name="line.122"></a>
-<span class="sourceLineNo">123</span> }<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> @Test<a name="line.125"></a>
-<span class="sourceLineNo">126</span> public void testChildOnLastStepWithRollbackDoubleExecution() throws Exception {<a name="line.126"></a>
-<span class="sourceLineNo">127</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.128"></a>
-<span class="sourceLineNo">129</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.129"></a>
-<span class="sourceLineNo">130</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId, true);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.131"></a>
-<span class="sourceLineNo">132</span> assertEquals(6, procExecutor.getEnvironment().rollbackCount.get());<a name="line.132"></a>
-<span class="sourceLineNo">133</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.133"></a>
-<span class="sourceLineNo">134</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<a name="line.134"></a>
-<span class="sourceLineNo">135</span> }<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span> public enum TestSMProcedureState { STEP_1, STEP_2 };<a name="line.137"></a>
-<span class="sourceLineNo">138</span> public static class TestSMProcedure<a name="line.138"></a>
-<span class="sourceLineNo">139</span> extends StateMachineProcedure<TestProcEnv, TestSMProcedureState> {<a name="line.139"></a>
-<span class="sourceLineNo">140</span> protected Flow executeFromState(TestProcEnv env, TestSMProcedureState state) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span> LOG.info("EXEC " + state + " " + this);<a name="line.141"></a>
-<span class="sourceLineNo">142</span> env.execCount.incrementAndGet();<a name="line.142"></a>
-<span class="sourceLineNo">143</span> switch (state) {<a name="line.143"></a>
-<span class="sourceLineNo">144</span> case STEP_1:<a name="line.144"></a>
-<span class="sourceLineNo">145</span> setNextState(TestSMProcedureState.STEP_2);<a name="line.145"></a>
-<span class="sourceLineNo">146</span> break;<a name="line.146"></a>
-<span class="sourceLineNo">147</span> case STEP_2:<a name="line.147"></a>
-<span class="sourceLineNo">148</span> addChildProcedure(new SimpleChildProcedure());<a name="line.148"></a>
-<span class="sourceLineNo">149</span> return Flow.NO_MORE_STATE;<a name="line.149"></a>
-<span class="sourceLineNo">150</span> }<a name="line.150"></a>
-<span class="sourceLineNo">151</span> return Flow.HAS_MORE_STATE;<a name="line.151"></a>
-<span class="sourceLineNo">152</span> }<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span> protected void rollbackState(TestProcEnv env, TestSMProcedureState state) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> LOG.info("ROLLBACK " + state + " " + this);<a name="line.155"></a>
-<span class="sourceLineNo">156</span> env.rollbackCount.incrementAndGet();<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> protected TestSMProcedureState getState(int stateId) {<a name="line.159"></a>
-<span class="sourceLineNo">160</span> return TestSMProcedureState.values()[stateId];<a name="line.160"></a>
-<span class="sourceLineNo">161</span> }<a name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span> protected int getStateId(TestSMProcedureState state) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span> return state.ordinal();<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> protected TestSMProcedureState getInitialState() {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> return TestSMProcedureState.STEP_1;<a name="line.168"></a>
+<span class="sourceLineNo">096</span> public void testAbortStuckProcedure() throws InterruptedException {<a name="line.96"></a>
+<span class="sourceLineNo">097</span> try {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> procExecutor.getEnvironment().loop = true;<a name="line.98"></a>
+<span class="sourceLineNo">099</span> TestSMProcedure proc = new TestSMProcedure();<a name="line.99"></a>
+<span class="sourceLineNo">100</span> long procId = procExecutor.submitProcedure(proc);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> Thread.sleep(1000 + (int) (Math.random() * 4001));<a name="line.101"></a>
+<span class="sourceLineNo">102</span> proc.abort(procExecutor.getEnvironment());<a name="line.102"></a>
+<span class="sourceLineNo">103</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.103"></a>
+<span class="sourceLineNo">104</span> assertEquals(true, proc.isFailed());<a name="line.104"></a>
+<span class="sourceLineNo">105</span> } finally {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> procExecutor.getEnvironment().loop = false;<a name="line.106"></a>
+<span class="sourceLineNo">107</span> }<a name="line.107"></a>
+<span class="sourceLineNo">108</span> }<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span> @Test<a name="line.110"></a>
+<span class="sourceLineNo">111</span> public void testChildOnLastStep() {<a name="line.111"></a>
+<span class="sourceLineNo">112</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.112"></a>
+<span class="sourceLineNo">113</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.113"></a>
+<span class="sourceLineNo">114</span> assertEquals(3, procExecutor.getEnvironment().execCount.get());<a name="line.114"></a>
+<span class="sourceLineNo">115</span> assertEquals(0, procExecutor.getEnvironment().rollbackCount.get());<a name="line.115"></a>
+<span class="sourceLineNo">116</span> ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<a name="line.116"></a>
+<span class="sourceLineNo">117</span> }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> @Test<a name="line.119"></a>
+<span class="sourceLineNo">120</span> public void testChildOnLastStepDoubleExecution() throws Exception {<a name="line.120"></a>
+<span class="sourceLineNo">121</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.121"></a>
+<span class="sourceLineNo">122</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.122"></a>
+<span class="sourceLineNo">123</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId);<a name="line.123"></a>
+<span class="sourceLineNo">124</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.124"></a>
+<span class="sourceLineNo">125</span> assertEquals(0, procExecutor.getEnvironment().rollbackCount.get());<a name="line.125"></a>
+<span class="sourceLineNo">126</span> ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> }<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> @Test<a name="line.129"></a>
+<span class="sourceLineNo">130</span> public void testChildOnLastStepWithRollback() {<a name="line.130"></a>
+<span class="sourceLineNo">131</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.131"></a>
+<span class="sourceLineNo">132</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.132"></a>
+<span class="sourceLineNo">133</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.133"></a>
+<span class="sourceLineNo">134</span> assertEquals(3, procExecutor.getEnvironment().execCount.get());<a name="line.134"></a>
+<span class="sourceLineNo">135</span> assertEquals(3, procExecutor.getEnvironment().rollbackCount.get());<a name="line.135"></a>
+<span class="sourceLineNo">136</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.136"></a>
+<span class="sourceLineNo">137</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<a name="line.137"></a>
+<span class="sourceLineNo">138</span> }<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span> @Test<a name="line.140"></a>
+<span class="sourceLineNo">141</span> public void testChildOnLastStepWithRollbackDoubleExecution() throws Exception {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.142"></a>
+<span class="sourceLineNo">143</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.143"></a>
+<span class="sourceLineNo">144</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.144"></a>
+<span class="sourceLineNo">145</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId, true);<a name="line.145"></a>
+<span class="sourceLineNo">146</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.146"></a>
+<span class="sourceLineNo">147</span> assertEquals(6, procExecutor.getEnvironment().rollbackCount.get());<a name="line.147"></a>
+<span class="sourceLineNo">148</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.148"></a>
+<span class="sourceLineNo">149</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> }<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span> public enum TestSMProcedureState { STEP_1, STEP_2 };<a name="line.152"></a>
+<span class="sourceLineNo">153</span> public static class TestSMProcedure<a name="line.153"></a>
+<span class="sourceLineNo">154</span> extends StateMachineProcedure<TestProcEnv, TestSMProcedureState> {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> protected Flow executeFromState(TestProcEnv env, TestSMProcedureState state) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span> LOG.info("EXEC " + state + " " + this);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> env.execCount.incrementAndGet();<a name="line.157"></a>
+<span class="sourceLineNo">158</span> switch (state) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> case STEP_1:<a name="line.159"></a>
+<span class="sourceLineNo">160</span> if (!env.loop) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> setNextState(TestSMProcedureState.STEP_2);<a name="line.161"></a>
+<span class="sourceLineNo">162</span> }<a name="line.162"></a>
+<span class="sourceLineNo">163</span> break;<a name="line.163"></a>
+<span class="sourceLineNo">164</span> case STEP_2:<a name="line.164"></a>
+<span class="sourceLineNo">165</span> addChildProcedure(new SimpleChildProcedure());<a name="line.165"></a>
+<span class="sourceLineNo">166</span> return Flow.NO_MORE_STATE;<a name="line.166"></a>
+<span class="sourceLineNo">167</span> }<a name="line.167"></a>
+<span class="sourceLineNo">168</span> return Flow.HAS_MORE_STATE;<a name="line.168"></a>
<span class="sourceLineNo">169</span> }<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> public static class SimpleChildProcedure extends NoopProcedure<TestProcEnv> {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> protected Procedure[] execute(TestProcEnv env) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span> LOG.info("EXEC " + this);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> env.execCount.incrementAndGet();<a name="line.175"></a>
-<span class="sourceLineNo">176</span> if (env.triggerChildRollback) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> setFailure("test-failure", TEST_FAILURE_EXCEPTION);<a name="line.177"></a>
-<span class="sourceLineNo">178</span> }<a name="line.178"></a>
-<span class="sourceLineNo">179</span> return null;<a name="line.179"></a>
-<span class="sourceLineNo">180</span> }<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span> @Override<a name="line.182"></a>
-<span class="sourceLineNo">183</span> protected void rollback(TestProcEnv env) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span> LOG.info("ROLLBACK " + this);<a name="line.184"></a>
-<span class="sourceLineNo">185</span> env.rollbackCount.incrementAndGet();<a name="line.185"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span> protected void rollbackState(TestProcEnv env, TestSMProcedureState state) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> LOG.info("ROLLBACK " + state + " " + this);<a name="line.172"></a>
+<span class="sourceLineNo">173</span> env.rollbackCount.incrementAndGet();<a name="line.173"></a>
+<span class="sourceLineNo">174</span> }<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span> protected TestSMProcedureState getState(int stateId) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span> return TestSMProcedureState.values()[stateId];<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span><a name="line.179"></a>
+<span class="sourceLineNo">180</span> protected int getStateId(TestSMProcedureState state) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> return state.ordinal();<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span> protected TestSMProcedureState getInitialState() {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> return TestSMProcedureState.STEP_1;<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><a name="line.188"></a>
-<span class="sourceLineNo">189</span> public class TestProcEnv {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> AtomicInteger execCount = new AtomicInteger(0);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> AtomicInteger rollbackCount = new AtomicInteger(0);<a name="line.191"></a>
-<span class="sourceLineNo">192</span> boolean triggerChildRollback = false;<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">189</span> public static class SimpleChildProcedure extends NoopProcedure<TestProcEnv> {<a name="line.189"></a>
+<span class="sourceLineNo">190</span> protected Procedure[] execute(TestProcEnv env) {<a name="line.190"></a>
+<span class="sourceLineNo">191</span> LOG.info("EXEC " + this);<a name="line.191"></a>
+<span class="sourceLineNo">192</span> env.execCount.incrementAndGet();<a name="line.192"></a>
+<span class="sourceLineNo">193</span> if (env.triggerChildRollback) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> setFailure("test-failure", TEST_FAILURE_EXCEPTION);<a name="line.194"></a>
+<span class="sourceLineNo">195</span> }<a name="line.195"></a>
+<span class="sourceLineNo">196</span> return null;<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> @Override<a name="line.199"></a>
+<span class="sourceLineNo">200</span> protected void rollback(TestProcEnv env) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> LOG.info("ROLLBACK " + this);<a name="line.201"></a>
+<span class="sourceLineNo">202</span> env.rollbackCount.incrementAndGet();<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><a name="line.205"></a>
+<span class="sourceLineNo">206</span> public class TestProcEnv {<a name="line.206"></a>
+<span class="sourceLineNo">207</span> AtomicInteger execCount = new AtomicInteger(0);<a name="line.207"></a>
+<span class="sourceLineNo">208</span> AtomicInteger rollbackCount = new AtomicInteger(0);<a name="line.208"></a>
+<span class="sourceLineNo">209</span> boolean triggerChildRollback = false;<a name="line.209"></a>
+<span class="sourceLineNo">210</span> boolean loop = false;<a name="line.210"></a>
+<span class="sourceLineNo">211</span> }<a name="line.211"></a>
+<span class="sourceLineNo">212</span>}<a name="line.212"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/986c93ca/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html
index 9e2d08d..60a7ac6 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.TestSMProcedureState.html
@@ -101,105 +101,123 @@
<span class="sourceLineNo">093</span> }<a name="line.93"></a>
<span class="sourceLineNo">094</span><a name="line.94"></a>
<span class="sourceLineNo">095</span> @Test<a name="line.95"></a>
-<span class="sourceLineNo">096</span> public void testChildOnLastStep() {<a name="line.96"></a>
-<span class="sourceLineNo">097</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.97"></a>
-<span class="sourceLineNo">098</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.98"></a>
-<span class="sourceLineNo">099</span> assertEquals(3, procExecutor.getEnvironment().execCount.get());<a name="line.99"></a>
-<span class="sourceLineNo">100</span> assertEquals(0, procExecutor.getEnvironment().rollbackCount.get());<a name="line.100"></a>
-<span class="sourceLineNo">101</span> ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<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> @Test<a name="line.104"></a>
-<span class="sourceLineNo">105</span> public void testChildOnLastStepDoubleExecution() throws Exception {<a name="line.105"></a>
-<span class="sourceLineNo">106</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.107"></a>
-<span class="sourceLineNo">108</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId);<a name="line.108"></a>
-<span class="sourceLineNo">109</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.109"></a>
-<span class="sourceLineNo">110</span> assertEquals(0, procExecutor.getEnvironment().rollbackCount.get());<a name="line.110"></a>
-<span class="sourceLineNo">111</span> ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<a name="line.111"></a>
-<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span> @Test<a name="line.114"></a>
-<span class="sourceLineNo">115</span> public void testChildOnLastStepWithRollback() {<a name="line.115"></a>
-<span class="sourceLineNo">116</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.116"></a>
-<span class="sourceLineNo">117</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.117"></a>
-<span class="sourceLineNo">118</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.118"></a>
-<span class="sourceLineNo">119</span> assertEquals(3, procExecutor.getEnvironment().execCount.get());<a name="line.119"></a>
-<span class="sourceLineNo">120</span> assertEquals(3, procExecutor.getEnvironment().rollbackCount.get());<a name="line.120"></a>
-<span class="sourceLineNo">121</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.121"></a>
-<span class="sourceLineNo">122</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<a name="line.122"></a>
-<span class="sourceLineNo">123</span> }<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> @Test<a name="line.125"></a>
-<span class="sourceLineNo">126</span> public void testChildOnLastStepWithRollbackDoubleExecution() throws Exception {<a name="line.126"></a>
-<span class="sourceLineNo">127</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.128"></a>
-<span class="sourceLineNo">129</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.129"></a>
-<span class="sourceLineNo">130</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId, true);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.131"></a>
-<span class="sourceLineNo">132</span> assertEquals(6, procExecutor.getEnvironment().rollbackCount.get());<a name="line.132"></a>
-<span class="sourceLineNo">133</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.133"></a>
-<span class="sourceLineNo">134</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<a name="line.134"></a>
-<span class="sourceLineNo">135</span> }<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span> public enum TestSMProcedureState { STEP_1, STEP_2 };<a name="line.137"></a>
-<span class="sourceLineNo">138</span> public static class TestSMProcedure<a name="line.138"></a>
-<span class="sourceLineNo">139</span> extends StateMachineProcedure<TestProcEnv, TestSMProcedureState> {<a name="line.139"></a>
-<span class="sourceLineNo">140</span> protected Flow executeFromState(TestProcEnv env, TestSMProcedureState state) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span> LOG.info("EXEC " + state + " " + this);<a name="line.141"></a>
-<span class="sourceLineNo">142</span> env.execCount.incrementAndGet();<a name="line.142"></a>
-<span class="sourceLineNo">143</span> switch (state) {<a name="line.143"></a>
-<span class="sourceLineNo">144</span> case STEP_1:<a name="line.144"></a>
-<span class="sourceLineNo">145</span> setNextState(TestSMProcedureState.STEP_2);<a name="line.145"></a>
-<span class="sourceLineNo">146</span> break;<a name="line.146"></a>
-<span class="sourceLineNo">147</span> case STEP_2:<a name="line.147"></a>
-<span class="sourceLineNo">148</span> addChildProcedure(new SimpleChildProcedure());<a name="line.148"></a>
-<span class="sourceLineNo">149</span> return Flow.NO_MORE_STATE;<a name="line.149"></a>
-<span class="sourceLineNo">150</span> }<a name="line.150"></a>
-<span class="sourceLineNo">151</span> return Flow.HAS_MORE_STATE;<a name="line.151"></a>
-<span class="sourceLineNo">152</span> }<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span> protected void rollbackState(TestProcEnv env, TestSMProcedureState state) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> LOG.info("ROLLBACK " + state + " " + this);<a name="line.155"></a>
-<span class="sourceLineNo">156</span> env.rollbackCount.incrementAndGet();<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> protected TestSMProcedureState getState(int stateId) {<a name="line.159"></a>
-<span class="sourceLineNo">160</span> return TestSMProcedureState.values()[stateId];<a name="line.160"></a>
-<span class="sourceLineNo">161</span> }<a name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span> protected int getStateId(TestSMProcedureState state) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span> return state.ordinal();<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> protected TestSMProcedureState getInitialState() {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> return TestSMProcedureState.STEP_1;<a name="line.168"></a>
+<span class="sourceLineNo">096</span> public void testAbortStuckProcedure() throws InterruptedException {<a name="line.96"></a>
+<span class="sourceLineNo">097</span> try {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> procExecutor.getEnvironment().loop = true;<a name="line.98"></a>
+<span class="sourceLineNo">099</span> TestSMProcedure proc = new TestSMProcedure();<a name="line.99"></a>
+<span class="sourceLineNo">100</span> long procId = procExecutor.submitProcedure(proc);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> Thread.sleep(1000 + (int) (Math.random() * 4001));<a name="line.101"></a>
+<span class="sourceLineNo">102</span> proc.abort(procExecutor.getEnvironment());<a name="line.102"></a>
+<span class="sourceLineNo">103</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.103"></a>
+<span class="sourceLineNo">104</span> assertEquals(true, proc.isFailed());<a name="line.104"></a>
+<span class="sourceLineNo">105</span> } finally {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> procExecutor.getEnvironment().loop = false;<a name="line.106"></a>
+<span class="sourceLineNo">107</span> }<a name="line.107"></a>
+<span class="sourceLineNo">108</span> }<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span> @Test<a name="line.110"></a>
+<span class="sourceLineNo">111</span> public void testChildOnLastStep() {<a name="line.111"></a>
+<span class="sourceLineNo">112</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.112"></a>
+<span class="sourceLineNo">113</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.113"></a>
+<span class="sourceLineNo">114</span> assertEquals(3, procExecutor.getEnvironment().execCount.get());<a name="line.114"></a>
+<span class="sourceLineNo">115</span> assertEquals(0, procExecutor.getEnvironment().rollbackCount.get());<a name="line.115"></a>
+<span class="sourceLineNo">116</span> ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<a name="line.116"></a>
+<span class="sourceLineNo">117</span> }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> @Test<a name="line.119"></a>
+<span class="sourceLineNo">120</span> public void testChildOnLastStepDoubleExecution() throws Exception {<a name="line.120"></a>
+<span class="sourceLineNo">121</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.121"></a>
+<span class="sourceLineNo">122</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.122"></a>
+<span class="sourceLineNo">123</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId);<a name="line.123"></a>
+<span class="sourceLineNo">124</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.124"></a>
+<span class="sourceLineNo">125</span> assertEquals(0, procExecutor.getEnvironment().rollbackCount.get());<a name="line.125"></a>
+<span class="sourceLineNo">126</span> ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> }<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> @Test<a name="line.129"></a>
+<span class="sourceLineNo">130</span> public void testChildOnLastStepWithRollback() {<a name="line.130"></a>
+<span class="sourceLineNo">131</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.131"></a>
+<span class="sourceLineNo">132</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.132"></a>
+<span class="sourceLineNo">133</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.133"></a>
+<span class="sourceLineNo">134</span> assertEquals(3, procExecutor.getEnvironment().execCount.get());<a name="line.134"></a>
+<span class="sourceLineNo">135</span> assertEquals(3, procExecutor.getEnvironment().rollbackCount.get());<a name="line.135"></a>
+<span class="sourceLineNo">136</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.136"></a>
+<span class="sourceLineNo">137</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<a name="line.137"></a>
+<span class="sourceLineNo">138</span> }<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span> @Test<a name="line.140"></a>
+<span class="sourceLineNo">141</span> public void testChildOnLastStepWithRollbackDoubleExecution() throws Exception {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.142"></a>
+<span class="sourceLineNo">143</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.143"></a>
+<span class="sourceLineNo">144</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.144"></a>
+<span class="sourceLineNo">145</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId, true);<a name="line.145"></a>
+<span class="sourceLineNo">146</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.146"></a>
+<span class="sourceLineNo">147</span> assertEquals(6, procExecutor.getEnvironment().rollbackCount.get());<a name="line.147"></a>
+<span class="sourceLineNo">148</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.148"></a>
+<span class="sourceLineNo">149</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> }<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span> public enum TestSMProcedureState { STEP_1, STEP_2 };<a name="line.152"></a>
+<span class="sourceLineNo">153</span> public static class TestSMProcedure<a name="line.153"></a>
+<span class="sourceLineNo">154</span> extends StateMachineProcedure<TestProcEnv, TestSMProcedureState> {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> protected Flow executeFromState(TestProcEnv env, TestSMProcedureState state) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span> LOG.info("EXEC " + state + " " + this);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> env.execCount.incrementAndGet();<a name="line.157"></a>
+<span class="sourceLineNo">158</span> switch (state) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> case STEP_1:<a name="line.159"></a>
+<span class="sourceLineNo">160</span> if (!env.loop) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> setNextState(TestSMProcedureState.STEP_2);<a name="line.161"></a>
+<span class="sourceLineNo">162</span> }<a name="line.162"></a>
+<span class="sourceLineNo">163</span> break;<a name="line.163"></a>
+<span class="sourceLineNo">164</span> case STEP_2:<a name="line.164"></a>
+<span class="sourceLineNo">165</span> addChildProcedure(new SimpleChildProcedure());<a name="line.165"></a>
+<span class="sourceLineNo">166</span> return Flow.NO_MORE_STATE;<a name="line.166"></a>
+<span class="sourceLineNo">167</span> }<a name="line.167"></a>
+<span class="sourceLineNo">168</span> return Flow.HAS_MORE_STATE;<a name="line.168"></a>
<span class="sourceLineNo">169</span> }<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> public static class SimpleChildProcedure extends NoopProcedure<TestProcEnv> {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> protected Procedure[] execute(TestProcEnv env) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span> LOG.info("EXEC " + this);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> env.execCount.incrementAndGet();<a name="line.175"></a>
-<span class="sourceLineNo">176</span> if (env.triggerChildRollback) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> setFailure("test-failure", TEST_FAILURE_EXCEPTION);<a name="line.177"></a>
-<span class="sourceLineNo">178</span> }<a name="line.178"></a>
-<span class="sourceLineNo">179</span> return null;<a name="line.179"></a>
-<span class="sourceLineNo">180</span> }<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span> @Override<a name="line.182"></a>
-<span class="sourceLineNo">183</span> protected void rollback(TestProcEnv env) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span> LOG.info("ROLLBACK " + this);<a name="line.184"></a>
-<span class="sourceLineNo">185</span> env.rollbackCount.incrementAndGet();<a name="line.185"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span> protected void rollbackState(TestProcEnv env, TestSMProcedureState state) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> LOG.info("ROLLBACK " + state + " " + this);<a name="line.172"></a>
+<span class="sourceLineNo">173</span> env.rollbackCount.incrementAndGet();<a name="line.173"></a>
+<span class="sourceLineNo">174</span> }<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span> protected TestSMProcedureState getState(int stateId) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span> return TestSMProcedureState.values()[stateId];<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span><a name="line.179"></a>
+<span class="sourceLineNo">180</span> protected int getStateId(TestSMProcedureState state) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> return state.ordinal();<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span> protected TestSMProcedureState getInitialState() {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> return TestSMProcedureState.STEP_1;<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><a name="line.188"></a>
-<span class="sourceLineNo">189</span> public class TestProcEnv {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> AtomicInteger execCount = new AtomicInteger(0);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> AtomicInteger rollbackCount = new AtomicInteger(0);<a name="line.191"></a>
-<span class="sourceLineNo">192</span> boolean triggerChildRollback = false;<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">189</span> public static class SimpleChildProcedure extends NoopProcedure<TestProcEnv> {<a name="line.189"></a>
+<span class="sourceLineNo">190</span> protected Procedure[] execute(TestProcEnv env) {<a name="line.190"></a>
+<span class="sourceLineNo">191</span> LOG.info("EXEC " + this);<a name="line.191"></a>
+<span class="sourceLineNo">192</span> env.execCount.incrementAndGet();<a name="line.192"></a>
+<span class="sourceLineNo">193</span> if (env.triggerChildRollback) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> setFailure("test-failure", TEST_FAILURE_EXCEPTION);<a name="line.194"></a>
+<span class="sourceLineNo">195</span> }<a name="line.195"></a>
+<span class="sourceLineNo">196</span> return null;<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> @Override<a name="line.199"></a>
+<span class="sourceLineNo">200</span> protected void rollback(TestProcEnv env) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> LOG.info("ROLLBACK " + this);<a name="line.201"></a>
+<span class="sourceLineNo">202</span> env.rollbackCount.incrementAndGet();<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><a name="line.205"></a>
+<span class="sourceLineNo">206</span> public class TestProcEnv {<a name="line.206"></a>
+<span class="sourceLineNo">207</span> AtomicInteger execCount = new AtomicInteger(0);<a name="line.207"></a>
+<span class="sourceLineNo">208</span> AtomicInteger rollbackCount = new AtomicInteger(0);<a name="line.208"></a>
+<span class="sourceLineNo">209</span> boolean triggerChildRollback = false;<a name="line.209"></a>
+<span class="sourceLineNo">210</span> boolean loop = false;<a name="line.210"></a>
+<span class="sourceLineNo">211</span> }<a name="line.211"></a>
+<span class="sourceLineNo">212</span>}<a name="line.212"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/986c93ca/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.html
index 9e2d08d..60a7ac6 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.html
@@ -101,105 +101,123 @@
<span class="sourceLineNo">093</span> }<a name="line.93"></a>
<span class="sourceLineNo">094</span><a name="line.94"></a>
<span class="sourceLineNo">095</span> @Test<a name="line.95"></a>
-<span class="sourceLineNo">096</span> public void testChildOnLastStep() {<a name="line.96"></a>
-<span class="sourceLineNo">097</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.97"></a>
-<span class="sourceLineNo">098</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.98"></a>
-<span class="sourceLineNo">099</span> assertEquals(3, procExecutor.getEnvironment().execCount.get());<a name="line.99"></a>
-<span class="sourceLineNo">100</span> assertEquals(0, procExecutor.getEnvironment().rollbackCount.get());<a name="line.100"></a>
-<span class="sourceLineNo">101</span> ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<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> @Test<a name="line.104"></a>
-<span class="sourceLineNo">105</span> public void testChildOnLastStepDoubleExecution() throws Exception {<a name="line.105"></a>
-<span class="sourceLineNo">106</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.107"></a>
-<span class="sourceLineNo">108</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId);<a name="line.108"></a>
-<span class="sourceLineNo">109</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.109"></a>
-<span class="sourceLineNo">110</span> assertEquals(0, procExecutor.getEnvironment().rollbackCount.get());<a name="line.110"></a>
-<span class="sourceLineNo">111</span> ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<a name="line.111"></a>
-<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span> @Test<a name="line.114"></a>
-<span class="sourceLineNo">115</span> public void testChildOnLastStepWithRollback() {<a name="line.115"></a>
-<span class="sourceLineNo">116</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.116"></a>
-<span class="sourceLineNo">117</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.117"></a>
-<span class="sourceLineNo">118</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.118"></a>
-<span class="sourceLineNo">119</span> assertEquals(3, procExecutor.getEnvironment().execCount.get());<a name="line.119"></a>
-<span class="sourceLineNo">120</span> assertEquals(3, procExecutor.getEnvironment().rollbackCount.get());<a name="line.120"></a>
-<span class="sourceLineNo">121</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.121"></a>
-<span class="sourceLineNo">122</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<a name="line.122"></a>
-<span class="sourceLineNo">123</span> }<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> @Test<a name="line.125"></a>
-<span class="sourceLineNo">126</span> public void testChildOnLastStepWithRollbackDoubleExecution() throws Exception {<a name="line.126"></a>
-<span class="sourceLineNo">127</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.127"></a>
-<span class="sourceLineNo">128</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.128"></a>
-<span class="sourceLineNo">129</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.129"></a>
-<span class="sourceLineNo">130</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId, true);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.131"></a>
-<span class="sourceLineNo">132</span> assertEquals(6, procExecutor.getEnvironment().rollbackCount.get());<a name="line.132"></a>
-<span class="sourceLineNo">133</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.133"></a>
-<span class="sourceLineNo">134</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<a name="line.134"></a>
-<span class="sourceLineNo">135</span> }<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span> public enum TestSMProcedureState { STEP_1, STEP_2 };<a name="line.137"></a>
-<span class="sourceLineNo">138</span> public static class TestSMProcedure<a name="line.138"></a>
-<span class="sourceLineNo">139</span> extends StateMachineProcedure<TestProcEnv, TestSMProcedureState> {<a name="line.139"></a>
-<span class="sourceLineNo">140</span> protected Flow executeFromState(TestProcEnv env, TestSMProcedureState state) {<a name="line.140"></a>
-<span class="sourceLineNo">141</span> LOG.info("EXEC " + state + " " + this);<a name="line.141"></a>
-<span class="sourceLineNo">142</span> env.execCount.incrementAndGet();<a name="line.142"></a>
-<span class="sourceLineNo">143</span> switch (state) {<a name="line.143"></a>
-<span class="sourceLineNo">144</span> case STEP_1:<a name="line.144"></a>
-<span class="sourceLineNo">145</span> setNextState(TestSMProcedureState.STEP_2);<a name="line.145"></a>
-<span class="sourceLineNo">146</span> break;<a name="line.146"></a>
-<span class="sourceLineNo">147</span> case STEP_2:<a name="line.147"></a>
-<span class="sourceLineNo">148</span> addChildProcedure(new SimpleChildProcedure());<a name="line.148"></a>
-<span class="sourceLineNo">149</span> return Flow.NO_MORE_STATE;<a name="line.149"></a>
-<span class="sourceLineNo">150</span> }<a name="line.150"></a>
-<span class="sourceLineNo">151</span> return Flow.HAS_MORE_STATE;<a name="line.151"></a>
-<span class="sourceLineNo">152</span> }<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span> protected void rollbackState(TestProcEnv env, TestSMProcedureState state) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span> LOG.info("ROLLBACK " + state + " " + this);<a name="line.155"></a>
-<span class="sourceLineNo">156</span> env.rollbackCount.incrementAndGet();<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> protected TestSMProcedureState getState(int stateId) {<a name="line.159"></a>
-<span class="sourceLineNo">160</span> return TestSMProcedureState.values()[stateId];<a name="line.160"></a>
-<span class="sourceLineNo">161</span> }<a name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span> protected int getStateId(TestSMProcedureState state) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span> return state.ordinal();<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> protected TestSMProcedureState getInitialState() {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> return TestSMProcedureState.STEP_1;<a name="line.168"></a>
+<span class="sourceLineNo">096</span> public void testAbortStuckProcedure() throws InterruptedException {<a name="line.96"></a>
+<span class="sourceLineNo">097</span> try {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> procExecutor.getEnvironment().loop = true;<a name="line.98"></a>
+<span class="sourceLineNo">099</span> TestSMProcedure proc = new TestSMProcedure();<a name="line.99"></a>
+<span class="sourceLineNo">100</span> long procId = procExecutor.submitProcedure(proc);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> Thread.sleep(1000 + (int) (Math.random() * 4001));<a name="line.101"></a>
+<span class="sourceLineNo">102</span> proc.abort(procExecutor.getEnvironment());<a name="line.102"></a>
+<span class="sourceLineNo">103</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.103"></a>
+<span class="sourceLineNo">104</span> assertEquals(true, proc.isFailed());<a name="line.104"></a>
+<span class="sourceLineNo">105</span> } finally {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> procExecutor.getEnvironment().loop = false;<a name="line.106"></a>
+<span class="sourceLineNo">107</span> }<a name="line.107"></a>
+<span class="sourceLineNo">108</span> }<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span> @Test<a name="line.110"></a>
+<span class="sourceLineNo">111</span> public void testChildOnLastStep() {<a name="line.111"></a>
+<span class="sourceLineNo">112</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.112"></a>
+<span class="sourceLineNo">113</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.113"></a>
+<span class="sourceLineNo">114</span> assertEquals(3, procExecutor.getEnvironment().execCount.get());<a name="line.114"></a>
+<span class="sourceLineNo">115</span> assertEquals(0, procExecutor.getEnvironment().rollbackCount.get());<a name="line.115"></a>
+<span class="sourceLineNo">116</span> ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<a name="line.116"></a>
+<span class="sourceLineNo">117</span> }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> @Test<a name="line.119"></a>
+<span class="sourceLineNo">120</span> public void testChildOnLastStepDoubleExecution() throws Exception {<a name="line.120"></a>
+<span class="sourceLineNo">121</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.121"></a>
+<span class="sourceLineNo">122</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.122"></a>
+<span class="sourceLineNo">123</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId);<a name="line.123"></a>
+<span class="sourceLineNo">124</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.124"></a>
+<span class="sourceLineNo">125</span> assertEquals(0, procExecutor.getEnvironment().rollbackCount.get());<a name="line.125"></a>
+<span class="sourceLineNo">126</span> ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> }<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> @Test<a name="line.129"></a>
+<span class="sourceLineNo">130</span> public void testChildOnLastStepWithRollback() {<a name="line.130"></a>
+<span class="sourceLineNo">131</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.131"></a>
+<span class="sourceLineNo">132</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.132"></a>
+<span class="sourceLineNo">133</span> ProcedureTestingUtility.waitProcedure(procExecutor, procId);<a name="line.133"></a>
+<span class="sourceLineNo">134</span> assertEquals(3, procExecutor.getEnvironment().execCount.get());<a name="line.134"></a>
+<span class="sourceLineNo">135</span> assertEquals(3, procExecutor.getEnvironment().rollbackCount.get());<a name="line.135"></a>
+<span class="sourceLineNo">136</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.136"></a>
+<span class="sourceLineNo">137</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<a name="line.137"></a>
+<span class="sourceLineNo">138</span> }<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span> @Test<a name="line.140"></a>
+<span class="sourceLineNo">141</span> public void testChildOnLastStepWithRollbackDoubleExecution() throws Exception {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> procExecutor.getEnvironment().triggerChildRollback = true;<a name="line.142"></a>
+<span class="sourceLineNo">143</span> ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, true);<a name="line.143"></a>
+<span class="sourceLineNo">144</span> long procId = procExecutor.submitProcedure(new TestSMProcedure());<a name="line.144"></a>
+<span class="sourceLineNo">145</span> ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId, true);<a name="line.145"></a>
+<span class="sourceLineNo">146</span> assertEquals(6, procExecutor.getEnvironment().execCount.get());<a name="line.146"></a>
+<span class="sourceLineNo">147</span> assertEquals(6, procExecutor.getEnvironment().rollbackCount.get());<a name="line.147"></a>
+<span class="sourceLineNo">148</span> Throwable cause = ProcedureTestingUtility.assertProcFailed(procExecutor, procId);<a name="line.148"></a>
+<span class="sourceLineNo">149</span> assertEquals(TEST_FAILURE_EXCEPTION, cause);<a name="line.149"></a>
+<span class="sourceLineNo">150</span> }<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span> public enum TestSMProcedureState { STEP_1, STEP_2 };<a name="line.152"></a>
+<span class="sourceLineNo">153</span> public static class TestSMProcedure<a name="line.153"></a>
+<span class="sourceLineNo">154</span> extends StateMachineProcedure<TestProcEnv, TestSMProcedureState> {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> protected Flow executeFromState(TestProcEnv env, TestSMProcedureState state) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span> LOG.info("EXEC " + state + " " + this);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> env.execCount.incrementAndGet();<a name="line.157"></a>
+<span class="sourceLineNo">158</span> switch (state) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> case STEP_1:<a name="line.159"></a>
+<span class="sourceLineNo">160</span> if (!env.loop) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> setNextState(TestSMProcedureState.STEP_2);<a name="line.161"></a>
+<span class="sourceLineNo">162</span> }<a name="line.162"></a>
+<span class="sourceLineNo">163</span> break;<a name="line.163"></a>
+<span class="sourceLineNo">164</span> case STEP_2:<a name="line.164"></a>
+<span class="sourceLineNo">165</span> addChildProcedure(new SimpleChildProcedure());<a name="line.165"></a>
+<span class="sourceLineNo">166</span> return Flow.NO_MORE_STATE;<a name="line.166"></a>
+<span class="sourceLineNo">167</span> }<a name="line.167"></a>
+<span class="sourceLineNo">168</span> return Flow.HAS_MORE_STATE;<a name="line.168"></a>
<span class="sourceLineNo">169</span> }<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> public static class SimpleChildProcedure extends NoopProcedure<TestProcEnv> {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> protected Procedure[] execute(TestProcEnv env) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span> LOG.info("EXEC " + this);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> env.execCount.incrementAndGet();<a name="line.175"></a>
-<span class="sourceLineNo">176</span> if (env.triggerChildRollback) {<a name="line.176"></a>
-<span class="sourceLineNo">177</span> setFailure("test-failure", TEST_FAILURE_EXCEPTION);<a name="line.177"></a>
-<span class="sourceLineNo">178</span> }<a name="line.178"></a>
-<span class="sourceLineNo">179</span> return null;<a name="line.179"></a>
-<span class="sourceLineNo">180</span> }<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span> @Override<a name="line.182"></a>
-<span class="sourceLineNo">183</span> protected void rollback(TestProcEnv env) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span> LOG.info("ROLLBACK " + this);<a name="line.184"></a>
-<span class="sourceLineNo">185</span> env.rollbackCount.incrementAndGet();<a name="line.185"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span> protected void rollbackState(TestProcEnv env, TestSMProcedureState state) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> LOG.info("ROLLBACK " + state + " " + this);<a name="line.172"></a>
+<span class="sourceLineNo">173</span> env.rollbackCount.incrementAndGet();<a name="line.173"></a>
+<span class="sourceLineNo">174</span> }<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span> protected TestSMProcedureState getState(int stateId) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span> return TestSMProcedureState.values()[stateId];<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span><a name="line.179"></a>
+<span class="sourceLineNo">180</span> protected int getStateId(TestSMProcedureState state) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> return state.ordinal();<a name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span><a name="line.183"></a>
+<span class="sourceLineNo">184</span> protected TestSMProcedureState getInitialState() {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> return TestSMProcedureState.STEP_1;<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><a name="line.188"></a>
-<span class="sourceLineNo">189</span> public class TestProcEnv {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> AtomicInteger execCount = new AtomicInteger(0);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> AtomicInteger rollbackCount = new AtomicInteger(0);<a name="line.191"></a>
-<span class="sourceLineNo">192</span> boolean triggerChildRollback = false;<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">189</span> public static class SimpleChildProcedure extends NoopProcedure<TestProcEnv> {<a name="line.189"></a>
+<span class="sourceLineNo">190</span> protected Procedure[] execute(TestProcEnv env) {<a name="line.190"></a>
+<span class="sourceLineNo">191</span> LOG.info("EXEC " + this);<a name="line.191"></a>
+<span class="sourceLineNo">192</span> env.execCount.incrementAndGet();<a name="line.192"></a>
+<span class="sourceLineNo">193</span> if (env.triggerChildRollback) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> setFailure("test-failure", TEST_FAILURE_EXCEPTION);<a name="line.194"></a>
+<span class="sourceLineNo">195</span> }<a name="line.195"></a>
+<span class="sourceLineNo">196</span> return null;<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> @Override<a name="line.199"></a>
+<span class="sourceLineNo">200</span> protected void rollback(TestProcEnv env) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> LOG.info("ROLLBACK " + this);<a name="line.201"></a>
+<span class="sourceLineNo">202</span> env.rollbackCount.incrementAndGet();<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><a name="line.205"></a>
+<span class="sourceLineNo">206</span> public class TestProcEnv {<a name="line.206"></a>
+<span class="sourceLineNo">207</span> AtomicInteger execCount = new AtomicInteger(0);<a name="line.207"></a>
+<span class="sourceLineNo">208</span> AtomicInteger rollbackCount = new AtomicInteger(0);<a name="line.208"></a>
+<span class="sourceLineNo">209</span> boolean triggerChildRollback = false;<a name="line.209"></a>
+<span class="sourceLineNo">210</span> boolean loop = false;<a name="line.210"></a>
+<span class="sourceLineNo">211</span> }<a name="line.211"></a>
+<span class="sourceLineNo">212</span>}<a name="line.212"></a>