Repository: hbase-site
Updated Branches:
  refs/heads/asf-site d682c43d8 -> 3b0a06ec3


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3b0a06ec/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestChildProcedures.TestChildProcedure.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestChildProcedures.TestChildProcedure.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestChildProcedures.TestChildProcedure.html
index 380fb36..07ae748 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestChildProcedures.TestChildProcedure.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestChildProcedures.TestChildProcedure.html
@@ -117,93 +117,120 @@
 <span class="sourceLineNo">109</span>    
ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<a 
name="line.109"></a>
 <span class="sourceLineNo">110</span>  }<a name="line.110"></a>
 <span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span>  @Test<a name="line.112"></a>
-<span class="sourceLineNo">113</span>  public void testChildRollbackLoad() 
throws Exception {<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    procEnv.toggleKillBeforeStoreUpdate = 
false;<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    procEnv.triggerRollbackOnChild = 
true;<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>    TestRootProcedure proc = new 
TestRootProcedure();<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExecutor, proc);<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>    
ProcedureTestingUtility.restart(procExecutor);<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    
ProcedureTestingUtility.waitProcedure(procExecutor, proc);<a 
name="line.120"></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 the state setting that happens 
after store to WAL; in particular the bit where we<a name="line.114"></a>
+<span class="sourceLineNo">115</span>   * set the parent runnable again after 
its children have all completed successfully.<a name="line.115"></a>
+<span class="sourceLineNo">116</span>   * See HBASE-20978.<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>   */<a name="line.117"></a>
+<span class="sourceLineNo">118</span>  @Test<a name="line.118"></a>
+<span class="sourceLineNo">119</span>  public void 
testChildLoadWithRestartAfterChildSuccess() throws Exception {<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>    procEnv.toggleKillAfterStoreUpdate = 
true;<a name="line.120"></a>
 <span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span>    assertProcFailed(procId);<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 
testChildRollbackLoadWithSteppedRestart() throws Exception {<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>    procEnv.toggleKillBeforeStoreUpdate = 
true;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    procEnv.triggerRollbackOnChild = 
true;<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>    TestRootProcedure proc = new 
TestRootProcedure();<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExecutor, proc);<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>    int restartCount = 0;<a 
name="line.132"></a>
-<span class="sourceLineNo">133</span>    while 
(!procExecutor.isFinished(procId)) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      
ProcedureTestingUtility.restart(procExecutor);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      
ProcedureTestingUtility.waitProcedure(procExecutor, proc);<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>      restartCount++;<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>    }<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    assertEquals(2, restartCount);<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>    assertProcFailed(procId);<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>  private void assertProcFailed(long 
procId) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    assertTrue("expected completed proc", 
procExecutor.isFinished(procId));<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    Procedure&lt;?&gt; result = 
procExecutor.getResult(procId);<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    assertEquals(true, 
result.isFailed());<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    
LOG.info(result.getException().getMessage());<a name="line.146"></a>
-<span class="sourceLineNo">147</span>  }<a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span>  public static class TestRootProcedure 
extends SequentialProcedure&lt;TestProcEnv&gt; {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    public TestRootProcedure() {}<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>    @Override<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    public Procedure[] 
execute(TestProcEnv env) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      if 
(env.toggleKillBeforeStoreUpdate) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>        
ProcedureTestingUtility.toggleKillBeforeStoreUpdate(procExecutor);<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>      }<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      return new Procedure[] { new 
TestChildProcedure(), new TestChildProcedure() };<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    }<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>    @Override<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    public void rollback(TestProcEnv env) 
{<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    }<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>    @Override<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    public boolean abort(TestProcEnv env) 
{<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      return false;<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    }<a name="line.167"></a>
-<span class="sourceLineNo">168</span>  }<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span>  public static class TestChildProcedure 
extends SequentialProcedure&lt;TestProcEnv&gt; {<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    public TestChildProcedure() {}<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span>    @Override<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    public Procedure[] 
execute(TestProcEnv env) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>      if 
(env.toggleKillBeforeStoreUpdate) {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>        
ProcedureTestingUtility.toggleKillBeforeStoreUpdate(procExecutor);<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>      }<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      if (env.triggerRollbackOnChild) {<a 
name="line.178"></a>
-<span class="sourceLineNo">179</span>        setFailure("test", new 
Exception("test"));<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      }<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      return null;<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>    @Override<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    public void rollback(TestProcEnv env) 
{<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>    public boolean abort(TestProcEnv env) 
{<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      return false;<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><a name="line.193"></a>
-<span class="sourceLineNo">194</span>  private static class TestProcEnv {<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>    public boolean 
toggleKillBeforeStoreUpdate = false;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    public boolean triggerRollbackOnChild 
= false;<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">122</span>    TestRootProcedure proc = new 
TestRootProcedure();<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExecutor, proc);<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>    int restartCount = 0;<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    while 
(!procExecutor.isFinished(procId)) {<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      
ProcedureTestingUtility.restart(procExecutor);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      
ProcedureTestingUtility.waitProcedure(procExecutor, proc);<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>      restartCount++;<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>    }<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    assertEquals(4, restartCount);<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>    assertTrue("expected completed proc", 
procExecutor.isFinished(procId));<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    
ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>  }<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>  @Test<a name="line.135"></a>
+<span class="sourceLineNo">136</span>  public void testChildRollbackLoad() 
throws Exception {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    procEnv.toggleKillBeforeStoreUpdate = 
false;<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    procEnv.triggerRollbackOnChild = 
true;<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span>    TestRootProcedure proc = new 
TestRootProcedure();<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExecutor, proc);<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>    
ProcedureTestingUtility.restart(procExecutor);<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    
ProcedureTestingUtility.waitProcedure(procExecutor, proc);<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>    assertProcFailed(procId);<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>  }<a name="line.146"></a>
+<span class="sourceLineNo">147</span><a name="line.147"></a>
+<span class="sourceLineNo">148</span>  @Test<a name="line.148"></a>
+<span class="sourceLineNo">149</span>  public void 
testChildRollbackLoadWithSteppedRestart() throws Exception {<a 
name="line.149"></a>
+<span class="sourceLineNo">150</span>    procEnv.toggleKillBeforeStoreUpdate = 
true;<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    procEnv.triggerRollbackOnChild = 
true;<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span>    TestRootProcedure proc = new 
TestRootProcedure();<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExecutor, proc);<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>    int restartCount = 0;<a 
name="line.155"></a>
+<span class="sourceLineNo">156</span>    while 
(!procExecutor.isFinished(procId)) {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      
ProcedureTestingUtility.restart(procExecutor);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      
ProcedureTestingUtility.waitProcedure(procExecutor, proc);<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>      restartCount++;<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>    }<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    assertEquals(2, restartCount);<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>    assertProcFailed(procId);<a 
name="line.162"></a>
+<span class="sourceLineNo">163</span>  }<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span>  private void assertProcFailed(long 
procId) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    assertTrue("expected completed proc", 
procExecutor.isFinished(procId));<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    Procedure&lt;?&gt; result = 
procExecutor.getResult(procId);<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    assertEquals(true, 
result.isFailed());<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    
LOG.info(result.getException().getMessage());<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 TestRootProcedure 
extends SequentialProcedure&lt;TestProcEnv&gt; {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    public TestRootProcedure() {}<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>    @Override<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    public Procedure[] 
execute(TestProcEnv env) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      if 
(env.toggleKillBeforeStoreUpdate) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span>        
ProcedureTestingUtility.toggleKillBeforeStoreUpdate(procExecutor);<a 
name="line.178"></a>
+<span class="sourceLineNo">179</span>      }<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      if (env.toggleKillAfterStoreUpdate) 
{<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        
ProcedureTestingUtility.toggleKillAfterStoreUpdate(procExecutor);<a 
name="line.181"></a>
+<span class="sourceLineNo">182</span>      }<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      return new Procedure[] { new 
TestChildProcedure(), new TestChildProcedure() };<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span>    @Override<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    public void rollback(TestProcEnv env) 
{<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    }<a name="line.188"></a>
+<span class="sourceLineNo">189</span><a name="line.189"></a>
+<span class="sourceLineNo">190</span>    @Override<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    public boolean abort(TestProcEnv env) 
{<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      return 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">195</span><a name="line.195"></a>
+<span class="sourceLineNo">196</span>  public static class TestChildProcedure 
extends SequentialProcedure&lt;TestProcEnv&gt; {<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    public TestChildProcedure() {}<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>    public Procedure[] 
execute(TestProcEnv env) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      if 
(env.toggleKillBeforeStoreUpdate) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span>        
ProcedureTestingUtility.toggleKillBeforeStoreUpdate(procExecutor);<a 
name="line.202"></a>
+<span class="sourceLineNo">203</span>      }<a name="line.203"></a>
+<span class="sourceLineNo">204</span>      if (env.triggerRollbackOnChild) {<a 
name="line.204"></a>
+<span class="sourceLineNo">205</span>        setFailure("test", new 
Exception("test"));<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>    public void rollback(TestProcEnv env) 
{<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    }<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span>    @Override<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    public boolean abort(TestProcEnv env) 
{<a name="line.215"></a>
+<span class="sourceLineNo">216</span>      return false;<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    }<a name="line.217"></a>
+<span class="sourceLineNo">218</span>  }<a name="line.218"></a>
+<span class="sourceLineNo">219</span><a name="line.219"></a>
+<span class="sourceLineNo">220</span>  private static class TestProcEnv {<a 
name="line.220"></a>
+<span class="sourceLineNo">221</span>    public boolean 
toggleKillBeforeStoreUpdate = false;<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    public boolean 
toggleKillAfterStoreUpdate = false;<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    public boolean triggerRollbackOnChild 
= false;<a name="line.223"></a>
+<span class="sourceLineNo">224</span>  }<a name="line.224"></a>
+<span class="sourceLineNo">225</span>}<a name="line.225"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3b0a06ec/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestChildProcedures.TestProcEnv.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestChildProcedures.TestProcEnv.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestChildProcedures.TestProcEnv.html
index 380fb36..07ae748 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestChildProcedures.TestProcEnv.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestChildProcedures.TestProcEnv.html
@@ -117,93 +117,120 @@
 <span class="sourceLineNo">109</span>    
ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<a 
name="line.109"></a>
 <span class="sourceLineNo">110</span>  }<a name="line.110"></a>
 <span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span>  @Test<a name="line.112"></a>
-<span class="sourceLineNo">113</span>  public void testChildRollbackLoad() 
throws Exception {<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    procEnv.toggleKillBeforeStoreUpdate = 
false;<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    procEnv.triggerRollbackOnChild = 
true;<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>    TestRootProcedure proc = new 
TestRootProcedure();<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExecutor, proc);<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>    
ProcedureTestingUtility.restart(procExecutor);<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    
ProcedureTestingUtility.waitProcedure(procExecutor, proc);<a 
name="line.120"></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 the state setting that happens 
after store to WAL; in particular the bit where we<a name="line.114"></a>
+<span class="sourceLineNo">115</span>   * set the parent runnable again after 
its children have all completed successfully.<a name="line.115"></a>
+<span class="sourceLineNo">116</span>   * See HBASE-20978.<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>   */<a name="line.117"></a>
+<span class="sourceLineNo">118</span>  @Test<a name="line.118"></a>
+<span class="sourceLineNo">119</span>  public void 
testChildLoadWithRestartAfterChildSuccess() throws Exception {<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>    procEnv.toggleKillAfterStoreUpdate = 
true;<a name="line.120"></a>
 <span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span>    assertProcFailed(procId);<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 
testChildRollbackLoadWithSteppedRestart() throws Exception {<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>    procEnv.toggleKillBeforeStoreUpdate = 
true;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    procEnv.triggerRollbackOnChild = 
true;<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>    TestRootProcedure proc = new 
TestRootProcedure();<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExecutor, proc);<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>    int restartCount = 0;<a 
name="line.132"></a>
-<span class="sourceLineNo">133</span>    while 
(!procExecutor.isFinished(procId)) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      
ProcedureTestingUtility.restart(procExecutor);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      
ProcedureTestingUtility.waitProcedure(procExecutor, proc);<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>      restartCount++;<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>    }<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    assertEquals(2, restartCount);<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>    assertProcFailed(procId);<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>  private void assertProcFailed(long 
procId) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    assertTrue("expected completed proc", 
procExecutor.isFinished(procId));<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    Procedure&lt;?&gt; result = 
procExecutor.getResult(procId);<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    assertEquals(true, 
result.isFailed());<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    
LOG.info(result.getException().getMessage());<a name="line.146"></a>
-<span class="sourceLineNo">147</span>  }<a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span>  public static class TestRootProcedure 
extends SequentialProcedure&lt;TestProcEnv&gt; {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    public TestRootProcedure() {}<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>    @Override<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    public Procedure[] 
execute(TestProcEnv env) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      if 
(env.toggleKillBeforeStoreUpdate) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>        
ProcedureTestingUtility.toggleKillBeforeStoreUpdate(procExecutor);<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>      }<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      return new Procedure[] { new 
TestChildProcedure(), new TestChildProcedure() };<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    }<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>    @Override<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    public void rollback(TestProcEnv env) 
{<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    }<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>    @Override<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    public boolean abort(TestProcEnv env) 
{<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      return false;<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    }<a name="line.167"></a>
-<span class="sourceLineNo">168</span>  }<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span>  public static class TestChildProcedure 
extends SequentialProcedure&lt;TestProcEnv&gt; {<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    public TestChildProcedure() {}<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span>    @Override<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    public Procedure[] 
execute(TestProcEnv env) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>      if 
(env.toggleKillBeforeStoreUpdate) {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>        
ProcedureTestingUtility.toggleKillBeforeStoreUpdate(procExecutor);<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>      }<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      if (env.triggerRollbackOnChild) {<a 
name="line.178"></a>
-<span class="sourceLineNo">179</span>        setFailure("test", new 
Exception("test"));<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      }<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      return null;<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>    @Override<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    public void rollback(TestProcEnv env) 
{<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>    public boolean abort(TestProcEnv env) 
{<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      return false;<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><a name="line.193"></a>
-<span class="sourceLineNo">194</span>  private static class TestProcEnv {<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>    public boolean 
toggleKillBeforeStoreUpdate = false;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    public boolean triggerRollbackOnChild 
= false;<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">122</span>    TestRootProcedure proc = new 
TestRootProcedure();<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExecutor, proc);<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>    int restartCount = 0;<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    while 
(!procExecutor.isFinished(procId)) {<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      
ProcedureTestingUtility.restart(procExecutor);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      
ProcedureTestingUtility.waitProcedure(procExecutor, proc);<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>      restartCount++;<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>    }<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    assertEquals(4, restartCount);<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>    assertTrue("expected completed proc", 
procExecutor.isFinished(procId));<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    
ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>  }<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>  @Test<a name="line.135"></a>
+<span class="sourceLineNo">136</span>  public void testChildRollbackLoad() 
throws Exception {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    procEnv.toggleKillBeforeStoreUpdate = 
false;<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    procEnv.triggerRollbackOnChild = 
true;<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span>    TestRootProcedure proc = new 
TestRootProcedure();<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExecutor, proc);<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>    
ProcedureTestingUtility.restart(procExecutor);<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    
ProcedureTestingUtility.waitProcedure(procExecutor, proc);<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>    assertProcFailed(procId);<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>  }<a name="line.146"></a>
+<span class="sourceLineNo">147</span><a name="line.147"></a>
+<span class="sourceLineNo">148</span>  @Test<a name="line.148"></a>
+<span class="sourceLineNo">149</span>  public void 
testChildRollbackLoadWithSteppedRestart() throws Exception {<a 
name="line.149"></a>
+<span class="sourceLineNo">150</span>    procEnv.toggleKillBeforeStoreUpdate = 
true;<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    procEnv.triggerRollbackOnChild = 
true;<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span>    TestRootProcedure proc = new 
TestRootProcedure();<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExecutor, proc);<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>    int restartCount = 0;<a 
name="line.155"></a>
+<span class="sourceLineNo">156</span>    while 
(!procExecutor.isFinished(procId)) {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      
ProcedureTestingUtility.restart(procExecutor);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      
ProcedureTestingUtility.waitProcedure(procExecutor, proc);<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>      restartCount++;<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>    }<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    assertEquals(2, restartCount);<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>    assertProcFailed(procId);<a 
name="line.162"></a>
+<span class="sourceLineNo">163</span>  }<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span>  private void assertProcFailed(long 
procId) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    assertTrue("expected completed proc", 
procExecutor.isFinished(procId));<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    Procedure&lt;?&gt; result = 
procExecutor.getResult(procId);<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    assertEquals(true, 
result.isFailed());<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    
LOG.info(result.getException().getMessage());<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 TestRootProcedure 
extends SequentialProcedure&lt;TestProcEnv&gt; {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    public TestRootProcedure() {}<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>    @Override<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    public Procedure[] 
execute(TestProcEnv env) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      if 
(env.toggleKillBeforeStoreUpdate) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span>        
ProcedureTestingUtility.toggleKillBeforeStoreUpdate(procExecutor);<a 
name="line.178"></a>
+<span class="sourceLineNo">179</span>      }<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      if (env.toggleKillAfterStoreUpdate) 
{<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        
ProcedureTestingUtility.toggleKillAfterStoreUpdate(procExecutor);<a 
name="line.181"></a>
+<span class="sourceLineNo">182</span>      }<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      return new Procedure[] { new 
TestChildProcedure(), new TestChildProcedure() };<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span>    @Override<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    public void rollback(TestProcEnv env) 
{<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    }<a name="line.188"></a>
+<span class="sourceLineNo">189</span><a name="line.189"></a>
+<span class="sourceLineNo">190</span>    @Override<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    public boolean abort(TestProcEnv env) 
{<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      return 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">195</span><a name="line.195"></a>
+<span class="sourceLineNo">196</span>  public static class TestChildProcedure 
extends SequentialProcedure&lt;TestProcEnv&gt; {<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    public TestChildProcedure() {}<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>    public Procedure[] 
execute(TestProcEnv env) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      if 
(env.toggleKillBeforeStoreUpdate) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span>        
ProcedureTestingUtility.toggleKillBeforeStoreUpdate(procExecutor);<a 
name="line.202"></a>
+<span class="sourceLineNo">203</span>      }<a name="line.203"></a>
+<span class="sourceLineNo">204</span>      if (env.triggerRollbackOnChild) {<a 
name="line.204"></a>
+<span class="sourceLineNo">205</span>        setFailure("test", new 
Exception("test"));<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>    public void rollback(TestProcEnv env) 
{<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    }<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span>    @Override<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    public boolean abort(TestProcEnv env) 
{<a name="line.215"></a>
+<span class="sourceLineNo">216</span>      return false;<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    }<a name="line.217"></a>
+<span class="sourceLineNo">218</span>  }<a name="line.218"></a>
+<span class="sourceLineNo">219</span><a name="line.219"></a>
+<span class="sourceLineNo">220</span>  private static class TestProcEnv {<a 
name="line.220"></a>
+<span class="sourceLineNo">221</span>    public boolean 
toggleKillBeforeStoreUpdate = false;<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    public boolean 
toggleKillAfterStoreUpdate = false;<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    public boolean triggerRollbackOnChild 
= false;<a name="line.223"></a>
+<span class="sourceLineNo">224</span>  }<a name="line.224"></a>
+<span class="sourceLineNo">225</span>}<a name="line.225"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3b0a06ec/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestChildProcedures.TestRootProcedure.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestChildProcedures.TestRootProcedure.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestChildProcedures.TestRootProcedure.html
index 380fb36..07ae748 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestChildProcedures.TestRootProcedure.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestChildProcedures.TestRootProcedure.html
@@ -117,93 +117,120 @@
 <span class="sourceLineNo">109</span>    
ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<a 
name="line.109"></a>
 <span class="sourceLineNo">110</span>  }<a name="line.110"></a>
 <span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span>  @Test<a name="line.112"></a>
-<span class="sourceLineNo">113</span>  public void testChildRollbackLoad() 
throws Exception {<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    procEnv.toggleKillBeforeStoreUpdate = 
false;<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    procEnv.triggerRollbackOnChild = 
true;<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>    TestRootProcedure proc = new 
TestRootProcedure();<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExecutor, proc);<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>    
ProcedureTestingUtility.restart(procExecutor);<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    
ProcedureTestingUtility.waitProcedure(procExecutor, proc);<a 
name="line.120"></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 the state setting that happens 
after store to WAL; in particular the bit where we<a name="line.114"></a>
+<span class="sourceLineNo">115</span>   * set the parent runnable again after 
its children have all completed successfully.<a name="line.115"></a>
+<span class="sourceLineNo">116</span>   * See HBASE-20978.<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>   */<a name="line.117"></a>
+<span class="sourceLineNo">118</span>  @Test<a name="line.118"></a>
+<span class="sourceLineNo">119</span>  public void 
testChildLoadWithRestartAfterChildSuccess() throws Exception {<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>    procEnv.toggleKillAfterStoreUpdate = 
true;<a name="line.120"></a>
 <span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span>    assertProcFailed(procId);<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 
testChildRollbackLoadWithSteppedRestart() throws Exception {<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>    procEnv.toggleKillBeforeStoreUpdate = 
true;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    procEnv.triggerRollbackOnChild = 
true;<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>    TestRootProcedure proc = new 
TestRootProcedure();<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExecutor, proc);<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>    int restartCount = 0;<a 
name="line.132"></a>
-<span class="sourceLineNo">133</span>    while 
(!procExecutor.isFinished(procId)) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      
ProcedureTestingUtility.restart(procExecutor);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      
ProcedureTestingUtility.waitProcedure(procExecutor, proc);<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>      restartCount++;<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>    }<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    assertEquals(2, restartCount);<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>    assertProcFailed(procId);<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>  private void assertProcFailed(long 
procId) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    assertTrue("expected completed proc", 
procExecutor.isFinished(procId));<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    Procedure&lt;?&gt; result = 
procExecutor.getResult(procId);<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    assertEquals(true, 
result.isFailed());<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    
LOG.info(result.getException().getMessage());<a name="line.146"></a>
-<span class="sourceLineNo">147</span>  }<a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span>  public static class TestRootProcedure 
extends SequentialProcedure&lt;TestProcEnv&gt; {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    public TestRootProcedure() {}<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>    @Override<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    public Procedure[] 
execute(TestProcEnv env) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      if 
(env.toggleKillBeforeStoreUpdate) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>        
ProcedureTestingUtility.toggleKillBeforeStoreUpdate(procExecutor);<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>      }<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      return new Procedure[] { new 
TestChildProcedure(), new TestChildProcedure() };<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    }<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>    @Override<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    public void rollback(TestProcEnv env) 
{<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    }<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>    @Override<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    public boolean abort(TestProcEnv env) 
{<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      return false;<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    }<a name="line.167"></a>
-<span class="sourceLineNo">168</span>  }<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span>  public static class TestChildProcedure 
extends SequentialProcedure&lt;TestProcEnv&gt; {<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    public TestChildProcedure() {}<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span>    @Override<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    public Procedure[] 
execute(TestProcEnv env) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>      if 
(env.toggleKillBeforeStoreUpdate) {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>        
ProcedureTestingUtility.toggleKillBeforeStoreUpdate(procExecutor);<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>      }<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      if (env.triggerRollbackOnChild) {<a 
name="line.178"></a>
-<span class="sourceLineNo">179</span>        setFailure("test", new 
Exception("test"));<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      }<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      return null;<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>    @Override<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    public void rollback(TestProcEnv env) 
{<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>    public boolean abort(TestProcEnv env) 
{<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      return false;<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><a name="line.193"></a>
-<span class="sourceLineNo">194</span>  private static class TestProcEnv {<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>    public boolean 
toggleKillBeforeStoreUpdate = false;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    public boolean triggerRollbackOnChild 
= false;<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">122</span>    TestRootProcedure proc = new 
TestRootProcedure();<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExecutor, proc);<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>    int restartCount = 0;<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    while 
(!procExecutor.isFinished(procId)) {<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      
ProcedureTestingUtility.restart(procExecutor);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      
ProcedureTestingUtility.waitProcedure(procExecutor, proc);<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>      restartCount++;<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>    }<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    assertEquals(4, restartCount);<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>    assertTrue("expected completed proc", 
procExecutor.isFinished(procId));<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    
ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>  }<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>  @Test<a name="line.135"></a>
+<span class="sourceLineNo">136</span>  public void testChildRollbackLoad() 
throws Exception {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    procEnv.toggleKillBeforeStoreUpdate = 
false;<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    procEnv.triggerRollbackOnChild = 
true;<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span>    TestRootProcedure proc = new 
TestRootProcedure();<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExecutor, proc);<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>    
ProcedureTestingUtility.restart(procExecutor);<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    
ProcedureTestingUtility.waitProcedure(procExecutor, proc);<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>    assertProcFailed(procId);<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>  }<a name="line.146"></a>
+<span class="sourceLineNo">147</span><a name="line.147"></a>
+<span class="sourceLineNo">148</span>  @Test<a name="line.148"></a>
+<span class="sourceLineNo">149</span>  public void 
testChildRollbackLoadWithSteppedRestart() throws Exception {<a 
name="line.149"></a>
+<span class="sourceLineNo">150</span>    procEnv.toggleKillBeforeStoreUpdate = 
true;<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    procEnv.triggerRollbackOnChild = 
true;<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span>    TestRootProcedure proc = new 
TestRootProcedure();<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExecutor, proc);<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>    int restartCount = 0;<a 
name="line.155"></a>
+<span class="sourceLineNo">156</span>    while 
(!procExecutor.isFinished(procId)) {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      
ProcedureTestingUtility.restart(procExecutor);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      
ProcedureTestingUtility.waitProcedure(procExecutor, proc);<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>      restartCount++;<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>    }<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    assertEquals(2, restartCount);<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>    assertProcFailed(procId);<a 
name="line.162"></a>
+<span class="sourceLineNo">163</span>  }<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span>  private void assertProcFailed(long 
procId) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    assertTrue("expected completed proc", 
procExecutor.isFinished(procId));<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    Procedure&lt;?&gt; result = 
procExecutor.getResult(procId);<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    assertEquals(true, 
result.isFailed());<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    
LOG.info(result.getException().getMessage());<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 TestRootProcedure 
extends SequentialProcedure&lt;TestProcEnv&gt; {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    public TestRootProcedure() {}<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>    @Override<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    public Procedure[] 
execute(TestProcEnv env) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      if 
(env.toggleKillBeforeStoreUpdate) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span>        
ProcedureTestingUtility.toggleKillBeforeStoreUpdate(procExecutor);<a 
name="line.178"></a>
+<span class="sourceLineNo">179</span>      }<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      if (env.toggleKillAfterStoreUpdate) 
{<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        
ProcedureTestingUtility.toggleKillAfterStoreUpdate(procExecutor);<a 
name="line.181"></a>
+<span class="sourceLineNo">182</span>      }<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      return new Procedure[] { new 
TestChildProcedure(), new TestChildProcedure() };<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span>    @Override<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    public void rollback(TestProcEnv env) 
{<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    }<a name="line.188"></a>
+<span class="sourceLineNo">189</span><a name="line.189"></a>
+<span class="sourceLineNo">190</span>    @Override<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    public boolean abort(TestProcEnv env) 
{<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      return 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">195</span><a name="line.195"></a>
+<span class="sourceLineNo">196</span>  public static class TestChildProcedure 
extends SequentialProcedure&lt;TestProcEnv&gt; {<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    public TestChildProcedure() {}<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>    public Procedure[] 
execute(TestProcEnv env) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      if 
(env.toggleKillBeforeStoreUpdate) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span>        
ProcedureTestingUtility.toggleKillBeforeStoreUpdate(procExecutor);<a 
name="line.202"></a>
+<span class="sourceLineNo">203</span>      }<a name="line.203"></a>
+<span class="sourceLineNo">204</span>      if (env.triggerRollbackOnChild) {<a 
name="line.204"></a>
+<span class="sourceLineNo">205</span>        setFailure("test", new 
Exception("test"));<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>    public void rollback(TestProcEnv env) 
{<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    }<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span>    @Override<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    public boolean abort(TestProcEnv env) 
{<a name="line.215"></a>
+<span class="sourceLineNo">216</span>      return false;<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    }<a name="line.217"></a>
+<span class="sourceLineNo">218</span>  }<a name="line.218"></a>
+<span class="sourceLineNo">219</span><a name="line.219"></a>
+<span class="sourceLineNo">220</span>  private static class TestProcEnv {<a 
name="line.220"></a>
+<span class="sourceLineNo">221</span>    public boolean 
toggleKillBeforeStoreUpdate = false;<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    public boolean 
toggleKillAfterStoreUpdate = false;<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    public boolean triggerRollbackOnChild 
= false;<a name="line.223"></a>
+<span class="sourceLineNo">224</span>  }<a name="line.224"></a>
+<span class="sourceLineNo">225</span>}<a name="line.225"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/3b0a06ec/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestChildProcedures.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestChildProcedures.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestChildProcedures.html
index 380fb36..07ae748 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestChildProcedures.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestChildProcedures.html
@@ -117,93 +117,120 @@
 <span class="sourceLineNo">109</span>    
ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<a 
name="line.109"></a>
 <span class="sourceLineNo">110</span>  }<a name="line.110"></a>
 <span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span>  @Test<a name="line.112"></a>
-<span class="sourceLineNo">113</span>  public void testChildRollbackLoad() 
throws Exception {<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    procEnv.toggleKillBeforeStoreUpdate = 
false;<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    procEnv.triggerRollbackOnChild = 
true;<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span>    TestRootProcedure proc = new 
TestRootProcedure();<a name="line.117"></a>
-<span class="sourceLineNo">118</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExecutor, proc);<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>    
ProcedureTestingUtility.restart(procExecutor);<a name="line.119"></a>
-<span class="sourceLineNo">120</span>    
ProcedureTestingUtility.waitProcedure(procExecutor, proc);<a 
name="line.120"></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 the state setting that happens 
after store to WAL; in particular the bit where we<a name="line.114"></a>
+<span class="sourceLineNo">115</span>   * set the parent runnable again after 
its children have all completed successfully.<a name="line.115"></a>
+<span class="sourceLineNo">116</span>   * See HBASE-20978.<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>   */<a name="line.117"></a>
+<span class="sourceLineNo">118</span>  @Test<a name="line.118"></a>
+<span class="sourceLineNo">119</span>  public void 
testChildLoadWithRestartAfterChildSuccess() throws Exception {<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>    procEnv.toggleKillAfterStoreUpdate = 
true;<a name="line.120"></a>
 <span class="sourceLineNo">121</span><a name="line.121"></a>
-<span class="sourceLineNo">122</span>    assertProcFailed(procId);<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 
testChildRollbackLoadWithSteppedRestart() throws Exception {<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>    procEnv.toggleKillBeforeStoreUpdate = 
true;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    procEnv.triggerRollbackOnChild = 
true;<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>    TestRootProcedure proc = new 
TestRootProcedure();<a name="line.130"></a>
-<span class="sourceLineNo">131</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExecutor, proc);<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>    int restartCount = 0;<a 
name="line.132"></a>
-<span class="sourceLineNo">133</span>    while 
(!procExecutor.isFinished(procId)) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      
ProcedureTestingUtility.restart(procExecutor);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      
ProcedureTestingUtility.waitProcedure(procExecutor, proc);<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>      restartCount++;<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>    }<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    assertEquals(2, restartCount);<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>    assertProcFailed(procId);<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>  }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>  private void assertProcFailed(long 
procId) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    assertTrue("expected completed proc", 
procExecutor.isFinished(procId));<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    Procedure&lt;?&gt; result = 
procExecutor.getResult(procId);<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    assertEquals(true, 
result.isFailed());<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    
LOG.info(result.getException().getMessage());<a name="line.146"></a>
-<span class="sourceLineNo">147</span>  }<a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span>  public static class TestRootProcedure 
extends SequentialProcedure&lt;TestProcEnv&gt; {<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    public TestRootProcedure() {}<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span><a name="line.151"></a>
-<span class="sourceLineNo">152</span>    @Override<a name="line.152"></a>
-<span class="sourceLineNo">153</span>    public Procedure[] 
execute(TestProcEnv env) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      if 
(env.toggleKillBeforeStoreUpdate) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>        
ProcedureTestingUtility.toggleKillBeforeStoreUpdate(procExecutor);<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>      }<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      return new Procedure[] { new 
TestChildProcedure(), new TestChildProcedure() };<a name="line.157"></a>
-<span class="sourceLineNo">158</span>    }<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>    @Override<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    public void rollback(TestProcEnv env) 
{<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    }<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>    @Override<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    public boolean abort(TestProcEnv env) 
{<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      return false;<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    }<a name="line.167"></a>
-<span class="sourceLineNo">168</span>  }<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span>  public static class TestChildProcedure 
extends SequentialProcedure&lt;TestProcEnv&gt; {<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    public TestChildProcedure() {}<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span><a name="line.172"></a>
-<span class="sourceLineNo">173</span>    @Override<a name="line.173"></a>
-<span class="sourceLineNo">174</span>    public Procedure[] 
execute(TestProcEnv env) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>      if 
(env.toggleKillBeforeStoreUpdate) {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>        
ProcedureTestingUtility.toggleKillBeforeStoreUpdate(procExecutor);<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>      }<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      if (env.triggerRollbackOnChild) {<a 
name="line.178"></a>
-<span class="sourceLineNo">179</span>        setFailure("test", new 
Exception("test"));<a name="line.179"></a>
-<span class="sourceLineNo">180</span>      }<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      return null;<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>    @Override<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    public void rollback(TestProcEnv env) 
{<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>    public boolean abort(TestProcEnv env) 
{<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      return false;<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><a name="line.193"></a>
-<span class="sourceLineNo">194</span>  private static class TestProcEnv {<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>    public boolean 
toggleKillBeforeStoreUpdate = false;<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    public boolean triggerRollbackOnChild 
= false;<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">122</span>    TestRootProcedure proc = new 
TestRootProcedure();<a name="line.122"></a>
+<span class="sourceLineNo">123</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExecutor, proc);<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>    int restartCount = 0;<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    while 
(!procExecutor.isFinished(procId)) {<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      
ProcedureTestingUtility.restart(procExecutor);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      
ProcedureTestingUtility.waitProcedure(procExecutor, proc);<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>      restartCount++;<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>    }<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    assertEquals(4, restartCount);<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>    assertTrue("expected completed proc", 
procExecutor.isFinished(procId));<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    
ProcedureTestingUtility.assertProcNotFailed(procExecutor, procId);<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>  }<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span>  @Test<a name="line.135"></a>
+<span class="sourceLineNo">136</span>  public void testChildRollbackLoad() 
throws Exception {<a name="line.136"></a>
+<span class="sourceLineNo">137</span>    procEnv.toggleKillBeforeStoreUpdate = 
false;<a name="line.137"></a>
+<span class="sourceLineNo">138</span>    procEnv.triggerRollbackOnChild = 
true;<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span>    TestRootProcedure proc = new 
TestRootProcedure();<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExecutor, proc);<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>    
ProcedureTestingUtility.restart(procExecutor);<a name="line.142"></a>
+<span class="sourceLineNo">143</span>    
ProcedureTestingUtility.waitProcedure(procExecutor, proc);<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>    assertProcFailed(procId);<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>  }<a name="line.146"></a>
+<span class="sourceLineNo">147</span><a name="line.147"></a>
+<span class="sourceLineNo">148</span>  @Test<a name="line.148"></a>
+<span class="sourceLineNo">149</span>  public void 
testChildRollbackLoadWithSteppedRestart() throws Exception {<a 
name="line.149"></a>
+<span class="sourceLineNo">150</span>    procEnv.toggleKillBeforeStoreUpdate = 
true;<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    procEnv.triggerRollbackOnChild = 
true;<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span>    TestRootProcedure proc = new 
TestRootProcedure();<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    long procId = 
ProcedureTestingUtility.submitAndWait(procExecutor, proc);<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>    int restartCount = 0;<a 
name="line.155"></a>
+<span class="sourceLineNo">156</span>    while 
(!procExecutor.isFinished(procId)) {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      
ProcedureTestingUtility.restart(procExecutor);<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      
ProcedureTestingUtility.waitProcedure(procExecutor, proc);<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>      restartCount++;<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>    }<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    assertEquals(2, restartCount);<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>    assertProcFailed(procId);<a 
name="line.162"></a>
+<span class="sourceLineNo">163</span>  }<a name="line.163"></a>
+<span class="sourceLineNo">164</span><a name="line.164"></a>
+<span class="sourceLineNo">165</span>  private void assertProcFailed(long 
procId) {<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    assertTrue("expected completed proc", 
procExecutor.isFinished(procId));<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    Procedure&lt;?&gt; result = 
procExecutor.getResult(procId);<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    assertEquals(true, 
result.isFailed());<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    
LOG.info(result.getException().getMessage());<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 TestRootProcedure 
extends SequentialProcedure&lt;TestProcEnv&gt; {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    public TestRootProcedure() {}<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>    @Override<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    public Procedure[] 
execute(TestProcEnv env) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      if 
(env.toggleKillBeforeStoreUpdate) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span>        
ProcedureTestingUtility.toggleKillBeforeStoreUpdate(procExecutor);<a 
name="line.178"></a>
+<span class="sourceLineNo">179</span>      }<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      if (env.toggleKillAfterStoreUpdate) 
{<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        
ProcedureTestingUtility.toggleKillAfterStoreUpdate(procExecutor);<a 
name="line.181"></a>
+<span class="sourceLineNo">182</span>      }<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      return new Procedure[] { new 
TestChildProcedure(), new TestChildProcedure() };<a name="line.183"></a>
+<span class="sourceLineNo">184</span>    }<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span>    @Override<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    public void rollback(TestProcEnv env) 
{<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    }<a name="line.188"></a>
+<span class="sourceLineNo">189</span><a name="line.189"></a>
+<span class="sourceLineNo">190</span>    @Override<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    public boolean abort(TestProcEnv env) 
{<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      return 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">195</span><a name="line.195"></a>
+<span class="sourceLineNo">196</span>  public static class TestChildProcedure 
extends SequentialProcedure&lt;TestProcEnv&gt; {<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    public TestChildProcedure() {}<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>    public Procedure[] 
execute(TestProcEnv env) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      if 
(env.toggleKillBeforeStoreUpdate) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span>        
ProcedureTestingUtility.toggleKillBeforeStoreUpdate(procExecutor);<a 
name="line.202"></a>
+<span class="sourceLineNo">203</span>      }<a name="line.203"></a>
+<span class="sourceLineNo">204</span>      if (env.triggerRollbackOnChild) {<a 
name="line.204"></a>
+<span class="sourceLineNo">205</span>        setFailure("test", new 
Exception("test"));<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>    public void rollback(TestProcEnv env) 
{<a name="line.211"></a>
+<span class="sourceLineNo">212</span>    }<a name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span>    @Override<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    public boolean abort(TestProcEnv env) 
{<a name="line.215"></a>
+<span class="sourceLineNo">216</span>      return false;<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    }<a name="line.217"></a>
+<span class="sourceLineNo">218</span>  }<a name="line.218"></a>
+<span class="sourceLineNo">219</span><a name="line.219"></a>
+<span class="sourceLineNo">220</span>  private static class TestProcEnv {<a 
name="line.220"></a>
+<span class="sourceLineNo">221</span>    public boolean 
toggleKillBeforeStoreUpdate = false;<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    public boolean 
toggleKillAfterStoreUpdate = false;<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    public boolean triggerRollbackOnChild 
= false;<a name="line.223"></a>
+<span class="sourceLineNo">224</span>  }<a name="line.224"></a>
+<span class="sourceLineNo">225</span>}<a name="line.225"></a>
 
 
 

Reply via email to