http://git-wip-us.apache.org/repos/asf/hbase-site/blob/c91fafb4/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 83c8b9e..d1e0ec4 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
@@ -539,7 +539,7 @@
 <span class="sourceLineNo">531</span>      final String namespace = 
table.getNamespaceAsString();<a name="line.531"></a>
 <span class="sourceLineNo">532</span>      final LockAndQueue namespaceLock = 
locking.getNamespaceLock(namespace);<a name="line.532"></a>
 <span class="sourceLineNo">533</span>      final LockAndQueue tableLock = 
locking.getTableLock(table);<a name="line.533"></a>
-<span class="sourceLineNo">534</span>      if (!namespaceLock.trySharedLock()) 
{<a name="line.534"></a>
+<span class="sourceLineNo">534</span>      if 
(!namespaceLock.trySharedLock(procedure)) {<a name="line.534"></a>
 <span class="sourceLineNo">535</span>        waitProcedure(namespaceLock, 
procedure);<a name="line.535"></a>
 <span class="sourceLineNo">536</span>        
logLockedResource(LockedResourceType.NAMESPACE, namespace);<a 
name="line.536"></a>
 <span class="sourceLineNo">537</span>        return true;<a 
name="line.537"></a>
@@ -568,443 +568,438 @@
 <span class="sourceLineNo">560</span>      final LockAndQueue namespaceLock = 
locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.560"></a>
 <span class="sourceLineNo">561</span>      final LockAndQueue tableLock = 
locking.getTableLock(table);<a name="line.561"></a>
 <span class="sourceLineNo">562</span>      int waitingCount = 0;<a 
name="line.562"></a>
-<span class="sourceLineNo">563</span><a name="line.563"></a>
-<span class="sourceLineNo">564</span>      if 
(!tableLock.hasParentLock(procedure)) {<a name="line.564"></a>
-<span class="sourceLineNo">565</span>        
tableLock.releaseExclusiveLock(procedure);<a name="line.565"></a>
-<span class="sourceLineNo">566</span>        waitingCount += 
wakeWaitingProcedures(tableLock);<a name="line.566"></a>
-<span class="sourceLineNo">567</span>      }<a name="line.567"></a>
-<span class="sourceLineNo">568</span>      if 
(namespaceLock.releaseSharedLock()) {<a name="line.568"></a>
-<span class="sourceLineNo">569</span>        waitingCount += 
wakeWaitingProcedures(namespaceLock);<a name="line.569"></a>
-<span class="sourceLineNo">570</span>      }<a name="line.570"></a>
-<span class="sourceLineNo">571</span>      addToRunQueue(tableRunQueue, 
getTableQueue(table));<a name="line.571"></a>
-<span class="sourceLineNo">572</span>      wakePollIfNeeded(waitingCount);<a 
name="line.572"></a>
-<span class="sourceLineNo">573</span>    } finally {<a name="line.573"></a>
-<span class="sourceLineNo">574</span>      schedUnlock();<a 
name="line.574"></a>
-<span class="sourceLineNo">575</span>    }<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>  /**<a name="line.578"></a>
-<span class="sourceLineNo">579</span>   * Suspend the procedure if the 
specified table is already locked.<a name="line.579"></a>
-<span class="sourceLineNo">580</span>   * other "read" operations in the 
table-queue may be executed concurrently,<a name="line.580"></a>
-<span class="sourceLineNo">581</span>   * @param procedure the procedure 
trying to acquire the lock<a name="line.581"></a>
-<span class="sourceLineNo">582</span>   * @param table Table to lock<a 
name="line.582"></a>
-<span class="sourceLineNo">583</span>   * @return true if the procedure has to 
wait for the table to be available<a name="line.583"></a>
-<span class="sourceLineNo">584</span>   */<a name="line.584"></a>
-<span class="sourceLineNo">585</span>  public boolean 
waitTableSharedLock(final Procedure&lt;?&gt; procedure, final TableName table) 
{<a name="line.585"></a>
-<span class="sourceLineNo">586</span>    return 
waitTableQueueSharedLock(procedure, table) == null;<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>  private TableQueue 
waitTableQueueSharedLock(final Procedure&lt;?&gt; procedure, final TableName 
table) {<a name="line.589"></a>
-<span class="sourceLineNo">590</span>    schedLock();<a name="line.590"></a>
-<span class="sourceLineNo">591</span>    try {<a name="line.591"></a>
-<span class="sourceLineNo">592</span>      final LockAndQueue namespaceLock = 
locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.592"></a>
-<span class="sourceLineNo">593</span>      final LockAndQueue tableLock = 
locking.getTableLock(table);<a name="line.593"></a>
-<span class="sourceLineNo">594</span>      if (!namespaceLock.trySharedLock()) 
{<a name="line.594"></a>
-<span class="sourceLineNo">595</span>        waitProcedure(namespaceLock, 
procedure);<a name="line.595"></a>
-<span class="sourceLineNo">596</span>        return null;<a 
name="line.596"></a>
-<span class="sourceLineNo">597</span>      }<a name="line.597"></a>
-<span class="sourceLineNo">598</span><a name="line.598"></a>
-<span class="sourceLineNo">599</span>      if (!tableLock.trySharedLock()) {<a 
name="line.599"></a>
-<span class="sourceLineNo">600</span>        
namespaceLock.releaseSharedLock();<a name="line.600"></a>
-<span class="sourceLineNo">601</span>        waitProcedure(tableLock, 
procedure);<a name="line.601"></a>
-<span class="sourceLineNo">602</span>        return null;<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>      return getTableQueue(table);<a 
name="line.605"></a>
-<span class="sourceLineNo">606</span>    } finally {<a name="line.606"></a>
-<span class="sourceLineNo">607</span>      schedUnlock();<a 
name="line.607"></a>
-<span class="sourceLineNo">608</span>    }<a name="line.608"></a>
-<span class="sourceLineNo">609</span>  }<a name="line.609"></a>
-<span class="sourceLineNo">610</span><a name="line.610"></a>
-<span class="sourceLineNo">611</span>  /**<a name="line.611"></a>
-<span class="sourceLineNo">612</span>   * Wake the procedures waiting for the 
specified table<a name="line.612"></a>
-<span class="sourceLineNo">613</span>   * @param procedure the procedure 
releasing the lock<a name="line.613"></a>
-<span class="sourceLineNo">614</span>   * @param table the name of the table 
that has the shared lock<a name="line.614"></a>
-<span class="sourceLineNo">615</span>   */<a name="line.615"></a>
-<span class="sourceLineNo">616</span>  public void wakeTableSharedLock(final 
Procedure&lt;?&gt; procedure, final TableName table) {<a name="line.616"></a>
-<span class="sourceLineNo">617</span>    schedLock();<a name="line.617"></a>
-<span class="sourceLineNo">618</span>    try {<a name="line.618"></a>
-<span class="sourceLineNo">619</span>      final LockAndQueue namespaceLock = 
locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.619"></a>
-<span class="sourceLineNo">620</span>      final LockAndQueue tableLock = 
locking.getTableLock(table);<a name="line.620"></a>
-<span class="sourceLineNo">621</span>      int waitingCount = 0;<a 
name="line.621"></a>
-<span class="sourceLineNo">622</span>      if (tableLock.releaseSharedLock()) 
{<a name="line.622"></a>
-<span class="sourceLineNo">623</span>        addToRunQueue(tableRunQueue, 
getTableQueue(table));<a name="line.623"></a>
-<span class="sourceLineNo">624</span>        waitingCount += 
wakeWaitingProcedures(tableLock);<a name="line.624"></a>
-<span class="sourceLineNo">625</span>      }<a name="line.625"></a>
-<span class="sourceLineNo">626</span>      if 
(namespaceLock.releaseSharedLock()) {<a name="line.626"></a>
-<span class="sourceLineNo">627</span>        waitingCount += 
wakeWaitingProcedures(namespaceLock);<a name="line.627"></a>
-<span class="sourceLineNo">628</span>      }<a name="line.628"></a>
-<span class="sourceLineNo">629</span>      wakePollIfNeeded(waitingCount);<a 
name="line.629"></a>
-<span class="sourceLineNo">630</span>    } finally {<a name="line.630"></a>
-<span class="sourceLineNo">631</span>      schedUnlock();<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>   * Tries to remove the queue and the 
table-lock of the specified table.<a name="line.636"></a>
-<span class="sourceLineNo">637</span>   * If there are new operations pending 
(e.g. a new create),<a name="line.637"></a>
-<span class="sourceLineNo">638</span>   * the remove will not be performed.<a 
name="line.638"></a>
-<span class="sourceLineNo">639</span>   * @param table the name of the table 
that should be marked as deleted<a name="line.639"></a>
-<span class="sourceLineNo">640</span>   * @param procedure the procedure that 
is removing the table<a name="line.640"></a>
-<span class="sourceLineNo">641</span>   * @return true if deletion succeeded, 
false otherwise meaning that there are<a name="line.641"></a>
-<span class="sourceLineNo">642</span>   *     other new operations pending for 
that table (e.g. a new create).<a name="line.642"></a>
-<span class="sourceLineNo">643</span>   */<a name="line.643"></a>
-<span class="sourceLineNo">644</span>  @VisibleForTesting<a 
name="line.644"></a>
-<span class="sourceLineNo">645</span>  boolean markTableAsDeleted(final 
TableName table, final Procedure&lt;?&gt; procedure) {<a name="line.645"></a>
-<span class="sourceLineNo">646</span>    schedLock();<a name="line.646"></a>
-<span class="sourceLineNo">647</span>    try {<a name="line.647"></a>
-<span class="sourceLineNo">648</span>      final TableQueue queue = 
getTableQueue(table);<a name="line.648"></a>
-<span class="sourceLineNo">649</span>      final LockAndQueue tableLock = 
locking.getTableLock(table);<a name="line.649"></a>
-<span class="sourceLineNo">650</span>      if (queue == null) return true;<a 
name="line.650"></a>
-<span class="sourceLineNo">651</span><a name="line.651"></a>
-<span class="sourceLineNo">652</span>      if (queue.isEmpty() &amp;&amp; 
tableLock.tryExclusiveLock(procedure)) {<a name="line.652"></a>
-<span class="sourceLineNo">653</span>        // remove the table from the 
run-queue and the map<a name="line.653"></a>
-<span class="sourceLineNo">654</span>        if 
(AvlIterableList.isLinked(queue)) {<a name="line.654"></a>
-<span class="sourceLineNo">655</span>          tableRunQueue.remove(queue);<a 
name="line.655"></a>
-<span class="sourceLineNo">656</span>        }<a name="line.656"></a>
-<span class="sourceLineNo">657</span>        removeTableQueue(table);<a 
name="line.657"></a>
-<span class="sourceLineNo">658</span>      } else {<a name="line.658"></a>
-<span class="sourceLineNo">659</span>        // TODO: If there are no create, 
we can drop all the other ops<a name="line.659"></a>
-<span class="sourceLineNo">660</span>        return false;<a 
name="line.660"></a>
-<span class="sourceLineNo">661</span>      }<a name="line.661"></a>
-<span class="sourceLineNo">662</span>    } finally {<a name="line.662"></a>
-<span class="sourceLineNo">663</span>      schedUnlock();<a 
name="line.663"></a>
-<span class="sourceLineNo">664</span>    }<a name="line.664"></a>
-<span class="sourceLineNo">665</span>    return true;<a name="line.665"></a>
-<span class="sourceLineNo">666</span>  }<a name="line.666"></a>
-<span class="sourceLineNo">667</span><a name="line.667"></a>
+<span class="sourceLineNo">563</span>      if 
(tableLock.releaseExclusiveLock(procedure)) {<a name="line.563"></a>
+<span class="sourceLineNo">564</span>        waitingCount += 
wakeWaitingProcedures(tableLock);<a name="line.564"></a>
+<span class="sourceLineNo">565</span>      }<a name="line.565"></a>
+<span class="sourceLineNo">566</span>      if 
(namespaceLock.releaseSharedLock()) {<a name="line.566"></a>
+<span class="sourceLineNo">567</span>        waitingCount += 
wakeWaitingProcedures(namespaceLock);<a name="line.567"></a>
+<span class="sourceLineNo">568</span>      }<a name="line.568"></a>
+<span class="sourceLineNo">569</span>      addToRunQueue(tableRunQueue, 
getTableQueue(table));<a name="line.569"></a>
+<span class="sourceLineNo">570</span>      wakePollIfNeeded(waitingCount);<a 
name="line.570"></a>
+<span class="sourceLineNo">571</span>    } finally {<a name="line.571"></a>
+<span class="sourceLineNo">572</span>      schedUnlock();<a 
name="line.572"></a>
+<span class="sourceLineNo">573</span>    }<a name="line.573"></a>
+<span class="sourceLineNo">574</span>  }<a name="line.574"></a>
+<span class="sourceLineNo">575</span><a name="line.575"></a>
+<span class="sourceLineNo">576</span>  /**<a name="line.576"></a>
+<span class="sourceLineNo">577</span>   * Suspend the procedure if the 
specified table is already locked.<a name="line.577"></a>
+<span class="sourceLineNo">578</span>   * other "read" operations in the 
table-queue may be executed concurrently,<a name="line.578"></a>
+<span class="sourceLineNo">579</span>   * @param procedure the procedure 
trying to acquire the lock<a name="line.579"></a>
+<span class="sourceLineNo">580</span>   * @param table Table to lock<a 
name="line.580"></a>
+<span class="sourceLineNo">581</span>   * @return true if the procedure has to 
wait for the table to be available<a name="line.581"></a>
+<span class="sourceLineNo">582</span>   */<a name="line.582"></a>
+<span class="sourceLineNo">583</span>  public boolean 
waitTableSharedLock(final Procedure&lt;?&gt; procedure, final TableName table) 
{<a name="line.583"></a>
+<span class="sourceLineNo">584</span>    return 
waitTableQueueSharedLock(procedure, table) == null;<a name="line.584"></a>
+<span class="sourceLineNo">585</span>  }<a name="line.585"></a>
+<span class="sourceLineNo">586</span><a name="line.586"></a>
+<span class="sourceLineNo">587</span>  private TableQueue 
waitTableQueueSharedLock(final Procedure&lt;?&gt; procedure, final TableName 
table) {<a name="line.587"></a>
+<span class="sourceLineNo">588</span>    schedLock();<a name="line.588"></a>
+<span class="sourceLineNo">589</span>    try {<a name="line.589"></a>
+<span class="sourceLineNo">590</span>      final LockAndQueue namespaceLock = 
locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.590"></a>
+<span class="sourceLineNo">591</span>      final LockAndQueue tableLock = 
locking.getTableLock(table);<a name="line.591"></a>
+<span class="sourceLineNo">592</span>      if 
(!namespaceLock.trySharedLock(procedure)) {<a name="line.592"></a>
+<span class="sourceLineNo">593</span>        waitProcedure(namespaceLock, 
procedure);<a name="line.593"></a>
+<span class="sourceLineNo">594</span>        return null;<a 
name="line.594"></a>
+<span class="sourceLineNo">595</span>      }<a name="line.595"></a>
+<span class="sourceLineNo">596</span><a name="line.596"></a>
+<span class="sourceLineNo">597</span>      if 
(!tableLock.trySharedLock(procedure)) {<a name="line.597"></a>
+<span class="sourceLineNo">598</span>        
namespaceLock.releaseSharedLock();<a name="line.598"></a>
+<span class="sourceLineNo">599</span>        waitProcedure(tableLock, 
procedure);<a name="line.599"></a>
+<span class="sourceLineNo">600</span>        return null;<a 
name="line.600"></a>
+<span class="sourceLineNo">601</span>      }<a name="line.601"></a>
+<span class="sourceLineNo">602</span><a name="line.602"></a>
+<span class="sourceLineNo">603</span>      return getTableQueue(table);<a 
name="line.603"></a>
+<span class="sourceLineNo">604</span>    } finally {<a name="line.604"></a>
+<span class="sourceLineNo">605</span>      schedUnlock();<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><a name="line.608"></a>
+<span class="sourceLineNo">609</span>  /**<a name="line.609"></a>
+<span class="sourceLineNo">610</span>   * Wake the procedures waiting for the 
specified table<a name="line.610"></a>
+<span class="sourceLineNo">611</span>   * @param procedure the procedure 
releasing the lock<a name="line.611"></a>
+<span class="sourceLineNo">612</span>   * @param table the name of the table 
that has the shared lock<a name="line.612"></a>
+<span class="sourceLineNo">613</span>   */<a name="line.613"></a>
+<span class="sourceLineNo">614</span>  public void wakeTableSharedLock(final 
Procedure&lt;?&gt; procedure, final TableName table) {<a name="line.614"></a>
+<span class="sourceLineNo">615</span>    schedLock();<a name="line.615"></a>
+<span class="sourceLineNo">616</span>    try {<a name="line.616"></a>
+<span class="sourceLineNo">617</span>      final LockAndQueue namespaceLock = 
locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.617"></a>
+<span class="sourceLineNo">618</span>      final LockAndQueue tableLock = 
locking.getTableLock(table);<a name="line.618"></a>
+<span class="sourceLineNo">619</span>      int waitingCount = 0;<a 
name="line.619"></a>
+<span class="sourceLineNo">620</span>      if (tableLock.releaseSharedLock()) 
{<a name="line.620"></a>
+<span class="sourceLineNo">621</span>        addToRunQueue(tableRunQueue, 
getTableQueue(table));<a name="line.621"></a>
+<span class="sourceLineNo">622</span>        waitingCount += 
wakeWaitingProcedures(tableLock);<a name="line.622"></a>
+<span class="sourceLineNo">623</span>      }<a name="line.623"></a>
+<span class="sourceLineNo">624</span>      if 
(namespaceLock.releaseSharedLock()) {<a name="line.624"></a>
+<span class="sourceLineNo">625</span>        waitingCount += 
wakeWaitingProcedures(namespaceLock);<a name="line.625"></a>
+<span class="sourceLineNo">626</span>      }<a name="line.626"></a>
+<span class="sourceLineNo">627</span>      wakePollIfNeeded(waitingCount);<a 
name="line.627"></a>
+<span class="sourceLineNo">628</span>    } finally {<a name="line.628"></a>
+<span class="sourceLineNo">629</span>      schedUnlock();<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><a name="line.632"></a>
+<span class="sourceLineNo">633</span>  /**<a name="line.633"></a>
+<span class="sourceLineNo">634</span>   * Tries to remove the queue and the 
table-lock of the specified table.<a name="line.634"></a>
+<span class="sourceLineNo">635</span>   * If there are new operations pending 
(e.g. a new create),<a name="line.635"></a>
+<span class="sourceLineNo">636</span>   * the remove will not be performed.<a 
name="line.636"></a>
+<span class="sourceLineNo">637</span>   * @param table the name of the table 
that should be marked as deleted<a name="line.637"></a>
+<span class="sourceLineNo">638</span>   * @param procedure the procedure that 
is removing the table<a name="line.638"></a>
+<span class="sourceLineNo">639</span>   * @return true if deletion succeeded, 
false otherwise meaning that there are<a name="line.639"></a>
+<span class="sourceLineNo">640</span>   *     other new operations pending for 
that table (e.g. a new create).<a name="line.640"></a>
+<span class="sourceLineNo">641</span>   */<a name="line.641"></a>
+<span class="sourceLineNo">642</span>  @VisibleForTesting<a 
name="line.642"></a>
+<span class="sourceLineNo">643</span>  boolean markTableAsDeleted(final 
TableName table, final Procedure&lt;?&gt; procedure) {<a name="line.643"></a>
+<span class="sourceLineNo">644</span>    schedLock();<a name="line.644"></a>
+<span class="sourceLineNo">645</span>    try {<a name="line.645"></a>
+<span class="sourceLineNo">646</span>      final TableQueue queue = 
getTableQueue(table);<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 (queue == null) return true;<a 
name="line.648"></a>
+<span class="sourceLineNo">649</span><a name="line.649"></a>
+<span class="sourceLineNo">650</span>      if (queue.isEmpty() &amp;&amp; 
tableLock.tryExclusiveLock(procedure)) {<a name="line.650"></a>
+<span class="sourceLineNo">651</span>        // remove the table from the 
run-queue and the map<a name="line.651"></a>
+<span class="sourceLineNo">652</span>        if 
(AvlIterableList.isLinked(queue)) {<a name="line.652"></a>
+<span class="sourceLineNo">653</span>          tableRunQueue.remove(queue);<a 
name="line.653"></a>
+<span class="sourceLineNo">654</span>        }<a name="line.654"></a>
+<span class="sourceLineNo">655</span>        removeTableQueue(table);<a 
name="line.655"></a>
+<span class="sourceLineNo">656</span>      } else {<a name="line.656"></a>
+<span class="sourceLineNo">657</span>        // TODO: If there are no create, 
we can drop all the other ops<a name="line.657"></a>
+<span class="sourceLineNo">658</span>        return false;<a 
name="line.658"></a>
+<span class="sourceLineNo">659</span>      }<a name="line.659"></a>
+<span class="sourceLineNo">660</span>    } finally {<a name="line.660"></a>
+<span class="sourceLineNo">661</span>      schedUnlock();<a 
name="line.661"></a>
+<span class="sourceLineNo">662</span>    }<a name="line.662"></a>
+<span class="sourceLineNo">663</span>    return true;<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>  //  Region Locking Helpers<a 
name="line.667"></a>
 <span class="sourceLineNo">668</span>  // 
============================================================================<a 
name="line.668"></a>
-<span class="sourceLineNo">669</span>  //  Region Locking Helpers<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>   * Suspend the procedure if the 
specified region is already locked.<a name="line.672"></a>
-<span class="sourceLineNo">673</span>   * @param procedure the procedure 
trying to acquire the lock on the region<a name="line.673"></a>
-<span class="sourceLineNo">674</span>   * @param regionInfo the region we are 
trying to lock<a name="line.674"></a>
-<span class="sourceLineNo">675</span>   * @return true if the procedure has to 
wait for the regions to be available<a name="line.675"></a>
-<span class="sourceLineNo">676</span>   */<a name="line.676"></a>
-<span class="sourceLineNo">677</span>  public boolean waitRegion(final 
Procedure&lt;?&gt; procedure, final RegionInfo regionInfo) {<a 
name="line.677"></a>
-<span class="sourceLineNo">678</span>    return waitRegions(procedure, 
regionInfo.getTable(), regionInfo);<a name="line.678"></a>
-<span class="sourceLineNo">679</span>  }<a name="line.679"></a>
-<span class="sourceLineNo">680</span><a name="line.680"></a>
-<span class="sourceLineNo">681</span>  /**<a name="line.681"></a>
-<span class="sourceLineNo">682</span>   * Suspend the procedure if the 
specified set of regions are already locked.<a name="line.682"></a>
-<span class="sourceLineNo">683</span>   * @param procedure the procedure 
trying to acquire the lock on the regions<a name="line.683"></a>
-<span class="sourceLineNo">684</span>   * @param table the table name of the 
regions we are trying to lock<a name="line.684"></a>
-<span class="sourceLineNo">685</span>   * @param regionInfo the list of 
regions we are trying to lock<a name="line.685"></a>
-<span class="sourceLineNo">686</span>   * @return true if the procedure has to 
wait for the regions to be available<a name="line.686"></a>
-<span class="sourceLineNo">687</span>   */<a name="line.687"></a>
-<span class="sourceLineNo">688</span>  public boolean waitRegions(final 
Procedure&lt;?&gt; procedure, final TableName table,<a name="line.688"></a>
-<span class="sourceLineNo">689</span>      final RegionInfo... regionInfo) {<a 
name="line.689"></a>
-<span class="sourceLineNo">690</span>    Arrays.sort(regionInfo, 
RegionInfo.COMPARATOR);<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    schedLock();<a name="line.691"></a>
-<span class="sourceLineNo">692</span>    try {<a name="line.692"></a>
-<span class="sourceLineNo">693</span>      // If there is parent procedure, it 
would have already taken xlock, so no need to take<a name="line.693"></a>
-<span class="sourceLineNo">694</span>      // shared lock here. Otherwise, 
take shared lock.<a name="line.694"></a>
-<span class="sourceLineNo">695</span>      if (!procedure.hasParent()<a 
name="line.695"></a>
-<span class="sourceLineNo">696</span>          &amp;&amp; 
waitTableQueueSharedLock(procedure, table) == null) {<a name="line.696"></a>
-<span class="sourceLineNo">697</span>          return true;<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>      // acquire region xlocks or wait<a 
name="line.700"></a>
-<span class="sourceLineNo">701</span>      boolean hasLock = true;<a 
name="line.701"></a>
-<span class="sourceLineNo">702</span>      final LockAndQueue[] regionLocks = 
new LockAndQueue[regionInfo.length];<a name="line.702"></a>
-<span class="sourceLineNo">703</span>      for (int i = 0; i &lt; 
regionInfo.length; ++i) {<a name="line.703"></a>
-<span class="sourceLineNo">704</span>        LOG.info("{} checking lock on 
{}", procedure, regionInfo[i].getEncodedName());<a name="line.704"></a>
-<span class="sourceLineNo">705</span>        assert table != null;<a 
name="line.705"></a>
-<span class="sourceLineNo">706</span>        assert regionInfo[i] != null;<a 
name="line.706"></a>
-<span class="sourceLineNo">707</span>        assert regionInfo[i].getTable() 
!= null;<a name="line.707"></a>
-<span class="sourceLineNo">708</span>        assert 
regionInfo[i].getTable().equals(table): regionInfo[i] + " " + procedure;<a 
name="line.708"></a>
-<span class="sourceLineNo">709</span>        assert i == 0 || regionInfo[i] != 
regionInfo[i - 1] : "duplicate region: " + regionInfo[i];<a name="line.709"></a>
-<span class="sourceLineNo">710</span><a name="line.710"></a>
-<span class="sourceLineNo">711</span>        regionLocks[i] = 
locking.getRegionLock(regionInfo[i].getEncodedName());<a name="line.711"></a>
-<span class="sourceLineNo">712</span>        if 
(!regionLocks[i].tryExclusiveLock(procedure)) {<a name="line.712"></a>
-<span class="sourceLineNo">713</span>          waitProcedure(regionLocks[i], 
procedure);<a name="line.713"></a>
-<span class="sourceLineNo">714</span>          hasLock = false;<a 
name="line.714"></a>
-<span class="sourceLineNo">715</span>          while (i-- &gt; 0) {<a 
name="line.715"></a>
-<span class="sourceLineNo">716</span>            
regionLocks[i].releaseExclusiveLock(procedure);<a name="line.716"></a>
-<span class="sourceLineNo">717</span>          }<a name="line.717"></a>
-<span class="sourceLineNo">718</span>          break;<a name="line.718"></a>
-<span class="sourceLineNo">719</span>        }<a name="line.719"></a>
-<span class="sourceLineNo">720</span>      }<a name="line.720"></a>
-<span class="sourceLineNo">721</span><a name="line.721"></a>
-<span class="sourceLineNo">722</span>      if (!hasLock &amp;&amp; 
!procedure.hasParent()) {<a name="line.722"></a>
-<span class="sourceLineNo">723</span>        wakeTableSharedLock(procedure, 
table);<a name="line.723"></a>
-<span class="sourceLineNo">724</span>      }<a name="line.724"></a>
-<span class="sourceLineNo">725</span>      return !hasLock;<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>  }<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>   * Wake the procedures waiting for the 
specified region<a name="line.732"></a>
-<span class="sourceLineNo">733</span>   * @param procedure the procedure that 
was holding the region<a name="line.733"></a>
-<span class="sourceLineNo">734</span>   * @param regionInfo the region the 
procedure was holding<a name="line.734"></a>
-<span class="sourceLineNo">735</span>   */<a name="line.735"></a>
-<span class="sourceLineNo">736</span>  public void wakeRegion(final 
Procedure&lt;?&gt; procedure, final RegionInfo regionInfo) {<a 
name="line.736"></a>
-<span class="sourceLineNo">737</span>    wakeRegions(procedure, 
regionInfo.getTable(), regionInfo);<a name="line.737"></a>
-<span class="sourceLineNo">738</span>  }<a name="line.738"></a>
-<span class="sourceLineNo">739</span><a name="line.739"></a>
-<span class="sourceLineNo">740</span>  /**<a name="line.740"></a>
-<span class="sourceLineNo">741</span>   * Wake the procedures waiting for the 
specified regions<a name="line.741"></a>
-<span class="sourceLineNo">742</span>   * @param procedure the procedure that 
was holding the regions<a name="line.742"></a>
-<span class="sourceLineNo">743</span>   * @param regionInfo the list of 
regions the procedure was holding<a name="line.743"></a>
-<span class="sourceLineNo">744</span>   */<a name="line.744"></a>
-<span class="sourceLineNo">745</span>  public void wakeRegions(final 
Procedure&lt;?&gt; procedure,final TableName table,<a name="line.745"></a>
-<span class="sourceLineNo">746</span>      final RegionInfo... regionInfo) {<a 
name="line.746"></a>
-<span class="sourceLineNo">747</span>    Arrays.sort(regionInfo, 
RegionInfo.COMPARATOR);<a name="line.747"></a>
-<span class="sourceLineNo">748</span>    schedLock();<a name="line.748"></a>
-<span class="sourceLineNo">749</span>    try {<a name="line.749"></a>
-<span class="sourceLineNo">750</span>      int numProcs = 0;<a 
name="line.750"></a>
-<span class="sourceLineNo">751</span>      final Procedure[] nextProcs = new 
Procedure[regionInfo.length];<a name="line.751"></a>
-<span class="sourceLineNo">752</span>      for (int i = 0; i &lt; 
regionInfo.length; ++i) {<a name="line.752"></a>
-<span class="sourceLineNo">753</span>        assert 
regionInfo[i].getTable().equals(table);<a name="line.753"></a>
-<span class="sourceLineNo">754</span>        assert i == 0 || regionInfo[i] != 
regionInfo[i - 1] : "duplicate region: " + regionInfo[i];<a name="line.754"></a>
-<span class="sourceLineNo">755</span><a name="line.755"></a>
-<span class="sourceLineNo">756</span>        LockAndQueue regionLock = 
locking.getRegionLock(regionInfo[i].getEncodedName());<a name="line.756"></a>
-<span class="sourceLineNo">757</span>        if 
(regionLock.releaseExclusiveLock(procedure)) {<a name="line.757"></a>
-<span class="sourceLineNo">758</span>          if (!regionLock.isEmpty()) {<a 
name="line.758"></a>
-<span class="sourceLineNo">759</span>            // release one procedure at 
the time since regions has an xlock<a name="line.759"></a>
-<span class="sourceLineNo">760</span>            nextProcs[numProcs++] = 
regionLock.removeFirst();<a name="line.760"></a>
-<span class="sourceLineNo">761</span>          } else {<a name="line.761"></a>
-<span class="sourceLineNo">762</span>            
locking.removeRegionLock(regionInfo[i].getEncodedName());<a name="line.762"></a>
-<span class="sourceLineNo">763</span>          }<a name="line.763"></a>
-<span class="sourceLineNo">764</span>        }<a name="line.764"></a>
+<span class="sourceLineNo">669</span>  /**<a name="line.669"></a>
+<span class="sourceLineNo">670</span>   * Suspend the procedure if the 
specified region is already locked.<a name="line.670"></a>
+<span class="sourceLineNo">671</span>   * @param procedure the procedure 
trying to acquire the lock on the region<a name="line.671"></a>
+<span class="sourceLineNo">672</span>   * @param regionInfo the region we are 
trying to lock<a name="line.672"></a>
+<span class="sourceLineNo">673</span>   * @return true if the procedure has to 
wait for the regions to be available<a name="line.673"></a>
+<span class="sourceLineNo">674</span>   */<a name="line.674"></a>
+<span class="sourceLineNo">675</span>  public boolean waitRegion(final 
Procedure&lt;?&gt; procedure, final RegionInfo regionInfo) {<a 
name="line.675"></a>
+<span class="sourceLineNo">676</span>    return waitRegions(procedure, 
regionInfo.getTable(), regionInfo);<a name="line.676"></a>
+<span class="sourceLineNo">677</span>  }<a name="line.677"></a>
+<span class="sourceLineNo">678</span><a name="line.678"></a>
+<span class="sourceLineNo">679</span>  /**<a name="line.679"></a>
+<span class="sourceLineNo">680</span>   * Suspend the procedure if the 
specified set of regions are already locked.<a name="line.680"></a>
+<span class="sourceLineNo">681</span>   * @param procedure the procedure 
trying to acquire the lock on the regions<a name="line.681"></a>
+<span class="sourceLineNo">682</span>   * @param table the table name of the 
regions we are trying to lock<a name="line.682"></a>
+<span class="sourceLineNo">683</span>   * @param regionInfo the list of 
regions we are trying to lock<a name="line.683"></a>
+<span class="sourceLineNo">684</span>   * @return true if the procedure has to 
wait for the regions to be available<a name="line.684"></a>
+<span class="sourceLineNo">685</span>   */<a name="line.685"></a>
+<span class="sourceLineNo">686</span>  public boolean waitRegions(final 
Procedure&lt;?&gt; procedure, final TableName table,<a name="line.686"></a>
+<span class="sourceLineNo">687</span>      final RegionInfo... regionInfo) {<a 
name="line.687"></a>
+<span class="sourceLineNo">688</span>    Arrays.sort(regionInfo, 
RegionInfo.COMPARATOR);<a name="line.688"></a>
+<span class="sourceLineNo">689</span>    schedLock();<a name="line.689"></a>
+<span class="sourceLineNo">690</span>    try {<a name="line.690"></a>
+<span class="sourceLineNo">691</span>      assert table != null;<a 
name="line.691"></a>
+<span class="sourceLineNo">692</span>      if (waitTableSharedLock(procedure, 
table)) {<a name="line.692"></a>
+<span class="sourceLineNo">693</span>        return true;<a 
name="line.693"></a>
+<span class="sourceLineNo">694</span>      }<a name="line.694"></a>
+<span class="sourceLineNo">695</span><a name="line.695"></a>
+<span class="sourceLineNo">696</span>      // acquire region xlocks or wait<a 
name="line.696"></a>
+<span class="sourceLineNo">697</span>      boolean hasLock = true;<a 
name="line.697"></a>
+<span class="sourceLineNo">698</span>      final LockAndQueue[] regionLocks = 
new LockAndQueue[regionInfo.length];<a name="line.698"></a>
+<span class="sourceLineNo">699</span>      for (int i = 0; i &lt; 
regionInfo.length; ++i) {<a name="line.699"></a>
+<span class="sourceLineNo">700</span>        LOG.info("{} checking lock on 
{}", procedure, regionInfo[i].getEncodedName());<a name="line.700"></a>
+<span class="sourceLineNo">701</span>        assert regionInfo[i] != null;<a 
name="line.701"></a>
+<span class="sourceLineNo">702</span>        assert regionInfo[i].getTable() 
!= null;<a name="line.702"></a>
+<span class="sourceLineNo">703</span>        assert 
regionInfo[i].getTable().equals(table): regionInfo[i] + " " + procedure;<a 
name="line.703"></a>
+<span class="sourceLineNo">704</span>        assert i == 0 || regionInfo[i] != 
regionInfo[i - 1] : "duplicate region: " + regionInfo[i];<a name="line.704"></a>
+<span class="sourceLineNo">705</span><a name="line.705"></a>
+<span class="sourceLineNo">706</span>        regionLocks[i] = 
locking.getRegionLock(regionInfo[i].getEncodedName());<a name="line.706"></a>
+<span class="sourceLineNo">707</span>        if 
(!regionLocks[i].tryExclusiveLock(procedure)) {<a name="line.707"></a>
+<span class="sourceLineNo">708</span>          waitProcedure(regionLocks[i], 
procedure);<a name="line.708"></a>
+<span class="sourceLineNo">709</span>          hasLock = false;<a 
name="line.709"></a>
+<span class="sourceLineNo">710</span>          while (i-- &gt; 0) {<a 
name="line.710"></a>
+<span class="sourceLineNo">711</span>            
regionLocks[i].releaseExclusiveLock(procedure);<a name="line.711"></a>
+<span class="sourceLineNo">712</span>          }<a name="line.712"></a>
+<span class="sourceLineNo">713</span>          break;<a name="line.713"></a>
+<span class="sourceLineNo">714</span>        }<a name="line.714"></a>
+<span class="sourceLineNo">715</span>      }<a name="line.715"></a>
+<span class="sourceLineNo">716</span><a name="line.716"></a>
+<span class="sourceLineNo">717</span>      if (!hasLock) {<a 
name="line.717"></a>
+<span class="sourceLineNo">718</span>        wakeTableSharedLock(procedure, 
table);<a name="line.718"></a>
+<span class="sourceLineNo">719</span>      }<a name="line.719"></a>
+<span class="sourceLineNo">720</span>      return !hasLock;<a 
name="line.720"></a>
+<span class="sourceLineNo">721</span>    } finally {<a name="line.721"></a>
+<span class="sourceLineNo">722</span>      schedUnlock();<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>  /**<a name="line.726"></a>
+<span class="sourceLineNo">727</span>   * Wake the procedures waiting for the 
specified region<a name="line.727"></a>
+<span class="sourceLineNo">728</span>   * @param procedure the procedure that 
was holding the region<a name="line.728"></a>
+<span class="sourceLineNo">729</span>   * @param regionInfo the region the 
procedure was holding<a name="line.729"></a>
+<span class="sourceLineNo">730</span>   */<a name="line.730"></a>
+<span class="sourceLineNo">731</span>  public void wakeRegion(final 
Procedure&lt;?&gt; procedure, final RegionInfo regionInfo) {<a 
name="line.731"></a>
+<span class="sourceLineNo">732</span>    wakeRegions(procedure, 
regionInfo.getTable(), regionInfo);<a name="line.732"></a>
+<span class="sourceLineNo">733</span>  }<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>   * Wake the procedures waiting for the 
specified regions<a name="line.736"></a>
+<span class="sourceLineNo">737</span>   * @param procedure the procedure that 
was holding the regions<a name="line.737"></a>
+<span class="sourceLineNo">738</span>   * @param regionInfo the list of 
regions the procedure was holding<a name="line.738"></a>
+<span class="sourceLineNo">739</span>   */<a name="line.739"></a>
+<span class="sourceLineNo">740</span>  public void wakeRegions(final 
Procedure&lt;?&gt; procedure,final TableName table,<a name="line.740"></a>
+<span class="sourceLineNo">741</span>      final RegionInfo... regionInfo) {<a 
name="line.741"></a>
+<span class="sourceLineNo">742</span>    Arrays.sort(regionInfo, 
RegionInfo.COMPARATOR);<a name="line.742"></a>
+<span class="sourceLineNo">743</span>    schedLock();<a name="line.743"></a>
+<span class="sourceLineNo">744</span>    try {<a name="line.744"></a>
+<span class="sourceLineNo">745</span>      int numProcs = 0;<a 
name="line.745"></a>
+<span class="sourceLineNo">746</span>      final Procedure&lt;?&gt;[] 
nextProcs = new Procedure[regionInfo.length];<a name="line.746"></a>
+<span class="sourceLineNo">747</span>      for (int i = 0; i &lt; 
regionInfo.length; ++i) {<a name="line.747"></a>
+<span class="sourceLineNo">748</span>        assert 
regionInfo[i].getTable().equals(table);<a name="line.748"></a>
+<span class="sourceLineNo">749</span>        assert i == 0 || regionInfo[i] != 
regionInfo[i - 1] : "duplicate region: " + regionInfo[i];<a name="line.749"></a>
+<span class="sourceLineNo">750</span><a name="line.750"></a>
+<span class="sourceLineNo">751</span>        LockAndQueue regionLock = 
locking.getRegionLock(regionInfo[i].getEncodedName());<a name="line.751"></a>
+<span class="sourceLineNo">752</span>        if 
(regionLock.releaseExclusiveLock(procedure)) {<a name="line.752"></a>
+<span class="sourceLineNo">753</span>          if 
(!regionLock.isWaitingQueueEmpty()) {<a name="line.753"></a>
+<span class="sourceLineNo">754</span>            // release one procedure at 
the time since regions has an xlock<a name="line.754"></a>
+<span class="sourceLineNo">755</span>            nextProcs[numProcs++] = 
regionLock.removeFirst();<a name="line.755"></a>
+<span class="sourceLineNo">756</span>          } else {<a name="line.756"></a>
+<span class="sourceLineNo">757</span>            
locking.removeRegionLock(regionInfo[i].getEncodedName());<a name="line.757"></a>
+<span class="sourceLineNo">758</span>          }<a name="line.758"></a>
+<span class="sourceLineNo">759</span>        }<a name="line.759"></a>
+<span class="sourceLineNo">760</span>      }<a name="line.760"></a>
+<span class="sourceLineNo">761</span><a name="line.761"></a>
+<span class="sourceLineNo">762</span>      // awake procedures if any<a 
name="line.762"></a>
+<span class="sourceLineNo">763</span>      for (int i = numProcs - 1; i &gt;= 
0; --i) {<a name="line.763"></a>
+<span class="sourceLineNo">764</span>        wakeProcedure(nextProcs[i]);<a 
name="line.764"></a>
 <span class="sourceLineNo">765</span>      }<a name="line.765"></a>
-<span class="sourceLineNo">766</span><a name="line.766"></a>
-<span class="sourceLineNo">767</span>      // awake procedures if any<a 
name="line.767"></a>
-<span class="sourceLineNo">768</span>      for (int i = numProcs - 1; i &gt;= 
0; --i) {<a name="line.768"></a>
-<span class="sourceLineNo">769</span>        wakeProcedure(nextProcs[i]);<a 
name="line.769"></a>
-<span class="sourceLineNo">770</span>      }<a name="line.770"></a>
-<span class="sourceLineNo">771</span>      wakePollIfNeeded(numProcs);<a 
name="line.771"></a>
-<span class="sourceLineNo">772</span>      if (!procedure.hasParent()) {<a 
name="line.772"></a>
-<span class="sourceLineNo">773</span>        // release the table 
shared-lock.<a name="line.773"></a>
-<span class="sourceLineNo">774</span>        // (if we have a parent, it is 
holding an xlock so we didn't take the shared-lock)<a name="line.774"></a>
-<span class="sourceLineNo">775</span>        wakeTableSharedLock(procedure, 
table);<a name="line.775"></a>
-<span class="sourceLineNo">776</span>      }<a name="line.776"></a>
-<span class="sourceLineNo">777</span>    } finally {<a name="line.777"></a>
-<span class="sourceLineNo">778</span>      schedUnlock();<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">781</span><a name="line.781"></a>
-<span class="sourceLineNo">782</span>  // 
============================================================================<a 
name="line.782"></a>
-<span class="sourceLineNo">783</span>  //  Namespace Locking Helpers<a 
name="line.783"></a>
-<span class="sourceLineNo">784</span>  // 
============================================================================<a 
name="line.784"></a>
-<span class="sourceLineNo">785</span>  /**<a name="line.785"></a>
-<span class="sourceLineNo">786</span>   * Suspend the procedure if the 
specified namespace is already locked.<a name="line.786"></a>
-<span class="sourceLineNo">787</span>   * @see 
#wakeNamespaceExclusiveLock(Procedure,String)<a name="line.787"></a>
-<span class="sourceLineNo">788</span>   * @param procedure the procedure 
trying to acquire the lock<a name="line.788"></a>
-<span class="sourceLineNo">789</span>   * @param namespace Namespace to lock<a 
name="line.789"></a>
-<span class="sourceLineNo">790</span>   * @return true if the procedure has to 
wait for the namespace to be available<a name="line.790"></a>
-<span class="sourceLineNo">791</span>   */<a name="line.791"></a>
-<span class="sourceLineNo">792</span>  public boolean 
waitNamespaceExclusiveLock(final Procedure&lt;?&gt; procedure, final String 
namespace) {<a name="line.792"></a>
-<span class="sourceLineNo">793</span>    schedLock();<a name="line.793"></a>
-<span class="sourceLineNo">794</span>    try {<a name="line.794"></a>
-<span class="sourceLineNo">795</span>      final LockAndQueue 
systemNamespaceTableLock =<a name="line.795"></a>
-<span class="sourceLineNo">796</span>          
locking.getTableLock(TableName.NAMESPACE_TABLE_NAME);<a name="line.796"></a>
-<span class="sourceLineNo">797</span>      if 
(!systemNamespaceTableLock.trySharedLock()) {<a name="line.797"></a>
-<span class="sourceLineNo">798</span>        
waitProcedure(systemNamespaceTableLock, procedure);<a name="line.798"></a>
-<span class="sourceLineNo">799</span>        
logLockedResource(LockedResourceType.TABLE,<a name="line.799"></a>
-<span class="sourceLineNo">800</span>            
TableName.NAMESPACE_TABLE_NAME.getNameAsString());<a name="line.800"></a>
+<span class="sourceLineNo">766</span>      wakePollIfNeeded(numProcs);<a 
name="line.766"></a>
+<span class="sourceLineNo">767</span>      // release the table shared-lock.<a 
name="line.767"></a>
+<span class="sourceLineNo">768</span>      wakeTableSharedLock(procedure, 
table);<a name="line.768"></a>
+<span class="sourceLineNo">769</span>    } finally {<a name="line.769"></a>
+<span class="sourceLineNo">770</span>      schedUnlock();<a 
name="line.770"></a>
+<span class="sourceLineNo">771</span>    }<a name="line.771"></a>
+<span class="sourceLineNo">772</span>  }<a name="line.772"></a>
+<span class="sourceLineNo">773</span><a name="line.773"></a>
+<span class="sourceLineNo">774</span>  // 
============================================================================<a 
name="line.774"></a>
+<span class="sourceLineNo">775</span>  //  Namespace Locking Helpers<a 
name="line.775"></a>
+<span class="sourceLineNo">776</span>  // 
============================================================================<a 
name="line.776"></a>
+<span class="sourceLineNo">777</span>  /**<a name="line.777"></a>
+<span class="sourceLineNo">778</span>   * Suspend the procedure if the 
specified namespace is already locked.<a name="line.778"></a>
+<span class="sourceLineNo">779</span>   * @see 
#wakeNamespaceExclusiveLock(Procedure,String)<a name="line.779"></a>
+<span class="sourceLineNo">780</span>   * @param procedure the procedure 
trying to acquire the lock<a name="line.780"></a>
+<span class="sourceLineNo">781</span>   * @param namespace Namespace to lock<a 
name="line.781"></a>
+<span class="sourceLineNo">782</span>   * @return true if the procedure has to 
wait for the namespace to be available<a name="line.782"></a>
+<span class="sourceLineNo">783</span>   */<a name="line.783"></a>
+<span class="sourceLineNo">784</span>  public boolean 
waitNamespaceExclusiveLock(Procedure&lt;?&gt; procedure, String namespace) {<a 
name="line.784"></a>
+<span class="sourceLineNo">785</span>    schedLock();<a name="line.785"></a>
+<span class="sourceLineNo">786</span>    try {<a name="line.786"></a>
+<span class="sourceLineNo">787</span>      final LockAndQueue 
systemNamespaceTableLock =<a name="line.787"></a>
+<span class="sourceLineNo">788</span>        
locking.getTableLock(TableName.NAMESPACE_TABLE_NAME);<a name="line.788"></a>
+<span class="sourceLineNo">789</span>      if 
(!systemNamespaceTableLock.trySharedLock(procedure)) {<a name="line.789"></a>
+<span class="sourceLineNo">790</span>        
waitProcedure(systemNamespaceTableLock, procedure);<a name="line.790"></a>
+<span class="sourceLineNo">791</span>        
logLockedResource(LockedResourceType.TABLE,<a name="line.791"></a>
+<span class="sourceLineNo">792</span>          
TableName.NAMESPACE_TABLE_NAME.getNameAsString());<a name="line.792"></a>
+<span class="sourceLineNo">793</span>        return true;<a 
name="line.793"></a>
+<span class="sourceLineNo">794</span>      }<a name="line.794"></a>
+<span class="sourceLineNo">795</span><a name="line.795"></a>
+<span class="sourceLineNo">796</span>      final LockAndQueue namespaceLock = 
locking.getNamespaceLock(namespace);<a name="line.796"></a>
+<span class="sourceLineNo">797</span>      if 
(!namespaceLock.tryExclusiveLock(procedure)) {<a name="line.797"></a>
+<span class="sourceLineNo">798</span>        
systemNamespaceTableLock.releaseSharedLock();<a name="line.798"></a>
+<span class="sourceLineNo">799</span>        waitProcedure(namespaceLock, 
procedure);<a name="line.799"></a>
+<span class="sourceLineNo">800</span>        
logLockedResource(LockedResourceType.NAMESPACE, namespace);<a 
name="line.800"></a>
 <span class="sourceLineNo">801</span>        return true;<a 
name="line.801"></a>
 <span class="sourceLineNo">802</span>      }<a name="line.802"></a>
-<span class="sourceLineNo">803</span><a name="line.803"></a>
-<span class="sourceLineNo">804</span>      final LockAndQueue namespaceLock = 
locking.getNamespaceLock(namespace);<a name="line.804"></a>
-<span class="sourceLineNo">805</span>      if 
(!namespaceLock.tryExclusiveLock(procedure)) {<a name="line.805"></a>
-<span class="sourceLineNo">806</span>        
systemNamespaceTableLock.releaseSharedLock();<a name="line.806"></a>
-<span class="sourceLineNo">807</span>        waitProcedure(namespaceLock, 
procedure);<a name="line.807"></a>
-<span class="sourceLineNo">808</span>        
logLockedResource(LockedResourceType.NAMESPACE, namespace);<a 
name="line.808"></a>
-<span class="sourceLineNo">809</span>        return true;<a 
name="line.809"></a>
-<span class="sourceLineNo">810</span>      }<a name="line.810"></a>
-<span class="sourceLineNo">811</span>      return false;<a name="line.811"></a>
-<span class="sourceLineNo">812</span>    } finally {<a name="line.812"></a>
-<span class="sourceLineNo">813</span>      schedUnlock();<a 
name="line.813"></a>
-<span class="sourceLineNo">814</span>    }<a name="line.814"></a>
-<span class="sourceLineNo">815</span>  }<a name="line.815"></a>
-<span class="sourceLineNo">816</span><a name="line.816"></a>
-<span class="sourceLineNo">817</span>  /**<a name="line.817"></a>
-<span class="sourceLineNo">818</span>   * Wake the procedures waiting for the 
specified namespace<a name="line.818"></a>
-<span class="sourceLineNo">819</span>   * @see 
#waitNamespaceExclusiveLock(Procedure,String)<a name="line.819"></a>
-<span class="sourceLineNo">820</span>   * @param procedure the procedure 
releasing the lock<a name="line.820"></a>
-<span class="sourceLineNo">821</span>   * @param namespace the namespace that 
has the exclusive lock<a name="line.821"></a>
-<span class="sourceLineNo">822</span>   */<a name="line.822"></a>
-<span class="sourceLineNo">823</span>  public void 
wakeNamespaceExclusiveLock(final Procedure&lt;?&gt; procedure, final String 
namespace) {<a name="line.823"></a>
-<span class="sourceLineNo">824</span>    schedLock();<a name="line.824"></a>
-<span class="sourceLineNo">825</span>    try {<a name="line.825"></a>
-<span class="sourceLineNo">826</span>      final LockAndQueue namespaceLock = 
locking.getNamespaceLock(namespace);<a name="line.826"></a>
-<span class="sourceLineNo">827</span>      final LockAndQueue 
systemNamespaceTableLock =<a name="line.827"></a>
-<span class="sourceLineNo">828</span>          
locking.getTableLock(TableName.NAMESPACE_TABLE_NAME);<a name="line.828"></a>
-<span class="sourceLineNo">829</span>      
namespaceLock.releaseExclusiveLock(procedure);<a name="line.829"></a>
-<span class="sourceLineNo">830</span>      int waitingCount = 0;<a 
name="line.830"></a>
-<span class="sourceLineNo">831</span>      if 
(systemNamespaceTableLock.releaseSharedLock()) {<a name="line.831"></a>
-<span class="sourceLineNo">832</span>        addToRunQueue(tableRunQueue, 
getTableQueue(TableName.NAMESPACE_TABLE_NAME));<a name="line.832"></a>
-<span class="sourceLineNo">833</span>        waitingCount += 
wakeWaitingProcedures(systemNamespaceTableLock);<a name="line.833"></a>
-<span class="sourceLineNo">834</span>      }<a name="line.834"></a>
-<span class="sourceLineNo">835</span>      waitingCount += 
wakeWaitingProcedures(namespaceLock);<a name="line.835"></a>
-<span class="sourceLineNo">836</span>      wakePollIfNeeded(waitingCount);<a 
name="line.836"></a>
-<span class="sourceLineNo">837</span>    } finally {<a name="line.837"></a>
-<span class="sourceLineNo">838</span>      schedUnlock();<a 
name="line.838"></a>
-<span class="sourceLineNo">839</span>    }<a name="line.839"></a>
-<span class="sourceLineNo">840</span>  }<a name="line.840"></a>
-<span class="sourceLineNo">841</span><a name="line.841"></a>
-<span class="sourceLineNo">842</span>  // 
============================================================================<a 
name="line.842"></a>
-<span class="sourceLineNo">843</span>  //  Server Locking Helpers<a 
name="line.843"></a>
-<span class="sourceLineNo">844</span>  // 
============================================================================<a 
name="line.844"></a>
-<span class="sourceLineNo">845</span>  /**<a name="line.845"></a>
-<span class="sourceLineNo">846</span>   * Try to acquire the exclusive lock on 
the specified server.<a name="line.846"></a>
-<span class="sourceLineNo">847</span>   * @see 
#wakeServerExclusiveLock(Procedure,ServerName)<a name="line.847"></a>
-<span class="sourceLineNo">848</span>   * @param procedure the procedure 
trying to acquire the lock<a name="line.848"></a>
-<span class="sourceLineNo">849</span>   * @param serverName Server to lock<a 
name="line.849"></a>
-<span class="sourceLineNo">850</span>   * @return true if the procedure has to 
wait for the server to be available<a name="line.850"></a>
-<span class="sourceLineNo">851</span>   */<a name="line.851"></a>
-<span class="sourceLineNo">852</span>  public boolean 
waitServerExclusiveLock(final Procedure&lt;?&gt; procedure,<a 
name="line.852"></a>
-<span class="sourceLineNo">853</span>      final ServerName serverName) {<a 
name="line.853"></a>
-<span class="sourceLineNo">854</span>    schedLock();<a name="line.854"></a>
-<span class="sourceLineNo">855</span>    try {<a name="line.855"></a>
-<span class="sourceLineNo">856</span>      final LockAndQueue lock = 
locking.getServerLock(serverName);<a name="line.856"></a>
-<span class="sourceLineNo">857</span>      if 
(lock.tryExclusiveLock(procedure)) {<a name="line.857"></a>
-<span class="sourceLineNo">858</span>        // We do not need to create a new 
queue so just pass null, as in tests we may pass<a name="line.858"></a>
-<span class="sourceLineNo">859</span>        // procedures other than 
ServerProcedureInterface<a name="line.859"></a>
-<span class="sourceLineNo">860</span>        
removeFromRunQueue(serverRunQueue, getServerQueue(serverName, null));<a 
name="line.860"></a>
-<span class="sourceLineNo">861</span>        return false;<a 
name="line.861"></a>
-<span class="sourceLineNo">862</span>      }<a name="line.862"></a>
-<span class="sourceLineNo">863</span>      waitProcedure(lock, procedure);<a 
name="line.863"></a>
-<span class="sourceLineNo">864</span>      
logLockedResource(LockedResourceType.SERVER, serverName.getServerName());<a 
name="line.864"></a>
-<span class="sourceLineNo">865</span>      return true;<a name="line.865"></a>
-<span class="sourceLineNo">866</span>    } finally {<a name="line.866"></a>
-<span class="sourceLineNo">867</span>      schedUnlock();<a 
name="line.867"></a>
-<span class="sourceLineNo">868</span>    }<a name="line.868"></a>
-<span class="sourceLineNo">869</span>  }<a name="line.869"></a>
-<span class="sourceLineNo">870</span><a name="line.870"></a>
-<span class="sourceLineNo">871</span>  /**<a name="line.871"></a>
-<span class="sourceLineNo">872</span>   * Wake the procedures waiting for the 
specified server<a name="line.872"></a>
-<span class="sourceLineNo">873</span>   * @see 
#waitServerExclusiveLock(Procedure,ServerName)<a name="line.873"></a>
-<span class="sourceLineNo">874</span>   * @param procedure the procedure 
releasing the lock<a name="line.874"></a>
-<span class="sourceLineNo">875</span>   * @param serverName the server that 
has the exclusive lock<a name="line.875"></a>
-<span class="sourceLineNo">876</span>   */<a name="line.876"></a>
-<span class="sourceLineNo">877</span>  public void 
wakeServerExclusiveLock(final Procedure&lt;?&gt; procedure, final ServerName 
serverName) {<a name="line.877"></a>
-<span class="sourceLineNo">878</span>    schedLock();<a name="line.878"></a>
-<span class="sourceLineNo">879</span>    try {<a name="line.879"></a>
-<span class="sourceLineNo">880</span>      final LockAndQueue lock = 
locking.getServerLock(serverName);<a name="line.880"></a>
-<span class="sourceLineNo">881</span>      
lock.releaseExclusiveLock(procedure);<a name="line.881"></a>
-<span class="sourceLineNo">882</span>      // We do not need to create a new 
queue so just pass null, as in tests we may pass procedures<a 
name="line.882"></a>
-<span class="sourceLineNo">883</span>      // other than 
ServerProcedureInterface<a name="line.883"></a>
-<span class="sourceLineNo">884</span>      addToRunQueue(serverRunQueue, 
getServerQueue(serverName, null));<a name="line.884"></a>
-<span class="sourceLineNo">885</span>      int waitingCount = 
wakeWaitingProcedures(lock);<a name="line.885"></a>
-<span class="sourceLineNo">886</span>      wakePollIfNeeded(waitingCount);<a 
name="line.886"></a>
-<span class="sourceLineNo">887</span>    } finally {<a name="line.887"></a>
-<span class="sourceLineNo">888</span>      schedUnlock();<a 
name="line.888"></a>
-<span class="sourceLineNo">889</span>    }<a name="line.889"></a>
-<span class="sourceLineNo">890</span>  }<a name="line.890"></a>
-<span class="sourceLineNo">891</span><a name="line.891"></a>
-<span class="sourceLineNo">892</span>  // 
============================================================================<a 
name="line.892"></a>
-<span class="sourceLineNo">893</span>  //  Peer Locking Helpers<a 
name="line.893"></a>
-<span class="sourceLineNo">894</span>  // 
============================================================================<a 
name="line.894"></a>
-<span class="sourceLineNo">895</span>  /**<a name="line.895"></a>
-<span class="sourceLineNo">896</span>   * Try to acquire the exclusive lock on 
the specified peer.<a name="line.896"></a>
-<span class="sourceLineNo">897</span>   * @see 
#wakePeerExclusiveLock(Procedure, String)<a name="line.897"></a>
-<span class="sourceLineNo">898</span>   * @param procedure the procedure 
trying to acquire the lock<a name="line.898"></a>
-<span class="sourceLineNo">899</span>   * @param peerId peer to lock<a 
name="line.899"></a>
-<span class="sourceLineNo">900</span>   * @return true if the procedure has to 
wait for the peer to be available<a name="line.900"></a>
-<span class="sourceLineNo">901</span>   */<a name="line.901"></a>
-<span class="sourceLineNo">902</span>  public boolean 
waitPeerExclusiveLock(Procedure&lt;?&gt; procedure, String peerId) {<a 
name="line.902"></a>
-<span class="sourceLineNo">903</span>    schedLock();<a name="line.903"></a>
-<span class="sourceLineNo">904</span>    try {<a name="line.904"></a>
-<span class="sourceLineNo">905</span>      final LockAndQueue lock = 
locking.getPeerLock(peerId);<a name="line.905"></a>
-<span class="sourceLineNo">906</span>      if 
(lock.tryExclusiveLock(procedure)) {<a name="line.906"></a>
-<span class="sourceLineNo">907</span>        removeFromRunQueue(peerRunQueue, 
getPeerQueue(peerId));<a name="line.907"></a>
-<span class="sourceLineNo">908</span>        return false;<a 
name="line.908"></a>
-<span class="sourceLineNo">909</span>      }<a name="line.909"></a>
-<span class="sourceLineNo">910</span>      waitProcedure(lock, procedure);<a 
name="line.910"></a>
-<span class="sourceLineNo">911</span>      
logLockedResource(LockedResourceType.PEER, peerId);<a name="line.911"></a>
-<span class="sourceLineNo">912</span>      return true;<a name="line.912"></a>
-<span class="sourceLineNo">913</span>    } finally {<a name="line.913"></a>
-<span class="sourceLineNo">914</span>      schedUnlock();<a 
name="line.914"></a>
-<span class="sourceLineNo">915</span>    }<a name="line.915"></a>
-<span class="sourceLineNo">916</span>  }<a name="line.916"></a>
-<span class="sourceLineNo">917</span><a name="line.917"></a>
-<span class="sourceLineNo">918</span>  /**<a name="line.918"></a>
-<span class="sourceLineNo">919</span>   * Wake the procedures waiting for the 
specified peer<a name="line.919"></a>
-<span class="sourceLineNo">920</span>   * @see 
#waitPeerExclusiveLock(Procedure, String)<a name="line.920"></a>
-<span class="sourceLineNo">921</span>   * @param procedure the procedure 
releasing the lock<a name="line.921"></a>
-<span class="sourceLineNo">922</span>   * @param peerId the peer that has the 
exclusive lock<a name="line.922"></a>
-<span class="sourceLineNo">923</span>   */<a name="line.923"></a>
-<span class="sourceLineNo">924</span>  public void 
wakePeerExclusiveLock(Procedure&lt;?&gt; procedure, String peerId) {<a 
name="line.924"></a>
-<span class="sourceLineNo">925</span>    schedLock();<a name="line.925"></a>
-<span class="sourceLineNo">926</span>    try {<a name="line.926"></a>
-<span class="sourceLineNo">927</span>      final LockAndQueue lock = 
locking.getPeerLock(peerId);<a name="line.927"></a>
-<span class="sourceLineNo">928</span>      
lock.releaseExclusiveLock(procedure);<a name="line.928"></a>
-<span class="sourceLineNo">929</span>      addToRunQueue(peerRunQueue, 
getPeerQueue(peerId));<a name="line.929"></a>
-<span class="sourceLineNo">930</span>      int waitingCount = 
wakeWaitingProcedures(lock);<a name="line.930"></a>
-<span class="sourceLineNo">931</span>      wakePollIfNeeded(waitingCount);<a 
name="line.931"></a>
-<span class="sourceLineNo">932</span>    } finally {<a name="line.932"></a>
-<span class="sourceLineNo">933</span>      schedUnlock();<a 
name="line.933"></a>
-<span class="sourceLineNo">934</span>    }<a name="line.934"></a>
-<span class="sourceLineNo">935</span>  }<a name="line.935"></a>
-<span class="sourceLineNo">936</span><a name="line.936"></a>
-<span class="sourceLineNo">937</span>  // 
============================================================================<a 
name="line.937"></a>
-<span class="sourceLineNo">938</span>  // Meta Locking Helpers<a 
name="line.938"></a>
-<span class="sourceLineNo">939</span>  // 
============================================================================<a 
name="line.939"></a>
-<span class="sourceLineNo">940</span>  /**<a name="line.940"></a>
-<span class="sourceLineNo">941</span>   * Try to acquire the exclusive lock on 
meta.<a name="line.941"></a>
-<span class="sourceLineNo">942</span>   * @see 
#wakeMetaExclusiveLock(Procedure)<a name="line.942"></a>
-<span class="sourceLineNo">943</span>   * @param procedure the procedure 
trying to acquire the lock<a name="line.943"></a>
-<span class="sourceLineNo">944</span>   * @return true if the procedure has to 
wait for meta to be available<a name="line.944"></a>
-<span class="sourceLineNo">945</span>   * @deprecated only used for {@link 
RecoverMetaProcedure}. Should be removed along with<a name="line.945"></a>
-<span class="sourceLineNo">946</span>   *             {@link 
RecoverMetaProcedure}.<a name="line.946"></a>
-<span class="sourceLineNo">947</span>   */<a name="line.947"></a>
-<span class="sourceLineNo">948</span>  @Deprecated<a name="line.948"></a>
-<span class="sourceLineNo">949</span>  public boolean 
waitMetaExclusiveLock(Procedure&lt;?&gt; procedure) {<a name="line.949"></a>
-<span class="sourceLineNo">950</span>    schedLock();<a name="line.950"></a>
-<span class="sourceLineNo">951</span>    try {<a name="line.951"></a>
-<span class="sourceLineNo">952</span>      final LockAndQueue lock = 
locking.getMetaLock();<a name="line.952"></a>
-<span class="sourceLineNo">953</span>      if 
(lock.tryExclusiveLock(procedure)) {<a name="line.953"></a>
-<span class="sourceLineNo">954</span>        removeFromRunQueue(metaRunQueue, 
getMetaQueue());<a name="line.954"></a>
-<span class="sourceLineNo">955</span>        return false;<a 
name="line.955"></a>
-<span class="sourceLineNo">956</span>      }<a name="line.956"></a>
-<span class="sourceLineNo">957</span>      waitProcedure(lock, procedure);<a 
name="line.957"></a>
-<span class="sourceLineNo">958</span>      
logLockedResource(LockedResourceType.META, 
TableName.META_TABLE_NAME.getNameAsString());<a name="line.958"></a>
-<span class="sourceLineNo">959</span>      return true;<a name="line.959"></a>
-<span class="sourceLineNo">960</span>    } finally {<a name="line.960"></a>
-<span class="sourceLineNo">961</span>      schedUnlock();<a 
name="line.961"></a>
-<span class="sourceLineNo">962</span>    }<a name="line.962"></a>
-<span class="sourceLineNo">963</span>  }<a name="line.963"></a>
-<span class="sourceLineNo">964</span><a name="line.964"></a>
-<span class="sourceLineNo">965</span>  /**<a name="line.965"></a>
-<span class="sourceLineNo">966</span>   * Wake the procedures waiting for 
meta.<a name="line.966"></a>
-<span class="sourceLineNo">967</span>   * @see 
#waitMetaExclusiveLock(Procedure)<a name="line.967"></a>
-<span class="sourceLineNo">968</span>   * @param procedure the procedure 
releasing the lock<a name="line.968"></a>
-<span class="sourceLineNo">969</span>   * @deprecated only used for {@link 
RecoverMetaProcedure}. Should be removed along with<a name="line.969"></a>
-<span class="sourceLineNo">970</span>   *             {@link 
RecoverMetaProcedure}.<a name="line.970"></a>
-<span class="sourceLineNo">971</span>   */<a name="line.971"></a>
-<span class="sourceLineNo">972</span>  @Deprecated<a name="line.972"></a>
-<span class="sourceLineNo">973</span>  public void 
wakeMetaExclusiveLock(Procedure&lt;?&gt; procedure) {<a name="line.973"></a>
-<span class="sourceLineNo">974</span>    schedLock();<a name="line.974"></a>
-<span class="sourceLineNo">975</span>    try {<a name="line.975"></a>
-<span class="sourceLineNo">976</span>      final LockAndQueue lock = 
locking.getMetaLock();<a name="line.976"></a>
-<span class="sourceLineNo">977</span>      
lock.releaseExclusiveLock(procedure);<a name="line.977"></a>
-<span class="sourceLineNo">978</span>      addToRunQueue(metaRunQueue, 
getMetaQueue());<a name="line.978"></a>
-<span class="sourceLineNo">979</span>      int waitingCount = 
wakeWaitingProcedures(lock);<a name="line.979"></a>
-<span class="sourceLineNo">980</span>      wakePollIfNeeded(waitingCount);<a 
name="line.980"></a>
-<span class="sourceLineNo">981</span>    } finally {<a name="line.981"></a>
-<span class="sourceLineNo">982</span>      schedUnlock();<a 
name="line.982"></a>
-<span class="sourceLineNo">983</span>    }<a name="line.983"></a>
-<span class="sourceLineNo">984</span>  }<a name="line.984"></a>
-<span class="sourceLineNo">985</span><a name="line.985"></a>
-<span class="sourceLineNo">986</span>  /**<a name="line.986"></a>
-<span class="sourceLineNo">987</span>   * For debugging. Expensive.<a 
name="line.987"></a>
-<span class="sourceLineNo">988</span>   */<a name="line.988"></a>
-<span class="sourceLineNo">989</span>  @VisibleForTesting<a 
name="line.989"></a>
-<span class="sourceLineNo">990</span>  public String dumpLocks() throws 
IOException {<a name="line.990"></a>
-<span class="sourceLineNo">991</span>    schedLock();<a name="line.991"></a>
-<span class="sourceLineNo">992</span>    try {<a name="line.992"></a>
-<span class="sourceLineNo">993</span>      // TODO: Refactor so we stream out 
locks for case when millions; i.e. take a PrintWriter<a name="line.993"></a>
-<span class="sourceLineNo">994</span>      return this.locking.toString();<a 
name="line.994"></a>
-<span class="sourceLineNo">995</span>    } finally {<a name="line.995"></a>
-<span class="sourceLineNo">996</span>      schedUnlock();<a 
name="line.996"></a>
-<span class="sourceLineNo">997</span>    }<a name="line.997"></a>
-<span class="sourceLineNo">998</span>  }<a name="line.998"></a>
-<span class="sourceLineNo">999</span>}<a name="line.999"></a>
+<span class="sourceLineNo">803</span>      return false;<a name="line.803"></a>
+<span class="sourceLineNo">804</span>    } finally {<a name="line.804"></a>
+<span class="sourceLineNo">805</span>      schedUnlock();<a 
name="line.805"></a>
+<span class="sourceLineNo">806</span>    }<a name="line.806"></a>
+<span class="sourceLineNo">807</span>  }<a name="line.807"></a>
+<span class="sourceLineNo">808</span><a name="line.808"></a>
+<span class="sourceLineNo">809</span>  /**<a name="line.809"></a>
+<span class="sourceLineNo">810</span>   * Wake the procedures waiting for the 
specified namespace<a name="line.810"></a>
+<span class="sourceLineNo">811</span>   * @see 
#waitNamespaceExclusiveLock(Procedure,String)<a name="line.811"></a>
+<span class="sourceLineNo">812</span>   * @param procedure the procedure 
releasing the lock<a name="line.812"></a>
+<span class="sourceLineNo">813</span>   * @param namespace the namespace that 
has the exclusive lock<a name="line.813"></a>
+<span class="sourceLineNo">814</span>   */<a name="line.814"></a>
+<span class="sourceLineNo">815</span>  public void 
wakeNamespaceExclusiveLock(final Procedure&lt;?&gt; procedure, final String 
namespace) {<a name="line.815"></a>
+<span class="sourceLineNo">816</span>    schedLock();<a name="line.816"></a>
+<span class="sourceLineNo">817</span>    try {<a name="line.817"></a>
+<span class="sourceLineNo">818</span>      final LockAndQueue namespaceLock = 
locking.getNamespaceLock(namespace);<a name="line.818"></a>
+<span class="sourceLineNo">819</span>      final LockAndQueue 
systemNamespaceTableLock =<a name="line.819"></a>
+<span class="sourceLineNo">820</span>          
locking.getTableLock(TableName.NAMESPACE_TABLE_NAME);<a name="line.820"></a>
+<span class="sourceLineNo">821</span>      int waitingCount = 0;<a 
name="line.821"></a>
+<span class="sourceLineNo">822</span>      if 
(namespaceLock.releaseExclusiveLock(procedure)) {<a name="line.822"></a>
+<span class="sourceLineNo">823</span>        waitingCount += 
wakeWaitingProcedures(namespaceLock);<a name="line.823"></a>
+<span class="sourceLineNo">824</span>      }<a name="line.824"></a>
+<span class="sourceLineNo">825</span>      if 
(systemNamespaceTableLock.releaseSharedLock()) {<a name="line.825"></a>
+<span class="sourceLineNo">826</span>        addToRunQueue(tableRunQueue, 
getTableQueue(TableName.NAMESPACE_TABLE_NAME));<a name="line.826"></a>
+<span class="sourceLineNo">827</span>        waitingCount += 
wakeWaitingProcedures(systemNamespaceTableLock);<a name="line.827"></a>
+<span class="sourceLineNo">828</span>      }<a name="line.828"></a>
+<span class="sourceLineNo">829</span>      wakePollIfNeeded(waitingCount);<a 
name="line.829"></a>
+<span class="sourceLineNo">830</span>    } finally {<a name="line.830"></a>
+<span class="sourceLineNo">831</span>      schedUnlock();<a 
name="line.831"></a>
+<span class="sourceLineNo">832</span>    }<a name="line.832"></a>
+<span class="sourceLineNo">833</span>  }<a name="line.833"></a>
+<span class="sourceLineNo">834</span><a name="line.834"></a>
+<span class="sourceLineNo">835</span>  // 
============================================================================<a 
name="line.835"></a>
+<span class="sourceLineNo">836</span>  //  Server Locking Helpers<a 
name="line.836"></a>
+<span class="sourceLineNo">837</span>  // 
============================================================================<a 
name="line.837"></a>
+<span class="sourceLineNo">838</span>  /**<a name="line.838"></a>
+<span class="sourceLineNo">839</span>   * Try to acquire the exclusive lock on 
the specified server.<a name="line.839"></a>
+<span class="sourceLineNo">840</span>   * @see 
#wakeServerExclusiveLock(Procedure,ServerName)<a name="line.840"></a>
+<span class="sourceLineNo">841</span>   * @param procedure the procedure 
trying to acquire the lock<a name="line.841"></a>
+<span class="sourceLineNo">842</span>   * @param serverName Server to lock<a 
name="line.842"></a>
+<span class="sourceLineNo">843</span>   * @return true if the procedure has to 
wait for the server to be available<a name="line.843"></a>
+<span class="sourceLineNo">844</span>   */<a name="line.844"></a>
+<span class="sourceLineNo">845</span>  public boolean 
waitServerExclusiveLock(final Procedure&lt;?&gt; procedure,<a 
name="line.845"></a>
+<span class="sourceLineNo">846</span>      final ServerName serverName) {<a 
name="line.846"></a>
+<span class="sourceLineNo">847</span>    schedLock();<a name="line.847"></a>
+<span class="sourceLineNo">848</span>    try {<a name="line.848"></a>
+<span class="sourceLineNo">849</span>      final LockAndQueue lock = 
locking.getServerLock(serverName);<a name="line.849"></a>
+<span class="sourceLineNo">850</span>      if 
(lock.tryExclusiveLock(procedure)) {<a name="line.850"></a>
+<span class="sourceLineNo">851</span>        // We do not need to create a new 
queue so just pass null, as in tests we may pass<a name="line.851"></a>
+<span class="sourceLineNo">852</span>        // procedures other than 
ServerProcedureInterface<a name="line.852"></a>
+<span class="sourceLineNo">853</span>        
removeFromRunQueue(serverRunQueue, getServerQueue(serverName, null));<a 
name="line.853"></a>
+<span class="sourceLineNo">854</span>        return false;<a 
name="line.854"></a>
+<span class="sourceLineNo">855</span>      }<a name="line.855"></a>
+<span class="sourceLineNo">856</span>      waitProcedure(lock, procedure);<a 
name="line.856"></a>
+<span class="sourceLineNo">857</span>      
logLockedResource(LockedResourceType.SERVER, serverName.getServerName());<a 
name="line.857"></a>
+<span class="sourceLineNo">858</span>      return true;<a name="line.858"></a>
+<span class="sourceLineNo">859</span>    } finally {<a name="line.859"></a>
+<span class="sourceLineNo">860</span>      schedUnlock();<a 
name="line.860"></a>
+<span class="sourceLineNo">861</span>    }<a name="line.861"></a>
+<span class="sourceLineNo">862</span>  }<a name="line.862"></a>
+<span class="sourceLineNo">863</span><a name="line.863"></a>
+<span class="sourceLineNo">864</span>  /**<a name="line.864"></a>
+<span class="sourceLineNo">865</span>   * Wake the procedures waiting for the 
specified server<a name="line.865"></a>
+<span class="sourceLineNo">866</span>   * @see 
#waitServerExclusiveLock(Procedure,ServerName)<a name="line.866"></a>
+<span class="sourceLineNo">867</span>   * @param procedure the procedure 
releasing the lock<a name="line.867"></a>
+<span class="sourceLineNo">868</span>   * @param serverName the server that 
has the exclusive lock<a name="line.868"></a>
+<span class="sourceLineNo">869</span>   */<a name="line.869"></a>
+<span class="sourceLineNo">870</span>  public void 
wakeServerExclusiveLock(final Procedure&lt;?&gt; procedure, final ServerName 
serverName) {<a name="line.870"></a>
+<span class="sourceLineNo">871</span>    schedLock();<a name="line.871"></a>
+<span class="sourceLineNo">872</span>    try {<a name="line.872"></a>
+<span class="sourceLineNo">873</span>      final LockAndQueue lock = 
locking.getServerLock(serverName);<a name="line.873"></a>
+<span class="sourceLineNo">874</span>      // Only SCP will acquire/release 
server lock so do not need to check the return value here.<a 
name="line.874"></a>
+<span class="sourceLineNo">875</span>      
lock.releaseExclusiveLock(procedure);<a name="line.875"></a>
+<span class="sourceLineNo">876</span>      // We do not need to create a new 
queue so just pass null, as in tests we may pass procedures<a 
name="line.876"></a>
+<span class="sourceLineNo">877</span>      // other than 
ServerProcedureInterface<a name="line.877"></a>
+<span class="sourceLineNo">878</span>      addToRunQueue(serverRunQueue, 
getServerQueue(serverName, null));<a name="line.878"></a>
+<span class="sourceLineNo">879</span>      int waitingCount = 
wakeWaitingProcedures(lock);<a name="line.879"></a>
+<span class="sourceLineNo">880</span>      wakePollIfNeeded(waitingCount);<a 
name="line.880"></a>
+<span class="sourceLineNo">881</span>    } finally {<a name="line.881"></a>
+<span class="sourceLineNo">882</span>      schedUnlock();<a 
name="line.882"></a>
+<span class="sourceLineNo">883</span>    }<a name="line.883"></a>
+<span class="sourceLineNo">884</span>  }<a name="line.884"></a>
+<span class="sourceLineNo">885</span><a name="line.885"></a>
+<span class="sourceLineNo">886</span>  // 
============================================================================<a 
name="line.886"></a>
+<span class="sourceLineNo">887</span>  //  Peer Locking Helpers<a 
name="line.887"></a>
+<span class="sourceLineNo">888</span>  // 
============================================================================<a 
name="line.888"></a>
+<span class="sourceLineNo">889</span>  /**<a name="line.889"></a>
+<span class="sourceLineNo">890</span>   * Try to acquire the exclusive lock on 
the specified peer.<a name="line.890"></a>
+<span class="sourceLineNo">891</span>   * @see 
#wakePeerExclusiveLock(Procedure, String)<a name="line.891"></a>
+<span class="sourceLineNo">892</span>   * @param procedure the procedure 
trying to acquire the lock<a name="line.892"></a>
+<span class="sourceLineNo">893</span>   * @param peerId peer to lock<a 
name="line.893"></a>
+<span class="sourceLineNo">894</span>   * @return true if the procedure has to 
wait for the peer to be available<a name="line.894"></a>
+<span class="sourceLineNo">895</span>   */<a name="line.895"></a>
+<span class="sourceLineNo">896</span>  public boolean 
waitPeerExclusiveLock(Procedure&lt;?&gt; procedure, String peerId) {<a 
name="line.896"></a>
+<span class="sourceLineNo">897</span>    schedLock();<a name="line.897"></a>
+<span class="sourceLineNo">898</span>    try {<a name="line.898"></a>
+<span class="sourceLineNo">899</span>      final LockAndQueue lock = 
locking.getPeerLock(peerId);<a name="line.899"></a>
+<span class="sourceLineNo">900</span>      if 
(lock.tryExclusiveLock(procedure)) {<a name="line.900"></a>
+<span class="sourceLineNo">901</span>        removeFromRunQueue(peerRunQueue, 
getPeerQueue(peerId));<a name="line.901"></a>
+<span class="sourceLineNo">902</span>        return false;<a 
name="line.902"></a>
+<span class="sourceLineNo">903</span>      }<a name="line.903"></a>
+<span class="sourceLineNo">904</span>      waitProcedure(lock, procedure);<a 
name="line.904"></a>
+<span class="sourceLineNo">905</span>      
logLockedResource(LockedResourceType.PEER, peerId);<a name="line.905"></a>
+<span class="sourceLineNo">906</span>      return true;<a name="line.906"></a>
+<span class="sourceLineNo">907</span>    } finally {<a name="line.907"></a>
+<span class="sourceLineNo">908</span>      schedUnlock();<a 
name="line.908"></a>
+<span class="sourceLineNo">909</span>    }<a name="line.909"></a>
+<span class="sourceLineNo">910</span>  }<a name="line.910"></a>
+<span class="sourceLineNo">911</span><a name="line.911"></a>
+<span class="sourceLineNo">912</span>  /**<a name="line.912"></a>
+<span class="sourceLineNo">913</span>   * Wake the procedures waiting for the 
specified peer<a name="line.913"></a>
+<span class="sourceLineNo">914</span>   * @see 
#waitPeerExclusiveLock(Procedure, String)<a name="line.914"></a>
+<span class="sourceLineNo">915</span>   * @param procedure the procedure 
releasing the lock<a name="line.915"></a>
+<span class="sourceLineNo">916</span>   * @param peerId the peer that has the 
exclusive lock<a name="line.916"></a>
+<span class="sourceLineNo">917</span>   */<a name="line.917"></a>
+<span class="sourceLineNo">918</span>  public void 
wakePeerExclusiveLock(Procedure&lt;?&gt; procedure, String peerId) {<a 
name="line.918"></a>
+<span class="sourceLineNo">919</span>    schedLock();<a name="line.919"></a>
+<span class="sourceLineNo">920</span>    try {<a name="line.920"></a>
+<span class="sourceLineNo">921</span>      final LockAndQueue lock = 
locking.getPeerLock(peerId);<a name="line.921"></a>
+<span class="sourceLineNo">922</span>      if 
(lock.releaseExclusiveLock(procedure)) {<a name="line.922"></a>
+<span class="sourceLineNo">923</span>        addToRunQueue(peerRunQueue, 
getPeerQueue(peerId));<a name="line.923"></a>
+<span class="sourceLineNo">924</span>        int waitingCount = 
wakeWaitingProcedures(lock);<a name="line.924"></a>
+<span class="sourceLineNo">925</span>        wakePollIfNeeded(waitingCount);<a 
name="line.925"></a>
+<span class="sourceLineNo">926</span>      }<a name="line.926"></a>
+<span class="sourceLineNo">927</span>    } finally {<a name="line.927"></a>
+<span class="sourceLineNo">928</span>      schedUnlock();<a 
name="line.928"></a>
+<span class="sourceLineNo">929</span>    }<a name="line.929"></a>
+<span class="sourceLineNo">930</span>  }<a name="line.930"></a>
+<span class="sourceLineNo">931</span><a name="line.931"></a>
+<span class="sourceLineNo">932</span>  // 
============================================================================<a 
name="line.932"></a>
+<span class="sourceLineNo">933</span>  // Meta Locking Helpers<a 
name="line.933"></a>
+<span class="sourceLineNo">934</span>  // 
============================================================================<a 
name="line.934"></a>
+<span class="sourceLineNo">935</span>  /**<a name="line.935"></a>
+<span class="sourceLineNo">936</span>   * Try to acquire the exclusive lock on 
meta.<a name="line.936"></a>
+<span class="sourceLineNo">937</span>   * @see 
#wakeMetaExclusiveLock(Procedure)<a name="line.937"></a>
+<span class="sourceLineNo">938</span>   * @param procedure the procedure 
trying to acquire the lock<a name="line.938"></a>
+<span class="sourceLineNo">939</span>   * @return true if the procedure has to 
wait for meta to be available<a name="line.939"></a>
+<span class="sourceLineNo">940</span>   * @deprecated only used for {@link 
RecoverMetaProcedure}. Should be removed along with<a name="line.940"></a>
+<span class="sourceLineNo">941</span>   *             {@link 
RecoverMetaProcedure}.<a name="line.941"></a>
+<span class="sourceLineNo">942</span>   */<a name="line.942"></a>
+<span class="sourceLineNo">943</span>  @Deprecated<a name="line.943"></a>
+<span class="sourceLineNo">944</span>  public boolean 
waitMetaExclusiveLock(Procedure&lt;?&gt; procedure) {<a name="line.944"></a>
+<span class="sourceLineNo">945</span>    schedLock();<a name="line.945"></a>
+<span class="sourceLineNo">946</span>    try {<a name="line.946"></a>
+<span class="sourceLineNo">947</span>      final LockAndQueue lock = 
locking.getMetaLock();<a name="line.947"></a>
+<span class="sourceLineNo">948</span>      if 
(lock.tryExclusiveLock(procedure)) {<a name="line.948"></a>
+<span class="sourceLineNo">949</span>        removeFromRunQueue(metaRunQueue, 
getMetaQueue());<a name="line.949"></a>
+<span class="sourceLineNo">950</span>        return false;<a 
name="line.950"></a>
+<span class="sourceLineNo">951</span>      }<a name="line.951"></a>
+<span class="sourceLineNo">952</span>      waitProcedure(lock, procedure);<a 
name="line.952"></a>
+<span class="sourceLineNo">953</span>      
logLockedResource(LockedResourceType.META, 
TableName.META_TABLE_NAME.getNameAsString());<a name="line.953"></a>
+<span class="sourceLineNo">954</span>      return true;<a name="line.954"></a>
+<span class="sourceLineNo">955</span>    } finally {<a name="line.955"></a>
+<span class="sourceLineNo">956</span>      schedUnlock();<a 
name="line.956"></a>
+<span class="sourceLineNo">957</span>    }<a name="line.957"></a>
+<span class="sourceLineNo">958</span>  }<a name="line.958"></a>
+<span class="sourceLineNo">959</span><a name="line.959"></a>
+<span class="sourceLineNo">960</span>  /**<a name="line.960"></a>
+<span class="sourceLineNo">961</span>   * Wake the procedures waiting for 
meta.<a name="line.961"></a>
+<span class="sourceLineNo">962</span>   * @see 
#waitMetaExclusiveLock(Procedure)<a name="line.962"></a>
+<span class="sourceLineNo">963</span>   * @param procedure the procedure 
releasing the lock<a name="line.963"></a>
+<span class="sourceLineNo">964</span>   * @deprecated only used for {@link 
RecoverMetaProcedure}. Should be removed along with<a name="line.964"></a>
+<span class="sourceLineNo">965</span>   *             {@link 
RecoverMetaProcedure}.<a name="line.965"></a>
+<span class="sourceLineNo">966</span>   */<a name="line.966"></a>
+<span class="sourceLineNo">967</span>  @Deprecated<a name="line.967"></a>
+<span class="sourceLineNo">968</span>  public void 
wakeMetaExclusiveLock(Procedure&lt;?&gt; procedure) {<a name="line.968"></a>
+<span class="sourceLineNo">969</span>    schedLock();<a name="line.969"></a>
+<span class="sourceLineNo">970</span>    try {<a name="line.970"></a>
+<span class="sourceLineNo">971</span>      final LockAndQueue lock = 
locking.getMetaLock();<a name="line.971"></a>
+<span class="sourceLineNo">972</span>      
lock.releaseExclusiveLock(procedure);<a name="line.972"></a>
+<span class="sourceLineNo">973</span>      addToRunQueue(metaRunQueue, 
getMetaQueue());<a name="line.973"></a>
+<span class="sourceLineNo">974</span>      int waitingCount = 
wakeWaitingProcedures(lock);<a name="line.974"></a>
+<span class="sourceLineNo">975</span>      wakePollIfNeeded(waitingCount);<a 
name="line.975"></a>
+<span class="sourceLineNo">976</span>    } finally {<a name="line.976"></a>
+<span class="sourceLineNo">977</span>      schedUnlock();<a 
name="line.977"></a>
+<span class="sourceLineNo">978</span>    }<a name="line.978"></a>
+<span class="sourceLineNo">979</span>  }<a name="line.979"></a>
+<span class="sourceLineNo">980</span><a name="line.980"></a>
+<span class="sourceLineNo">981</span>  /**<a name="line.981"></a>
+<span class="sourceLineNo">982</span>   * For debugging. Expensive.<a 
name="line.982"></a>
+<span class="sourceLineNo">983</span>   */<a name="line.983"></a>
+<span class="sourceLineNo">984</span>  @VisibleForTesting<a 
name="line.984"></a>
+<span class="sourceLineNo">985</span>  public String dumpLocks() throws 
IOException {<a name="line.985"></a>
+<span class="sourceLineNo">986</span>    schedLock();<a name="line.986"></a>
+<span class="sourceLineNo">987</span>    try {<a name="line.987"></a>
+<span class="sourceLineNo">988</span>      // TODO: Refactor so we stream out 
locks for case when millions; i.e. take a PrintWriter<a name="line.988"></a>
+<span class="sourceLineNo">989</span>      return this.locking.toString();<a 
name="line.989"></a>
+<span class="sourceLineNo">990</span>    } finally {<a name="line.990"></a>
+<span class="sourceLineNo">991</span>      schedUnlock();<a 
name="line.991"></a>
+<span class="sourceLineNo">992</span>    }<a name="line.992"></a>
+<span class="sourceLineNo">993</span>  }<a name="line.993"></a>
+<span class="sourceLineNo">994</span>}<a name="line.994"></a>
 
 
 

Reply via email to