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 2017/05/17 14:58:21 UTC
[13/20] hbase-site git commit: Published site at
82d554e3783372cc6b05489452c815b57c06f6cd.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/986c93ca/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.html
index 2c7300b..e8e24d4 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/DeleteTableProcedure.html
@@ -154,260 +154,269 @@
<span class="sourceLineNo">146</span> }<a name="line.146"></a>
<span class="sourceLineNo">147</span><a name="line.147"></a>
<span class="sourceLineNo">148</span> @Override<a name="line.148"></a>
-<span class="sourceLineNo">149</span> protected void rollbackState(final MasterProcedureEnv env, final DeleteTableState state) {<a name="line.149"></a>
-<span class="sourceLineNo">150</span> if (state == DeleteTableState.DELETE_TABLE_PRE_OPERATION) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> // nothing to rollback, pre-delete is just table-state checks.<a name="line.151"></a>
-<span class="sourceLineNo">152</span> // We can fail if the table does not exist or is not disabled.<a name="line.152"></a>
-<span class="sourceLineNo">153</span> // TODO: coprocessor rollback semantic is still undefined.<a name="line.153"></a>
-<span class="sourceLineNo">154</span> releaseSyncLatch();<a name="line.154"></a>
-<span class="sourceLineNo">155</span> return;<a name="line.155"></a>
-<span class="sourceLineNo">156</span> }<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span> // The delete doesn't have a rollback. The execution will succeed, at some point.<a name="line.158"></a>
-<span class="sourceLineNo">159</span> throw new UnsupportedOperationException("unhandled state=" + state);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> }<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span> @Override<a name="line.162"></a>
-<span class="sourceLineNo">163</span> protected boolean isRollbackSupported(final DeleteTableState state) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span> switch (state) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> case DELETE_TABLE_PRE_OPERATION:<a name="line.165"></a>
-<span class="sourceLineNo">166</span> return true;<a name="line.166"></a>
-<span class="sourceLineNo">167</span> default:<a name="line.167"></a>
-<span class="sourceLineNo">168</span> return false;<a name="line.168"></a>
-<span class="sourceLineNo">169</span> }<a name="line.169"></a>
-<span class="sourceLineNo">170</span> }<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span> @Override<a name="line.172"></a>
-<span class="sourceLineNo">173</span> protected DeleteTableState getState(final int stateId) {<a name="line.173"></a>
-<span class="sourceLineNo">174</span> return DeleteTableState.valueOf(stateId);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> }<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span> @Override<a name="line.177"></a>
-<span class="sourceLineNo">178</span> protected int getStateId(final DeleteTableState state) {<a name="line.178"></a>
-<span class="sourceLineNo">179</span> return state.getNumber();<a name="line.179"></a>
-<span class="sourceLineNo">180</span> }<a name="line.180"></a>
-<span class="sourceLineNo">181</span><a name="line.181"></a>
-<span class="sourceLineNo">182</span> @Override<a name="line.182"></a>
-<span class="sourceLineNo">183</span> protected DeleteTableState getInitialState() {<a name="line.183"></a>
-<span class="sourceLineNo">184</span> return DeleteTableState.DELETE_TABLE_PRE_OPERATION;<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span> @Override<a name="line.187"></a>
-<span class="sourceLineNo">188</span> public TableName getTableName() {<a name="line.188"></a>
-<span class="sourceLineNo">189</span> return tableName;<a name="line.189"></a>
-<span class="sourceLineNo">190</span> }<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span> @Override<a name="line.192"></a>
-<span class="sourceLineNo">193</span> public TableOperationType getTableOperationType() {<a name="line.193"></a>
-<span class="sourceLineNo">194</span> return TableOperationType.DELETE;<a name="line.194"></a>
-<span class="sourceLineNo">195</span> }<a name="line.195"></a>
-<span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span> @Override<a name="line.197"></a>
-<span class="sourceLineNo">198</span> public void serializeStateData(final OutputStream stream) throws IOException {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> super.serializeStateData(stream);<a name="line.199"></a>
+<span class="sourceLineNo">149</span> protected boolean abort(MasterProcedureEnv env) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span> // TODO: Current behavior is: with no rollback and no abort support, procedure may stuck<a name="line.150"></a>
+<span class="sourceLineNo">151</span> // looping in retrying failing step forever. Default behavior of abort is changed to support<a name="line.151"></a>
+<span class="sourceLineNo">152</span> // aborting all procedures. Override the default wisely. Following code retains the current<a name="line.152"></a>
+<span class="sourceLineNo">153</span> // behavior. Revisit it later.<a name="line.153"></a>
+<span class="sourceLineNo">154</span> return isRollbackSupported(getCurrentState()) ? super.abort(env) : false;<a name="line.154"></a>
+<span class="sourceLineNo">155</span> }<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span> @Override<a name="line.157"></a>
+<span class="sourceLineNo">158</span> protected void rollbackState(final MasterProcedureEnv env, final DeleteTableState state) {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> if (state == DeleteTableState.DELETE_TABLE_PRE_OPERATION) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> // nothing to rollback, pre-delete is just table-state checks.<a name="line.160"></a>
+<span class="sourceLineNo">161</span> // We can fail if the table does not exist or is not disabled.<a name="line.161"></a>
+<span class="sourceLineNo">162</span> // TODO: coprocessor rollback semantic is still undefined.<a name="line.162"></a>
+<span class="sourceLineNo">163</span> releaseSyncLatch();<a name="line.163"></a>
+<span class="sourceLineNo">164</span> return;<a name="line.164"></a>
+<span class="sourceLineNo">165</span> }<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span> // The delete doesn't have a rollback. The execution will succeed, at some point.<a name="line.167"></a>
+<span class="sourceLineNo">168</span> throw new UnsupportedOperationException("unhandled state=" + state);<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 boolean isRollbackSupported(final DeleteTableState state) {<a name="line.172"></a>
+<span class="sourceLineNo">173</span> switch (state) {<a name="line.173"></a>
+<span class="sourceLineNo">174</span> case DELETE_TABLE_PRE_OPERATION:<a name="line.174"></a>
+<span class="sourceLineNo">175</span> return true;<a name="line.175"></a>
+<span class="sourceLineNo">176</span> default:<a name="line.176"></a>
+<span class="sourceLineNo">177</span> return false;<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><a name="line.180"></a>
+<span class="sourceLineNo">181</span> @Override<a name="line.181"></a>
+<span class="sourceLineNo">182</span> protected DeleteTableState getState(final int stateId) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span> return DeleteTableState.valueOf(stateId);<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 int getStateId(final DeleteTableState state) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> return state.getNumber();<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 DeleteTableState getInitialState() {<a name="line.192"></a>
+<span class="sourceLineNo">193</span> return DeleteTableState.DELETE_TABLE_PRE_OPERATION;<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 TableName getTableName() {<a name="line.197"></a>
+<span class="sourceLineNo">198</span> return tableName;<a name="line.198"></a>
+<span class="sourceLineNo">199</span> }<a name="line.199"></a>
<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span> MasterProcedureProtos.DeleteTableStateData.Builder state =<a name="line.201"></a>
-<span class="sourceLineNo">202</span> MasterProcedureProtos.DeleteTableStateData.newBuilder()<a name="line.202"></a>
-<span class="sourceLineNo">203</span> .setUserInfo(MasterProcedureUtil.toProtoUserInfo(getUser()))<a name="line.203"></a>
-<span class="sourceLineNo">204</span> .setTableName(ProtobufUtil.toProtoTableName(tableName));<a name="line.204"></a>
-<span class="sourceLineNo">205</span> if (regions != null) {<a name="line.205"></a>
-<span class="sourceLineNo">206</span> for (HRegionInfo hri: regions) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span> state.addRegionInfo(HRegionInfo.convert(hri));<a name="line.207"></a>
-<span class="sourceLineNo">208</span> }<a name="line.208"></a>
-<span class="sourceLineNo">209</span> }<a name="line.209"></a>
-<span class="sourceLineNo">210</span> state.build().writeDelimitedTo(stream);<a name="line.210"></a>
-<span class="sourceLineNo">211</span> }<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span> @Override<a name="line.213"></a>
-<span class="sourceLineNo">214</span> public void deserializeStateData(final InputStream stream) throws IOException {<a name="line.214"></a>
-<span class="sourceLineNo">215</span> super.deserializeStateData(stream);<a name="line.215"></a>
-<span class="sourceLineNo">216</span><a name="line.216"></a>
-<span class="sourceLineNo">217</span> MasterProcedureProtos.DeleteTableStateData state =<a name="line.217"></a>
-<span class="sourceLineNo">218</span> MasterProcedureProtos.DeleteTableStateData.parseDelimitedFrom(stream);<a name="line.218"></a>
-<span class="sourceLineNo">219</span> setUser(MasterProcedureUtil.toUserInfo(state.getUserInfo()));<a name="line.219"></a>
-<span class="sourceLineNo">220</span> tableName = ProtobufUtil.toTableName(state.getTableName());<a name="line.220"></a>
-<span class="sourceLineNo">221</span> if (state.getRegionInfoCount() == 0) {<a name="line.221"></a>
-<span class="sourceLineNo">222</span> regions = null;<a name="line.222"></a>
-<span class="sourceLineNo">223</span> } else {<a name="line.223"></a>
-<span class="sourceLineNo">224</span> regions = new ArrayList<>(state.getRegionInfoCount());<a name="line.224"></a>
-<span class="sourceLineNo">225</span> for (HBaseProtos.RegionInfo hri: state.getRegionInfoList()) {<a name="line.225"></a>
-<span class="sourceLineNo">226</span> regions.add(HRegionInfo.convert(hri));<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> }<a name="line.229"></a>
-<span class="sourceLineNo">230</span><a name="line.230"></a>
-<span class="sourceLineNo">231</span> private boolean prepareDelete(final MasterProcedureEnv env) throws IOException {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> try {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> env.getMasterServices().checkTableModifiable(tableName);<a name="line.233"></a>
-<span class="sourceLineNo">234</span> } catch (TableNotFoundException|TableNotDisabledException e) {<a name="line.234"></a>
-<span class="sourceLineNo">235</span> setFailure("master-delete-table", e);<a name="line.235"></a>
-<span class="sourceLineNo">236</span> return false;<a name="line.236"></a>
+<span class="sourceLineNo">201</span> @Override<a name="line.201"></a>
+<span class="sourceLineNo">202</span> public TableOperationType getTableOperationType() {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> return TableOperationType.DELETE;<a name="line.203"></a>
+<span class="sourceLineNo">204</span> }<a name="line.204"></a>
+<span class="sourceLineNo">205</span><a name="line.205"></a>
+<span class="sourceLineNo">206</span> @Override<a name="line.206"></a>
+<span class="sourceLineNo">207</span> public void serializeStateData(final OutputStream stream) throws IOException {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> super.serializeStateData(stream);<a name="line.208"></a>
+<span class="sourceLineNo">209</span><a name="line.209"></a>
+<span class="sourceLineNo">210</span> MasterProcedureProtos.DeleteTableStateData.Builder state =<a name="line.210"></a>
+<span class="sourceLineNo">211</span> MasterProcedureProtos.DeleteTableStateData.newBuilder()<a name="line.211"></a>
+<span class="sourceLineNo">212</span> .setUserInfo(MasterProcedureUtil.toProtoUserInfo(getUser()))<a name="line.212"></a>
+<span class="sourceLineNo">213</span> .setTableName(ProtobufUtil.toProtoTableName(tableName));<a name="line.213"></a>
+<span class="sourceLineNo">214</span> if (regions != null) {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> for (HRegionInfo hri: regions) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span> state.addRegionInfo(HRegionInfo.convert(hri));<a name="line.216"></a>
+<span class="sourceLineNo">217</span> }<a name="line.217"></a>
+<span class="sourceLineNo">218</span> }<a name="line.218"></a>
+<span class="sourceLineNo">219</span> state.build().writeDelimitedTo(stream);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span> @Override<a name="line.222"></a>
+<span class="sourceLineNo">223</span> public void deserializeStateData(final InputStream stream) throws IOException {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> super.deserializeStateData(stream);<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> MasterProcedureProtos.DeleteTableStateData state =<a name="line.226"></a>
+<span class="sourceLineNo">227</span> MasterProcedureProtos.DeleteTableStateData.parseDelimitedFrom(stream);<a name="line.227"></a>
+<span class="sourceLineNo">228</span> setUser(MasterProcedureUtil.toUserInfo(state.getUserInfo()));<a name="line.228"></a>
+<span class="sourceLineNo">229</span> tableName = ProtobufUtil.toTableName(state.getTableName());<a name="line.229"></a>
+<span class="sourceLineNo">230</span> if (state.getRegionInfoCount() == 0) {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> regions = null;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> } else {<a name="line.232"></a>
+<span class="sourceLineNo">233</span> regions = new ArrayList<>(state.getRegionInfoCount());<a name="line.233"></a>
+<span class="sourceLineNo">234</span> for (HBaseProtos.RegionInfo hri: state.getRegionInfoList()) {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> regions.add(HRegionInfo.convert(hri));<a name="line.235"></a>
+<span class="sourceLineNo">236</span> }<a name="line.236"></a>
<span class="sourceLineNo">237</span> }<a name="line.237"></a>
-<span class="sourceLineNo">238</span> return true;<a name="line.238"></a>
-<span class="sourceLineNo">239</span> }<a name="line.239"></a>
-<span class="sourceLineNo">240</span><a name="line.240"></a>
-<span class="sourceLineNo">241</span> private boolean preDelete(final MasterProcedureEnv env)<a name="line.241"></a>
-<span class="sourceLineNo">242</span> throws IOException, InterruptedException {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> final MasterCoprocessorHost cpHost = env.getMasterCoprocessorHost();<a name="line.243"></a>
-<span class="sourceLineNo">244</span> if (cpHost != null) {<a name="line.244"></a>
-<span class="sourceLineNo">245</span> final TableName tableName = this.tableName;<a name="line.245"></a>
-<span class="sourceLineNo">246</span> cpHost.preDeleteTableAction(tableName, getUser());<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span> return true;<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> private void postDelete(final MasterProcedureEnv env)<a name="line.251"></a>
-<span class="sourceLineNo">252</span> throws IOException, InterruptedException {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> deleteTableStates(env, tableName);<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span> final MasterCoprocessorHost cpHost = env.getMasterCoprocessorHost();<a name="line.255"></a>
-<span class="sourceLineNo">256</span> if (cpHost != null) {<a name="line.256"></a>
-<span class="sourceLineNo">257</span> final TableName tableName = this.tableName;<a name="line.257"></a>
-<span class="sourceLineNo">258</span> cpHost.postCompletedDeleteTableAction(tableName, getUser());<a name="line.258"></a>
-<span class="sourceLineNo">259</span> }<a name="line.259"></a>
-<span class="sourceLineNo">260</span> }<a name="line.260"></a>
-<span class="sourceLineNo">261</span><a name="line.261"></a>
-<span class="sourceLineNo">262</span> protected static void deleteFromFs(final MasterProcedureEnv env,<a name="line.262"></a>
-<span class="sourceLineNo">263</span> final TableName tableName, final List<HRegionInfo> regions,<a name="line.263"></a>
-<span class="sourceLineNo">264</span> final boolean archive) throws IOException {<a name="line.264"></a>
-<span class="sourceLineNo">265</span> final MasterFileSystem mfs = env.getMasterServices().getMasterFileSystem();<a name="line.265"></a>
-<span class="sourceLineNo">266</span> final FileSystem fs = mfs.getFileSystem();<a name="line.266"></a>
-<span class="sourceLineNo">267</span> final Path tempdir = mfs.getTempDir();<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span> final Path tableDir = FSUtils.getTableDir(mfs.getRootDir(), tableName);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> final Path tempTableDir = FSUtils.getTableDir(tempdir, tableName);<a name="line.270"></a>
-<span class="sourceLineNo">271</span><a name="line.271"></a>
-<span class="sourceLineNo">272</span> if (fs.exists(tableDir)) {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> // Ensure temp exists<a name="line.273"></a>
-<span class="sourceLineNo">274</span> if (!fs.exists(tempdir) && !fs.mkdirs(tempdir)) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> throw new IOException("HBase temp directory '" + tempdir + "' creation failure.");<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></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> private boolean prepareDelete(final MasterProcedureEnv env) throws IOException {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> try {<a name="line.241"></a>
+<span class="sourceLineNo">242</span> env.getMasterServices().checkTableModifiable(tableName);<a name="line.242"></a>
+<span class="sourceLineNo">243</span> } catch (TableNotFoundException|TableNotDisabledException e) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span> setFailure("master-delete-table", e);<a name="line.244"></a>
+<span class="sourceLineNo">245</span> return false;<a name="line.245"></a>
+<span class="sourceLineNo">246</span> }<a name="line.246"></a>
+<span class="sourceLineNo">247</span> return true;<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> private boolean preDelete(final MasterProcedureEnv env)<a name="line.250"></a>
+<span class="sourceLineNo">251</span> throws IOException, InterruptedException {<a name="line.251"></a>
+<span class="sourceLineNo">252</span> final MasterCoprocessorHost cpHost = env.getMasterCoprocessorHost();<a name="line.252"></a>
+<span class="sourceLineNo">253</span> if (cpHost != null) {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> final TableName tableName = this.tableName;<a name="line.254"></a>
+<span class="sourceLineNo">255</span> cpHost.preDeleteTableAction(tableName, getUser());<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span> return true;<a name="line.257"></a>
+<span class="sourceLineNo">258</span> }<a name="line.258"></a>
+<span class="sourceLineNo">259</span><a name="line.259"></a>
+<span class="sourceLineNo">260</span> private void postDelete(final MasterProcedureEnv env)<a name="line.260"></a>
+<span class="sourceLineNo">261</span> throws IOException, InterruptedException {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> deleteTableStates(env, tableName);<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span> final MasterCoprocessorHost cpHost = env.getMasterCoprocessorHost();<a name="line.264"></a>
+<span class="sourceLineNo">265</span> if (cpHost != null) {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> final TableName tableName = this.tableName;<a name="line.266"></a>
+<span class="sourceLineNo">267</span> cpHost.postCompletedDeleteTableAction(tableName, getUser());<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> protected static void deleteFromFs(final MasterProcedureEnv env,<a name="line.271"></a>
+<span class="sourceLineNo">272</span> final TableName tableName, final List<HRegionInfo> regions,<a name="line.272"></a>
+<span class="sourceLineNo">273</span> final boolean archive) throws IOException {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> final MasterFileSystem mfs = env.getMasterServices().getMasterFileSystem();<a name="line.274"></a>
+<span class="sourceLineNo">275</span> final FileSystem fs = mfs.getFileSystem();<a name="line.275"></a>
+<span class="sourceLineNo">276</span> final Path tempdir = mfs.getTempDir();<a name="line.276"></a>
<span class="sourceLineNo">277</span><a name="line.277"></a>
-<span class="sourceLineNo">278</span> // Ensure parent exists<a name="line.278"></a>
-<span class="sourceLineNo">279</span> if (!fs.exists(tempTableDir.getParent()) && !fs.mkdirs(tempTableDir.getParent())) {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> throw new IOException("HBase temp directory '" + tempdir + "' creation failure.");<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> // Move the table in /hbase/.tmp<a name="line.283"></a>
-<span class="sourceLineNo">284</span> if (!fs.rename(tableDir, tempTableDir)) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span> if (fs.exists(tempTableDir)) {<a name="line.285"></a>
-<span class="sourceLineNo">286</span> // TODO<a name="line.286"></a>
-<span class="sourceLineNo">287</span> // what's in this dir? something old? probably something manual from the user...<a name="line.287"></a>
-<span class="sourceLineNo">288</span> // let's get rid of this stuff...<a name="line.288"></a>
-<span class="sourceLineNo">289</span> FileStatus[] files = fs.listStatus(tempdir);<a name="line.289"></a>
-<span class="sourceLineNo">290</span> if (files != null && files.length > 0) {<a name="line.290"></a>
-<span class="sourceLineNo">291</span> for (int i = 0; i < files.length; ++i) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> if (!files[i].isDir()) continue;<a name="line.292"></a>
-<span class="sourceLineNo">293</span> HFileArchiver.archiveRegion(fs, mfs.getRootDir(), tempTableDir, files[i].getPath());<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span> }<a name="line.295"></a>
-<span class="sourceLineNo">296</span> fs.delete(tempdir, true);<a name="line.296"></a>
-<span class="sourceLineNo">297</span> }<a name="line.297"></a>
-<span class="sourceLineNo">298</span> throw new IOException("Unable to move '" + tableDir + "' to temp '" + tempTableDir + "'");<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><a name="line.301"></a>
-<span class="sourceLineNo">302</span> // Archive regions from FS (temp directory)<a name="line.302"></a>
-<span class="sourceLineNo">303</span> if (archive) {<a name="line.303"></a>
-<span class="sourceLineNo">304</span> for (HRegionInfo hri : regions) {<a name="line.304"></a>
-<span class="sourceLineNo">305</span> LOG.debug("Archiving region " + hri.getRegionNameAsString() + " from FS");<a name="line.305"></a>
-<span class="sourceLineNo">306</span> HFileArchiver.archiveRegion(fs, mfs.getRootDir(),<a name="line.306"></a>
-<span class="sourceLineNo">307</span> tempTableDir, HRegion.getRegionDir(tempTableDir, hri.getEncodedName()));<a name="line.307"></a>
+<span class="sourceLineNo">278</span> final Path tableDir = FSUtils.getTableDir(mfs.getRootDir(), tableName);<a name="line.278"></a>
+<span class="sourceLineNo">279</span> final Path tempTableDir = FSUtils.getTableDir(tempdir, tableName);<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span> if (fs.exists(tableDir)) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> // Ensure temp exists<a name="line.282"></a>
+<span class="sourceLineNo">283</span> if (!fs.exists(tempdir) && !fs.mkdirs(tempdir)) {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> throw new IOException("HBase temp directory '" + tempdir + "' creation failure.");<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span> // Ensure parent exists<a name="line.287"></a>
+<span class="sourceLineNo">288</span> if (!fs.exists(tempTableDir.getParent()) && !fs.mkdirs(tempTableDir.getParent())) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> throw new IOException("HBase temp directory '" + tempdir + "' creation failure.");<a name="line.289"></a>
+<span class="sourceLineNo">290</span> }<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span> // Move the table in /hbase/.tmp<a name="line.292"></a>
+<span class="sourceLineNo">293</span> if (!fs.rename(tableDir, tempTableDir)) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> if (fs.exists(tempTableDir)) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span> // TODO<a name="line.295"></a>
+<span class="sourceLineNo">296</span> // what's in this dir? something old? probably something manual from the user...<a name="line.296"></a>
+<span class="sourceLineNo">297</span> // let's get rid of this stuff...<a name="line.297"></a>
+<span class="sourceLineNo">298</span> FileStatus[] files = fs.listStatus(tempdir);<a name="line.298"></a>
+<span class="sourceLineNo">299</span> if (files != null && files.length > 0) {<a name="line.299"></a>
+<span class="sourceLineNo">300</span> for (int i = 0; i < files.length; ++i) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span> if (!files[i].isDir()) continue;<a name="line.301"></a>
+<span class="sourceLineNo">302</span> HFileArchiver.archiveRegion(fs, mfs.getRootDir(), tempTableDir, files[i].getPath());<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> fs.delete(tempdir, true);<a name="line.305"></a>
+<span class="sourceLineNo">306</span> }<a name="line.306"></a>
+<span class="sourceLineNo">307</span> throw new IOException("Unable to move '" + tableDir + "' to temp '" + tempTableDir + "'");<a name="line.307"></a>
<span class="sourceLineNo">308</span> }<a name="line.308"></a>
-<span class="sourceLineNo">309</span> LOG.debug("Table '" + tableName + "' archived!");<a name="line.309"></a>
-<span class="sourceLineNo">310</span> }<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span> // Archive mob data<a name="line.312"></a>
-<span class="sourceLineNo">313</span> Path mobTableDir = FSUtils.getTableDir(new Path(mfs.getRootDir(), MobConstants.MOB_DIR_NAME),<a name="line.313"></a>
-<span class="sourceLineNo">314</span> tableName);<a name="line.314"></a>
-<span class="sourceLineNo">315</span> Path regionDir =<a name="line.315"></a>
-<span class="sourceLineNo">316</span> new Path(mobTableDir, MobUtils.getMobRegionInfo(tableName).getEncodedName());<a name="line.316"></a>
-<span class="sourceLineNo">317</span> if (fs.exists(regionDir)) {<a name="line.317"></a>
-<span class="sourceLineNo">318</span> HFileArchiver.archiveRegion(fs, mfs.getRootDir(), mobTableDir, regionDir);<a name="line.318"></a>
+<span class="sourceLineNo">309</span> }<a name="line.309"></a>
+<span class="sourceLineNo">310</span><a name="line.310"></a>
+<span class="sourceLineNo">311</span> // Archive regions from FS (temp directory)<a name="line.311"></a>
+<span class="sourceLineNo">312</span> if (archive) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span> for (HRegionInfo hri : regions) {<a name="line.313"></a>
+<span class="sourceLineNo">314</span> LOG.debug("Archiving region " + hri.getRegionNameAsString() + " from FS");<a name="line.314"></a>
+<span class="sourceLineNo">315</span> HFileArchiver.archiveRegion(fs, mfs.getRootDir(),<a name="line.315"></a>
+<span class="sourceLineNo">316</span> tempTableDir, HRegion.getRegionDir(tempTableDir, hri.getEncodedName()));<a name="line.316"></a>
+<span class="sourceLineNo">317</span> }<a name="line.317"></a>
+<span class="sourceLineNo">318</span> LOG.debug("Table '" + tableName + "' archived!");<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> // Delete table directory from FS (temp directory)<a name="line.321"></a>
-<span class="sourceLineNo">322</span> if (!fs.delete(tempTableDir, true) && fs.exists(tempTableDir)) {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> throw new IOException("Couldn't delete " + tempTableDir);<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> // Delete the table directory where the mob files are saved<a name="line.326"></a>
-<span class="sourceLineNo">327</span> if (mobTableDir != null && fs.exists(mobTableDir)) {<a name="line.327"></a>
-<span class="sourceLineNo">328</span> if (!fs.delete(mobTableDir, true)) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> throw new IOException("Couldn't delete mob dir " + mobTableDir);<a name="line.329"></a>
-<span class="sourceLineNo">330</span> }<a name="line.330"></a>
-<span class="sourceLineNo">331</span> }<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> * There may be items for this table still up in hbase:meta in the case where the<a name="line.335"></a>
-<span class="sourceLineNo">336</span> * info:regioninfo column was empty because of some write error. Remove ALL rows from hbase:meta<a name="line.336"></a>
-<span class="sourceLineNo">337</span> * that have to do with this table. See HBASE-12980.<a name="line.337"></a>
-<span class="sourceLineNo">338</span> * @throws IOException<a name="line.338"></a>
-<span class="sourceLineNo">339</span> */<a name="line.339"></a>
-<span class="sourceLineNo">340</span> private static void cleanAnyRemainingRows(final MasterProcedureEnv env,<a name="line.340"></a>
-<span class="sourceLineNo">341</span> final TableName tableName) throws IOException {<a name="line.341"></a>
-<span class="sourceLineNo">342</span> Connection connection = env.getMasterServices().getConnection();<a name="line.342"></a>
-<span class="sourceLineNo">343</span> Scan tableScan = MetaTableAccessor.getScanForTableName(connection, tableName);<a name="line.343"></a>
-<span class="sourceLineNo">344</span> try (Table metaTable =<a name="line.344"></a>
-<span class="sourceLineNo">345</span> connection.getTable(TableName.META_TABLE_NAME)) {<a name="line.345"></a>
-<span class="sourceLineNo">346</span> List<Delete> deletes = new ArrayList<>();<a name="line.346"></a>
-<span class="sourceLineNo">347</span> try (ResultScanner resScanner = metaTable.getScanner(tableScan)) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> for (Result result : resScanner) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span> deletes.add(new Delete(result.getRow()));<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> if (!deletes.isEmpty()) {<a name="line.352"></a>
-<span class="sourceLineNo">353</span> LOG.warn("Deleting some vestigial " + deletes.size() + " rows of " + tableName +<a name="line.353"></a>
-<span class="sourceLineNo">354</span> " from " + TableName.META_TABLE_NAME);<a name="line.354"></a>
-<span class="sourceLineNo">355</span> metaTable.delete(deletes);<a name="line.355"></a>
-<span class="sourceLineNo">356</span> }<a name="line.356"></a>
-<span class="sourceLineNo">357</span> }<a name="line.357"></a>
-<span class="sourceLineNo">358</span> }<a name="line.358"></a>
-<span class="sourceLineNo">359</span><a name="line.359"></a>
-<span class="sourceLineNo">360</span> protected static void deleteFromMeta(final MasterProcedureEnv env,<a name="line.360"></a>
-<span class="sourceLineNo">361</span> final TableName tableName, List<HRegionInfo> regions) throws IOException {<a name="line.361"></a>
-<span class="sourceLineNo">362</span> MetaTableAccessor.deleteRegions(env.getMasterServices().getConnection(), regions);<a name="line.362"></a>
-<span class="sourceLineNo">363</span><a name="line.363"></a>
-<span class="sourceLineNo">364</span> // Clean any remaining rows for this table.<a name="line.364"></a>
-<span class="sourceLineNo">365</span> cleanAnyRemainingRows(env, tableName);<a name="line.365"></a>
-<span class="sourceLineNo">366</span><a name="line.366"></a>
-<span class="sourceLineNo">367</span> // clean region references from the server manager<a name="line.367"></a>
-<span class="sourceLineNo">368</span> env.getMasterServices().getServerManager().removeRegions(regions);<a name="line.368"></a>
-<span class="sourceLineNo">369</span><a name="line.369"></a>
-<span class="sourceLineNo">370</span> // Clear Favored Nodes for this table<a name="line.370"></a>
-<span class="sourceLineNo">371</span> FavoredNodesManager fnm = env.getMasterServices().getFavoredNodesManager();<a name="line.371"></a>
-<span class="sourceLineNo">372</span> if (fnm != null) {<a name="line.372"></a>
-<span class="sourceLineNo">373</span> fnm.deleteFavoredNodesForRegions(regions);<a name="line.373"></a>
-<span class="sourceLineNo">374</span> }<a name="line.374"></a>
-<span class="sourceLineNo">375</span> }<a name="line.375"></a>
-<span class="sourceLineNo">376</span><a name="line.376"></a>
-<span class="sourceLineNo">377</span> protected static void deleteAssignmentState(final MasterProcedureEnv env,<a name="line.377"></a>
-<span class="sourceLineNo">378</span> final TableName tableName) throws IOException {<a name="line.378"></a>
-<span class="sourceLineNo">379</span> final AssignmentManager am = env.getMasterServices().getAssignmentManager();<a name="line.379"></a>
-<span class="sourceLineNo">380</span><a name="line.380"></a>
-<span class="sourceLineNo">381</span> // Clean up regions of the table in RegionStates.<a name="line.381"></a>
-<span class="sourceLineNo">382</span> LOG.debug("Removing '" + tableName + "' from region states.");<a name="line.382"></a>
-<span class="sourceLineNo">383</span> am.getRegionStates().tableDeleted(tableName);<a name="line.383"></a>
-<span class="sourceLineNo">384</span><a name="line.384"></a>
-<span class="sourceLineNo">385</span> // If entry for this table states, remove it.<a name="line.385"></a>
-<span class="sourceLineNo">386</span> LOG.debug("Marking '" + tableName + "' as deleted.");<a name="line.386"></a>
-<span class="sourceLineNo">387</span> env.getMasterServices().getTableStateManager().setDeletedTable(tableName);<a name="line.387"></a>
-<span class="sourceLineNo">388</span> }<a name="line.388"></a>
+<span class="sourceLineNo">321</span> // Archive mob data<a name="line.321"></a>
+<span class="sourceLineNo">322</span> Path mobTableDir = FSUtils.getTableDir(new Path(mfs.getRootDir(), MobConstants.MOB_DIR_NAME),<a name="line.322"></a>
+<span class="sourceLineNo">323</span> tableName);<a name="line.323"></a>
+<span class="sourceLineNo">324</span> Path regionDir =<a name="line.324"></a>
+<span class="sourceLineNo">325</span> new Path(mobTableDir, MobUtils.getMobRegionInfo(tableName).getEncodedName());<a name="line.325"></a>
+<span class="sourceLineNo">326</span> if (fs.exists(regionDir)) {<a name="line.326"></a>
+<span class="sourceLineNo">327</span> HFileArchiver.archiveRegion(fs, mfs.getRootDir(), mobTableDir, regionDir);<a name="line.327"></a>
+<span class="sourceLineNo">328</span> }<a name="line.328"></a>
+<span class="sourceLineNo">329</span><a name="line.329"></a>
+<span class="sourceLineNo">330</span> // Delete table directory from FS (temp directory)<a name="line.330"></a>
+<span class="sourceLineNo">331</span> if (!fs.delete(tempTableDir, true) && fs.exists(tempTableDir)) {<a name="line.331"></a>
+<span class="sourceLineNo">332</span> throw new IOException("Couldn't delete " + tempTableDir);<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> // Delete the table directory where the mob files are saved<a name="line.335"></a>
+<span class="sourceLineNo">336</span> if (mobTableDir != null && fs.exists(mobTableDir)) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span> if (!fs.delete(mobTableDir, true)) {<a name="line.337"></a>
+<span class="sourceLineNo">338</span> throw new IOException("Couldn't delete mob dir " + mobTableDir);<a name="line.338"></a>
+<span class="sourceLineNo">339</span> }<a name="line.339"></a>
+<span class="sourceLineNo">340</span> }<a name="line.340"></a>
+<span class="sourceLineNo">341</span> }<a name="line.341"></a>
+<span class="sourceLineNo">342</span><a name="line.342"></a>
+<span class="sourceLineNo">343</span> /**<a name="line.343"></a>
+<span class="sourceLineNo">344</span> * There may be items for this table still up in hbase:meta in the case where the<a name="line.344"></a>
+<span class="sourceLineNo">345</span> * info:regioninfo column was empty because of some write error. Remove ALL rows from hbase:meta<a name="line.345"></a>
+<span class="sourceLineNo">346</span> * that have to do with this table. See HBASE-12980.<a name="line.346"></a>
+<span class="sourceLineNo">347</span> * @throws IOException<a name="line.347"></a>
+<span class="sourceLineNo">348</span> */<a name="line.348"></a>
+<span class="sourceLineNo">349</span> private static void cleanAnyRemainingRows(final MasterProcedureEnv env,<a name="line.349"></a>
+<span class="sourceLineNo">350</span> final TableName tableName) throws IOException {<a name="line.350"></a>
+<span class="sourceLineNo">351</span> Connection connection = env.getMasterServices().getConnection();<a name="line.351"></a>
+<span class="sourceLineNo">352</span> Scan tableScan = MetaTableAccessor.getScanForTableName(connection, tableName);<a name="line.352"></a>
+<span class="sourceLineNo">353</span> try (Table metaTable =<a name="line.353"></a>
+<span class="sourceLineNo">354</span> connection.getTable(TableName.META_TABLE_NAME)) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span> List<Delete> deletes = new ArrayList<>();<a name="line.355"></a>
+<span class="sourceLineNo">356</span> try (ResultScanner resScanner = metaTable.getScanner(tableScan)) {<a name="line.356"></a>
+<span class="sourceLineNo">357</span> for (Result result : resScanner) {<a name="line.357"></a>
+<span class="sourceLineNo">358</span> deletes.add(new Delete(result.getRow()));<a name="line.358"></a>
+<span class="sourceLineNo">359</span> }<a name="line.359"></a>
+<span class="sourceLineNo">360</span> }<a name="line.360"></a>
+<span class="sourceLineNo">361</span> if (!deletes.isEmpty()) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span> LOG.warn("Deleting some vestigial " + deletes.size() + " rows of " + tableName +<a name="line.362"></a>
+<span class="sourceLineNo">363</span> " from " + TableName.META_TABLE_NAME);<a name="line.363"></a>
+<span class="sourceLineNo">364</span> metaTable.delete(deletes);<a name="line.364"></a>
+<span class="sourceLineNo">365</span> }<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><a name="line.368"></a>
+<span class="sourceLineNo">369</span> protected static void deleteFromMeta(final MasterProcedureEnv env,<a name="line.369"></a>
+<span class="sourceLineNo">370</span> final TableName tableName, List<HRegionInfo> regions) throws IOException {<a name="line.370"></a>
+<span class="sourceLineNo">371</span> MetaTableAccessor.deleteRegions(env.getMasterServices().getConnection(), regions);<a name="line.371"></a>
+<span class="sourceLineNo">372</span><a name="line.372"></a>
+<span class="sourceLineNo">373</span> // Clean any remaining rows for this table.<a name="line.373"></a>
+<span class="sourceLineNo">374</span> cleanAnyRemainingRows(env, tableName);<a name="line.374"></a>
+<span class="sourceLineNo">375</span><a name="line.375"></a>
+<span class="sourceLineNo">376</span> // clean region references from the server manager<a name="line.376"></a>
+<span class="sourceLineNo">377</span> env.getMasterServices().getServerManager().removeRegions(regions);<a name="line.377"></a>
+<span class="sourceLineNo">378</span><a name="line.378"></a>
+<span class="sourceLineNo">379</span> // Clear Favored Nodes for this table<a name="line.379"></a>
+<span class="sourceLineNo">380</span> FavoredNodesManager fnm = env.getMasterServices().getFavoredNodesManager();<a name="line.380"></a>
+<span class="sourceLineNo">381</span> if (fnm != null) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span> fnm.deleteFavoredNodesForRegions(regions);<a name="line.382"></a>
+<span class="sourceLineNo">383</span> }<a name="line.383"></a>
+<span class="sourceLineNo">384</span> }<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span> protected static void deleteAssignmentState(final MasterProcedureEnv env,<a name="line.386"></a>
+<span class="sourceLineNo">387</span> final TableName tableName) throws IOException {<a name="line.387"></a>
+<span class="sourceLineNo">388</span> final AssignmentManager am = env.getMasterServices().getAssignmentManager();<a name="line.388"></a>
<span class="sourceLineNo">389</span><a name="line.389"></a>
-<span class="sourceLineNo">390</span> protected static void deleteTableDescriptorCache(final MasterProcedureEnv env,<a name="line.390"></a>
-<span class="sourceLineNo">391</span> final TableName tableName) throws IOException {<a name="line.391"></a>
-<span class="sourceLineNo">392</span> LOG.debug("Removing '" + tableName + "' descriptor.");<a name="line.392"></a>
-<span class="sourceLineNo">393</span> env.getMasterServices().getTableDescriptors().remove(tableName);<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> protected static void deleteTableStates(final MasterProcedureEnv env, final TableName tableName)<a name="line.396"></a>
-<span class="sourceLineNo">397</span> throws IOException {<a name="line.397"></a>
-<span class="sourceLineNo">398</span> if (!tableName.isSystemTable()) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span> ProcedureSyncWait.getMasterQuotaManager(env).removeTableFromNamespaceQuota(tableName);<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>}<a name="line.402"></a>
+<span class="sourceLineNo">390</span> // Clean up regions of the table in RegionStates.<a name="line.390"></a>
+<span class="sourceLineNo">391</span> LOG.debug("Removing '" + tableName + "' from region states.");<a name="line.391"></a>
+<span class="sourceLineNo">392</span> am.getRegionStates().tableDeleted(tableName);<a name="line.392"></a>
+<span class="sourceLineNo">393</span><a name="line.393"></a>
+<span class="sourceLineNo">394</span> // If entry for this table states, remove it.<a name="line.394"></a>
+<span class="sourceLineNo">395</span> LOG.debug("Marking '" + tableName + "' as deleted.");<a name="line.395"></a>
+<span class="sourceLineNo">396</span> env.getMasterServices().getTableStateManager().setDeletedTable(tableName);<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> protected static void deleteTableDescriptorCache(final MasterProcedureEnv env,<a name="line.399"></a>
+<span class="sourceLineNo">400</span> final TableName tableName) throws IOException {<a name="line.400"></a>
+<span class="sourceLineNo">401</span> LOG.debug("Removing '" + tableName + "' descriptor.");<a name="line.401"></a>
+<span class="sourceLineNo">402</span> env.getMasterServices().getTableDescriptors().remove(tableName);<a name="line.402"></a>
+<span class="sourceLineNo">403</span> }<a name="line.403"></a>
+<span class="sourceLineNo">404</span><a name="line.404"></a>
+<span class="sourceLineNo">405</span> protected static void deleteTableStates(final MasterProcedureEnv env, final TableName tableName)<a name="line.405"></a>
+<span class="sourceLineNo">406</span> throws IOException {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> if (!tableName.isSystemTable()) {<a name="line.407"></a>
+<span class="sourceLineNo">408</span> ProcedureSyncWait.getMasterQuotaManager(env).removeTableFromNamespaceQuota(tableName);<a name="line.408"></a>
+<span class="sourceLineNo">409</span> }<a name="line.409"></a>
+<span class="sourceLineNo">410</span> }<a name="line.410"></a>
+<span class="sourceLineNo">411</span>}<a name="line.411"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/986c93ca/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TruncateTableProcedure.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TruncateTableProcedure.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TruncateTableProcedure.html
index bbb39c0..33335c0 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TruncateTableProcedure.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TruncateTableProcedure.html
@@ -205,103 +205,97 @@
<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 boolean abort(final MasterProcedureEnv env) {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> // TODO: We may be able to abort if the procedure is not started yet.<a name="line.201"></a>
-<span class="sourceLineNo">202</span> return false;<a name="line.202"></a>
-<span class="sourceLineNo">203</span> }<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span> @Override<a name="line.205"></a>
-<span class="sourceLineNo">206</span> public void toStringClassDetails(StringBuilder sb) {<a name="line.206"></a>
-<span class="sourceLineNo">207</span> sb.append(getClass().getSimpleName());<a name="line.207"></a>
-<span class="sourceLineNo">208</span> sb.append(" (table=");<a name="line.208"></a>
-<span class="sourceLineNo">209</span> sb.append(getTableName());<a name="line.209"></a>
-<span class="sourceLineNo">210</span> sb.append(" preserveSplits=");<a name="line.210"></a>
-<span class="sourceLineNo">211</span> sb.append(preserveSplits);<a name="line.211"></a>
-<span class="sourceLineNo">212</span> sb.append(")");<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 serializeStateData(final OutputStream stream) throws IOException {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> super.serializeStateData(stream);<a name="line.217"></a>
-<span class="sourceLineNo">218</span><a name="line.218"></a>
-<span class="sourceLineNo">219</span> MasterProcedureProtos.TruncateTableStateData.Builder state =<a name="line.219"></a>
-<span class="sourceLineNo">220</span> MasterProcedureProtos.TruncateTableStateData.newBuilder()<a name="line.220"></a>
-<span class="sourceLineNo">221</span> .setUserInfo(MasterProcedureUtil.toProtoUserInfo(getUser()))<a name="line.221"></a>
-<span class="sourceLineNo">222</span> .setPreserveSplits(preserveSplits);<a name="line.222"></a>
-<span class="sourceLineNo">223</span> if (hTableDescriptor != null) {<a name="line.223"></a>
-<span class="sourceLineNo">224</span> state.setTableSchema(ProtobufUtil.convertToTableSchema(hTableDescriptor));<a name="line.224"></a>
-<span class="sourceLineNo">225</span> } else {<a name="line.225"></a>
-<span class="sourceLineNo">226</span> state.setTableName(ProtobufUtil.toProtoTableName(tableName));<a name="line.226"></a>
-<span class="sourceLineNo">227</span> }<a name="line.227"></a>
-<span class="sourceLineNo">228</span> if (regions != null) {<a name="line.228"></a>
-<span class="sourceLineNo">229</span> for (HRegionInfo hri: regions) {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> state.addRegionInfo(HRegionInfo.convert(hri));<a name="line.230"></a>
-<span class="sourceLineNo">231</span> }<a name="line.231"></a>
-<span class="sourceLineNo">232</span> }<a name="line.232"></a>
-<span class="sourceLineNo">233</span> state.build().writeDelimitedTo(stream);<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span> @Override<a name="line.236"></a>
-<span class="sourceLineNo">237</span> public void deserializeStateData(final InputStream stream) throws IOException {<a name="line.237"></a>
-<span class="sourceLineNo">238</span> super.deserializeStateData(stream);<a name="line.238"></a>
-<span class="sourceLineNo">239</span><a name="line.239"></a>
-<span class="sourceLineNo">240</span> MasterProcedureProtos.TruncateTableStateData state =<a name="line.240"></a>
-<span class="sourceLineNo">241</span> MasterProcedureProtos.TruncateTableStateData.parseDelimitedFrom(stream);<a name="line.241"></a>
-<span class="sourceLineNo">242</span> setUser(MasterProcedureUtil.toUserInfo(state.getUserInfo()));<a name="line.242"></a>
-<span class="sourceLineNo">243</span> if (state.hasTableSchema()) {<a name="line.243"></a>
-<span class="sourceLineNo">244</span> hTableDescriptor = ProtobufUtil.convertToHTableDesc(state.getTableSchema());<a name="line.244"></a>
-<span class="sourceLineNo">245</span> tableName = hTableDescriptor.getTableName();<a name="line.245"></a>
+<span class="sourceLineNo">200</span> public void toStringClassDetails(StringBuilder sb) {<a name="line.200"></a>
+<span class="sourceLineNo">201</span> sb.append(getClass().getSimpleName());<a name="line.201"></a>
+<span class="sourceLineNo">202</span> sb.append(" (table=");<a name="line.202"></a>
+<span class="sourceLineNo">203</span> sb.append(getTableName());<a name="line.203"></a>
+<span class="sourceLineNo">204</span> sb.append(" preserveSplits=");<a name="line.204"></a>
+<span class="sourceLineNo">205</span> sb.append(preserveSplits);<a name="line.205"></a>
+<span class="sourceLineNo">206</span> sb.append(")");<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> @Override<a name="line.209"></a>
+<span class="sourceLineNo">210</span> public void serializeStateData(final OutputStream stream) throws IOException {<a name="line.210"></a>
+<span class="sourceLineNo">211</span> super.serializeStateData(stream);<a name="line.211"></a>
+<span class="sourceLineNo">212</span><a name="line.212"></a>
+<span class="sourceLineNo">213</span> MasterProcedureProtos.TruncateTableStateData.Builder state =<a name="line.213"></a>
+<span class="sourceLineNo">214</span> MasterProcedureProtos.TruncateTableStateData.newBuilder()<a name="line.214"></a>
+<span class="sourceLineNo">215</span> .setUserInfo(MasterProcedureUtil.toProtoUserInfo(getUser()))<a name="line.215"></a>
+<span class="sourceLineNo">216</span> .setPreserveSplits(preserveSplits);<a name="line.216"></a>
+<span class="sourceLineNo">217</span> if (hTableDescriptor != null) {<a name="line.217"></a>
+<span class="sourceLineNo">218</span> state.setTableSchema(ProtobufUtil.convertToTableSchema(hTableDescriptor));<a name="line.218"></a>
+<span class="sourceLineNo">219</span> } else {<a name="line.219"></a>
+<span class="sourceLineNo">220</span> state.setTableName(ProtobufUtil.toProtoTableName(tableName));<a name="line.220"></a>
+<span class="sourceLineNo">221</span> }<a name="line.221"></a>
+<span class="sourceLineNo">222</span> if (regions != null) {<a name="line.222"></a>
+<span class="sourceLineNo">223</span> for (HRegionInfo hri: regions) {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> state.addRegionInfo(HRegionInfo.convert(hri));<a name="line.224"></a>
+<span class="sourceLineNo">225</span> }<a name="line.225"></a>
+<span class="sourceLineNo">226</span> }<a name="line.226"></a>
+<span class="sourceLineNo">227</span> state.build().writeDelimitedTo(stream);<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span> @Override<a name="line.230"></a>
+<span class="sourceLineNo">231</span> public void deserializeStateData(final InputStream stream) throws IOException {<a name="line.231"></a>
+<span class="sourceLineNo">232</span> super.deserializeStateData(stream);<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span> MasterProcedureProtos.TruncateTableStateData state =<a name="line.234"></a>
+<span class="sourceLineNo">235</span> MasterProcedureProtos.TruncateTableStateData.parseDelimitedFrom(stream);<a name="line.235"></a>
+<span class="sourceLineNo">236</span> setUser(MasterProcedureUtil.toUserInfo(state.getUserInfo()));<a name="line.236"></a>
+<span class="sourceLineNo">237</span> if (state.hasTableSchema()) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> hTableDescriptor = ProtobufUtil.convertToHTableDesc(state.getTableSchema());<a name="line.238"></a>
+<span class="sourceLineNo">239</span> tableName = hTableDescriptor.getTableName();<a name="line.239"></a>
+<span class="sourceLineNo">240</span> } else {<a name="line.240"></a>
+<span class="sourceLineNo">241</span> tableName = ProtobufUtil.toTableName(state.getTableName());<a name="line.241"></a>
+<span class="sourceLineNo">242</span> }<a name="line.242"></a>
+<span class="sourceLineNo">243</span> preserveSplits = state.getPreserveSplits();<a name="line.243"></a>
+<span class="sourceLineNo">244</span> if (state.getRegionInfoCount() == 0) {<a name="line.244"></a>
+<span class="sourceLineNo">245</span> regions = null;<a name="line.245"></a>
<span class="sourceLineNo">246</span> } else {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> tableName = ProtobufUtil.toTableName(state.getTableName());<a name="line.247"></a>
-<span class="sourceLineNo">248</span> }<a name="line.248"></a>
-<span class="sourceLineNo">249</span> preserveSplits = state.getPreserveSplits();<a name="line.249"></a>
-<span class="sourceLineNo">250</span> if (state.getRegionInfoCount() == 0) {<a name="line.250"></a>
-<span class="sourceLineNo">251</span> regions = null;<a name="line.251"></a>
-<span class="sourceLineNo">252</span> } else {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> regions = new ArrayList<>(state.getRegionInfoCount());<a name="line.253"></a>
-<span class="sourceLineNo">254</span> for (HBaseProtos.RegionInfo hri: state.getRegionInfoList()) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span> regions.add(HRegionInfo.convert(hri));<a name="line.255"></a>
-<span class="sourceLineNo">256</span> }<a name="line.256"></a>
-<span class="sourceLineNo">257</span> }<a name="line.257"></a>
-<span class="sourceLineNo">258</span> }<a name="line.258"></a>
-<span class="sourceLineNo">259</span><a name="line.259"></a>
-<span class="sourceLineNo">260</span> private static List<HRegionInfo> recreateRegionInfo(final List<HRegionInfo> regions) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> ArrayList<HRegionInfo> newRegions = new ArrayList<>(regions.size());<a name="line.261"></a>
-<span class="sourceLineNo">262</span> for (HRegionInfo hri: regions) {<a name="line.262"></a>
-<span class="sourceLineNo">263</span> newRegions.add(new HRegionInfo(hri.getTable(), hri.getStartKey(), hri.getEndKey()));<a name="line.263"></a>
-<span class="sourceLineNo">264</span> }<a name="line.264"></a>
-<span class="sourceLineNo">265</span> return newRegions;<a name="line.265"></a>
-<span class="sourceLineNo">266</span> }<a name="line.266"></a>
-<span class="sourceLineNo">267</span><a name="line.267"></a>
-<span class="sourceLineNo">268</span> private boolean prepareTruncate(final MasterProcedureEnv env) throws IOException {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> try {<a name="line.269"></a>
-<span class="sourceLineNo">270</span> env.getMasterServices().checkTableModifiable(getTableName());<a name="line.270"></a>
-<span class="sourceLineNo">271</span> } catch (TableNotFoundException|TableNotDisabledException e) {<a name="line.271"></a>
-<span class="sourceLineNo">272</span> setFailure("master-truncate-table", e);<a name="line.272"></a>
-<span class="sourceLineNo">273</span> return false;<a name="line.273"></a>
-<span class="sourceLineNo">274</span> }<a name="line.274"></a>
-<span class="sourceLineNo">275</span> return true;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span><a name="line.277"></a>
-<span class="sourceLineNo">278</span> private boolean preTruncate(final MasterProcedureEnv env)<a name="line.278"></a>
-<span class="sourceLineNo">279</span> throws IOException, InterruptedException {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> final MasterCoprocessorHost cpHost = env.getMasterCoprocessorHost();<a name="line.280"></a>
-<span class="sourceLineNo">281</span> if (cpHost != null) {<a name="line.281"></a>
-<span class="sourceLineNo">282</span> final TableName tableName = getTableName();<a name="line.282"></a>
-<span class="sourceLineNo">283</span> cpHost.preTruncateTableAction(tableName, getUser());<a name="line.283"></a>
-<span class="sourceLineNo">284</span> }<a name="line.284"></a>
-<span class="sourceLineNo">285</span> return true;<a name="line.285"></a>
-<span class="sourceLineNo">286</span> }<a name="line.286"></a>
-<span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span> private void postTruncate(final MasterProcedureEnv env)<a name="line.288"></a>
-<span class="sourceLineNo">289</span> throws IOException, InterruptedException {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> final MasterCoprocessorHost cpHost = env.getMasterCoprocessorHost();<a name="line.290"></a>
-<span class="sourceLineNo">291</span> if (cpHost != null) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> final TableName tableName = getTableName();<a name="line.292"></a>
-<span class="sourceLineNo">293</span> cpHost.postCompletedTruncateTableAction(tableName, getUser());<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span> }<a name="line.295"></a>
-<span class="sourceLineNo">296</span>}<a name="line.296"></a>
+<span class="sourceLineNo">247</span> regions = new ArrayList<>(state.getRegionInfoCount());<a name="line.247"></a>
+<span class="sourceLineNo">248</span> for (HBaseProtos.RegionInfo hri: state.getRegionInfoList()) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> regions.add(HRegionInfo.convert(hri));<a name="line.249"></a>
+<span class="sourceLineNo">250</span> }<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> private static List<HRegionInfo> recreateRegionInfo(final List<HRegionInfo> regions) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span> ArrayList<HRegionInfo> newRegions = new ArrayList<>(regions.size());<a name="line.255"></a>
+<span class="sourceLineNo">256</span> for (HRegionInfo hri: regions) {<a name="line.256"></a>
+<span class="sourceLineNo">257</span> newRegions.add(new HRegionInfo(hri.getTable(), hri.getStartKey(), hri.getEndKey()));<a name="line.257"></a>
+<span class="sourceLineNo">258</span> }<a name="line.258"></a>
+<span class="sourceLineNo">259</span> return newRegions;<a name="line.259"></a>
+<span class="sourceLineNo">260</span> }<a name="line.260"></a>
+<span class="sourceLineNo">261</span><a name="line.261"></a>
+<span class="sourceLineNo">262</span> private boolean prepareTruncate(final MasterProcedureEnv env) throws IOException {<a name="line.262"></a>
+<span class="sourceLineNo">263</span> try {<a name="line.263"></a>
+<span class="sourceLineNo">264</span> env.getMasterServices().checkTableModifiable(getTableName());<a name="line.264"></a>
+<span class="sourceLineNo">265</span> } catch (TableNotFoundException|TableNotDisabledException e) {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> setFailure("master-truncate-table", e);<a name="line.266"></a>
+<span class="sourceLineNo">267</span> return false;<a name="line.267"></a>
+<span class="sourceLineNo">268</span> }<a name="line.268"></a>
+<span class="sourceLineNo">269</span> return true;<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> private boolean preTruncate(final MasterProcedureEnv env)<a name="line.272"></a>
+<span class="sourceLineNo">273</span> throws IOException, InterruptedException {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> final MasterCoprocessorHost cpHost = env.getMasterCoprocessorHost();<a name="line.274"></a>
+<span class="sourceLineNo">275</span> if (cpHost != null) {<a name="line.275"></a>
+<span class="sourceLineNo">276</span> final TableName tableName = getTableName();<a name="line.276"></a>
+<span class="sourceLineNo">277</span> cpHost.preTruncateTableAction(tableName, getUser());<a name="line.277"></a>
+<span class="sourceLineNo">278</span> }<a name="line.278"></a>
+<span class="sourceLineNo">279</span> return true;<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> private void postTruncate(final MasterProcedureEnv env)<a name="line.282"></a>
+<span class="sourceLineNo">283</span> throws IOException, InterruptedException {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> final MasterCoprocessorHost cpHost = env.getMasterCoprocessorHost();<a name="line.284"></a>
+<span class="sourceLineNo">285</span> if (cpHost != null) {<a name="line.285"></a>
+<span class="sourceLineNo">286</span> final TableName tableName = getTableName();<a name="line.286"></a>
+<span class="sourceLineNo">287</span> cpHost.postCompletedTruncateTableAction(tableName, getUser());<a name="line.287"></a>
+<span class="sourceLineNo">288</span> }<a name="line.288"></a>
+<span class="sourceLineNo">289</span> }<a name="line.289"></a>
+<span class="sourceLineNo">290</span>}<a name="line.290"></a>