http://git-wip-us.apache.org/repos/asf/hbase-site/blob/50917b1d/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.html
----------------------------------------------------------------------
diff --git
a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.html
b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.html
index ebf3b32..7b5c61d 100644
---
a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.html
+++
b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/AddColumnFamilyProcedure.html
@@ -42,378 +42,375 @@
<span class="sourceLineNo">034</span>import
org.apache.hadoop.hbase.TableName;<a name="line.34"></a>
<span class="sourceLineNo">035</span>import
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.35"></a>
<span class="sourceLineNo">036</span>import
org.apache.hadoop.hbase.client.TableState;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import
org.apache.hadoop.hbase.executor.EventType;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import
org.apache.hadoop.hbase.master.MasterCoprocessorHost;<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.protobuf.ProtobufUtil;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import
org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos;<a
name="line.41"></a>
-<span class="sourceLineNo">042</span>import
org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.AddColumnFamilyState;<a
name="line.42"></a>
-<span class="sourceLineNo">043</span>import
org.apache.hadoop.security.UserGroupInformation;<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> * The procedure to add a column family
to an existing table.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> */<a name="line.47"></a>
-<span class="sourceLineNo">048</span>@InterfaceAudience.Private<a
name="line.48"></a>
-<span class="sourceLineNo">049</span>public class AddColumnFamilyProcedure<a
name="line.49"></a>
-<span class="sourceLineNo">050</span> extends
StateMachineProcedure<MasterProcedureEnv, AddColumnFamilyState><a
name="line.50"></a>
-<span class="sourceLineNo">051</span> implements TableProcedureInterface
{<a name="line.51"></a>
-<span class="sourceLineNo">052</span> private static final Log LOG =
LogFactory.getLog(AddColumnFamilyProcedure.class);<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span> private final AtomicBoolean aborted =
new AtomicBoolean(false);<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span> private TableName tableName;<a
name="line.56"></a>
-<span class="sourceLineNo">057</span> private HTableDescriptor
unmodifiedHTableDescriptor;<a name="line.57"></a>
-<span class="sourceLineNo">058</span> private HColumnDescriptor
cfDescriptor;<a name="line.58"></a>
-<span class="sourceLineNo">059</span> private UserGroupInformation user;<a
name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span> private List<HRegionInfo>
regionInfoList;<a name="line.61"></a>
-<span class="sourceLineNo">062</span> private Boolean traceEnabled;<a
name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> public AddColumnFamilyProcedure() {<a
name="line.64"></a>
-<span class="sourceLineNo">065</span> this.unmodifiedHTableDescriptor =
null;<a name="line.65"></a>
-<span class="sourceLineNo">066</span> this.regionInfoList = null;<a
name="line.66"></a>
-<span class="sourceLineNo">067</span> this.traceEnabled = null;<a
name="line.67"></a>
-<span class="sourceLineNo">068</span> }<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span> public AddColumnFamilyProcedure(<a
name="line.70"></a>
-<span class="sourceLineNo">071</span> final MasterProcedureEnv env,<a
name="line.71"></a>
-<span class="sourceLineNo">072</span> final TableName tableName,<a
name="line.72"></a>
-<span class="sourceLineNo">073</span> final HColumnDescriptor
cfDescriptor) throws IOException {<a name="line.73"></a>
-<span class="sourceLineNo">074</span> this.tableName = tableName;<a
name="line.74"></a>
-<span class="sourceLineNo">075</span> this.cfDescriptor = cfDescriptor;<a
name="line.75"></a>
-<span class="sourceLineNo">076</span> this.user =
env.getRequestUser().getUGI();<a name="line.76"></a>
-<span class="sourceLineNo">077</span>
this.setOwner(this.user.getShortUserName());<a name="line.77"></a>
-<span class="sourceLineNo">078</span> this.unmodifiedHTableDescriptor =
null;<a name="line.78"></a>
-<span class="sourceLineNo">079</span> this.regionInfoList = null;<a
name="line.79"></a>
-<span class="sourceLineNo">080</span> this.traceEnabled = null;<a
name="line.80"></a>
-<span class="sourceLineNo">081</span> }<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span> @Override<a name="line.83"></a>
-<span class="sourceLineNo">084</span> protected Flow executeFromState(final
MasterProcedureEnv env, final AddColumnFamilyState state)<a name="line.84"></a>
-<span class="sourceLineNo">085</span> throws InterruptedException {<a
name="line.85"></a>
-<span class="sourceLineNo">086</span> if (isTraceEnabled()) {<a
name="line.86"></a>
-<span class="sourceLineNo">087</span> LOG.trace(this + " execute state="
+ state);<a name="line.87"></a>
-<span class="sourceLineNo">088</span> }<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span> try {<a name="line.90"></a>
-<span class="sourceLineNo">091</span> switch (state) {<a
name="line.91"></a>
-<span class="sourceLineNo">092</span> case ADD_COLUMN_FAMILY_PREPARE:<a
name="line.92"></a>
-<span class="sourceLineNo">093</span> prepareAdd(env);<a
name="line.93"></a>
-<span class="sourceLineNo">094</span>
setNextState(AddColumnFamilyState.ADD_COLUMN_FAMILY_PRE_OPERATION);<a
name="line.94"></a>
-<span class="sourceLineNo">095</span> break;<a name="line.95"></a>
-<span class="sourceLineNo">096</span> case
ADD_COLUMN_FAMILY_PRE_OPERATION:<a name="line.96"></a>
-<span class="sourceLineNo">097</span> preAdd(env, state);<a
name="line.97"></a>
-<span class="sourceLineNo">098</span>
setNextState(AddColumnFamilyState.ADD_COLUMN_FAMILY_UPDATE_TABLE_DESCRIPTOR);<a
name="line.98"></a>
-<span class="sourceLineNo">099</span> break;<a name="line.99"></a>
-<span class="sourceLineNo">100</span> case
ADD_COLUMN_FAMILY_UPDATE_TABLE_DESCRIPTOR:<a name="line.100"></a>
-<span class="sourceLineNo">101</span> updateTableDescriptor(env);<a
name="line.101"></a>
-<span class="sourceLineNo">102</span>
setNextState(AddColumnFamilyState.ADD_COLUMN_FAMILY_POST_OPERATION);<a
name="line.102"></a>
-<span class="sourceLineNo">103</span> break;<a name="line.103"></a>
-<span class="sourceLineNo">104</span> case
ADD_COLUMN_FAMILY_POST_OPERATION:<a name="line.104"></a>
-<span class="sourceLineNo">105</span> postAdd(env, state);<a
name="line.105"></a>
-<span class="sourceLineNo">106</span>
setNextState(AddColumnFamilyState.ADD_COLUMN_FAMILY_REOPEN_ALL_REGIONS);<a
name="line.106"></a>
-<span class="sourceLineNo">107</span> break;<a name="line.107"></a>
-<span class="sourceLineNo">108</span> case
ADD_COLUMN_FAMILY_REOPEN_ALL_REGIONS:<a name="line.108"></a>
-<span class="sourceLineNo">109</span>
reOpenAllRegionsIfTableIsOnline(env);<a name="line.109"></a>
-<span class="sourceLineNo">110</span> return Flow.NO_MORE_STATE;<a
name="line.110"></a>
-<span class="sourceLineNo">111</span> default:<a name="line.111"></a>
-<span class="sourceLineNo">112</span> throw new
UnsupportedOperationException(this + " unhandled state=" + state);<a
name="line.112"></a>
-<span class="sourceLineNo">113</span> }<a name="line.113"></a>
-<span class="sourceLineNo">114</span> } catch (IOException e) {<a
name="line.114"></a>
-<span class="sourceLineNo">115</span> LOG.warn("Error trying to add the
column family" + getColumnFamilyName() + " to the table "<a name="line.115"></a>
-<span class="sourceLineNo">116</span> + tableName + " (in state=" +
state + ")", e);<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span>
setFailure("master-add-columnfamily", e);<a name="line.118"></a>
-<span class="sourceLineNo">119</span> }<a name="line.119"></a>
-<span class="sourceLineNo">120</span> return Flow.HAS_MORE_STATE;<a
name="line.120"></a>
-<span class="sourceLineNo">121</span> }<a name="line.121"></a>
-<span class="sourceLineNo">122</span><a name="line.122"></a>
-<span class="sourceLineNo">123</span> @Override<a name="line.123"></a>
-<span class="sourceLineNo">124</span> protected void rollbackState(final
MasterProcedureEnv env, final AddColumnFamilyState state)<a name="line.124"></a>
-<span class="sourceLineNo">125</span> throws IOException {<a
name="line.125"></a>
-<span class="sourceLineNo">126</span> if (isTraceEnabled()) {<a
name="line.126"></a>
-<span class="sourceLineNo">127</span> LOG.trace(this + " rollback state="
+ state);<a name="line.127"></a>
-<span class="sourceLineNo">128</span> }<a name="line.128"></a>
-<span class="sourceLineNo">129</span> try {<a name="line.129"></a>
-<span class="sourceLineNo">130</span> switch (state) {<a
name="line.130"></a>
-<span class="sourceLineNo">131</span> case
ADD_COLUMN_FAMILY_REOPEN_ALL_REGIONS:<a name="line.131"></a>
-<span class="sourceLineNo">132</span> break; // Nothing to undo.<a
name="line.132"></a>
-<span class="sourceLineNo">133</span> case
ADD_COLUMN_FAMILY_POST_OPERATION:<a name="line.133"></a>
-<span class="sourceLineNo">134</span> // TODO-MAYBE: call the
coprocessor event to undo?<a name="line.134"></a>
-<span class="sourceLineNo">135</span> break;<a name="line.135"></a>
-<span class="sourceLineNo">136</span> case
ADD_COLUMN_FAMILY_UPDATE_TABLE_DESCRIPTOR:<a name="line.136"></a>
-<span class="sourceLineNo">137</span> restoreTableDescriptor(env);<a
name="line.137"></a>
-<span class="sourceLineNo">138</span> break;<a name="line.138"></a>
-<span class="sourceLineNo">139</span> case
ADD_COLUMN_FAMILY_PRE_OPERATION:<a name="line.139"></a>
-<span class="sourceLineNo">140</span> // TODO-MAYBE: call the
coprocessor event to undo?<a name="line.140"></a>
-<span class="sourceLineNo">141</span> break;<a name="line.141"></a>
-<span class="sourceLineNo">142</span> case ADD_COLUMN_FAMILY_PREPARE:<a
name="line.142"></a>
-<span class="sourceLineNo">143</span> break; // nothing to do<a
name="line.143"></a>
-<span class="sourceLineNo">144</span> default:<a name="line.144"></a>
-<span class="sourceLineNo">145</span> throw new
UnsupportedOperationException(this + " unhandled state=" + state);<a
name="line.145"></a>
-<span class="sourceLineNo">146</span> }<a name="line.146"></a>
-<span class="sourceLineNo">147</span> } catch (IOException e) {<a
name="line.147"></a>
-<span class="sourceLineNo">148</span> // This will be retried. Unless
there is a bug in the code,<a name="line.148"></a>
-<span class="sourceLineNo">149</span> // this should be just a "temporary
error" (e.g. network down)<a name="line.149"></a>
-<span class="sourceLineNo">150</span> LOG.warn("Failed rollback attempt
step " + state + " for adding the column family"<a name="line.150"></a>
-<span class="sourceLineNo">151</span> + getColumnFamilyName() + " to
the table " + tableName, e);<a name="line.151"></a>
-<span class="sourceLineNo">152</span> throw e;<a name="line.152"></a>
-<span class="sourceLineNo">153</span> }<a name="line.153"></a>
-<span class="sourceLineNo">154</span> }<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span> @Override<a name="line.156"></a>
-<span class="sourceLineNo">157</span> protected AddColumnFamilyState
getState(final int stateId) {<a name="line.157"></a>
-<span class="sourceLineNo">158</span> return
AddColumnFamilyState.valueOf(stateId);<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> @Override<a name="line.161"></a>
-<span class="sourceLineNo">162</span> protected int getStateId(final
AddColumnFamilyState state) {<a name="line.162"></a>
-<span class="sourceLineNo">163</span> return state.getNumber();<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 AddColumnFamilyState
getInitialState() {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> return
AddColumnFamilyState.ADD_COLUMN_FAMILY_PREPARE;<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> @Override<a name="line.171"></a>
-<span class="sourceLineNo">172</span> protected void
setNextState(AddColumnFamilyState state) {<a name="line.172"></a>
-<span class="sourceLineNo">173</span> if (aborted.get()) {<a
name="line.173"></a>
-<span class="sourceLineNo">174</span> setAbortFailure("add-columnfamily",
"abort requested");<a name="line.174"></a>
-<span class="sourceLineNo">175</span> } else {<a name="line.175"></a>
-<span class="sourceLineNo">176</span> super.setNextState(state);<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><a name="line.179"></a>
-<span class="sourceLineNo">180</span> @Override<a name="line.180"></a>
-<span class="sourceLineNo">181</span> public boolean abort(final
MasterProcedureEnv env) {<a name="line.181"></a>
-<span class="sourceLineNo">182</span> aborted.set(true);<a
name="line.182"></a>
-<span class="sourceLineNo">183</span> return true;<a name="line.183"></a>
-<span class="sourceLineNo">184</span> }<a name="line.184"></a>
-<span class="sourceLineNo">185</span><a name="line.185"></a>
-<span class="sourceLineNo">186</span> @Override<a name="line.186"></a>
-<span class="sourceLineNo">187</span> protected boolean acquireLock(final
MasterProcedureEnv env) {<a name="line.187"></a>
-<span class="sourceLineNo">188</span> if (!env.isInitialized()) return
false;<a name="line.188"></a>
-<span class="sourceLineNo">189</span> return
env.getProcedureQueue().tryAcquireTableExclusiveLock(<a name="line.189"></a>
-<span class="sourceLineNo">190</span> tableName,<a name="line.190"></a>
-<span class="sourceLineNo">191</span>
EventType.C_M_ADD_FAMILY.toString());<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> @Override<a name="line.194"></a>
-<span class="sourceLineNo">195</span> protected void releaseLock(final
MasterProcedureEnv env) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span>
env.getProcedureQueue().releaseTableExclusiveLock(tableName);<a
name="line.196"></a>
-<span class="sourceLineNo">197</span> }<a name="line.197"></a>
-<span class="sourceLineNo">198</span><a name="line.198"></a>
-<span class="sourceLineNo">199</span> @Override<a name="line.199"></a>
-<span class="sourceLineNo">200</span> public void serializeStateData(final
OutputStream stream) throws IOException {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> super.serializeStateData(stream);<a
name="line.201"></a>
-<span class="sourceLineNo">202</span><a name="line.202"></a>
-<span class="sourceLineNo">203</span>
MasterProcedureProtos.AddColumnFamilyStateData.Builder addCFMsg =<a
name="line.203"></a>
-<span class="sourceLineNo">204</span>
MasterProcedureProtos.AddColumnFamilyStateData.newBuilder()<a
name="line.204"></a>
-<span class="sourceLineNo">205</span>
.setUserInfo(MasterProcedureUtil.toProtoUserInfo(user))<a name="line.205"></a>
-<span class="sourceLineNo">206</span>
.setTableName(ProtobufUtil.toProtoTableName(tableName))<a name="line.206"></a>
-<span class="sourceLineNo">207</span>
.setColumnfamilySchema(cfDescriptor.convert());<a name="line.207"></a>
-<span class="sourceLineNo">208</span> if (unmodifiedHTableDescriptor !=
null) {<a name="line.208"></a>
-<span class="sourceLineNo">209</span>
addCFMsg.setUnmodifiedTableSchema(unmodifiedHTableDescriptor.convert());<a
name="line.209"></a>
-<span class="sourceLineNo">210</span> }<a name="line.210"></a>
+<span class="sourceLineNo">037</span>import
org.apache.hadoop.hbase.master.MasterCoprocessorHost;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import
org.apache.hadoop.hbase.procedure2.StateMachineProcedure;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import
org.apache.hadoop.hbase.protobuf.ProtobufUtil;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import
org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos;<a
name="line.40"></a>
+<span class="sourceLineNo">041</span>import
org.apache.hadoop.hbase.protobuf.generated.MasterProcedureProtos.AddColumnFamilyState;<a
name="line.41"></a>
+<span class="sourceLineNo">042</span>import
org.apache.hadoop.security.UserGroupInformation;<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span>/**<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * The procedure to add a column family
to an existing table.<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 class AddColumnFamilyProcedure<a
name="line.48"></a>
+<span class="sourceLineNo">049</span> extends
StateMachineProcedure<MasterProcedureEnv, AddColumnFamilyState><a
name="line.49"></a>
+<span class="sourceLineNo">050</span> implements TableProcedureInterface
{<a name="line.50"></a>
+<span class="sourceLineNo">051</span> private static final Log LOG =
LogFactory.getLog(AddColumnFamilyProcedure.class);<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span> private final AtomicBoolean aborted =
new AtomicBoolean(false);<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span> private TableName tableName;<a
name="line.55"></a>
+<span class="sourceLineNo">056</span> private HTableDescriptor
unmodifiedHTableDescriptor;<a name="line.56"></a>
+<span class="sourceLineNo">057</span> private HColumnDescriptor
cfDescriptor;<a name="line.57"></a>
+<span class="sourceLineNo">058</span> private UserGroupInformation user;<a
name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span> private List<HRegionInfo>
regionInfoList;<a name="line.60"></a>
+<span class="sourceLineNo">061</span> private Boolean traceEnabled;<a
name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span> public AddColumnFamilyProcedure() {<a
name="line.63"></a>
+<span class="sourceLineNo">064</span> this.unmodifiedHTableDescriptor =
null;<a name="line.64"></a>
+<span class="sourceLineNo">065</span> this.regionInfoList = null;<a
name="line.65"></a>
+<span class="sourceLineNo">066</span> this.traceEnabled = null;<a
name="line.66"></a>
+<span class="sourceLineNo">067</span> }<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span> public AddColumnFamilyProcedure(<a
name="line.69"></a>
+<span class="sourceLineNo">070</span> final MasterProcedureEnv env,<a
name="line.70"></a>
+<span class="sourceLineNo">071</span> final TableName tableName,<a
name="line.71"></a>
+<span class="sourceLineNo">072</span> final HColumnDescriptor
cfDescriptor) throws IOException {<a name="line.72"></a>
+<span class="sourceLineNo">073</span> this.tableName = tableName;<a
name="line.73"></a>
+<span class="sourceLineNo">074</span> this.cfDescriptor = cfDescriptor;<a
name="line.74"></a>
+<span class="sourceLineNo">075</span> this.user =
env.getRequestUser().getUGI();<a name="line.75"></a>
+<span class="sourceLineNo">076</span>
this.setOwner(this.user.getShortUserName());<a name="line.76"></a>
+<span class="sourceLineNo">077</span> this.unmodifiedHTableDescriptor =
null;<a name="line.77"></a>
+<span class="sourceLineNo">078</span> this.regionInfoList = null;<a
name="line.78"></a>
+<span class="sourceLineNo">079</span> this.traceEnabled = null;<a
name="line.79"></a>
+<span class="sourceLineNo">080</span> }<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span> @Override<a name="line.82"></a>
+<span class="sourceLineNo">083</span> protected Flow executeFromState(final
MasterProcedureEnv env, final AddColumnFamilyState state)<a name="line.83"></a>
+<span class="sourceLineNo">084</span> throws InterruptedException {<a
name="line.84"></a>
+<span class="sourceLineNo">085</span> if (isTraceEnabled()) {<a
name="line.85"></a>
+<span class="sourceLineNo">086</span> LOG.trace(this + " execute state="
+ state);<a name="line.86"></a>
+<span class="sourceLineNo">087</span> }<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span> try {<a name="line.89"></a>
+<span class="sourceLineNo">090</span> switch (state) {<a
name="line.90"></a>
+<span class="sourceLineNo">091</span> case ADD_COLUMN_FAMILY_PREPARE:<a
name="line.91"></a>
+<span class="sourceLineNo">092</span> prepareAdd(env);<a
name="line.92"></a>
+<span class="sourceLineNo">093</span>
setNextState(AddColumnFamilyState.ADD_COLUMN_FAMILY_PRE_OPERATION);<a
name="line.93"></a>
+<span class="sourceLineNo">094</span> break;<a name="line.94"></a>
+<span class="sourceLineNo">095</span> case
ADD_COLUMN_FAMILY_PRE_OPERATION:<a name="line.95"></a>
+<span class="sourceLineNo">096</span> preAdd(env, state);<a
name="line.96"></a>
+<span class="sourceLineNo">097</span>
setNextState(AddColumnFamilyState.ADD_COLUMN_FAMILY_UPDATE_TABLE_DESCRIPTOR);<a
name="line.97"></a>
+<span class="sourceLineNo">098</span> break;<a name="line.98"></a>
+<span class="sourceLineNo">099</span> case
ADD_COLUMN_FAMILY_UPDATE_TABLE_DESCRIPTOR:<a name="line.99"></a>
+<span class="sourceLineNo">100</span> updateTableDescriptor(env);<a
name="line.100"></a>
+<span class="sourceLineNo">101</span>
setNextState(AddColumnFamilyState.ADD_COLUMN_FAMILY_POST_OPERATION);<a
name="line.101"></a>
+<span class="sourceLineNo">102</span> break;<a name="line.102"></a>
+<span class="sourceLineNo">103</span> case
ADD_COLUMN_FAMILY_POST_OPERATION:<a name="line.103"></a>
+<span class="sourceLineNo">104</span> postAdd(env, state);<a
name="line.104"></a>
+<span class="sourceLineNo">105</span>
setNextState(AddColumnFamilyState.ADD_COLUMN_FAMILY_REOPEN_ALL_REGIONS);<a
name="line.105"></a>
+<span class="sourceLineNo">106</span> break;<a name="line.106"></a>
+<span class="sourceLineNo">107</span> case
ADD_COLUMN_FAMILY_REOPEN_ALL_REGIONS:<a name="line.107"></a>
+<span class="sourceLineNo">108</span>
reOpenAllRegionsIfTableIsOnline(env);<a name="line.108"></a>
+<span class="sourceLineNo">109</span> return Flow.NO_MORE_STATE;<a
name="line.109"></a>
+<span class="sourceLineNo">110</span> default:<a name="line.110"></a>
+<span class="sourceLineNo">111</span> throw new
UnsupportedOperationException(this + " unhandled state=" + state);<a
name="line.111"></a>
+<span class="sourceLineNo">112</span> }<a name="line.112"></a>
+<span class="sourceLineNo">113</span> } catch (IOException e) {<a
name="line.113"></a>
+<span class="sourceLineNo">114</span> LOG.warn("Error trying to add the
column family" + getColumnFamilyName() + " to the table "<a name="line.114"></a>
+<span class="sourceLineNo">115</span> + tableName + " (in state=" +
state + ")", e);<a name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span>
setFailure("master-add-columnfamily", e);<a name="line.117"></a>
+<span class="sourceLineNo">118</span> }<a name="line.118"></a>
+<span class="sourceLineNo">119</span> return Flow.HAS_MORE_STATE;<a
name="line.119"></a>
+<span class="sourceLineNo">120</span> }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span> @Override<a name="line.122"></a>
+<span class="sourceLineNo">123</span> protected void rollbackState(final
MasterProcedureEnv env, final AddColumnFamilyState state)<a name="line.123"></a>
+<span class="sourceLineNo">124</span> throws IOException {<a
name="line.124"></a>
+<span class="sourceLineNo">125</span> if (isTraceEnabled()) {<a
name="line.125"></a>
+<span class="sourceLineNo">126</span> LOG.trace(this + " rollback state="
+ state);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> }<a name="line.127"></a>
+<span class="sourceLineNo">128</span> try {<a name="line.128"></a>
+<span class="sourceLineNo">129</span> switch (state) {<a
name="line.129"></a>
+<span class="sourceLineNo">130</span> case
ADD_COLUMN_FAMILY_REOPEN_ALL_REGIONS:<a name="line.130"></a>
+<span class="sourceLineNo">131</span> break; // Nothing to undo.<a
name="line.131"></a>
+<span class="sourceLineNo">132</span> case
ADD_COLUMN_FAMILY_POST_OPERATION:<a name="line.132"></a>
+<span class="sourceLineNo">133</span> // TODO-MAYBE: call the
coprocessor event to undo?<a name="line.133"></a>
+<span class="sourceLineNo">134</span> break;<a name="line.134"></a>
+<span class="sourceLineNo">135</span> case
ADD_COLUMN_FAMILY_UPDATE_TABLE_DESCRIPTOR:<a name="line.135"></a>
+<span class="sourceLineNo">136</span> restoreTableDescriptor(env);<a
name="line.136"></a>
+<span class="sourceLineNo">137</span> break;<a name="line.137"></a>
+<span class="sourceLineNo">138</span> case
ADD_COLUMN_FAMILY_PRE_OPERATION:<a name="line.138"></a>
+<span class="sourceLineNo">139</span> // TODO-MAYBE: call the
coprocessor event to undo?<a name="line.139"></a>
+<span class="sourceLineNo">140</span> break;<a name="line.140"></a>
+<span class="sourceLineNo">141</span> case ADD_COLUMN_FAMILY_PREPARE:<a
name="line.141"></a>
+<span class="sourceLineNo">142</span> break; // nothing to do<a
name="line.142"></a>
+<span class="sourceLineNo">143</span> default:<a name="line.143"></a>
+<span class="sourceLineNo">144</span> throw new
UnsupportedOperationException(this + " unhandled state=" + state);<a
name="line.144"></a>
+<span class="sourceLineNo">145</span> }<a name="line.145"></a>
+<span class="sourceLineNo">146</span> } catch (IOException e) {<a
name="line.146"></a>
+<span class="sourceLineNo">147</span> // This will be retried. Unless
there is a bug in the code,<a name="line.147"></a>
+<span class="sourceLineNo">148</span> // this should be just a "temporary
error" (e.g. network down)<a name="line.148"></a>
+<span class="sourceLineNo">149</span> LOG.warn("Failed rollback attempt
step " + state + " for adding the column family"<a name="line.149"></a>
+<span class="sourceLineNo">150</span> + getColumnFamilyName() + " to
the table " + tableName, e);<a name="line.150"></a>
+<span class="sourceLineNo">151</span> throw e;<a name="line.151"></a>
+<span class="sourceLineNo">152</span> }<a name="line.152"></a>
+<span class="sourceLineNo">153</span> }<a name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span> @Override<a name="line.155"></a>
+<span class="sourceLineNo">156</span> protected AddColumnFamilyState
getState(final int stateId) {<a name="line.156"></a>
+<span class="sourceLineNo">157</span> return
AddColumnFamilyState.valueOf(stateId);<a name="line.157"></a>
+<span class="sourceLineNo">158</span> }<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span> @Override<a name="line.160"></a>
+<span class="sourceLineNo">161</span> protected int getStateId(final
AddColumnFamilyState state) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span> return state.getNumber();<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> @Override<a name="line.165"></a>
+<span class="sourceLineNo">166</span> protected AddColumnFamilyState
getInitialState() {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> return
AddColumnFamilyState.ADD_COLUMN_FAMILY_PREPARE;<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> @Override<a name="line.170"></a>
+<span class="sourceLineNo">171</span> protected void
setNextState(AddColumnFamilyState state) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> if (aborted.get()) {<a
name="line.172"></a>
+<span class="sourceLineNo">173</span> setAbortFailure("add-columnfamily",
"abort requested");<a name="line.173"></a>
+<span class="sourceLineNo">174</span> } else {<a name="line.174"></a>
+<span class="sourceLineNo">175</span> super.setNextState(state);<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> @Override<a name="line.179"></a>
+<span class="sourceLineNo">180</span> public boolean abort(final
MasterProcedureEnv env) {<a name="line.180"></a>
+<span class="sourceLineNo">181</span> aborted.set(true);<a
name="line.181"></a>
+<span class="sourceLineNo">182</span> return true;<a name="line.182"></a>
+<span class="sourceLineNo">183</span> }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span> @Override<a name="line.185"></a>
+<span class="sourceLineNo">186</span> protected boolean acquireLock(final
MasterProcedureEnv env) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> if (env.waitInitialized(this)) return
false;<a name="line.187"></a>
+<span class="sourceLineNo">188</span> return
env.getProcedureQueue().tryAcquireTableExclusiveLock(tableName, "add
family");<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span> @Override<a name="line.191"></a>
+<span class="sourceLineNo">192</span> protected void releaseLock(final
MasterProcedureEnv env) {<a name="line.192"></a>
+<span class="sourceLineNo">193</span>
env.getProcedureQueue().releaseTableExclusiveLock(tableName);<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> @Override<a name="line.196"></a>
+<span class="sourceLineNo">197</span> public void serializeStateData(final
OutputStream stream) throws IOException {<a name="line.197"></a>
+<span class="sourceLineNo">198</span> super.serializeStateData(stream);<a
name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span>
MasterProcedureProtos.AddColumnFamilyStateData.Builder addCFMsg =<a
name="line.200"></a>
+<span class="sourceLineNo">201</span>
MasterProcedureProtos.AddColumnFamilyStateData.newBuilder()<a
name="line.201"></a>
+<span class="sourceLineNo">202</span>
.setUserInfo(MasterProcedureUtil.toProtoUserInfo(user))<a name="line.202"></a>
+<span class="sourceLineNo">203</span>
.setTableName(ProtobufUtil.toProtoTableName(tableName))<a name="line.203"></a>
+<span class="sourceLineNo">204</span>
.setColumnfamilySchema(cfDescriptor.convert());<a name="line.204"></a>
+<span class="sourceLineNo">205</span> if (unmodifiedHTableDescriptor !=
null) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span>
addCFMsg.setUnmodifiedTableSchema(unmodifiedHTableDescriptor.convert());<a
name="line.206"></a>
+<span class="sourceLineNo">207</span> }<a name="line.207"></a>
+<span class="sourceLineNo">208</span><a name="line.208"></a>
+<span class="sourceLineNo">209</span>
addCFMsg.build().writeDelimitedTo(stream);<a name="line.209"></a>
+<span class="sourceLineNo">210</span> }<a name="line.210"></a>
<span class="sourceLineNo">211</span><a name="line.211"></a>
-<span class="sourceLineNo">212</span>
addCFMsg.build().writeDelimitedTo(stream);<a name="line.212"></a>
-<span class="sourceLineNo">213</span> }<a name="line.213"></a>
-<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span> @Override<a name="line.215"></a>
-<span class="sourceLineNo">216</span> public void deserializeStateData(final
InputStream stream) throws IOException {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> super.deserializeStateData(stream);<a
name="line.217"></a>
-<span class="sourceLineNo">218</span><a name="line.218"></a>
-<span class="sourceLineNo">219</span>
MasterProcedureProtos.AddColumnFamilyStateData addCFMsg =<a name="line.219"></a>
-<span class="sourceLineNo">220</span>
MasterProcedureProtos.AddColumnFamilyStateData.parseDelimitedFrom(stream);<a
name="line.220"></a>
-<span class="sourceLineNo">221</span> user =
MasterProcedureUtil.toUserInfo(addCFMsg.getUserInfo());<a name="line.221"></a>
-<span class="sourceLineNo">222</span> tableName =
ProtobufUtil.toTableName(addCFMsg.getTableName());<a name="line.222"></a>
-<span class="sourceLineNo">223</span> cfDescriptor =
HColumnDescriptor.convert(addCFMsg.getColumnfamilySchema());<a
name="line.223"></a>
-<span class="sourceLineNo">224</span> if
(addCFMsg.hasUnmodifiedTableSchema()) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span> unmodifiedHTableDescriptor =
HTableDescriptor.convert(addCFMsg.getUnmodifiedTableSchema());<a
name="line.225"></a>
-<span class="sourceLineNo">226</span> }<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 void
toStringClassDetails(StringBuilder sb) {<a name="line.230"></a>
-<span class="sourceLineNo">231</span>
sb.append(getClass().getSimpleName());<a name="line.231"></a>
-<span class="sourceLineNo">232</span> sb.append(" (table=");<a
name="line.232"></a>
-<span class="sourceLineNo">233</span> sb.append(tableName);<a
name="line.233"></a>
-<span class="sourceLineNo">234</span> sb.append(", columnfamily=");<a
name="line.234"></a>
-<span class="sourceLineNo">235</span> if (cfDescriptor != null) {<a
name="line.235"></a>
-<span class="sourceLineNo">236</span> sb.append(getColumnFamilyName());<a
name="line.236"></a>
-<span class="sourceLineNo">237</span> } else {<a name="line.237"></a>
-<span class="sourceLineNo">238</span> sb.append("Unknown");<a
name="line.238"></a>
-<span class="sourceLineNo">239</span> }<a name="line.239"></a>
-<span class="sourceLineNo">240</span> sb.append(")");<a name="line.240"></a>
-<span class="sourceLineNo">241</span> }<a name="line.241"></a>
-<span class="sourceLineNo">242</span><a name="line.242"></a>
-<span class="sourceLineNo">243</span> @Override<a name="line.243"></a>
-<span class="sourceLineNo">244</span> public TableName getTableName() {<a
name="line.244"></a>
-<span class="sourceLineNo">245</span> return tableName;<a
name="line.245"></a>
-<span class="sourceLineNo">246</span> }<a name="line.246"></a>
-<span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span> @Override<a name="line.248"></a>
-<span class="sourceLineNo">249</span> public TableOperationType
getTableOperationType() {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> return TableOperationType.EDIT;<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> /**<a name="line.253"></a>
-<span class="sourceLineNo">254</span> * Action before any real action of
adding column family.<a name="line.254"></a>
-<span class="sourceLineNo">255</span> * @param env MasterProcedureEnv<a
name="line.255"></a>
-<span class="sourceLineNo">256</span> * @throws IOException<a
name="line.256"></a>
-<span class="sourceLineNo">257</span> */<a name="line.257"></a>
-<span class="sourceLineNo">258</span> private void prepareAdd(final
MasterProcedureEnv env) throws IOException {<a name="line.258"></a>
-<span class="sourceLineNo">259</span> // Checks whether the table is
allowed to be modified.<a name="line.259"></a>
-<span class="sourceLineNo">260</span>
MasterDDLOperationHelper.checkTableModifiable(env, tableName);<a
name="line.260"></a>
-<span class="sourceLineNo">261</span><a name="line.261"></a>
-<span class="sourceLineNo">262</span> // In order to update the descriptor,
we need to retrieve the old descriptor for comparison.<a name="line.262"></a>
-<span class="sourceLineNo">263</span> unmodifiedHTableDescriptor =
env.getMasterServices().getTableDescriptors().get(tableName);<a
name="line.263"></a>
-<span class="sourceLineNo">264</span> if (unmodifiedHTableDescriptor ==
null) {<a name="line.264"></a>
-<span class="sourceLineNo">265</span> throw new
IOException("HTableDescriptor missing for " + tableName);<a name="line.265"></a>
-<span class="sourceLineNo">266</span> }<a name="line.266"></a>
-<span class="sourceLineNo">267</span> if
(unmodifiedHTableDescriptor.hasFamily(cfDescriptor.getName())) {<a
name="line.267"></a>
-<span class="sourceLineNo">268</span> throw new
InvalidFamilyOperationException("Column family '" + getColumnFamilyName()<a
name="line.268"></a>
-<span class="sourceLineNo">269</span> + "' in table '" + tableName +
"' already exists so cannot be added");<a name="line.269"></a>
-<span class="sourceLineNo">270</span> }<a name="line.270"></a>
-<span class="sourceLineNo">271</span> }<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span> /**<a name="line.273"></a>
-<span class="sourceLineNo">274</span> * Action before adding column
family.<a name="line.274"></a>
-<span class="sourceLineNo">275</span> * @param env MasterProcedureEnv<a
name="line.275"></a>
-<span class="sourceLineNo">276</span> * @param state the procedure state<a
name="line.276"></a>
-<span class="sourceLineNo">277</span> * @throws IOException<a
name="line.277"></a>
-<span class="sourceLineNo">278</span> * @throws InterruptedException<a
name="line.278"></a>
-<span class="sourceLineNo">279</span> */<a name="line.279"></a>
-<span class="sourceLineNo">280</span> private void preAdd(final
MasterProcedureEnv env, final AddColumnFamilyState state)<a name="line.280"></a>
-<span class="sourceLineNo">281</span> throws IOException,
InterruptedException {<a name="line.281"></a>
-<span class="sourceLineNo">282</span> runCoprocessorAction(env, state);<a
name="line.282"></a>
-<span class="sourceLineNo">283</span> }<a name="line.283"></a>
-<span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span> /**<a name="line.285"></a>
-<span class="sourceLineNo">286</span> * Add the column family to the file
system<a name="line.286"></a>
-<span class="sourceLineNo">287</span> */<a name="line.287"></a>
-<span class="sourceLineNo">288</span> private void
updateTableDescriptor(final MasterProcedureEnv env) throws IOException {<a
name="line.288"></a>
-<span class="sourceLineNo">289</span> // Update table descriptor<a
name="line.289"></a>
-<span class="sourceLineNo">290</span> LOG.info("AddColumn. Table = " +
tableName + " HCD = " + cfDescriptor.toString());<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span> HTableDescriptor htd =
env.getMasterServices().getTableDescriptors().get(tableName);<a
name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span> if
(htd.hasFamily(cfDescriptor.getName())) {<a name="line.294"></a>
-<span class="sourceLineNo">295</span> // It is possible to reach this
situation, as we could already add the column family<a name="line.295"></a>
-<span class="sourceLineNo">296</span> // to table descriptor, but the
master failover happens before we complete this state.<a name="line.296"></a>
-<span class="sourceLineNo">297</span> // We should be able to handle
running this function multiple times without causing problem.<a
name="line.297"></a>
-<span class="sourceLineNo">298</span> return;<a name="line.298"></a>
-<span class="sourceLineNo">299</span> }<a name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span> htd.addFamily(cfDescriptor);<a
name="line.301"></a>
-<span class="sourceLineNo">302</span>
env.getMasterServices().getTableDescriptors().add(htd);<a name="line.302"></a>
-<span class="sourceLineNo">303</span> }<a name="line.303"></a>
-<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span> /**<a name="line.305"></a>
-<span class="sourceLineNo">306</span> * Restore the table descriptor back to
pre-add<a name="line.306"></a>
-<span class="sourceLineNo">307</span> * @param env MasterProcedureEnv<a
name="line.307"></a>
-<span class="sourceLineNo">308</span> * @throws IOException<a
name="line.308"></a>
-<span class="sourceLineNo">309</span> **/<a name="line.309"></a>
-<span class="sourceLineNo">310</span> private void
restoreTableDescriptor(final MasterProcedureEnv env) throws IOException {<a
name="line.310"></a>
-<span class="sourceLineNo">311</span> HTableDescriptor htd =
env.getMasterServices().getTableDescriptors().get(tableName);<a
name="line.311"></a>
-<span class="sourceLineNo">312</span> if
(htd.hasFamily(cfDescriptor.getName())) {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> // Remove the column family from
file system and update the table descriptor to<a name="line.313"></a>
-<span class="sourceLineNo">314</span> // the
before-add-column-family-state<a name="line.314"></a>
-<span class="sourceLineNo">315</span>
MasterDDLOperationHelper.deleteColumnFamilyFromFileSystem(env, tableName,<a
name="line.315"></a>
-<span class="sourceLineNo">316</span> getRegionInfoList(env),
cfDescriptor.getName(), cfDescriptor.isMobEnabled());<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span>
env.getMasterServices().getTableDescriptors().add(unmodifiedHTableDescriptor);<a
name="line.318"></a>
-<span class="sourceLineNo">319</span><a name="line.319"></a>
-<span class="sourceLineNo">320</span> // Make sure regions are opened
after table descriptor is updated.<a name="line.320"></a>
-<span class="sourceLineNo">321</span>
reOpenAllRegionsIfTableIsOnline(env);<a name="line.321"></a>
-<span class="sourceLineNo">322</span> }<a name="line.322"></a>
-<span class="sourceLineNo">323</span> }<a name="line.323"></a>
-<span class="sourceLineNo">324</span><a name="line.324"></a>
-<span class="sourceLineNo">325</span> /**<a name="line.325"></a>
-<span class="sourceLineNo">326</span> * Action after adding column family.<a
name="line.326"></a>
-<span class="sourceLineNo">327</span> * @param env MasterProcedureEnv<a
name="line.327"></a>
-<span class="sourceLineNo">328</span> * @param state the procedure state<a
name="line.328"></a>
-<span class="sourceLineNo">329</span> * @throws IOException<a
name="line.329"></a>
-<span class="sourceLineNo">330</span> * @throws InterruptedException<a
name="line.330"></a>
-<span class="sourceLineNo">331</span> */<a name="line.331"></a>
-<span class="sourceLineNo">332</span> private void postAdd(final
MasterProcedureEnv env, final AddColumnFamilyState state)<a name="line.332"></a>
-<span class="sourceLineNo">333</span> throws IOException,
InterruptedException {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> runCoprocessorAction(env, state);<a
name="line.334"></a>
-<span class="sourceLineNo">335</span> }<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span> /**<a name="line.337"></a>
-<span class="sourceLineNo">338</span> * Last action from the procedure -
executed when online schema change is supported.<a name="line.338"></a>
-<span class="sourceLineNo">339</span> * @param env MasterProcedureEnv<a
name="line.339"></a>
-<span class="sourceLineNo">340</span> * @throws IOException<a
name="line.340"></a>
-<span class="sourceLineNo">341</span> */<a name="line.341"></a>
-<span class="sourceLineNo">342</span> private void
reOpenAllRegionsIfTableIsOnline(final MasterProcedureEnv env) throws
IOException {<a name="line.342"></a>
-<span class="sourceLineNo">343</span> // This operation only run when the
table is enabled.<a name="line.343"></a>
-<span class="sourceLineNo">344</span> if
(!env.getMasterServices().getAssignmentManager().getTableStateManager()<a
name="line.344"></a>
-<span class="sourceLineNo">345</span> .isTableState(getTableName(),
TableState.State.ENABLED)) {<a name="line.345"></a>
-<span class="sourceLineNo">346</span> return;<a name="line.346"></a>
-<span class="sourceLineNo">347</span> }<a name="line.347"></a>
-<span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span> if
(MasterDDLOperationHelper.reOpenAllRegions(env, getTableName(),
getRegionInfoList(env))) {<a name="line.349"></a>
-<span class="sourceLineNo">350</span> LOG.info("Completed add column
family operation on table " + getTableName());<a name="line.350"></a>
-<span class="sourceLineNo">351</span> } else {<a name="line.351"></a>
-<span class="sourceLineNo">352</span> LOG.warn("Error on reopening the
regions on table " + getTableName());<a name="line.352"></a>
-<span class="sourceLineNo">353</span> }<a name="line.353"></a>
-<span class="sourceLineNo">354</span> }<a name="line.354"></a>
-<span class="sourceLineNo">355</span><a name="line.355"></a>
-<span class="sourceLineNo">356</span> /**<a name="line.356"></a>
-<span class="sourceLineNo">357</span> * The procedure could be restarted
from a different machine. If the variable is null, we need to<a
name="line.357"></a>
-<span class="sourceLineNo">358</span> * retrieve it.<a name="line.358"></a>
-<span class="sourceLineNo">359</span> * @return traceEnabled<a
name="line.359"></a>
-<span class="sourceLineNo">360</span> */<a name="line.360"></a>
-<span class="sourceLineNo">361</span> private Boolean isTraceEnabled() {<a
name="line.361"></a>
-<span class="sourceLineNo">362</span> if (traceEnabled == null) {<a
name="line.362"></a>
-<span class="sourceLineNo">363</span> traceEnabled =
LOG.isTraceEnabled();<a name="line.363"></a>
-<span class="sourceLineNo">364</span> }<a name="line.364"></a>
-<span class="sourceLineNo">365</span> return traceEnabled;<a
name="line.365"></a>
-<span class="sourceLineNo">366</span> }<a name="line.366"></a>
-<span class="sourceLineNo">367</span><a name="line.367"></a>
-<span class="sourceLineNo">368</span> private String getColumnFamilyName()
{<a name="line.368"></a>
-<span class="sourceLineNo">369</span> return
cfDescriptor.getNameAsString();<a name="line.369"></a>
-<span class="sourceLineNo">370</span> }<a name="line.370"></a>
-<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span> /**<a name="line.372"></a>
-<span class="sourceLineNo">373</span> * Coprocessor Action.<a
name="line.373"></a>
-<span class="sourceLineNo">374</span> * @param env MasterProcedureEnv<a
name="line.374"></a>
-<span class="sourceLineNo">375</span> * @param state the procedure state<a
name="line.375"></a>
-<span class="sourceLineNo">376</span> * @throws IOException<a
name="line.376"></a>
-<span class="sourceLineNo">377</span> * @throws InterruptedException<a
name="line.377"></a>
-<span class="sourceLineNo">378</span> */<a name="line.378"></a>
-<span class="sourceLineNo">379</span> private void runCoprocessorAction(final
MasterProcedureEnv env, final AddColumnFamilyState state)<a name="line.379"></a>
-<span class="sourceLineNo">380</span> throws IOException,
InterruptedException {<a name="line.380"></a>
-<span class="sourceLineNo">381</span> final MasterCoprocessorHost cpHost =
env.getMasterCoprocessorHost();<a name="line.381"></a>
-<span class="sourceLineNo">382</span> if (cpHost != null) {<a
name="line.382"></a>
-<span class="sourceLineNo">383</span> user.doAs(new
PrivilegedExceptionAction<Void>() {<a name="line.383"></a>
-<span class="sourceLineNo">384</span> @Override<a name="line.384"></a>
-<span class="sourceLineNo">385</span> public Void run() throws
Exception {<a name="line.385"></a>
-<span class="sourceLineNo">386</span> switch (state) {<a
name="line.386"></a>
-<span class="sourceLineNo">387</span> case
ADD_COLUMN_FAMILY_PRE_OPERATION:<a name="line.387"></a>
-<span class="sourceLineNo">388</span>
cpHost.preAddColumnHandler(tableName, cfDescriptor);<a name="line.388"></a>
+<span class="sourceLineNo">212</span> @Override<a name="line.212"></a>
+<span class="sourceLineNo">213</span> public void deserializeStateData(final
InputStream stream) throws IOException {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> super.deserializeStateData(stream);<a
name="line.214"></a>
+<span class="sourceLineNo">215</span><a name="line.215"></a>
+<span class="sourceLineNo">216</span>
MasterProcedureProtos.AddColumnFamilyStateData addCFMsg =<a name="line.216"></a>
+<span class="sourceLineNo">217</span>
MasterProcedureProtos.AddColumnFamilyStateData.parseDelimitedFrom(stream);<a
name="line.217"></a>
+<span class="sourceLineNo">218</span> user =
MasterProcedureUtil.toUserInfo(addCFMsg.getUserInfo());<a name="line.218"></a>
+<span class="sourceLineNo">219</span> tableName =
ProtobufUtil.toTableName(addCFMsg.getTableName());<a name="line.219"></a>
+<span class="sourceLineNo">220</span> cfDescriptor =
HColumnDescriptor.convert(addCFMsg.getColumnfamilySchema());<a
name="line.220"></a>
+<span class="sourceLineNo">221</span> if
(addCFMsg.hasUnmodifiedTableSchema()) {<a name="line.221"></a>
+<span class="sourceLineNo">222</span> unmodifiedHTableDescriptor =
HTableDescriptor.convert(addCFMsg.getUnmodifiedTableSchema());<a
name="line.222"></a>
+<span class="sourceLineNo">223</span> }<a name="line.223"></a>
+<span class="sourceLineNo">224</span> }<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> @Override<a name="line.226"></a>
+<span class="sourceLineNo">227</span> public void
toStringClassDetails(StringBuilder sb) {<a name="line.227"></a>
+<span class="sourceLineNo">228</span>
sb.append(getClass().getSimpleName());<a name="line.228"></a>
+<span class="sourceLineNo">229</span> sb.append(" (table=");<a
name="line.229"></a>
+<span class="sourceLineNo">230</span> sb.append(tableName);<a
name="line.230"></a>
+<span class="sourceLineNo">231</span> sb.append(", columnfamily=");<a
name="line.231"></a>
+<span class="sourceLineNo">232</span> if (cfDescriptor != null) {<a
name="line.232"></a>
+<span class="sourceLineNo">233</span> sb.append(getColumnFamilyName());<a
name="line.233"></a>
+<span class="sourceLineNo">234</span> } else {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> sb.append("Unknown");<a
name="line.235"></a>
+<span class="sourceLineNo">236</span> }<a name="line.236"></a>
+<span class="sourceLineNo">237</span> sb.append(")");<a name="line.237"></a>
+<span class="sourceLineNo">238</span> }<a name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span> @Override<a name="line.240"></a>
+<span class="sourceLineNo">241</span> public TableName getTableName() {<a
name="line.241"></a>
+<span class="sourceLineNo">242</span> return tableName;<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> @Override<a name="line.245"></a>
+<span class="sourceLineNo">246</span> public TableOperationType
getTableOperationType() {<a name="line.246"></a>
+<span class="sourceLineNo">247</span> return TableOperationType.EDIT;<a
name="line.247"></a>
+<span class="sourceLineNo">248</span> }<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span> /**<a name="line.250"></a>
+<span class="sourceLineNo">251</span> * Action before any real action of
adding column family.<a name="line.251"></a>
+<span class="sourceLineNo">252</span> * @param env MasterProcedureEnv<a
name="line.252"></a>
+<span class="sourceLineNo">253</span> * @throws IOException<a
name="line.253"></a>
+<span class="sourceLineNo">254</span> */<a name="line.254"></a>
+<span class="sourceLineNo">255</span> private void prepareAdd(final
MasterProcedureEnv env) throws IOException {<a name="line.255"></a>
+<span class="sourceLineNo">256</span> // Checks whether the table is
allowed to be modified.<a name="line.256"></a>
+<span class="sourceLineNo">257</span>
MasterDDLOperationHelper.checkTableModifiable(env, tableName);<a
name="line.257"></a>
+<span class="sourceLineNo">258</span><a name="line.258"></a>
+<span class="sourceLineNo">259</span> // In order to update the descriptor,
we need to retrieve the old descriptor for comparison.<a name="line.259"></a>
+<span class="sourceLineNo">260</span> unmodifiedHTableDescriptor =
env.getMasterServices().getTableDescriptors().get(tableName);<a
name="line.260"></a>
+<span class="sourceLineNo">261</span> if (unmodifiedHTableDescriptor ==
null) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> throw new
IOException("HTableDescriptor missing for " + tableName);<a name="line.262"></a>
+<span class="sourceLineNo">263</span> }<a name="line.263"></a>
+<span class="sourceLineNo">264</span> if
(unmodifiedHTableDescriptor.hasFamily(cfDescriptor.getName())) {<a
name="line.264"></a>
+<span class="sourceLineNo">265</span> throw new
InvalidFamilyOperationException("Column family '" + getColumnFamilyName()<a
name="line.265"></a>
+<span class="sourceLineNo">266</span> + "' in table '" + tableName +
"' already exists so cannot be added");<a name="line.266"></a>
+<span class="sourceLineNo">267</span> }<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> /**<a name="line.270"></a>
+<span class="sourceLineNo">271</span> * Action before adding column
family.<a name="line.271"></a>
+<span class="sourceLineNo">272</span> * @param env MasterProcedureEnv<a
name="line.272"></a>
+<span class="sourceLineNo">273</span> * @param state the procedure state<a
name="line.273"></a>
+<span class="sourceLineNo">274</span> * @throws IOException<a
name="line.274"></a>
+<span class="sourceLineNo">275</span> * @throws InterruptedException<a
name="line.275"></a>
+<span class="sourceLineNo">276</span> */<a name="line.276"></a>
+<span class="sourceLineNo">277</span> private void preAdd(final
MasterProcedureEnv env, final AddColumnFamilyState state)<a name="line.277"></a>
+<span class="sourceLineNo">278</span> throws IOException,
InterruptedException {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> runCoprocessorAction(env, state);<a
name="line.279"></a>
+<span class="sourceLineNo">280</span> }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span> /**<a name="line.282"></a>
+<span class="sourceLineNo">283</span> * Add the column family to the file
system<a name="line.283"></a>
+<span class="sourceLineNo">284</span> */<a name="line.284"></a>
+<span class="sourceLineNo">285</span> private void
updateTableDescriptor(final MasterProcedureEnv env) throws IOException {<a
name="line.285"></a>
+<span class="sourceLineNo">286</span> // Update table descriptor<a
name="line.286"></a>
+<span class="sourceLineNo">287</span> LOG.info("AddColumn. Table = " +
tableName + " HCD = " + cfDescriptor.toString());<a name="line.287"></a>
+<span class="sourceLineNo">288</span><a name="line.288"></a>
+<span class="sourceLineNo">289</span> HTableDescriptor htd =
env.getMasterServices().getTableDescriptors().get(tableName);<a
name="line.289"></a>
+<span class="sourceLineNo">290</span><a name="line.290"></a>
+<span class="sourceLineNo">291</span> if
(htd.hasFamily(cfDescriptor.getName())) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> // It is possible to reach this
situation, as we could already add the column family<a name="line.292"></a>
+<span class="sourceLineNo">293</span> // to table descriptor, but the
master failover happens before we complete this state.<a name="line.293"></a>
+<span class="sourceLineNo">294</span> // We should be able to handle
running this function multiple times without causing problem.<a
name="line.294"></a>
+<span class="sourceLineNo">295</span> return;<a name="line.295"></a>
+<span class="sourceLineNo">296</span> }<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span> htd.addFamily(cfDescriptor);<a
name="line.298"></a>
+<span class="sourceLineNo">299</span>
env.getMasterServices().getTableDescriptors().add(htd);<a name="line.299"></a>
+<span class="sourceLineNo">300</span> }<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span> /**<a name="line.302"></a>
+<span class="sourceLineNo">303</span> * Restore the table descriptor back to
pre-add<a name="line.303"></a>
+<span class="sourceLineNo">304</span> * @param env MasterProcedureEnv<a
name="line.304"></a>
+<span class="sourceLineNo">305</span> * @throws IOException<a
name="line.305"></a>
+<span class="sourceLineNo">306</span> **/<a name="line.306"></a>
+<span class="sourceLineNo">307</span> private void
restoreTableDescriptor(final MasterProcedureEnv env) throws IOException {<a
name="line.307"></a>
+<span class="sourceLineNo">308</span> HTableDescriptor htd =
env.getMasterServices().getTableDescriptors().get(tableName);<a
name="line.308"></a>
+<span class="sourceLineNo">309</span> if
(htd.hasFamily(cfDescriptor.getName())) {<a name="line.309"></a>
+<span class="sourceLineNo">310</span> // Remove the column family from
file system and update the table descriptor to<a name="line.310"></a>
+<span class="sourceLineNo">311</span> // the
before-add-column-family-state<a name="line.311"></a>
+<span class="sourceLineNo">312</span>
MasterDDLOperationHelper.deleteColumnFamilyFromFileSystem(env, tableName,<a
name="line.312"></a>
+<span class="sourceLineNo">313</span> getRegionInfoList(env),
cfDescriptor.getName(), cfDescriptor.isMobEnabled());<a name="line.313"></a>
+<span class="sourceLineNo">314</span><a name="line.314"></a>
+<span class="sourceLineNo">315</span>
env.getMasterServices().getTableDescriptors().add(unmodifiedHTableDescriptor);<a
name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span> // Make sure regions are opened
after table descriptor is updated.<a name="line.317"></a>
+<span class="sourceLineNo">318</span>
reOpenAllRegionsIfTableIsOnline(env);<a name="line.318"></a>
+<span class="sourceLineNo">319</span> }<a name="line.319"></a>
+<span class="sourceLineNo">320</span> }<a name="line.320"></a>
+<span class="sourceLineNo">321</span><a name="line.321"></a>
+<span class="sourceLineNo">322</span> /**<a name="line.322"></a>
+<span class="sourceLineNo">323</span> * Action after adding column family.<a
name="line.323"></a>
+<span class="sourceLineNo">324</span> * @param env MasterProcedureEnv<a
name="line.324"></a>
+<span class="sourceLineNo">325</span> * @param state the procedure state<a
name="line.325"></a>
+<span class="sourceLineNo">326</span> * @throws IOException<a
name="line.326"></a>
+<span class="sourceLineNo">327</span> * @throws InterruptedException<a
name="line.327"></a>
+<span class="sourceLineNo">328</span> */<a name="line.328"></a>
+<span class="sourceLineNo">329</span> private void postAdd(final
MasterProcedureEnv env, final AddColumnFamilyState state)<a name="line.329"></a>
+<span class="sourceLineNo">330</span> throws IOException,
InterruptedException {<a name="line.330"></a>
+<span class="sourceLineNo">331</span> runCoprocessorAction(env, state);<a
name="line.331"></a>
+<span class="sourceLineNo">332</span> }<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span> /**<a name="line.334"></a>
+<span class="sourceLineNo">335</span> * Last action from the procedure -
executed when online schema change is supported.<a name="line.335"></a>
+<span class="sourceLineNo">336</span> * @param env MasterProcedureEnv<a
name="line.336"></a>
+<span class="sourceLineNo">337</span> * @throws IOException<a
name="line.337"></a>
+<span class="sourceLineNo">338</span> */<a name="line.338"></a>
+<span class="sourceLineNo">339</span> private void
reOpenAllRegionsIfTableIsOnline(final MasterProcedureEnv env) throws
IOException {<a name="line.339"></a>
+<span class="sourceLineNo">340</span> // This operation only run when the
table is enabled.<a name="line.340"></a>
+<span class="sourceLineNo">341</span> if
(!env.getMasterServices().getAssignmentManager().getTableStateManager()<a
name="line.341"></a>
+<span class="sourceLineNo">342</span> .isTableState(getTableName(),
TableState.State.ENABLED)) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> return;<a name="line.343"></a>
+<span class="sourceLineNo">344</span> }<a name="line.344"></a>
+<span class="sourceLineNo">345</span><a name="line.345"></a>
+<span class="sourceLineNo">346</span> if
(MasterDDLOperationHelper.reOpenAllRegions(env, getTableName(),
getRegionInfoList(env))) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span> LOG.info("Completed add column
family operation on table " + getTableName());<a name="line.347"></a>
+<span class="sourceLineNo">348</span> } else {<a name="line.348"></a>
+<span class="sourceLineNo">349</span> LOG.warn("Error on reopening the
regions on table " + getTableName());<a name="line.349"></a>
+<span class="sourceLineNo">350</span> }<a name="line.350"></a>
+<span class="sourceLineNo">351</span> }<a name="line.351"></a>
+<span class="sourceLineNo">352</span><a name="line.352"></a>
+<span class="sourceLineNo">353</span> /**<a name="line.353"></a>
+<span class="sourceLineNo">354</span> * The procedure could be restarted
from a different machine. If the variable is null, we need to<a
name="line.354"></a>
+<span class="sourceLineNo">355</span> * retrieve it.<a name="line.355"></a>
+<span class="sourceLineNo">356</span> * @return traceEnabled<a
name="line.356"></a>
+<span class="sourceLineNo">357</span> */<a name="line.357"></a>
+<span class="sourceLineNo">358</span> private Boolean isTraceEnabled() {<a
name="line.358"></a>
+<span class="sourceLineNo">359</span> if (traceEnabled == null) {<a
name="line.359"></a>
+<span class="sourceLineNo">360</span> traceEnabled =
LOG.isTraceEnabled();<a name="line.360"></a>
+<span class="sourceLineNo">361</span> }<a name="line.361"></a>
+<span class="sourceLineNo">362</span> return traceEnabled;<a
name="line.362"></a>
+<span class="sourceLineNo">363</span> }<a name="line.363"></a>
+<span class="sourceLineNo">364</span><a name="line.364"></a>
+<span class="sourceLineNo">365</span> private String getColumnFamilyName()
{<a name="line.365"></a>
+<span class="sourceLineNo">366</span> return
cfDescriptor.getNameAsString();<a name="line.366"></a>
+<span class="sourceLineNo">367</span> }<a name="line.367"></a>
+<span class="sourceLineNo">368</span><a name="line.368"></a>
+<span class="sourceLineNo">369</span> /**<a name="line.369"></a>
+<span class="sourceLineNo">370</span> * Coprocessor Action.<a
name="line.370"></a>
+<span class="sourceLineNo">371</span> * @param env MasterProcedureEnv<a
name="line.371"></a>
+<span class="sourceLineNo">372</span> * @param state the procedure state<a
name="line.372"></a>
+<span class="sourceLineNo">373</span> * @throws IOException<a
name="line.373"></a>
+<span class="sourceLineNo">374</span> * @throws InterruptedException<a
name="line.374"></a>
+<span class="sourceLineNo">375</span> */<a name="line.375"></a>
+<span class="sourceLineNo">376</span> private void runCoprocessorAction(final
MasterProcedureEnv env, final AddColumnFamilyState state)<a name="line.376"></a>
+<span class="sourceLineNo">377</span> throws IOException,
InterruptedException {<a name="line.377"></a>
+<span class="sourceLineNo">378</span> final MasterCoprocessorHost cpHost =
env.getMasterCoprocessorHost();<a name="line.378"></a>
+<span class="sourceLineNo">379</span> if (cpHost != null) {<a
name="line.379"></a>
+<span class="sourceLineNo">380</span> user.doAs(new
PrivilegedExceptionAction<Void>() {<a name="line.380"></a>
+<span class="sourceLineNo">381</span> @Override<a name="line.381"></a>
+<span class="sourceLineNo">382</span> public Void run() throws
Exception {<a name="line.382"></a>
+<span class="sourceLineNo">383</span> switch (state) {<a
name="line.383"></a>
+<span class="sourceLineNo">384</span> case
ADD_COLUMN_FAMILY_PRE_OPERATION:<a name="line.384"></a>
+<span class="sourceLineNo">385</span>
cpHost.preAddColumnHandler(tableName, cfDescriptor);<a name="line.385"></a>
+<span class="sourceLineNo">386</span> break;<a name="line.386"></a>
+<span class="sourceLineNo">387</span> case
ADD_COLUMN_FAMILY_POST_OPERATION:<a name="line.387"></a>
+<span class="sourceLineNo">388</span>
cpHost.postAddColumnHandler(tableName, cfDescriptor);<a name="line.388"></a>
<span class="sourceLineNo">389</span> break;<a name="line.389"></a>
-<span class="sourceLineNo">390</span> case
ADD_COLUMN_FAMILY_POST_OPERATION:<a name="line.390"></a>
-<span class="sourceLineNo">391</span>
cpHost.postAddColumnHandler(tableName, cfDescriptor);<a name="line.391"></a>
-<span class="sourceLineNo">392</span> break;<a name="line.392"></a>
-<span class="sourceLineNo">393</span> default:<a name="line.393"></a>
-<span class="sourceLineNo">394</span> throw new
UnsupportedOperationException(this + " unhandled state=" + state);<a
name="line.394"></a>
-<span class="sourceLineNo">395</span> }<a name="line.395"></a>
-<span class="sourceLineNo">396</span> return null;<a
name="line.396"></a>
-<span class="sourceLineNo">397</span> }<a name="line.397"></a>
-<span class="sourceLineNo">398</span> });<a name="line.398"></a>
-<span class="sourceLineNo">399</span> }<a name="line.399"></a>
-<span class="sourceLineNo">400</span> }<a name="line.400"></a>
-<span class="sourceLineNo">401</span><a name="line.401"></a>
-<span class="sourceLineNo">402</span> private List<HRegionInfo>
getRegionInfoList(final MasterProcedureEnv env) throws IOException {<a
name="line.402"></a>
-<span class="sourceLineNo">403</span> if (regionInfoList == null) {<a
name="line.403"></a>
-<span class="sourceLineNo">404</span> regionInfoList =
ProcedureSyncWait.getRegionsFromMeta(env, getTableName());<a
name="line.404"></a>
-<span class="sourceLineNo">405</span> }<a name="line.405"></a>
-<span class="sourceLineNo">406</span> return regionInfoList;<a
name="line.406"></a>
-<span class="sourceLineNo">407</span> }<a name="line.407"></a>
-<span class="sourceLineNo">408</span>}<a name="line.408"></a>
+<span class="sourceLineNo">390</span> default:<a name="line.390"></a>
+<span class="sourceLineNo">391</span> throw new
UnsupportedOperationException(this + " unhandled state=" + state);<a
name="line.391"></a>
+<span class="sourceLineNo">392</span> }<a name="line.392"></a>
+<span class="sourceLineNo">393</span> return null;<a
name="line.393"></a>
+<span class="sourceLineNo">394</span> }<a name="line.394"></a>
+<span class="sourceLineNo">395</span> });<a name="line.395"></a>
+<span class="sourceLineNo">396</span> }<a name="line.396"></a>
+<span class="sourceLineNo">397</span> }<a name="line.397"></a>
+<span class="sourceLineNo">398</span><a name="line.398"></a>
+<span class="sourceLineNo">399</span> private List<HRegionInfo>
getRegionInfoList(final MasterProcedureEnv env) throws IOException {<a
name="line.399"></a>
+<span class="sourceLineNo">400</span> if (regionInfoList == null) {<a
name="line.400"></a>
+<span class="sourceLineNo">401</span> regionInfoList =
ProcedureSyncWait.getRegionsFromMeta(env, getTableName());<a
name="line.401"></a>
+<span class="sourceLineNo">402</span> }<a name="line.402"></a>
+<span class="sourceLineNo">403</span> return regionInfoList;<a
name="line.403"></a>
+<span class="sourceLineNo">404</span> }<a name="line.404"></a>
+<span class="sourceLineNo">405</span>}<a name="line.405"></a>
