You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/07/25 14:49:43 UTC
[03/51] [partial] hbase-site git commit: Published site at
ba5d1c1f28301adc99019d9d6c4a04fac98ae511.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/804782f0/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.html
index 02e56cf..8d2fe80 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/assignment/RegionTransitionProcedure.html
@@ -42,87 +42,87 @@
<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.procedure2.RemoteProcedureDispatcher.RemoteOperation;<a name="line.34"></a>
<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.procedure2.RemoteProcedureDispatcher.RemoteProcedure;<a name="line.35"></a>
<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.procedure2.RemoteProcedureException;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.RegionTransitionState;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.slf4j.Logger;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.slf4j.LoggerFactory;<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>/**<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * Base class for the Assign and Unassign Procedure.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> *<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * Locking:<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * Takes exclusive lock on the region being assigned/unassigned. Thus, there can only be one<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * RegionTransitionProcedure per region running at a time (see MasterProcedureScheduler).<a name="line.50"></a>
-<span class="sourceLineNo">051</span> *<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * <p>This procedure is asynchronous and responds to external events.<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * The AssignmentManager will notify this procedure when the RS completes<a name="line.53"></a>
-<span class="sourceLineNo">054</span> * the operation and reports the transitioned state<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * (see the Assign and Unassign class for more detail).</p><a name="line.55"></a>
-<span class="sourceLineNo">056</span> *<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * <p>Procedures move from the REGION_TRANSITION_QUEUE state when they are<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * first submitted, to the REGION_TRANSITION_DISPATCH state when the request<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * to remote server is sent and the Procedure is suspended waiting on external<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * event to be woken again. Once the external event is triggered, Procedure<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * moves to the REGION_TRANSITION_FINISH state.</p><a name="line.61"></a>
-<span class="sourceLineNo">062</span> *<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * <p>NOTE: {@link AssignProcedure} and {@link UnassignProcedure} should not be thought of<a name="line.63"></a>
-<span class="sourceLineNo">064</span> * as being asymmetric, at least currently.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> * <ul><a name="line.65"></a>
-<span class="sourceLineNo">066</span> * <li>{@link AssignProcedure} moves through all the above described states and implements methods<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * associated with each while {@link UnassignProcedure} starts at state<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * REGION_TRANSITION_DISPATCH and state REGION_TRANSITION_QUEUE is not supported.</li><a name="line.68"></a>
-<span class="sourceLineNo">069</span> *<a name="line.69"></a>
-<span class="sourceLineNo">070</span> * <li>When any step in {@link AssignProcedure} fails, failure handler<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * AssignProcedure#handleFailure(MasterProcedureEnv, RegionStateNode) re-attempts the<a name="line.71"></a>
-<span class="sourceLineNo">072</span> * assignment by setting the procedure state to REGION_TRANSITION_QUEUE and forces<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * assignment to a different target server by setting {@link AssignProcedure#forceNewPlan}. When<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * the number of attempts reaches threshold configuration 'hbase.assignment.maximum.attempts',<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * the procedure is aborted. For {@link UnassignProcedure}, similar re-attempts are<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * intentionally not implemented. It is a 'one shot' procedure. See its class doc for how it<a name="line.76"></a>
-<span class="sourceLineNo">077</span> * handles failure.<a name="line.77"></a>
-<span class="sourceLineNo">078</span> * </li><a name="line.78"></a>
-<span class="sourceLineNo">079</span> * <li>If we find a region in an 'unexpected' state, we'll complain and retry with backoff forever.<a name="line.79"></a>
-<span class="sourceLineNo">080</span> * The 'unexpected' state needs to be fixed either by another running Procedure or by operator<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * intervention (Regions in 'unexpected' state indicates bug or unexpected transition type).<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * For this to work, subclasses need to persist the 'attempt' counter kept in this class when<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * they do serializeStateData and restore it inside their deserializeStateData, just as they do<a name="line.83"></a>
-<span class="sourceLineNo">084</span> * for {@link #regionInfo}.<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * </li><a name="line.85"></a>
-<span class="sourceLineNo">086</span> * </ul><a name="line.86"></a>
-<span class="sourceLineNo">087</span> * </p><a name="line.87"></a>
-<span class="sourceLineNo">088</span> *<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * <p>TODO: Considering it is a priority doing all we can to get make a region available as soon as<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * possible, re-attempting with any target makes sense if specified target fails in case of<a name="line.90"></a>
-<span class="sourceLineNo">091</span> * {@link AssignProcedure}. For {@link UnassignProcedure}, our concern is preventing data loss<a name="line.91"></a>
-<span class="sourceLineNo">092</span> * on failed unassign. See class doc for explanation.<a name="line.92"></a>
-<span class="sourceLineNo">093</span> */<a name="line.93"></a>
-<span class="sourceLineNo">094</span>@InterfaceAudience.Private<a name="line.94"></a>
-<span class="sourceLineNo">095</span>public abstract class RegionTransitionProcedure<a name="line.95"></a>
-<span class="sourceLineNo">096</span> extends Procedure<MasterProcedureEnv><a name="line.96"></a>
-<span class="sourceLineNo">097</span> implements TableProcedureInterface,<a name="line.97"></a>
-<span class="sourceLineNo">098</span> RemoteProcedure<MasterProcedureEnv, ServerName> {<a name="line.98"></a>
-<span class="sourceLineNo">099</span> private static final Logger LOG = LoggerFactory.getLogger(RegionTransitionProcedure.class);<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span> protected final AtomicBoolean aborted = new AtomicBoolean(false);<a name="line.101"></a>
+<span class="sourceLineNo">037</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.slf4j.Logger;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.slf4j.LoggerFactory;<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.41"></a>
+<span class="sourceLineNo">042</span><a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProcedureProtos.RegionTransitionState;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.ProcedureProtos;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode;<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>/**<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * Base class for the Assign and Unassign Procedure.<a name="line.48"></a>
+<span class="sourceLineNo">049</span> *<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * Locking:<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * Takes exclusive lock on the region being assigned/unassigned. Thus, there can only be one<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * RegionTransitionProcedure per region running at a time (see MasterProcedureScheduler).<a name="line.52"></a>
+<span class="sourceLineNo">053</span> *<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * <p>This procedure is asynchronous and responds to external events.<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * The AssignmentManager will notify this procedure when the RS completes<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * the operation and reports the transitioned state<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * (see the Assign and Unassign class for more detail).</p><a name="line.57"></a>
+<span class="sourceLineNo">058</span> *<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * <p>Procedures move from the REGION_TRANSITION_QUEUE state when they are<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * first submitted, to the REGION_TRANSITION_DISPATCH state when the request<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * to remote server is sent and the Procedure is suspended waiting on external<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * event to be woken again. Once the external event is triggered, Procedure<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * moves to the REGION_TRANSITION_FINISH state.</p><a name="line.63"></a>
+<span class="sourceLineNo">064</span> *<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * <p>NOTE: {@link AssignProcedure} and {@link UnassignProcedure} should not be thought of<a name="line.65"></a>
+<span class="sourceLineNo">066</span> * as being asymmetric, at least currently.<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * <ul><a name="line.67"></a>
+<span class="sourceLineNo">068</span> * <li>{@link AssignProcedure} moves through all the above described states and implements methods<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * associated with each while {@link UnassignProcedure} starts at state<a name="line.69"></a>
+<span class="sourceLineNo">070</span> * REGION_TRANSITION_DISPATCH and state REGION_TRANSITION_QUEUE is not supported.</li><a name="line.70"></a>
+<span class="sourceLineNo">071</span> *<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * <li>When any step in {@link AssignProcedure} fails, failure handler<a name="line.72"></a>
+<span class="sourceLineNo">073</span> * AssignProcedure#handleFailure(MasterProcedureEnv, RegionStateNode) re-attempts the<a name="line.73"></a>
+<span class="sourceLineNo">074</span> * assignment by setting the procedure state to REGION_TRANSITION_QUEUE and forces<a name="line.74"></a>
+<span class="sourceLineNo">075</span> * assignment to a different target server by setting {@link AssignProcedure#forceNewPlan}. When<a name="line.75"></a>
+<span class="sourceLineNo">076</span> * the number of attempts reaches threshold configuration 'hbase.assignment.maximum.attempts',<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * the procedure is aborted. For {@link UnassignProcedure}, similar re-attempts are<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * intentionally not implemented. It is a 'one shot' procedure. See its class doc for how it<a name="line.78"></a>
+<span class="sourceLineNo">079</span> * handles failure.<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * </li><a name="line.80"></a>
+<span class="sourceLineNo">081</span> * <li>If we find a region in an 'unexpected' state, we'll complain and retry with backoff forever.<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * The 'unexpected' state needs to be fixed either by another running Procedure or by operator<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * intervention (Regions in 'unexpected' state indicates bug or unexpected transition type).<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * For this to work, subclasses need to persist the 'attempt' counter kept in this class when<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * they do serializeStateData and restore it inside their deserializeStateData, just as they do<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * for {@link #regionInfo}.<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * </li><a name="line.87"></a>
+<span class="sourceLineNo">088</span> * </ul><a name="line.88"></a>
+<span class="sourceLineNo">089</span> * </p><a name="line.89"></a>
+<span class="sourceLineNo">090</span> *<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * <p>TODO: Considering it is a priority doing all we can to get make a region available as soon as<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * possible, re-attempting with any target makes sense if specified target fails in case of<a name="line.92"></a>
+<span class="sourceLineNo">093</span> * {@link AssignProcedure}. For {@link UnassignProcedure}, our concern is preventing data loss<a name="line.93"></a>
+<span class="sourceLineNo">094</span> * on failed unassign. See class doc for explanation.<a name="line.94"></a>
+<span class="sourceLineNo">095</span> */<a name="line.95"></a>
+<span class="sourceLineNo">096</span>@InterfaceAudience.Private<a name="line.96"></a>
+<span class="sourceLineNo">097</span>public abstract class RegionTransitionProcedure<a name="line.97"></a>
+<span class="sourceLineNo">098</span> extends Procedure<MasterProcedureEnv><a name="line.98"></a>
+<span class="sourceLineNo">099</span> implements TableProcedureInterface,<a name="line.99"></a>
+<span class="sourceLineNo">100</span> RemoteProcedure<MasterProcedureEnv, ServerName> {<a name="line.100"></a>
+<span class="sourceLineNo">101</span> private static final Logger LOG = LoggerFactory.getLogger(RegionTransitionProcedure.class);<a name="line.101"></a>
<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span> private RegionTransitionState transitionState = RegionTransitionState.REGION_TRANSITION_QUEUE;<a name="line.103"></a>
-<span class="sourceLineNo">104</span> /**<a name="line.104"></a>
-<span class="sourceLineNo">105</span> * This data member must be persisted. Expectation is that it is done by subclasses in their<a name="line.105"></a>
-<span class="sourceLineNo">106</span> * {@link #serializeStateData(ProcedureStateSerializer)} call, restoring {@link #regionInfo}<a name="line.106"></a>
-<span class="sourceLineNo">107</span> * in their {@link #deserializeStateData(ProcedureStateSerializer)} method.<a name="line.107"></a>
-<span class="sourceLineNo">108</span> */<a name="line.108"></a>
-<span class="sourceLineNo">109</span> private RegionInfo regionInfo;<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> * Like {@link #regionInfo}, the expectation is that subclasses persist the value of this<a name="line.112"></a>
-<span class="sourceLineNo">113</span> * data member. It is used doing backoff when Procedure gets stuck.<a name="line.113"></a>
-<span class="sourceLineNo">114</span> */<a name="line.114"></a>
-<span class="sourceLineNo">115</span> private int attempt;<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span> private volatile boolean lock = false;<a name="line.117"></a>
+<span class="sourceLineNo">103</span> protected final AtomicBoolean aborted = new AtomicBoolean(false);<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span> private RegionTransitionState transitionState = RegionTransitionState.REGION_TRANSITION_QUEUE;<a name="line.105"></a>
+<span class="sourceLineNo">106</span> /**<a name="line.106"></a>
+<span class="sourceLineNo">107</span> * This data member must be persisted. Expectation is that it is done by subclasses in their<a name="line.107"></a>
+<span class="sourceLineNo">108</span> * {@link #serializeStateData(ProcedureStateSerializer)} call, restoring {@link #regionInfo}<a name="line.108"></a>
+<span class="sourceLineNo">109</span> * in their {@link #deserializeStateData(ProcedureStateSerializer)} method.<a name="line.109"></a>
+<span class="sourceLineNo">110</span> */<a name="line.110"></a>
+<span class="sourceLineNo">111</span> private RegionInfo regionInfo;<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> * Like {@link #regionInfo}, the expectation is that subclasses persist the value of this<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * data member. It is used doing backoff when Procedure gets stuck.<a name="line.115"></a>
+<span class="sourceLineNo">116</span> */<a name="line.116"></a>
+<span class="sourceLineNo">117</span> private int attempt;<a name="line.117"></a>
<span class="sourceLineNo">118</span><a name="line.118"></a>
<span class="sourceLineNo">119</span> // Required by the Procedure framework to create the procedure on replay<a name="line.119"></a>
<span class="sourceLineNo">120</span> public RegionTransitionProcedure() {}<a name="line.120"></a>
@@ -225,7 +225,7 @@
<span class="sourceLineNo">217</span> final ServerName serverName, final IOException exception) {<a name="line.217"></a>
<span class="sourceLineNo">218</span> final RegionStateNode regionNode = getRegionState(env);<a name="line.218"></a>
<span class="sourceLineNo">219</span> LOG.warn("Remote call failed {}; {}; {}; exception={}", serverName,<a name="line.219"></a>
-<span class="sourceLineNo">220</span> this, regionNode.toShortString(), exception.getClass().getSimpleName());<a name="line.220"></a>
+<span class="sourceLineNo">220</span> this, regionNode.toShortString(), exception.getClass().getSimpleName(), exception);<a name="line.220"></a>
<span class="sourceLineNo">221</span> if (remoteCallFailed(env, regionNode, exception)) {<a name="line.221"></a>
<span class="sourceLineNo">222</span> // NOTE: This call to wakeEvent puts this Procedure back on the scheduler.<a name="line.222"></a>
<span class="sourceLineNo">223</span> // Thereafter, another Worker can be in here so DO NOT MESS WITH STATE beyond<a name="line.223"></a>
@@ -427,33 +427,33 @@
<span class="sourceLineNo">419</span> }<a name="line.419"></a>
<span class="sourceLineNo">420</span><a name="line.420"></a>
<span class="sourceLineNo">421</span> @Override<a name="line.421"></a>
-<span class="sourceLineNo">422</span> protected LockState acquireLock(final MasterProcedureEnv env) {<a name="line.422"></a>
+<span class="sourceLineNo">422</span> protected boolean waitInitialized(MasterProcedureEnv env) {<a name="line.422"></a>
<span class="sourceLineNo">423</span> // Unless we are assigning meta, wait for meta to be available and loaded.<a name="line.423"></a>
-<span class="sourceLineNo">424</span> if (!isMeta()) {<a name="line.424"></a>
-<span class="sourceLineNo">425</span> AssignmentManager am = env.getAssignmentManager();<a name="line.425"></a>
-<span class="sourceLineNo">426</span> if (am.waitMetaLoaded(this) || am.waitMetaAssigned(this, regionInfo)) {<a name="line.426"></a>
-<span class="sourceLineNo">427</span> return LockState.LOCK_EVENT_WAIT;<a name="line.427"></a>
-<span class="sourceLineNo">428</span> }<a name="line.428"></a>
-<span class="sourceLineNo">429</span> }<a name="line.429"></a>
+<span class="sourceLineNo">424</span> if (isMeta()) {<a name="line.424"></a>
+<span class="sourceLineNo">425</span> return false;<a name="line.425"></a>
+<span class="sourceLineNo">426</span> }<a name="line.426"></a>
+<span class="sourceLineNo">427</span> AssignmentManager am = env.getAssignmentManager();<a name="line.427"></a>
+<span class="sourceLineNo">428</span> return am.waitMetaLoaded(this) || am.waitMetaAssigned(this, regionInfo);<a name="line.428"></a>
+<span class="sourceLineNo">429</span> }<a name="line.429"></a>
<span class="sourceLineNo">430</span><a name="line.430"></a>
-<span class="sourceLineNo">431</span> // TODO: Revisit this and move it to the executor<a name="line.431"></a>
-<span class="sourceLineNo">432</span> if (env.getProcedureScheduler().waitRegion(this, getRegionInfo())) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> try {<a name="line.433"></a>
-<span class="sourceLineNo">434</span> LOG.debug(LockState.LOCK_EVENT_WAIT + " pid=" + getProcId() + " " +<a name="line.434"></a>
-<span class="sourceLineNo">435</span> env.getProcedureScheduler().dumpLocks());<a name="line.435"></a>
-<span class="sourceLineNo">436</span> } catch (IOException e) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> // ignore, just for logging<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
-<span class="sourceLineNo">439</span> return LockState.LOCK_EVENT_WAIT;<a name="line.439"></a>
-<span class="sourceLineNo">440</span> }<a name="line.440"></a>
-<span class="sourceLineNo">441</span> this.lock = true;<a name="line.441"></a>
-<span class="sourceLineNo">442</span> return LockState.LOCK_ACQUIRED;<a name="line.442"></a>
-<span class="sourceLineNo">443</span> }<a name="line.443"></a>
-<span class="sourceLineNo">444</span><a name="line.444"></a>
-<span class="sourceLineNo">445</span> @Override<a name="line.445"></a>
-<span class="sourceLineNo">446</span> protected void releaseLock(final MasterProcedureEnv env) {<a name="line.446"></a>
-<span class="sourceLineNo">447</span> env.getProcedureScheduler().wakeRegion(this, getRegionInfo());<a name="line.447"></a>
-<span class="sourceLineNo">448</span> lock = false;<a name="line.448"></a>
+<span class="sourceLineNo">431</span> @Override<a name="line.431"></a>
+<span class="sourceLineNo">432</span> protected LockState acquireLock(final MasterProcedureEnv env) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span> // TODO: Revisit this and move it to the executor<a name="line.433"></a>
+<span class="sourceLineNo">434</span> if (env.getProcedureScheduler().waitRegion(this, getRegionInfo())) {<a name="line.434"></a>
+<span class="sourceLineNo">435</span> try {<a name="line.435"></a>
+<span class="sourceLineNo">436</span> LOG.debug(LockState.LOCK_EVENT_WAIT + " pid=" + getProcId() + " " +<a name="line.436"></a>
+<span class="sourceLineNo">437</span> env.getProcedureScheduler().dumpLocks());<a name="line.437"></a>
+<span class="sourceLineNo">438</span> } catch (IOException e) {<a name="line.438"></a>
+<span class="sourceLineNo">439</span> // ignore, just for logging<a name="line.439"></a>
+<span class="sourceLineNo">440</span> }<a name="line.440"></a>
+<span class="sourceLineNo">441</span> return LockState.LOCK_EVENT_WAIT;<a name="line.441"></a>
+<span class="sourceLineNo">442</span> }<a name="line.442"></a>
+<span class="sourceLineNo">443</span> return LockState.LOCK_ACQUIRED;<a name="line.443"></a>
+<span class="sourceLineNo">444</span> }<a name="line.444"></a>
+<span class="sourceLineNo">445</span><a name="line.445"></a>
+<span class="sourceLineNo">446</span> @Override<a name="line.446"></a>
+<span class="sourceLineNo">447</span> protected void releaseLock(final MasterProcedureEnv env) {<a name="line.447"></a>
+<span class="sourceLineNo">448</span> env.getProcedureScheduler().wakeRegion(this, getRegionInfo());<a name="line.448"></a>
<span class="sourceLineNo">449</span> }<a name="line.449"></a>
<span class="sourceLineNo">450</span><a name="line.450"></a>
<span class="sourceLineNo">451</span> @Override<a name="line.451"></a>
@@ -462,35 +462,30 @@
<span class="sourceLineNo">454</span> }<a name="line.454"></a>
<span class="sourceLineNo">455</span><a name="line.455"></a>
<span class="sourceLineNo">456</span> @Override<a name="line.456"></a>
-<span class="sourceLineNo">457</span> protected boolean hasLock(final MasterProcedureEnv env) {<a name="line.457"></a>
-<span class="sourceLineNo">458</span> return lock;<a name="line.458"></a>
-<span class="sourceLineNo">459</span> }<a name="line.459"></a>
-<span class="sourceLineNo">460</span><a name="line.460"></a>
-<span class="sourceLineNo">461</span> @Override<a name="line.461"></a>
-<span class="sourceLineNo">462</span> protected boolean shouldWaitClientAck(MasterProcedureEnv env) {<a name="line.462"></a>
-<span class="sourceLineNo">463</span> // The operation is triggered internally on the server<a name="line.463"></a>
-<span class="sourceLineNo">464</span> // the client does not know about this procedure.<a name="line.464"></a>
-<span class="sourceLineNo">465</span> return false;<a name="line.465"></a>
-<span class="sourceLineNo">466</span> }<a name="line.466"></a>
-<span class="sourceLineNo">467</span><a name="line.467"></a>
-<span class="sourceLineNo">468</span> /**<a name="line.468"></a>
-<span class="sourceLineNo">469</span> * Used by ServerCrashProcedure to see if this Assign/Unassign needs processing.<a name="line.469"></a>
-<span class="sourceLineNo">470</span> * @return ServerName the Assign or Unassign is going against.<a name="line.470"></a>
-<span class="sourceLineNo">471</span> */<a name="line.471"></a>
-<span class="sourceLineNo">472</span> public abstract ServerName getServer(final MasterProcedureEnv env);<a name="line.472"></a>
-<span class="sourceLineNo">473</span><a name="line.473"></a>
-<span class="sourceLineNo">474</span> @Override<a name="line.474"></a>
-<span class="sourceLineNo">475</span> public void remoteOperationCompleted(MasterProcedureEnv env) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span> // should not be called for region operation until we modified the open/close region procedure<a name="line.476"></a>
-<span class="sourceLineNo">477</span> throw new UnsupportedOperationException();<a name="line.477"></a>
-<span class="sourceLineNo">478</span> }<a name="line.478"></a>
-<span class="sourceLineNo">479</span><a name="line.479"></a>
-<span class="sourceLineNo">480</span> @Override<a name="line.480"></a>
-<span class="sourceLineNo">481</span> public void remoteOperationFailed(MasterProcedureEnv env, RemoteProcedureException error) {<a name="line.481"></a>
-<span class="sourceLineNo">482</span> // should not be called for region operation until we modified the open/close region procedure<a name="line.482"></a>
-<span class="sourceLineNo">483</span> throw new UnsupportedOperationException();<a name="line.483"></a>
-<span class="sourceLineNo">484</span> }<a name="line.484"></a>
-<span class="sourceLineNo">485</span>}<a name="line.485"></a>
+<span class="sourceLineNo">457</span> protected boolean shouldWaitClientAck(MasterProcedureEnv env) {<a name="line.457"></a>
+<span class="sourceLineNo">458</span> // The operation is triggered internally on the server<a name="line.458"></a>
+<span class="sourceLineNo">459</span> // the client does not know about this procedure.<a name="line.459"></a>
+<span class="sourceLineNo">460</span> return false;<a name="line.460"></a>
+<span class="sourceLineNo">461</span> }<a name="line.461"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
+<span class="sourceLineNo">463</span> /**<a name="line.463"></a>
+<span class="sourceLineNo">464</span> * Used by ServerCrashProcedure to see if this Assign/Unassign needs processing.<a name="line.464"></a>
+<span class="sourceLineNo">465</span> * @return ServerName the Assign or Unassign is going against.<a name="line.465"></a>
+<span class="sourceLineNo">466</span> */<a name="line.466"></a>
+<span class="sourceLineNo">467</span> public abstract ServerName getServer(final MasterProcedureEnv env);<a name="line.467"></a>
+<span class="sourceLineNo">468</span><a name="line.468"></a>
+<span class="sourceLineNo">469</span> @Override<a name="line.469"></a>
+<span class="sourceLineNo">470</span> public void remoteOperationCompleted(MasterProcedureEnv env) {<a name="line.470"></a>
+<span class="sourceLineNo">471</span> // should not be called for region operation until we modified the open/close region procedure<a name="line.471"></a>
+<span class="sourceLineNo">472</span> throw new UnsupportedOperationException();<a name="line.472"></a>
+<span class="sourceLineNo">473</span> }<a name="line.473"></a>
+<span class="sourceLineNo">474</span><a name="line.474"></a>
+<span class="sourceLineNo">475</span> @Override<a name="line.475"></a>
+<span class="sourceLineNo">476</span> public void remoteOperationFailed(MasterProcedureEnv env, RemoteProcedureException error) {<a name="line.476"></a>
+<span class="sourceLineNo">477</span> // should not be called for region operation until we modified the open/close region procedure<a name="line.477"></a>
+<span class="sourceLineNo">478</span> throw new UnsupportedOperationException();<a name="line.478"></a>
+<span class="sourceLineNo">479</span> }<a name="line.479"></a>
+<span class="sourceLineNo">480</span>}<a name="line.480"></a>