You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2016/03/03 18:17:17 UTC

[31/49] hbase-site git commit: Published site at 4b3e38705cb24aee82615b1b9af47ed549ea1358.

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4ce8323f/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html
index e83e623..eebec9d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/StateMachineProcedure.Flow.html
@@ -29,179 +29,200 @@
 <span class="sourceLineNo">021</span>import java.io.IOException;<a name="line.21"></a>
 <span class="sourceLineNo">022</span>import java.io.InputStream;<a name="line.22"></a>
 <span class="sourceLineNo">023</span>import java.io.OutputStream;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import java.util.Arrays;<a name="line.24"></a>
-<span class="sourceLineNo">025</span><a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.StateMachineProcedureData;<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>/**<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * Procedure described by a series of steps.<a name="line.31"></a>
-<span class="sourceLineNo">032</span> *<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * The procedure implementor must have an enum of 'states', describing<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * the various step of the procedure.<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * Once the procedure is running, the procedure-framework will call executeFromState()<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * using the 'state' provided by the user. The first call to executeFromState()<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * will be performed with 'state = null'. The implementor can jump between<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * states using setNextState(MyStateEnum.ordinal()).<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * The rollback will call rollbackState() for each state that was executed, in reverse order.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> */<a name="line.40"></a>
-<span class="sourceLineNo">041</span>@InterfaceAudience.Private<a name="line.41"></a>
-<span class="sourceLineNo">042</span>@InterfaceStability.Evolving<a name="line.42"></a>
-<span class="sourceLineNo">043</span>public abstract class StateMachineProcedure&lt;TEnvironment, TState&gt;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>    extends Procedure&lt;TEnvironment&gt; {<a name="line.44"></a>
-<span class="sourceLineNo">045</span>  private int stateCount = 0;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>  private int[] states = null;<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>  protected enum Flow {<a name="line.48"></a>
-<span class="sourceLineNo">049</span>    HAS_MORE_STATE,<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    NO_MORE_STATE,<a name="line.50"></a>
-<span class="sourceLineNo">051</span>  }<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span>  /**<a name="line.53"></a>
-<span class="sourceLineNo">054</span>   * called to perform a single step of the specified 'state' of the procedure<a name="line.54"></a>
-<span class="sourceLineNo">055</span>   * @param state state to execute<a name="line.55"></a>
-<span class="sourceLineNo">056</span>   * @return Flow.NO_MORE_STATE if the procedure is completed,<a name="line.56"></a>
-<span class="sourceLineNo">057</span>   *         Flow.HAS_MORE_STATE if there is another step.<a name="line.57"></a>
-<span class="sourceLineNo">058</span>   */<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  protected abstract Flow executeFromState(TEnvironment env, TState state)<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    throws ProcedureYieldException, InterruptedException;<a name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>  /**<a name="line.62"></a>
-<span class="sourceLineNo">063</span>   * called to perform the rollback of the specified state<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   * @param state state to rollback<a name="line.64"></a>
-<span class="sourceLineNo">065</span>   * @throws IOException temporary failure, the rollback will retry later<a name="line.65"></a>
-<span class="sourceLineNo">066</span>   */<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  protected abstract void rollbackState(TEnvironment env, TState state)<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    throws IOException, InterruptedException;<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>  /**<a name="line.70"></a>
-<span class="sourceLineNo">071</span>   * Convert an ordinal (or state id) to an Enum (or more descriptive) state object.<a name="line.71"></a>
-<span class="sourceLineNo">072</span>   * @param stateId the ordinal() of the state enum (or state id)<a name="line.72"></a>
-<span class="sourceLineNo">073</span>   * @return the state enum object<a name="line.73"></a>
-<span class="sourceLineNo">074</span>   */<a name="line.74"></a>
-<span class="sourceLineNo">075</span>  protected abstract TState getState(int stateId);<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span>  /**<a name="line.77"></a>
-<span class="sourceLineNo">078</span>   * Convert the Enum (or more descriptive) state object to an ordinal (or state id).<a name="line.78"></a>
-<span class="sourceLineNo">079</span>   * @param state the state enum object<a name="line.79"></a>
-<span class="sourceLineNo">080</span>   * @return stateId the ordinal() of the state enum (or state id)<a name="line.80"></a>
-<span class="sourceLineNo">081</span>   */<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  protected abstract int getStateId(TState state);<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span>  /**<a name="line.84"></a>
-<span class="sourceLineNo">085</span>   * Return the initial state object that will be used for the first call to executeFromState().<a name="line.85"></a>
-<span class="sourceLineNo">086</span>   * @return the initial state enum object<a name="line.86"></a>
-<span class="sourceLineNo">087</span>   */<a name="line.87"></a>
-<span class="sourceLineNo">088</span>  protected abstract TState getInitialState();<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>  /**<a name="line.90"></a>
-<span class="sourceLineNo">091</span>   * Set the next state for the procedure.<a name="line.91"></a>
-<span class="sourceLineNo">092</span>   * @param state the state enum object<a name="line.92"></a>
-<span class="sourceLineNo">093</span>   */<a name="line.93"></a>
-<span class="sourceLineNo">094</span>  protected void setNextState(final TState state) {<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    setNextState(getStateId(state));<a name="line.95"></a>
-<span class="sourceLineNo">096</span>  }<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>  /**<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   * By default, the executor will try ro run all the steps of the procedure start to finish.<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   * Return true to make the executor yield between execution steps to<a name="line.100"></a>
-<span class="sourceLineNo">101</span>   * give other procedures time to run their steps.<a name="line.101"></a>
-<span class="sourceLineNo">102</span>   * @param state the state we are going to execute next.<a name="line.102"></a>
-<span class="sourceLineNo">103</span>   * @return Return true if the executor should yield before the execution of the specified step.<a name="line.103"></a>
-<span class="sourceLineNo">104</span>   *         Defaults to return false.<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   */<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  protected boolean isYieldBeforeExecuteFromState(TEnvironment env, TState state) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    return false;<a name="line.107"></a>
-<span class="sourceLineNo">108</span>  }<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span>  @Override<a name="line.110"></a>
-<span class="sourceLineNo">111</span>  protected Procedure[] execute(final TEnvironment env)<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      throws ProcedureYieldException, InterruptedException {<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    updateTimestamp();<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    try {<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      TState state = getCurrentState();<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      if (stateCount == 0) {<a name="line.116"></a>
-<span class="sourceLineNo">117</span>        setNextState(getStateId(state));<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      }<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      if (executeFromState(env, state) == Flow.NO_MORE_STATE) {<a name="line.119"></a>
-<span class="sourceLineNo">120</span>        // completed<a name="line.120"></a>
-<span class="sourceLineNo">121</span>        return null;<a name="line.121"></a>
-<span class="sourceLineNo">122</span>      }<a name="line.122"></a>
-<span class="sourceLineNo">123</span>      return (isWaiting() || isFailed()) ? null : new Procedure[] {this};<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    } finally {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      updateTimestamp();<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    }<a name="line.126"></a>
-<span class="sourceLineNo">127</span>  }<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span>  @Override<a name="line.129"></a>
-<span class="sourceLineNo">130</span>  protected void rollback(final TEnvironment env)<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      throws IOException, InterruptedException {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    try {<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      updateTimestamp();<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      rollbackState(env, getCurrentState());<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      stateCount--;<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    } finally {<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      updateTimestamp();<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>  }<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>  @Override<a name="line.141"></a>
-<span class="sourceLineNo">142</span>  protected boolean isYieldAfterExecutionStep(final TEnvironment env) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    return isYieldBeforeExecuteFromState(env, getCurrentState());<a name="line.143"></a>
-<span class="sourceLineNo">144</span>  }<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span>  private TState getCurrentState() {<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    return stateCount &gt; 0 ? getState(states[stateCount-1]) : getInitialState();<a name="line.147"></a>
+<span class="sourceLineNo">024</span>import java.util.ArrayList;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.util.Arrays;<a name="line.25"></a>
+<span class="sourceLineNo">026</span><a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.StateMachineProcedureData;<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> * Procedure described by a series of steps.<a name="line.32"></a>
+<span class="sourceLineNo">033</span> *<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * The procedure implementor must have an enum of 'states', describing<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * the various step of the procedure.<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * Once the procedure is running, the procedure-framework will call executeFromState()<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * using the 'state' provided by the user. The first call to executeFromState()<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * will be performed with 'state = null'. The implementor can jump between<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * states using setNextState(MyStateEnum.ordinal()).<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * The rollback will call rollbackState() for each state that was executed, in reverse order.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> */<a name="line.41"></a>
+<span class="sourceLineNo">042</span>@InterfaceAudience.Private<a name="line.42"></a>
+<span class="sourceLineNo">043</span>@InterfaceStability.Evolving<a name="line.43"></a>
+<span class="sourceLineNo">044</span>public abstract class StateMachineProcedure&lt;TEnvironment, TState&gt;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>    extends Procedure&lt;TEnvironment&gt; {<a name="line.45"></a>
+<span class="sourceLineNo">046</span>  private int stateCount = 0;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>  private int[] states = null;<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span>  private ArrayList&lt;Procedure&gt; subProcList = null;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>  protected enum Flow {<a name="line.51"></a>
+<span class="sourceLineNo">052</span>    HAS_MORE_STATE,<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    NO_MORE_STATE,<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>
+<span class="sourceLineNo">056</span>  /**<a name="line.56"></a>
+<span class="sourceLineNo">057</span>   * called to perform a single step of the specified 'state' of the procedure<a name="line.57"></a>
+<span class="sourceLineNo">058</span>   * @param state state to execute<a name="line.58"></a>
+<span class="sourceLineNo">059</span>   * @return Flow.NO_MORE_STATE if the procedure is completed,<a name="line.59"></a>
+<span class="sourceLineNo">060</span>   *         Flow.HAS_MORE_STATE if there is another step.<a name="line.60"></a>
+<span class="sourceLineNo">061</span>   */<a name="line.61"></a>
+<span class="sourceLineNo">062</span>  protected abstract Flow executeFromState(TEnvironment env, TState state)<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    throws ProcedureYieldException, InterruptedException;<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span>  /**<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   * called to perform the rollback of the specified state<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   * @param state state to rollback<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   * @throws IOException temporary failure, the rollback will retry later<a name="line.68"></a>
+<span class="sourceLineNo">069</span>   */<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  protected abstract void rollbackState(TEnvironment env, TState state)<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    throws IOException, InterruptedException;<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span>  /**<a name="line.73"></a>
+<span class="sourceLineNo">074</span>   * Convert an ordinal (or state id) to an Enum (or more descriptive) state object.<a name="line.74"></a>
+<span class="sourceLineNo">075</span>   * @param stateId the ordinal() of the state enum (or state id)<a name="line.75"></a>
+<span class="sourceLineNo">076</span>   * @return the state enum object<a name="line.76"></a>
+<span class="sourceLineNo">077</span>   */<a name="line.77"></a>
+<span class="sourceLineNo">078</span>  protected abstract TState getState(int stateId);<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span>  /**<a name="line.80"></a>
+<span class="sourceLineNo">081</span>   * Convert the Enum (or more descriptive) state object to an ordinal (or state id).<a name="line.81"></a>
+<span class="sourceLineNo">082</span>   * @param state the state enum object<a name="line.82"></a>
+<span class="sourceLineNo">083</span>   * @return stateId the ordinal() of the state enum (or state id)<a name="line.83"></a>
+<span class="sourceLineNo">084</span>   */<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  protected abstract int getStateId(TState state);<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span>  /**<a name="line.87"></a>
+<span class="sourceLineNo">088</span>   * Return the initial state object that will be used for the first call to executeFromState().<a name="line.88"></a>
+<span class="sourceLineNo">089</span>   * @return the initial state enum object<a name="line.89"></a>
+<span class="sourceLineNo">090</span>   */<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  protected abstract TState getInitialState();<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>  /**<a name="line.93"></a>
+<span class="sourceLineNo">094</span>   * Set the next state for the procedure.<a name="line.94"></a>
+<span class="sourceLineNo">095</span>   * @param state the state enum object<a name="line.95"></a>
+<span class="sourceLineNo">096</span>   */<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  protected void setNextState(final TState state) {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    setNextState(getStateId(state));<a name="line.98"></a>
+<span class="sourceLineNo">099</span>  }<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>   * By default, the executor will try ro run all the steps of the procedure start to finish.<a name="line.102"></a>
+<span class="sourceLineNo">103</span>   * Return true to make the executor yield between execution steps to<a name="line.103"></a>
+<span class="sourceLineNo">104</span>   * give other procedures time to run their steps.<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   * @param state the state we are going to execute next.<a name="line.105"></a>
+<span class="sourceLineNo">106</span>   * @return Return true if the executor should yield before the execution of the specified step.<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   *         Defaults to return false.<a name="line.107"></a>
+<span class="sourceLineNo">108</span>   */<a name="line.108"></a>
+<span class="sourceLineNo">109</span>  protected boolean isYieldBeforeExecuteFromState(TEnvironment env, TState state) {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    return false;<a name="line.110"></a>
+<span class="sourceLineNo">111</span>  }<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span>  /**<a name="line.113"></a>
+<span class="sourceLineNo">114</span>   * Add a child procedure to execute<a name="line.114"></a>
+<span class="sourceLineNo">115</span>   * @param subProcedure the child procedure<a name="line.115"></a>
+<span class="sourceLineNo">116</span>   */<a name="line.116"></a>
+<span class="sourceLineNo">117</span>  protected void addChildProcedure(Procedure subProcedure) {<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    if (subProcList == null) {<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      subProcList = new ArrayList&lt;Procedure&gt;();<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    }<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    subProcList.add(subProcedure);<a name="line.121"></a>
+<span class="sourceLineNo">122</span>  }<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span>  @Override<a name="line.124"></a>
+<span class="sourceLineNo">125</span>  protected Procedure[] execute(final TEnvironment env)<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      throws ProcedureYieldException, InterruptedException {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    updateTimestamp();<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    try {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      TState state = getCurrentState();<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      if (stateCount == 0) {<a name="line.130"></a>
+<span class="sourceLineNo">131</span>        setNextState(getStateId(state));<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      }<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      if (executeFromState(env, state) == Flow.NO_MORE_STATE) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span>        // completed<a name="line.134"></a>
+<span class="sourceLineNo">135</span>        return null;<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      }<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span>      if (subProcList != null &amp;&amp; subProcList.size() != 0) {<a name="line.138"></a>
+<span class="sourceLineNo">139</span>        Procedure[] subProcedures = subProcList.toArray(new Procedure[subProcList.size()]);<a name="line.139"></a>
+<span class="sourceLineNo">140</span>        subProcList = null;<a name="line.140"></a>
+<span class="sourceLineNo">141</span>        return subProcedures;<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      }<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>      return (isWaiting() || isFailed()) ? null : new Procedure[] {this};<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    } finally {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>      updateTimestamp();<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><a name="line.149"></a>
-<span class="sourceLineNo">150</span>  /**<a name="line.150"></a>
-<span class="sourceLineNo">151</span>   * Set the next state for the procedure.<a name="line.151"></a>
-<span class="sourceLineNo">152</span>   * @param stateId the ordinal() of the state enum (or state id)<a name="line.152"></a>
-<span class="sourceLineNo">153</span>   */<a name="line.153"></a>
-<span class="sourceLineNo">154</span>  private void setNextState(final int stateId) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    if (states == null || states.length == stateCount) {<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      int newCapacity = stateCount + 8;<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      if (states != null) {<a name="line.157"></a>
-<span class="sourceLineNo">158</span>        states = Arrays.copyOf(states, newCapacity);<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      } else {<a name="line.159"></a>
-<span class="sourceLineNo">160</span>        states = new int[newCapacity];<a name="line.160"></a>
-<span class="sourceLineNo">161</span>      }<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    }<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    states[stateCount++] = stateId;<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>  @Override<a name="line.166"></a>
-<span class="sourceLineNo">167</span>  protected void toStringState(StringBuilder builder) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    super.toStringState(builder);<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    if (!isFinished() &amp;&amp; getCurrentState() != null) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      builder.append(":").append(getCurrentState());<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    }<a name="line.171"></a>
-<span class="sourceLineNo">172</span>  }<a name="line.172"></a>
-<span class="sourceLineNo">173</span><a name="line.173"></a>
-<span class="sourceLineNo">174</span>  @Override<a name="line.174"></a>
-<span class="sourceLineNo">175</span>  protected void serializeStateData(final OutputStream stream) throws IOException {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    StateMachineProcedureData.Builder data = StateMachineProcedureData.newBuilder();<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    for (int i = 0; i &lt; stateCount; ++i) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      data.addState(states[i]);<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    }<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    data.build().writeDelimitedTo(stream);<a name="line.180"></a>
-<span class="sourceLineNo">181</span>  }<a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span>  @Override<a name="line.183"></a>
-<span class="sourceLineNo">184</span>  protected void deserializeStateData(final InputStream stream) throws IOException {<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    StateMachineProcedureData data = StateMachineProcedureData.parseDelimitedFrom(stream);<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    stateCount = data.getStateCount();<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    if (stateCount &gt; 0) {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      states = new int[stateCount];<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      for (int i = 0; i &lt; stateCount; ++i) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span>        states[i] = data.getState(i);<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      }<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    } else {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      states = null;<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>}<a name="line.196"></a>
+<span class="sourceLineNo">150</span>  @Override<a name="line.150"></a>
+<span class="sourceLineNo">151</span>  protected void rollback(final TEnvironment env)<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      throws IOException, InterruptedException {<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    try {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>      updateTimestamp();<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      rollbackState(env, getCurrentState());<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      stateCount--;<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    } finally {<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      updateTimestamp();<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    }<a name="line.159"></a>
+<span class="sourceLineNo">160</span>  }<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span>  @Override<a name="line.162"></a>
+<span class="sourceLineNo">163</span>  protected boolean isYieldAfterExecutionStep(final TEnvironment env) {<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    return isYieldBeforeExecuteFromState(env, getCurrentState());<a name="line.164"></a>
+<span class="sourceLineNo">165</span>  }<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span>  private TState getCurrentState() {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    return stateCount &gt; 0 ? getState(states[stateCount-1]) : getInitialState();<a name="line.168"></a>
+<span class="sourceLineNo">169</span>  }<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span>  /**<a name="line.171"></a>
+<span class="sourceLineNo">172</span>   * Set the next state for the procedure.<a name="line.172"></a>
+<span class="sourceLineNo">173</span>   * @param stateId the ordinal() of the state enum (or state id)<a name="line.173"></a>
+<span class="sourceLineNo">174</span>   */<a name="line.174"></a>
+<span class="sourceLineNo">175</span>  private void setNextState(final int stateId) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    if (states == null || states.length == stateCount) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      int newCapacity = stateCount + 8;<a name="line.177"></a>
+<span class="sourceLineNo">178</span>      if (states != null) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>        states = Arrays.copyOf(states, newCapacity);<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      } else {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        states = new int[newCapacity];<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>    states[stateCount++] = stateId;<a name="line.184"></a>
+<span class="sourceLineNo">185</span>  }<a name="line.185"></a>
+<span class="sourceLineNo">186</span><a name="line.186"></a>
+<span class="sourceLineNo">187</span>  @Override<a name="line.187"></a>
+<span class="sourceLineNo">188</span>  protected void toStringState(StringBuilder builder) {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    super.toStringState(builder);<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    if (!isFinished() &amp;&amp; getCurrentState() != null) {<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      builder.append(":").append(getCurrentState());<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><a name="line.194"></a>
+<span class="sourceLineNo">195</span>  @Override<a name="line.195"></a>
+<span class="sourceLineNo">196</span>  protected void serializeStateData(final OutputStream stream) throws IOException {<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    StateMachineProcedureData.Builder data = StateMachineProcedureData.newBuilder();<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    for (int i = 0; i &lt; stateCount; ++i) {<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      data.addState(states[i]);<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    data.build().writeDelimitedTo(stream);<a name="line.201"></a>
+<span class="sourceLineNo">202</span>  }<a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span>  @Override<a name="line.204"></a>
+<span class="sourceLineNo">205</span>  protected void deserializeStateData(final InputStream stream) throws IOException {<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    StateMachineProcedureData data = StateMachineProcedureData.parseDelimitedFrom(stream);<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    stateCount = data.getStateCount();<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    if (stateCount &gt; 0) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      states = new int[stateCount];<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      for (int i = 0; i &lt; stateCount; ++i) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>        states[i] = data.getState(i);<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      }<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    } else {<a name="line.213"></a>
+<span class="sourceLineNo">214</span>      states = null;<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    }<a name="line.215"></a>
+<span class="sourceLineNo">216</span>  }<a name="line.216"></a>
+<span class="sourceLineNo">217</span>}<a name="line.217"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4ce8323f/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/StateMachineProcedure.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/StateMachineProcedure.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/StateMachineProcedure.html
index e83e623..eebec9d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/StateMachineProcedure.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/StateMachineProcedure.html
@@ -29,179 +29,200 @@
 <span class="sourceLineNo">021</span>import java.io.IOException;<a name="line.21"></a>
 <span class="sourceLineNo">022</span>import java.io.InputStream;<a name="line.22"></a>
 <span class="sourceLineNo">023</span>import java.io.OutputStream;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import java.util.Arrays;<a name="line.24"></a>
-<span class="sourceLineNo">025</span><a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.StateMachineProcedureData;<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>/**<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * Procedure described by a series of steps.<a name="line.31"></a>
-<span class="sourceLineNo">032</span> *<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * The procedure implementor must have an enum of 'states', describing<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * the various step of the procedure.<a name="line.34"></a>
-<span class="sourceLineNo">035</span> * Once the procedure is running, the procedure-framework will call executeFromState()<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * using the 'state' provided by the user. The first call to executeFromState()<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * will be performed with 'state = null'. The implementor can jump between<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * states using setNextState(MyStateEnum.ordinal()).<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * The rollback will call rollbackState() for each state that was executed, in reverse order.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> */<a name="line.40"></a>
-<span class="sourceLineNo">041</span>@InterfaceAudience.Private<a name="line.41"></a>
-<span class="sourceLineNo">042</span>@InterfaceStability.Evolving<a name="line.42"></a>
-<span class="sourceLineNo">043</span>public abstract class StateMachineProcedure&lt;TEnvironment, TState&gt;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>    extends Procedure&lt;TEnvironment&gt; {<a name="line.44"></a>
-<span class="sourceLineNo">045</span>  private int stateCount = 0;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>  private int[] states = null;<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>  protected enum Flow {<a name="line.48"></a>
-<span class="sourceLineNo">049</span>    HAS_MORE_STATE,<a name="line.49"></a>
-<span class="sourceLineNo">050</span>    NO_MORE_STATE,<a name="line.50"></a>
-<span class="sourceLineNo">051</span>  }<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span>  /**<a name="line.53"></a>
-<span class="sourceLineNo">054</span>   * called to perform a single step of the specified 'state' of the procedure<a name="line.54"></a>
-<span class="sourceLineNo">055</span>   * @param state state to execute<a name="line.55"></a>
-<span class="sourceLineNo">056</span>   * @return Flow.NO_MORE_STATE if the procedure is completed,<a name="line.56"></a>
-<span class="sourceLineNo">057</span>   *         Flow.HAS_MORE_STATE if there is another step.<a name="line.57"></a>
-<span class="sourceLineNo">058</span>   */<a name="line.58"></a>
-<span class="sourceLineNo">059</span>  protected abstract Flow executeFromState(TEnvironment env, TState state)<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    throws ProcedureYieldException, InterruptedException;<a name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>  /**<a name="line.62"></a>
-<span class="sourceLineNo">063</span>   * called to perform the rollback of the specified state<a name="line.63"></a>
-<span class="sourceLineNo">064</span>   * @param state state to rollback<a name="line.64"></a>
-<span class="sourceLineNo">065</span>   * @throws IOException temporary failure, the rollback will retry later<a name="line.65"></a>
-<span class="sourceLineNo">066</span>   */<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  protected abstract void rollbackState(TEnvironment env, TState state)<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    throws IOException, InterruptedException;<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>  /**<a name="line.70"></a>
-<span class="sourceLineNo">071</span>   * Convert an ordinal (or state id) to an Enum (or more descriptive) state object.<a name="line.71"></a>
-<span class="sourceLineNo">072</span>   * @param stateId the ordinal() of the state enum (or state id)<a name="line.72"></a>
-<span class="sourceLineNo">073</span>   * @return the state enum object<a name="line.73"></a>
-<span class="sourceLineNo">074</span>   */<a name="line.74"></a>
-<span class="sourceLineNo">075</span>  protected abstract TState getState(int stateId);<a name="line.75"></a>
-<span class="sourceLineNo">076</span><a name="line.76"></a>
-<span class="sourceLineNo">077</span>  /**<a name="line.77"></a>
-<span class="sourceLineNo">078</span>   * Convert the Enum (or more descriptive) state object to an ordinal (or state id).<a name="line.78"></a>
-<span class="sourceLineNo">079</span>   * @param state the state enum object<a name="line.79"></a>
-<span class="sourceLineNo">080</span>   * @return stateId the ordinal() of the state enum (or state id)<a name="line.80"></a>
-<span class="sourceLineNo">081</span>   */<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  protected abstract int getStateId(TState state);<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span>  /**<a name="line.84"></a>
-<span class="sourceLineNo">085</span>   * Return the initial state object that will be used for the first call to executeFromState().<a name="line.85"></a>
-<span class="sourceLineNo">086</span>   * @return the initial state enum object<a name="line.86"></a>
-<span class="sourceLineNo">087</span>   */<a name="line.87"></a>
-<span class="sourceLineNo">088</span>  protected abstract TState getInitialState();<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>  /**<a name="line.90"></a>
-<span class="sourceLineNo">091</span>   * Set the next state for the procedure.<a name="line.91"></a>
-<span class="sourceLineNo">092</span>   * @param state the state enum object<a name="line.92"></a>
-<span class="sourceLineNo">093</span>   */<a name="line.93"></a>
-<span class="sourceLineNo">094</span>  protected void setNextState(final TState state) {<a name="line.94"></a>
-<span class="sourceLineNo">095</span>    setNextState(getStateId(state));<a name="line.95"></a>
-<span class="sourceLineNo">096</span>  }<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>  /**<a name="line.98"></a>
-<span class="sourceLineNo">099</span>   * By default, the executor will try ro run all the steps of the procedure start to finish.<a name="line.99"></a>
-<span class="sourceLineNo">100</span>   * Return true to make the executor yield between execution steps to<a name="line.100"></a>
-<span class="sourceLineNo">101</span>   * give other procedures time to run their steps.<a name="line.101"></a>
-<span class="sourceLineNo">102</span>   * @param state the state we are going to execute next.<a name="line.102"></a>
-<span class="sourceLineNo">103</span>   * @return Return true if the executor should yield before the execution of the specified step.<a name="line.103"></a>
-<span class="sourceLineNo">104</span>   *         Defaults to return false.<a name="line.104"></a>
-<span class="sourceLineNo">105</span>   */<a name="line.105"></a>
-<span class="sourceLineNo">106</span>  protected boolean isYieldBeforeExecuteFromState(TEnvironment env, TState state) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span>    return false;<a name="line.107"></a>
-<span class="sourceLineNo">108</span>  }<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span>  @Override<a name="line.110"></a>
-<span class="sourceLineNo">111</span>  protected Procedure[] execute(final TEnvironment env)<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      throws ProcedureYieldException, InterruptedException {<a name="line.112"></a>
-<span class="sourceLineNo">113</span>    updateTimestamp();<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    try {<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      TState state = getCurrentState();<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      if (stateCount == 0) {<a name="line.116"></a>
-<span class="sourceLineNo">117</span>        setNextState(getStateId(state));<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      }<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      if (executeFromState(env, state) == Flow.NO_MORE_STATE) {<a name="line.119"></a>
-<span class="sourceLineNo">120</span>        // completed<a name="line.120"></a>
-<span class="sourceLineNo">121</span>        return null;<a name="line.121"></a>
-<span class="sourceLineNo">122</span>      }<a name="line.122"></a>
-<span class="sourceLineNo">123</span>      return (isWaiting() || isFailed()) ? null : new Procedure[] {this};<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    } finally {<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      updateTimestamp();<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    }<a name="line.126"></a>
-<span class="sourceLineNo">127</span>  }<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span>  @Override<a name="line.129"></a>
-<span class="sourceLineNo">130</span>  protected void rollback(final TEnvironment env)<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      throws IOException, InterruptedException {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>    try {<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      updateTimestamp();<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      rollbackState(env, getCurrentState());<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      stateCount--;<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    } finally {<a name="line.136"></a>
-<span class="sourceLineNo">137</span>      updateTimestamp();<a name="line.137"></a>
-<span class="sourceLineNo">138</span>    }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>  }<a name="line.139"></a>
-<span class="sourceLineNo">140</span><a name="line.140"></a>
-<span class="sourceLineNo">141</span>  @Override<a name="line.141"></a>
-<span class="sourceLineNo">142</span>  protected boolean isYieldAfterExecutionStep(final TEnvironment env) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    return isYieldBeforeExecuteFromState(env, getCurrentState());<a name="line.143"></a>
-<span class="sourceLineNo">144</span>  }<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span>  private TState getCurrentState() {<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    return stateCount &gt; 0 ? getState(states[stateCount-1]) : getInitialState();<a name="line.147"></a>
+<span class="sourceLineNo">024</span>import java.util.ArrayList;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.util.Arrays;<a name="line.25"></a>
+<span class="sourceLineNo">026</span><a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.classification.InterfaceStability;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.protobuf.generated.ProcedureProtos.StateMachineProcedureData;<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> * Procedure described by a series of steps.<a name="line.32"></a>
+<span class="sourceLineNo">033</span> *<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * The procedure implementor must have an enum of 'states', describing<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * the various step of the procedure.<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * Once the procedure is running, the procedure-framework will call executeFromState()<a name="line.36"></a>
+<span class="sourceLineNo">037</span> * using the 'state' provided by the user. The first call to executeFromState()<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * will be performed with 'state = null'. The implementor can jump between<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * states using setNextState(MyStateEnum.ordinal()).<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * The rollback will call rollbackState() for each state that was executed, in reverse order.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> */<a name="line.41"></a>
+<span class="sourceLineNo">042</span>@InterfaceAudience.Private<a name="line.42"></a>
+<span class="sourceLineNo">043</span>@InterfaceStability.Evolving<a name="line.43"></a>
+<span class="sourceLineNo">044</span>public abstract class StateMachineProcedure&lt;TEnvironment, TState&gt;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>    extends Procedure&lt;TEnvironment&gt; {<a name="line.45"></a>
+<span class="sourceLineNo">046</span>  private int stateCount = 0;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>  private int[] states = null;<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span>  private ArrayList&lt;Procedure&gt; subProcList = null;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>  protected enum Flow {<a name="line.51"></a>
+<span class="sourceLineNo">052</span>    HAS_MORE_STATE,<a name="line.52"></a>
+<span class="sourceLineNo">053</span>    NO_MORE_STATE,<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>
+<span class="sourceLineNo">056</span>  /**<a name="line.56"></a>
+<span class="sourceLineNo">057</span>   * called to perform a single step of the specified 'state' of the procedure<a name="line.57"></a>
+<span class="sourceLineNo">058</span>   * @param state state to execute<a name="line.58"></a>
+<span class="sourceLineNo">059</span>   * @return Flow.NO_MORE_STATE if the procedure is completed,<a name="line.59"></a>
+<span class="sourceLineNo">060</span>   *         Flow.HAS_MORE_STATE if there is another step.<a name="line.60"></a>
+<span class="sourceLineNo">061</span>   */<a name="line.61"></a>
+<span class="sourceLineNo">062</span>  protected abstract Flow executeFromState(TEnvironment env, TState state)<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    throws ProcedureYieldException, InterruptedException;<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span>  /**<a name="line.65"></a>
+<span class="sourceLineNo">066</span>   * called to perform the rollback of the specified state<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   * @param state state to rollback<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   * @throws IOException temporary failure, the rollback will retry later<a name="line.68"></a>
+<span class="sourceLineNo">069</span>   */<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  protected abstract void rollbackState(TEnvironment env, TState state)<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    throws IOException, InterruptedException;<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span>  /**<a name="line.73"></a>
+<span class="sourceLineNo">074</span>   * Convert an ordinal (or state id) to an Enum (or more descriptive) state object.<a name="line.74"></a>
+<span class="sourceLineNo">075</span>   * @param stateId the ordinal() of the state enum (or state id)<a name="line.75"></a>
+<span class="sourceLineNo">076</span>   * @return the state enum object<a name="line.76"></a>
+<span class="sourceLineNo">077</span>   */<a name="line.77"></a>
+<span class="sourceLineNo">078</span>  protected abstract TState getState(int stateId);<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span>  /**<a name="line.80"></a>
+<span class="sourceLineNo">081</span>   * Convert the Enum (or more descriptive) state object to an ordinal (or state id).<a name="line.81"></a>
+<span class="sourceLineNo">082</span>   * @param state the state enum object<a name="line.82"></a>
+<span class="sourceLineNo">083</span>   * @return stateId the ordinal() of the state enum (or state id)<a name="line.83"></a>
+<span class="sourceLineNo">084</span>   */<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  protected abstract int getStateId(TState state);<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span>  /**<a name="line.87"></a>
+<span class="sourceLineNo">088</span>   * Return the initial state object that will be used for the first call to executeFromState().<a name="line.88"></a>
+<span class="sourceLineNo">089</span>   * @return the initial state enum object<a name="line.89"></a>
+<span class="sourceLineNo">090</span>   */<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  protected abstract TState getInitialState();<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>  /**<a name="line.93"></a>
+<span class="sourceLineNo">094</span>   * Set the next state for the procedure.<a name="line.94"></a>
+<span class="sourceLineNo">095</span>   * @param state the state enum object<a name="line.95"></a>
+<span class="sourceLineNo">096</span>   */<a name="line.96"></a>
+<span class="sourceLineNo">097</span>  protected void setNextState(final TState state) {<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    setNextState(getStateId(state));<a name="line.98"></a>
+<span class="sourceLineNo">099</span>  }<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>   * By default, the executor will try ro run all the steps of the procedure start to finish.<a name="line.102"></a>
+<span class="sourceLineNo">103</span>   * Return true to make the executor yield between execution steps to<a name="line.103"></a>
+<span class="sourceLineNo">104</span>   * give other procedures time to run their steps.<a name="line.104"></a>
+<span class="sourceLineNo">105</span>   * @param state the state we are going to execute next.<a name="line.105"></a>
+<span class="sourceLineNo">106</span>   * @return Return true if the executor should yield before the execution of the specified step.<a name="line.106"></a>
+<span class="sourceLineNo">107</span>   *         Defaults to return false.<a name="line.107"></a>
+<span class="sourceLineNo">108</span>   */<a name="line.108"></a>
+<span class="sourceLineNo">109</span>  protected boolean isYieldBeforeExecuteFromState(TEnvironment env, TState state) {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    return false;<a name="line.110"></a>
+<span class="sourceLineNo">111</span>  }<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span>  /**<a name="line.113"></a>
+<span class="sourceLineNo">114</span>   * Add a child procedure to execute<a name="line.114"></a>
+<span class="sourceLineNo">115</span>   * @param subProcedure the child procedure<a name="line.115"></a>
+<span class="sourceLineNo">116</span>   */<a name="line.116"></a>
+<span class="sourceLineNo">117</span>  protected void addChildProcedure(Procedure subProcedure) {<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    if (subProcList == null) {<a name="line.118"></a>
+<span class="sourceLineNo">119</span>      subProcList = new ArrayList&lt;Procedure&gt;();<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    }<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    subProcList.add(subProcedure);<a name="line.121"></a>
+<span class="sourceLineNo">122</span>  }<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span>  @Override<a name="line.124"></a>
+<span class="sourceLineNo">125</span>  protected Procedure[] execute(final TEnvironment env)<a name="line.125"></a>
+<span class="sourceLineNo">126</span>      throws ProcedureYieldException, InterruptedException {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>    updateTimestamp();<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    try {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      TState state = getCurrentState();<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      if (stateCount == 0) {<a name="line.130"></a>
+<span class="sourceLineNo">131</span>        setNextState(getStateId(state));<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      }<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      if (executeFromState(env, state) == Flow.NO_MORE_STATE) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span>        // completed<a name="line.134"></a>
+<span class="sourceLineNo">135</span>        return null;<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      }<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span>      if (subProcList != null &amp;&amp; subProcList.size() != 0) {<a name="line.138"></a>
+<span class="sourceLineNo">139</span>        Procedure[] subProcedures = subProcList.toArray(new Procedure[subProcList.size()]);<a name="line.139"></a>
+<span class="sourceLineNo">140</span>        subProcList = null;<a name="line.140"></a>
+<span class="sourceLineNo">141</span>        return subProcedures;<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      }<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>      return (isWaiting() || isFailed()) ? null : new Procedure[] {this};<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    } finally {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>      updateTimestamp();<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><a name="line.149"></a>
-<span class="sourceLineNo">150</span>  /**<a name="line.150"></a>
-<span class="sourceLineNo">151</span>   * Set the next state for the procedure.<a name="line.151"></a>
-<span class="sourceLineNo">152</span>   * @param stateId the ordinal() of the state enum (or state id)<a name="line.152"></a>
-<span class="sourceLineNo">153</span>   */<a name="line.153"></a>
-<span class="sourceLineNo">154</span>  private void setNextState(final int stateId) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>    if (states == null || states.length == stateCount) {<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      int newCapacity = stateCount + 8;<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      if (states != null) {<a name="line.157"></a>
-<span class="sourceLineNo">158</span>        states = Arrays.copyOf(states, newCapacity);<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      } else {<a name="line.159"></a>
-<span class="sourceLineNo">160</span>        states = new int[newCapacity];<a name="line.160"></a>
-<span class="sourceLineNo">161</span>      }<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    }<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    states[stateCount++] = stateId;<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>  @Override<a name="line.166"></a>
-<span class="sourceLineNo">167</span>  protected void toStringState(StringBuilder builder) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    super.toStringState(builder);<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    if (!isFinished() &amp;&amp; getCurrentState() != null) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      builder.append(":").append(getCurrentState());<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    }<a name="line.171"></a>
-<span class="sourceLineNo">172</span>  }<a name="line.172"></a>
-<span class="sourceLineNo">173</span><a name="line.173"></a>
-<span class="sourceLineNo">174</span>  @Override<a name="line.174"></a>
-<span class="sourceLineNo">175</span>  protected void serializeStateData(final OutputStream stream) throws IOException {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    StateMachineProcedureData.Builder data = StateMachineProcedureData.newBuilder();<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    for (int i = 0; i &lt; stateCount; ++i) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      data.addState(states[i]);<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    }<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    data.build().writeDelimitedTo(stream);<a name="line.180"></a>
-<span class="sourceLineNo">181</span>  }<a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span>  @Override<a name="line.183"></a>
-<span class="sourceLineNo">184</span>  protected void deserializeStateData(final InputStream stream) throws IOException {<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    StateMachineProcedureData data = StateMachineProcedureData.parseDelimitedFrom(stream);<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    stateCount = data.getStateCount();<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    if (stateCount &gt; 0) {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      states = new int[stateCount];<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      for (int i = 0; i &lt; stateCount; ++i) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span>        states[i] = data.getState(i);<a name="line.190"></a>
-<span class="sourceLineNo">191</span>      }<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    } else {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      states = null;<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>}<a name="line.196"></a>
+<span class="sourceLineNo">150</span>  @Override<a name="line.150"></a>
+<span class="sourceLineNo">151</span>  protected void rollback(final TEnvironment env)<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      throws IOException, InterruptedException {<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    try {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>      updateTimestamp();<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      rollbackState(env, getCurrentState());<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      stateCount--;<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    } finally {<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      updateTimestamp();<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    }<a name="line.159"></a>
+<span class="sourceLineNo">160</span>  }<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span>  @Override<a name="line.162"></a>
+<span class="sourceLineNo">163</span>  protected boolean isYieldAfterExecutionStep(final TEnvironment env) {<a name="line.163"></a>
+<span class="sourceLineNo">164</span>    return isYieldBeforeExecuteFromState(env, getCurrentState());<a name="line.164"></a>
+<span class="sourceLineNo">165</span>  }<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span>  private TState getCurrentState() {<a name="line.167"></a>
+<span class="sourceLineNo">168</span>    return stateCount &gt; 0 ? getState(states[stateCount-1]) : getInitialState();<a name="line.168"></a>
+<span class="sourceLineNo">169</span>  }<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span>  /**<a name="line.171"></a>
+<span class="sourceLineNo">172</span>   * Set the next state for the procedure.<a name="line.172"></a>
+<span class="sourceLineNo">173</span>   * @param stateId the ordinal() of the state enum (or state id)<a name="line.173"></a>
+<span class="sourceLineNo">174</span>   */<a name="line.174"></a>
+<span class="sourceLineNo">175</span>  private void setNextState(final int stateId) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    if (states == null || states.length == stateCount) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      int newCapacity = stateCount + 8;<a name="line.177"></a>
+<span class="sourceLineNo">178</span>      if (states != null) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>        states = Arrays.copyOf(states, newCapacity);<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      } else {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        states = new int[newCapacity];<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>    states[stateCount++] = stateId;<a name="line.184"></a>
+<span class="sourceLineNo">185</span>  }<a name="line.185"></a>
+<span class="sourceLineNo">186</span><a name="line.186"></a>
+<span class="sourceLineNo">187</span>  @Override<a name="line.187"></a>
+<span class="sourceLineNo">188</span>  protected void toStringState(StringBuilder builder) {<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    super.toStringState(builder);<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    if (!isFinished() &amp;&amp; getCurrentState() != null) {<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      builder.append(":").append(getCurrentState());<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><a name="line.194"></a>
+<span class="sourceLineNo">195</span>  @Override<a name="line.195"></a>
+<span class="sourceLineNo">196</span>  protected void serializeStateData(final OutputStream stream) throws IOException {<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    StateMachineProcedureData.Builder data = StateMachineProcedureData.newBuilder();<a name="line.197"></a>
+<span class="sourceLineNo">198</span>    for (int i = 0; i &lt; stateCount; ++i) {<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      data.addState(states[i]);<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    data.build().writeDelimitedTo(stream);<a name="line.201"></a>
+<span class="sourceLineNo">202</span>  }<a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span>  @Override<a name="line.204"></a>
+<span class="sourceLineNo">205</span>  protected void deserializeStateData(final InputStream stream) throws IOException {<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    StateMachineProcedureData data = StateMachineProcedureData.parseDelimitedFrom(stream);<a name="line.206"></a>
+<span class="sourceLineNo">207</span>    stateCount = data.getStateCount();<a name="line.207"></a>
+<span class="sourceLineNo">208</span>    if (stateCount &gt; 0) {<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      states = new int[stateCount];<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      for (int i = 0; i &lt; stateCount; ++i) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>        states[i] = data.getState(i);<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      }<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    } else {<a name="line.213"></a>
+<span class="sourceLineNo">214</span>      states = null;<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    }<a name="line.215"></a>
+<span class="sourceLineNo">216</span>  }<a name="line.216"></a>
+<span class="sourceLineNo">217</span>}<a name="line.217"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/4ce8323f/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/AbstractMemStore.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/AbstractMemStore.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/AbstractMemStore.html
index 7e80faa..c6029bd 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/AbstractMemStore.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/AbstractMemStore.html
@@ -234,36 +234,36 @@
 <span class="sourceLineNo">226</span>    return getSnapshot().getSize();<a name="line.226"></a>
 <span class="sourceLineNo">227</span>  }<a name="line.227"></a>
 <span class="sourceLineNo">228</span><a name="line.228"></a>
-<span class="sourceLineNo">229</span>  @Override<a name="line.229"></a>
-<span class="sourceLineNo">230</span>  public String toString() {<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    StringBuffer buf = new StringBuffer();<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    int i = 1;<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    try {<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      for (Segment segment : getListOfSegments()) {<a name="line.234"></a>
-<span class="sourceLineNo">235</span>        buf.append("Segment (" + i + ") " + segment.toString() + "; ");<a name="line.235"></a>
-<span class="sourceLineNo">236</span>        i++;<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      }<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    } catch (IOException e){<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      return e.toString();<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    }<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    return buf.toString();<a name="line.241"></a>
-<span class="sourceLineNo">242</span>  }<a name="line.242"></a>
-<span class="sourceLineNo">243</span><a name="line.243"></a>
-<span class="sourceLineNo">244</span>  protected void rollbackInSnapshot(Cell cell) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    // If the key is in the snapshot, delete it. We should not update<a name="line.245"></a>
-<span class="sourceLineNo">246</span>    // this.size, because that tracks the size of only the memstore and<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    // not the snapshot. The flush of this snapshot to disk has not<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    // yet started because Store.flush() waits for all rwcc transactions to<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    // commit before starting the flush to disk.<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    snapshot.rollback(cell);<a name="line.250"></a>
-<span class="sourceLineNo">251</span>  }<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span>  protected void rollbackInActive(Cell cell) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    // If the key is in the memstore, delete it. Update this.size.<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    long sz = active.rollback(cell);<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    if (sz != 0) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span>      setOldestEditTimeToNow();<a name="line.257"></a>
-<span class="sourceLineNo">258</span>    }<a name="line.258"></a>
+<span class="sourceLineNo">229</span>  /**<a name="line.229"></a>
+<span class="sourceLineNo">230</span>   * Remove n key from the memstore. Only cells that have the same key and the<a name="line.230"></a>
+<span class="sourceLineNo">231</span>   * same memstoreTS are removed.  It is ok to not update timeRangeTracker<a name="line.231"></a>
+<span class="sourceLineNo">232</span>   * in this call. It is possible that we can optimize this method by using<a name="line.232"></a>
+<span class="sourceLineNo">233</span>   * tailMap/iterator, but since this method is called rarely (only for<a name="line.233"></a>
+<span class="sourceLineNo">234</span>   * error recovery), we can leave those optimization for the future.<a name="line.234"></a>
+<span class="sourceLineNo">235</span>   * @param cell<a name="line.235"></a>
+<span class="sourceLineNo">236</span>   */<a name="line.236"></a>
+<span class="sourceLineNo">237</span>  @Override<a name="line.237"></a>
+<span class="sourceLineNo">238</span>  public void rollback(Cell cell) {<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    // If the key is in the active, delete it. Update this.size.<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    long sz = active.rollback(cell);<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    if (sz != 0) {<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      setOldestEditTimeToNow();<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    }<a name="line.243"></a>
+<span class="sourceLineNo">244</span>  }<a name="line.244"></a>
+<span class="sourceLineNo">245</span><a name="line.245"></a>
+<span class="sourceLineNo">246</span>  @Override<a name="line.246"></a>
+<span class="sourceLineNo">247</span>  public String toString() {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    StringBuffer buf = new StringBuffer();<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    int i = 1;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>    try {<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      for (Segment segment : getListOfSegments()) {<a name="line.251"></a>
+<span class="sourceLineNo">252</span>        buf.append("Segment (" + i + ") " + segment.toString() + "; ");<a name="line.252"></a>
+<span class="sourceLineNo">253</span>        i++;<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      }<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    } catch (IOException e){<a name="line.255"></a>
+<span class="sourceLineNo">256</span>      return e.toString();<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    }<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    return buf.toString();<a name="line.258"></a>
 <span class="sourceLineNo">259</span>  }<a name="line.259"></a>
 <span class="sourceLineNo">260</span><a name="line.260"></a>
 <span class="sourceLineNo">261</span>  protected Configuration getConfiguration() {<a name="line.261"></a>