You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mi...@apache.org on 2016/01/15 18:04:16 UTC
[11/51] [partial] hbase-site git commit: Published site at
cb17c7a97a1e2eb0ebd532f614191e4edbb9e49b.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/50917b1d/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/DeleteNamespaceProcedure.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/DeleteNamespaceProcedure.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/DeleteNamespaceProcedure.html
index e1c6d7b..a7c79ea 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/DeleteNamespaceProcedure.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/DeleteNamespaceProcedure.html
@@ -112,7 +112,7 @@
<span class="sourceLineNo">104</span> throw new UnsupportedOperationException(this + " unhandled state=" + state);<a name="line.104"></a>
<span class="sourceLineNo">105</span> }<a name="line.105"></a>
<span class="sourceLineNo">106</span> } catch (IOException e) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span> LOG.warn("Error trying to delete the namespace" + namespaceName<a name="line.107"></a>
+<span class="sourceLineNo">107</span> LOG.warn("Error trying to delete the namespace " + namespaceName<a name="line.107"></a>
<span class="sourceLineNo">108</span> + " (in state=" + state + ")", e);<a name="line.108"></a>
<span class="sourceLineNo">109</span><a name="line.109"></a>
<span class="sourceLineNo">110</span> setFailure("master-delete-namespace", e);<a name="line.110"></a>
@@ -220,191 +220,196 @@
<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> protected boolean acquireLock(final MasterProcedureEnv env) {<a name="line.214"></a>
-<span class="sourceLineNo">215</span> return getTableNamespaceManager(env).acquireExclusiveLock();<a name="line.215"></a>
-<span class="sourceLineNo">216</span> }<a name="line.216"></a>
-<span class="sourceLineNo">217</span><a name="line.217"></a>
-<span class="sourceLineNo">218</span> @Override<a name="line.218"></a>
-<span class="sourceLineNo">219</span> protected void releaseLock(final MasterProcedureEnv env) {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> getTableNamespaceManager(env).releaseExclusiveLock();<a name="line.220"></a>
-<span class="sourceLineNo">221</span> }<a name="line.221"></a>
-<span class="sourceLineNo">222</span><a name="line.222"></a>
-<span class="sourceLineNo">223</span> @Override<a name="line.223"></a>
-<span class="sourceLineNo">224</span> public TableName getTableName() {<a name="line.224"></a>
-<span class="sourceLineNo">225</span> return TableName.NAMESPACE_TABLE_NAME;<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> @Override<a name="line.228"></a>
-<span class="sourceLineNo">229</span> public TableOperationType getTableOperationType() {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> return TableOperationType.EDIT;<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> /**<a name="line.233"></a>
-<span class="sourceLineNo">234</span> * Action before any real action of deleting namespace.<a name="line.234"></a>
-<span class="sourceLineNo">235</span> * @param env MasterProcedureEnv<a name="line.235"></a>
-<span class="sourceLineNo">236</span> * @throws IOException<a name="line.236"></a>
-<span class="sourceLineNo">237</span> */<a name="line.237"></a>
-<span class="sourceLineNo">238</span> private void prepareDelete(final MasterProcedureEnv env) throws IOException {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> if (getTableNamespaceManager(env).doesNamespaceExist(namespaceName) == false) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span> throw new NamespaceNotFoundException(namespaceName);<a name="line.240"></a>
-<span class="sourceLineNo">241</span> }<a name="line.241"></a>
-<span class="sourceLineNo">242</span> if (NamespaceDescriptor.RESERVED_NAMESPACES.contains(namespaceName)) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span> throw new ConstraintException("Reserved namespace "+ namespaceName +" cannot be removed.");<a name="line.243"></a>
-<span class="sourceLineNo">244</span> }<a name="line.244"></a>
-<span class="sourceLineNo">245</span><a name="line.245"></a>
-<span class="sourceLineNo">246</span> int tableCount = 0;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> try {<a name="line.247"></a>
-<span class="sourceLineNo">248</span> tableCount = env.getMasterServices().listTableDescriptorsByNamespace(namespaceName).size();<a name="line.248"></a>
-<span class="sourceLineNo">249</span> } catch (FileNotFoundException fnfe) {<a name="line.249"></a>
-<span class="sourceLineNo">250</span> throw new NamespaceNotFoundException(namespaceName);<a name="line.250"></a>
-<span class="sourceLineNo">251</span> }<a name="line.251"></a>
-<span class="sourceLineNo">252</span> if (tableCount > 0) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span> throw new ConstraintException("Only empty namespaces can be removed. " +<a name="line.253"></a>
-<span class="sourceLineNo">254</span> "Namespace "+ namespaceName + " has "+ tableCount +" tables");<a name="line.254"></a>
-<span class="sourceLineNo">255</span> }<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span> // This is used for rollback<a name="line.257"></a>
-<span class="sourceLineNo">258</span> nsDescriptor = getTableNamespaceManager(env).get(namespaceName);<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> * delete the row from namespace table<a name="line.262"></a>
-<span class="sourceLineNo">263</span> * @param env MasterProcedureEnv<a name="line.263"></a>
-<span class="sourceLineNo">264</span> * @param namespaceName name of the namespace in string format<a name="line.264"></a>
-<span class="sourceLineNo">265</span> * @throws IOException<a name="line.265"></a>
-<span class="sourceLineNo">266</span> */<a name="line.266"></a>
-<span class="sourceLineNo">267</span> protected static void deleteFromNSTable(<a name="line.267"></a>
-<span class="sourceLineNo">268</span> final MasterProcedureEnv env,<a name="line.268"></a>
-<span class="sourceLineNo">269</span> final String namespaceName) throws IOException {<a name="line.269"></a>
-<span class="sourceLineNo">270</span> getTableNamespaceManager(env).removeFromNSTable(namespaceName);<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> * undo the delete<a name="line.274"></a>
-<span class="sourceLineNo">275</span> * @param env MasterProcedureEnv<a name="line.275"></a>
-<span class="sourceLineNo">276</span> * @throws IOException<a name="line.276"></a>
-<span class="sourceLineNo">277</span> */<a name="line.277"></a>
-<span class="sourceLineNo">278</span> private void undoDeleteFromNSTable(final MasterProcedureEnv env) {<a name="line.278"></a>
-<span class="sourceLineNo">279</span> try {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> if (nsDescriptor != null) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> CreateNamespaceProcedure.insertIntoNSTable(env, nsDescriptor);<a name="line.281"></a>
-<span class="sourceLineNo">282</span> }<a name="line.282"></a>
-<span class="sourceLineNo">283</span> } catch (Exception e) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> // Ignore<a name="line.284"></a>
-<span class="sourceLineNo">285</span> LOG.debug("Rollback of deleteFromNSTable throws exception: " + e);<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><a name="line.288"></a>
-<span class="sourceLineNo">289</span> /**<a name="line.289"></a>
-<span class="sourceLineNo">290</span> * remove from Zookeeper.<a name="line.290"></a>
-<span class="sourceLineNo">291</span> * @param env MasterProcedureEnv<a name="line.291"></a>
-<span class="sourceLineNo">292</span> * @param namespaceName name of the namespace in string format<a name="line.292"></a>
-<span class="sourceLineNo">293</span> * @throws IOException<a name="line.293"></a>
-<span class="sourceLineNo">294</span> */<a name="line.294"></a>
-<span class="sourceLineNo">295</span> protected static void removeFromZKNamespaceManager(<a name="line.295"></a>
-<span class="sourceLineNo">296</span> final MasterProcedureEnv env,<a name="line.296"></a>
-<span class="sourceLineNo">297</span> final String namespaceName) throws IOException {<a name="line.297"></a>
-<span class="sourceLineNo">298</span> getTableNamespaceManager(env).removeFromZKNamespaceManager(namespaceName);<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> * undo the remove from Zookeeper<a name="line.302"></a>
-<span class="sourceLineNo">303</span> * @param env MasterProcedureEnv<a name="line.303"></a>
-<span class="sourceLineNo">304</span> * @throws IOException<a name="line.304"></a>
-<span class="sourceLineNo">305</span> */<a name="line.305"></a>
-<span class="sourceLineNo">306</span> private void undoRemoveFromZKNamespaceManager(final MasterProcedureEnv env) {<a name="line.306"></a>
-<span class="sourceLineNo">307</span> try {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> if (nsDescriptor != null) {<a name="line.308"></a>
-<span class="sourceLineNo">309</span> CreateNamespaceProcedure.updateZKNamespaceManager(env, nsDescriptor);<a name="line.309"></a>
-<span class="sourceLineNo">310</span> }<a name="line.310"></a>
-<span class="sourceLineNo">311</span> } catch (Exception e) {<a name="line.311"></a>
-<span class="sourceLineNo">312</span> // Ignore<a name="line.312"></a>
-<span class="sourceLineNo">313</span> LOG.debug("Rollback of removeFromZKNamespaceManager throws exception: " + e);<a name="line.313"></a>
-<span class="sourceLineNo">314</span> }<a name="line.314"></a>
-<span class="sourceLineNo">315</span> }<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span> /**<a name="line.317"></a>
-<span class="sourceLineNo">318</span> * Delete the namespace directories from the file system<a name="line.318"></a>
-<span class="sourceLineNo">319</span> * @param env MasterProcedureEnv<a name="line.319"></a>
-<span class="sourceLineNo">320</span> * @param namespaceName name of the namespace in string format<a name="line.320"></a>
-<span class="sourceLineNo">321</span> * @throws IOException<a name="line.321"></a>
-<span class="sourceLineNo">322</span> */<a name="line.322"></a>
-<span class="sourceLineNo">323</span> protected static void deleteDirectory(<a name="line.323"></a>
-<span class="sourceLineNo">324</span> final MasterProcedureEnv env,<a name="line.324"></a>
-<span class="sourceLineNo">325</span> final String namespaceName) throws IOException {<a name="line.325"></a>
-<span class="sourceLineNo">326</span> MasterFileSystem mfs = env.getMasterServices().getMasterFileSystem();<a name="line.326"></a>
-<span class="sourceLineNo">327</span> FileSystem fs = mfs.getFileSystem();<a name="line.327"></a>
-<span class="sourceLineNo">328</span> Path p = FSUtils.getNamespaceDir(mfs.getRootDir(), namespaceName);<a name="line.328"></a>
-<span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span> try {<a name="line.330"></a>
-<span class="sourceLineNo">331</span> for(FileStatus status : fs.listStatus(p)) {<a name="line.331"></a>
-<span class="sourceLineNo">332</span> if (!HConstants.HBASE_NON_TABLE_DIRS.contains(status.getPath().getName())) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span> throw new IOException("Namespace directory contains table dir: " + status.getPath());<a name="line.333"></a>
-<span class="sourceLineNo">334</span> }<a name="line.334"></a>
-<span class="sourceLineNo">335</span> }<a name="line.335"></a>
-<span class="sourceLineNo">336</span> if (!fs.delete(FSUtils.getNamespaceDir(mfs.getRootDir(), namespaceName), true)) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span> throw new IOException("Failed to remove namespace: " + namespaceName);<a name="line.337"></a>
-<span class="sourceLineNo">338</span> }<a name="line.338"></a>
-<span class="sourceLineNo">339</span> } catch (FileNotFoundException e) {<a name="line.339"></a>
-<span class="sourceLineNo">340</span> // File already deleted, continue<a name="line.340"></a>
-<span class="sourceLineNo">341</span> LOG.debug("deleteDirectory throws exception: " + e);<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><a name="line.344"></a>
-<span class="sourceLineNo">345</span> /**<a name="line.345"></a>
-<span class="sourceLineNo">346</span> * undo delete directory<a name="line.346"></a>
-<span class="sourceLineNo">347</span> * @param env MasterProcedureEnv<a name="line.347"></a>
-<span class="sourceLineNo">348</span> * @throws IOException<a name="line.348"></a>
-<span class="sourceLineNo">349</span> */<a name="line.349"></a>
-<span class="sourceLineNo">350</span> private void rollbackDeleteDirectory(final MasterProcedureEnv env) throws IOException {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> try {<a name="line.351"></a>
-<span class="sourceLineNo">352</span> CreateNamespaceProcedure.createDirectory(env, nsDescriptor);<a name="line.352"></a>
-<span class="sourceLineNo">353</span> } catch (Exception e) {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> // Ignore exception<a name="line.354"></a>
-<span class="sourceLineNo">355</span> LOG.debug("Rollback of deleteDirectory throws exception: " + e);<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> * remove quota for the namespace<a name="line.360"></a>
-<span class="sourceLineNo">361</span> * @param env MasterProcedureEnv<a name="line.361"></a>
-<span class="sourceLineNo">362</span> * @param namespaceName name of the namespace in string format<a name="line.362"></a>
-<span class="sourceLineNo">363</span> * @throws IOException<a name="line.363"></a>
-<span class="sourceLineNo">364</span> **/<a name="line.364"></a>
-<span class="sourceLineNo">365</span> protected static void removeNamespaceQuota(<a name="line.365"></a>
-<span class="sourceLineNo">366</span> final MasterProcedureEnv env,<a name="line.366"></a>
-<span class="sourceLineNo">367</span> final String namespaceName) throws IOException {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> env.getMasterServices().getMasterQuotaManager().removeNamespaceQuota(namespaceName);<a name="line.368"></a>
-<span class="sourceLineNo">369</span> }<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> * undo remove quota for the namespace<a name="line.372"></a>
-<span class="sourceLineNo">373</span> * @param env MasterProcedureEnv<a name="line.373"></a>
-<span class="sourceLineNo">374</span> * @throws IOException<a name="line.374"></a>
-<span class="sourceLineNo">375</span> **/<a name="line.375"></a>
-<span class="sourceLineNo">376</span> private void rollbacRemoveNamespaceQuota(final MasterProcedureEnv env) throws IOException {<a name="line.376"></a>
-<span class="sourceLineNo">377</span> try {<a name="line.377"></a>
-<span class="sourceLineNo">378</span> CreateNamespaceProcedure.setNamespaceQuota(env, nsDescriptor);<a name="line.378"></a>
-<span class="sourceLineNo">379</span> } catch (Exception e) {<a name="line.379"></a>
-<span class="sourceLineNo">380</span> // Ignore exception<a name="line.380"></a>
-<span class="sourceLineNo">381</span> LOG.debug("Rollback of removeNamespaceQuota throws exception: " + e);<a name="line.381"></a>
-<span class="sourceLineNo">382</span> }<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> private static TableNamespaceManager getTableNamespaceManager(final MasterProcedureEnv env) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span> return env.getMasterServices().getClusterSchema().getTableNamespaceManager();<a name="line.386"></a>
-<span class="sourceLineNo">387</span> }<a name="line.387"></a>
-<span class="sourceLineNo">388</span> /**<a name="line.388"></a>
-<span class="sourceLineNo">389</span> * The procedure could be restarted from a different machine. If the variable is null, we need to<a name="line.389"></a>
-<span class="sourceLineNo">390</span> * retrieve it.<a name="line.390"></a>
-<span class="sourceLineNo">391</span> * @return traceEnabled<a name="line.391"></a>
-<span class="sourceLineNo">392</span> */<a name="line.392"></a>
-<span class="sourceLineNo">393</span> private Boolean isTraceEnabled() {<a name="line.393"></a>
-<span class="sourceLineNo">394</span> if (traceEnabled == null) {<a name="line.394"></a>
-<span class="sourceLineNo">395</span> traceEnabled = LOG.isTraceEnabled();<a name="line.395"></a>
-<span class="sourceLineNo">396</span> }<a name="line.396"></a>
-<span class="sourceLineNo">397</span> return traceEnabled;<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">215</span> if (env.waitInitialized(this)) return false;<a name="line.215"></a>
+<span class="sourceLineNo">216</span> return env.getProcedureQueue().tryAcquireNamespaceExclusiveLock(getNamespaceName());<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> @Override<a name="line.219"></a>
+<span class="sourceLineNo">220</span> protected void releaseLock(final MasterProcedureEnv env) {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> env.getProcedureQueue().releaseNamespaceExclusiveLock(getNamespaceName());<a name="line.221"></a>
+<span class="sourceLineNo">222</span> }<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span> @Override<a name="line.224"></a>
+<span class="sourceLineNo">225</span> public TableName getTableName() {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> return TableName.NAMESPACE_TABLE_NAME;<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 TableOperationType getTableOperationType() {<a name="line.230"></a>
+<span class="sourceLineNo">231</span> return TableOperationType.EDIT;<a name="line.231"></a>
+<span class="sourceLineNo">232</span> }<a name="line.232"></a>
+<span class="sourceLineNo">233</span><a name="line.233"></a>
+<span class="sourceLineNo">234</span> private String getNamespaceName() {<a name="line.234"></a>
+<span class="sourceLineNo">235</span> return namespaceName;<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> /**<a name="line.238"></a>
+<span class="sourceLineNo">239</span> * Action before any real action of deleting namespace.<a name="line.239"></a>
+<span class="sourceLineNo">240</span> * @param env MasterProcedureEnv<a name="line.240"></a>
+<span class="sourceLineNo">241</span> * @throws IOException<a name="line.241"></a>
+<span class="sourceLineNo">242</span> */<a name="line.242"></a>
+<span class="sourceLineNo">243</span> private void prepareDelete(final MasterProcedureEnv env) throws IOException {<a name="line.243"></a>
+<span class="sourceLineNo">244</span> if (getTableNamespaceManager(env).doesNamespaceExist(namespaceName) == false) {<a name="line.244"></a>
+<span class="sourceLineNo">245</span> throw new NamespaceNotFoundException(namespaceName);<a name="line.245"></a>
+<span class="sourceLineNo">246</span> }<a name="line.246"></a>
+<span class="sourceLineNo">247</span> if (NamespaceDescriptor.RESERVED_NAMESPACES.contains(namespaceName)) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span> throw new ConstraintException("Reserved namespace "+ namespaceName +" cannot be removed.");<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> int tableCount = 0;<a name="line.251"></a>
+<span class="sourceLineNo">252</span> try {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> tableCount = env.getMasterServices().listTableDescriptorsByNamespace(namespaceName).size();<a name="line.253"></a>
+<span class="sourceLineNo">254</span> } catch (FileNotFoundException fnfe) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span> throw new NamespaceNotFoundException(namespaceName);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span> if (tableCount > 0) {<a name="line.257"></a>
+<span class="sourceLineNo">258</span> throw new ConstraintException("Only empty namespaces can be removed. " +<a name="line.258"></a>
+<span class="sourceLineNo">259</span> "Namespace "+ namespaceName + " has "+ tableCount +" tables");<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> // This is used for rollback<a name="line.262"></a>
+<span class="sourceLineNo">263</span> nsDescriptor = getTableNamespaceManager(env).get(namespaceName);<a name="line.263"></a>
+<span class="sourceLineNo">264</span> }<a name="line.264"></a>
+<span class="sourceLineNo">265</span><a name="line.265"></a>
+<span class="sourceLineNo">266</span> /**<a name="line.266"></a>
+<span class="sourceLineNo">267</span> * delete the row from namespace table<a name="line.267"></a>
+<span class="sourceLineNo">268</span> * @param env MasterProcedureEnv<a name="line.268"></a>
+<span class="sourceLineNo">269</span> * @param namespaceName name of the namespace in string format<a name="line.269"></a>
+<span class="sourceLineNo">270</span> * @throws IOException<a name="line.270"></a>
+<span class="sourceLineNo">271</span> */<a name="line.271"></a>
+<span class="sourceLineNo">272</span> protected static void deleteFromNSTable(<a name="line.272"></a>
+<span class="sourceLineNo">273</span> final MasterProcedureEnv env,<a name="line.273"></a>
+<span class="sourceLineNo">274</span> final String namespaceName) throws IOException {<a name="line.274"></a>
+<span class="sourceLineNo">275</span> getTableNamespaceManager(env).removeFromNSTable(namespaceName);<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> /**<a name="line.278"></a>
+<span class="sourceLineNo">279</span> * undo the delete<a name="line.279"></a>
+<span class="sourceLineNo">280</span> * @param env MasterProcedureEnv<a name="line.280"></a>
+<span class="sourceLineNo">281</span> * @throws IOException<a name="line.281"></a>
+<span class="sourceLineNo">282</span> */<a name="line.282"></a>
+<span class="sourceLineNo">283</span> private void undoDeleteFromNSTable(final MasterProcedureEnv env) {<a name="line.283"></a>
+<span class="sourceLineNo">284</span> try {<a name="line.284"></a>
+<span class="sourceLineNo">285</span> if (nsDescriptor != null) {<a name="line.285"></a>
+<span class="sourceLineNo">286</span> CreateNamespaceProcedure.insertIntoNSTable(env, nsDescriptor);<a name="line.286"></a>
+<span class="sourceLineNo">287</span> }<a name="line.287"></a>
+<span class="sourceLineNo">288</span> } catch (Exception e) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span> // Ignore<a name="line.289"></a>
+<span class="sourceLineNo">290</span> LOG.debug("Rollback of deleteFromNSTable throws exception: " + e);<a name="line.290"></a>
+<span class="sourceLineNo">291</span> }<a name="line.291"></a>
+<span class="sourceLineNo">292</span> }<a name="line.292"></a>
+<span class="sourceLineNo">293</span><a name="line.293"></a>
+<span class="sourceLineNo">294</span> /**<a name="line.294"></a>
+<span class="sourceLineNo">295</span> * remove from Zookeeper.<a name="line.295"></a>
+<span class="sourceLineNo">296</span> * @param env MasterProcedureEnv<a name="line.296"></a>
+<span class="sourceLineNo">297</span> * @param namespaceName name of the namespace in string format<a name="line.297"></a>
+<span class="sourceLineNo">298</span> * @throws IOException<a name="line.298"></a>
+<span class="sourceLineNo">299</span> */<a name="line.299"></a>
+<span class="sourceLineNo">300</span> protected static void removeFromZKNamespaceManager(<a name="line.300"></a>
+<span class="sourceLineNo">301</span> final MasterProcedureEnv env,<a name="line.301"></a>
+<span class="sourceLineNo">302</span> final String namespaceName) throws IOException {<a name="line.302"></a>
+<span class="sourceLineNo">303</span> getTableNamespaceManager(env).removeFromZKNamespaceManager(namespaceName);<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> /**<a name="line.306"></a>
+<span class="sourceLineNo">307</span> * undo the remove from Zookeeper<a name="line.307"></a>
+<span class="sourceLineNo">308</span> * @param env MasterProcedureEnv<a name="line.308"></a>
+<span class="sourceLineNo">309</span> * @throws IOException<a name="line.309"></a>
+<span class="sourceLineNo">310</span> */<a name="line.310"></a>
+<span class="sourceLineNo">311</span> private void undoRemoveFromZKNamespaceManager(final MasterProcedureEnv env) {<a name="line.311"></a>
+<span class="sourceLineNo">312</span> try {<a name="line.312"></a>
+<span class="sourceLineNo">313</span> if (nsDescriptor != null) {<a name="line.313"></a>
+<span class="sourceLineNo">314</span> CreateNamespaceProcedure.updateZKNamespaceManager(env, nsDescriptor);<a name="line.314"></a>
+<span class="sourceLineNo">315</span> }<a name="line.315"></a>
+<span class="sourceLineNo">316</span> } catch (Exception e) {<a name="line.316"></a>
+<span class="sourceLineNo">317</span> // Ignore<a name="line.317"></a>
+<span class="sourceLineNo">318</span> LOG.debug("Rollback of removeFromZKNamespaceManager throws exception: " + e);<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> * Delete the namespace directories from the file system<a name="line.323"></a>
+<span class="sourceLineNo">324</span> * @param env MasterProcedureEnv<a name="line.324"></a>
+<span class="sourceLineNo">325</span> * @param namespaceName name of the namespace in string format<a name="line.325"></a>
+<span class="sourceLineNo">326</span> * @throws IOException<a name="line.326"></a>
+<span class="sourceLineNo">327</span> */<a name="line.327"></a>
+<span class="sourceLineNo">328</span> protected static void deleteDirectory(<a name="line.328"></a>
+<span class="sourceLineNo">329</span> final MasterProcedureEnv env,<a name="line.329"></a>
+<span class="sourceLineNo">330</span> final String namespaceName) throws IOException {<a name="line.330"></a>
+<span class="sourceLineNo">331</span> MasterFileSystem mfs = env.getMasterServices().getMasterFileSystem();<a name="line.331"></a>
+<span class="sourceLineNo">332</span> FileSystem fs = mfs.getFileSystem();<a name="line.332"></a>
+<span class="sourceLineNo">333</span> Path p = FSUtils.getNamespaceDir(mfs.getRootDir(), namespaceName);<a name="line.333"></a>
+<span class="sourceLineNo">334</span><a name="line.334"></a>
+<span class="sourceLineNo">335</span> try {<a name="line.335"></a>
+<span class="sourceLineNo">336</span> for(FileStatus status : fs.listStatus(p)) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span> if (!HConstants.HBASE_NON_TABLE_DIRS.contains(status.getPath().getName())) {<a name="line.337"></a>
+<span class="sourceLineNo">338</span> throw new IOException("Namespace directory contains table dir: " + status.getPath());<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> if (!fs.delete(FSUtils.getNamespaceDir(mfs.getRootDir(), namespaceName), true)) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span> throw new IOException("Failed to remove namespace: " + namespaceName);<a name="line.342"></a>
+<span class="sourceLineNo">343</span> }<a name="line.343"></a>
+<span class="sourceLineNo">344</span> } catch (FileNotFoundException e) {<a name="line.344"></a>
+<span class="sourceLineNo">345</span> // File already deleted, continue<a name="line.345"></a>
+<span class="sourceLineNo">346</span> LOG.debug("deleteDirectory throws exception: " + e);<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><a name="line.349"></a>
+<span class="sourceLineNo">350</span> /**<a name="line.350"></a>
+<span class="sourceLineNo">351</span> * undo delete directory<a name="line.351"></a>
+<span class="sourceLineNo">352</span> * @param env MasterProcedureEnv<a name="line.352"></a>
+<span class="sourceLineNo">353</span> * @throws IOException<a name="line.353"></a>
+<span class="sourceLineNo">354</span> */<a name="line.354"></a>
+<span class="sourceLineNo">355</span> private void rollbackDeleteDirectory(final MasterProcedureEnv env) throws IOException {<a name="line.355"></a>
+<span class="sourceLineNo">356</span> try {<a name="line.356"></a>
+<span class="sourceLineNo">357</span> CreateNamespaceProcedure.createDirectory(env, nsDescriptor);<a name="line.357"></a>
+<span class="sourceLineNo">358</span> } catch (Exception e) {<a name="line.358"></a>
+<span class="sourceLineNo">359</span> // Ignore exception<a name="line.359"></a>
+<span class="sourceLineNo">360</span> LOG.debug("Rollback of deleteDirectory throws exception: " + e);<a name="line.360"></a>
+<span class="sourceLineNo">361</span> }<a name="line.361"></a>
+<span class="sourceLineNo">362</span> }<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> * remove quota for the namespace<a name="line.365"></a>
+<span class="sourceLineNo">366</span> * @param env MasterProcedureEnv<a name="line.366"></a>
+<span class="sourceLineNo">367</span> * @param namespaceName name of the namespace in string format<a name="line.367"></a>
+<span class="sourceLineNo">368</span> * @throws IOException<a name="line.368"></a>
+<span class="sourceLineNo">369</span> **/<a name="line.369"></a>
+<span class="sourceLineNo">370</span> protected static void removeNamespaceQuota(<a name="line.370"></a>
+<span class="sourceLineNo">371</span> final MasterProcedureEnv env,<a name="line.371"></a>
+<span class="sourceLineNo">372</span> final String namespaceName) throws IOException {<a name="line.372"></a>
+<span class="sourceLineNo">373</span> env.getMasterServices().getMasterQuotaManager().removeNamespaceQuota(namespaceName);<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> * undo remove quota for the namespace<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * @param env MasterProcedureEnv<a name="line.378"></a>
+<span class="sourceLineNo">379</span> * @throws IOException<a name="line.379"></a>
+<span class="sourceLineNo">380</span> **/<a name="line.380"></a>
+<span class="sourceLineNo">381</span> private void rollbacRemoveNamespaceQuota(final MasterProcedureEnv env) throws IOException {<a name="line.381"></a>
+<span class="sourceLineNo">382</span> try {<a name="line.382"></a>
+<span class="sourceLineNo">383</span> CreateNamespaceProcedure.setNamespaceQuota(env, nsDescriptor);<a name="line.383"></a>
+<span class="sourceLineNo">384</span> } catch (Exception e) {<a name="line.384"></a>
+<span class="sourceLineNo">385</span> // Ignore exception<a name="line.385"></a>
+<span class="sourceLineNo">386</span> LOG.debug("Rollback of removeNamespaceQuota throws exception: " + e);<a name="line.386"></a>
+<span class="sourceLineNo">387</span> }<a name="line.387"></a>
+<span class="sourceLineNo">388</span> }<a name="line.388"></a>
+<span class="sourceLineNo">389</span><a name="line.389"></a>
+<span class="sourceLineNo">390</span> private static TableNamespaceManager getTableNamespaceManager(final MasterProcedureEnv env) {<a name="line.390"></a>
+<span class="sourceLineNo">391</span> return env.getMasterServices().getClusterSchema().getTableNamespaceManager();<a name="line.391"></a>
+<span class="sourceLineNo">392</span> }<a name="line.392"></a>
+<span class="sourceLineNo">393</span> /**<a name="line.393"></a>
+<span class="sourceLineNo">394</span> * The procedure could be restarted from a different machine. If the variable is null, we need to<a name="line.394"></a>
+<span class="sourceLineNo">395</span> * retrieve it.<a name="line.395"></a>
+<span class="sourceLineNo">396</span> * @return traceEnabled<a name="line.396"></a>
+<span class="sourceLineNo">397</span> */<a name="line.397"></a>
+<span class="sourceLineNo">398</span> private Boolean isTraceEnabled() {<a name="line.398"></a>
+<span class="sourceLineNo">399</span> if (traceEnabled == null) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span> traceEnabled = LOG.isTraceEnabled();<a name="line.400"></a>
+<span class="sourceLineNo">401</span> }<a name="line.401"></a>
+<span class="sourceLineNo">402</span> return traceEnabled;<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/50917b1d/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 aeed12c..a1d5e74 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
@@ -208,7 +208,7 @@
<span class="sourceLineNo">200</span><a name="line.200"></a>
<span class="sourceLineNo">201</span> @Override<a name="line.201"></a>
<span class="sourceLineNo">202</span> protected boolean acquireLock(final MasterProcedureEnv env) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span> if (!env.isInitialized()) return false;<a name="line.203"></a>
+<span class="sourceLineNo">203</span> if (env.waitInitialized(this)) return false;<a name="line.203"></a>
<span class="sourceLineNo">204</span> return env.getProcedureQueue().tryAcquireTableExclusiveLock(getTableName(), "delete table");<a name="line.204"></a>
<span class="sourceLineNo">205</span> }<a name="line.205"></a>
<span class="sourceLineNo">206</span><a name="line.206"></a>