hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From git-site-r...@apache.org
Subject [22/37] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
Date Thu, 25 May 2017 14:59:54 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/6cafca90/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.TablePriorities.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.TablePriorities.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.TablePriorities.html
index ec7097b..92d4ef6 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.TablePriorities.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.TablePriorities.html
@@ -347,871 +347,925 @@
 <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>  @Override<a name="line.341"></a>
-<span class="sourceLineNo">342</span>  public void clear() {<a name="line.342"></a>
-<span class="sourceLineNo">343</span>    schedLock();<a name="line.343"></a>
-<span class="sourceLineNo">344</span>    try {<a name="line.344"></a>
-<span class="sourceLineNo">345</span>      clearQueue();<a name="line.345"></a>
-<span class="sourceLineNo">346</span>      locking.clear();<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    } finally {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>      schedUnlock();<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><a name="line.351"></a>
-<span class="sourceLineNo">352</span>  protected void clearQueue() {<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    // Remove Servers<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    for (int i = 0; i &lt; serverBuckets.length; ++i) {<a name="line.354"></a>
-<span class="sourceLineNo">355</span>      clear(serverBuckets[i], serverRunQueue, SERVER_QUEUE_KEY_COMPARATOR);<a name="line.355"></a>
-<span class="sourceLineNo">356</span>      serverBuckets[i] = null;<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>    // Remove Tables<a name="line.359"></a>
-<span class="sourceLineNo">360</span>    clear(tableMap, tableRunQueue, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    tableMap = null;<a name="line.361"></a>
-<span class="sourceLineNo">362</span><a name="line.362"></a>
-<span class="sourceLineNo">363</span>    assert size() == 0 : "expected queue size to be 0, got " + size();<a name="line.363"></a>
-<span class="sourceLineNo">364</span>  }<a name="line.364"></a>
-<span class="sourceLineNo">365</span><a name="line.365"></a>
-<span class="sourceLineNo">366</span>  private &lt;T extends Comparable&lt;T&gt;, TNode extends Queue&lt;T&gt;&gt; void clear(TNode treeMap,<a name="line.366"></a>
-<span class="sourceLineNo">367</span>      final FairQueue&lt;T&gt; fairq, final AvlKeyComparator&lt;TNode&gt; comparator) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    while (treeMap != null) {<a name="line.368"></a>
-<span class="sourceLineNo">369</span>      Queue&lt;T&gt; node = AvlTree.getFirst(treeMap);<a name="line.369"></a>
-<span class="sourceLineNo">370</span>      treeMap = AvlTree.remove(treeMap, node.getKey(), comparator);<a name="line.370"></a>
-<span class="sourceLineNo">371</span>      if (fairq != null) removeFromRunQueue(fairq, node);<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    }<a name="line.372"></a>
-<span class="sourceLineNo">373</span>  }<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span>  @Override<a name="line.375"></a>
-<span class="sourceLineNo">376</span>  protected int queueSize() {<a name="line.376"></a>
-<span class="sourceLineNo">377</span>    int count = 0;<a name="line.377"></a>
-<span class="sourceLineNo">378</span><a name="line.378"></a>
-<span class="sourceLineNo">379</span>    // Server queues<a name="line.379"></a>
-<span class="sourceLineNo">380</span>    final AvlTreeIterator&lt;ServerQueue&gt; serverIter = new AvlTreeIterator&lt;&gt;();<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    for (int i = 0; i &lt; serverBuckets.length; ++i) {<a name="line.381"></a>
-<span class="sourceLineNo">382</span>      serverIter.seekFirst(serverBuckets[i]);<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      while (serverIter.hasNext()) {<a name="line.383"></a>
-<span class="sourceLineNo">384</span>        count += serverIter.next().size();<a name="line.384"></a>
-<span class="sourceLineNo">385</span>      }<a name="line.385"></a>
-<span class="sourceLineNo">386</span>    }<a name="line.386"></a>
-<span class="sourceLineNo">387</span><a name="line.387"></a>
-<span class="sourceLineNo">388</span>    // Table queues<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    final AvlTreeIterator&lt;TableQueue&gt; tableIter = new AvlTreeIterator&lt;&gt;(tableMap);<a name="line.389"></a>
-<span class="sourceLineNo">390</span>    while (tableIter.hasNext()) {<a name="line.390"></a>
-<span class="sourceLineNo">391</span>      count += tableIter.next().size();<a name="line.391"></a>
-<span class="sourceLineNo">392</span>    }<a name="line.392"></a>
-<span class="sourceLineNo">393</span>    return count;<a name="line.393"></a>
-<span class="sourceLineNo">394</span>  }<a name="line.394"></a>
-<span class="sourceLineNo">395</span><a name="line.395"></a>
-<span class="sourceLineNo">396</span>  @Override<a name="line.396"></a>
-<span class="sourceLineNo">397</span>  public void completionCleanup(final Procedure proc) {<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    if (proc instanceof TableProcedureInterface) {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      TableProcedureInterface iProcTable = (TableProcedureInterface)proc;<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      boolean tableDeleted;<a name="line.400"></a>
-<span class="sourceLineNo">401</span>      if (proc.hasException()) {<a name="line.401"></a>
-<span class="sourceLineNo">402</span>        Exception procEx = proc.getException().unwrapRemoteException();<a name="line.402"></a>
-<span class="sourceLineNo">403</span>        if (iProcTable.getTableOperationType() == TableOperationType.CREATE) {<a name="line.403"></a>
-<span class="sourceLineNo">404</span>          // create failed because the table already exist<a name="line.404"></a>
-<span class="sourceLineNo">405</span>          tableDeleted = !(procEx instanceof TableExistsException);<a name="line.405"></a>
-<span class="sourceLineNo">406</span>        } else {<a name="line.406"></a>
-<span class="sourceLineNo">407</span>          // the operation failed because the table does not exist<a name="line.407"></a>
-<span class="sourceLineNo">408</span>          tableDeleted = (procEx instanceof TableNotFoundException);<a name="line.408"></a>
-<span class="sourceLineNo">409</span>        }<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      } else {<a name="line.410"></a>
-<span class="sourceLineNo">411</span>        // the table was deleted<a name="line.411"></a>
-<span class="sourceLineNo">412</span>        tableDeleted = (iProcTable.getTableOperationType() == TableOperationType.DELETE);<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      }<a name="line.413"></a>
-<span class="sourceLineNo">414</span>      if (tableDeleted) {<a name="line.414"></a>
-<span class="sourceLineNo">415</span>        markTableAsDeleted(iProcTable.getTableName(), proc);<a name="line.415"></a>
-<span class="sourceLineNo">416</span>        return;<a name="line.416"></a>
-<span class="sourceLineNo">417</span>      }<a name="line.417"></a>
-<span class="sourceLineNo">418</span>    } else {<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      // No cleanup for ServerProcedureInterface types, yet.<a name="line.419"></a>
-<span class="sourceLineNo">420</span>      return;<a name="line.420"></a>
-<span class="sourceLineNo">421</span>    }<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>  private static &lt;T extends Comparable&lt;T&gt;&gt; void addToRunQueue(FairQueue&lt;T&gt; fairq, Queue&lt;T&gt; queue) {<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    if (!AvlIterableList.isLinked(queue) &amp;&amp; !queue.isEmpty()) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>      fairq.add(queue);<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>  private static &lt;T extends Comparable&lt;T&gt;&gt; void removeFromRunQueue(<a name="line.430"></a>
-<span class="sourceLineNo">431</span>      FairQueue&lt;T&gt; fairq, Queue&lt;T&gt; queue) {<a name="line.431"></a>
-<span class="sourceLineNo">432</span>    if (AvlIterableList.isLinked(queue)) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span>      fairq.remove(queue);<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    }<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>  // ============================================================================<a name="line.437"></a>
-<span class="sourceLineNo">438</span>  //  Table Queue Lookup Helpers<a name="line.438"></a>
-<span class="sourceLineNo">439</span>  // ============================================================================<a name="line.439"></a>
-<span class="sourceLineNo">440</span>  private TableQueue getTableQueue(TableName tableName) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    TableQueue node = AvlTree.get(tableMap, tableName, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    if (node != null) return node;<a name="line.442"></a>
-<span class="sourceLineNo">443</span><a name="line.443"></a>
-<span class="sourceLineNo">444</span>    node = new TableQueue(tableName, tablePriorities.getPriority(tableName),<a name="line.444"></a>
-<span class="sourceLineNo">445</span>        locking.getTableLock(tableName), locking.getNamespaceLock(tableName.getNamespaceAsString()));<a name="line.445"></a>
-<span class="sourceLineNo">446</span>    tableMap = AvlTree.insert(tableMap, node);<a name="line.446"></a>
-<span class="sourceLineNo">447</span>    return node;<a name="line.447"></a>
+<span class="sourceLineNo">342</span>  public LockInfo getLockInfoForResource(LockInfo.ResourceType resourceType, String resourceName) {<a name="line.342"></a>
+<span class="sourceLineNo">343</span>    LockAndQueue queue = null;<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    schedLock();<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    try {<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      switch (resourceType) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>        case SERVER:<a name="line.347"></a>
+<span class="sourceLineNo">348</span>          queue = locking.serverLocks.get(ServerName.valueOf(resourceName));<a name="line.348"></a>
+<span class="sourceLineNo">349</span>          break;<a name="line.349"></a>
+<span class="sourceLineNo">350</span>        case NAMESPACE:<a name="line.350"></a>
+<span class="sourceLineNo">351</span>          queue = locking.namespaceLocks.get(resourceName);<a name="line.351"></a>
+<span class="sourceLineNo">352</span>          break;<a name="line.352"></a>
+<span class="sourceLineNo">353</span>        case TABLE:<a name="line.353"></a>
+<span class="sourceLineNo">354</span>          queue = locking.tableLocks.get(TableName.valueOf(resourceName));<a name="line.354"></a>
+<span class="sourceLineNo">355</span>          break;<a name="line.355"></a>
+<span class="sourceLineNo">356</span>        case REGION:<a name="line.356"></a>
+<span class="sourceLineNo">357</span>          queue = locking.regionLocks.get(resourceName);<a name="line.357"></a>
+<span class="sourceLineNo">358</span>          break;<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>      return queue != null ? createLockInfo(resourceType, resourceName, queue) : null;<a name="line.361"></a>
+<span class="sourceLineNo">362</span>    } finally {<a name="line.362"></a>
+<span class="sourceLineNo">363</span>      schedUnlock();<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    }<a name="line.364"></a>
+<span class="sourceLineNo">365</span>  }<a name="line.365"></a>
+<span class="sourceLineNo">366</span><a name="line.366"></a>
+<span class="sourceLineNo">367</span>  @Override<a name="line.367"></a>
+<span class="sourceLineNo">368</span>  public void clear() {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    schedLock();<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    try {<a name="line.370"></a>
+<span class="sourceLineNo">371</span>      clearQueue();<a name="line.371"></a>
+<span class="sourceLineNo">372</span>      locking.clear();<a name="line.372"></a>
+<span class="sourceLineNo">373</span>    } finally {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>      schedUnlock();<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><a name="line.377"></a>
+<span class="sourceLineNo">378</span>  protected void clearQueue() {<a name="line.378"></a>
+<span class="sourceLineNo">379</span>    // Remove Servers<a name="line.379"></a>
+<span class="sourceLineNo">380</span>    for (int i = 0; i &lt; serverBuckets.length; ++i) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span>      clear(serverBuckets[i], serverRunQueue, SERVER_QUEUE_KEY_COMPARATOR);<a name="line.381"></a>
+<span class="sourceLineNo">382</span>      serverBuckets[i] = null;<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>    // Remove Tables<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    clear(tableMap, tableRunQueue, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    tableMap = null;<a name="line.387"></a>
+<span class="sourceLineNo">388</span><a name="line.388"></a>
+<span class="sourceLineNo">389</span>    assert size() == 0 : "expected queue size to be 0, got " + size();<a name="line.389"></a>
+<span class="sourceLineNo">390</span>  }<a name="line.390"></a>
+<span class="sourceLineNo">391</span><a name="line.391"></a>
+<span class="sourceLineNo">392</span>  private &lt;T extends Comparable&lt;T&gt;, TNode extends Queue&lt;T&gt;&gt; void clear(TNode treeMap,<a name="line.392"></a>
+<span class="sourceLineNo">393</span>      final FairQueue&lt;T&gt; fairq, final AvlKeyComparator&lt;TNode&gt; comparator) {<a name="line.393"></a>
+<span class="sourceLineNo">394</span>    while (treeMap != null) {<a name="line.394"></a>
+<span class="sourceLineNo">395</span>      Queue&lt;T&gt; node = AvlTree.getFirst(treeMap);<a name="line.395"></a>
+<span class="sourceLineNo">396</span>      treeMap = AvlTree.remove(treeMap, node.getKey(), comparator);<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      if (fairq != null) removeFromRunQueue(fairq, node);<a name="line.397"></a>
+<span class="sourceLineNo">398</span>    }<a name="line.398"></a>
+<span class="sourceLineNo">399</span>  }<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span>  @Override<a name="line.401"></a>
+<span class="sourceLineNo">402</span>  protected int queueSize() {<a name="line.402"></a>
+<span class="sourceLineNo">403</span>    int count = 0;<a name="line.403"></a>
+<span class="sourceLineNo">404</span><a name="line.404"></a>
+<span class="sourceLineNo">405</span>    // Server queues<a name="line.405"></a>
+<span class="sourceLineNo">406</span>    final AvlTreeIterator&lt;ServerQueue&gt; serverIter = new AvlTreeIterator&lt;&gt;();<a name="line.406"></a>
+<span class="sourceLineNo">407</span>    for (int i = 0; i &lt; serverBuckets.length; ++i) {<a name="line.407"></a>
+<span class="sourceLineNo">408</span>      serverIter.seekFirst(serverBuckets[i]);<a name="line.408"></a>
+<span class="sourceLineNo">409</span>      while (serverIter.hasNext()) {<a name="line.409"></a>
+<span class="sourceLineNo">410</span>        count += serverIter.next().size();<a name="line.410"></a>
+<span class="sourceLineNo">411</span>      }<a name="line.411"></a>
+<span class="sourceLineNo">412</span>    }<a name="line.412"></a>
+<span class="sourceLineNo">413</span><a name="line.413"></a>
+<span class="sourceLineNo">414</span>    // Table queues<a name="line.414"></a>
+<span class="sourceLineNo">415</span>    final AvlTreeIterator&lt;TableQueue&gt; tableIter = new AvlTreeIterator&lt;&gt;(tableMap);<a name="line.415"></a>
+<span class="sourceLineNo">416</span>    while (tableIter.hasNext()) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>      count += tableIter.next().size();<a name="line.417"></a>
+<span class="sourceLineNo">418</span>    }<a name="line.418"></a>
+<span class="sourceLineNo">419</span>    return count;<a name="line.419"></a>
+<span class="sourceLineNo">420</span>  }<a name="line.420"></a>
+<span class="sourceLineNo">421</span><a name="line.421"></a>
+<span class="sourceLineNo">422</span>  @Override<a name="line.422"></a>
+<span class="sourceLineNo">423</span>  public void completionCleanup(final Procedure proc) {<a name="line.423"></a>
+<span class="sourceLineNo">424</span>    if (proc instanceof TableProcedureInterface) {<a name="line.424"></a>
+<span class="sourceLineNo">425</span>      TableProcedureInterface iProcTable = (TableProcedureInterface)proc;<a name="line.425"></a>
+<span class="sourceLineNo">426</span>      boolean tableDeleted;<a name="line.426"></a>
+<span class="sourceLineNo">427</span>      if (proc.hasException()) {<a name="line.427"></a>
+<span class="sourceLineNo">428</span>        Exception procEx = proc.getException().unwrapRemoteException();<a name="line.428"></a>
+<span class="sourceLineNo">429</span>        if (iProcTable.getTableOperationType() == TableOperationType.CREATE) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span>          // create failed because the table already exist<a name="line.430"></a>
+<span class="sourceLineNo">431</span>          tableDeleted = !(procEx instanceof TableExistsException);<a name="line.431"></a>
+<span class="sourceLineNo">432</span>        } else {<a name="line.432"></a>
+<span class="sourceLineNo">433</span>          // the operation failed because the table does not exist<a name="line.433"></a>
+<span class="sourceLineNo">434</span>          tableDeleted = (procEx instanceof TableNotFoundException);<a name="line.434"></a>
+<span class="sourceLineNo">435</span>        }<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      } else {<a name="line.436"></a>
+<span class="sourceLineNo">437</span>        // the table was deleted<a name="line.437"></a>
+<span class="sourceLineNo">438</span>        tableDeleted = (iProcTable.getTableOperationType() == TableOperationType.DELETE);<a name="line.438"></a>
+<span class="sourceLineNo">439</span>      }<a name="line.439"></a>
+<span class="sourceLineNo">440</span>      if (tableDeleted) {<a name="line.440"></a>
+<span class="sourceLineNo">441</span>        markTableAsDeleted(iProcTable.getTableName(), proc);<a name="line.441"></a>
+<span class="sourceLineNo">442</span>        return;<a name="line.442"></a>
+<span class="sourceLineNo">443</span>      }<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    } else {<a name="line.444"></a>
+<span class="sourceLineNo">445</span>      // No cleanup for ServerProcedureInterface types, yet.<a name="line.445"></a>
+<span class="sourceLineNo">446</span>      return;<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    }<a name="line.447"></a>
 <span class="sourceLineNo">448</span>  }<a name="line.448"></a>
 <span class="sourceLineNo">449</span><a name="line.449"></a>
-<span class="sourceLineNo">450</span>  private void removeTableQueue(TableName tableName) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span>    tableMap = AvlTree.remove(tableMap, tableName, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.451"></a>
-<span class="sourceLineNo">452</span>    locking.removeTableLock(tableName);<a name="line.452"></a>
-<span class="sourceLineNo">453</span>  }<a name="line.453"></a>
-<span class="sourceLineNo">454</span><a name="line.454"></a>
+<span class="sourceLineNo">450</span>  private static &lt;T extends Comparable&lt;T&gt;&gt; void addToRunQueue(FairQueue&lt;T&gt; fairq, Queue&lt;T&gt; queue) {<a name="line.450"></a>
+<span class="sourceLineNo">451</span>    if (!AvlIterableList.isLinked(queue) &amp;&amp; !queue.isEmpty()) {<a name="line.451"></a>
+<span class="sourceLineNo">452</span>      fairq.add(queue);<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    }<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>  private static boolean isTableProcedure(Procedure proc) {<a name="line.456"></a>
-<span class="sourceLineNo">457</span>    return proc instanceof TableProcedureInterface;<a name="line.457"></a>
-<span class="sourceLineNo">458</span>  }<a name="line.458"></a>
-<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span>  private static TableName getTableName(Procedure proc) {<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    return ((TableProcedureInterface)proc).getTableName();<a name="line.461"></a>
-<span class="sourceLineNo">462</span>  }<a name="line.462"></a>
-<span class="sourceLineNo">463</span><a name="line.463"></a>
-<span class="sourceLineNo">464</span>  // ============================================================================<a name="line.464"></a>
-<span class="sourceLineNo">465</span>  //  Server Queue Lookup Helpers<a name="line.465"></a>
-<span class="sourceLineNo">466</span>  // ============================================================================<a name="line.466"></a>
-<span class="sourceLineNo">467</span>  private ServerQueue getServerQueue(ServerName serverName) {<a name="line.467"></a>
-<span class="sourceLineNo">468</span>    final int index = getBucketIndex(serverBuckets, serverName.hashCode());<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    ServerQueue node = AvlTree.get(serverBuckets[index], serverName, SERVER_QUEUE_KEY_COMPARATOR);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    if (node != null) return node;<a name="line.470"></a>
-<span class="sourceLineNo">471</span><a name="line.471"></a>
-<span class="sourceLineNo">472</span>    node = new ServerQueue(serverName, locking.getServerLock(serverName));<a name="line.472"></a>
-<span class="sourceLineNo">473</span>    serverBuckets[index] = AvlTree.insert(serverBuckets[index], node);<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    return node;<a name="line.474"></a>
-<span class="sourceLineNo">475</span>  }<a name="line.475"></a>
-<span class="sourceLineNo">476</span><a name="line.476"></a>
-<span class="sourceLineNo">477</span>  private static int getBucketIndex(Object[] buckets, int hashCode) {<a name="line.477"></a>
-<span class="sourceLineNo">478</span>    return Math.abs(hashCode) % buckets.length;<a name="line.478"></a>
+<span class="sourceLineNo">456</span>  private static &lt;T extends Comparable&lt;T&gt;&gt; void removeFromRunQueue(<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      FairQueue&lt;T&gt; fairq, Queue&lt;T&gt; queue) {<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    if (AvlIterableList.isLinked(queue)) {<a name="line.458"></a>
+<span class="sourceLineNo">459</span>      fairq.remove(queue);<a name="line.459"></a>
+<span class="sourceLineNo">460</span>    }<a name="line.460"></a>
+<span class="sourceLineNo">461</span>  }<a name="line.461"></a>
+<span class="sourceLineNo">462</span><a name="line.462"></a>
+<span class="sourceLineNo">463</span>  // ============================================================================<a name="line.463"></a>
+<span class="sourceLineNo">464</span>  //  Table Queue Lookup Helpers<a name="line.464"></a>
+<span class="sourceLineNo">465</span>  // ============================================================================<a name="line.465"></a>
+<span class="sourceLineNo">466</span>  private TableQueue getTableQueue(TableName tableName) {<a name="line.466"></a>
+<span class="sourceLineNo">467</span>    TableQueue node = AvlTree.get(tableMap, tableName, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.467"></a>
+<span class="sourceLineNo">468</span>    if (node != null) return node;<a name="line.468"></a>
+<span class="sourceLineNo">469</span><a name="line.469"></a>
+<span class="sourceLineNo">470</span>    node = new TableQueue(tableName, tablePriorities.getPriority(tableName),<a name="line.470"></a>
+<span class="sourceLineNo">471</span>        locking.getTableLock(tableName), locking.getNamespaceLock(tableName.getNamespaceAsString()));<a name="line.471"></a>
+<span class="sourceLineNo">472</span>    tableMap = AvlTree.insert(tableMap, node);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    return node;<a name="line.473"></a>
+<span class="sourceLineNo">474</span>  }<a name="line.474"></a>
+<span class="sourceLineNo">475</span><a name="line.475"></a>
+<span class="sourceLineNo">476</span>  private void removeTableQueue(TableName tableName) {<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    tableMap = AvlTree.remove(tableMap, tableName, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    locking.removeTableLock(tableName);<a name="line.478"></a>
 <span class="sourceLineNo">479</span>  }<a name="line.479"></a>
 <span class="sourceLineNo">480</span><a name="line.480"></a>
-<span class="sourceLineNo">481</span>  private static boolean isServerProcedure(Procedure proc) {<a name="line.481"></a>
-<span class="sourceLineNo">482</span>    return proc instanceof ServerProcedureInterface;<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>  private static ServerName getServerName(Procedure proc) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span>    return ((ServerProcedureInterface)proc).getServerName();<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>  // ============================================================================<a name="line.489"></a>
-<span class="sourceLineNo">490</span>  //  Table and Server Queue Implementation<a name="line.490"></a>
-<span class="sourceLineNo">491</span>  // ============================================================================<a name="line.491"></a>
-<span class="sourceLineNo">492</span>  private static class ServerQueueKeyComparator implements AvlKeyComparator&lt;ServerQueue&gt; {<a name="line.492"></a>
-<span class="sourceLineNo">493</span>    @Override<a name="line.493"></a>
-<span class="sourceLineNo">494</span>    public int compareKey(ServerQueue node, Object key) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span>      return node.compareKey((ServerName)key);<a name="line.495"></a>
-<span class="sourceLineNo">496</span>    }<a name="line.496"></a>
-<span class="sourceLineNo">497</span>  }<a name="line.497"></a>
-<span class="sourceLineNo">498</span><a name="line.498"></a>
-<span class="sourceLineNo">499</span>  public static class ServerQueue extends Queue&lt;ServerName&gt; {<a name="line.499"></a>
-<span class="sourceLineNo">500</span>    public ServerQueue(ServerName serverName, LockStatus serverLock) {<a name="line.500"></a>
-<span class="sourceLineNo">501</span>      super(serverName, serverLock);<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    }<a name="line.502"></a>
-<span class="sourceLineNo">503</span><a name="line.503"></a>
-<span class="sourceLineNo">504</span>    @Override<a name="line.504"></a>
-<span class="sourceLineNo">505</span>    public boolean requireExclusiveLock(Procedure proc) {<a name="line.505"></a>
-<span class="sourceLineNo">506</span>      ServerProcedureInterface spi = (ServerProcedureInterface)proc;<a name="line.506"></a>
-<span class="sourceLineNo">507</span>      switch (spi.getServerOperationType()) {<a name="line.507"></a>
-<span class="sourceLineNo">508</span>        case CRASH_HANDLER:<a name="line.508"></a>
-<span class="sourceLineNo">509</span>          return true;<a name="line.509"></a>
-<span class="sourceLineNo">510</span>        default:<a name="line.510"></a>
-<span class="sourceLineNo">511</span>          break;<a name="line.511"></a>
-<span class="sourceLineNo">512</span>      }<a name="line.512"></a>
-<span class="sourceLineNo">513</span>      throw new UnsupportedOperationException("unexpected type " + spi.getServerOperationType());<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    }<a name="line.514"></a>
-<span class="sourceLineNo">515</span>  }<a name="line.515"></a>
-<span class="sourceLineNo">516</span><a name="line.516"></a>
-<span class="sourceLineNo">517</span>  private static class TableQueueKeyComparator implements AvlKeyComparator&lt;TableQueue&gt; {<a name="line.517"></a>
-<span class="sourceLineNo">518</span>    @Override<a name="line.518"></a>
-<span class="sourceLineNo">519</span>    public int compareKey(TableQueue node, Object key) {<a name="line.519"></a>
-<span class="sourceLineNo">520</span>      return node.compareKey((TableName)key);<a name="line.520"></a>
-<span class="sourceLineNo">521</span>    }<a name="line.521"></a>
-<span class="sourceLineNo">522</span>  }<a name="line.522"></a>
-<span class="sourceLineNo">523</span><a name="line.523"></a>
-<span class="sourceLineNo">524</span>  public static class TableQueue extends Queue&lt;TableName&gt; {<a name="line.524"></a>
-<span class="sourceLineNo">525</span>    private final LockStatus namespaceLockStatus;<a name="line.525"></a>
-<span class="sourceLineNo">526</span><a name="line.526"></a>
-<span class="sourceLineNo">527</span>    public TableQueue(TableName tableName, int priority, LockStatus tableLock,<a name="line.527"></a>
-<span class="sourceLineNo">528</span>        LockStatus namespaceLockStatus) {<a name="line.528"></a>
-<span class="sourceLineNo">529</span>      super(tableName, priority, tableLock);<a name="line.529"></a>
-<span class="sourceLineNo">530</span>      this.namespaceLockStatus = namespaceLockStatus;<a name="line.530"></a>
-<span class="sourceLineNo">531</span>    }<a name="line.531"></a>
-<span class="sourceLineNo">532</span><a name="line.532"></a>
-<span class="sourceLineNo">533</span>    @Override<a name="line.533"></a>
-<span class="sourceLineNo">534</span>    public boolean isAvailable() {<a name="line.534"></a>
-<span class="sourceLineNo">535</span>      // if there are no items in the queue, or the namespace is locked.<a name="line.535"></a>
-<span class="sourceLineNo">536</span>      // we can't execute operation on this table<a name="line.536"></a>
-<span class="sourceLineNo">537</span>      if (isEmpty() || namespaceLockStatus.hasExclusiveLock()) {<a name="line.537"></a>
-<span class="sourceLineNo">538</span>        return false;<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>      if (getLockStatus().hasExclusiveLock()) {<a name="line.541"></a>
-<span class="sourceLineNo">542</span>        // if we have an exclusive lock already taken<a name="line.542"></a>
-<span class="sourceLineNo">543</span>        // only child of the lock owner can be executed<a name="line.543"></a>
-<span class="sourceLineNo">544</span>        final Procedure nextProc = peek();<a name="line.544"></a>
-<span class="sourceLineNo">545</span>        return nextProc != null &amp;&amp; getLockStatus().hasLockAccess(nextProc);<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>      // no xlock<a name="line.548"></a>
-<span class="sourceLineNo">549</span>      return true;<a name="line.549"></a>
-<span class="sourceLineNo">550</span>    }<a name="line.550"></a>
-<span class="sourceLineNo">551</span><a name="line.551"></a>
-<span class="sourceLineNo">552</span>    @Override<a name="line.552"></a>
-<span class="sourceLineNo">553</span>    public boolean requireExclusiveLock(Procedure proc) {<a name="line.553"></a>
-<span class="sourceLineNo">554</span>      return requireTableExclusiveLock((TableProcedureInterface)proc);<a name="line.554"></a>
-<span class="sourceLineNo">555</span>    }<a name="line.555"></a>
-<span class="sourceLineNo">556</span>  }<a name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span>  // ============================================================================<a name="line.558"></a>
-<span class="sourceLineNo">559</span>  //  Table Locking Helpers<a name="line.559"></a>
-<span class="sourceLineNo">560</span>  // ============================================================================<a name="line.560"></a>
-<span class="sourceLineNo">561</span>  private static boolean requireTableExclusiveLock(TableProcedureInterface proc) {<a name="line.561"></a>
-<span class="sourceLineNo">562</span>    switch (proc.getTableOperationType()) {<a name="line.562"></a>
-<span class="sourceLineNo">563</span>      case CREATE:<a name="line.563"></a>
-<span class="sourceLineNo">564</span>      case DELETE:<a name="line.564"></a>
-<span class="sourceLineNo">565</span>      case DISABLE:<a name="line.565"></a>
-<span class="sourceLineNo">566</span>      case ENABLE:<a name="line.566"></a>
-<span class="sourceLineNo">567</span>        return true;<a name="line.567"></a>
-<span class="sourceLineNo">568</span>      case EDIT:<a name="line.568"></a>
-<span class="sourceLineNo">569</span>        // we allow concurrent edit on the NS table<a name="line.569"></a>
-<span class="sourceLineNo">570</span>        return !proc.getTableName().equals(TableName.NAMESPACE_TABLE_NAME);<a name="line.570"></a>
-<span class="sourceLineNo">571</span>      case READ:<a name="line.571"></a>
-<span class="sourceLineNo">572</span>        return false;<a name="line.572"></a>
-<span class="sourceLineNo">573</span>      // region operations are using the shared-lock on the table<a name="line.573"></a>
-<span class="sourceLineNo">574</span>      // and then they will grab an xlock on the region.<a name="line.574"></a>
-<span class="sourceLineNo">575</span>      case SPLIT:<a name="line.575"></a>
-<span class="sourceLineNo">576</span>      case MERGE:<a name="line.576"></a>
-<span class="sourceLineNo">577</span>      case ASSIGN:<a name="line.577"></a>
-<span class="sourceLineNo">578</span>      case UNASSIGN:<a name="line.578"></a>
-<span class="sourceLineNo">579</span>      case REGION_EDIT:<a name="line.579"></a>
-<span class="sourceLineNo">580</span>        return false;<a name="line.580"></a>
-<span class="sourceLineNo">581</span>      default:<a name="line.581"></a>
-<span class="sourceLineNo">582</span>        break;<a name="line.582"></a>
-<span class="sourceLineNo">583</span>    }<a name="line.583"></a>
-<span class="sourceLineNo">584</span>    throw new UnsupportedOperationException("unexpected type " +<a name="line.584"></a>
-<span class="sourceLineNo">585</span>        proc.getTableOperationType());<a name="line.585"></a>
-<span class="sourceLineNo">586</span>  }<a name="line.586"></a>
-<span class="sourceLineNo">587</span><a name="line.587"></a>
-<span class="sourceLineNo">588</span>  /**<a name="line.588"></a>
-<span class="sourceLineNo">589</span>   * Suspend the procedure if the specified table is already locked.<a name="line.589"></a>
-<span class="sourceLineNo">590</span>   * Other operations in the table-queue will be executed after the lock is released.<a name="line.590"></a>
-<span class="sourceLineNo">591</span>   * @param procedure the procedure trying to acquire the lock<a name="line.591"></a>
-<span class="sourceLineNo">592</span>   * @param table Table to lock<a name="line.592"></a>
-<span class="sourceLineNo">593</span>   * @return true if the procedure has to wait for the table to be available<a name="line.593"></a>
-<span class="sourceLineNo">594</span>   */<a name="line.594"></a>
-<span class="sourceLineNo">595</span>  public boolean waitTableExclusiveLock(final Procedure procedure, final TableName table) {<a name="line.595"></a>
-<span class="sourceLineNo">596</span>    schedLock();<a name="line.596"></a>
-<span class="sourceLineNo">597</span>    try {<a name="line.597"></a>
-<span class="sourceLineNo">598</span>      final LockAndQueue namespaceLock = locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.598"></a>
-<span class="sourceLineNo">599</span>      final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.599"></a>
-<span class="sourceLineNo">600</span>      if (!namespaceLock.trySharedLock()) {<a name="line.600"></a>
-<span class="sourceLineNo">601</span>        waitProcedure(namespaceLock, procedure);<a name="line.601"></a>
-<span class="sourceLineNo">602</span>        return true;<a name="line.602"></a>
-<span class="sourceLineNo">603</span>      }<a name="line.603"></a>
-<span class="sourceLineNo">604</span>      if (!tableLock.tryExclusiveLock(procedure)) {<a name="line.604"></a>
-<span class="sourceLineNo">605</span>        namespaceLock.releaseSharedLock();<a name="line.605"></a>
-<span class="sourceLineNo">606</span>        waitProcedure(tableLock, procedure);<a name="line.606"></a>
-<span class="sourceLineNo">607</span>        return true;<a name="line.607"></a>
-<span class="sourceLineNo">608</span>      }<a name="line.608"></a>
-<span class="sourceLineNo">609</span>      removeFromRunQueue(tableRunQueue, getTableQueue(table));<a name="line.609"></a>
-<span class="sourceLineNo">610</span>      return false;<a name="line.610"></a>
-<span class="sourceLineNo">611</span>    } finally {<a name="line.611"></a>
-<span class="sourceLineNo">612</span>      schedUnlock();<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    }<a name="line.613"></a>
-<span class="sourceLineNo">614</span>  }<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>   * Wake the procedures waiting for the specified table<a name="line.617"></a>
-<span class="sourceLineNo">618</span>   * @param procedure the procedure releasing the lock<a name="line.618"></a>
-<span class="sourceLineNo">619</span>   * @param table the name of the table that has the exclusive lock<a name="line.619"></a>
-<span class="sourceLineNo">620</span>   */<a name="line.620"></a>
-<span class="sourceLineNo">621</span>  public void wakeTableExclusiveLock(final Procedure procedure, final TableName table) {<a name="line.621"></a>
-<span class="sourceLineNo">622</span>    schedLock();<a name="line.622"></a>
-<span class="sourceLineNo">623</span>    try {<a name="line.623"></a>
-<span class="sourceLineNo">624</span>      final LockAndQueue namespaceLock = locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.624"></a>
-<span class="sourceLineNo">625</span>      final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.625"></a>
-<span class="sourceLineNo">626</span>      int waitingCount = 0;<a name="line.626"></a>
-<span class="sourceLineNo">627</span><a name="line.627"></a>
-<span class="sourceLineNo">628</span>      if (!tableLock.hasParentLock(procedure)) {<a name="line.628"></a>
-<span class="sourceLineNo">629</span>        tableLock.releaseExclusiveLock(procedure);<a name="line.629"></a>
-<span class="sourceLineNo">630</span>        waitingCount += wakeWaitingProcedures(tableLock);<a name="line.630"></a>
-<span class="sourceLineNo">631</span>      }<a name="line.631"></a>
-<span class="sourceLineNo">632</span>      if (namespaceLock.releaseSharedLock()) {<a name="line.632"></a>
-<span class="sourceLineNo">633</span>        waitingCount += wakeWaitingProcedures(namespaceLock);<a name="line.633"></a>
-<span class="sourceLineNo">634</span>      }<a name="line.634"></a>
-<span class="sourceLineNo">635</span>      addToRunQueue(tableRunQueue, getTableQueue(table));<a name="line.635"></a>
-<span class="sourceLineNo">636</span>      wakePollIfNeeded(waitingCount);<a name="line.636"></a>
-<span class="sourceLineNo">637</span>    } finally {<a name="line.637"></a>
-<span class="sourceLineNo">638</span>      schedUnlock();<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    }<a name="line.639"></a>
-<span class="sourceLineNo">640</span>  }<a name="line.640"></a>
-<span class="sourceLineNo">641</span><a name="line.641"></a>
-<span class="sourceLineNo">642</span>  /**<a name="line.642"></a>
-<span class="sourceLineNo">643</span>   * Suspend the procedure if the specified table is already locked.<a name="line.643"></a>
-<span class="sourceLineNo">644</span>   * other "read" operations in the table-queue may be executed concurrently,<a name="line.644"></a>
-<span class="sourceLineNo">645</span>   * @param procedure the procedure trying to acquire the lock<a name="line.645"></a>
-<span class="sourceLineNo">646</span>   * @param table Table to lock<a name="line.646"></a>
-<span class="sourceLineNo">647</span>   * @return true if the procedure has to wait for the table to be available<a name="line.647"></a>
-<span class="sourceLineNo">648</span>   */<a name="line.648"></a>
-<span class="sourceLineNo">649</span>  public boolean waitTableSharedLock(final Procedure procedure, final TableName table) {<a name="line.649"></a>
-<span class="sourceLineNo">650</span>    return waitTableQueueSharedLock(procedure, table) == null;<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>  private TableQueue waitTableQueueSharedLock(final Procedure procedure, final TableName table) {<a name="line.653"></a>
-<span class="sourceLineNo">654</span>    schedLock();<a name="line.654"></a>
-<span class="sourceLineNo">655</span>    try {<a name="line.655"></a>
-<span class="sourceLineNo">656</span>      final LockAndQueue namespaceLock = locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.656"></a>
-<span class="sourceLineNo">657</span>      final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.657"></a>
-<span class="sourceLineNo">658</span>      if (!namespaceLock.trySharedLock()) {<a name="line.658"></a>
-<span class="sourceLineNo">659</span>        waitProcedure(namespaceLock, procedure);<a name="line.659"></a>
-<span class="sourceLineNo">660</span>        return null;<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>      if (!tableLock.trySharedLock()) {<a name="line.663"></a>
-<span class="sourceLineNo">664</span>        namespaceLock.releaseSharedLock();<a name="line.664"></a>
-<span class="sourceLineNo">665</span>        waitProcedure(tableLock, procedure);<a name="line.665"></a>
-<span class="sourceLineNo">666</span>        return null;<a name="line.666"></a>
-<span class="sourceLineNo">667</span>      }<a name="line.667"></a>
-<span class="sourceLineNo">668</span><a name="line.668"></a>
-<span class="sourceLineNo">669</span>      return getTableQueue(table);<a name="line.669"></a>
-<span class="sourceLineNo">670</span>    } finally {<a name="line.670"></a>
-<span class="sourceLineNo">671</span>      schedUnlock();<a name="line.671"></a>
-<span class="sourceLineNo">672</span>    }<a name="line.672"></a>
-<span class="sourceLineNo">673</span>  }<a name="line.673"></a>
-<span class="sourceLineNo">674</span><a name="line.674"></a>
-<span class="sourceLineNo">675</span>  /**<a name="line.675"></a>
-<span class="sourceLineNo">676</span>   * Wake the procedures waiting for the specified table<a name="line.676"></a>
-<span class="sourceLineNo">677</span>   * @param procedure the procedure releasing the lock<a name="line.677"></a>
-<span class="sourceLineNo">678</span>   * @param table the name of the table that has the shared lock<a name="line.678"></a>
-<span class="sourceLineNo">679</span>   */<a name="line.679"></a>
-<span class="sourceLineNo">680</span>  public void wakeTableSharedLock(final Procedure procedure, final TableName table) {<a name="line.680"></a>
-<span class="sourceLineNo">681</span>    schedLock();<a name="line.681"></a>
-<span class="sourceLineNo">682</span>    try {<a name="line.682"></a>
-<span class="sourceLineNo">683</span>      final LockAndQueue namespaceLock = locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.683"></a>
-<span class="sourceLineNo">684</span>      final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.684"></a>
-<span class="sourceLineNo">685</span>      int waitingCount = 0;<a name="line.685"></a>
-<span class="sourceLineNo">686</span>      if (tableLock.releaseSharedLock()) {<a name="line.686"></a>
-<span class="sourceLineNo">687</span>        addToRunQueue(tableRunQueue, getTableQueue(table));<a name="line.687"></a>
-<span class="sourceLineNo">688</span>        waitingCount += wakeWaitingProcedures(tableLock);<a name="line.688"></a>
-<span class="sourceLineNo">689</span>      }<a name="line.689"></a>
-<span class="sourceLineNo">690</span>      if (namespaceLock.releaseSharedLock()) {<a name="line.690"></a>
-<span class="sourceLineNo">691</span>        waitingCount += wakeWaitingProcedures(namespaceLock);<a name="line.691"></a>
-<span class="sourceLineNo">692</span>      }<a name="line.692"></a>
-<span class="sourceLineNo">693</span>      wakePollIfNeeded(waitingCount);<a name="line.693"></a>
-<span class="sourceLineNo">694</span>    } finally {<a name="line.694"></a>
-<span class="sourceLineNo">695</span>      schedUnlock();<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>  /**<a name="line.699"></a>
-<span class="sourceLineNo">700</span>   * Tries to remove the queue and the table-lock of the specified table.<a name="line.700"></a>
-<span class="sourceLineNo">701</span>   * If there are new operations pending (e.g. a new create),<a name="line.701"></a>
-<span class="sourceLineNo">702</span>   * the remove will not be performed.<a name="line.702"></a>
-<span class="sourceLineNo">703</span>   * @param table the name of the table that should be marked as deleted<a name="line.703"></a>
-<span class="sourceLineNo">704</span>   * @param procedure the procedure that is removing the table<a name="line.704"></a>
-<span class="sourceLineNo">705</span>   * @return true if deletion succeeded, false otherwise meaning that there are<a name="line.705"></a>
-<span class="sourceLineNo">706</span>   *     other new operations pending for that table (e.g. a new create).<a name="line.706"></a>
-<span class="sourceLineNo">707</span>   */<a name="line.707"></a>
-<span class="sourceLineNo">708</span>  @VisibleForTesting<a name="line.708"></a>
-<span class="sourceLineNo">709</span>  protected boolean markTableAsDeleted(final TableName table, final Procedure procedure) {<a name="line.709"></a>
-<span class="sourceLineNo">710</span>    schedLock();<a name="line.710"></a>
-<span class="sourceLineNo">711</span>    try {<a name="line.711"></a>
-<span class="sourceLineNo">712</span>      final TableQueue queue = getTableQueue(table);<a name="line.712"></a>
-<span class="sourceLineNo">713</span>      final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.713"></a>
-<span class="sourceLineNo">714</span>      if (queue == null) return true;<a name="line.714"></a>
-<span class="sourceLineNo">715</span><a name="line.715"></a>
-<span class="sourceLineNo">716</span>      if (queue.isEmpty() &amp;&amp; tableLock.tryExclusiveLock(procedure)) {<a name="line.716"></a>
-<span class="sourceLineNo">717</span>        // remove the table from the run-queue and the map<a name="line.717"></a>
-<span class="sourceLineNo">718</span>        if (AvlIterableList.isLinked(queue)) {<a name="line.718"></a>
-<span class="sourceLineNo">719</span>          tableRunQueue.remove(queue);<a name="line.719"></a>
-<span class="sourceLineNo">720</span>        }<a name="line.720"></a>
-<span class="sourceLineNo">721</span>        removeTableQueue(table);<a name="line.721"></a>
-<span class="sourceLineNo">722</span>      } else {<a name="line.722"></a>
-<span class="sourceLineNo">723</span>        // TODO: If there are no create, we can drop all the other ops<a name="line.723"></a>
-<span class="sourceLineNo">724</span>        return false;<a name="line.724"></a>
-<span class="sourceLineNo">725</span>      }<a name="line.725"></a>
-<span class="sourceLineNo">726</span>    } finally {<a name="line.726"></a>
-<span class="sourceLineNo">727</span>      schedUnlock();<a name="line.727"></a>
-<span class="sourceLineNo">728</span>    }<a name="line.728"></a>
-<span class="sourceLineNo">729</span>    return true;<a name="line.729"></a>
-<span class="sourceLineNo">730</span>  }<a name="line.730"></a>
-<span class="sourceLineNo">731</span><a name="line.731"></a>
-<span class="sourceLineNo">732</span>  // ============================================================================<a name="line.732"></a>
-<span class="sourceLineNo">733</span>  //  Region Locking Helpers<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>   * Suspend the procedure if the specified region is already locked.<a name="line.736"></a>
-<span class="sourceLineNo">737</span>   * @param procedure the procedure trying to acquire the lock on the region<a name="line.737"></a>
-<span class="sourceLineNo">738</span>   * @param regionInfo the region we are trying to lock<a name="line.738"></a>
-<span class="sourceLineNo">739</span>   * @return true if the procedure has to wait for the regions to be available<a name="line.739"></a>
-<span class="sourceLineNo">740</span>   */<a name="line.740"></a>
-<span class="sourceLineNo">741</span>  public boolean waitRegion(final Procedure procedure, final HRegionInfo regionInfo) {<a name="line.741"></a>
-<span class="sourceLineNo">742</span>    return waitRegions(procedure, regionInfo.getTable(), regionInfo);<a name="line.742"></a>
-<span class="sourceLineNo">743</span>  }<a name="line.743"></a>
-<span class="sourceLineNo">744</span><a name="line.744"></a>
-<span class="sourceLineNo">745</span>  /**<a name="line.745"></a>
-<span class="sourceLineNo">746</span>   * Suspend the procedure if the specified set of regions are already locked.<a name="line.746"></a>
-<span class="sourceLineNo">747</span>   * @param procedure the procedure trying to acquire the lock on the regions<a name="line.747"></a>
-<span class="sourceLineNo">748</span>   * @param table the table name of the regions we are trying to lock<a name="line.748"></a>
-<span class="sourceLineNo">749</span>   * @param regionInfo the list of regions we are trying to lock<a name="line.749"></a>
-<span class="sourceLineNo">750</span>   * @return true if the procedure has to wait for the regions to be available<a name="line.750"></a>
-<span class="sourceLineNo">751</span>   */<a name="line.751"></a>
-<span class="sourceLineNo">752</span>  public boolean waitRegions(final Procedure procedure, final TableName table,<a name="line.752"></a>
-<span class="sourceLineNo">753</span>      final HRegionInfo... regionInfo) {<a name="line.753"></a>
-<span class="sourceLineNo">754</span>    Arrays.sort(regionInfo);<a name="line.754"></a>
-<span class="sourceLineNo">755</span>    schedLock();<a name="line.755"></a>
-<span class="sourceLineNo">756</span>    try {<a name="line.756"></a>
-<span class="sourceLineNo">757</span>      // If there is parent procedure, it would have already taken xlock, so no need to take<a name="line.757"></a>
-<span class="sourceLineNo">758</span>      // shared lock here. Otherwise, take shared lock.<a name="line.758"></a>
-<span class="sourceLineNo">759</span>      if (!procedure.hasParent()<a name="line.759"></a>
-<span class="sourceLineNo">760</span>          &amp;&amp; waitTableQueueSharedLock(procedure, table) == null) {<a name="line.760"></a>
-<span class="sourceLineNo">761</span>          return true;<a name="line.761"></a>
-<span class="sourceLineNo">762</span>      }<a name="line.762"></a>
-<span class="sourceLineNo">763</span><a name="line.763"></a>
-<span class="sourceLineNo">764</span>      // acquire region xlocks or wait<a name="line.764"></a>
-<span class="sourceLineNo">765</span>      boolean hasLock = true;<a name="line.765"></a>
-<span class="sourceLineNo">766</span>      final LockAndQueue[] regionLocks = new LockAndQueue[regionInfo.length];<a name="line.766"></a>
-<span class="sourceLineNo">767</span>      for (int i = 0; i &lt; regionInfo.length; ++i) {<a name="line.767"></a>
-<span class="sourceLineNo">768</span>        assert regionInfo[i].getTable().equals(table);<a name="line.768"></a>
-<span class="sourceLineNo">769</span>        assert i == 0 || regionInfo[i] != regionInfo[i - 1] : "duplicate region: " + regionInfo[i];<a name="line.769"></a>
-<span class="sourceLineNo">770</span><a name="line.770"></a>
-<span class="sourceLineNo">771</span>        regionLocks[i] = locking.getRegionLock(regionInfo[i].getEncodedName());<a name="line.771"></a>
-<span class="sourceLineNo">772</span>        if (!regionLocks[i].tryExclusiveLock(procedure)) {<a name="line.772"></a>
-<span class="sourceLineNo">773</span>          waitProcedure(regionLocks[i], procedure);<a name="line.773"></a>
-<span class="sourceLineNo">774</span>          hasLock = false;<a name="line.774"></a>
-<span class="sourceLineNo">775</span>          while (i-- &gt; 0) {<a name="line.775"></a>
-<span class="sourceLineNo">776</span>            regionLocks[i].releaseExclusiveLock(procedure);<a name="line.776"></a>
-<span class="sourceLineNo">777</span>          }<a name="line.777"></a>
-<span class="sourceLineNo">778</span>          break;<a name="line.778"></a>
-<span class="sourceLineNo">779</span>        }<a name="line.779"></a>
-<span class="sourceLineNo">780</span>      }<a name="line.780"></a>
+<span class="sourceLineNo">481</span><a name="line.481"></a>
+<span class="sourceLineNo">482</span>  private static boolean isTableProcedure(Procedure proc) {<a name="line.482"></a>
+<span class="sourceLineNo">483</span>    return proc instanceof TableProcedureInterface;<a name="line.483"></a>
+<span class="sourceLineNo">484</span>  }<a name="line.484"></a>
+<span class="sourceLineNo">485</span><a name="line.485"></a>
+<span class="sourceLineNo">486</span>  private static TableName getTableName(Procedure proc) {<a name="line.486"></a>
+<span class="sourceLineNo">487</span>    return ((TableProcedureInterface)proc).getTableName();<a name="line.487"></a>
+<span class="sourceLineNo">488</span>  }<a name="line.488"></a>
+<span class="sourceLineNo">489</span><a name="line.489"></a>
+<span class="sourceLineNo">490</span>  // ============================================================================<a name="line.490"></a>
+<span class="sourceLineNo">491</span>  //  Server Queue Lookup Helpers<a name="line.491"></a>
+<span class="sourceLineNo">492</span>  // ============================================================================<a name="line.492"></a>
+<span class="sourceLineNo">493</span>  private ServerQueue getServerQueue(ServerName serverName) {<a name="line.493"></a>
+<span class="sourceLineNo">494</span>    final int index = getBucketIndex(serverBuckets, serverName.hashCode());<a name="line.494"></a>
+<span class="sourceLineNo">495</span>    ServerQueue node = AvlTree.get(serverBuckets[index], serverName, SERVER_QUEUE_KEY_COMPARATOR);<a name="line.495"></a>
+<span class="sourceLineNo">496</span>    if (node != null) return node;<a name="line.496"></a>
+<span class="sourceLineNo">497</span><a name="line.497"></a>
+<span class="sourceLineNo">498</span>    node = new ServerQueue(serverName, locking.getServerLock(serverName));<a name="line.498"></a>
+<span class="sourceLineNo">499</span>    serverBuckets[index] = AvlTree.insert(serverBuckets[index], node);<a name="line.499"></a>
+<span class="sourceLineNo">500</span>    return node;<a name="line.500"></a>
+<span class="sourceLineNo">501</span>  }<a name="line.501"></a>
+<span class="sourceLineNo">502</span><a name="line.502"></a>
+<span class="sourceLineNo">503</span>  private static int getBucketIndex(Object[] buckets, int hashCode) {<a name="line.503"></a>
+<span class="sourceLineNo">504</span>    return Math.abs(hashCode) % buckets.length;<a name="line.504"></a>
+<span class="sourceLineNo">505</span>  }<a name="line.505"></a>
+<span class="sourceLineNo">506</span><a name="line.506"></a>
+<span class="sourceLineNo">507</span>  private static boolean isServerProcedure(Procedure proc) {<a name="line.507"></a>
+<span class="sourceLineNo">508</span>    return proc instanceof ServerProcedureInterface;<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>  private static ServerName getServerName(Procedure proc) {<a name="line.511"></a>
+<span class="sourceLineNo">512</span>    return ((ServerProcedureInterface)proc).getServerName();<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>  // ============================================================================<a name="line.515"></a>
+<span class="sourceLineNo">516</span>  //  Table and Server Queue Implementation<a name="line.516"></a>
+<span class="sourceLineNo">517</span>  // ============================================================================<a name="line.517"></a>
+<span class="sourceLineNo">518</span>  private static class ServerQueueKeyComparator implements AvlKeyComparator&lt;ServerQueue&gt; {<a name="line.518"></a>
+<span class="sourceLineNo">519</span>    @Override<a name="line.519"></a>
+<span class="sourceLineNo">520</span>    public int compareKey(ServerQueue node, Object key) {<a name="line.520"></a>
+<span class="sourceLineNo">521</span>      return node.compareKey((ServerName)key);<a name="line.521"></a>
+<span class="sourceLineNo">522</span>    }<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>  public static class ServerQueue extends Queue&lt;ServerName&gt; {<a name="line.525"></a>
+<span class="sourceLineNo">526</span>    public ServerQueue(ServerName serverName, LockStatus serverLock) {<a name="line.526"></a>
+<span class="sourceLineNo">527</span>      super(serverName, serverLock);<a name="line.527"></a>
+<span class="sourceLineNo">528</span>    }<a name="line.528"></a>
+<span class="sourceLineNo">529</span><a name="line.529"></a>
+<span class="sourceLineNo">530</span>    @Override<a name="line.530"></a>
+<span class="sourceLineNo">531</span>    public boolean requireExclusiveLock(Procedure proc) {<a name="line.531"></a>
+<span class="sourceLineNo">532</span>      ServerProcedureInterface spi = (ServerProcedureInterface)proc;<a name="line.532"></a>
+<span class="sourceLineNo">533</span>      switch (spi.getServerOperationType()) {<a name="line.533"></a>
+<span class="sourceLineNo">534</span>        case CRASH_HANDLER:<a name="line.534"></a>
+<span class="sourceLineNo">535</span>          return true;<a name="line.535"></a>
+<span class="sourceLineNo">536</span>        default:<a name="line.536"></a>
+<span class="sourceLineNo">537</span>          break;<a name="line.537"></a>
+<span class="sourceLineNo">538</span>      }<a name="line.538"></a>
+<span class="sourceLineNo">539</span>      throw new UnsupportedOperationException("unexpected type " + spi.getServerOperationType());<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>  private static class TableQueueKeyComparator implements AvlKeyComparator&lt;TableQueue&gt; {<a name="line.543"></a>
+<span class="sourceLineNo">544</span>    @Override<a name="line.544"></a>
+<span class="sourceLineNo">545</span>    public int compareKey(TableQueue node, Object key) {<a name="line.545"></a>
+<span class="sourceLineNo">546</span>      return node.compareKey((TableName)key);<a name="line.546"></a>
+<span class="sourceLineNo">547</span>    }<a name="line.547"></a>
+<span class="sourceLineNo">548</span>  }<a name="line.548"></a>
+<span class="sourceLineNo">549</span><a name="line.549"></a>
+<span class="sourceLineNo">550</span>  public static class TableQueue extends Queue&lt;TableName&gt; {<a name="line.550"></a>
+<span class="sourceLineNo">551</span>    private final LockStatus namespaceLockStatus;<a name="line.551"></a>
+<span class="sourceLineNo">552</span><a name="line.552"></a>
+<span class="sourceLineNo">553</span>    public TableQueue(TableName tableName, int priority, LockStatus tableLock,<a name="line.553"></a>
+<span class="sourceLineNo">554</span>        LockStatus namespaceLockStatus) {<a name="line.554"></a>
+<span class="sourceLineNo">555</span>      super(tableName, priority, tableLock);<a name="line.555"></a>
+<span class="sourceLineNo">556</span>      this.namespaceLockStatus = namespaceLockStatus;<a name="line.556"></a>
+<span class="sourceLineNo">557</span>    }<a name="line.557"></a>
+<span class="sourceLineNo">558</span><a name="line.558"></a>
+<span class="sourceLineNo">559</span>    @Override<a name="line.559"></a>
+<span class="sourceLineNo">560</span>    public boolean isAvailable() {<a name="line.560"></a>
+<span class="sourceLineNo">561</span>      // if there are no items in the queue, or the namespace is locked.<a name="line.561"></a>
+<span class="sourceLineNo">562</span>      // we can't execute operation on this table<a name="line.562"></a>
+<span class="sourceLineNo">563</span>      if (isEmpty() || namespaceLockStatus.hasExclusiveLock()) {<a name="line.563"></a>
+<span class="sourceLineNo">564</span>        return false;<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>      if (getLockStatus().hasExclusiveLock()) {<a name="line.567"></a>
+<span class="sourceLineNo">568</span>        // if we have an exclusive lock already taken<a name="line.568"></a>
+<span class="sourceLineNo">569</span>        // only child of the lock owner can be executed<a name="line.569"></a>
+<span class="sourceLineNo">570</span>        final Procedure nextProc = peek();<a name="line.570"></a>
+<span class="sourceLineNo">571</span>        return nextProc != null &amp;&amp; getLockStatus().hasLockAccess(nextProc);<a name="line.571"></a>
+<span class="sourceLineNo">572</span>      }<a name="line.572"></a>
+<span class="sourceLineNo">573</span><a name="line.573"></a>
+<span class="sourceLineNo">574</span>      // no xlock<a name="line.574"></a>
+<span class="sourceLineNo">575</span>      return true;<a name="line.575"></a>
+<span class="sourceLineNo">576</span>    }<a name="line.576"></a>
+<span class="sourceLineNo">577</span><a name="line.577"></a>
+<span class="sourceLineNo">578</span>    @Override<a name="line.578"></a>
+<span class="sourceLineNo">579</span>    public boolean requireExclusiveLock(Procedure proc) {<a name="line.579"></a>
+<span class="sourceLineNo">580</span>      return requireTableExclusiveLock((TableProcedureInterface)proc);<a name="line.580"></a>
+<span class="sourceLineNo">581</span>    }<a name="line.581"></a>
+<span class="sourceLineNo">582</span>  }<a name="line.582"></a>
+<span class="sourceLineNo">583</span><a name="line.583"></a>
+<span class="sourceLineNo">584</span>  // ============================================================================<a name="line.584"></a>
+<span class="sourceLineNo">585</span>  //  Table Locking Helpers<a name="line.585"></a>
+<span class="sourceLineNo">586</span>  // ============================================================================<a name="line.586"></a>
+<span class="sourceLineNo">587</span>  private static boolean requireTableExclusiveLock(TableProcedureInterface proc) {<a name="line.587"></a>
+<span class="sourceLineNo">588</span>    switch (proc.getTableOperationType()) {<a name="line.588"></a>
+<span class="sourceLineNo">589</span>      case CREATE:<a name="line.589"></a>
+<span class="sourceLineNo">590</span>      case DELETE:<a name="line.590"></a>
+<span class="sourceLineNo">591</span>      case DISABLE:<a name="line.591"></a>
+<span class="sourceLineNo">592</span>      case ENABLE:<a name="line.592"></a>
+<span class="sourceLineNo">593</span>        return true;<a name="line.593"></a>
+<span class="sourceLineNo">594</span>      case EDIT:<a name="line.594"></a>
+<span class="sourceLineNo">595</span>        // we allow concurrent edit on the NS table<a name="line.595"></a>
+<span class="sourceLineNo">596</span>        return !proc.getTableName().equals(TableName.NAMESPACE_TABLE_NAME);<a name="line.596"></a>
+<span class="sourceLineNo">597</span>      case READ:<a name="line.597"></a>
+<span class="sourceLineNo">598</span>        return false;<a name="line.598"></a>
+<span class="sourceLineNo">599</span>      // region operations are using the shared-lock on the table<a name="line.599"></a>
+<span class="sourceLineNo">600</span>      // and then they will grab an xlock on the region.<a name="line.600"></a>
+<span class="sourceLineNo">601</span>      case SPLIT:<a name="line.601"></a>
+<span class="sourceLineNo">602</span>      case MERGE:<a name="line.602"></a>
+<span class="sourceLineNo">603</span>      case ASSIGN:<a name="line.603"></a>
+<span class="sourceLineNo">604</span>      case UNASSIGN:<a name="line.604"></a>
+<span class="sourceLineNo">605</span>      case REGION_EDIT:<a name="line.605"></a>
+<span class="sourceLineNo">606</span>        return false;<a name="line.606"></a>
+<span class="sourceLineNo">607</span>      default:<a name="line.607"></a>
+<span class="sourceLineNo">608</span>        break;<a name="line.608"></a>
+<span class="sourceLineNo">609</span>    }<a name="line.609"></a>
+<span class="sourceLineNo">610</span>    throw new UnsupportedOperationException("unexpected type " +<a name="line.610"></a>
+<span class="sourceLineNo">611</span>        proc.getTableOperationType());<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>  /**<a name="line.614"></a>
+<span class="sourceLineNo">615</span>   * Get lock info for a resource of specified type and name and log details<a name="line.615"></a>
+<span class="sourceLineNo">616</span>   */<a name="line.616"></a>
+<span class="sourceLineNo">617</span>  protected void logLockInfoForResource(LockInfo.ResourceType resourceType, String resourceName) {<a name="line.617"></a>
+<span class="sourceLineNo">618</span>    if (!LOG.isDebugEnabled()) {<a name="line.618"></a>
+<span class="sourceLineNo">619</span>      return;<a name="line.619"></a>
+<span class="sourceLineNo">620</span>    }<a name="line.620"></a>
+<span class="sourceLineNo">621</span><a name="line.621"></a>
+<span class="sourceLineNo">622</span>    LockInfo lockInfo = getLockInfoForResource(resourceType, resourceName);<a name="line.622"></a>
+<span class="sourceLineNo">623</span>    if (lockInfo != null) {<a name="line.623"></a>
+<span class="sourceLineNo">624</span>      String msg = resourceType.toString() + " '" + resourceName + "', shared lock count=" +<a name="line.624"></a>
+<span class="sourceLineNo">625</span>          lockInfo.getSharedLockCount();<a name="line.625"></a>
+<span class="sourceLineNo">626</span><a name="line.626"></a>
+<span class="sourceLineNo">627</span>      ProcedureInfo proc = lockInfo.getExclusiveLockOwnerProcedure();<a name="line.627"></a>
+<span class="sourceLineNo">628</span>      if (proc != null) {<a name="line.628"></a>
+<span class="sourceLineNo">629</span>        msg += ", exclusively locked by procId=" + proc.getProcId();<a name="line.629"></a>
+<span class="sourceLineNo">630</span>      }<a name="line.630"></a>
+<span class="sourceLineNo">631</span>      LOG.debug(msg);<a name="line.631"></a>
+<span class="sourceLineNo">632</span>    }<a name="line.632"></a>
+<span class="sourceLineNo">633</span>  }<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>   * Suspend the procedure if the specified table is already locked.<a name="line.636"></a>
+<span class="sourceLineNo">637</span>   * Other operations in the table-queue will be executed after the lock is released.<a name="line.637"></a>
+<span class="sourceLineNo">638</span>   * @param procedure the procedure trying to acquire the lock<a name="line.638"></a>
+<span class="sourceLineNo">639</span>   * @param table Table to lock<a name="line.639"></a>
+<span class="sourceLineNo">640</span>   * @return true if the procedure has to wait for the table to be available<a name="line.640"></a>
+<span class="sourceLineNo">641</span>   */<a name="line.641"></a>
+<span class="sourceLineNo">642</span>  public boolean waitTableExclusiveLock(final Procedure procedure, final TableName table) {<a name="line.642"></a>
+<span class="sourceLineNo">643</span>    schedLock();<a name="line.643"></a>
+<span class="sourceLineNo">644</span>    try {<a name="line.644"></a>
+<span class="sourceLineNo">645</span>      final String namespace = table.getNamespaceAsString();<a name="line.645"></a>
+<span class="sourceLineNo">646</span>      final LockAndQueue namespaceLock = locking.getNamespaceLock(namespace);<a name="line.646"></a>
+<span class="sourceLineNo">647</span>      final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.647"></a>
+<span class="sourceLineNo">648</span>      if (!namespaceLock.trySharedLock()) {<a name="line.648"></a>
+<span class="sourceLineNo">649</span>        waitProcedure(namespaceLock, procedure);<a name="line.649"></a>
+<span class="sourceLineNo">650</span>        logLockInfoForResource(LockInfo.ResourceType.NAMESPACE, namespace);<a name="line.650"></a>
+<span class="sourceLineNo">651</span>        return true;<a name="line.651"></a>
+<span class="sourceLineNo">652</span>      }<a name="line.652"></a>
+<span class="sourceLineNo">653</span>      if (!tableLock.tryExclusiveLock(procedure)) {<a name="line.653"></a>
+<span class="sourceLineNo">654</span>        namespaceLock.releaseSharedLock();<a name="line.654"></a>
+<span class="sourceLineNo">655</span>        waitProcedure(tableLock, procedure);<a name="line.655"></a>
+<span class="sourceLineNo">656</span>        logLockInfoForResource(LockInfo.ResourceType.TABLE, table.getNameAsString());<a name="line.656"></a>
+<span class="sourceLineNo">657</span>        return true;<a name="line.657"></a>
+<span class="sourceLineNo">658</span>      }<a name="line.658"></a>
+<span class="sourceLineNo">659</span>      removeFromRunQueue(tableRunQueue, getTableQueue(table));<a name="line.659"></a>
+<span class="sourceLineNo">660</span>      return false;<a name="line.660"></a>
+<span class="sourceLineNo">661</span>    } finally {<a name="line.661"></a>
+<span class="sourceLineNo">662</span>      schedUnlock();<a name="line.662"></a>
+<span class="sourceLineNo">663</span>    }<a name="line.663"></a>
+<span class="sourceLineNo">664</span>  }<a name="line.664"></a>
+<span class="sourceLineNo">665</span><a name="line.665"></a>
+<span class="sourceLineNo">666</span>  /**<a name="line.666"></a>
+<span class="sourceLineNo">667</span>   * Wake the procedures waiting for the specified table<a name="line.667"></a>
+<span class="sourceLineNo">668</span>   * @param procedure the procedure releasing the lock<a name="line.668"></a>
+<span class="sourceLineNo">669</span>   * @param table the name of the table that has the exclusive lock<a name="line.669"></a>
+<span class="sourceLineNo">670</span>   */<a name="line.670"></a>
+<span class="sourceLineNo">671</span>  public void wakeTableExclusiveLock(final Procedure procedure, final TableName table) {<a name="line.671"></a>
+<span class="sourceLineNo">672</span>    schedLock();<a name="line.672"></a>
+<span class="sourceLineNo">673</span>    try {<a name="line.673"></a>
+<span class="sourceLineNo">674</span>      final LockAndQueue namespaceLock = locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.674"></a>
+<span class="sourceLineNo">675</span>      final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.675"></a>
+<span class="sourceLineNo">676</span>      int waitingCount = 0;<a name="line.676"></a>
+<span class="sourceLineNo">677</span><a name="line.677"></a>
+<span class="sourceLineNo">678</span>      if (!tableLock.hasParentLock(procedure)) {<a name="line.678"></a>
+<span class="sourceLineNo">679</span>        tableLock.releaseExclusiveLock(procedure);<a name="line.679"></a>
+<span class="sourceLineNo">680</span>        waitingCount += wakeWaitingProcedures(tableLock);<a name="line.680"></a>
+<span class="sourceLineNo">681</span>      }<a name="line.681"></a>
+<span class="sourceLineNo">682</span>      if (namespaceLock.releaseSharedLock()) {<a name="line.682"></a>
+<span class="sourceLineNo">683</span>        waitingCount += wakeWaitingProcedures(namespaceLock);<a name="line.683"></a>
+<span class="sourceLineNo">684</span>      }<a name="line.684"></a>
+<span class="sourceLineNo">685</span>      addToRunQueue(tableRunQueue, getTableQueue(table));<a name="line.685"></a>
+<span class="sourceLineNo">686</span>      wakePollIfNeeded(waitingCount);<a name="line.686"></a>
+<span class="sourceLineNo">687</span>    } finally {<a name="line.687"></a>
+<span class="sourceLineNo">688</span>      schedUnlock();<a name="line.688"></a>
+<span class="sourceLineNo">689</span>    }<a name="line.689"></a>
+<span class="sourceLineNo">690</span>  }<a name="line.690"></a>
+<span class="sourceLineNo">691</span><a name="line.691"></a>
+<span class="sourceLineNo">692</span>  /**<a name="line.692"></a>
+<span class="sourceLineNo">693</span>   * Suspend the procedure if the specified table is already locked.<a name="line.693"></a>
+<span class="sourceLineNo">694</span>   * other "read" operations in the table-queue may be executed concurrently,<a name="line.694"></a>
+<span class="sourceLineNo">695</span>   * @param procedure the procedure trying to acquire the lock<a name="line.695"></a>
+<span class="sourceLineNo">696</span>   * @param table Table to lock<a name="line.696"></a>
+<span class="sourceLineNo">697</span>   * @return true if the procedure has to wait for the table to be available<a name="line.697"></a>
+<span class="sourceLineNo">698</span>   */<a name="line.698"></a>
+<span class="sourceLineNo">699</span>  public boolean waitTableSharedLock(final Procedure procedure, final TableName table) {<a name="line.699"></a>
+<span class="sourceLineNo">700</span>    return waitTableQueueSharedLock(procedure, table) == null;<a name="line.700"></a>
+<span class="sourceLineNo">701</span>  }<a name="line.701"></a>
+<span class="sourceLineNo">702</span><a name="line.702"></a>
+<span class="sourceLineNo">703</span>  private TableQueue waitTableQueueSharedLock(final Procedure procedure, final TableName table) {<a name="line.703"></a>
+<span class="sourceLineNo">704</span>    schedLock();<a name="line.704"></a>
+<span class="sourceLineNo">705</span>    try {<a name="line.705"></a>
+<span class="sourceLineNo">706</span>      final LockAndQueue namespaceLock = locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.706"></a>
+<span class="sourceLineNo">707</span>      final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.707"></a>
+<span class="sourceLineNo">708</span>      if (!namespaceLock.trySharedLock()) {<a name="line.708"></a>
+<span class="sourceLineNo">709</span>        waitProcedure(namespaceLock, procedure);<a name="line.709"></a>
+<span class="sourceLineNo">710</span>        return null;<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>      if (!tableLock.trySharedLock()) {<a name="line.713"></a>
+<span class="sourceLineNo">714</span>        namespaceLock.releaseSharedLock();<a name="line.714"></a>
+<span class="sourceLineNo">715</span>        waitProcedure(tableLock, procedure);<a name="line.715"></a>
+<span class="sourceLineNo">716</span>        return null;<a name="line.716"></a>
+<span class="sourceLineNo">717</span>      }<a name="line.717"></a>
+<span class="sourceLineNo">718</span><a name="line.718"></a>
+<span class="sourceLineNo">719</span>      return getTableQueue(table);<a name="line.719"></a>
+<span class="sourceLineNo">720</span>    } finally {<a name="line.720"></a>
+<span class="sourceLineNo">721</span>      schedUnlock();<a name="line.721"></a>
+<span class="sourceLineNo">722</span>    }<a name="line.722"></a>
+<span class="sourceLineNo">723</span>  }<a name="line.723"></a>
+<span class="sourceLineNo">724</span><a name="line.724"></a>
+<span class="sourceLineNo">725</span>  /**<a name="line.725"></a>
+<span class="sourceLineNo">726</span>   * Wake the procedures waiting for the specified table<a name="line.726"></a>
+<span class="sourceLineNo">727</span>   * @param procedure the procedure releasing the lock<a name="line.727"></a>
+<span class="sourceLineNo">728</span>   * @param table the name of the table that has the shared lock<a name="line.728"></a>
+<span class="sourceLineNo">729</span>   */<a name="line.729"></a>
+<span class="sourceLineNo">730</span>  public void wakeTableSharedLock(final Procedure procedure, final TableName table) {<a name="line.730"></a>
+<span class="sourceLineNo">731</span>    schedLock();<a name="line.731"></a>
+<span class="sourceLineNo">732</span>    try {<a name="line.732"></a>
+<span class="sourceLineNo">733</span>      final LockAndQueue namespaceLock = locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.733"></a>
+<span class="sourceLineNo">734</span>      final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.734"></a>
+<span class="sourceLineNo">735</span>      int waitingCount = 0;<a name="line.735"></a>
+<span class="sourceLineNo">736</span>      if (tableLock.releaseSharedLock()) {<a name="line.736"></a>
+<span class="sourceLineNo">737</span>        addToRunQueue(tableRunQueue, getTableQueue(table));<a name="line.737"></a>
+<span class="sourceLineNo">738</span>        waitingCount += wakeWaitingProcedures(tableLock);<a name="line.738"></a>
+<span class="sourceLineNo">739</span>      }<a name="line.739"></a>
+<span class="sourceLineNo">740</span>      if (namespaceLock.releaseSharedLock()) {<a name="line.740"></a>
+<span class="sourceLineNo">741</span>        waitingCount += wakeWaitingProcedures(namespaceLock);<a name="line.741"></a>
+<span class="sourceLineNo">742</span>      }<a name="line.742"></a>
+<span class="sourceLineNo">743</span>      wakePollIfNeeded(waitingCount);<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>   * Tries to remove the queue and the table-lock of the specified table.<a name="line.750"></a>
+<span class="sourceLineNo">751</span>   * If there are new operations pending (e.g. a new create),<a name="line.751"></a>
+<span class="sourceLineNo">752</span>   * the remove will not be performed.<a name="line.752"></a>
+<span class="sourceLineNo">753</span>   * @param table the name of the table that should be marked as deleted<a name="line.753"></a>
+<span class="sourceLineNo">754</span>   * @param procedure the procedure that is removing the table<a name="line.754"></a>
+<span class="sourceLineNo">755</span>   * @return true if deletion succeeded, false otherwise meaning that there are<a name="line.755"></a>
+<span class="sourceLineNo">756</span>   *     other new operations pending for that table (e.g. a new create).<a name="line.756"></a>
+<span class="sourceLineNo">757</span>   */<a name="line.757"></a>
+<span class="sourceLineNo">758</span>  @VisibleForTesting<a name="line.758"></a>
+<span class="sourceLineNo">759</span>  protected boolean markTableAsDeleted(final TableName table, final Procedure procedure) {<a name="line.759"></a>
+<span class="sourceLineNo">760</span>    schedLock();<a name="line.760"></a>
+<span class="sourceLineNo">761</span>    try {<a name="line.761"></a>
+<span class="sourceLineNo">762</span>      final TableQueue queue = getTableQueue(table);<a name="line.762"></a>
+<span class="sourceLineNo">763</span>      final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.763"></a>
+<span class="sourceLineNo">764</span>      if (queue == null) return true;<a name="line.764"></a>
+<span class="sourceLineNo">765</span><a name="line.765"></a>
+<span class="sourceLineNo">766</span>      if (queue.isEmpty() &amp;&amp; tableLock.tryExclusiveLock(procedure)) {<a name="line.766"></a>
+<span class="sourceLineNo">767</span>        // remove the table from the run-queue and the map<a name="line.767"></a>
+<span class="sourceLineNo">768</span>        if (AvlIterableList.isLinked(queue)) {<a name="line.768"></a>
+<span class="sourceLineNo">769</span>          tableRunQueue.remove(queue);<a name="line.769"></a>
+<span class="sourceLineNo">770</span>        }<a name="line.770"></a>
+<span class="sourceLineNo">771</span>        removeTableQueue(table);<a name="line.771"></a>
+<span class="sourceLineNo">772</span>      } else {<a name="line.772"></a>
+<span class="sourceLineNo">773</span>        // TODO: If there are no create, we can drop all the other ops<a name="line.773"></a>
+<span class="sourceLineNo">774</span>        return false;<a name="line.774"></a>
+<span class="sourceLineNo">775</span>      }<a name="line.775"></a>
+<span class="sourceLineNo">776</span>    } finally {<a name="line.776"></a>
+<span class="sourceLineNo">777</span>      schedUnlock();<a name="line.777"></a>
+<span class="sourceLineNo">778</span>    }<a name="line.778"></a>
+<span class="sourceLineNo">779</span>    return true;<a name="line.779"></a>
+<span class="sourceLineNo">780</span>  }<a name="line.780"></a>
 <span class="sourceLineNo">781</span><a name="line.781"></a>
-<span class="sourceLineNo">782</span>      if (!hasLock &amp;&amp; !procedure.hasParent()) {<a name="line.782"></a>
-<span class="sourceLineNo">783</span>        wakeTableSharedLock(procedure, table);<a name="line.783"></a>
-<span class="sourceLineNo">784</span>      }<a name="line.784"></a>
-<span class="sourceLineNo">785</span>      return !hasLock;<a name="line.785"></a>
-<span class="sourceLineNo">786</span>    } finally {<a name="line.786"></a>
-<span class="sourceLineNo">787</span>      schedUnlock();<a name="line.787"></a>
-<span class="sourceLineNo">788</span>    }<a name="line.788"></a>
-<span class="sourceLineNo">789</span>  }<a name="line.789"></a>
-<span class="sourceLineNo">790</span><a name="line.790"></a>
-<span class="sourceLineNo">791</span>  /**<a name="line.791"></a>
-<span class="sourceLineNo">792</span>   * Wake the procedures waiting for the specified region<a name="line.792"></a>
-<span class="sourceLineNo">793</span>   * @param procedure the procedure that was holding the region<a name="line.793"></a>
-<span class="sourceLineNo">794</span>   * @param regionInfo the region the procedure was holding<a name="line.794"></a>
-<span class="sourceLineNo">795</span>   */<a name="line.795"></a>
-<span class="sourceLineNo">796</span>  public void wakeRegion(final Procedure procedure, final HRegionInfo regionInfo) {<a name="line.796"></a>
-<span class="sourceLineNo">797</span>    wakeRegions(procedure, regionInfo.getTable(), regionInfo);<a name="line.797"></a>
-<span class="sourceLineNo">798</span>  }<a name="line.798"></a>
-<span class="sourceLineNo">799</span><a name="line.799"></a>
-<span class="sourceLineNo">800</span>  /**<a name="line.800"></a>
-<span class="sourceLineNo">801</span>   * Wake the procedures waiting for the specified regions<a name="line.801"></a>
-<span class="sourceLineNo">802</span>   * @param procedure the procedure that was holding the regions<a name="line.802"></a>
-<span class="sourceLineNo">803</span>   * @param regionInfo the list of regions the procedure was holding<a name="line.803"></a>
-<span class="sourceLineNo">804</span>   */<a name="line.804"></a>
-<span class="sourceLineNo">805</span>  public void wakeRegions(final Procedure procedure,final TableName table,<a name="line.805"></a>
-<span class="sourceLineNo">806</span>      final HRegionInfo... regionInfo) {<a name="line.806"></a>
-<span class="sourceLineNo">807</span>    Arrays.sort(regionInfo);<a name="line.807"></a>
-<span class="sourceLineNo">808</span>    schedLock();<a name="line.808"></a>
-<span class="sourceLineNo">809</span>    try {<a name="line.809"></a>
-<span class="sourceLineNo">810</span>      int numProcs = 0;<a name="line.810"></a>
-<span class="sourceLineNo">811</span>      final Procedure[] nextProcs = new Procedure[regionInfo.length];<a name="line.811"></a>
-<span class="sourceLineNo">812</span>      for (int i = 0; i &lt; regionInfo.length; ++i) {<a name="line.812"></a>
-<span class="sourceLineNo">813</span>        assert regionInfo[i].getTable().equals(table);<a name="line.813"></a>
-<span class="sourceLineNo">814</span>        assert i == 0 || regionInfo[i] != regionInfo[i - 1] : "duplicate region: " + regionInfo[i];<a name="line.814"></a>
-<span class="sourceLineNo">815</span><a name="line.815"></a>
-<span class="sourceLineNo">816</span>        LockAndQueue regionLock = locking.getRegionLock(regionInfo[i].getEncodedName());<a name="line.816"></a>
-<span class="sourceLineNo">817</span>        if (regionLock.releaseExclusiveLock(procedure)) {<a name="line.817"></a>
-<span class="sourceLineNo">818</span>          if (!regionLock.isEmpty()) {<a name="line.818"></a>
-<span class="sourceLineNo">819</span>            // release one procedure at the time since regions has an xlock<a name="line.819"></a>
-<span class="sourceLineNo">820</span>            nextProcs[numProcs++] = regionLock.removeFirst();<a name="line.820"></a>
-<span class="sourceLineNo">821</span>          } else {<a name="line.821"></a>
-<span class="sourceLineNo">822</span>            locking.removeRegionLock(regionInfo[i].getEncodedName());<a name="line.822"></a>
-

<TRUNCATED>

Mime
View raw message