You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/05/16 14:47:41 UTC
[2/3] hbase-site git commit: Published site at
ab53329cb3a56296ad05ee68735eb78896819cd3.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/00ccdc9b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.html
index 82a898a..696449f 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.html
@@ -255,635 +255,639 @@
<span class="sourceLineNo">247</span> clear(tableMap, tableRunQueue, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.247"></a>
<span class="sourceLineNo">248</span> tableMap = null;<a name="line.248"></a>
<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> assert size() == 0 : "expected queue size to be 0, got " + size();<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> private <T extends Comparable<T>, TNode extends Queue<T>> void clear(TNode treeMap,<a name="line.253"></a>
-<span class="sourceLineNo">254</span> final FairQueue<T> fairq, final AvlKeyComparator<TNode> comparator) {<a name="line.254"></a>
-<span class="sourceLineNo">255</span> while (treeMap != null) {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> Queue<T> node = AvlTree.getFirst(treeMap);<a name="line.256"></a>
-<span class="sourceLineNo">257</span> treeMap = AvlTree.remove(treeMap, node.getKey(), comparator);<a name="line.257"></a>
-<span class="sourceLineNo">258</span> if (fairq != null) removeFromRunQueue(fairq, node);<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> @Override<a name="line.262"></a>
-<span class="sourceLineNo">263</span> protected int queueSize() {<a name="line.263"></a>
-<span class="sourceLineNo">264</span> int count = 0;<a name="line.264"></a>
+<span class="sourceLineNo">250</span> // Remove Peers<a name="line.250"></a>
+<span class="sourceLineNo">251</span> clear(peerMap, peerRunQueue, PEER_QUEUE_KEY_COMPARATOR);<a name="line.251"></a>
+<span class="sourceLineNo">252</span> peerMap = null;<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span> assert size() == 0 : "expected queue size to be 0, got " + size();<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> private <T extends Comparable<T>, TNode extends Queue<T>> void clear(TNode treeMap,<a name="line.257"></a>
+<span class="sourceLineNo">258</span> final FairQueue<T> fairq, final AvlKeyComparator<TNode> comparator) {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> while (treeMap != null) {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> Queue<T> node = AvlTree.getFirst(treeMap);<a name="line.260"></a>
+<span class="sourceLineNo">261</span> treeMap = AvlTree.remove(treeMap, node.getKey(), comparator);<a name="line.261"></a>
+<span class="sourceLineNo">262</span> if (fairq != null) removeFromRunQueue(fairq, node);<a name="line.262"></a>
+<span class="sourceLineNo">263</span> }<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> // Server queues<a name="line.266"></a>
-<span class="sourceLineNo">267</span> final AvlTreeIterator<ServerQueue> serverIter = new AvlTreeIterator<>();<a name="line.267"></a>
-<span class="sourceLineNo">268</span> for (int i = 0; i < serverBuckets.length; ++i) {<a name="line.268"></a>
-<span class="sourceLineNo">269</span> serverIter.seekFirst(serverBuckets[i]);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> while (serverIter.hasNext()) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> count += serverIter.next().size();<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><a name="line.274"></a>
-<span class="sourceLineNo">275</span> // Table queues<a name="line.275"></a>
-<span class="sourceLineNo">276</span> final AvlTreeIterator<TableQueue> tableIter = new AvlTreeIterator<>(tableMap);<a name="line.276"></a>
-<span class="sourceLineNo">277</span> while (tableIter.hasNext()) {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> count += tableIter.next().size();<a name="line.278"></a>
-<span class="sourceLineNo">279</span> }<a name="line.279"></a>
-<span class="sourceLineNo">280</span><a name="line.280"></a>
-<span class="sourceLineNo">281</span> // Peer queues<a name="line.281"></a>
-<span class="sourceLineNo">282</span> final AvlTreeIterator<PeerQueue> peerIter = new AvlTreeIterator<>(peerMap);<a name="line.282"></a>
-<span class="sourceLineNo">283</span> while (peerIter.hasNext()) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> count += peerIter.next().size();<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> return count;<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> @Override<a name="line.290"></a>
-<span class="sourceLineNo">291</span> public void completionCleanup(final Procedure proc) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span> if (proc instanceof TableProcedureInterface) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> TableProcedureInterface iProcTable = (TableProcedureInterface) proc;<a name="line.293"></a>
-<span class="sourceLineNo">294</span> boolean tableDeleted;<a name="line.294"></a>
-<span class="sourceLineNo">295</span> if (proc.hasException()) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> Exception procEx = proc.getException().unwrapRemoteException();<a name="line.296"></a>
-<span class="sourceLineNo">297</span> if (iProcTable.getTableOperationType() == TableOperationType.CREATE) {<a name="line.297"></a>
-<span class="sourceLineNo">298</span> // create failed because the table already exist<a name="line.298"></a>
-<span class="sourceLineNo">299</span> tableDeleted = !(procEx instanceof TableExistsException);<a name="line.299"></a>
-<span class="sourceLineNo">300</span> } else {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> // the operation failed because the table does not exist<a name="line.301"></a>
-<span class="sourceLineNo">302</span> tableDeleted = (procEx instanceof TableNotFoundException);<a name="line.302"></a>
-<span class="sourceLineNo">303</span> }<a name="line.303"></a>
-<span class="sourceLineNo">304</span> } else {<a name="line.304"></a>
-<span class="sourceLineNo">305</span> // the table was deleted<a name="line.305"></a>
-<span class="sourceLineNo">306</span> tableDeleted = (iProcTable.getTableOperationType() == TableOperationType.DELETE);<a name="line.306"></a>
-<span class="sourceLineNo">307</span> }<a name="line.307"></a>
-<span class="sourceLineNo">308</span> if (tableDeleted) {<a name="line.308"></a>
-<span class="sourceLineNo">309</span> markTableAsDeleted(iProcTable.getTableName(), proc);<a name="line.309"></a>
-<span class="sourceLineNo">310</span> return;<a name="line.310"></a>
+<span class="sourceLineNo">266</span> @Override<a name="line.266"></a>
+<span class="sourceLineNo">267</span> protected int queueSize() {<a name="line.267"></a>
+<span class="sourceLineNo">268</span> int count = 0;<a name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span> // Server queues<a name="line.270"></a>
+<span class="sourceLineNo">271</span> final AvlTreeIterator<ServerQueue> serverIter = new AvlTreeIterator<>();<a name="line.271"></a>
+<span class="sourceLineNo">272</span> for (int i = 0; i < serverBuckets.length; ++i) {<a name="line.272"></a>
+<span class="sourceLineNo">273</span> serverIter.seekFirst(serverBuckets[i]);<a name="line.273"></a>
+<span class="sourceLineNo">274</span> while (serverIter.hasNext()) {<a name="line.274"></a>
+<span class="sourceLineNo">275</span> count += serverIter.next().size();<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> // Table queues<a name="line.279"></a>
+<span class="sourceLineNo">280</span> final AvlTreeIterator<TableQueue> tableIter = new AvlTreeIterator<>(tableMap);<a name="line.280"></a>
+<span class="sourceLineNo">281</span> while (tableIter.hasNext()) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> count += tableIter.next().size();<a name="line.282"></a>
+<span class="sourceLineNo">283</span> }<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span> // Peer queues<a name="line.285"></a>
+<span class="sourceLineNo">286</span> final AvlTreeIterator<PeerQueue> peerIter = new AvlTreeIterator<>(peerMap);<a name="line.286"></a>
+<span class="sourceLineNo">287</span> while (peerIter.hasNext()) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> count += peerIter.next().size();<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>
+<span class="sourceLineNo">291</span> return count;<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> @Override<a name="line.294"></a>
+<span class="sourceLineNo">295</span> public void completionCleanup(final Procedure proc) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> if (proc instanceof TableProcedureInterface) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> TableProcedureInterface iProcTable = (TableProcedureInterface) proc;<a name="line.297"></a>
+<span class="sourceLineNo">298</span> boolean tableDeleted;<a name="line.298"></a>
+<span class="sourceLineNo">299</span> if (proc.hasException()) {<a name="line.299"></a>
+<span class="sourceLineNo">300</span> Exception procEx = proc.getException().unwrapRemoteException();<a name="line.300"></a>
+<span class="sourceLineNo">301</span> if (iProcTable.getTableOperationType() == TableOperationType.CREATE) {<a name="line.301"></a>
+<span class="sourceLineNo">302</span> // create failed because the table already exist<a name="line.302"></a>
+<span class="sourceLineNo">303</span> tableDeleted = !(procEx instanceof TableExistsException);<a name="line.303"></a>
+<span class="sourceLineNo">304</span> } else {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> // the operation failed because the table does not exist<a name="line.305"></a>
+<span class="sourceLineNo">306</span> tableDeleted = (procEx instanceof TableNotFoundException);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> }<a name="line.307"></a>
+<span class="sourceLineNo">308</span> } else {<a name="line.308"></a>
+<span class="sourceLineNo">309</span> // the table was deleted<a name="line.309"></a>
+<span class="sourceLineNo">310</span> tableDeleted = (iProcTable.getTableOperationType() == TableOperationType.DELETE);<a name="line.310"></a>
<span class="sourceLineNo">311</span> }<a name="line.311"></a>
-<span class="sourceLineNo">312</span> } else if (proc instanceof PeerProcedureInterface) {<a name="line.312"></a>
-<span class="sourceLineNo">313</span> PeerProcedureInterface iProcPeer = (PeerProcedureInterface) proc;<a name="line.313"></a>
-<span class="sourceLineNo">314</span> tryCleanupPeerQueue(iProcPeer.getPeerId(), proc);<a name="line.314"></a>
-<span class="sourceLineNo">315</span> } else {<a name="line.315"></a>
-<span class="sourceLineNo">316</span> // No cleanup for ServerProcedureInterface types, yet.<a name="line.316"></a>
-<span class="sourceLineNo">317</span> return;<a name="line.317"></a>
-<span class="sourceLineNo">318</span> }<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> private static <T extends Comparable<T>> void addToRunQueue(FairQueue<T> fairq, Queue<T> queue) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span> if (!AvlIterableList.isLinked(queue) && !queue.isEmpty()) {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> fairq.add(queue);<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><a name="line.326"></a>
-<span class="sourceLineNo">327</span> private static <T extends Comparable<T>> void removeFromRunQueue(<a name="line.327"></a>
-<span class="sourceLineNo">328</span> FairQueue<T> fairq, Queue<T> queue) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> if (AvlIterableList.isLinked(queue)) {<a name="line.329"></a>
-<span class="sourceLineNo">330</span> fairq.remove(queue);<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> // Table Queue Lookup Helpers<a name="line.335"></a>
-<span class="sourceLineNo">336</span> // ============================================================================<a name="line.336"></a>
-<span class="sourceLineNo">337</span> private TableQueue getTableQueue(TableName tableName) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span> TableQueue node = AvlTree.get(tableMap, tableName, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.338"></a>
-<span class="sourceLineNo">339</span> if (node != null) return node;<a name="line.339"></a>
-<span class="sourceLineNo">340</span><a name="line.340"></a>
-<span class="sourceLineNo">341</span> node = new TableQueue(tableName, MasterProcedureUtil.getTablePriority(tableName),<a name="line.341"></a>
-<span class="sourceLineNo">342</span> locking.getTableLock(tableName), locking.getNamespaceLock(tableName.getNamespaceAsString()));<a name="line.342"></a>
-<span class="sourceLineNo">343</span> tableMap = AvlTree.insert(tableMap, node);<a name="line.343"></a>
-<span class="sourceLineNo">344</span> return node;<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> private void removeTableQueue(TableName tableName) {<a name="line.347"></a>
-<span class="sourceLineNo">348</span> tableMap = AvlTree.remove(tableMap, tableName, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.348"></a>
-<span class="sourceLineNo">349</span> locking.removeTableLock(tableName);<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> private static boolean isTableProcedure(Procedure<?> proc) {<a name="line.352"></a>
-<span class="sourceLineNo">353</span> return proc instanceof TableProcedureInterface;<a name="line.353"></a>
+<span class="sourceLineNo">312</span> if (tableDeleted) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span> markTableAsDeleted(iProcTable.getTableName(), proc);<a name="line.313"></a>
+<span class="sourceLineNo">314</span> return;<a name="line.314"></a>
+<span class="sourceLineNo">315</span> }<a name="line.315"></a>
+<span class="sourceLineNo">316</span> } else if (proc instanceof PeerProcedureInterface) {<a name="line.316"></a>
+<span class="sourceLineNo">317</span> PeerProcedureInterface iProcPeer = (PeerProcedureInterface) proc;<a name="line.317"></a>
+<span class="sourceLineNo">318</span> tryCleanupPeerQueue(iProcPeer.getPeerId(), proc);<a name="line.318"></a>
+<span class="sourceLineNo">319</span> } else {<a name="line.319"></a>
+<span class="sourceLineNo">320</span> // No cleanup for ServerProcedureInterface types, yet.<a name="line.320"></a>
+<span class="sourceLineNo">321</span> return;<a name="line.321"></a>
+<span class="sourceLineNo">322</span> }<a name="line.322"></a>
+<span class="sourceLineNo">323</span> }<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span> private static <T extends Comparable<T>> void addToRunQueue(FairQueue<T> fairq, Queue<T> queue) {<a name="line.325"></a>
+<span class="sourceLineNo">326</span> if (!AvlIterableList.isLinked(queue) && !queue.isEmpty()) {<a name="line.326"></a>
+<span class="sourceLineNo">327</span> fairq.add(queue);<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><a name="line.330"></a>
+<span class="sourceLineNo">331</span> private static <T extends Comparable<T>> void removeFromRunQueue(<a name="line.331"></a>
+<span class="sourceLineNo">332</span> FairQueue<T> fairq, Queue<T> queue) {<a name="line.332"></a>
+<span class="sourceLineNo">333</span> if (AvlIterableList.isLinked(queue)) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span> fairq.remove(queue);<a name="line.334"></a>
+<span class="sourceLineNo">335</span> }<a name="line.335"></a>
+<span class="sourceLineNo">336</span> }<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span> // ============================================================================<a name="line.338"></a>
+<span class="sourceLineNo">339</span> // Table Queue Lookup Helpers<a name="line.339"></a>
+<span class="sourceLineNo">340</span> // ============================================================================<a name="line.340"></a>
+<span class="sourceLineNo">341</span> private TableQueue getTableQueue(TableName tableName) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span> TableQueue node = AvlTree.get(tableMap, tableName, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.342"></a>
+<span class="sourceLineNo">343</span> if (node != null) return node;<a name="line.343"></a>
+<span class="sourceLineNo">344</span><a name="line.344"></a>
+<span class="sourceLineNo">345</span> node = new TableQueue(tableName, MasterProcedureUtil.getTablePriority(tableName),<a name="line.345"></a>
+<span class="sourceLineNo">346</span> locking.getTableLock(tableName), locking.getNamespaceLock(tableName.getNamespaceAsString()));<a name="line.346"></a>
+<span class="sourceLineNo">347</span> tableMap = AvlTree.insert(tableMap, node);<a name="line.347"></a>
+<span class="sourceLineNo">348</span> return node;<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> private void removeTableQueue(TableName tableName) {<a name="line.351"></a>
+<span class="sourceLineNo">352</span> tableMap = AvlTree.remove(tableMap, tableName, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.352"></a>
+<span class="sourceLineNo">353</span> locking.removeTableLock(tableName);<a name="line.353"></a>
<span class="sourceLineNo">354</span> }<a name="line.354"></a>
<span class="sourceLineNo">355</span><a name="line.355"></a>
-<span class="sourceLineNo">356</span> private static TableName getTableName(Procedure<?> proc) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span> return ((TableProcedureInterface)proc).getTableName();<a name="line.357"></a>
+<span class="sourceLineNo">356</span> private static boolean isTableProcedure(Procedure<?> proc) {<a name="line.356"></a>
+<span class="sourceLineNo">357</span> return proc instanceof TableProcedureInterface;<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> // ============================================================================<a name="line.360"></a>
-<span class="sourceLineNo">361</span> // Server Queue Lookup Helpers<a name="line.361"></a>
-<span class="sourceLineNo">362</span> // ============================================================================<a name="line.362"></a>
-<span class="sourceLineNo">363</span> private ServerQueue getServerQueue(ServerName serverName) {<a name="line.363"></a>
-<span class="sourceLineNo">364</span> final int index = getBucketIndex(serverBuckets, serverName.hashCode());<a name="line.364"></a>
-<span class="sourceLineNo">365</span> ServerQueue node = AvlTree.get(serverBuckets[index], serverName, SERVER_QUEUE_KEY_COMPARATOR);<a name="line.365"></a>
-<span class="sourceLineNo">366</span> if (node != null) return node;<a name="line.366"></a>
-<span class="sourceLineNo">367</span><a name="line.367"></a>
-<span class="sourceLineNo">368</span> node = new ServerQueue(serverName, locking.getServerLock(serverName));<a name="line.368"></a>
-<span class="sourceLineNo">369</span> serverBuckets[index] = AvlTree.insert(serverBuckets[index], node);<a name="line.369"></a>
-<span class="sourceLineNo">370</span> return node;<a name="line.370"></a>
-<span class="sourceLineNo">371</span> }<a name="line.371"></a>
-<span class="sourceLineNo">372</span><a name="line.372"></a>
-<span class="sourceLineNo">373</span> private static int getBucketIndex(Object[] buckets, int hashCode) {<a name="line.373"></a>
-<span class="sourceLineNo">374</span> return Math.abs(hashCode) % buckets.length;<a name="line.374"></a>
+<span class="sourceLineNo">360</span> private static TableName getTableName(Procedure<?> proc) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span> return ((TableProcedureInterface)proc).getTableName();<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> // Server Queue Lookup Helpers<a name="line.365"></a>
+<span class="sourceLineNo">366</span> // ============================================================================<a name="line.366"></a>
+<span class="sourceLineNo">367</span> private ServerQueue getServerQueue(ServerName serverName) {<a name="line.367"></a>
+<span class="sourceLineNo">368</span> final int index = getBucketIndex(serverBuckets, serverName.hashCode());<a name="line.368"></a>
+<span class="sourceLineNo">369</span> ServerQueue node = AvlTree.get(serverBuckets[index], serverName, SERVER_QUEUE_KEY_COMPARATOR);<a name="line.369"></a>
+<span class="sourceLineNo">370</span> if (node != null) return node;<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span> node = new ServerQueue(serverName, locking.getServerLock(serverName));<a name="line.372"></a>
+<span class="sourceLineNo">373</span> serverBuckets[index] = AvlTree.insert(serverBuckets[index], node);<a name="line.373"></a>
+<span class="sourceLineNo">374</span> return node;<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> private static boolean isServerProcedure(Procedure<?> proc) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span> return proc instanceof ServerProcedureInterface;<a name="line.378"></a>
+<span class="sourceLineNo">377</span> private static int getBucketIndex(Object[] buckets, int hashCode) {<a name="line.377"></a>
+<span class="sourceLineNo">378</span> return Math.abs(hashCode) % buckets.length;<a name="line.378"></a>
<span class="sourceLineNo">379</span> }<a name="line.379"></a>
<span class="sourceLineNo">380</span><a name="line.380"></a>
-<span class="sourceLineNo">381</span> private static ServerName getServerName(Procedure<?> proc) {<a name="line.381"></a>
-<span class="sourceLineNo">382</span> return ((ServerProcedureInterface)proc).getServerName();<a name="line.382"></a>
+<span class="sourceLineNo">381</span> private static boolean isServerProcedure(Procedure<?> proc) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span> return proc instanceof ServerProcedureInterface;<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> // Peer Queue Lookup Helpers<a name="line.386"></a>
-<span class="sourceLineNo">387</span> // ============================================================================<a name="line.387"></a>
-<span class="sourceLineNo">388</span> private PeerQueue getPeerQueue(String peerId) {<a name="line.388"></a>
-<span class="sourceLineNo">389</span> PeerQueue node = AvlTree.get(peerMap, peerId, PEER_QUEUE_KEY_COMPARATOR);<a name="line.389"></a>
-<span class="sourceLineNo">390</span> if (node != null) {<a name="line.390"></a>
-<span class="sourceLineNo">391</span> return node;<a name="line.391"></a>
-<span class="sourceLineNo">392</span> }<a name="line.392"></a>
-<span class="sourceLineNo">393</span> node = new PeerQueue(peerId, locking.getPeerLock(peerId));<a name="line.393"></a>
-<span class="sourceLineNo">394</span> peerMap = AvlTree.insert(peerMap, node);<a name="line.394"></a>
-<span class="sourceLineNo">395</span> return node;<a name="line.395"></a>
-<span class="sourceLineNo">396</span> }<a name="line.396"></a>
-<span class="sourceLineNo">397</span><a name="line.397"></a>
-<span class="sourceLineNo">398</span> private void removePeerQueue(String peerId) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span> peerMap = AvlTree.remove(peerMap, peerId, PEER_QUEUE_KEY_COMPARATOR);<a name="line.399"></a>
-<span class="sourceLineNo">400</span> locking.removePeerLock(peerId);<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">403</span> private void tryCleanupPeerQueue(String peerId, Procedure<?> procedure) {<a name="line.403"></a>
-<span class="sourceLineNo">404</span> schedLock();<a name="line.404"></a>
-<span class="sourceLineNo">405</span> try {<a name="line.405"></a>
-<span class="sourceLineNo">406</span> PeerQueue queue = AvlTree.get(peerMap, peerId, PEER_QUEUE_KEY_COMPARATOR);<a name="line.406"></a>
-<span class="sourceLineNo">407</span> if (queue == null) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span> return;<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> final LockAndQueue lock = locking.getPeerLock(peerId);<a name="line.411"></a>
-<span class="sourceLineNo">412</span> if (queue.isEmpty() && lock.tryExclusiveLock(procedure)) {<a name="line.412"></a>
-<span class="sourceLineNo">413</span> removeFromRunQueue(peerRunQueue, queue);<a name="line.413"></a>
-<span class="sourceLineNo">414</span> removePeerQueue(peerId);<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span> } finally {<a name="line.416"></a>
-<span class="sourceLineNo">417</span> schedUnlock();<a name="line.417"></a>
-<span class="sourceLineNo">418</span> }<a name="line.418"></a>
-<span class="sourceLineNo">419</span> }<a name="line.419"></a>
-<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span> private static boolean isPeerProcedure(Procedure<?> proc) {<a name="line.421"></a>
-<span class="sourceLineNo">422</span> return proc instanceof PeerProcedureInterface;<a name="line.422"></a>
+<span class="sourceLineNo">385</span> private static ServerName getServerName(Procedure<?> proc) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> return ((ServerProcedureInterface)proc).getServerName();<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> // Peer Queue Lookup Helpers<a name="line.390"></a>
+<span class="sourceLineNo">391</span> // ============================================================================<a name="line.391"></a>
+<span class="sourceLineNo">392</span> private PeerQueue getPeerQueue(String peerId) {<a name="line.392"></a>
+<span class="sourceLineNo">393</span> PeerQueue node = AvlTree.get(peerMap, peerId, PEER_QUEUE_KEY_COMPARATOR);<a name="line.393"></a>
+<span class="sourceLineNo">394</span> if (node != null) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span> return node;<a name="line.395"></a>
+<span class="sourceLineNo">396</span> }<a name="line.396"></a>
+<span class="sourceLineNo">397</span> node = new PeerQueue(peerId, locking.getPeerLock(peerId));<a name="line.397"></a>
+<span class="sourceLineNo">398</span> peerMap = AvlTree.insert(peerMap, node);<a name="line.398"></a>
+<span class="sourceLineNo">399</span> return node;<a name="line.399"></a>
+<span class="sourceLineNo">400</span> }<a name="line.400"></a>
+<span class="sourceLineNo">401</span><a name="line.401"></a>
+<span class="sourceLineNo">402</span> private void removePeerQueue(String peerId) {<a name="line.402"></a>
+<span class="sourceLineNo">403</span> peerMap = AvlTree.remove(peerMap, peerId, PEER_QUEUE_KEY_COMPARATOR);<a name="line.403"></a>
+<span class="sourceLineNo">404</span> locking.removePeerLock(peerId);<a name="line.404"></a>
+<span class="sourceLineNo">405</span> }<a name="line.405"></a>
+<span class="sourceLineNo">406</span><a name="line.406"></a>
+<span class="sourceLineNo">407</span> private void tryCleanupPeerQueue(String peerId, Procedure<?> procedure) {<a name="line.407"></a>
+<span class="sourceLineNo">408</span> schedLock();<a name="line.408"></a>
+<span class="sourceLineNo">409</span> try {<a name="line.409"></a>
+<span class="sourceLineNo">410</span> PeerQueue queue = AvlTree.get(peerMap, peerId, PEER_QUEUE_KEY_COMPARATOR);<a name="line.410"></a>
+<span class="sourceLineNo">411</span> if (queue == null) {<a name="line.411"></a>
+<span class="sourceLineNo">412</span> return;<a name="line.412"></a>
+<span class="sourceLineNo">413</span> }<a name="line.413"></a>
+<span class="sourceLineNo">414</span><a name="line.414"></a>
+<span class="sourceLineNo">415</span> final LockAndQueue lock = locking.getPeerLock(peerId);<a name="line.415"></a>
+<span class="sourceLineNo">416</span> if (queue.isEmpty() && lock.tryExclusiveLock(procedure)) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span> removeFromRunQueue(peerRunQueue, queue);<a name="line.417"></a>
+<span class="sourceLineNo">418</span> removePeerQueue(peerId);<a name="line.418"></a>
+<span class="sourceLineNo">419</span> }<a name="line.419"></a>
+<span class="sourceLineNo">420</span> } finally {<a name="line.420"></a>
+<span class="sourceLineNo">421</span> schedUnlock();<a name="line.421"></a>
+<span class="sourceLineNo">422</span> }<a name="line.422"></a>
<span class="sourceLineNo">423</span> }<a name="line.423"></a>
<span class="sourceLineNo">424</span><a name="line.424"></a>
-<span class="sourceLineNo">425</span> private static String getPeerId(Procedure<?> proc) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> return ((PeerProcedureInterface) proc).getPeerId();<a name="line.426"></a>
+<span class="sourceLineNo">425</span> private static boolean isPeerProcedure(Procedure<?> proc) {<a name="line.425"></a>
+<span class="sourceLineNo">426</span> return proc instanceof PeerProcedureInterface;<a name="line.426"></a>
<span class="sourceLineNo">427</span> }<a name="line.427"></a>
<span class="sourceLineNo">428</span><a name="line.428"></a>
-<span class="sourceLineNo">429</span> // ============================================================================<a name="line.429"></a>
-<span class="sourceLineNo">430</span> // Table Locking Helpers<a name="line.430"></a>
-<span class="sourceLineNo">431</span> // ============================================================================<a name="line.431"></a>
-<span class="sourceLineNo">432</span> /**<a name="line.432"></a>
-<span class="sourceLineNo">433</span> * Get lock info for a resource of specified type and name and log details<a name="line.433"></a>
-<span class="sourceLineNo">434</span> */<a name="line.434"></a>
-<span class="sourceLineNo">435</span> private void logLockedResource(LockedResourceType resourceType, String resourceName) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> if (!LOG.isDebugEnabled()) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> return;<a name="line.437"></a>
-<span class="sourceLineNo">438</span> }<a name="line.438"></a>
-<span class="sourceLineNo">439</span><a name="line.439"></a>
-<span class="sourceLineNo">440</span> LockedResource lockedResource = getLockResource(resourceType, resourceName);<a name="line.440"></a>
-<span class="sourceLineNo">441</span> if (lockedResource != null) {<a name="line.441"></a>
-<span class="sourceLineNo">442</span> String msg = resourceType.toString() + " '" + resourceName + "', shared lock count=" +<a name="line.442"></a>
-<span class="sourceLineNo">443</span> lockedResource.getSharedLockCount();<a name="line.443"></a>
-<span class="sourceLineNo">444</span><a name="line.444"></a>
-<span class="sourceLineNo">445</span> Procedure<?> proc = lockedResource.getExclusiveLockOwnerProcedure();<a name="line.445"></a>
-<span class="sourceLineNo">446</span> if (proc != null) {<a name="line.446"></a>
-<span class="sourceLineNo">447</span> msg += ", exclusively locked by procId=" + proc.getProcId();<a name="line.447"></a>
-<span class="sourceLineNo">448</span> }<a name="line.448"></a>
-<span class="sourceLineNo">449</span> LOG.debug(msg);<a name="line.449"></a>
-<span class="sourceLineNo">450</span> }<a name="line.450"></a>
-<span class="sourceLineNo">451</span> }<a name="line.451"></a>
-<span class="sourceLineNo">452</span><a name="line.452"></a>
-<span class="sourceLineNo">453</span> /**<a name="line.453"></a>
-<span class="sourceLineNo">454</span> * Suspend the procedure if the specified table is already locked.<a name="line.454"></a>
-<span class="sourceLineNo">455</span> * Other operations in the table-queue will be executed after the lock is released.<a name="line.455"></a>
-<span class="sourceLineNo">456</span> * @param procedure the procedure trying to acquire the lock<a name="line.456"></a>
-<span class="sourceLineNo">457</span> * @param table Table to lock<a name="line.457"></a>
-<span class="sourceLineNo">458</span> * @return true if the procedure has to wait for the table to be available<a name="line.458"></a>
-<span class="sourceLineNo">459</span> */<a name="line.459"></a>
-<span class="sourceLineNo">460</span> public boolean waitTableExclusiveLock(final Procedure procedure, final TableName table) {<a name="line.460"></a>
-<span class="sourceLineNo">461</span> schedLock();<a name="line.461"></a>
-<span class="sourceLineNo">462</span> try {<a name="line.462"></a>
-<span class="sourceLineNo">463</span> final String namespace = table.getNamespaceAsString();<a name="line.463"></a>
-<span class="sourceLineNo">464</span> final LockAndQueue namespaceLock = locking.getNamespaceLock(namespace);<a name="line.464"></a>
-<span class="sourceLineNo">465</span> final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.465"></a>
-<span class="sourceLineNo">466</span> if (!namespaceLock.trySharedLock()) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> waitProcedure(namespaceLock, procedure);<a name="line.467"></a>
-<span class="sourceLineNo">468</span> logLockedResource(LockedResourceType.NAMESPACE, namespace);<a name="line.468"></a>
-<span class="sourceLineNo">469</span> return true;<a name="line.469"></a>
-<span class="sourceLineNo">470</span> }<a name="line.470"></a>
-<span class="sourceLineNo">471</span> if (!tableLock.tryExclusiveLock(procedure)) {<a name="line.471"></a>
-<span class="sourceLineNo">472</span> namespaceLock.releaseSharedLock();<a name="line.472"></a>
-<span class="sourceLineNo">473</span> waitProcedure(tableLock, procedure);<a name="line.473"></a>
-<span class="sourceLineNo">474</span> logLockedResource(LockedResourceType.TABLE, table.getNameAsString());<a name="line.474"></a>
-<span class="sourceLineNo">475</span> return true;<a name="line.475"></a>
-<span class="sourceLineNo">476</span> }<a name="line.476"></a>
-<span class="sourceLineNo">477</span> removeFromRunQueue(tableRunQueue, getTableQueue(table));<a name="line.477"></a>
-<span class="sourceLineNo">478</span> return false;<a name="line.478"></a>
-<span class="sourceLineNo">479</span> } finally {<a name="line.479"></a>
-<span class="sourceLineNo">480</span> schedUnlock();<a name="line.480"></a>
-<span class="sourceLineNo">481</span> }<a name="line.481"></a>
-<span class="sourceLineNo">482</span> }<a name="line.482"></a>
-<span class="sourceLineNo">483</span><a name="line.483"></a>
-<span class="sourceLineNo">484</span> /**<a name="line.484"></a>
-<span class="sourceLineNo">485</span> * Wake the procedures waiting for the specified table<a name="line.485"></a>
-<span class="sourceLineNo">486</span> * @param procedure the procedure releasing the lock<a name="line.486"></a>
-<span class="sourceLineNo">487</span> * @param table the name of the table that has the exclusive lock<a name="line.487"></a>
-<span class="sourceLineNo">488</span> */<a name="line.488"></a>
-<span class="sourceLineNo">489</span> public void wakeTableExclusiveLock(final Procedure procedure, final TableName table) {<a name="line.489"></a>
-<span class="sourceLineNo">490</span> schedLock();<a name="line.490"></a>
-<span class="sourceLineNo">491</span> try {<a name="line.491"></a>
-<span class="sourceLineNo">492</span> final LockAndQueue namespaceLock = locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.492"></a>
-<span class="sourceLineNo">493</span> final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.493"></a>
-<span class="sourceLineNo">494</span> int waitingCount = 0;<a name="line.494"></a>
-<span class="sourceLineNo">495</span><a name="line.495"></a>
-<span class="sourceLineNo">496</span> if (!tableLock.hasParentLock(procedure)) {<a name="line.496"></a>
-<span class="sourceLineNo">497</span> tableLock.releaseExclusiveLock(procedure);<a name="line.497"></a>
-<span class="sourceLineNo">498</span> waitingCount += wakeWaitingProcedures(tableLock);<a name="line.498"></a>
-<span class="sourceLineNo">499</span> }<a name="line.499"></a>
-<span class="sourceLineNo">500</span> if (namespaceLock.releaseSharedLock()) {<a name="line.500"></a>
-<span class="sourceLineNo">501</span> waitingCount += wakeWaitingProcedures(namespaceLock);<a name="line.501"></a>
-<span class="sourceLineNo">502</span> }<a name="line.502"></a>
-<span class="sourceLineNo">503</span> addToRunQueue(tableRunQueue, getTableQueue(table));<a name="line.503"></a>
-<span class="sourceLineNo">504</span> wakePollIfNeeded(waitingCount);<a name="line.504"></a>
-<span class="sourceLineNo">505</span> } finally {<a name="line.505"></a>
-<span class="sourceLineNo">506</span> schedUnlock();<a name="line.506"></a>
-<span class="sourceLineNo">507</span> }<a name="line.507"></a>
-<span class="sourceLineNo">508</span> }<a name="line.508"></a>
-<span class="sourceLineNo">509</span><a name="line.509"></a>
-<span class="sourceLineNo">510</span> /**<a name="line.510"></a>
-<span class="sourceLineNo">511</span> * Suspend the procedure if the specified table is already locked.<a name="line.511"></a>
-<span class="sourceLineNo">512</span> * other "read" operations in the table-queue may be executed concurrently,<a name="line.512"></a>
-<span class="sourceLineNo">513</span> * @param procedure the procedure trying to acquire the lock<a name="line.513"></a>
-<span class="sourceLineNo">514</span> * @param table Table to lock<a name="line.514"></a>
-<span class="sourceLineNo">515</span> * @return true if the procedure has to wait for the table to be available<a name="line.515"></a>
-<span class="sourceLineNo">516</span> */<a name="line.516"></a>
-<span class="sourceLineNo">517</span> public boolean waitTableSharedLock(final Procedure procedure, final TableName table) {<a name="line.517"></a>
-<span class="sourceLineNo">518</span> return waitTableQueueSharedLock(procedure, table) == null;<a name="line.518"></a>
-<span class="sourceLineNo">519</span> }<a name="line.519"></a>
-<span class="sourceLineNo">520</span><a name="line.520"></a>
-<span class="sourceLineNo">521</span> private TableQueue waitTableQueueSharedLock(final Procedure<?> procedure, final TableName table) {<a name="line.521"></a>
-<span class="sourceLineNo">522</span> schedLock();<a name="line.522"></a>
-<span class="sourceLineNo">523</span> try {<a name="line.523"></a>
-<span class="sourceLineNo">524</span> final LockAndQueue namespaceLock = locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.524"></a>
-<span class="sourceLineNo">525</span> final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.525"></a>
-<span class="sourceLineNo">526</span> if (!namespaceLock.trySharedLock()) {<a name="line.526"></a>
-<span class="sourceLineNo">527</span> waitProcedure(namespaceLock, procedure);<a name="line.527"></a>
-<span class="sourceLineNo">528</span> return null;<a name="line.528"></a>
-<span class="sourceLineNo">529</span> }<a name="line.529"></a>
-<span class="sourceLineNo">530</span><a name="line.530"></a>
-<span class="sourceLineNo">531</span> if (!tableLock.trySharedLock()) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span> namespaceLock.releaseSharedLock();<a name="line.532"></a>
-<span class="sourceLineNo">533</span> waitProcedure(tableLock, procedure);<a name="line.533"></a>
-<span class="sourceLineNo">534</span> return null;<a name="line.534"></a>
-<span class="sourceLineNo">535</span> }<a name="line.535"></a>
-<span class="sourceLineNo">536</span><a name="line.536"></a>
-<span class="sourceLineNo">537</span> return getTableQueue(table);<a name="line.537"></a>
-<span class="sourceLineNo">538</span> } finally {<a name="line.538"></a>
-<span class="sourceLineNo">539</span> schedUnlock();<a name="line.539"></a>
-<span class="sourceLineNo">540</span> }<a name="line.540"></a>
-<span class="sourceLineNo">541</span> }<a name="line.541"></a>
-<span class="sourceLineNo">542</span><a name="line.542"></a>
-<span class="sourceLineNo">543</span> /**<a name="line.543"></a>
-<span class="sourceLineNo">544</span> * Wake the procedures waiting for the specified table<a name="line.544"></a>
-<span class="sourceLineNo">545</span> * @param procedure the procedure releasing the lock<a name="line.545"></a>
-<span class="sourceLineNo">546</span> * @param table the name of the table that has the shared lock<a name="line.546"></a>
-<span class="sourceLineNo">547</span> */<a name="line.547"></a>
-<span class="sourceLineNo">548</span> public void wakeTableSharedLock(final Procedure procedure, final TableName table) {<a name="line.548"></a>
-<span class="sourceLineNo">549</span> schedLock();<a name="line.549"></a>
-<span class="sourceLineNo">550</span> try {<a name="line.550"></a>
-<span class="sourceLineNo">551</span> final LockAndQueue namespaceLock = locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.551"></a>
-<span class="sourceLineNo">552</span> final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.552"></a>
-<span class="sourceLineNo">553</span> int waitingCount = 0;<a name="line.553"></a>
-<span class="sourceLineNo">554</span> if (tableLock.releaseSharedLock()) {<a name="line.554"></a>
-<span class="sourceLineNo">555</span> addToRunQueue(tableRunQueue, getTableQueue(table));<a name="line.555"></a>
-<span class="sourceLineNo">556</span> waitingCount += wakeWaitingProcedures(tableLock);<a name="line.556"></a>
-<span class="sourceLineNo">557</span> }<a name="line.557"></a>
-<span class="sourceLineNo">558</span> if (namespaceLock.releaseSharedLock()) {<a name="line.558"></a>
-<span class="sourceLineNo">559</span> waitingCount += wakeWaitingProcedures(namespaceLock);<a name="line.559"></a>
-<span class="sourceLineNo">560</span> }<a name="line.560"></a>
-<span class="sourceLineNo">561</span> wakePollIfNeeded(waitingCount);<a name="line.561"></a>
-<span class="sourceLineNo">562</span> } finally {<a name="line.562"></a>
-<span class="sourceLineNo">563</span> schedUnlock();<a name="line.563"></a>
-<span class="sourceLineNo">564</span> }<a name="line.564"></a>
-<span class="sourceLineNo">565</span> }<a name="line.565"></a>
-<span class="sourceLineNo">566</span><a name="line.566"></a>
-<span class="sourceLineNo">567</span> /**<a name="line.567"></a>
-<span class="sourceLineNo">568</span> * Tries to remove the queue and the table-lock of the specified table.<a name="line.568"></a>
-<span class="sourceLineNo">569</span> * If there are new operations pending (e.g. a new create),<a name="line.569"></a>
-<span class="sourceLineNo">570</span> * the remove will not be performed.<a name="line.570"></a>
-<span class="sourceLineNo">571</span> * @param table the name of the table that should be marked as deleted<a name="line.571"></a>
-<span class="sourceLineNo">572</span> * @param procedure the procedure that is removing the table<a name="line.572"></a>
-<span class="sourceLineNo">573</span> * @return true if deletion succeeded, false otherwise meaning that there are<a name="line.573"></a>
-<span class="sourceLineNo">574</span> * other new operations pending for that table (e.g. a new create).<a name="line.574"></a>
-<span class="sourceLineNo">575</span> */<a name="line.575"></a>
-<span class="sourceLineNo">576</span> @VisibleForTesting<a name="line.576"></a>
-<span class="sourceLineNo">577</span> boolean markTableAsDeleted(final TableName table, final Procedure<?> procedure) {<a name="line.577"></a>
-<span class="sourceLineNo">578</span> schedLock();<a name="line.578"></a>
-<span class="sourceLineNo">579</span> try {<a name="line.579"></a>
-<span class="sourceLineNo">580</span> final TableQueue queue = getTableQueue(table);<a name="line.580"></a>
-<span class="sourceLineNo">581</span> final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.581"></a>
-<span class="sourceLineNo">582</span> if (queue == null) return true;<a name="line.582"></a>
-<span class="sourceLineNo">583</span><a name="line.583"></a>
-<span class="sourceLineNo">584</span> if (queue.isEmpty() && tableLock.tryExclusiveLock(procedure)) {<a name="line.584"></a>
-<span class="sourceLineNo">585</span> // remove the table from the run-queue and the map<a name="line.585"></a>
-<span class="sourceLineNo">586</span> if (AvlIterableList.isLinked(queue)) {<a name="line.586"></a>
-<span class="sourceLineNo">587</span> tableRunQueue.remove(queue);<a name="line.587"></a>
-<span class="sourceLineNo">588</span> }<a name="line.588"></a>
-<span class="sourceLineNo">589</span> removeTableQueue(table);<a name="line.589"></a>
-<span class="sourceLineNo">590</span> } else {<a name="line.590"></a>
-<span class="sourceLineNo">591</span> // TODO: If there are no create, we can drop all the other ops<a name="line.591"></a>
-<span class="sourceLineNo">592</span> return false;<a name="line.592"></a>
-<span class="sourceLineNo">593</span> }<a name="line.593"></a>
-<span class="sourceLineNo">594</span> } finally {<a name="line.594"></a>
-<span class="sourceLineNo">595</span> schedUnlock();<a name="line.595"></a>
-<span class="sourceLineNo">596</span> }<a name="line.596"></a>
-<span class="sourceLineNo">597</span> return true;<a name="line.597"></a>
-<span class="sourceLineNo">598</span> }<a name="line.598"></a>
-<span class="sourceLineNo">599</span><a name="line.599"></a>
-<span class="sourceLineNo">600</span> // ============================================================================<a name="line.600"></a>
-<span class="sourceLineNo">601</span> // Region Locking Helpers<a name="line.601"></a>
-<span class="sourceLineNo">602</span> // ============================================================================<a name="line.602"></a>
-<span class="sourceLineNo">603</span> /**<a name="line.603"></a>
-<span class="sourceLineNo">604</span> * Suspend the procedure if the specified region is already locked.<a name="line.604"></a>
-<span class="sourceLineNo">605</span> * @param procedure the procedure trying to acquire the lock on the region<a name="line.605"></a>
-<span class="sourceLineNo">606</span> * @param regionInfo the region we are trying to lock<a name="line.606"></a>
-<span class="sourceLineNo">607</span> * @return true if the procedure has to wait for the regions to be available<a name="line.607"></a>
-<span class="sourceLineNo">608</span> */<a name="line.608"></a>
-<span class="sourceLineNo">609</span> public boolean waitRegion(final Procedure procedure, final RegionInfo regionInfo) {<a name="line.609"></a>
-<span class="sourceLineNo">610</span> return waitRegions(procedure, regionInfo.getTable(), regionInfo);<a name="line.610"></a>
-<span class="sourceLineNo">611</span> }<a name="line.611"></a>
-<span class="sourceLineNo">612</span><a name="line.612"></a>
-<span class="sourceLineNo">613</span> /**<a name="line.613"></a>
-<span class="sourceLineNo">614</span> * Suspend the procedure if the specified set of regions are already locked.<a name="line.614"></a>
-<span class="sourceLineNo">615</span> * @param procedure the procedure trying to acquire the lock on the regions<a name="line.615"></a>
-<span class="sourceLineNo">616</span> * @param table the table name of the regions we are trying to lock<a name="line.616"></a>
-<span class="sourceLineNo">617</span> * @param regionInfo the list of regions we are trying to lock<a name="line.617"></a>
-<span class="sourceLineNo">618</span> * @return true if the procedure has to wait for the regions to be available<a name="line.618"></a>
-<span class="sourceLineNo">619</span> */<a name="line.619"></a>
-<span class="sourceLineNo">620</span> public boolean waitRegions(final Procedure procedure, final TableName table,<a name="line.620"></a>
-<span class="sourceLineNo">621</span> final RegionInfo... regionInfo) {<a name="line.621"></a>
-<span class="sourceLineNo">622</span> Arrays.sort(regionInfo, RegionInfo.COMPARATOR);<a name="line.622"></a>
-<span class="sourceLineNo">623</span> schedLock();<a name="line.623"></a>
-<span class="sourceLineNo">624</span> try {<a name="line.624"></a>
-<span class="sourceLineNo">625</span> // If there is parent procedure, it would have already taken xlock, so no need to take<a name="line.625"></a>
-<span class="sourceLineNo">626</span> // shared lock here. Otherwise, take shared lock.<a name="line.626"></a>
-<span class="sourceLineNo">627</span> if (!procedure.hasParent()<a name="line.627"></a>
-<span class="sourceLineNo">628</span> && waitTableQueueSharedLock(procedure, table) == null) {<a name="line.628"></a>
-<span class="sourceLineNo">629</span> return true;<a name="line.629"></a>
-<span class="sourceLineNo">630</span> }<a name="line.630"></a>
-<span class="sourceLineNo">631</span><a name="line.631"></a>
-<span class="sourceLineNo">632</span> // acquire region xlocks or wait<a name="line.632"></a>
-<span class="sourceLineNo">633</span> boolean hasLock = true;<a name="line.633"></a>
-<span class="sourceLineNo">634</span> final LockAndQueue[] regionLocks = new LockAndQueue[regionInfo.length];<a name="line.634"></a>
-<span class="sourceLineNo">635</span> for (int i = 0; i < regionInfo.length; ++i) {<a name="line.635"></a>
-<span class="sourceLineNo">636</span> LOG.info("{} checking lock on {}", procedure, regionInfo[i].getEncodedName());<a name="line.636"></a>
-<span class="sourceLineNo">637</span> assert table != null;<a name="line.637"></a>
-<span class="sourceLineNo">638</span> assert regionInfo[i] != null;<a name="line.638"></a>
-<span class="sourceLineNo">639</span> assert regionInfo[i].getTable() != null;<a name="line.639"></a>
-<span class="sourceLineNo">640</span> assert regionInfo[i].getTable().equals(table): regionInfo[i] + " " + procedure;<a name="line.640"></a>
-<span class="sourceLineNo">641</span> assert i == 0 || regionInfo[i] != regionInfo[i - 1] : "duplicate region: " + regionInfo[i];<a name="line.641"></a>
-<span class="sourceLineNo">642</span><a name="line.642"></a>
-<span class="sourceLineNo">643</span> regionLocks[i] = locking.getRegionLock(regionInfo[i].getEncodedName());<a name="line.643"></a>
-<span class="sourceLineNo">644</span> if (!regionLocks[i].tryExclusiveLock(procedure)) {<a name="line.644"></a>
-<span class="sourceLineNo">645</span> waitProcedure(regionLocks[i], procedure);<a name="line.645"></a>
-<span class="sourceLineNo">646</span> hasLock = false;<a name="line.646"></a>
-<span class="sourceLineNo">647</span> while (i-- > 0) {<a name="line.647"></a>
-<span class="sourceLineNo">648</span> regionLocks[i].releaseExclusiveLock(procedure);<a name="line.648"></a>
-<span class="sourceLineNo">649</span> }<a name="line.649"></a>
-<span class="sourceLineNo">650</span> break;<a name="line.650"></a>
-<span class="sourceLineNo">651</span> }<a name="line.651"></a>
-<span class="sourceLineNo">652</span> }<a name="line.652"></a>
-<span class="sourceLineNo">653</span><a name="line.653"></a>
-<span class="sourceLineNo">654</span> if (!hasLock && !procedure.hasParent()) {<a name="line.654"></a>
-<span class="sourceLineNo">655</span> wakeTableSharedLock(procedure, table);<a name="line.655"></a>
+<span class="sourceLineNo">429</span> private static String getPeerId(Procedure<?> proc) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span> return ((PeerProcedureInterface) proc).getPeerId();<a name="line.430"></a>
+<span class="sourceLineNo">431</span> }<a name="line.431"></a>
+<span class="sourceLineNo">432</span><a name="line.432"></a>
+<span class="sourceLineNo">433</span> // ============================================================================<a name="line.433"></a>
+<span class="sourceLineNo">434</span> // Table Locking Helpers<a name="line.434"></a>
+<span class="sourceLineNo">435</span> // ============================================================================<a name="line.435"></a>
+<span class="sourceLineNo">436</span> /**<a name="line.436"></a>
+<span class="sourceLineNo">437</span> * Get lock info for a resource of specified type and name and log details<a name="line.437"></a>
+<span class="sourceLineNo">438</span> */<a name="line.438"></a>
+<span class="sourceLineNo">439</span> private void logLockedResource(LockedResourceType resourceType, String resourceName) {<a name="line.439"></a>
+<span class="sourceLineNo">440</span> if (!LOG.isDebugEnabled()) {<a name="line.440"></a>
+<span class="sourceLineNo">441</span> return;<a name="line.441"></a>
+<span class="sourceLineNo">442</span> }<a name="line.442"></a>
+<span class="sourceLineNo">443</span><a name="line.443"></a>
+<span class="sourceLineNo">444</span> LockedResource lockedResource = getLockResource(resourceType, resourceName);<a name="line.444"></a>
+<span class="sourceLineNo">445</span> if (lockedResource != null) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span> String msg = resourceType.toString() + " '" + resourceName + "', shared lock count=" +<a name="line.446"></a>
+<span class="sourceLineNo">447</span> lockedResource.getSharedLockCount();<a name="line.447"></a>
+<span class="sourceLineNo">448</span><a name="line.448"></a>
+<span class="sourceLineNo">449</span> Procedure<?> proc = lockedResource.getExclusiveLockOwnerProcedure();<a name="line.449"></a>
+<span class="sourceLineNo">450</span> if (proc != null) {<a name="line.450"></a>
+<span class="sourceLineNo">451</span> msg += ", exclusively locked by procId=" + proc.getProcId();<a name="line.451"></a>
+<span class="sourceLineNo">452</span> }<a name="line.452"></a>
+<span class="sourceLineNo">453</span> LOG.debug(msg);<a name="line.453"></a>
+<span class="sourceLineNo">454</span> }<a name="line.454"></a>
+<span class="sourceLineNo">455</span> }<a name="line.455"></a>
+<span class="sourceLineNo">456</span><a name="line.456"></a>
+<span class="sourceLineNo">457</span> /**<a name="line.457"></a>
+<span class="sourceLineNo">458</span> * Suspend the procedure if the specified table is already locked.<a name="line.458"></a>
+<span class="sourceLineNo">459</span> * Other operations in the table-queue will be executed after the lock is released.<a name="line.459"></a>
+<span class="sourceLineNo">460</span> * @param procedure the procedure trying to acquire the lock<a name="line.460"></a>
+<span class="sourceLineNo">461</span> * @param table Table to lock<a name="line.461"></a>
+<span class="sourceLineNo">462</span> * @return true if the procedure has to wait for the table to be available<a name="line.462"></a>
+<span class="sourceLineNo">463</span> */<a name="line.463"></a>
+<span class="sourceLineNo">464</span> public boolean waitTableExclusiveLock(final Procedure procedure, final TableName table) {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> schedLock();<a name="line.465"></a>
+<span class="sourceLineNo">466</span> try {<a name="line.466"></a>
+<span class="sourceLineNo">467</span> final String namespace = table.getNamespaceAsString();<a name="line.467"></a>
+<span class="sourceLineNo">468</span> final LockAndQueue namespaceLock = locking.getNamespaceLock(namespace);<a name="line.468"></a>
+<span class="sourceLineNo">469</span> final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.469"></a>
+<span class="sourceLineNo">470</span> if (!namespaceLock.trySharedLock()) {<a name="line.470"></a>
+<span class="sourceLineNo">471</span> waitProcedure(namespaceLock, procedure);<a name="line.471"></a>
+<span class="sourceLineNo">472</span> logLockedResource(LockedResourceType.NAMESPACE, namespace);<a name="line.472"></a>
+<span class="sourceLineNo">473</span> return true;<a name="line.473"></a>
+<span class="sourceLineNo">474</span> }<a name="line.474"></a>
+<span class="sourceLineNo">475</span> if (!tableLock.tryExclusiveLock(procedure)) {<a name="line.475"></a>
+<span class="sourceLineNo">476</span> namespaceLock.releaseSharedLock();<a name="line.476"></a>
+<span class="sourceLineNo">477</span> waitProcedure(tableLock, procedure);<a name="line.477"></a>
+<span class="sourceLineNo">478</span> logLockedResource(LockedResourceType.TABLE, table.getNameAsString());<a name="line.478"></a>
+<span class="sourceLineNo">479</span> return true;<a name="line.479"></a>
+<span class="sourceLineNo">480</span> }<a name="line.480"></a>
+<span class="sourceLineNo">481</span> removeFromRunQueue(tableRunQueue, getTableQueue(table));<a name="line.481"></a>
+<span class="sourceLineNo">482</span> return false;<a name="line.482"></a>
+<span class="sourceLineNo">483</span> } finally {<a name="line.483"></a>
+<span class="sourceLineNo">484</span> schedUnlock();<a name="line.484"></a>
+<span class="sourceLineNo">485</span> }<a name="line.485"></a>
+<span class="sourceLineNo">486</span> }<a name="line.486"></a>
+<span class="sourceLineNo">487</span><a name="line.487"></a>
+<span class="sourceLineNo">488</span> /**<a name="line.488"></a>
+<span class="sourceLineNo">489</span> * Wake the procedures waiting for the specified table<a name="line.489"></a>
+<span class="sourceLineNo">490</span> * @param procedure the procedure releasing the lock<a name="line.490"></a>
+<span class="sourceLineNo">491</span> * @param table the name of the table that has the exclusive lock<a name="line.491"></a>
+<span class="sourceLineNo">492</span> */<a name="line.492"></a>
+<span class="sourceLineNo">493</span> public void wakeTableExclusiveLock(final Procedure procedure, final TableName table) {<a name="line.493"></a>
+<span class="sourceLineNo">494</span> schedLock();<a name="line.494"></a>
+<span class="sourceLineNo">495</span> try {<a name="line.495"></a>
+<span class="sourceLineNo">496</span> final LockAndQueue namespaceLock = locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.496"></a>
+<span class="sourceLineNo">497</span> final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.497"></a>
+<span class="sourceLineNo">498</span> int waitingCount = 0;<a name="line.498"></a>
+<span class="sourceLineNo">499</span><a name="line.499"></a>
+<span class="sourceLineNo">500</span> if (!tableLock.hasParentLock(procedure)) {<a name="line.500"></a>
+<span class="sourceLineNo">501</span> tableLock.releaseExclusiveLock(procedure);<a name="line.501"></a>
+<span class="sourceLineNo">502</span> waitingCount += wakeWaitingProcedures(tableLock);<a name="line.502"></a>
+<span class="sourceLineNo">503</span> }<a name="line.503"></a>
+<span class="sourceLineNo">504</span> if (namespaceLock.releaseSharedLock()) {<a name="line.504"></a>
+<span class="sourceLineNo">505</span> waitingCount += wakeWaitingProcedures(namespaceLock);<a name="line.505"></a>
+<span class="sourceLineNo">506</span> }<a name="line.506"></a>
+<span class="sourceLineNo">507</span> addToRunQueue(tableRunQueue, getTableQueue(table));<a name="line.507"></a>
+<span class="sourceLineNo">508</span> wakePollIfNeeded(waitingCount);<a name="line.508"></a>
+<span class="sourceLineNo">509</span> } finally {<a name="line.509"></a>
+<span class="sourceLineNo">510</span> schedUnlock();<a name="line.510"></a>
+<span class="sourceLineNo">511</span> }<a name="line.511"></a>
+<span class="sourceLineNo">512</span> }<a name="line.512"></a>
+<span class="sourceLineNo">513</span><a name="line.513"></a>
+<span class="sourceLineNo">514</span> /**<a name="line.514"></a>
+<span class="sourceLineNo">515</span> * Suspend the procedure if the specified table is already locked.<a name="line.515"></a>
+<span class="sourceLineNo">516</span> * other "read" operations in the table-queue may be executed concurrently,<a name="line.516"></a>
+<span class="sourceLineNo">517</span> * @param procedure the procedure trying to acquire the lock<a name="line.517"></a>
+<span class="sourceLineNo">518</span> * @param table Table to lock<a name="line.518"></a>
+<span class="sourceLineNo">519</span> * @return true if the procedure has to wait for the table to be available<a name="line.519"></a>
+<span class="sourceLineNo">520</span> */<a name="line.520"></a>
+<span class="sourceLineNo">521</span> public boolean waitTableSharedLock(final Procedure procedure, final TableName table) {<a name="line.521"></a>
+<span class="sourceLineNo">522</span> return waitTableQueueSharedLock(procedure, table) == null;<a name="line.522"></a>
+<span class="sourceLineNo">523</span> }<a name="line.523"></a>
+<span class="sourceLineNo">524</span><a name="line.524"></a>
+<span class="sourceLineNo">525</span> private TableQueue waitTableQueueSharedLock(final Procedure<?> procedure, final TableName table) {<a name="line.525"></a>
+<span class="sourceLineNo">526</span> schedLock();<a name="line.526"></a>
+<span class="sourceLineNo">527</span> try {<a name="line.527"></a>
+<span class="sourceLineNo">528</span> final LockAndQueue namespaceLock = locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.528"></a>
+<span class="sourceLineNo">529</span> final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.529"></a>
+<span class="sourceLineNo">530</span> if (!namespaceLock.trySharedLock()) {<a name="line.530"></a>
+<span class="sourceLineNo">531</span> waitProcedure(namespaceLock, procedure);<a name="line.531"></a>
+<span class="sourceLineNo">532</span> return null;<a name="line.532"></a>
+<span class="sourceLineNo">533</span> }<a name="line.533"></a>
+<span class="sourceLineNo">534</span><a name="line.534"></a>
+<span class="sourceLineNo">535</span> if (!tableLock.trySharedLock()) {<a name="line.535"></a>
+<span class="sourceLineNo">536</span> namespaceLock.releaseSharedLock();<a name="line.536"></a>
+<span class="sourceLineNo">537</span> waitProcedure(tableLock, procedure);<a name="line.537"></a>
+<span class="sourceLineNo">538</span> return null;<a name="line.538"></a>
+<span class="sourceLineNo">539</span> }<a name="line.539"></a>
+<span class="sourceLineNo">540</span><a name="line.540"></a>
+<span class="sourceLineNo">541</span> return getTableQueue(table);<a name="line.541"></a>
+<span class="sourceLineNo">542</span> } finally {<a name="line.542"></a>
+<span class="sourceLineNo">543</span> schedUnlock();<a name="line.543"></a>
+<span class="sourceLineNo">544</span> }<a name="line.544"></a>
+<span class="sourceLineNo">545</span> }<a name="line.545"></a>
+<span class="sourceLineNo">546</span><a name="line.546"></a>
+<span class="sourceLineNo">547</span> /**<a name="line.547"></a>
+<span class="sourceLineNo">548</span> * Wake the procedures waiting for the specified table<a name="line.548"></a>
+<span class="sourceLineNo">549</span> * @param procedure the procedure releasing the lock<a name="line.549"></a>
+<span class="sourceLineNo">550</span> * @param table the name of the table that has the shared lock<a name="line.550"></a>
+<span class="sourceLineNo">551</span> */<a name="line.551"></a>
+<span class="sourceLineNo">552</span> public void wakeTableSharedLock(final Procedure procedure, final TableName table) {<a name="line.552"></a>
+<span class="sourceLineNo">553</span> schedLock();<a name="line.553"></a>
+<span class="sourceLineNo">554</span> try {<a name="line.554"></a>
+<span class="sourceLineNo">555</span> final LockAndQueue namespaceLock = locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.555"></a>
+<span class="sourceLineNo">556</span> final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.556"></a>
+<span class="sourceLineNo">557</span> int waitingCount = 0;<a name="line.557"></a>
+<span class="sourceLineNo">558</span> if (tableLock.releaseSharedLock()) {<a name="line.558"></a>
+<span class="sourceLineNo">559</span> addToRunQueue(tableRunQueue, getTableQueue(table));<a name="line.559"></a>
+<span class="sourceLineNo">560</span> waitingCount += wakeWaitingProcedures(tableLock);<a name="line.560"></a>
+<span class="sourceLineNo">561</span> }<a name="line.561"></a>
+<span class="sourceLineNo">562</span> if (namespaceLock.releaseSharedLock()) {<a name="line.562"></a>
+<span class="sourceLineNo">563</span> waitingCount += wakeWaitingProcedures(namespaceLock);<a name="line.563"></a>
+<span class="sourceLineNo">564</span> }<a name="line.564"></a>
+<span class="sourceLineNo">565</span> wakePollIfNeeded(waitingCount);<a name="line.565"></a>
+<span class="sourceLineNo">566</span> } finally {<a name="line.566"></a>
+<span class="sourceLineNo">567</span> schedUnlock();<a name="line.567"></a>
+<span class="sourceLineNo">568</span> }<a name="line.568"></a>
+<span class="sourceLineNo">569</span> }<a name="line.569"></a>
+<span class="sourceLineNo">570</span><a name="line.570"></a>
+<span class="sourceLineNo">571</span> /**<a name="line.571"></a>
+<span class="sourceLineNo">572</span> * Tries to remove the queue and the table-lock of the specified table.<a name="line.572"></a>
+<span class="sourceLineNo">573</span> * If there are new operations pending (e.g. a new create),<a name="line.573"></a>
+<span class="sourceLineNo">574</span> * the remove will not be performed.<a name="line.574"></a>
+<span class="sourceLineNo">575</span> * @param table the name of the table that should be marked as deleted<a name="line.575"></a>
+<span class="sourceLineNo">576</span> * @param procedure the procedure that is removing the table<a name="line.576"></a>
+<span class="sourceLineNo">577</span> * @return true if deletion succeeded, false otherwise meaning that there are<a name="line.577"></a>
+<span class="sourceLineNo">578</span> * other new operations pending for that table (e.g. a new create).<a name="line.578"></a>
+<span class="sourceLineNo">579</span> */<a name="line.579"></a>
+<span class="sourceLineNo">580</span> @VisibleForTesting<a name="line.580"></a>
+<span class="sourceLineNo">581</span> boolean markTableAsDeleted(final TableName table, final Procedure<?> procedure) {<a name="line.581"></a>
+<span class="sourceLineNo">582</span> schedLock();<a name="line.582"></a>
+<span class="sourceLineNo">583</span> try {<a name="line.583"></a>
+<span class="sourceLineNo">584</span> final TableQueue queue = getTableQueue(table);<a name="line.584"></a>
+<span class="sourceLineNo">585</span> final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.585"></a>
+<span class="sourceLineNo">586</span> if (queue == null) return true;<a name="line.586"></a>
+<span class="sourceLineNo">587</span><a name="line.587"></a>
+<span class="sourceLineNo">588</span> if (queue.isEmpty() && tableLock.tryExclusiveLock(procedure)) {<a name="line.588"></a>
+<span class="sourceLineNo">589</span> // remove the table from the run-queue and the map<a name="line.589"></a>
+<span class="sourceLineNo">590</span> if (AvlIterableList.isLinked(queue)) {<a name="line.590"></a>
+<span class="sourceLineNo">591</span> tableRunQueue.remove(queue);<a name="line.591"></a>
+<span class="sourceLineNo">592</span> }<a name="line.592"></a>
+<span class="sourceLineNo">593</span> removeTableQueue(table);<a name="line.593"></a>
+<span class="sourceLineNo">594</span> } else {<a name="line.594"></a>
+<span class="sourceLineNo">595</span> // TODO: If there are no create, we can drop all the other ops<a name="line.595"></a>
+<span class="sourceLineNo">596</span> return false;<a name="line.596"></a>
+<span class="sourceLineNo">597</span> }<a name="line.597"></a>
+<span class="sourceLineNo">598</span> } finally {<a name="line.598"></a>
+<span class="sourceLineNo">599</span> schedUnlock();<a name="line.599"></a>
+<span class="sourceLineNo">600</span> }<a name="line.600"></a>
+<span class="sourceLineNo">601</span> return true;<a name="line.601"></a>
+<span class="sourceLineNo">602</span> }<a name="line.602"></a>
+<span class="sourceLineNo">603</span><a name="line.603"></a>
+<span class="sourceLineNo">604</span> // ============================================================================<a name="line.604"></a>
+<span class="sourceLineNo">605</span> // Region Locking Helpers<a name="line.605"></a>
+<span class="sourceLineNo">606</span> // ============================================================================<a name="line.606"></a>
+<span class="sourceLineNo">607</span> /**<a name="line.607"></a>
+<span class="sourceLineNo">608</span> * Suspend the procedure if the specified region is already locked.<a name="line.608"></a>
+<span class="sourceLineNo">609</span> * @param procedure the procedure trying to acquire the lock on the region<a name="line.609"></a>
+<span class="sourceLineNo">610</span> * @param regionInfo the region we are trying to lock<a name="line.610"></a>
+<span class="sourceLineNo">611</span> * @return true if the procedure has to wait for the regions to be available<a name="line.611"></a>
+<span class="sourceLineNo">612</span> */<a name="line.612"></a>
+<span class="sourceLineNo">613</span> public boolean waitRegion(final Procedure procedure, final RegionInfo regionInfo) {<a name="line.613"></a>
+<span class="sourceLineNo">614</span> return waitRegions(procedure, regionInfo.getTable(), regionInfo);<a name="line.614"></a>
+<span class="sourceLineNo">615</span> }<a name="line.615"></a>
+<span class="sourceLineNo">616</span><a name="line.616"></a>
+<span class="sourceLineNo">617</span> /**<a name="line.617"></a>
+<span class="sourceLineNo">618</span> * Suspend the procedure if the specified set of regions are already locked.<a name="line.618"></a>
+<span class="sourceLineNo">619</span> * @param procedure the procedure trying to acquire the lock on the regions<a name="line.619"></a>
+<span class="sourceLineNo">620</span> * @param table the table name of the regions we are trying to lock<a name="line.620"></a>
+<span class="sourceLineNo">621</span> * @param regionInfo the list of regions we are trying to lock<a name="line.621"></a>
+<span class="sourceLineNo">622</span> * @return true if the procedure has to wait for the regions to be available<a name="line.622"></a>
+<span class="sourceLineNo">623</span> */<a name="line.623"></a>
+<span class="sourceLineNo">624</span> public boolean waitRegions(final Procedure procedure, final TableName table,<a name="line.624"></a>
+<span class="sourceLineNo">625</span> final RegionInfo... regionInfo) {<a name="line.625"></a>
+<span class="sourceLineNo">626</span> Arrays.sort(regionInfo, RegionInfo.COMPARATOR);<a name="line.626"></a>
+<span class="sourceLineNo">627</span> schedLock();<a name="line.627"></a>
+<span class="sourceLineNo">628</span> try {<a name="line.628"></a>
+<span class="sourceLineNo">629</span> // If there is parent procedure, it would have already taken xlock, so no need to take<a name="line.629"></a>
+<span class="sourceLineNo">630</span> // shared lock here. Otherwise, take shared lock.<a name="line.630"></a>
+<span class="sourceLineNo">631</span> if (!procedure.hasParent()<a name="line.631"></a>
+<span class="sourceLineNo">632</span> && waitTableQueueSharedLock(procedure, table) == null) {<a name="line.632"></a>
+<span class="sourceLineNo">633</span> return true;<a name="line.633"></a>
+<span class="sourceLineNo">634</span> }<a name="line.634"></a>
+<span class="sourceLineNo">635</span><a name="line.635"></a>
+<span class="sourceLineNo">636</span> // acquire region xlocks or wait<a name="line.636"></a>
+<span class="sourceLineNo">637</span> boolean hasLock = true;<a name="line.637"></a>
+<span class="sourceLineNo">638</span> final LockAndQueue[] regionLocks = new LockAndQueue[regionInfo.length];<a name="line.638"></a>
+<span class="sourceLineNo">639</span> for (int i = 0; i < regionInfo.length; ++i) {<a name="line.639"></a>
+<span class="sourceLineNo">640</span> LOG.info("{} checking lock on {}", procedure, regionInfo[i].getEncodedName());<a name="line.640"></a>
+<span class="sourceLineNo">641</span> assert table != null;<a name="line.641"></a>
+<span class="sourceLineNo">642</span> assert regionInfo[i] != null;<a name="line.642"></a>
+<span class="sourceLineNo">643</span> assert regionInfo[i].getTable() != null;<a name="line.643"></a>
+<span class="sourceLineNo">644</span> assert regionInfo[i].getTable().equals(table): regionInfo[i] + " " + procedure;<a name="line.644"></a>
+<span class="sourceLineNo">645</span> assert i == 0 || regionInfo[i] != regionInfo[i - 1] : "duplicate region: " + regionInfo[i];<a name="line.645"></a>
+<span class="sourceLineNo">646</span><a name="line.646"></a>
+<span class="sourceLineNo">647</span> regionLocks[i] = locking.getRegionLock(regionInfo[i].getEncodedName());<a name="line.647"></a>
+<span class="sourceLineNo">648</span> if (!regionLocks[i].tryExclusiveLock(procedure)) {<a name="line.648"></a>
+<span class="sourceLineNo">649</span> waitProcedure(regionLocks[i], procedure);<a name="line.649"></a>
+<span class="sourceLineNo">650</span> hasLock = false;<a name="line.650"></a>
+<span class="sourceLineNo">651</span> while (i-- > 0) {<a name="line.651"></a>
+<span class="sourceLineNo">652</span> regionLocks[i].releaseExclusiveLock(procedure);<a name="line.652"></a>
+<span class="sourceLineNo">653</span> }<a name="line.653"></a>
+<span class="sourceLineNo">654</span> break;<a name="line.654"></a>
+<span class="sourceLineNo">655</span> }<a name="line.655"></a>
<span class="sourceLineNo">656</span> }<a name="line.656"></a>
-<span class="sourceLineNo">657</span> return !hasLock;<a name="line.657"></a>
-<span class="sourceLineNo">658</span> } finally {<a name="line.658"></a>
-<span class="sourceLineNo">659</span> schedUnlock();<a name="line.659"></a>
-<span class="sourceLineNo">660</span> }<a name="line.660"></a>
-<span class="sourceLineNo">661</span> }<a name="line.661"></a>
-<span class="sourceLineNo">662</span><a name="line.662"></a>
-<span class="sourceLineNo">663</span> /**<a name="line.663"></a>
-<span class="sourceLineNo">664</span> * Wake the procedures waiting for the specified region<a name="line.664"></a>
-<span class="sourceLineNo">665</span> * @param procedure the procedure that was holding the region<a name="line.665"></a>
-<span class="sourceLineNo">666</span> * @param regionInfo the region the procedure was holding<a name="line.666"></a>
-<span class="sourceLineNo">667</span> */<a name="line.667"></a>
-<span class="sourceLineNo">668</span> public void wakeRegion(final Procedure procedure, final RegionInfo regionInfo) {<a name="line.668"></a>
-<span class="sourceLineNo">669</span> wakeRegions(procedure, regionInfo.getTable(), regionInfo);<a name="line.669"></a>
-<span class="sourceLineNo">670</span> }<a name="line.670"></a>
-<span class="sourceLineNo">671</span><a name="line.671"></a>
-<span class="sourceLineNo">672</span> /**<a name="line.672"></a>
-<span class="sourceLineNo">673</span> * Wake the procedures waiting for the specified regions<a name="line.673"></a>
-<span class="sourceLineNo">674</span> * @param procedure the procedure that was holding the regions<a name="line.674"></a>
-<span class="sourceLineNo">675</span> * @param regionInfo the list of regions the procedure was holding<a name="line.675"></a>
-<span class="sourceLineNo">676</span> */<a name="line.676"></a>
-<span class="sourceLineNo">677</span> public void wakeRegions(final Procedure procedure,final TableName table,<a name="line.677"></a>
-<span class="sourceLineNo">678</span> final RegionInfo... regionInfo) {<a name="line.678"></a>
-<span class="sourceLineNo">679</span> Arrays.sort(regionInfo, RegionInfo.COMPARATOR);<a name="line.679"></a>
-<span class="sourceLineNo">680</span> schedLock();<a name="line.680"></a>
-<span class="sourceLineNo">681</span> try {<a name="line.681"></a>
-<span class="sourceLineNo">682</span> int numProcs = 0;<a name="line.682"></a>
-<span class="sourceLineNo">683</span> final Procedure[] nextProcs = new Procedure[regionInfo.length];<a name="line.683"></a>
-<span class="sourceLineNo">684</span> for (int i = 0; i < regionInfo.length; ++i) {<a name="line.684"></a>
-<span class="sourceLineNo">685</span> assert regionInfo[i].getTable().equals(table);<a name="line.685"></a>
-<span class="sourceLineNo">686</span> assert i == 0 || regionInfo[i] != regionInfo[i - 1] : "duplicate region: " + regionInfo[i];<a name="line.686"></a>
-<span class="sourceLineNo">687</span><a name="line.687"></a>
-<span class="sourceLineNo">688</span> LockAndQueue regionLock = locking.getRegionLock(regionInfo[i].getEncodedName());<a name="line.688"></a>
-<span class="sourceLineNo">689</span> if (regionLock.releaseExclusiveLock(procedure)) {<a name="line.689"></a>
-<span class="sourceLineNo">690</span> if (!regionLock.isEmpty()) {<a name="line.690"></a>
-<span class="sourceLineNo">691</span> // release one procedure at the time since regions has an xlock<a name="line.691"></a>
-<span class="sourceLineNo">692</span> nextProcs[numProcs++] = regionLock.removeFirst();<a name="line.692"></a>
-<span class="sourceLineNo">693</span> } else {<a name="line.693"></a>
-<span class="sourceLineNo">694</span> locking.removeRegionLock(regionInfo[i].getEncodedName());<a name="line.694"></a>
-<span class="sourceLineNo">695</span> }<a name="line.695"></a>
-<span class="sourceLineNo">696</span> }<a name="line.696"></a>
-<span class="sourceLineNo">697</span> }<a name="line.697"></a>
-<span class="sourceLineNo">698</span><a name="line.698"></a>
-<span class="sourceLineNo">699</span> // awake procedures if any<a name="line.699"></a>
-<span class="sourceLineNo">700</span> for (int i = numProcs - 1; i >= 0; --i) {<a name="line.700"></a>
-<span class="sourceLineNo">701</span> wakeProcedure(nextProcs[i]);<a name="line.701"></a>
-<span class="sourceLineNo">702</span> }<a name="line.702"></a>
-<span class="sourceLineNo">703</span> wakePollIfNeeded(numProcs);<a name="line.703"></a>
-<span class="sourceLineNo">704</span> if (!procedure.hasParent()) {<a name="line.704"></a>
-<span class="sourceLineNo">705</span> // release the table shared-lock.<a name="line.705"></a>
-<span class="sourceLineNo">706</span> // (if we have a parent, it is holding an xlock so we didn't take the shared-lock)<a name="line.706"></a>
-<span class="sourceLineNo">707</span> wakeTableSharedLock(procedure, table);<a name="line.707"></a>
-<span class="sourceLineNo">708</span> }<a name="line.708"></a>
-<span class="sourceLineNo">709</span> } finally {<a name="line.709"></a>
-<span class="sourceLineNo">710</span> schedUnlock();<a name="line.710"></a>
-<span class="sourceLineNo">711</span> }<a name="line.711"></a>
-<span class="sourceLineNo">712</span> }<a name="line.712"></a>
-<span class="sourceLineNo">713</span><a name="line.713"></a>
-<span class="sourceLineNo">714</span> // ============================================================================<a name="line.714"></a>
-<span class="sourceLineNo">715</span> // Namespace Locking Helpers<a name="line.715"></a>
-<span class="sourceLineNo">716</span> // ============================================================================<a name="line.716"></a>
-<span class="sourceLineNo">717</span> /**<a name="line.717"></a>
-<span class="sourceLineNo">718</span> * Suspend the procedure if the specified namespace is already locked.<a name="line.718"></a>
-<span class="sourceLineNo">719</span> * @see #wakeNamespaceExclusiveLock(Procedure,String)<a name="line.719"></a>
-<span class="sourceLineNo">720</span> * @param procedure the procedure trying to acquire the lock<a name="line.720"></a>
-<span class="sourceLineNo">721</span> * @param namespace Namespace to lock<a name="line.721"></a>
-<span class="sourceLineNo">722</span> * @return true if the procedure has to wait for the namespace to be available<a name="line.722"></a>
-<span class="sourceLineNo">723</span> */<a name="line.723"></a>
-<span class="sourceLineNo">724</span> public boolean waitNamespaceExclusiveLock(final Procedure procedure, final String namespace) {<a name="line.724"></a>
-<span class="sourceLineNo">725</span> schedLock();<a name="line.725"></a>
-<span class="sourceLineNo">726</span> try {<a name="line.726"></a>
-<span class="sourceLineNo">727</span> final LockAndQueue systemNamespaceTableLock =<a name="line.727"></a>
-<span class="sourceLineNo">728</span> locking.getTableLock(TableName.NAMESPACE_TABLE_NAME);<a name="line.728"></a>
-<span class="sourceLineNo">729</span> if (!systemNamespaceTableLock.trySharedLock()) {<a name="line.729"></a>
-<span class="sourceLineNo">730</span> waitProcedure(systemNamespaceTableLock, procedure);<a name="line.730"></a>
-<span class="sourceLineNo">731</span> logLockedResource(LockedResourceType.TABLE,<a name="line.731"></a>
-<span class="sourceLineNo">732</span> TableName.NAMESPACE_TABLE_NAME.getNameAsString());<a name="line.732"></a>
-<span class="sourceLineNo">733</span> return true;<a name="line.733"></a>
-<span class="sourceLineNo">734</span> }<a name="line.734"></a>
-<span class="sourceLineNo">735</span><a name="line.735"></a>
-<span class="sourceLineNo">736</span> final LockAndQueue namespaceLock = locking.getNamespaceLock(namespace);<a name="line.736"></a>
-<span class="sourceLineNo">737</span> if (!namespaceLock.tryExclusiveLock(procedure)) {<a name="line.737"></a>
-<span class="sourceLineNo">738</span> systemNamespaceTableLock.releaseSharedLock();<a name="line.738"></a>
-<span class="sourceLineNo">739</span> waitProcedure(namespaceLock, procedure);<a name="line.739"></a>
-<span class="sourceLineNo">740</span> logLockedResource(LockedResourceType.NAMESPACE, namespace);<a name="line.740"></a>
-<span class="sourceLineNo">741</span> return true;<a name="line.741"></a>
-<span class="sourceLineNo">742</span> }<a name="line.742"></a>
-<span class="sourceLineNo">743</span> return false;<a name="line.743"></a>
-<span class="sourceLineNo">744</span> } finally {<a name="line.744"></a>
-<span class="sourceLineNo">745</span> schedUnlock();<a name="line.745"></a>
-<span class="sourceLineNo">746</span> }<a name="line.746"></a>
-<span class="sourceLineNo">747</span> }<a name="line.747"></a>
-<span class="sourceLineNo">748</span><a name="line.748"></a>
-<span class="sourceLineNo">749</span> /**<a name="line.749"></a>
-<span class="sourceLineNo">750</span> * Wake the procedures waiting for the specified namespace<a name="line.750"></a>
-<span class="sourceLineNo">751</span> * @see #waitNamespaceExclusiveLock(Procedur
<TRUNCATED>