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/03/17 14:53:47 UTC
[11/51] [partial] hbase-site git commit: Published site at
00095a2ef9442e3fd86c04876c9d91f2f8b23ad8.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bd675fa3/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.TableSkewCostFunction.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.TableSkewCostFunction.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.TableSkewCostFunction.html
index 1bdfb9a..22bebe1 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.TableSkewCostFunction.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.TableSkewCostFunction.html
@@ -300,7 +300,7 @@
<span class="sourceLineNo">292</span> continue;<a name="line.292"></a>
<span class="sourceLineNo">293</span> }<a name="line.293"></a>
<span class="sourceLineNo">294</span> if (!c.isNeeded()) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> LOG.debug(c.getClass().getName() + " indicated that its cost should not be considered");<a name="line.295"></a>
+<span class="sourceLineNo">295</span> LOG.debug("{} not needed", c.getClass().getSimpleName());<a name="line.295"></a>
<span class="sourceLineNo">296</span> continue;<a name="line.296"></a>
<span class="sourceLineNo">297</span> }<a name="line.297"></a>
<span class="sourceLineNo">298</span> sumMultiplier += multiplier;<a name="line.298"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bd675fa3/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.WriteRequestCostFunction.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.WriteRequestCostFunction.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.WriteRequestCostFunction.html
index 1bdfb9a..22bebe1 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.WriteRequestCostFunction.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.WriteRequestCostFunction.html
@@ -300,7 +300,7 @@
<span class="sourceLineNo">292</span> continue;<a name="line.292"></a>
<span class="sourceLineNo">293</span> }<a name="line.293"></a>
<span class="sourceLineNo">294</span> if (!c.isNeeded()) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> LOG.debug(c.getClass().getName() + " indicated that its cost should not be considered");<a name="line.295"></a>
+<span class="sourceLineNo">295</span> LOG.debug("{} not needed", c.getClass().getSimpleName());<a name="line.295"></a>
<span class="sourceLineNo">296</span> continue;<a name="line.296"></a>
<span class="sourceLineNo">297</span> }<a name="line.297"></a>
<span class="sourceLineNo">298</span> sumMultiplier += multiplier;<a name="line.298"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bd675fa3/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.html
index 1bdfb9a..22bebe1 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.html
@@ -300,7 +300,7 @@
<span class="sourceLineNo">292</span> continue;<a name="line.292"></a>
<span class="sourceLineNo">293</span> }<a name="line.293"></a>
<span class="sourceLineNo">294</span> if (!c.isNeeded()) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> LOG.debug(c.getClass().getName() + " indicated that its cost should not be considered");<a name="line.295"></a>
+<span class="sourceLineNo">295</span> LOG.debug("{} not needed", c.getClass().getSimpleName());<a name="line.295"></a>
<span class="sourceLineNo">296</span> continue;<a name="line.296"></a>
<span class="sourceLineNo">297</span> }<a name="line.297"></a>
<span class="sourceLineNo">298</span> sumMultiplier += multiplier;<a name="line.298"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bd675fa3/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineTableProcedure.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineTableProcedure.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineTableProcedure.html
index aae0575..e85a77c 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineTableProcedure.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineTableProcedure.html
@@ -34,150 +34,181 @@
<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.TableNotDisabledException;<a name="line.26"></a>
<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.TableNotEnabledException;<a name="line.27"></a>
<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.client.TableState;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.master.MasterFileSystem;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.master.TableStateManager;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.procedure2.StateMachineProcedure;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.security.User;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.36"></a>
-<span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span>/**<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * Base class for all the Table procedures that want to use a StateMachineProcedure.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * It provides helpers like basic locking, sync latch, and toStringClassDetails().<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>public abstract class AbstractStateMachineTableProcedure<TState><a name="line.43"></a>
-<span class="sourceLineNo">044</span> extends StateMachineProcedure<MasterProcedureEnv, TState><a name="line.44"></a>
-<span class="sourceLineNo">045</span> implements TableProcedureInterface {<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span> // used for compatibility with old clients<a name="line.47"></a>
-<span class="sourceLineNo">048</span> private final ProcedurePrepareLatch syncLatch;<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span> private User user;<a name="line.50"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.UnknownRegionException;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.client.DoNotRetryRegionException;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.client.RegionOfflineException;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.client.TableState;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.master.MasterFileSystem;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.master.MasterServices;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.master.RegionState;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.master.TableStateManager;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.master.assignment.RegionStates;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.procedure2.StateMachineProcedure;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.security.User;<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><a name="line.42"></a>
+<span class="sourceLineNo">043</span>/**<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * Base class for all the Table procedures that want to use a StateMachineProcedure.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * It provides helpers like basic locking, sync latch, and toStringClassDetails().<a name="line.45"></a>
+<span class="sourceLineNo">046</span> */<a name="line.46"></a>
+<span class="sourceLineNo">047</span>@InterfaceAudience.Private<a name="line.47"></a>
+<span class="sourceLineNo">048</span>public abstract class AbstractStateMachineTableProcedure<TState><a name="line.48"></a>
+<span class="sourceLineNo">049</span> extends StateMachineProcedure<MasterProcedureEnv, TState><a name="line.49"></a>
+<span class="sourceLineNo">050</span> implements TableProcedureInterface {<a name="line.50"></a>
<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span> protected AbstractStateMachineTableProcedure() {<a name="line.52"></a>
-<span class="sourceLineNo">053</span> // Required by the Procedure framework to create the procedure on replay<a name="line.53"></a>
-<span class="sourceLineNo">054</span> syncLatch = null;<a name="line.54"></a>
-<span class="sourceLineNo">055</span> }<a name="line.55"></a>
+<span class="sourceLineNo">052</span> // used for compatibility with old clients<a name="line.52"></a>
+<span class="sourceLineNo">053</span> private final ProcedurePrepareLatch syncLatch;<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span> private User user;<a name="line.55"></a>
<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span> protected AbstractStateMachineTableProcedure(final MasterProcedureEnv env) {<a name="line.57"></a>
-<span class="sourceLineNo">058</span> this(env, null);<a name="line.58"></a>
-<span class="sourceLineNo">059</span> }<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span> /**<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * @param env Uses this to set Procedure Owner at least.<a name="line.62"></a>
-<span class="sourceLineNo">063</span> */<a name="line.63"></a>
-<span class="sourceLineNo">064</span> protected AbstractStateMachineTableProcedure(final MasterProcedureEnv env,<a name="line.64"></a>
-<span class="sourceLineNo">065</span> final ProcedurePrepareLatch latch) {<a name="line.65"></a>
-<span class="sourceLineNo">066</span> if (env != null) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span> this.user = env.getRequestUser();<a name="line.67"></a>
-<span class="sourceLineNo">068</span> this.setOwner(user);<a name="line.68"></a>
-<span class="sourceLineNo">069</span> }<a name="line.69"></a>
-<span class="sourceLineNo">070</span> // used for compatibility with clients without procedures<a name="line.70"></a>
-<span class="sourceLineNo">071</span> // they need a sync TableExistsException, TableNotFoundException, TableNotDisabledException, ...<a name="line.71"></a>
-<span class="sourceLineNo">072</span> this.syncLatch = latch;<a name="line.72"></a>
-<span class="sourceLineNo">073</span> }<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span> @Override<a name="line.75"></a>
-<span class="sourceLineNo">076</span> public abstract TableName getTableName();<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span> @Override<a name="line.78"></a>
-<span class="sourceLineNo">079</span> public abstract TableOperationType getTableOperationType();<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span> @Override<a name="line.81"></a>
-<span class="sourceLineNo">082</span> public void toStringClassDetails(final StringBuilder sb) {<a name="line.82"></a>
-<span class="sourceLineNo">083</span> sb.append(getClass().getSimpleName());<a name="line.83"></a>
-<span class="sourceLineNo">084</span> sb.append(" table=");<a name="line.84"></a>
-<span class="sourceLineNo">085</span> sb.append(getTableName());<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> @Override<a name="line.88"></a>
-<span class="sourceLineNo">089</span> protected LockState acquireLock(final MasterProcedureEnv env) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span> if (env.waitInitialized(this)) return LockState.LOCK_EVENT_WAIT;<a name="line.90"></a>
-<span class="sourceLineNo">091</span> if (env.getProcedureScheduler().waitTableExclusiveLock(this, getTableName())) {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> return LockState.LOCK_EVENT_WAIT;<a name="line.92"></a>
-<span class="sourceLineNo">093</span> }<a name="line.93"></a>
-<span class="sourceLineNo">094</span> return LockState.LOCK_ACQUIRED;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> }<a name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span> @Override<a name="line.97"></a>
-<span class="sourceLineNo">098</span> protected void releaseLock(final MasterProcedureEnv env) {<a name="line.98"></a>
-<span class="sourceLineNo">099</span> env.getProcedureScheduler().wakeTableExclusiveLock(this, getTableName());<a name="line.99"></a>
+<span class="sourceLineNo">057</span> protected AbstractStateMachineTableProcedure() {<a name="line.57"></a>
+<span class="sourceLineNo">058</span> // Required by the Procedure framework to create the procedure on replay<a name="line.58"></a>
+<span class="sourceLineNo">059</span> syncLatch = null;<a name="line.59"></a>
+<span class="sourceLineNo">060</span> }<a name="line.60"></a>
+<span class="sourceLineNo">061</span><a name="line.61"></a>
+<span class="sourceLineNo">062</span> protected AbstractStateMachineTableProcedure(final MasterProcedureEnv env) {<a name="line.62"></a>
+<span class="sourceLineNo">063</span> this(env, null);<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> /**<a name="line.66"></a>
+<span class="sourceLineNo">067</span> * @param env Uses this to set Procedure Owner at least.<a name="line.67"></a>
+<span class="sourceLineNo">068</span> */<a name="line.68"></a>
+<span class="sourceLineNo">069</span> protected AbstractStateMachineTableProcedure(final MasterProcedureEnv env,<a name="line.69"></a>
+<span class="sourceLineNo">070</span> final ProcedurePrepareLatch latch) {<a name="line.70"></a>
+<span class="sourceLineNo">071</span> if (env != null) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> this.user = env.getRequestUser();<a name="line.72"></a>
+<span class="sourceLineNo">073</span> this.setOwner(user);<a name="line.73"></a>
+<span class="sourceLineNo">074</span> }<a name="line.74"></a>
+<span class="sourceLineNo">075</span> // used for compatibility with clients without procedures<a name="line.75"></a>
+<span class="sourceLineNo">076</span> // they need a sync TableExistsException, TableNotFoundException, TableNotDisabledException, ...<a name="line.76"></a>
+<span class="sourceLineNo">077</span> this.syncLatch = latch;<a name="line.77"></a>
+<span class="sourceLineNo">078</span> }<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span> @Override<a name="line.80"></a>
+<span class="sourceLineNo">081</span> public abstract TableName getTableName();<a name="line.81"></a>
+<span class="sourceLineNo">082</span><a name="line.82"></a>
+<span class="sourceLineNo">083</span> @Override<a name="line.83"></a>
+<span class="sourceLineNo">084</span> public abstract TableOperationType getTableOperationType();<a name="line.84"></a>
+<span class="sourceLineNo">085</span><a name="line.85"></a>
+<span class="sourceLineNo">086</span> @Override<a name="line.86"></a>
+<span class="sourceLineNo">087</span> public void toStringClassDetails(final StringBuilder sb) {<a name="line.87"></a>
+<span class="sourceLineNo">088</span> sb.append(getClass().getSimpleName());<a name="line.88"></a>
+<span class="sourceLineNo">089</span> sb.append(" table=");<a name="line.89"></a>
+<span class="sourceLineNo">090</span> sb.append(getTableName());<a name="line.90"></a>
+<span class="sourceLineNo">091</span> }<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span> @Override<a name="line.93"></a>
+<span class="sourceLineNo">094</span> protected LockState acquireLock(final MasterProcedureEnv env) {<a name="line.94"></a>
+<span class="sourceLineNo">095</span> if (env.waitInitialized(this)) return LockState.LOCK_EVENT_WAIT;<a name="line.95"></a>
+<span class="sourceLineNo">096</span> if (env.getProcedureScheduler().waitTableExclusiveLock(this, getTableName())) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span> return LockState.LOCK_EVENT_WAIT;<a name="line.97"></a>
+<span class="sourceLineNo">098</span> }<a name="line.98"></a>
+<span class="sourceLineNo">099</span> return LockState.LOCK_ACQUIRED;<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> protected User getUser() {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> return user;<a name="line.103"></a>
-<span class="sourceLineNo">104</span> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span> protected void setUser(final User user) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span> this.user = user;<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> protected void releaseSyncLatch() {<a name="line.110"></a>
-<span class="sourceLineNo">111</span> ProcedurePrepareLatch.releaseLatch(syncLatch, this);<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> /**<a name="line.114"></a>
-<span class="sourceLineNo">115</span> * Check whether a table is modifiable - exists and either offline or online with config set<a name="line.115"></a>
-<span class="sourceLineNo">116</span> * @param env MasterProcedureEnv<a name="line.116"></a>
-<span class="sourceLineNo">117</span> * @throws IOException<a name="line.117"></a>
-<span class="sourceLineNo">118</span> */<a name="line.118"></a>
-<span class="sourceLineNo">119</span> protected void checkTableModifiable(final MasterProcedureEnv env) throws IOException {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> // Checks whether the table exists<a name="line.120"></a>
-<span class="sourceLineNo">121</span> if (!MetaTableAccessor.tableExists(env.getMasterServices().getConnection(), getTableName())) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span> throw new TableNotFoundException(getTableName());<a name="line.122"></a>
-<span class="sourceLineNo">123</span> }<a name="line.123"></a>
-<span class="sourceLineNo">124</span> }<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span> protected final Path getRegionDir(MasterProcedureEnv env, RegionInfo region) throws IOException {<a name="line.126"></a>
-<span class="sourceLineNo">127</span> return env.getMasterServices().getMasterFileSystem().getRegionDir(region);<a name="line.127"></a>
-<span class="sourceLineNo">128</span> }<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span> /**<a name="line.130"></a>
-<span class="sourceLineNo">131</span> * Check that cluster is up and master is running. Check table is modifiable.<a name="line.131"></a>
-<span class="sourceLineNo">132</span> * If <code>enabled</code>, check table is enabled else check it is disabled.<a name="line.132"></a>
-<span class="sourceLineNo">133</span> * Call in Procedure constructor so can pass any exception to caller.<a name="line.133"></a>
-<span class="sourceLineNo">134</span> * @param enabled If true, check table is enabled and throw exception if not. If false, do the<a name="line.134"></a>
-<span class="sourceLineNo">135</span> * inverse. If null, do no table checks.<a name="line.135"></a>
-<span class="sourceLineNo">136</span> */<a name="line.136"></a>
-<span class="sourceLineNo">137</span> protected void preflightChecks(MasterProcedureEnv env, Boolean enabled) throws HBaseIOException {<a name="line.137"></a>
-<span class="sourceLineNo">138</span> MasterServices master = env.getMasterServices();<a name="line.138"></a>
-<span class="sourceLineNo">139</span> if (!master.isClusterUp()) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span> throw new HBaseIOException("Cluster not up!");<a name="line.140"></a>
-<span class="sourceLineNo">141</span> }<a name="line.141"></a>
-<span class="sourceLineNo">142</span> if (master.isStopping() || master.isStopped()) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> throw new HBaseIOException("Master stopping=" + master.isStopping() +<a name="line.143"></a>
-<span class="sourceLineNo">144</span> ", stopped=" + master.isStopped());<a name="line.144"></a>
-<span class="sourceLineNo">145</span> }<a name="line.145"></a>
-<span class="sourceLineNo">146</span> if (enabled == null) {<a name="line.146"></a>
-<span class="sourceLineNo">147</span> // Don't do any table checks.<a name="line.147"></a>
-<span class="sourceLineNo">148</span> return;<a name="line.148"></a>
-<span class="sourceLineNo">149</span> }<a name="line.149"></a>
-<span class="sourceLineNo">150</span> try {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> // Checks table exists and is modifiable.<a name="line.151"></a>
-<span class="sourceLineNo">152</span> checkTableModifiable(env);<a name="line.152"></a>
-<span class="sourceLineNo">153</span> TableName tn = getTableName();<a name="line.153"></a>
-<span class="sourceLineNo">154</span> TableStateManager tsm = master.getTableStateManager();<a name="line.154"></a>
-<span class="sourceLineNo">155</span> TableState ts = tsm.getTableState(tn);<a name="line.155"></a>
-<span class="sourceLineNo">156</span> if (enabled) {<a name="line.156"></a>
-<span class="sourceLineNo">157</span> if (!ts.isEnabledOrEnabling()) {<a name="line.157"></a>
-<span class="sourceLineNo">158</span> throw new TableNotEnabledException(tn);<a name="line.158"></a>
-<span class="sourceLineNo">159</span> }<a name="line.159"></a>
-<span class="sourceLineNo">160</span> } else {<a name="line.160"></a>
-<span class="sourceLineNo">161</span> if (!ts.isDisabledOrDisabling()) {<a name="line.161"></a>
-<span class="sourceLineNo">162</span> throw new TableNotDisabledException(tn);<a name="line.162"></a>
-<span class="sourceLineNo">163</span> }<a name="line.163"></a>
-<span class="sourceLineNo">164</span> }<a name="line.164"></a>
-<span class="sourceLineNo">165</span> } catch (IOException ioe) {<a name="line.165"></a>
-<span class="sourceLineNo">166</span> if (ioe instanceof HBaseIOException) {<a name="line.166"></a>
-<span class="sourceLineNo">167</span> throw (HBaseIOException)ioe;<a name="line.167"></a>
-<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span> throw new HBaseIOException(ioe);<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>}<a name="line.172"></a>
+<span class="sourceLineNo">102</span> @Override<a name="line.102"></a>
+<span class="sourceLineNo">103</span> protected void releaseLock(final MasterProcedureEnv env) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span> env.getProcedureScheduler().wakeTableExclusiveLock(this, getTableName());<a name="line.104"></a>
+<span class="sourceLineNo">105</span> }<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span> protected User getUser() {<a name="line.107"></a>
+<span class="sourceLineNo">108</span> return user;<a name="line.108"></a>
+<span class="sourceLineNo">109</span> }<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span> protected void setUser(final User user) {<a name="line.111"></a>
+<span class="sourceLineNo">112</span> this.user = user;<a name="line.112"></a>
+<span class="sourceLineNo">113</span> }<a name="line.113"></a>
+<span class="sourceLineNo">114</span><a name="line.114"></a>
+<span class="sourceLineNo">115</span> protected void releaseSyncLatch() {<a name="line.115"></a>
+<span class="sourceLineNo">116</span> ProcedurePrepareLatch.releaseLatch(syncLatch, this);<a name="line.116"></a>
+<span class="sourceLineNo">117</span> }<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> /**<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * Check whether a table is modifiable - exists and either offline or online with config set<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * @param env MasterProcedureEnv<a name="line.121"></a>
+<span class="sourceLineNo">122</span> * @throws IOException<a name="line.122"></a>
+<span class="sourceLineNo">123</span> */<a name="line.123"></a>
+<span class="sourceLineNo">124</span> protected void checkTableModifiable(final MasterProcedureEnv env) throws IOException {<a name="line.124"></a>
+<span class="sourceLineNo">125</span> // Checks whether the table exists<a name="line.125"></a>
+<span class="sourceLineNo">126</span> if (!MetaTableAccessor.tableExists(env.getMasterServices().getConnection(), getTableName())) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span> throw new TableNotFoundException(getTableName());<a name="line.127"></a>
+<span class="sourceLineNo">128</span> }<a name="line.128"></a>
+<span class="sourceLineNo">129</span> }<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span> protected final Path getRegionDir(MasterProcedureEnv env, RegionInfo region) throws IOException {<a name="line.131"></a>
+<span class="sourceLineNo">132</span> return env.getMasterServices().getMasterFileSystem().getRegionDir(region);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> }<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span> /**<a name="line.135"></a>
+<span class="sourceLineNo">136</span> * Check that cluster is up and master is running. Check table is modifiable.<a name="line.136"></a>
+<span class="sourceLineNo">137</span> * If <code>enabled</code>, check table is enabled else check it is disabled.<a name="line.137"></a>
+<span class="sourceLineNo">138</span> * Call in Procedure constructor so can pass any exception to caller.<a name="line.138"></a>
+<span class="sourceLineNo">139</span> * @param enabled If true, check table is enabled and throw exception if not. If false, do the<a name="line.139"></a>
+<span class="sourceLineNo">140</span> * inverse. If null, do no table checks.<a name="line.140"></a>
+<span class="sourceLineNo">141</span> */<a name="line.141"></a>
+<span class="sourceLineNo">142</span> protected void preflightChecks(MasterProcedureEnv env, Boolean enabled) throws HBaseIOException {<a name="line.142"></a>
+<span class="sourceLineNo">143</span> MasterServices master = env.getMasterServices();<a name="line.143"></a>
+<span class="sourceLineNo">144</span> if (!master.isClusterUp()) {<a name="line.144"></a>
+<span class="sourceLineNo">145</span> throw new HBaseIOException("Cluster not up!");<a name="line.145"></a>
+<span class="sourceLineNo">146</span> }<a name="line.146"></a>
+<span class="sourceLineNo">147</span> if (master.isStopping() || master.isStopped()) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> throw new HBaseIOException("Master stopping=" + master.isStopping() +<a name="line.148"></a>
+<span class="sourceLineNo">149</span> ", stopped=" + master.isStopped());<a name="line.149"></a>
+<span class="sourceLineNo">150</span> }<a name="line.150"></a>
+<span class="sourceLineNo">151</span> if (enabled == null) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span> // Don't do any table checks.<a name="line.152"></a>
+<span class="sourceLineNo">153</span> return;<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span> try {<a name="line.155"></a>
+<span class="sourceLineNo">156</span> // Checks table exists and is modifiable.<a name="line.156"></a>
+<span class="sourceLineNo">157</span> checkTableModifiable(env);<a name="line.157"></a>
+<span class="sourceLineNo">158</span> TableName tn = getTableName();<a name="line.158"></a>
+<span class="sourceLineNo">159</span> TableStateManager tsm = master.getTableStateManager();<a name="line.159"></a>
+<span class="sourceLineNo">160</span> TableState ts = tsm.getTableState(tn);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> if (enabled) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span> if (!ts.isEnabledOrEnabling()) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> throw new TableNotEnabledException(tn);<a name="line.163"></a>
+<span class="sourceLineNo">164</span> }<a name="line.164"></a>
+<span class="sourceLineNo">165</span> } else {<a name="line.165"></a>
+<span class="sourceLineNo">166</span> if (!ts.isDisabledOrDisabling()) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> throw new TableNotDisabledException(tn);<a name="line.167"></a>
+<span class="sourceLineNo">168</span> }<a name="line.168"></a>
+<span class="sourceLineNo">169</span> }<a name="line.169"></a>
+<span class="sourceLineNo">170</span> } catch (IOException ioe) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> if (ioe instanceof HBaseIOException) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> throw (HBaseIOException)ioe;<a name="line.172"></a>
+<span class="sourceLineNo">173</span> }<a name="line.173"></a>
+<span class="sourceLineNo">174</span> throw new HBaseIOException(ioe);<a name="line.174"></a>
+<span class="sourceLineNo">175</span> }<a name="line.175"></a>
+<span class="sourceLineNo">176</span> }<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> /**<a name="line.178"></a>
+<span class="sourceLineNo">179</span> * Check region is online.<a name="line.179"></a>
+<span class="sourceLineNo">180</span> */<a name="line.180"></a>
+<span class="sourceLineNo">181</span> protected static void checkOnline(MasterProcedureEnv env, final RegionInfo ri)<a name="line.181"></a>
+<span class="sourceLineNo">182</span> throws DoNotRetryRegionException {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> RegionStates regionStates = env.getAssignmentManager().getRegionStates();<a name="line.183"></a>
+<span class="sourceLineNo">184</span> RegionState rs = regionStates.getRegionState(ri);<a name="line.184"></a>
+<span class="sourceLineNo">185</span> if (rs == null) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span> throw new UnknownRegionException("No RegionState found for " + ri.getEncodedName());<a name="line.186"></a>
+<span class="sourceLineNo">187</span> }<a name="line.187"></a>
+<span class="sourceLineNo">188</span> if (!rs.isOpened()) {<a name="line.188"></a>
+<span class="sourceLineNo">189</span> throw new DoNotRetryRegionException(ri.getEncodedName() + " is not OPEN");<a name="line.189"></a>
+<span class="sourceLineNo">190</span> }<a name="line.190"></a>
+<span class="sourceLineNo">191</span> if (ri.isSplitParent()) {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> throw new DoNotRetryRegionException(ri.getEncodedName() +<a name="line.192"></a>
+<span class="sourceLineNo">193</span> " is not online (splitParent=true)");<a name="line.193"></a>
+<span class="sourceLineNo">194</span> }<a name="line.194"></a>
+<span class="sourceLineNo">195</span> if (ri.isSplit()) {<a name="line.195"></a>
+<span class="sourceLineNo">196</span> throw new DoNotRetryRegionException(ri.getEncodedName() + " has split=true");<a name="line.196"></a>
+<span class="sourceLineNo">197</span> }<a name="line.197"></a>
+<span class="sourceLineNo">198</span> if (ri.isOffline()) {<a name="line.198"></a>
+<span class="sourceLineNo">199</span> // RegionOfflineException is not instance of DNRIOE so wrap it.<a name="line.199"></a>
+<span class="sourceLineNo">200</span> throw new DoNotRetryRegionException(new RegionOfflineException(ri.getEncodedName()));<a name="line.200"></a>
+<span class="sourceLineNo">201</span> }<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/bd675fa3/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.html
index 64dee5d..82a898a 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.html
@@ -641,7 +641,7 @@
<span class="sourceLineNo">633</span> boolean hasLock = true;<a name="line.633"></a>
<span class="sourceLineNo">634</span> final LockAndQueue[] regionLocks = new LockAndQueue[regionInfo.length];<a name="line.634"></a>
<span class="sourceLineNo">635</span> for (int i = 0; i < regionInfo.length; ++i) {<a name="line.635"></a>
-<span class="sourceLineNo">636</span> LOG.info(procedure + ", " + regionInfo[i].getRegionNameAsString());<a name="line.636"></a>
+<span class="sourceLineNo">636</span> LOG.info("{} checking lock on {}", procedure, regionInfo[i].getEncodedName());<a name="line.636"></a>
<span class="sourceLineNo">637</span> assert table != null;<a name="line.637"></a>
<span class="sourceLineNo">638</span> assert regionInfo[i] != null;<a name="line.638"></a>
<span class="sourceLineNo">639</span> assert regionInfo[i].getTable() != null;<a name="line.639"></a>