Repository: hbase-site
Updated Branches:
  refs/heads/asf-site c28bec8eb -> 40477ee92


http://git-wip-us.apache.org/repos/asf/hbase-site/blob/40477ee9/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureEvents.TestProcEnv.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureEvents.TestProcEnv.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureEvents.TestProcEnv.html
index cfe0ebc..f1bd6d3 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureEvents.TestProcEnv.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureEvents.TestProcEnv.html
@@ -88,135 +88,142 @@
 <span class="sourceLineNo">080</span>    fs.delete(logDir, true);<a 
name="line.80"></a>
 <span class="sourceLineNo">081</span>  }<a name="line.81"></a>
 <span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span>  @Test<a name="line.83"></a>
-<span class="sourceLineNo">084</span>  public void testTimeoutEventProcedure() 
throws Exception {<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    final int NTIMEOUTS = 5;<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span>    TestTimeoutEventProcedure proc = new 
TestTimeoutEventProcedure(500, NTIMEOUTS);<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    procExecutor.submitProcedure(proc);<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>    
ProcedureTestingUtility.waitProcedure(procExecutor, proc.getProcId());<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>    
ProcedureTestingUtility.assertIsAbortException(procExecutor.getResult(proc.getProcId()));<a
 name="line.91"></a>
-<span class="sourceLineNo">092</span>    assertEquals(NTIMEOUTS + 1, 
proc.getTimeoutsCount());<a name="line.92"></a>
-<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 
testTimeoutEventProcedureDoubleExecution() throws Exception {<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span>    
testTimeoutEventProcedureDoubleExecution(false);<a name="line.97"></a>
-<span class="sourceLineNo">098</span>  }<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>  @Test<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  public void 
testTimeoutEventProcedureDoubleExecutionKillIfSuspended() throws Exception {<a 
name="line.101"></a>
-<span class="sourceLineNo">102</span>    
testTimeoutEventProcedureDoubleExecution(true);<a name="line.102"></a>
-<span class="sourceLineNo">103</span>  }<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span>  private void 
testTimeoutEventProcedureDoubleExecution(final boolean killIfSuspended)<a 
name="line.105"></a>
-<span class="sourceLineNo">106</span>      throws Exception {<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>    TestTimeoutEventProcedure proc = new 
TestTimeoutEventProcedure(1000, 3);<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, 
true);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    
ProcedureTestingUtility.setKillIfSuspended(procExecutor, killIfSuspended);<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>    long procId = 
procExecutor.submitProcedure(proc);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    
ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId, 
true);<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    
ProcedureTestingUtility.assertIsAbortException(procExecutor.getResult(proc.getProcId()));<a
 name="line.112"></a>
-<span class="sourceLineNo">113</span>  }<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span>  /**<a name="line.115"></a>
-<span class="sourceLineNo">116</span>   * This Event+Procedure exhibits 
following behavior:<a name="line.116"></a>
-<span class="sourceLineNo">117</span>   * &lt;ul&gt;<a name="line.117"></a>
-<span class="sourceLineNo">118</span>   *   &lt;li&gt;On procedure execute()<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>   *     &lt;ul&gt;<a name="line.119"></a>
-<span class="sourceLineNo">120</span>   *       &lt;li&gt;If had enough 
timeouts, abort the procedure. Else....&lt;/li&gt;<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   *       &lt;li&gt;Suspend the event 
and add self to its suspend queue&lt;/li&gt;<a name="line.121"></a>
-<span class="sourceLineNo">122</span>   *       &lt;li&gt;Go into waiting 
state&lt;/li&gt;<a name="line.122"></a>
-<span class="sourceLineNo">123</span>   *     &lt;/ul&gt;<a 
name="line.123"></a>
-<span class="sourceLineNo">124</span>   *   &lt;/li&gt;<a name="line.124"></a>
-<span class="sourceLineNo">125</span>   *   &lt;li&gt;<a name="line.125"></a>
-<span class="sourceLineNo">126</span>   *     On waiting timeout<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>   *     &lt;ul&gt;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>   *       &lt;li&gt;Wake the event 
(which adds this procedure back into scheduler queue), and set own's<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>   *       state to RUNNABLE (so can be 
executed again).&lt;/li&gt;<a name="line.129"></a>
+<span class="sourceLineNo">083</span>  /**<a name="line.83"></a>
+<span class="sourceLineNo">084</span>   * Tests being able to suspend a 
Procedure for N timeouts and then failing.s<a name="line.84"></a>
+<span class="sourceLineNo">085</span>   * Resets the timeout after each 
elapses. See {@link TestTimeoutEventProcedure} for example<a name="line.85"></a>
+<span class="sourceLineNo">086</span>   * of how to do this sort of trickery 
with the ProcedureExecutor; i.e. suspend for a while,<a name="line.86"></a>
+<span class="sourceLineNo">087</span>   * check for a condition and if not 
set, suspend again, etc., ultimately failing or succeeding<a name="line.87"></a>
+<span class="sourceLineNo">088</span>   * eventually.<a name="line.88"></a>
+<span class="sourceLineNo">089</span>   */<a name="line.89"></a>
+<span class="sourceLineNo">090</span>  @Test<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  public void testTimeoutEventProcedure() 
throws Exception {<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    final int NTIMEOUTS = 5;<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span>    TestTimeoutEventProcedure proc = new 
TestTimeoutEventProcedure(500, NTIMEOUTS);<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    procExecutor.submitProcedure(proc);<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span>    
ProcedureTestingUtility.waitProcedure(procExecutor, proc.getProcId());<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>    
ProcedureTestingUtility.assertIsAbortException(procExecutor.getResult(proc.getProcId()));<a
 name="line.98"></a>
+<span class="sourceLineNo">099</span>    assertEquals(NTIMEOUTS + 1, 
proc.getTimeoutsCount());<a name="line.99"></a>
+<span class="sourceLineNo">100</span>  }<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>  @Test<a name="line.102"></a>
+<span class="sourceLineNo">103</span>  public void 
testTimeoutEventProcedureDoubleExecution() throws Exception {<a 
name="line.103"></a>
+<span class="sourceLineNo">104</span>    
testTimeoutEventProcedureDoubleExecution(false);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>  }<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span>  @Test<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  public void 
testTimeoutEventProcedureDoubleExecutionKillIfSuspended() throws Exception {<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>    
testTimeoutEventProcedureDoubleExecution(true);<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>  private void 
testTimeoutEventProcedureDoubleExecution(final boolean killIfSuspended)<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>      throws Exception {<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span>    TestTimeoutEventProcedure proc = new 
TestTimeoutEventProcedure(1000, 3);<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, 
true);<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    
ProcedureTestingUtility.setKillIfSuspended(procExecutor, killIfSuspended);<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>    long procId = 
procExecutor.submitProcedure(proc);<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    
ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId, 
true);<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    
ProcedureTestingUtility.assertIsAbortException(procExecutor.getResult(proc.getProcId()));<a
 name="line.119"></a>
+<span class="sourceLineNo">120</span>  }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span>  /**<a name="line.122"></a>
+<span class="sourceLineNo">123</span>   * This Event+Procedure exhibits 
following behavior:<a name="line.123"></a>
+<span class="sourceLineNo">124</span>   * &lt;ul&gt;<a name="line.124"></a>
+<span class="sourceLineNo">125</span>   *   &lt;li&gt;On procedure execute()<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>   *     &lt;ul&gt;<a name="line.126"></a>
+<span class="sourceLineNo">127</span>   *       &lt;li&gt;If had enough 
timeouts, abort the procedure. Else....&lt;/li&gt;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>   *       &lt;li&gt;Suspend the event 
and add self to its suspend queue&lt;/li&gt;<a name="line.128"></a>
+<span class="sourceLineNo">129</span>   *       &lt;li&gt;Go into waiting 
state&lt;/li&gt;<a name="line.129"></a>
 <span class="sourceLineNo">130</span>   *     &lt;/ul&gt;<a 
name="line.130"></a>
 <span class="sourceLineNo">131</span>   *   &lt;/li&gt;<a name="line.131"></a>
-<span class="sourceLineNo">132</span>   * &lt;/ul&gt;<a name="line.132"></a>
-<span class="sourceLineNo">133</span>   */<a name="line.133"></a>
-<span class="sourceLineNo">134</span>  public static class 
TestTimeoutEventProcedure extends NoopProcedure&lt;TestProcEnv&gt; {<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>    private final ProcedureEvent event = 
new ProcedureEvent("timeout-event");<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span>    private final AtomicInteger ntimeouts 
= new AtomicInteger(0);<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    private int maxTimeouts = 1;<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span>    public TestTimeoutEventProcedure() 
{}<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>    public 
TestTimeoutEventProcedure(final int timeoutMsec, final int maxTimeouts) {<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>      this.maxTimeouts = maxTimeouts;<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>      setTimeout(timeoutMsec);<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>    }<a name="line.145"></a>
+<span class="sourceLineNo">132</span>   *   &lt;li&gt;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>   *     On waiting timeout<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>   *     &lt;ul&gt;<a name="line.134"></a>
+<span class="sourceLineNo">135</span>   *       &lt;li&gt;Wake the event 
(which adds this procedure back into scheduler queue), and set own's<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>   *       state to RUNNABLE (so can be 
executed again).&lt;/li&gt;<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   *     &lt;/ul&gt;<a 
name="line.137"></a>
+<span class="sourceLineNo">138</span>   *   &lt;/li&gt;<a name="line.138"></a>
+<span class="sourceLineNo">139</span>   * &lt;/ul&gt;<a name="line.139"></a>
+<span class="sourceLineNo">140</span>   */<a name="line.140"></a>
+<span class="sourceLineNo">141</span>  public static class 
TestTimeoutEventProcedure extends NoopProcedure&lt;TestProcEnv&gt; {<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>    private final ProcedureEvent event = 
new ProcedureEvent("timeout-event");<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>    private final AtomicInteger ntimeouts 
= new AtomicInteger(0);<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    private int maxTimeouts = 1;<a 
name="line.145"></a>
 <span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span>    public int getTimeoutsCount() {<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span>      return ntimeouts.get();<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>    }<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span>    @Override<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    protected Procedure[] execute(final 
TestProcEnv env) throws ProcedureSuspendedException {<a name="line.152"></a>
-<span class="sourceLineNo">153</span>      LOG.info("EXECUTE " + this + " 
ntimeouts=" + ntimeouts);<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      if (ntimeouts.get() &gt; 
maxTimeouts) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>        setAbortFailure("test", "give up 
after " + ntimeouts.get());<a name="line.155"></a>
-<span class="sourceLineNo">156</span>        return null;<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>      event.suspend();<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>      if (event.suspendIfNotReady(this)) 
{<a name="line.160"></a>
-<span class="sourceLineNo">161</span>        
setState(ProcedureState.WAITING_TIMEOUT);<a name="line.161"></a>
-<span class="sourceLineNo">162</span>        throw new 
ProcedureSuspendedException();<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>      return null;<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>    @Override<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    protected synchronized boolean 
setTimeoutFailure(final TestProcEnv env) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      int n = 
ntimeouts.incrementAndGet();<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      LOG.info("HANDLE TIMEOUT " + this + 
" ntimeouts=" + n);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      
setState(ProcedureState.RUNNABLE);<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      
event.wake((AbstractProcedureScheduler) env.getProcedureScheduler());<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>      return false;<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    }<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span>    @Override<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    protected void afterReplay(final 
TestProcEnv env) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      if (getState() == 
ProcedureState.WAITING_TIMEOUT) {<a name="line.179"></a>
-<span class="sourceLineNo">180</span>        event.suspend();<a 
name="line.180"></a>
-<span class="sourceLineNo">181</span>        event.suspendIfNotReady(this);<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><a name="line.184"></a>
-<span class="sourceLineNo">185</span>    @Override<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    protected void 
serializeStateData(ProcedureStateSerializer serializer)<a name="line.186"></a>
-<span class="sourceLineNo">187</span>        throws IOException {<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>      Int32Value.Builder ntimeoutsBuilder 
= Int32Value.newBuilder().setValue(ntimeouts.get());<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      
serializer.serialize(ntimeoutsBuilder.build());<a name="line.189"></a>
-<span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span>      Int32Value.Builder 
maxTimeoutsBuilder = Int32Value.newBuilder().setValue(maxTimeouts);<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>      
serializer.serialize(maxTimeoutsBuilder.build());<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    }<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span>    @Override<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    protected void 
deserializeStateData(ProcedureStateSerializer serializer)<a name="line.196"></a>
-<span class="sourceLineNo">197</span>        throws IOException {<a 
name="line.197"></a>
-<span class="sourceLineNo">198</span>      Int32Value ntimeoutsValue = 
serializer.deserialize(Int32Value.class);<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      
ntimeouts.set(ntimeoutsValue.getValue());<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span>      Int32Value maxTimeoutsValue = 
serializer.deserialize(Int32Value.class);<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      maxTimeouts = 
maxTimeoutsValue.getValue();<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>  private class TestProcEnv {<a 
name="line.206"></a>
-<span class="sourceLineNo">207</span>    public ProcedureScheduler 
getProcedureScheduler() {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>      return 
procExecutor.getScheduler();<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    }<a name="line.209"></a>
-<span class="sourceLineNo">210</span>  }<a name="line.210"></a>
-<span class="sourceLineNo">211</span>}<a name="line.211"></a>
+<span class="sourceLineNo">147</span>    public TestTimeoutEventProcedure() 
{}<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span>    public 
TestTimeoutEventProcedure(final int timeoutMsec, final int maxTimeouts) {<a 
name="line.149"></a>
+<span class="sourceLineNo">150</span>      this.maxTimeouts = maxTimeouts;<a 
name="line.150"></a>
+<span class="sourceLineNo">151</span>      setTimeout(timeoutMsec);<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>    public int getTimeoutsCount() {<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>      return ntimeouts.get();<a 
name="line.155"></a>
+<span class="sourceLineNo">156</span>    }<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span>    @Override<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    protected Procedure[] execute(final 
TestProcEnv env) throws ProcedureSuspendedException {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      LOG.info("EXECUTE " + this + " 
ntimeouts=" + ntimeouts);<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      if (ntimeouts.get() &gt; 
maxTimeouts) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span>        setAbortFailure("test", "give up 
after " + ntimeouts.get());<a name="line.162"></a>
+<span class="sourceLineNo">163</span>        return null;<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>      }<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span>      event.suspend();<a 
name="line.166"></a>
+<span class="sourceLineNo">167</span>      if (event.suspendIfNotReady(this)) 
{<a name="line.167"></a>
+<span class="sourceLineNo">168</span>        
setState(ProcedureState.WAITING_TIMEOUT);<a name="line.168"></a>
+<span class="sourceLineNo">169</span>        throw new 
ProcedureSuspendedException();<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>      return null;<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    }<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>    protected synchronized boolean 
setTimeoutFailure(final TestProcEnv env) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      int n = 
ntimeouts.incrementAndGet();<a name="line.177"></a>
+<span class="sourceLineNo">178</span>      LOG.info("HANDLE TIMEOUT " + this + 
" ntimeouts=" + n);<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      
setState(ProcedureState.RUNNABLE);<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      
event.wake((AbstractProcedureScheduler) env.getProcedureScheduler());<a 
name="line.180"></a>
+<span class="sourceLineNo">181</span>      return false;<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>    protected void afterReplay(final 
TestProcEnv env) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      if (getState() == 
ProcedureState.WAITING_TIMEOUT) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>        event.suspend();<a 
name="line.187"></a>
+<span class="sourceLineNo">188</span>        event.suspendIfNotReady(this);<a 
name="line.188"></a>
+<span class="sourceLineNo">189</span>      }<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span>    @Override<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    protected void 
serializeStateData(ProcedureStateSerializer serializer)<a name="line.193"></a>
+<span class="sourceLineNo">194</span>        throws IOException {<a 
name="line.194"></a>
+<span class="sourceLineNo">195</span>      Int32Value.Builder ntimeoutsBuilder 
= Int32Value.newBuilder().setValue(ntimeouts.get());<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      
serializer.serialize(ntimeoutsBuilder.build());<a name="line.196"></a>
+<span class="sourceLineNo">197</span><a name="line.197"></a>
+<span class="sourceLineNo">198</span>      Int32Value.Builder 
maxTimeoutsBuilder = Int32Value.newBuilder().setValue(maxTimeouts);<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>      
serializer.serialize(maxTimeoutsBuilder.build());<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span>    @Override<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    protected void 
deserializeStateData(ProcedureStateSerializer serializer)<a name="line.203"></a>
+<span class="sourceLineNo">204</span>        throws IOException {<a 
name="line.204"></a>
+<span class="sourceLineNo">205</span>      Int32Value ntimeoutsValue = 
serializer.deserialize(Int32Value.class);<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      
ntimeouts.set(ntimeoutsValue.getValue());<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span>      Int32Value maxTimeoutsValue = 
serializer.deserialize(Int32Value.class);<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      maxTimeouts = 
maxTimeoutsValue.getValue();<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    }<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>
+<span class="sourceLineNo">213</span>  private class TestProcEnv {<a 
name="line.213"></a>
+<span class="sourceLineNo">214</span>    public ProcedureScheduler 
getProcedureScheduler() {<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      return 
procExecutor.getScheduler();<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    }<a name="line.216"></a>
+<span class="sourceLineNo">217</span>  }<a name="line.217"></a>
+<span class="sourceLineNo">218</span>}<a name="line.218"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/40477ee9/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureEvents.TestTimeoutEventProcedure.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureEvents.TestTimeoutEventProcedure.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureEvents.TestTimeoutEventProcedure.html
index cfe0ebc..f1bd6d3 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureEvents.TestTimeoutEventProcedure.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureEvents.TestTimeoutEventProcedure.html
@@ -88,135 +88,142 @@
 <span class="sourceLineNo">080</span>    fs.delete(logDir, true);<a 
name="line.80"></a>
 <span class="sourceLineNo">081</span>  }<a name="line.81"></a>
 <span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span>  @Test<a name="line.83"></a>
-<span class="sourceLineNo">084</span>  public void testTimeoutEventProcedure() 
throws Exception {<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    final int NTIMEOUTS = 5;<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span>    TestTimeoutEventProcedure proc = new 
TestTimeoutEventProcedure(500, NTIMEOUTS);<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    procExecutor.submitProcedure(proc);<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>    
ProcedureTestingUtility.waitProcedure(procExecutor, proc.getProcId());<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>    
ProcedureTestingUtility.assertIsAbortException(procExecutor.getResult(proc.getProcId()));<a
 name="line.91"></a>
-<span class="sourceLineNo">092</span>    assertEquals(NTIMEOUTS + 1, 
proc.getTimeoutsCount());<a name="line.92"></a>
-<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 
testTimeoutEventProcedureDoubleExecution() throws Exception {<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span>    
testTimeoutEventProcedureDoubleExecution(false);<a name="line.97"></a>
-<span class="sourceLineNo">098</span>  }<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>  @Test<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  public void 
testTimeoutEventProcedureDoubleExecutionKillIfSuspended() throws Exception {<a 
name="line.101"></a>
-<span class="sourceLineNo">102</span>    
testTimeoutEventProcedureDoubleExecution(true);<a name="line.102"></a>
-<span class="sourceLineNo">103</span>  }<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span>  private void 
testTimeoutEventProcedureDoubleExecution(final boolean killIfSuspended)<a 
name="line.105"></a>
-<span class="sourceLineNo">106</span>      throws Exception {<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>    TestTimeoutEventProcedure proc = new 
TestTimeoutEventProcedure(1000, 3);<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, 
true);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    
ProcedureTestingUtility.setKillIfSuspended(procExecutor, killIfSuspended);<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>    long procId = 
procExecutor.submitProcedure(proc);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    
ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId, 
true);<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    
ProcedureTestingUtility.assertIsAbortException(procExecutor.getResult(proc.getProcId()));<a
 name="line.112"></a>
-<span class="sourceLineNo">113</span>  }<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span>  /**<a name="line.115"></a>
-<span class="sourceLineNo">116</span>   * This Event+Procedure exhibits 
following behavior:<a name="line.116"></a>
-<span class="sourceLineNo">117</span>   * &lt;ul&gt;<a name="line.117"></a>
-<span class="sourceLineNo">118</span>   *   &lt;li&gt;On procedure execute()<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>   *     &lt;ul&gt;<a name="line.119"></a>
-<span class="sourceLineNo">120</span>   *       &lt;li&gt;If had enough 
timeouts, abort the procedure. Else....&lt;/li&gt;<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   *       &lt;li&gt;Suspend the event 
and add self to its suspend queue&lt;/li&gt;<a name="line.121"></a>
-<span class="sourceLineNo">122</span>   *       &lt;li&gt;Go into waiting 
state&lt;/li&gt;<a name="line.122"></a>
-<span class="sourceLineNo">123</span>   *     &lt;/ul&gt;<a 
name="line.123"></a>
-<span class="sourceLineNo">124</span>   *   &lt;/li&gt;<a name="line.124"></a>
-<span class="sourceLineNo">125</span>   *   &lt;li&gt;<a name="line.125"></a>
-<span class="sourceLineNo">126</span>   *     On waiting timeout<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>   *     &lt;ul&gt;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>   *       &lt;li&gt;Wake the event 
(which adds this procedure back into scheduler queue), and set own's<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>   *       state to RUNNABLE (so can be 
executed again).&lt;/li&gt;<a name="line.129"></a>
+<span class="sourceLineNo">083</span>  /**<a name="line.83"></a>
+<span class="sourceLineNo">084</span>   * Tests being able to suspend a 
Procedure for N timeouts and then failing.s<a name="line.84"></a>
+<span class="sourceLineNo">085</span>   * Resets the timeout after each 
elapses. See {@link TestTimeoutEventProcedure} for example<a name="line.85"></a>
+<span class="sourceLineNo">086</span>   * of how to do this sort of trickery 
with the ProcedureExecutor; i.e. suspend for a while,<a name="line.86"></a>
+<span class="sourceLineNo">087</span>   * check for a condition and if not 
set, suspend again, etc., ultimately failing or succeeding<a name="line.87"></a>
+<span class="sourceLineNo">088</span>   * eventually.<a name="line.88"></a>
+<span class="sourceLineNo">089</span>   */<a name="line.89"></a>
+<span class="sourceLineNo">090</span>  @Test<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  public void testTimeoutEventProcedure() 
throws Exception {<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    final int NTIMEOUTS = 5;<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span>    TestTimeoutEventProcedure proc = new 
TestTimeoutEventProcedure(500, NTIMEOUTS);<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    procExecutor.submitProcedure(proc);<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span>    
ProcedureTestingUtility.waitProcedure(procExecutor, proc.getProcId());<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>    
ProcedureTestingUtility.assertIsAbortException(procExecutor.getResult(proc.getProcId()));<a
 name="line.98"></a>
+<span class="sourceLineNo">099</span>    assertEquals(NTIMEOUTS + 1, 
proc.getTimeoutsCount());<a name="line.99"></a>
+<span class="sourceLineNo">100</span>  }<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>  @Test<a name="line.102"></a>
+<span class="sourceLineNo">103</span>  public void 
testTimeoutEventProcedureDoubleExecution() throws Exception {<a 
name="line.103"></a>
+<span class="sourceLineNo">104</span>    
testTimeoutEventProcedureDoubleExecution(false);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>  }<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span>  @Test<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  public void 
testTimeoutEventProcedureDoubleExecutionKillIfSuspended() throws Exception {<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>    
testTimeoutEventProcedureDoubleExecution(true);<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>  private void 
testTimeoutEventProcedureDoubleExecution(final boolean killIfSuspended)<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>      throws Exception {<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span>    TestTimeoutEventProcedure proc = new 
TestTimeoutEventProcedure(1000, 3);<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, 
true);<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    
ProcedureTestingUtility.setKillIfSuspended(procExecutor, killIfSuspended);<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>    long procId = 
procExecutor.submitProcedure(proc);<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    
ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId, 
true);<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    
ProcedureTestingUtility.assertIsAbortException(procExecutor.getResult(proc.getProcId()));<a
 name="line.119"></a>
+<span class="sourceLineNo">120</span>  }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span>  /**<a name="line.122"></a>
+<span class="sourceLineNo">123</span>   * This Event+Procedure exhibits 
following behavior:<a name="line.123"></a>
+<span class="sourceLineNo">124</span>   * &lt;ul&gt;<a name="line.124"></a>
+<span class="sourceLineNo">125</span>   *   &lt;li&gt;On procedure execute()<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>   *     &lt;ul&gt;<a name="line.126"></a>
+<span class="sourceLineNo">127</span>   *       &lt;li&gt;If had enough 
timeouts, abort the procedure. Else....&lt;/li&gt;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>   *       &lt;li&gt;Suspend the event 
and add self to its suspend queue&lt;/li&gt;<a name="line.128"></a>
+<span class="sourceLineNo">129</span>   *       &lt;li&gt;Go into waiting 
state&lt;/li&gt;<a name="line.129"></a>
 <span class="sourceLineNo">130</span>   *     &lt;/ul&gt;<a 
name="line.130"></a>
 <span class="sourceLineNo">131</span>   *   &lt;/li&gt;<a name="line.131"></a>
-<span class="sourceLineNo">132</span>   * &lt;/ul&gt;<a name="line.132"></a>
-<span class="sourceLineNo">133</span>   */<a name="line.133"></a>
-<span class="sourceLineNo">134</span>  public static class 
TestTimeoutEventProcedure extends NoopProcedure&lt;TestProcEnv&gt; {<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>    private final ProcedureEvent event = 
new ProcedureEvent("timeout-event");<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span>    private final AtomicInteger ntimeouts 
= new AtomicInteger(0);<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    private int maxTimeouts = 1;<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span>    public TestTimeoutEventProcedure() 
{}<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>    public 
TestTimeoutEventProcedure(final int timeoutMsec, final int maxTimeouts) {<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>      this.maxTimeouts = maxTimeouts;<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>      setTimeout(timeoutMsec);<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>    }<a name="line.145"></a>
+<span class="sourceLineNo">132</span>   *   &lt;li&gt;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>   *     On waiting timeout<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>   *     &lt;ul&gt;<a name="line.134"></a>
+<span class="sourceLineNo">135</span>   *       &lt;li&gt;Wake the event 
(which adds this procedure back into scheduler queue), and set own's<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>   *       state to RUNNABLE (so can be 
executed again).&lt;/li&gt;<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   *     &lt;/ul&gt;<a 
name="line.137"></a>
+<span class="sourceLineNo">138</span>   *   &lt;/li&gt;<a name="line.138"></a>
+<span class="sourceLineNo">139</span>   * &lt;/ul&gt;<a name="line.139"></a>
+<span class="sourceLineNo">140</span>   */<a name="line.140"></a>
+<span class="sourceLineNo">141</span>  public static class 
TestTimeoutEventProcedure extends NoopProcedure&lt;TestProcEnv&gt; {<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>    private final ProcedureEvent event = 
new ProcedureEvent("timeout-event");<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>    private final AtomicInteger ntimeouts 
= new AtomicInteger(0);<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    private int maxTimeouts = 1;<a 
name="line.145"></a>
 <span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span>    public int getTimeoutsCount() {<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span>      return ntimeouts.get();<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>    }<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span>    @Override<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    protected Procedure[] execute(final 
TestProcEnv env) throws ProcedureSuspendedException {<a name="line.152"></a>
-<span class="sourceLineNo">153</span>      LOG.info("EXECUTE " + this + " 
ntimeouts=" + ntimeouts);<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      if (ntimeouts.get() &gt; 
maxTimeouts) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>        setAbortFailure("test", "give up 
after " + ntimeouts.get());<a name="line.155"></a>
-<span class="sourceLineNo">156</span>        return null;<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>      event.suspend();<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>      if (event.suspendIfNotReady(this)) 
{<a name="line.160"></a>
-<span class="sourceLineNo">161</span>        
setState(ProcedureState.WAITING_TIMEOUT);<a name="line.161"></a>
-<span class="sourceLineNo">162</span>        throw new 
ProcedureSuspendedException();<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>      return null;<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>    @Override<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    protected synchronized boolean 
setTimeoutFailure(final TestProcEnv env) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      int n = 
ntimeouts.incrementAndGet();<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      LOG.info("HANDLE TIMEOUT " + this + 
" ntimeouts=" + n);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      
setState(ProcedureState.RUNNABLE);<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      
event.wake((AbstractProcedureScheduler) env.getProcedureScheduler());<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>      return false;<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    }<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span>    @Override<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    protected void afterReplay(final 
TestProcEnv env) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      if (getState() == 
ProcedureState.WAITING_TIMEOUT) {<a name="line.179"></a>
-<span class="sourceLineNo">180</span>        event.suspend();<a 
name="line.180"></a>
-<span class="sourceLineNo">181</span>        event.suspendIfNotReady(this);<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><a name="line.184"></a>
-<span class="sourceLineNo">185</span>    @Override<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    protected void 
serializeStateData(ProcedureStateSerializer serializer)<a name="line.186"></a>
-<span class="sourceLineNo">187</span>        throws IOException {<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>      Int32Value.Builder ntimeoutsBuilder 
= Int32Value.newBuilder().setValue(ntimeouts.get());<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      
serializer.serialize(ntimeoutsBuilder.build());<a name="line.189"></a>
-<span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span>      Int32Value.Builder 
maxTimeoutsBuilder = Int32Value.newBuilder().setValue(maxTimeouts);<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>      
serializer.serialize(maxTimeoutsBuilder.build());<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    }<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span>    @Override<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    protected void 
deserializeStateData(ProcedureStateSerializer serializer)<a name="line.196"></a>
-<span class="sourceLineNo">197</span>        throws IOException {<a 
name="line.197"></a>
-<span class="sourceLineNo">198</span>      Int32Value ntimeoutsValue = 
serializer.deserialize(Int32Value.class);<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      
ntimeouts.set(ntimeoutsValue.getValue());<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span>      Int32Value maxTimeoutsValue = 
serializer.deserialize(Int32Value.class);<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      maxTimeouts = 
maxTimeoutsValue.getValue();<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>  private class TestProcEnv {<a 
name="line.206"></a>
-<span class="sourceLineNo">207</span>    public ProcedureScheduler 
getProcedureScheduler() {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>      return 
procExecutor.getScheduler();<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    }<a name="line.209"></a>
-<span class="sourceLineNo">210</span>  }<a name="line.210"></a>
-<span class="sourceLineNo">211</span>}<a name="line.211"></a>
+<span class="sourceLineNo">147</span>    public TestTimeoutEventProcedure() 
{}<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span>    public 
TestTimeoutEventProcedure(final int timeoutMsec, final int maxTimeouts) {<a 
name="line.149"></a>
+<span class="sourceLineNo">150</span>      this.maxTimeouts = maxTimeouts;<a 
name="line.150"></a>
+<span class="sourceLineNo">151</span>      setTimeout(timeoutMsec);<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>    public int getTimeoutsCount() {<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>      return ntimeouts.get();<a 
name="line.155"></a>
+<span class="sourceLineNo">156</span>    }<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span>    @Override<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    protected Procedure[] execute(final 
TestProcEnv env) throws ProcedureSuspendedException {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      LOG.info("EXECUTE " + this + " 
ntimeouts=" + ntimeouts);<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      if (ntimeouts.get() &gt; 
maxTimeouts) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span>        setAbortFailure("test", "give up 
after " + ntimeouts.get());<a name="line.162"></a>
+<span class="sourceLineNo">163</span>        return null;<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>      }<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span>      event.suspend();<a 
name="line.166"></a>
+<span class="sourceLineNo">167</span>      if (event.suspendIfNotReady(this)) 
{<a name="line.167"></a>
+<span class="sourceLineNo">168</span>        
setState(ProcedureState.WAITING_TIMEOUT);<a name="line.168"></a>
+<span class="sourceLineNo">169</span>        throw new 
ProcedureSuspendedException();<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>      return null;<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    }<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>    protected synchronized boolean 
setTimeoutFailure(final TestProcEnv env) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      int n = 
ntimeouts.incrementAndGet();<a name="line.177"></a>
+<span class="sourceLineNo">178</span>      LOG.info("HANDLE TIMEOUT " + this + 
" ntimeouts=" + n);<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      
setState(ProcedureState.RUNNABLE);<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      
event.wake((AbstractProcedureScheduler) env.getProcedureScheduler());<a 
name="line.180"></a>
+<span class="sourceLineNo">181</span>      return false;<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>    protected void afterReplay(final 
TestProcEnv env) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      if (getState() == 
ProcedureState.WAITING_TIMEOUT) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>        event.suspend();<a 
name="line.187"></a>
+<span class="sourceLineNo">188</span>        event.suspendIfNotReady(this);<a 
name="line.188"></a>
+<span class="sourceLineNo">189</span>      }<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span>    @Override<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    protected void 
serializeStateData(ProcedureStateSerializer serializer)<a name="line.193"></a>
+<span class="sourceLineNo">194</span>        throws IOException {<a 
name="line.194"></a>
+<span class="sourceLineNo">195</span>      Int32Value.Builder ntimeoutsBuilder 
= Int32Value.newBuilder().setValue(ntimeouts.get());<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      
serializer.serialize(ntimeoutsBuilder.build());<a name="line.196"></a>
+<span class="sourceLineNo">197</span><a name="line.197"></a>
+<span class="sourceLineNo">198</span>      Int32Value.Builder 
maxTimeoutsBuilder = Int32Value.newBuilder().setValue(maxTimeouts);<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>      
serializer.serialize(maxTimeoutsBuilder.build());<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span>    @Override<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    protected void 
deserializeStateData(ProcedureStateSerializer serializer)<a name="line.203"></a>
+<span class="sourceLineNo">204</span>        throws IOException {<a 
name="line.204"></a>
+<span class="sourceLineNo">205</span>      Int32Value ntimeoutsValue = 
serializer.deserialize(Int32Value.class);<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      
ntimeouts.set(ntimeoutsValue.getValue());<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span>      Int32Value maxTimeoutsValue = 
serializer.deserialize(Int32Value.class);<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      maxTimeouts = 
maxTimeoutsValue.getValue();<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    }<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>
+<span class="sourceLineNo">213</span>  private class TestProcEnv {<a 
name="line.213"></a>
+<span class="sourceLineNo">214</span>    public ProcedureScheduler 
getProcedureScheduler() {<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      return 
procExecutor.getScheduler();<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    }<a name="line.216"></a>
+<span class="sourceLineNo">217</span>  }<a name="line.217"></a>
+<span class="sourceLineNo">218</span>}<a name="line.218"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/40477ee9/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureEvents.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureEvents.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureEvents.html
index cfe0ebc..f1bd6d3 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureEvents.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/procedure2/TestProcedureEvents.html
@@ -88,135 +88,142 @@
 <span class="sourceLineNo">080</span>    fs.delete(logDir, true);<a 
name="line.80"></a>
 <span class="sourceLineNo">081</span>  }<a name="line.81"></a>
 <span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span>  @Test<a name="line.83"></a>
-<span class="sourceLineNo">084</span>  public void testTimeoutEventProcedure() 
throws Exception {<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    final int NTIMEOUTS = 5;<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span>    TestTimeoutEventProcedure proc = new 
TestTimeoutEventProcedure(500, NTIMEOUTS);<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    procExecutor.submitProcedure(proc);<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>    
ProcedureTestingUtility.waitProcedure(procExecutor, proc.getProcId());<a 
name="line.90"></a>
-<span class="sourceLineNo">091</span>    
ProcedureTestingUtility.assertIsAbortException(procExecutor.getResult(proc.getProcId()));<a
 name="line.91"></a>
-<span class="sourceLineNo">092</span>    assertEquals(NTIMEOUTS + 1, 
proc.getTimeoutsCount());<a name="line.92"></a>
-<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 
testTimeoutEventProcedureDoubleExecution() throws Exception {<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span>    
testTimeoutEventProcedureDoubleExecution(false);<a name="line.97"></a>
-<span class="sourceLineNo">098</span>  }<a name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>  @Test<a name="line.100"></a>
-<span class="sourceLineNo">101</span>  public void 
testTimeoutEventProcedureDoubleExecutionKillIfSuspended() throws Exception {<a 
name="line.101"></a>
-<span class="sourceLineNo">102</span>    
testTimeoutEventProcedureDoubleExecution(true);<a name="line.102"></a>
-<span class="sourceLineNo">103</span>  }<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span>  private void 
testTimeoutEventProcedureDoubleExecution(final boolean killIfSuspended)<a 
name="line.105"></a>
-<span class="sourceLineNo">106</span>      throws Exception {<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>    TestTimeoutEventProcedure proc = new 
TestTimeoutEventProcedure(1000, 3);<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, 
true);<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    
ProcedureTestingUtility.setKillIfSuspended(procExecutor, killIfSuspended);<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>    long procId = 
procExecutor.submitProcedure(proc);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    
ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId, 
true);<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    
ProcedureTestingUtility.assertIsAbortException(procExecutor.getResult(proc.getProcId()));<a
 name="line.112"></a>
-<span class="sourceLineNo">113</span>  }<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span>  /**<a name="line.115"></a>
-<span class="sourceLineNo">116</span>   * This Event+Procedure exhibits 
following behavior:<a name="line.116"></a>
-<span class="sourceLineNo">117</span>   * &lt;ul&gt;<a name="line.117"></a>
-<span class="sourceLineNo">118</span>   *   &lt;li&gt;On procedure execute()<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>   *     &lt;ul&gt;<a name="line.119"></a>
-<span class="sourceLineNo">120</span>   *       &lt;li&gt;If had enough 
timeouts, abort the procedure. Else....&lt;/li&gt;<a name="line.120"></a>
-<span class="sourceLineNo">121</span>   *       &lt;li&gt;Suspend the event 
and add self to its suspend queue&lt;/li&gt;<a name="line.121"></a>
-<span class="sourceLineNo">122</span>   *       &lt;li&gt;Go into waiting 
state&lt;/li&gt;<a name="line.122"></a>
-<span class="sourceLineNo">123</span>   *     &lt;/ul&gt;<a 
name="line.123"></a>
-<span class="sourceLineNo">124</span>   *   &lt;/li&gt;<a name="line.124"></a>
-<span class="sourceLineNo">125</span>   *   &lt;li&gt;<a name="line.125"></a>
-<span class="sourceLineNo">126</span>   *     On waiting timeout<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>   *     &lt;ul&gt;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>   *       &lt;li&gt;Wake the event 
(which adds this procedure back into scheduler queue), and set own's<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>   *       state to RUNNABLE (so can be 
executed again).&lt;/li&gt;<a name="line.129"></a>
+<span class="sourceLineNo">083</span>  /**<a name="line.83"></a>
+<span class="sourceLineNo">084</span>   * Tests being able to suspend a 
Procedure for N timeouts and then failing.s<a name="line.84"></a>
+<span class="sourceLineNo">085</span>   * Resets the timeout after each 
elapses. See {@link TestTimeoutEventProcedure} for example<a name="line.85"></a>
+<span class="sourceLineNo">086</span>   * of how to do this sort of trickery 
with the ProcedureExecutor; i.e. suspend for a while,<a name="line.86"></a>
+<span class="sourceLineNo">087</span>   * check for a condition and if not 
set, suspend again, etc., ultimately failing or succeeding<a name="line.87"></a>
+<span class="sourceLineNo">088</span>   * eventually.<a name="line.88"></a>
+<span class="sourceLineNo">089</span>   */<a name="line.89"></a>
+<span class="sourceLineNo">090</span>  @Test<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  public void testTimeoutEventProcedure() 
throws Exception {<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    final int NTIMEOUTS = 5;<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span>    TestTimeoutEventProcedure proc = new 
TestTimeoutEventProcedure(500, NTIMEOUTS);<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    procExecutor.submitProcedure(proc);<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span>    
ProcedureTestingUtility.waitProcedure(procExecutor, proc.getProcId());<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>    
ProcedureTestingUtility.assertIsAbortException(procExecutor.getResult(proc.getProcId()));<a
 name="line.98"></a>
+<span class="sourceLineNo">099</span>    assertEquals(NTIMEOUTS + 1, 
proc.getTimeoutsCount());<a name="line.99"></a>
+<span class="sourceLineNo">100</span>  }<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>  @Test<a name="line.102"></a>
+<span class="sourceLineNo">103</span>  public void 
testTimeoutEventProcedureDoubleExecution() throws Exception {<a 
name="line.103"></a>
+<span class="sourceLineNo">104</span>    
testTimeoutEventProcedureDoubleExecution(false);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>  }<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span>  @Test<a name="line.107"></a>
+<span class="sourceLineNo">108</span>  public void 
testTimeoutEventProcedureDoubleExecutionKillIfSuspended() throws Exception {<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>    
testTimeoutEventProcedureDoubleExecution(true);<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>  private void 
testTimeoutEventProcedureDoubleExecution(final boolean killIfSuspended)<a 
name="line.112"></a>
+<span class="sourceLineNo">113</span>      throws Exception {<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span>    TestTimeoutEventProcedure proc = new 
TestTimeoutEventProcedure(1000, 3);<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExecutor, 
true);<a name="line.115"></a>
+<span class="sourceLineNo">116</span>    
ProcedureTestingUtility.setKillIfSuspended(procExecutor, killIfSuspended);<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>    long procId = 
procExecutor.submitProcedure(proc);<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    
ProcedureTestingUtility.testRecoveryAndDoubleExecution(procExecutor, procId, 
true);<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    
ProcedureTestingUtility.assertIsAbortException(procExecutor.getResult(proc.getProcId()));<a
 name="line.119"></a>
+<span class="sourceLineNo">120</span>  }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span>  /**<a name="line.122"></a>
+<span class="sourceLineNo">123</span>   * This Event+Procedure exhibits 
following behavior:<a name="line.123"></a>
+<span class="sourceLineNo">124</span>   * &lt;ul&gt;<a name="line.124"></a>
+<span class="sourceLineNo">125</span>   *   &lt;li&gt;On procedure execute()<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>   *     &lt;ul&gt;<a name="line.126"></a>
+<span class="sourceLineNo">127</span>   *       &lt;li&gt;If had enough 
timeouts, abort the procedure. Else....&lt;/li&gt;<a name="line.127"></a>
+<span class="sourceLineNo">128</span>   *       &lt;li&gt;Suspend the event 
and add self to its suspend queue&lt;/li&gt;<a name="line.128"></a>
+<span class="sourceLineNo">129</span>   *       &lt;li&gt;Go into waiting 
state&lt;/li&gt;<a name="line.129"></a>
 <span class="sourceLineNo">130</span>   *     &lt;/ul&gt;<a 
name="line.130"></a>
 <span class="sourceLineNo">131</span>   *   &lt;/li&gt;<a name="line.131"></a>
-<span class="sourceLineNo">132</span>   * &lt;/ul&gt;<a name="line.132"></a>
-<span class="sourceLineNo">133</span>   */<a name="line.133"></a>
-<span class="sourceLineNo">134</span>  public static class 
TestTimeoutEventProcedure extends NoopProcedure&lt;TestProcEnv&gt; {<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>    private final ProcedureEvent event = 
new ProcedureEvent("timeout-event");<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span>    private final AtomicInteger ntimeouts 
= new AtomicInteger(0);<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    private int maxTimeouts = 1;<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span>    public TestTimeoutEventProcedure() 
{}<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>    public 
TestTimeoutEventProcedure(final int timeoutMsec, final int maxTimeouts) {<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>      this.maxTimeouts = maxTimeouts;<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>      setTimeout(timeoutMsec);<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>    }<a name="line.145"></a>
+<span class="sourceLineNo">132</span>   *   &lt;li&gt;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>   *     On waiting timeout<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>   *     &lt;ul&gt;<a name="line.134"></a>
+<span class="sourceLineNo">135</span>   *       &lt;li&gt;Wake the event 
(which adds this procedure back into scheduler queue), and set own's<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>   *       state to RUNNABLE (so can be 
executed again).&lt;/li&gt;<a name="line.136"></a>
+<span class="sourceLineNo">137</span>   *     &lt;/ul&gt;<a 
name="line.137"></a>
+<span class="sourceLineNo">138</span>   *   &lt;/li&gt;<a name="line.138"></a>
+<span class="sourceLineNo">139</span>   * &lt;/ul&gt;<a name="line.139"></a>
+<span class="sourceLineNo">140</span>   */<a name="line.140"></a>
+<span class="sourceLineNo">141</span>  public static class 
TestTimeoutEventProcedure extends NoopProcedure&lt;TestProcEnv&gt; {<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>    private final ProcedureEvent event = 
new ProcedureEvent("timeout-event");<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>    private final AtomicInteger ntimeouts 
= new AtomicInteger(0);<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    private int maxTimeouts = 1;<a 
name="line.145"></a>
 <span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span>    public int getTimeoutsCount() {<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span>      return ntimeouts.get();<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>    }<a name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span>    @Override<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    protected Procedure[] execute(final 
TestProcEnv env) throws ProcedureSuspendedException {<a name="line.152"></a>
-<span class="sourceLineNo">153</span>      LOG.info("EXECUTE " + this + " 
ntimeouts=" + ntimeouts);<a name="line.153"></a>
-<span class="sourceLineNo">154</span>      if (ntimeouts.get() &gt; 
maxTimeouts) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>        setAbortFailure("test", "give up 
after " + ntimeouts.get());<a name="line.155"></a>
-<span class="sourceLineNo">156</span>        return null;<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>      event.suspend();<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>      if (event.suspendIfNotReady(this)) 
{<a name="line.160"></a>
-<span class="sourceLineNo">161</span>        
setState(ProcedureState.WAITING_TIMEOUT);<a name="line.161"></a>
-<span class="sourceLineNo">162</span>        throw new 
ProcedureSuspendedException();<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>      return null;<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    }<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>    @Override<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    protected synchronized boolean 
setTimeoutFailure(final TestProcEnv env) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      int n = 
ntimeouts.incrementAndGet();<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      LOG.info("HANDLE TIMEOUT " + this + 
" ntimeouts=" + n);<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      
setState(ProcedureState.RUNNABLE);<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      
event.wake((AbstractProcedureScheduler) env.getProcedureScheduler());<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>      return false;<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    }<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span>    @Override<a name="line.177"></a>
-<span class="sourceLineNo">178</span>    protected void afterReplay(final 
TestProcEnv env) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      if (getState() == 
ProcedureState.WAITING_TIMEOUT) {<a name="line.179"></a>
-<span class="sourceLineNo">180</span>        event.suspend();<a 
name="line.180"></a>
-<span class="sourceLineNo">181</span>        event.suspendIfNotReady(this);<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><a name="line.184"></a>
-<span class="sourceLineNo">185</span>    @Override<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    protected void 
serializeStateData(ProcedureStateSerializer serializer)<a name="line.186"></a>
-<span class="sourceLineNo">187</span>        throws IOException {<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>      Int32Value.Builder ntimeoutsBuilder 
= Int32Value.newBuilder().setValue(ntimeouts.get());<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      
serializer.serialize(ntimeoutsBuilder.build());<a name="line.189"></a>
-<span class="sourceLineNo">190</span><a name="line.190"></a>
-<span class="sourceLineNo">191</span>      Int32Value.Builder 
maxTimeoutsBuilder = Int32Value.newBuilder().setValue(maxTimeouts);<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>      
serializer.serialize(maxTimeoutsBuilder.build());<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    }<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span>    @Override<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    protected void 
deserializeStateData(ProcedureStateSerializer serializer)<a name="line.196"></a>
-<span class="sourceLineNo">197</span>        throws IOException {<a 
name="line.197"></a>
-<span class="sourceLineNo">198</span>      Int32Value ntimeoutsValue = 
serializer.deserialize(Int32Value.class);<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      
ntimeouts.set(ntimeoutsValue.getValue());<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span>      Int32Value maxTimeoutsValue = 
serializer.deserialize(Int32Value.class);<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      maxTimeouts = 
maxTimeoutsValue.getValue();<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>  private class TestProcEnv {<a 
name="line.206"></a>
-<span class="sourceLineNo">207</span>    public ProcedureScheduler 
getProcedureScheduler() {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>      return 
procExecutor.getScheduler();<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    }<a name="line.209"></a>
-<span class="sourceLineNo">210</span>  }<a name="line.210"></a>
-<span class="sourceLineNo">211</span>}<a name="line.211"></a>
+<span class="sourceLineNo">147</span>    public TestTimeoutEventProcedure() 
{}<a name="line.147"></a>
+<span class="sourceLineNo">148</span><a name="line.148"></a>
+<span class="sourceLineNo">149</span>    public 
TestTimeoutEventProcedure(final int timeoutMsec, final int maxTimeouts) {<a 
name="line.149"></a>
+<span class="sourceLineNo">150</span>      this.maxTimeouts = maxTimeouts;<a 
name="line.150"></a>
+<span class="sourceLineNo">151</span>      setTimeout(timeoutMsec);<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>    public int getTimeoutsCount() {<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>      return ntimeouts.get();<a 
name="line.155"></a>
+<span class="sourceLineNo">156</span>    }<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span>    @Override<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    protected Procedure[] execute(final 
TestProcEnv env) throws ProcedureSuspendedException {<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      LOG.info("EXECUTE " + this + " 
ntimeouts=" + ntimeouts);<a name="line.160"></a>
+<span class="sourceLineNo">161</span>      if (ntimeouts.get() &gt; 
maxTimeouts) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span>        setAbortFailure("test", "give up 
after " + ntimeouts.get());<a name="line.162"></a>
+<span class="sourceLineNo">163</span>        return null;<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>      }<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span>      event.suspend();<a 
name="line.166"></a>
+<span class="sourceLineNo">167</span>      if (event.suspendIfNotReady(this)) 
{<a name="line.167"></a>
+<span class="sourceLineNo">168</span>        
setState(ProcedureState.WAITING_TIMEOUT);<a name="line.168"></a>
+<span class="sourceLineNo">169</span>        throw new 
ProcedureSuspendedException();<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>      return null;<a name="line.172"></a>
+<span class="sourceLineNo">173</span>    }<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>    protected synchronized boolean 
setTimeoutFailure(final TestProcEnv env) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      int n = 
ntimeouts.incrementAndGet();<a name="line.177"></a>
+<span class="sourceLineNo">178</span>      LOG.info("HANDLE TIMEOUT " + this + 
" ntimeouts=" + n);<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      
setState(ProcedureState.RUNNABLE);<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      
event.wake((AbstractProcedureScheduler) env.getProcedureScheduler());<a 
name="line.180"></a>
+<span class="sourceLineNo">181</span>      return false;<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>    protected void afterReplay(final 
TestProcEnv env) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      if (getState() == 
ProcedureState.WAITING_TIMEOUT) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span>        event.suspend();<a 
name="line.187"></a>
+<span class="sourceLineNo">188</span>        event.suspendIfNotReady(this);<a 
name="line.188"></a>
+<span class="sourceLineNo">189</span>      }<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span>    @Override<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    protected void 
serializeStateData(ProcedureStateSerializer serializer)<a name="line.193"></a>
+<span class="sourceLineNo">194</span>        throws IOException {<a 
name="line.194"></a>
+<span class="sourceLineNo">195</span>      Int32Value.Builder ntimeoutsBuilder 
= Int32Value.newBuilder().setValue(ntimeouts.get());<a name="line.195"></a>
+<span class="sourceLineNo">196</span>      
serializer.serialize(ntimeoutsBuilder.build());<a name="line.196"></a>
+<span class="sourceLineNo">197</span><a name="line.197"></a>
+<span class="sourceLineNo">198</span>      Int32Value.Builder 
maxTimeoutsBuilder = Int32Value.newBuilder().setValue(maxTimeouts);<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>      
serializer.serialize(maxTimeoutsBuilder.build());<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span>    @Override<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    protected void 
deserializeStateData(ProcedureStateSerializer serializer)<a name="line.203"></a>
+<span class="sourceLineNo">204</span>        throws IOException {<a 
name="line.204"></a>
+<span class="sourceLineNo">205</span>      Int32Value ntimeoutsValue = 
serializer.deserialize(Int32Value.class);<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      
ntimeouts.set(ntimeoutsValue.getValue());<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span>      Int32Value maxTimeoutsValue = 
serializer.deserialize(Int32Value.class);<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      maxTimeouts = 
maxTimeoutsValue.getValue();<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    }<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>
+<span class="sourceLineNo">213</span>  private class TestProcEnv {<a 
name="line.213"></a>
+<span class="sourceLineNo">214</span>    public ProcedureScheduler 
getProcedureScheduler() {<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      return 
procExecutor.getScheduler();<a name="line.215"></a>
+<span class="sourceLineNo">216</span>    }<a name="line.216"></a>
+<span class="sourceLineNo">217</span>  }<a name="line.217"></a>
+<span class="sourceLineNo">218</span>}<a name="line.218"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/40477ee9/testdevapidocs/src-html/org/apache/hadoop/hbase/util/TestRetryCounter.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/util/TestRetryCounter.html 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/util/TestRetryCounter.html
new file mode 100644
index 0000000..cb3ef85
--- /dev/null
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/util/TestRetryCounter.html
@@ -0,0 +1,127 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="en">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" 
title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
+<span class="sourceLineNo">002</span> * Licensed to the Apache Software 
Foundation (ASF) under one<a name="line.2"></a>
+<span class="sourceLineNo">003</span> * or more contributor license 
agreements.  See the NOTICE file<a name="line.3"></a>
+<span class="sourceLineNo">004</span> * distributed with this work for 
additional information<a name="line.4"></a>
+<span class="sourceLineNo">005</span> * regarding copyright ownership.  The 
ASF licenses this file<a name="line.5"></a>
+<span class="sourceLineNo">006</span> * to you under the Apache License, 
Version 2.0 (the<a name="line.6"></a>
+<span class="sourceLineNo">007</span> * "License"); you may not use this file 
except in compliance<a name="line.7"></a>
+<span class="sourceLineNo">008</span> * with the License.  You may obtain a 
copy of the License at<a name="line.8"></a>
+<span class="sourceLineNo">009</span> *<a name="line.9"></a>
+<span class="sourceLineNo">010</span> *     
http://www.apache.org/licenses/LICENSE-2.0<a name="line.10"></a>
+<span class="sourceLineNo">011</span> *<a name="line.11"></a>
+<span class="sourceLineNo">012</span> * Unless required by applicable law or 
agreed to in writing, software<a name="line.12"></a>
+<span class="sourceLineNo">013</span> * distributed under the License is 
distributed on an "AS IS" BASIS,<a name="line.13"></a>
+<span class="sourceLineNo">014</span> * WITHOUT WARRANTIES OR CONDITIONS OF 
ANY KIND, either express or implied.<a name="line.14"></a>
+<span class="sourceLineNo">015</span> * See the License for the specific 
language governing permissions and<a name="line.15"></a>
+<span class="sourceLineNo">016</span> * limitations under the License.<a 
name="line.16"></a>
+<span class="sourceLineNo">017</span> */<a name="line.17"></a>
+<span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.util;<a 
name="line.18"></a>
+<span class="sourceLineNo">019</span><a name="line.19"></a>
+<span class="sourceLineNo">020</span>import static 
junit.framework.TestCase.assertTrue;<a name="line.20"></a>
+<span class="sourceLineNo">021</span><a name="line.21"></a>
+<span class="sourceLineNo">022</span>import 
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import 
org.apache.hadoop.hbase.testclassification.MiscTests;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import 
org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.junit.ClassRule;<a 
name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.junit.Test;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span>import 
org.junit.experimental.categories.Category;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.slf4j.Logger;<a 
name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.slf4j.LoggerFactory;<a 
name="line.29"></a>
+<span class="sourceLineNo">030</span><a name="line.30"></a>
+<span class="sourceLineNo">031</span><a name="line.31"></a>
+<span class="sourceLineNo">032</span>/**<a name="line.32"></a>
+<span class="sourceLineNo">033</span>* Basic test for some old functionality 
we don't seem to have used but that looks nice.<a name="line.33"></a>
+<span class="sourceLineNo">034</span> */<a name="line.34"></a>
+<span class="sourceLineNo">035</span>@Category({MiscTests.class, 
SmallTests.class})<a name="line.35"></a>
+<span class="sourceLineNo">036</span>public class TestRetryCounter {<a 
name="line.36"></a>
+<span class="sourceLineNo">037</span>  @ClassRule<a name="line.37"></a>
+<span class="sourceLineNo">038</span>  public static final HBaseClassTestRule 
CLASS_RULE =<a name="line.38"></a>
+<span class="sourceLineNo">039</span>      
HBaseClassTestRule.forClass(TestRetryCounter.class);<a name="line.39"></a>
+<span class="sourceLineNo">040</span>  private static final Logger LOG = 
LoggerFactory.getLogger(TestRetryCounter.class);<a name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span>  @Test<a name="line.42"></a>
+<span class="sourceLineNo">043</span>  public void testBasics() throws 
InterruptedException {<a name="line.43"></a>
+<span class="sourceLineNo">044</span>    int maxAttempts = 10;<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>    RetryCounterFactory factory =<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>        new 
RetryCounterFactory(maxAttempts, 10, 1000);<a name="line.46"></a>
+<span class="sourceLineNo">047</span>    RetryCounter retryCounter = 
factory.create();<a name="line.47"></a>
+<span class="sourceLineNo">048</span>    while (retryCounter.shouldRetry()) 
{<a name="line.48"></a>
+<span class="sourceLineNo">049</span>      LOG.info("Attempt={}, 
backoffTime={}", retryCounter.getAttemptTimes(),<a name="line.49"></a>
+<span class="sourceLineNo">050</span>          
retryCounter.getBackoffTime());<a name="line.50"></a>
+<span class="sourceLineNo">051</span>      
retryCounter.sleepUntilNextRetry();<a name="line.51"></a>
+<span class="sourceLineNo">052</span>    }<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    
assertTrue(retryCounter.getAttemptTimes() == maxAttempts);<a name="line.53"></a>
+<span class="sourceLineNo">054</span>  }<a name="line.54"></a>
+<span class="sourceLineNo">055</span>}<a name="line.55"></a>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>

Reply via email to