http://git-wip-us.apache.org/repos/asf/hbase-site/blob/621486f3/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 696449f..8a6d3d9 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
@@ -109,785 +109,847 @@
 <span class="sourceLineNo">101</span>    (n, k) -&gt; n.compareKey((TableName) 
k);<a name="line.101"></a>
 <span class="sourceLineNo">102</span>  private final static 
AvlKeyComparator&lt;PeerQueue&gt; PEER_QUEUE_KEY_COMPARATOR =<a 
name="line.102"></a>
 <span class="sourceLineNo">103</span>    (n, k) -&gt; n.compareKey((String) 
k);<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span>  private final 
FairQueue&lt;ServerName&gt; serverRunQueue = new FairQueue&lt;&gt;();<a 
name="line.105"></a>
-<span class="sourceLineNo">106</span>  private final 
FairQueue&lt;TableName&gt; tableRunQueue = new FairQueue&lt;&gt;();<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>  private final FairQueue&lt;String&gt; 
peerRunQueue = new FairQueue&lt;&gt;();<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span>  private final ServerQueue[] 
serverBuckets = new ServerQueue[128];<a name="line.109"></a>
-<span class="sourceLineNo">110</span>  private TableQueue tableMap = null;<a 
name="line.110"></a>
-<span class="sourceLineNo">111</span>  private PeerQueue peerMap = null;<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span>  private final SchemaLocking locking = 
new SchemaLocking();<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span>  @Override<a name="line.115"></a>
-<span class="sourceLineNo">116</span>  public void yield(final Procedure proc) 
{<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    push(proc, isTableProcedure(proc), 
true);<a name="line.117"></a>
-<span class="sourceLineNo">118</span>  }<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>  @Override<a name="line.120"></a>
-<span class="sourceLineNo">121</span>  protected void enqueue(final Procedure 
proc, final boolean addFront) {<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    if (isTableProcedure(proc)) {<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>      doAdd(tableRunQueue, 
getTableQueue(getTableName(proc)), proc, addFront);<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    } else if (isServerProcedure(proc)) 
{<a name="line.124"></a>
-<span class="sourceLineNo">125</span>      doAdd(serverRunQueue, 
getServerQueue(getServerName(proc)), proc, addFront);<a name="line.125"></a>
-<span class="sourceLineNo">126</span>    } else if (isPeerProcedure(proc)) {<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>      doAdd(peerRunQueue, 
getPeerQueue(getPeerId(proc)), proc, addFront);<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    } else {<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      // TODO: at the moment we only have 
Table and Server procedures<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      // if you are implementing a 
non-table/non-server procedure, you have two options: create<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>      // a group for all the 
non-table/non-server procedures or try to find a key for your<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>      // non-table/non-server procedures 
and implement something similar to the TableRunQueue.<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      throw new 
UnsupportedOperationException(<a name="line.133"></a>
-<span class="sourceLineNo">134</span>        "RQs for non-table/non-server 
procedures are not implemented yet: " + proc);<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    }<a name="line.135"></a>
-<span class="sourceLineNo">136</span>  }<a name="line.136"></a>
-<span class="sourceLineNo">137</span><a name="line.137"></a>
-<span class="sourceLineNo">138</span>  private &lt;T extends 
Comparable&lt;T&gt;&gt; void doAdd(final FairQueue&lt;T&gt; fairq,<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>      final Queue&lt;T&gt; queue, final 
Procedure&lt;?&gt; proc, final boolean addFront) {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    queue.add(proc, addFront);<a 
name="line.140"></a>
-<span class="sourceLineNo">141</span>    if 
(!queue.getLockStatus().hasExclusiveLock() || 
queue.getLockStatus().isLockOwner(proc.getProcId())) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      // if the queue was not remove for 
an xlock execution<a name="line.142"></a>
-<span class="sourceLineNo">143</span>      // or the proc is the lock owner, 
put the queue back into execution<a name="line.143"></a>
-<span class="sourceLineNo">144</span>      addToRunQueue(fairq, queue);<a 
name="line.144"></a>
-<span class="sourceLineNo">145</span>    } else if 
(queue.getLockStatus().hasParentLock(proc)) {<a name="line.145"></a>
-<span class="sourceLineNo">146</span>      assert addFront : "expected to add 
a child in the front";<a name="line.146"></a>
-<span class="sourceLineNo">147</span>      // our (proc) parent has the 
xlock,<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      // so the queue is not in the fairq 
(run-queue)<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      // add it back to let the child run 
(inherit the lock)<a name="line.149"></a>
+<span class="sourceLineNo">104</span>  private final static 
AvlKeyComparator&lt;MetaQueue&gt; META_QUEUE_KEY_COMPARATOR =<a 
name="line.104"></a>
+<span class="sourceLineNo">105</span>    (n, k) -&gt; n.compareKey((TableName) 
k);<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span>  private final 
FairQueue&lt;ServerName&gt; serverRunQueue = new FairQueue&lt;&gt;();<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>  private final 
FairQueue&lt;TableName&gt; tableRunQueue = new FairQueue&lt;&gt;();<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>  private final FairQueue&lt;String&gt; 
peerRunQueue = new FairQueue&lt;&gt;();<a name="line.109"></a>
+<span class="sourceLineNo">110</span>  private final 
FairQueue&lt;TableName&gt; metaRunQueue = new FairQueue&lt;&gt;();<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span>  private final ServerQueue[] 
serverBuckets = new ServerQueue[128];<a name="line.112"></a>
+<span class="sourceLineNo">113</span>  private TableQueue tableMap = null;<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span>  private PeerQueue peerMap = null;<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>  private MetaQueue metaMap = null;<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span><a name="line.116"></a>
+<span class="sourceLineNo">117</span>  private final SchemaLocking locking = 
new SchemaLocking();<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span>  @Override<a name="line.119"></a>
+<span class="sourceLineNo">120</span>  public void yield(final Procedure proc) 
{<a name="line.120"></a>
+<span class="sourceLineNo">121</span>    push(proc, isTableProcedure(proc), 
true);<a name="line.121"></a>
+<span class="sourceLineNo">122</span>  }<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span>  @Override<a name="line.124"></a>
+<span class="sourceLineNo">125</span>  protected void enqueue(final Procedure 
proc, final boolean addFront) {<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    if (isMetaProcedure(proc)) {<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>      doAdd(metaRunQueue, getMetaQueue(), 
proc, addFront);<a name="line.127"></a>
+<span class="sourceLineNo">128</span>    } else if (isTableProcedure(proc)) 
{<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      doAdd(tableRunQueue, 
getTableQueue(getTableName(proc)), proc, addFront);<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    } else if (isServerProcedure(proc)) 
{<a name="line.130"></a>
+<span class="sourceLineNo">131</span>      doAdd(serverRunQueue, 
getServerQueue(getServerName(proc)), proc, addFront);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    } else if (isPeerProcedure(proc)) {<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>      doAdd(peerRunQueue, 
getPeerQueue(getPeerId(proc)), proc, addFront);<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    } else {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>      // TODO: at the moment we only have 
Table and Server procedures<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      // if you are implementing a 
non-table/non-server procedure, you have two options: create<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>      // a group for all the 
non-table/non-server procedures or try to find a key for your<a 
name="line.137"></a>
+<span class="sourceLineNo">138</span>      // non-table/non-server procedures 
and implement something similar to the TableRunQueue.<a name="line.138"></a>
+<span class="sourceLineNo">139</span>      throw new 
UnsupportedOperationException(<a name="line.139"></a>
+<span class="sourceLineNo">140</span>        "RQs for non-table/non-server 
procedures are not implemented yet: " + proc);<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    }<a name="line.141"></a>
+<span class="sourceLineNo">142</span>  }<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span>  private &lt;T extends 
Comparable&lt;T&gt;&gt; void doAdd(final FairQueue&lt;T&gt; fairq,<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>      final Queue&lt;T&gt; queue, final 
Procedure&lt;?&gt; proc, final boolean addFront) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    queue.add(proc, addFront);<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>    if 
(!queue.getLockStatus().hasExclusiveLock() || 
queue.getLockStatus().isLockOwner(proc.getProcId())) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      // if the queue was not remove for 
an xlock execution<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      // or the proc is the lock owner, 
put the queue back into execution<a name="line.149"></a>
 <span class="sourceLineNo">150</span>      addToRunQueue(fairq, queue);<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>    }<a name="line.151"></a>
-<span class="sourceLineNo">152</span>  }<a name="line.152"></a>
-<span class="sourceLineNo">153</span><a name="line.153"></a>
-<span class="sourceLineNo">154</span>  @Override<a name="line.154"></a>
-<span class="sourceLineNo">155</span>  protected boolean queueHasRunnables() 
{<a name="line.155"></a>
-<span class="sourceLineNo">156</span>    return tableRunQueue.hasRunnables() 
|| serverRunQueue.hasRunnables() ||<a name="line.156"></a>
-<span class="sourceLineNo">157</span>        peerRunQueue.hasRunnables();<a 
name="line.157"></a>
+<span class="sourceLineNo">151</span>    } else if 
(queue.getLockStatus().hasParentLock(proc)) {<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      assert addFront : "expected to add 
a child in the front";<a name="line.152"></a>
+<span class="sourceLineNo">153</span>      // our (proc) parent has the 
xlock,<a name="line.153"></a>
+<span class="sourceLineNo">154</span>      // so the queue is not in the fairq 
(run-queue)<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      // add it back to let the child run 
(inherit the lock)<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      addToRunQueue(fairq, queue);<a 
name="line.156"></a>
+<span class="sourceLineNo">157</span>    }<a name="line.157"></a>
 <span class="sourceLineNo">158</span>  }<a name="line.158"></a>
 <span class="sourceLineNo">159</span><a name="line.159"></a>
 <span class="sourceLineNo">160</span>  @Override<a name="line.160"></a>
-<span class="sourceLineNo">161</span>  protected Procedure dequeue() {<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>    // For now, let server handling have 
precedence over table handling; presumption is that it<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    // is more important handling crashed 
servers than it is running the<a name="line.163"></a>
-<span class="sourceLineNo">164</span>    // enabling/disabling tables, etc.<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>    Procedure&lt;?&gt; pollResult = 
doPoll(serverRunQueue);<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    if (pollResult == null) {<a 
name="line.166"></a>
-<span class="sourceLineNo">167</span>      pollResult = 
doPoll(peerRunQueue);<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    }<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    if (pollResult == null) {<a 
name="line.169"></a>
-<span class="sourceLineNo">170</span>      pollResult = 
doPoll(tableRunQueue);<a name="line.170"></a>
-<span class="sourceLineNo">171</span>    }<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    return pollResult;<a 
name="line.172"></a>
-<span class="sourceLineNo">173</span>  }<a name="line.173"></a>
-<span class="sourceLineNo">174</span><a name="line.174"></a>
-<span class="sourceLineNo">175</span>  private &lt;T extends 
Comparable&lt;T&gt;&gt; Procedure&lt;?&gt; doPoll(final FairQueue&lt;T&gt; 
fairq) {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    final Queue&lt;T&gt; rq = 
fairq.poll();<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    if (rq == null || !rq.isAvailable()) 
{<a name="line.177"></a>
-<span class="sourceLineNo">178</span>      return null;<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    }<a name="line.179"></a>
-<span class="sourceLineNo">180</span><a name="line.180"></a>
-<span class="sourceLineNo">181</span>    final Procedure&lt;?&gt; pollResult = 
rq.peek();<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    if (pollResult == null) {<a 
name="line.182"></a>
-<span class="sourceLineNo">183</span>      return null;<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    }<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    final boolean xlockReq = 
rq.requireExclusiveLock(pollResult);<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    if (xlockReq &amp;&amp; 
rq.getLockStatus().isLocked() &amp;&amp; 
!rq.getLockStatus().hasLockAccess(pollResult)) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>      // someone is already holding the 
lock (e.g. shared lock). avoid a yield<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      removeFromRunQueue(fairq, rq);<a 
name="line.188"></a>
-<span class="sourceLineNo">189</span>      return null;<a name="line.189"></a>
-<span class="sourceLineNo">190</span>    }<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span>    rq.poll();<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    if (rq.isEmpty() || xlockReq) {<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>      removeFromRunQueue(fairq, rq);<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>    } else if 
(rq.getLockStatus().hasParentLock(pollResult)) {<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      // if the rq is in the fairq 
because of runnable child<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      // check if the next procedure is 
still a child.<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      // if not, remove the rq from the 
fairq and go back to the xlock state<a name="line.198"></a>
-<span class="sourceLineNo">199</span>      Procedure&lt;?&gt; nextProc = 
rq.peek();<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      if (nextProc != null &amp;&amp; 
!Procedure.haveSameParent(nextProc, pollResult)) {<a name="line.200"></a>
-<span class="sourceLineNo">201</span>        removeFromRunQueue(fairq, rq);<a 
name="line.201"></a>
-<span class="sourceLineNo">202</span>      }<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    }<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span>    return pollResult;<a 
name="line.205"></a>
-<span class="sourceLineNo">206</span>  }<a name="line.206"></a>
-<span class="sourceLineNo">207</span><a name="line.207"></a>
-<span class="sourceLineNo">208</span>  @Override<a name="line.208"></a>
-<span class="sourceLineNo">209</span>  public List&lt;LockedResource&gt; 
getLocks() {<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    schedLock();<a name="line.210"></a>
-<span class="sourceLineNo">211</span>    try {<a name="line.211"></a>
-<span class="sourceLineNo">212</span>      return locking.getLocks();<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span>    } finally {<a name="line.213"></a>
-<span class="sourceLineNo">214</span>      schedUnlock();<a 
name="line.214"></a>
-<span class="sourceLineNo">215</span>    }<a name="line.215"></a>
+<span class="sourceLineNo">161</span>  protected boolean queueHasRunnables() 
{<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    return metaRunQueue.hasRunnables() || 
tableRunQueue.hasRunnables() ||<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      serverRunQueue.hasRunnables() || 
peerRunQueue.hasRunnables();<a name="line.163"></a>
+<span class="sourceLineNo">164</span>  }<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span>  @Override<a name="line.166"></a>
+<span class="sourceLineNo">167</span>  protected Procedure dequeue() {<a 
name="line.167"></a>
+<span class="sourceLineNo">168</span>    // meta procedure is always the first 
priority<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    Procedure&lt;?&gt; pollResult = 
doPoll(metaRunQueue);<a name="line.169"></a>
+<span class="sourceLineNo">170</span>    // For now, let server handling have 
precedence over table handling; presumption is that it<a name="line.170"></a>
+<span class="sourceLineNo">171</span>    // is more important handling crashed 
servers than it is running the<a name="line.171"></a>
+<span class="sourceLineNo">172</span>    // enabling/disabling tables, etc.<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span>    if (pollResult == null) {<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>      pollResult = 
doPoll(serverRunQueue);<a name="line.174"></a>
+<span class="sourceLineNo">175</span>    }<a name="line.175"></a>
+<span class="sourceLineNo">176</span>    if (pollResult == null) {<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>      pollResult = 
doPoll(peerRunQueue);<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    }<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    if (pollResult == null) {<a 
name="line.179"></a>
+<span class="sourceLineNo">180</span>      pollResult = 
doPoll(tableRunQueue);<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    }<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    return pollResult;<a 
name="line.182"></a>
+<span class="sourceLineNo">183</span>  }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span>  private &lt;T extends 
Comparable&lt;T&gt;&gt; Procedure&lt;?&gt; doPoll(final FairQueue&lt;T&gt; 
fairq) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>    final Queue&lt;T&gt; rq = 
fairq.poll();<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    if (rq == null || !rq.isAvailable()) 
{<a name="line.187"></a>
+<span class="sourceLineNo">188</span>      return null;<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    }<a name="line.189"></a>
+<span class="sourceLineNo">190</span><a name="line.190"></a>
+<span class="sourceLineNo">191</span>    final Procedure&lt;?&gt; pollResult = 
rq.peek();<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    if (pollResult == null) {<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>      return null;<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    }<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    final boolean xlockReq = 
rq.requireExclusiveLock(pollResult);<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    if (xlockReq &amp;&amp; 
rq.getLockStatus().isLocked() &amp;&amp; 
!rq.getLockStatus().hasLockAccess(pollResult)) {<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      // someone is already holding the 
lock (e.g. shared lock). avoid a yield<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      removeFromRunQueue(fairq, rq);<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>      return null;<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
+<span class="sourceLineNo">201</span><a name="line.201"></a>
+<span class="sourceLineNo">202</span>    rq.poll();<a name="line.202"></a>
+<span class="sourceLineNo">203</span>    if (rq.isEmpty() || xlockReq) {<a 
name="line.203"></a>
+<span class="sourceLineNo">204</span>      removeFromRunQueue(fairq, rq);<a 
name="line.204"></a>
+<span class="sourceLineNo">205</span>    } else if 
(rq.getLockStatus().hasParentLock(pollResult)) {<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      // if the rq is in the fairq 
because of runnable child<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      // check if the next procedure is 
still a child.<a name="line.207"></a>
+<span class="sourceLineNo">208</span>      // if not, remove the rq from the 
fairq and go back to the xlock state<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      Procedure&lt;?&gt; nextProc = 
rq.peek();<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      if (nextProc != null &amp;&amp; 
!Procedure.haveSameParent(nextProc, pollResult)) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>        removeFromRunQueue(fairq, rq);<a 
name="line.211"></a>
+<span class="sourceLineNo">212</span>      }<a name="line.212"></a>
+<span class="sourceLineNo">213</span>    }<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span>    return pollResult;<a 
name="line.215"></a>
 <span class="sourceLineNo">216</span>  }<a name="line.216"></a>
 <span class="sourceLineNo">217</span><a name="line.217"></a>
 <span class="sourceLineNo">218</span>  @Override<a name="line.218"></a>
-<span class="sourceLineNo">219</span>  public LockedResource 
getLockResource(LockedResourceType resourceType, String resourceName) {<a 
name="line.219"></a>
+<span class="sourceLineNo">219</span>  public List&lt;LockedResource&gt; 
getLocks() {<a name="line.219"></a>
 <span class="sourceLineNo">220</span>    schedLock();<a name="line.220"></a>
 <span class="sourceLineNo">221</span>    try {<a name="line.221"></a>
-<span class="sourceLineNo">222</span>      return 
locking.getLockResource(resourceType, resourceName);<a name="line.222"></a>
+<span class="sourceLineNo">222</span>      return locking.getLocks();<a 
name="line.222"></a>
 <span class="sourceLineNo">223</span>    } finally {<a name="line.223"></a>
 <span class="sourceLineNo">224</span>      schedUnlock();<a 
name="line.224"></a>
 <span class="sourceLineNo">225</span>    }<a name="line.225"></a>
 <span class="sourceLineNo">226</span>  }<a name="line.226"></a>
 <span class="sourceLineNo">227</span><a name="line.227"></a>
 <span class="sourceLineNo">228</span>  @Override<a name="line.228"></a>
-<span class="sourceLineNo">229</span>  public void clear() {<a 
name="line.229"></a>
+<span class="sourceLineNo">229</span>  public LockedResource 
getLockResource(LockedResourceType resourceType, String resourceName) {<a 
name="line.229"></a>
 <span class="sourceLineNo">230</span>    schedLock();<a name="line.230"></a>
 <span class="sourceLineNo">231</span>    try {<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      clearQueue();<a name="line.232"></a>
-<span class="sourceLineNo">233</span>      locking.clear();<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>    } finally {<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      schedUnlock();<a 
name="line.235"></a>
-<span class="sourceLineNo">236</span>    }<a name="line.236"></a>
-<span class="sourceLineNo">237</span>  }<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span>  private void clearQueue() {<a 
name="line.239"></a>
-<span class="sourceLineNo">240</span>    // Remove Servers<a 
name="line.240"></a>
-<span class="sourceLineNo">241</span>    for (int i = 0; i &lt; 
serverBuckets.length; ++i) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span>      clear(serverBuckets[i], 
serverRunQueue, SERVER_QUEUE_KEY_COMPARATOR);<a name="line.242"></a>
-<span class="sourceLineNo">243</span>      serverBuckets[i] = null;<a 
name="line.243"></a>
-<span class="sourceLineNo">244</span>    }<a name="line.244"></a>
-<span class="sourceLineNo">245</span><a name="line.245"></a>
-<span class="sourceLineNo">246</span>    // Remove Tables<a 
name="line.246"></a>
-<span class="sourceLineNo">247</span>    clear(tableMap, tableRunQueue, 
TABLE_QUEUE_KEY_COMPARATOR);<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    tableMap = null;<a 
name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span>    // Remove Peers<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    clear(peerMap, peerRunQueue, 
PEER_QUEUE_KEY_COMPARATOR);<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    peerMap = null;<a name="line.252"></a>
-<span class="sourceLineNo">253</span><a name="line.253"></a>
-<span class="sourceLineNo">254</span>    assert size() == 0 : "expected queue 
size to be 0, got " + size();<a name="line.254"></a>
-<span class="sourceLineNo">255</span>  }<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span>  private &lt;T extends 
Comparable&lt;T&gt;, TNode extends Queue&lt;T&gt;&gt; void clear(TNode 
treeMap,<a name="line.257"></a>
-<span class="sourceLineNo">258</span>      final FairQueue&lt;T&gt; fairq, 
final AvlKeyComparator&lt;TNode&gt; comparator) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>    while (treeMap != null) {<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span>      Queue&lt;T&gt; node = 
AvlTree.getFirst(treeMap);<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      treeMap = AvlTree.remove(treeMap, 
node.getKey(), comparator);<a name="line.261"></a>
-<span class="sourceLineNo">262</span>      if (fairq != null) 
removeFromRunQueue(fairq, node);<a name="line.262"></a>
-<span class="sourceLineNo">263</span>    }<a name="line.263"></a>
-<span class="sourceLineNo">264</span>  }<a name="line.264"></a>
-<span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span>  @Override<a name="line.266"></a>
-<span class="sourceLineNo">267</span>  protected int queueSize() {<a 
name="line.267"></a>
-<span class="sourceLineNo">268</span>    int count = 0;<a name="line.268"></a>
-<span class="sourceLineNo">269</span><a name="line.269"></a>
-<span class="sourceLineNo">270</span>    // Server queues<a 
name="line.270"></a>
-<span class="sourceLineNo">271</span>    final 
AvlTreeIterator&lt;ServerQueue&gt; serverIter = new 
AvlTreeIterator&lt;&gt;();<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    for (int i = 0; i &lt; 
serverBuckets.length; ++i) {<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      
serverIter.seekFirst(serverBuckets[i]);<a name="line.273"></a>
-<span class="sourceLineNo">274</span>      while (serverIter.hasNext()) {<a 
name="line.274"></a>
-<span class="sourceLineNo">275</span>        count += 
serverIter.next().size();<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      }<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    }<a name="line.277"></a>
-<span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span>    // Table queues<a name="line.279"></a>
-<span class="sourceLineNo">280</span>    final 
AvlTreeIterator&lt;TableQueue&gt; tableIter = new 
AvlTreeIterator&lt;&gt;(tableMap);<a name="line.280"></a>
-<span class="sourceLineNo">281</span>    while (tableIter.hasNext()) {<a 
name="line.281"></a>
-<span class="sourceLineNo">282</span>      count += tableIter.next().size();<a 
name="line.282"></a>
-<span class="sourceLineNo">283</span>    }<a name="line.283"></a>
+<span class="sourceLineNo">232</span>      return 
locking.getLockResource(resourceType, resourceName);<a name="line.232"></a>
+<span class="sourceLineNo">233</span>    } finally {<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      schedUnlock();<a 
name="line.234"></a>
+<span class="sourceLineNo">235</span>    }<a name="line.235"></a>
+<span class="sourceLineNo">236</span>  }<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span>  @Override<a name="line.238"></a>
+<span class="sourceLineNo">239</span>  public void clear() {<a 
name="line.239"></a>
+<span class="sourceLineNo">240</span>    schedLock();<a name="line.240"></a>
+<span class="sourceLineNo">241</span>    try {<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      clearQueue();<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      locking.clear();<a 
name="line.243"></a>
+<span class="sourceLineNo">244</span>    } finally {<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      schedUnlock();<a 
name="line.245"></a>
+<span class="sourceLineNo">246</span>    }<a name="line.246"></a>
+<span class="sourceLineNo">247</span>  }<a name="line.247"></a>
+<span class="sourceLineNo">248</span><a name="line.248"></a>
+<span class="sourceLineNo">249</span>  private void clearQueue() {<a 
name="line.249"></a>
+<span class="sourceLineNo">250</span>    // Remove Servers<a 
name="line.250"></a>
+<span class="sourceLineNo">251</span>    for (int i = 0; i &lt; 
serverBuckets.length; ++i) {<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      clear(serverBuckets[i], 
serverRunQueue, SERVER_QUEUE_KEY_COMPARATOR);<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      serverBuckets[i] = null;<a 
name="line.253"></a>
+<span class="sourceLineNo">254</span>    }<a name="line.254"></a>
+<span class="sourceLineNo">255</span><a name="line.255"></a>
+<span class="sourceLineNo">256</span>    // Remove Tables<a 
name="line.256"></a>
+<span class="sourceLineNo">257</span>    clear(tableMap, tableRunQueue, 
TABLE_QUEUE_KEY_COMPARATOR);<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    tableMap = null;<a 
name="line.258"></a>
+<span class="sourceLineNo">259</span><a name="line.259"></a>
+<span class="sourceLineNo">260</span>    // Remove Peers<a name="line.260"></a>
+<span class="sourceLineNo">261</span>    clear(peerMap, peerRunQueue, 
PEER_QUEUE_KEY_COMPARATOR);<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    peerMap = null;<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span>    assert size() == 0 : "expected queue 
size to be 0, got " + size();<a name="line.264"></a>
+<span class="sourceLineNo">265</span>  }<a name="line.265"></a>
+<span class="sourceLineNo">266</span><a name="line.266"></a>
+<span class="sourceLineNo">267</span>  private &lt;T extends 
Comparable&lt;T&gt;, TNode extends Queue&lt;T&gt;&gt; void clear(TNode 
treeMap,<a name="line.267"></a>
+<span class="sourceLineNo">268</span>      final FairQueue&lt;T&gt; fairq, 
final AvlKeyComparator&lt;TNode&gt; comparator) {<a name="line.268"></a>
+<span class="sourceLineNo">269</span>    while (treeMap != null) {<a 
name="line.269"></a>
+<span class="sourceLineNo">270</span>      Queue&lt;T&gt; node = 
AvlTree.getFirst(treeMap);<a name="line.270"></a>
+<span class="sourceLineNo">271</span>      treeMap = AvlTree.remove(treeMap, 
node.getKey(), comparator);<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      if (fairq != null) 
removeFromRunQueue(fairq, node);<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    }<a name="line.273"></a>
+<span class="sourceLineNo">274</span>  }<a name="line.274"></a>
+<span class="sourceLineNo">275</span><a name="line.275"></a>
+<span class="sourceLineNo">276</span>  private int queueSize(Queue&lt;?&gt; 
head) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>    int count = 0;<a name="line.277"></a>
+<span class="sourceLineNo">278</span>    AvlTreeIterator&lt;Queue&lt;?&gt;&gt; 
iter = new AvlTreeIterator&lt;Queue&lt;?&gt;&gt;(head);<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    while (iter.hasNext()) {<a 
name="line.279"></a>
+<span class="sourceLineNo">280</span>      count += iter.next().size();<a 
name="line.280"></a>
+<span class="sourceLineNo">281</span>    }<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    return count;<a name="line.282"></a>
+<span class="sourceLineNo">283</span>  }<a name="line.283"></a>
 <span class="sourceLineNo">284</span><a name="line.284"></a>
-<span class="sourceLineNo">285</span>    // Peer queues<a name="line.285"></a>
-<span class="sourceLineNo">286</span>    final 
AvlTreeIterator&lt;PeerQueue&gt; peerIter = new 
AvlTreeIterator&lt;&gt;(peerMap);<a name="line.286"></a>
-<span class="sourceLineNo">287</span>    while (peerIter.hasNext()) {<a 
name="line.287"></a>
-<span class="sourceLineNo">288</span>      count += peerIter.next().size();<a 
name="line.288"></a>
-<span class="sourceLineNo">289</span>    }<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span>    return count;<a name="line.291"></a>
-<span class="sourceLineNo">292</span>  }<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span>  @Override<a name="line.294"></a>
-<span class="sourceLineNo">295</span>  public void completionCleanup(final 
Procedure proc) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span>    if (proc instanceof 
TableProcedureInterface) {<a name="line.296"></a>
-<span class="sourceLineNo">297</span>      TableProcedureInterface iProcTable 
= (TableProcedureInterface) proc;<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      boolean tableDeleted;<a 
name="line.298"></a>
-<span class="sourceLineNo">299</span>      if (proc.hasException()) {<a 
name="line.299"></a>
-<span class="sourceLineNo">300</span>        Exception procEx = 
proc.getException().unwrapRemoteException();<a name="line.300"></a>
-<span class="sourceLineNo">301</span>        if 
(iProcTable.getTableOperationType() == TableOperationType.CREATE) {<a 
name="line.301"></a>
-<span class="sourceLineNo">302</span>          // create failed because the 
table already exist<a name="line.302"></a>
-<span class="sourceLineNo">303</span>          tableDeleted = !(procEx 
instanceof TableExistsException);<a name="line.303"></a>
-<span class="sourceLineNo">304</span>        } else {<a name="line.304"></a>
-<span class="sourceLineNo">305</span>          // the operation failed because 
the table does not exist<a name="line.305"></a>
-<span class="sourceLineNo">306</span>          tableDeleted = (procEx 
instanceof TableNotFoundException);<a name="line.306"></a>
-<span class="sourceLineNo">307</span>        }<a name="line.307"></a>
-<span class="sourceLineNo">308</span>      } else {<a name="line.308"></a>
-<span class="sourceLineNo">309</span>        // the table was deleted<a 
name="line.309"></a>
-<span class="sourceLineNo">310</span>        tableDeleted = 
(iProcTable.getTableOperationType() == TableOperationType.DELETE);<a 
name="line.310"></a>
-<span class="sourceLineNo">311</span>      }<a name="line.311"></a>
-<span class="sourceLineNo">312</span>      if (tableDeleted) {<a 
name="line.312"></a>
-<span class="sourceLineNo">313</span>        
markTableAsDeleted(iProcTable.getTableName(), proc);<a name="line.313"></a>
-<span class="sourceLineNo">314</span>        return;<a name="line.314"></a>
-<span class="sourceLineNo">315</span>      }<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    } else if (proc instanceof 
PeerProcedureInterface) {<a name="line.316"></a>
-<span class="sourceLineNo">317</span>      PeerProcedureInterface iProcPeer = 
(PeerProcedureInterface) proc;<a name="line.317"></a>
-<span class="sourceLineNo">318</span>      
tryCleanupPeerQueue(iProcPeer.getPeerId(), proc);<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    } else {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>      // No cleanup for 
ServerProcedureInterface types, yet.<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      return;<a name="line.321"></a>
-<span class="sourceLineNo">322</span>    }<a name="line.322"></a>
-<span class="sourceLineNo">323</span>  }<a name="line.323"></a>
-<span class="sourceLineNo">324</span><a name="line.324"></a>
-<span class="sourceLineNo">325</span>  private static &lt;T extends 
Comparable&lt;T&gt;&gt; void addToRunQueue(FairQueue&lt;T&gt; fairq, 
Queue&lt;T&gt; queue) {<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    if (!AvlIterableList.isLinked(queue) 
&amp;&amp; !queue.isEmpty()) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      fairq.add(queue);<a 
name="line.327"></a>
-<span class="sourceLineNo">328</span>    }<a name="line.328"></a>
-<span class="sourceLineNo">329</span>  }<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span>  private static &lt;T extends 
Comparable&lt;T&gt;&gt; void removeFromRunQueue(<a name="line.331"></a>
-<span class="sourceLineNo">332</span>      FairQueue&lt;T&gt; fairq, 
Queue&lt;T&gt; queue) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    if (AvlIterableList.isLinked(queue)) 
{<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      fairq.remove(queue);<a 
name="line.334"></a>
-<span class="sourceLineNo">335</span>    }<a name="line.335"></a>
-<span class="sourceLineNo">336</span>  }<a name="line.336"></a>
-<span class="sourceLineNo">337</span><a name="line.337"></a>
-<span class="sourceLineNo">338</span>  // 
============================================================================<a 
name="line.338"></a>
-<span class="sourceLineNo">339</span>  //  Table Queue Lookup Helpers<a 
name="line.339"></a>
-<span class="sourceLineNo">340</span>  // 
============================================================================<a 
name="line.340"></a>
-<span class="sourceLineNo">341</span>  private TableQueue 
getTableQueue(TableName tableName) {<a name="line.341"></a>
-<span class="sourceLineNo">342</span>    TableQueue node = 
AvlTree.get(tableMap, tableName, TABLE_QUEUE_KEY_COMPARATOR);<a 
name="line.342"></a>
-<span class="sourceLineNo">343</span>    if (node != null) return node;<a 
name="line.343"></a>
-<span class="sourceLineNo">344</span><a name="line.344"></a>
-<span class="sourceLineNo">345</span>    node = new TableQueue(tableName, 
MasterProcedureUtil.getTablePriority(tableName),<a name="line.345"></a>
-<span class="sourceLineNo">346</span>        locking.getTableLock(tableName), 
locking.getNamespaceLock(tableName.getNamespaceAsString()));<a 
name="line.346"></a>
-<span class="sourceLineNo">347</span>    tableMap = AvlTree.insert(tableMap, 
node);<a name="line.347"></a>
-<span class="sourceLineNo">348</span>    return node;<a name="line.348"></a>
-<span class="sourceLineNo">349</span>  }<a name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span>  private void removeTableQueue(TableName 
tableName) {<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    tableMap = AvlTree.remove(tableMap, 
tableName, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    locking.removeTableLock(tableName);<a 
name="line.353"></a>
-<span class="sourceLineNo">354</span>  }<a name="line.354"></a>
-<span class="sourceLineNo">355</span><a name="line.355"></a>
-<span class="sourceLineNo">356</span>  private static boolean 
isTableProcedure(Procedure&lt;?&gt; proc) {<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    return proc instanceof 
TableProcedureInterface;<a name="line.357"></a>
-<span class="sourceLineNo">358</span>  }<a name="line.358"></a>
-<span class="sourceLineNo">359</span><a name="line.359"></a>
-<span class="sourceLineNo">360</span>  private static TableName 
getTableName(Procedure&lt;?&gt; proc) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    return 
((TableProcedureInterface)proc).getTableName();<a name="line.361"></a>
-<span class="sourceLineNo">362</span>  }<a name="line.362"></a>
-<span class="sourceLineNo">363</span><a name="line.363"></a>
-<span class="sourceLineNo">364</span>  // 
============================================================================<a 
name="line.364"></a>
-<span class="sourceLineNo">365</span>  //  Server Queue Lookup Helpers<a 
name="line.365"></a>
-<span class="sourceLineNo">366</span>  // 
============================================================================<a 
name="line.366"></a>
-<span class="sourceLineNo">367</span>  private ServerQueue 
getServerQueue(ServerName serverName) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    final int index = 
getBucketIndex(serverBuckets, serverName.hashCode());<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    ServerQueue node = 
AvlTree.get(serverBuckets[index], serverName, SERVER_QUEUE_KEY_COMPARATOR);<a 
name="line.369"></a>
-<span class="sourceLineNo">370</span>    if (node != null) return node;<a 
name="line.370"></a>
-<span class="sourceLineNo">371</span><a name="line.371"></a>
-<span class="sourceLineNo">372</span>    node = new ServerQueue(serverName, 
locking.getServerLock(serverName));<a name="line.372"></a>
-<span class="sourceLineNo">373</span>    serverBuckets[index] = 
AvlTree.insert(serverBuckets[index], node);<a name="line.373"></a>
-<span class="sourceLineNo">374</span>    return node;<a name="line.374"></a>
-<span class="sourceLineNo">375</span>  }<a name="line.375"></a>
-<span class="sourceLineNo">376</span><a name="line.376"></a>
-<span class="sourceLineNo">377</span>  private static int 
getBucketIndex(Object[] buckets, int hashCode) {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>    return Math.abs(hashCode) % 
buckets.length;<a name="line.378"></a>
-<span class="sourceLineNo">379</span>  }<a name="line.379"></a>
-<span class="sourceLineNo">380</span><a name="line.380"></a>
-<span class="sourceLineNo">381</span>  private static boolean 
isServerProcedure(Procedure&lt;?&gt; proc) {<a name="line.381"></a>
-<span class="sourceLineNo">382</span>    return proc instanceof 
ServerProcedureInterface;<a name="line.382"></a>
-<span class="sourceLineNo">383</span>  }<a name="line.383"></a>
-<span class="sourceLineNo">384</span><a name="line.384"></a>
-<span class="sourceLineNo">385</span>  private static ServerName 
getServerName(Procedure&lt;?&gt; proc) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>    return 
((ServerProcedureInterface)proc).getServerName();<a name="line.386"></a>
-<span class="sourceLineNo">387</span>  }<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span>  // 
============================================================================<a 
name="line.389"></a>
-<span class="sourceLineNo">390</span>  //  Peer Queue Lookup Helpers<a 
name="line.390"></a>
-<span class="sourceLineNo">391</span>  // 
============================================================================<a 
name="line.391"></a>
-<span class="sourceLineNo">392</span>  private PeerQueue getPeerQueue(String 
peerId) {<a name="line.392"></a>
-<span class="sourceLineNo">393</span>    PeerQueue node = AvlTree.get(peerMap, 
peerId, PEER_QUEUE_KEY_COMPARATOR);<a name="line.393"></a>
-<span class="sourceLineNo">394</span>    if (node != null) {<a 
name="line.394"></a>
-<span class="sourceLineNo">395</span>      return node;<a name="line.395"></a>
-<span class="sourceLineNo">396</span>    }<a name="line.396"></a>
-<span class="sourceLineNo">397</span>    node = new PeerQueue(peerId, 
locking.getPeerLock(peerId));<a name="line.397"></a>
-<span class="sourceLineNo">398</span>    peerMap = AvlTree.insert(peerMap, 
node);<a name="line.398"></a>
-<span class="sourceLineNo">399</span>    return node;<a name="line.399"></a>
-<span class="sourceLineNo">400</span>  }<a name="line.400"></a>
-<span class="sourceLineNo">401</span><a name="line.401"></a>
-<span class="sourceLineNo">402</span>  private void removePeerQueue(String 
peerId) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span>    peerMap = AvlTree.remove(peerMap, 
peerId, PEER_QUEUE_KEY_COMPARATOR);<a name="line.403"></a>
-<span class="sourceLineNo">404</span>    locking.removePeerLock(peerId);<a 
name="line.404"></a>
-<span class="sourceLineNo">405</span>  }<a name="line.405"></a>
-<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span>  private void tryCleanupPeerQueue(String 
peerId, Procedure&lt;?&gt; procedure) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>    schedLock();<a name="line.408"></a>
-<span class="sourceLineNo">409</span>    try {<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      PeerQueue queue = 
AvlTree.get(peerMap, peerId, PEER_QUEUE_KEY_COMPARATOR);<a name="line.410"></a>
-<span class="sourceLineNo">411</span>      if (queue == null) {<a 
name="line.411"></a>
-<span class="sourceLineNo">412</span>        return;<a name="line.412"></a>
-<span class="sourceLineNo">413</span>      }<a name="line.413"></a>
-<span class="sourceLineNo">414</span><a name="line.414"></a>
-<span class="sourceLineNo">415</span>      final LockAndQueue lock = 
locking.getPeerLock(peerId);<a name="line.415"></a>
-<span class="sourceLineNo">416</span>      if (queue.isEmpty() &amp;&amp; 
lock.tryExclusiveLock(procedure)) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span>        removeFromRunQueue(peerRunQueue, 
queue);<a name="line.417"></a>
-<span class="sourceLineNo">418</span>        removePeerQueue(peerId);<a 
name="line.418"></a>
-<span class="sourceLineNo">419</span>      }<a name="line.419"></a>
-<span class="sourceLineNo">420</span>    } finally {<a name="line.420"></a>
-<span class="sourceLineNo">421</span>      schedUnlock();<a 
name="line.421"></a>
-<span class="sourceLineNo">422</span>    }<a name="line.422"></a>
-<span class="sourceLineNo">423</span>  }<a name="line.423"></a>
-<span class="sourceLineNo">424</span><a name="line.424"></a>
-<span class="sourceLineNo">425</span>  private static boolean 
isPeerProcedure(Procedure&lt;?&gt; proc) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>    return proc instanceof 
PeerProcedureInterface;<a name="line.426"></a>
-<span class="sourceLineNo">427</span>  }<a name="line.427"></a>
-<span class="sourceLineNo">428</span><a name="line.428"></a>
-<span class="sourceLineNo">429</span>  private static String 
getPeerId(Procedure&lt;?&gt; proc) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>    return ((PeerProcedureInterface) 
proc).getPeerId();<a name="line.430"></a>
-<span class="sourceLineNo">431</span>  }<a name="line.431"></a>
-<span class="sourceLineNo">432</span><a name="line.432"></a>
-<span class="sourceLineNo">433</span>  // 
============================================================================<a 
name="line.433"></a>
-<span class="sourceLineNo">434</span>  //  Table Locking Helpers<a 
name="line.434"></a>
-<span class="sourceLineNo">435</span>  // 
============================================================================<a 
name="line.435"></a>
-<span class="sourceLineNo">436</span>  /**<a name="line.436"></a>
-<span class="sourceLineNo">437</span>   * Get lock info for a resource of 
specified type and name and log details<a name="line.437"></a>
-<span class="sourceLineNo">438</span>   */<a name="line.438"></a>
-<span class="sourceLineNo">439</span>  private void 
logLockedResource(LockedResourceType resourceType, String resourceName) {<a 
name="line.439"></a>
-<span class="sourceLineNo">440</span>    if (!LOG.isDebugEnabled()) {<a 
name="line.440"></a>
-<span class="sourceLineNo">441</span>      return;<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    }<a name="line.442"></a>
-<span class="sourceLineNo">443</span><a name="line.443"></a>
-<span class="sourceLineNo">444</span>    LockedResource lockedResource = 
getLockResource(resourceType, resourceName);<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    if (lockedResource != null) {<a 
name="line.445"></a>
-<span class="sourceLineNo">446</span>      String msg = 
resourceType.toString() + " '" + resourceName + "', shared lock count=" +<a 
name="line.446"></a>
-<span class="sourceLineNo">447</span>          
lockedResource.getSharedLockCount();<a name="line.447"></a>
+<span class="sourceLineNo">285</span>  @Override<a name="line.285"></a>
+<span class="sourceLineNo">286</span>  protected int queueSize() {<a 
name="line.286"></a>
+<span class="sourceLineNo">287</span>    int count = 0;<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    for (ServerQueue serverMap : 
serverBuckets) {<a name="line.288"></a>
+<span class="sourceLineNo">289</span>      count += queueSize(serverMap);<a 
name="line.289"></a>
+<span class="sourceLineNo">290</span>    }<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    count += queueSize(tableMap);<a 
name="line.291"></a>
+<span class="sourceLineNo">292</span>    count += queueSize(peerMap);<a 
name="line.292"></a>
+<span class="sourceLineNo">293</span>    count += queueSize(metaMap);<a 
name="line.293"></a>
+<span class="sourceLineNo">294</span>    return count;<a name="line.294"></a>
+<span class="sourceLineNo">295</span>  }<a name="line.295"></a>
+<span class="sourceLineNo">296</span><a name="line.296"></a>
+<span class="sourceLineNo">297</span>  @Override<a name="line.297"></a>
+<span class="sourceLineNo">298</span>  public void completionCleanup(final 
Procedure proc) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    if (proc instanceof 
TableProcedureInterface) {<a name="line.299"></a>
+<span class="sourceLineNo">300</span>      TableProcedureInterface iProcTable 
= (TableProcedureInterface) proc;<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      boolean tableDeleted;<a 
name="line.301"></a>
+<span class="sourceLineNo">302</span>      if (proc.hasException()) {<a 
name="line.302"></a>
+<span class="sourceLineNo">303</span>        Exception procEx = 
proc.getException().unwrapRemoteException();<a name="line.303"></a>
+<span class="sourceLineNo">304</span>        if 
(iProcTable.getTableOperationType() == TableOperationType.CREATE) {<a 
name="line.304"></a>
+<span class="sourceLineNo">305</span>          // create failed because the 
table already exist<a name="line.305"></a>
+<span class="sourceLineNo">306</span>          tableDeleted = !(procEx 
instanceof TableExistsException);<a name="line.306"></a>
+<span class="sourceLineNo">307</span>        } else {<a name="line.307"></a>
+<span class="sourceLineNo">308</span>          // the operation failed because 
the table does not exist<a name="line.308"></a>
+<span class="sourceLineNo">309</span>          tableDeleted = (procEx 
instanceof TableNotFoundException);<a name="line.309"></a>
+<span class="sourceLineNo">310</span>        }<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      } else {<a name="line.311"></a>
+<span class="sourceLineNo">312</span>        // the table was deleted<a 
name="line.312"></a>
+<span class="sourceLineNo">313</span>        tableDeleted = 
(iProcTable.getTableOperationType() == TableOperationType.DELETE);<a 
name="line.313"></a>
+<span class="sourceLineNo">314</span>      }<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      if (tableDeleted) {<a 
name="line.315"></a>
+<span class="sourceLineNo">316</span>        
markTableAsDeleted(iProcTable.getTableName(), proc);<a name="line.316"></a>
+<span class="sourceLineNo">317</span>        return;<a name="line.317"></a>
+<span class="sourceLineNo">318</span>      }<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    } else if (proc instanceof 
PeerProcedureInterface) {<a name="line.319"></a>
+<span class="sourceLineNo">320</span>      PeerProcedureInterface iProcPeer = 
(PeerProcedureInterface) proc;<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      
tryCleanupPeerQueue(iProcPeer.getPeerId(), proc);<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    } else {<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      // No cleanup for 
ServerProcedureInterface types, yet.<a name="line.323"></a>
+<span class="sourceLineNo">324</span>      return;<a name="line.324"></a>
+<span class="sourceLineNo">325</span>    }<a name="line.325"></a>
+<span class="sourceLineNo">326</span>  }<a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</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.328"></a>
+<span class="sourceLineNo">329</span>    if (!AvlIterableList.isLinked(queue) 
&amp;&amp; !queue.isEmpty()) {<a name="line.329"></a>
+<span class="sourceLineNo">330</span>      fairq.add(queue);<a 
name="line.330"></a>
+<span class="sourceLineNo">331</span>    }<a name="line.331"></a>
+<span class="sourceLineNo">332</span>  }<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span>  private static &lt;T extends 
Comparable&lt;T&gt;&gt; void removeFromRunQueue(<a name="line.334"></a>
+<span class="sourceLineNo">335</span>      FairQueue&lt;T&gt; fairq, 
Queue&lt;T&gt; queue) {<a name="line.335"></a>
+<span class="sourceLineNo">336</span>    if (AvlIterableList.isLinked(queue)) 
{<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      fairq.remove(queue);<a 
name="line.337"></a>
+<span class="sourceLineNo">338</span>    }<a name="line.338"></a>
+<span class="sourceLineNo">339</span>  }<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span>  // 
============================================================================<a 
name="line.341"></a>
+<span class="sourceLineNo">342</span>  //  Table Queue Lookup Helpers<a 
name="line.342"></a>
+<span class="sourceLineNo">343</span>  // 
============================================================================<a 
name="line.343"></a>
+<span class="sourceLineNo">344</span>  private TableQueue 
getTableQueue(TableName tableName) {<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    TableQueue node = 
AvlTree.get(tableMap, tableName, TABLE_QUEUE_KEY_COMPARATOR);<a 
name="line.345"></a>
+<span class="sourceLineNo">346</span>    if (node != null) return node;<a 
name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span>    node = new TableQueue(tableName, 
MasterProcedureUtil.getTablePriority(tableName),<a name="line.348"></a>
+<span class="sourceLineNo">349</span>        locking.getTableLock(tableName), 
locking.getNamespaceLock(tableName.getNamespaceAsString()));<a 
name="line.349"></a>
+<span class="sourceLineNo">350</span>    tableMap = AvlTree.insert(tableMap, 
node);<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    return node;<a name="line.351"></a>
+<span class="sourceLineNo">352</span>  }<a name="line.352"></a>
+<span class="sourceLineNo">353</span><a name="line.353"></a>
+<span class="sourceLineNo">354</span>  private void removeTableQueue(TableName 
tableName) {<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    tableMap = AvlTree.remove(tableMap, 
tableName, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    locking.removeTableLock(tableName);<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>  private static boolean 
isTableProcedure(Procedure&lt;?&gt; proc) {<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    return proc instanceof 
TableProcedureInterface;<a name="line.360"></a>
+<span class="sourceLineNo">361</span>  }<a name="line.361"></a>
+<span class="sourceLineNo">362</span><a name="line.362"></a>
+<span class="sourceLineNo">363</span>  private static TableName 
getTableName(Procedure&lt;?&gt; proc) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    return 
((TableProcedureInterface)proc).getTableName();<a name="line.364"></a>
+<span class="sourceLineNo">365</span>  }<a name="line.365"></a>
+<span class="sourceLineNo">366</span><a name="line.366"></a>
+<span class="sourceLineNo">367</span>  // 
============================================================================<a 
name="line.367"></a>
+<span class="sourceLineNo">368</span>  //  Server Queue Lookup Helpers<a 
name="line.368"></a>
+<span class="sourceLineNo">369</span>  // 
============================================================================<a 
name="line.369"></a>
+<span class="sourceLineNo">370</span>  private ServerQueue 
getServerQueue(ServerName serverName) {<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    final int index = 
getBucketIndex(serverBuckets, serverName.hashCode());<a name="line.371"></a>
+<span class="sourceLineNo">372</span>    ServerQueue node = 
AvlTree.get(serverBuckets[index], serverName, SERVER_QUEUE_KEY_COMPARATOR);<a 
name="line.372"></a>
+<span class="sourceLineNo">373</span>    if (node != null) return node;<a 
name="line.373"></a>
+<span class="sourceLineNo">374</span><a name="line.374"></a>
+<span class="sourceLineNo">375</span>    node = new ServerQueue(serverName, 
locking.getServerLock(serverName));<a name="line.375"></a>
+<span class="sourceLineNo">376</span>    serverBuckets[index] = 
AvlTree.insert(serverBuckets[index], node);<a name="line.376"></a>
+<span class="sourceLineNo">377</span>    return node;<a name="line.377"></a>
+<span class="sourceLineNo">378</span>  }<a name="line.378"></a>
+<span class="sourceLineNo">379</span><a name="line.379"></a>
+<span class="sourceLineNo">380</span>  private static int 
getBucketIndex(Object[] buckets, int hashCode) {<a name="line.380"></a>
+<span class="sourceLineNo">381</span>    return Math.abs(hashCode) % 
buckets.length;<a name="line.381"></a>
+<span class="sourceLineNo">382</span>  }<a name="line.382"></a>
+<span class="sourceLineNo">383</span><a name="line.383"></a>
+<span class="sourceLineNo">384</span>  private static boolean 
isServerProcedure(Procedure&lt;?&gt; proc) {<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    return proc instanceof 
ServerProcedureInterface;<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>  private static ServerName 
getServerName(Procedure&lt;?&gt; proc) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    return 
((ServerProcedureInterface)proc).getServerName();<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>  // 
============================================================================<a 
name="line.392"></a>
+<span class="sourceLineNo">393</span>  //  Peer Queue Lookup Helpers<a 
name="line.393"></a>
+<span class="sourceLineNo">394</span>  // 
============================================================================<a 
name="line.394"></a>
+<span class="sourceLineNo">395</span>  private PeerQueue getPeerQueue(String 
peerId) {<a name="line.395"></a>
+<span class="sourceLineNo">396</span>    PeerQueue node = AvlTree.get(peerMap, 
peerId, PEER_QUEUE_KEY_COMPARATOR);<a name="line.396"></a>
+<span class="sourceLineNo">397</span>    if (node != null) {<a 
name="line.397"></a>
+<span class="sourceLineNo">398</span>      return node;<a name="line.398"></a>
+<span class="sourceLineNo">399</span>    }<a name="line.399"></a>
+<span class="sourceLineNo">400</span>    node = new PeerQueue(peerId, 
locking.getPeerLock(peerId));<a name="line.400"></a>
+<span class="sourceLineNo">401</span>    peerMap = AvlTree.insert(peerMap, 
node);<a name="line.401"></a>
+<span class="sourceLineNo">402</span>    return node;<a name="line.402"></a>
+<span class="sourceLineNo">403</span>  }<a name="line.403"></a>
+<span class="sourceLineNo">404</span><a name="line.404"></a>
+<span class="sourceLineNo">405</span>  private void removePeerQueue(String 
peerId) {<a name="line.405"></a>
+<span class="sourceLineNo">406</span>    peerMap = AvlTree.remove(peerMap, 
peerId, PEER_QUEUE_KEY_COMPARATOR);<a name="line.406"></a>
+<span class="sourceLineNo">407</span>    locking.removePeerLock(peerId);<a 
name="line.407"></a>
+<span class="sourceLineNo">408</span>  }<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span>  private void tryCleanupPeerQueue(String 
peerId, Procedure&lt;?&gt; procedure) {<a name="line.410"></a>
+<span class="sourceLineNo">411</span>    schedLock();<a name="line.411"></a>
+<span class="sourceLineNo">412</span>    try {<a name="line.412"></a>
+<span class="sourceLineNo">413</span>      PeerQueue queue = 
AvlTree.get(peerMap, peerId, PEER_QUEUE_KEY_COMPARATOR);<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      if (queue == null) {<a 
name="line.414"></a>
+<span class="sourceLineNo">415</span>        return;<a name="line.415"></a>
+<span class="sourceLineNo">416</span>      }<a name="line.416"></a>
+<span class="sourceLineNo">417</span><a name="line.417"></a>
+<span class="sourceLineNo">418</span>      final LockAndQueue lock = 
locking.getPeerLock(peerId);<a name="line.418"></a>
+<span class="sourceLineNo">419</span>      if (queue.isEmpty() &amp;&amp; 
lock.tryExclusiveLock(procedure)) {<a name="line.419"></a>
+<span class="sourceLineNo">420</span>        removeFromRunQueue(peerRunQueue, 
queue);<a name="line.420"></a>
+<span class="sourceLineNo">421</span>        removePeerQueue(peerId);<a 
name="line.421"></a>
+<span class="sourceLineNo">422</span>      }<a name="line.422"></a>
+<span class="sourceLineNo">423</span>    } finally {<a name="line.423"></a>
+<span class="sourceLineNo">424</span>      schedUnlock();<a 
name="line.424"></a>
+<span class="sourceLineNo">425</span>    }<a name="line.425"></a>
+<span class="sourceLineNo">426</span>  }<a name="line.426"></a>
+<span class="sourceLineNo">427</span><a name="line.427"></a>
+<span class="sourceLineNo">428</span>  private static boolean 
isPeerProcedure(Procedure&lt;?&gt; proc) {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>    return proc instanceof 
PeerProcedureInterface;<a name="line.429"></a>
+<span class="sourceLineNo">430</span>  }<a name="line.430"></a>
+<span class="sourceLineNo">431</span><a name="line.431"></a>
+<span class="sourceLineNo">432</span>  private static String 
getPeerId(Procedure&lt;?&gt; proc) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span>    return ((PeerProcedureInterface) 
proc).getPeerId();<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>  //  Meta Queue Lookup Helpers<a 
name="line.437"></a>
+<span class="sourceLineNo">438</span>  // 
============================================================================<a 
name="line.438"></a>
+<span class="sourceLineNo">439</span>  private MetaQueue getMetaQueue() {<a 
name="line.439"></a>
+<span class="sourceLineNo">440</span>    MetaQueue node = AvlTree.get(metaMap, 
TableName.META_TABLE_NAME, META_QUEUE_KEY_COMPARATOR);<a name="line.440"></a>
+<span class="sourceLineNo">441</span>    if (node != null) {<a 
name="line.441"></a>
+<span class="sourceLineNo">442</span>      return node;<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    }<a name="line.443"></a>
+<span class="sourceLineNo">444</span>    node = new 
MetaQueue(locking.getMetaLock());<a name="line.444"></a>
+<span class="sourceLineNo">445</span>    metaMap = AvlTree.insert(metaMap, 
node);<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    return node;<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>      Procedure&lt;?&gt; proc = 
lockedResource.getExclusiveLockOwnerProcedure();<a name="line.449"></a>
-<span class="sourceLineNo">450</span>      if (proc != null) {<a 
name="line.450"></a>
-<span class="sourceLineNo">451</span>        msg += ", exclusively locked by 
procId=" + proc.getProcId();<a name="line.451"></a>
-<span class="sourceLineNo">452</span>      }<a name="line.452"></a>
-<span class="sourceLineNo">453</span>      LOG.debug(msg);<a 
name="line.453"></a>
-<span class="sourceLineNo">454</span>    }<a name="line.454"></a>
-<span class="sourceLineNo">455</span>  }<a name="line.455"></a>
-<span class="sourceLineNo">456</span><a name="line.456"></a>
-<span class="sourceLineNo">457</span>  /**<a name="line.457"></a>
-<span class="sourceLineNo">458</span>   * Suspend the procedure if the 
specified table is already locked.<a name="line.458"></a>
-<span class="sourceLineNo">459</span>   * Other operations in the table-queue 
will be executed after the lock is released.<a name="line.459"></a>
-<span class="sourceLineNo">460</span>   * @param procedure the procedure 
trying to acquire the lock<a name="line.460"></a>
-<span class="sourceLineNo">461</span>   * @param table Table to lock<a 
name="line.461"></a>
-<span class="sourceLineNo">462</span>   * @return true if the procedure has to 
wait for the table to be available<a name="line.462"></a>
-<span class="sourceLineNo">463</span>   */<a name="line.463"></a>
-<span class="sourceLineNo">464</span>  public boolean 
waitTableExclusiveLock(final Procedure procedure, final TableName table) {<a 
name="line.464"></a>
-<span class="sourceLineNo">465</span>    schedLock();<a name="line.465"></a>
-<span class="sourceLineNo">466</span>    try {<a name="line.466"></a>
-<span class="sourceLineNo">467</span>      final String namespace = 
table.getNamespaceAsString();<a name="line.467"></a>
-<span class="sourceLineNo">468</span>      final LockAndQueue namespaceLock = 
locking.getNamespaceLock(namespace);<a name="line.468"></a>
-<span class="sourceLineNo">469</span>      final LockAndQueue tableLock = 
locking.getTableLock(table);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      if (!namespaceLock.trySharedLock()) 
{<a name="line.470"></a>
-<span class="sourceLineNo">471</span>        waitProcedure(namespaceLock, 
procedure);<a name="line.471"></a>
-<span class="sourceLineNo">472</span>        
logLockedResource(LockedResourceType.NAMESPACE, namespace);<a 
name="line.472"></a>
-<span class="sourceLineNo">473</span>        return true;<a 
name="line.473"></a>
-<span class="sourceLineNo">474</span>      }<a name="line.474"></a>
-<span class="sourceLineNo">475</span>      if 
(!tableLock.tryExclusiveLock(procedure)) {<a name="line.475"></a>
-<span class="sourceLineNo">476</span>        
namespaceLock.releaseSharedLock();<a name="line.476"></a>
-<span class="sourceLineNo">477</span>        waitProcedure(tableLock, 
procedure);<a name="line.477"></a>
-<span class="sourceLineNo">478</span>        
logLockedResource(LockedResourceType.TABLE, table.getNameAsString());<a 
name="line.478"></a>
-<span class="sourceLineNo">479</span>        return true;<a 
name="line.479"></a>
-<span class="sourceLineNo">480</span>      }<a name="line.480"></a>
-<span class="sourceLineNo">481</span>      removeFromRunQueue(tableRunQueue, 
getTableQueue(table));<a name="line.481"></a>
-<span class="sourceLineNo">482</span>      return false;<a name="line.482"></a>
-<span class="sourceLineNo">483</span>    } finally {<a name="line.483"></a>
-<span class="sourceLineNo">484</span>      schedUnlock();<a 
name="line.484"></a>
-<span class="sourceLineNo">485</span>    }<a name="line.485"></a>
-<span class="sourceLineNo">486</span>  }<a name="line.486"></a>
-<span class="sourceLineNo">487</span><a name="line.487"></a>
-<span class="sourceLineNo">488</span>  /**<a name="line.488"></a>
-<span class="sourceLineNo">489</span>   * Wake the procedures waiting for the 
specified table<a name="line.489"></a>
-<span class="sourceLineNo">490</span>   * @param procedure the procedure 
releasing the lock<a name="line.490"></a>
-<span class="sourceLineNo">491</span>   * @param table the name of the table 
that has the exclusive lock<a name="line.491"></a>
-<span class="sourceLineNo">492</span>   */<a name="line.492"></a>
-<span class="sourceLineNo">493</span>  public void 
wakeTableExclusiveLock(final Procedure procedure, final TableName table) {<a 
name="line.493"></a>
-<span class="sourceLineNo">494</span>    schedLock();<a name="line.494"></a>
-<span class="sourceLineNo">495</span>    try {<a name="line.495"></a>
-<span class="sourceLineNo">496</span>      final LockAndQueue namespaceLock = 
locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.496"></a>
-<span class="sourceLineNo">497</span>      final LockAndQueue tableLock = 
locking.getTableLock(table);<a name="line.497"></a>
-<span class="sourceLineNo">498</span>      int waitingCount = 0;<a 
name="line.498"></a>
-<span class="sourceLineNo">499</span><a name="line.499"></a>
-<span class="sourceLineNo">500</span>      if 
(!tableLock.hasParentLock(procedure)) {<a name="line.500"></a>
-<span class="sourceLineNo">501</span>        
tableLock.releaseExclusiveLock(procedure);<a name="line.501"></a>
-<span class="sourceLineNo">502</span>        waitingCount += 
wakeWaitingProcedures(tableLock);<a name="line.502"></a>
-<span class="sourceLineNo">503</span>      }<a name="line.503"></a>
-<span class="sourceLineNo">504</span>      if 
(namespaceLock.releaseSharedLock()) {<a name="line.504"></a>
-<span class="sourceLineNo">505</span>        waitingCount += 
wakeWaitingProcedures(namespaceLock);<a name="line.505"></a>
-<span class="sourceLineNo">506</span>      }<a name="line.506"></a>
-<span class="sourceLineNo">507</span>      addToRunQueue(tableRunQueue, 
getTableQueue(table));<a name="line.507"></a>
-<span class="sourceLineNo">508</span>      wakePollIfNeeded(waitingCount);<a 
name="line.508"></a>
-<span class="sourceLineNo">509</span>    } finally {<a name="line.509"></a>
-<span class="sourceLineNo">510</span>      schedUnlock();<a 
name="line.510"></a>
-<span class="sourceLineNo">511</span>    }<a name="line.511"></a>
-<span class="sourceLineNo">512</span>  }<a name="line.512"></a>
-<span class="sourceLineNo">513</span><a name="line.513"></a>
-<span class="sourceLineNo">514</span>  /**<a name="line.514"></a>
-<span class="sourceLineNo">515</span>   * Suspend the procedure if the 
specified table is already locked.<a name="line.515"></a>
-<span class="sourceLineNo">516</span>   * other "read" operations in the 
table-queue may be executed concurrently,<a name="line.516"></a>
-<span class="sourceLineNo">517</span>   * @param procedure the procedure 
trying to acquire the lock<a name="line.517"></a>
-<span class="sourceLineNo">518</span>   * @param table Table to lock<a 
name="line.518"></a>
-<span class="sourceLineNo">519</span>   * @return true if the procedure has to 
wait for the table to be available<a name="line.519"></a>
-<span class="sourceLineNo">520</span>   */<a name="line.520"></a>
-<span class="sourceLineNo">521</span>  public boolean 
waitTableSharedLock(final Procedure procedure, final TableName table) {<a 
name="line.521"></a>
-<span class="sourceLineNo">522</span>    return 
waitTableQueueSharedLock(procedure, table) == null;<a name="line.522"></a>
-<span class="sourceLineNo">523</span>  }<a name="line.523"></a>
-<span class="sourceLineNo">524</span><a name="line.524"></a>
-<span class="sourceLineNo">525</span>  private TableQueue 
waitTableQueueSharedLock(final Procedure&lt;?&gt; procedure, final TableName 
table) {<a name="line.525"></a>
-<span class="sourceLineNo">526</span>    schedLock();<a name="line.526"></a>
-<span class="sourceLineNo">527</span>    try {<a name="line.527"></a>
-<span class="sourceLineNo">528</span>      final LockAndQueue namespaceLock = 
locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.528"></a>
-<span class="sourceLineNo">529</span>      final LockAndQueue tableLock = 
locking.getTableLock(table);<a name="line.529"></a>
-<span class="sourceLineNo">530</span>      if (!namespaceLock.trySharedLock()) 
{<a name="line.530"></a>
-<span class="sourceLineNo">531</span>        waitProcedure(namespaceLock, 
procedure);<a name="line.531"></a>
-<span class="sourceLineNo">532</span>        return null;<a 
name="line.532"></a>
-<span class="sourceLineNo">533</span>      }<a name="line.533"></a>
-<span class="sourceLineNo">534</span><a name="line.534"></a>
-<span class="sourceLineNo">535</span>      if (!tableLock.trySharedLock()) {<a 
name="line.535"></a>
-<span class="sourceLineNo">536</span>        
namespaceLock.releaseSharedLock();<a name="line.536"></a>
-<span class="sourceLineNo">537</span>        waitProcedure(tableLock, 
procedure);<a name="line.537"></a>
-<span class="sourceLineNo">538</span>        return null;<a 
name="line.538"></a>
-<span class="sourceLineNo">539</span>      }<a name="line.539"></a>
-<span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span>      return getTableQueue(table);<a 
name="line.541"></a>
-<span class="sourceLineNo">542</span>    } finally {<a name="line.542"></a>
-<span class="sourceLineNo">543</span>      schedUnlock();<a 
name="line.543"></a>
-<span class="sourceLineNo">544</span>    }<a name="line.544"></a>
-<span class="sourceLineNo">545</span>  }<a name="line.545"></a>
-<span class="sourceLineNo">546</span><a name="line.546"></a>
-<span class="sourceLineNo">547</span>  /**<a name="line.547"></a>
-<span class="sourceLineNo">548</span>   * Wake the procedures waiting for the 
specified table<a name="line.548"></a>
-<span class="sourceLineNo">549</span>   * @param procedure the procedure 
releasing the lock<a name="line.549"></a>
-<span class="sourceLineNo">550</span>   * @param table the name of the table 
that has the shared lock<a name="line.550"></a>
-<span class="sourceLineNo">551</span>   */<a name="line.551"></a>
-<span class="sourceLineNo">552</span>  public void wakeTableSharedLock(final 
Procedure procedure, final TableName table) {<a name="line.552"></a>
-<span class="sourceLineNo">553</span>    schedLock();<a name="line.553"></a>
-<span class="sourceLineNo">554</span>    try {<a name="line.554"></a>
-<span class="sourceLineNo">555</span>      final LockAndQueue namespaceLock = 
locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.555"></a>
-<span class="sourceLineNo">556</span>      final LockAndQueue tableLock = 
locking.getTableLock(table);<a name="line.556"></a>
-<span class="sourceLineNo">557</span>      int waitingCount = 0;<a 
name="line.557"></a>
-<span class="sourceLineNo">558</span>      if (tableLock.releaseSharedLock()) 
{<a name="line.558"></a>
-<span class="sourceLineNo">559</span>        addToRunQueue(tableRunQueue, 
getTableQueue(table));<a name="line.559"></a>
-<span class="sourceLineNo">560</span>        waitingCount += 
wakeWaitingProcedures(tableLock);<a name="line.560"></a>
-<span class="sourceLineNo">561</span>      }<a name="line.561"></a>
-<span class="sourceLineNo">562</span>      if 
(namespaceLock.releaseSharedLock()) {<a name="line.562"></a>
-<span class="sourceLineNo">563</span>        waitingCount += 
wakeWaitingProcedures(namespaceLock);<a name="line.563"></a>
-<span class="sourceLineNo">564</span>      }<a name="line.564"></a>
-<span class="sourceLineNo">565</span>      wakePollIfNeeded(waitingCount);<a 
name="line.565"></a>
-<span class="sourceLineNo">566</span>    } finally {<a name="line.566"></a>
-<span class="sourceLineNo">567</span>      schedUnlock();<a 
name="line.567"></a>
-<span class="sourceLineNo">568</span>    }<a name="line.568"></a>
-<span class="sourceLineNo">569</span>  }<a name="line.569"></a>
-<span class="sourceLineNo">570</span><a name="line.570"></a>
-<span class="sourceLineNo">571</span>  /**<a name="line.571"></a>
-<span class="sourceLineNo">572</span>   * Tries to remove the queue and the 
table-lock of the specified table.<a name="line.572"></a>
-<span class="sourceLineNo">573</span>   * If there are new operations pending 
(e.g. a new create),<a name="line.573"></a>
-<span class="sourceLineNo">574</span>   * the remove will not be performed.<a 
name="line.574"></a>
-<span class="sourceLineNo">575</span>   * @param table the name of the table 
that should be marked as deleted<a name="line.575"></a>
-<span class="sourceLineNo">576</span>   * @param procedure the procedure that 
is removing the table<a name="line.576"></a>
-<span class="sourceLineNo">577</span>   * @return true if deletion succeeded, 
false otherwise meaning that there are<a name="line.577"></a>
-<span class="sourceLineNo">578</span>   *     other new operations pending for 
that table (e.g. a new create).<a name="line.578"></a>
-<span class="sourceLineNo">579</span>   */<a name="line.579"></a>
-<span class="sourceLineNo">580</span>  @VisibleForTesting<a 
name="line.580"></a>
-<span class="sourceLineNo">581</span>  boolean markTableAsDeleted(final 
TableName table, final Procedure&lt;?&gt; procedure) {<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    schedLock();<a name="line.582"></a>
-<span class="sourceLineNo">583</span>    try {<a name="line.583"></a>
-<span class="sourceLineNo">584</span>      final TableQueue queue = 
getTableQueue(table);<a name="line.584"></a>
-<span class="sourceLineNo">585</span>      final LockAndQueue tableLock = 
locking.getTableLock(table);<a name="line.585"></a>
-<span class="sourceLineNo">586</span>      if (queue == null) return true;<a 
name="line.586"></a>
-<span class="sourceLineNo">587</span><a name="line.587"></a>
-<span class="sourceLineNo">588</span>      if (queue.isEmpty() &amp;&amp; 
tableLock.tryExclusiveLock(procedure)) {<a name="line.588"></a>
-<span class="sourceLineNo">589</span>        // remove the table from the 
run-queue and the map<a name="line.589"></a>
-<span class="sourceLineNo">590</span>        if 
(AvlIterableList.isLinked(queue)) {<a name="line.590"></a>
-<span class="sourceLineNo">591</span>          tableRunQueue.remove(queue);<a 
name="line.591"></a>
-<span class="sourceLineNo">592</span>        }<a name="line.592"></a>
-<span class="sourceLineNo">593</span>        removeTableQueue(table);<a 
name="line.593"></a>
-<span class="sourceLineNo">594</span>      } else {<a name="line.594"></a>
-<span class="sourceLineNo">595</span>        // TODO: If there are no create, 
we can drop all the other ops<a name="line.595"></a>
-<span class="sourceLineNo">596</span>        return false;<a 
name="line.596"></a>
-<span class="sourceLineNo">597</span>      }<a name="line.597"></a>
-<span class="sourceLineNo">598</span>    } finally {<a name="line.598"></a>
-<span class="sourceLineNo">599</span>      schedUnlock();<a 
name="line.599"></a>
-<span class="sourceLineNo">600</span>    }<a name="line.600"></a>
-<span class="sourceLineNo">601</span>    return true;<a name="line.601"></a>
-<span class="sourceLineNo">602</span>  }<a name="line.602"></a>
-<span class="sourceLineNo">603</span><a name="line.603"></a>
-<span class="sourceLineNo">604</span>  // 
============================================================================<a 
name="line.604"></a>
-<span class="sourceLineNo">605</span>  //  Region Locking Helpers<a 
name="line.605"></a>
-<span class="sourceLineNo">606</span>  // 
============================================================================<a 
name="line.606"></a>
-<span class="sourceLineNo">607</span>  /**<a name="line.607"></a>
-<span class="sourceLineNo">608</span>   * Suspend the procedure if the 
specified region is already locked.<a name="line.608"></a>
-<span class="sourceLineNo">609</span>   * @param procedure the procedure 
trying to acquire the lock on the region<a name="line.609"></a>
-<span class="sourceLineNo">610</span>   * @param regionInfo the region we are 
trying to lock<a name="line.610"></a>
-<span class="sourceLineNo">611</span>   * @return true if the procedure has to 
wait for the regions to be available<a name="line.611"></a>
-<span class="sourceLineNo">612</span>   */<a name="line.612"></a>
-<span class="sourceLineNo">613</span>  public boolean waitRegion(final 
Procedure procedure, final RegionInfo regionInfo) {<a name="line.613"></a>
-<span class="sourceLineNo">614</span>    return waitRegions(procedure, 
regionInfo.getTable(), regionInfo);<a name="line.614"></a>
-<span class="sourceLineNo">615</span>  }<a name="line.615"></a>
-<span class="sourceLineNo">616</span><a name="line.616"></a>
-<span class="sourceLineNo">617</span>  /**<a name="line.617"></a>
-<span class="sourceLineNo">618</span>   * Suspend the procedure if the 
specified set of regions are already locked.<a name="line.618"></a>
-<span class="sourceLineNo">619</span>   * @param procedure the procedure 
trying to acquire the lock on the regions<a name="line.619"></a>
-<span class="sourceLineNo">620</span>   * @param table the table name of the 
regions we are trying to lock<a name="line.620"></a>
-<span class="sourceLineNo">621</span>   * @param regionInfo the list of 
regions we are trying to lock<a name="line.621"></a>
-<span class="sourceLineNo">622</span>   * @return true if the procedure has to 
wait for the regions to be available<a name="line.622"></a>
-<span class="sourceLineNo">623</span>   */<a name="line.623"></a>
-<span class="sourceLineNo">624</span>  public boolean waitRegions(final 
Procedure procedure, final TableName table,<a name="line.624"></a>
-<span class="sourceLineNo">625</span>      final RegionInfo... regionInfo) {<a 
name="line.625"></a>
-<span class="sourceLineNo">626</span>    Arrays.sort(regionInfo, 
RegionInfo.COMPARATOR);<a name="line.626"></a>
-<span class="sourceLineNo">627</span>    schedLock();<a name="line.627"></a>
-<span class="sourceLineNo">628</span>    try {<a name="line.628"></a>
-<span class="sourceLineNo">629</span>      // If there is parent procedure, it 
would have already taken xlock, so no need to take<a name="line.629"></a>
-<span class="sourceLineNo">630</span>      // shared lock here. Otherwise, 
take shared lock.<a name="line.630"></a>
-<span class="sourceLineNo">631</span>      if (!procedure.hasParent()<a 
name="line.631"></a>
-<span class="sourceLineNo">632</span>          &amp;&amp; 
waitTableQueueSharedLock(procedure, table) == null) {<a name="line.632"></a>
-<span class="sourceLineNo">633</span>          return true;<a 
name="line.633"></a>
-<span class="sourceLineNo">634</span>      }<a name="line.634"></a>
+<span class="sourceLineNo">449</span>  private static boolean 
isMetaProcedure(Procedure&lt;?&gt; proc) {<a name="line.449"></a>
+<span class="sourceLineNo">450</span>    return proc instanceof 
MetaProcedureInterface;<a name="line.450"></a>
+<span class="sourceLineNo">451</span>  }<a name="line.451"></a>
+<span class="sourceLineNo">452</span>  // 
============================================================================<a 
name="line.452"></a>
+<span class="sourceLineNo">453</span>  //  Table Locking Helpers<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>   * Get lock info for a resource of 
specified type and name and log details<a name="line.456"></a>
+<span class="sourceLineNo">457</span>   */<a name="line.457"></a>
+<span class="sourceLineNo">458</span>  private void 
logLockedResource(LockedResourceType resourceType, String resourceName) {<a 
name="line.458"></a>
+<span class="sourceLineNo">459</span>    if (!LOG.isDebugEnabled()) {<a 
name="line.459"></a>
+<span class="sourceLineNo">460</span>      return;<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>    LockedResource lockedResource = 
getLockResource(resourceType, resourceName);<a name="line.463"></a>
+<span class="sourceLineNo">464</span>    if (lockedResource != null) {<a 
name="line.464"></a>
+<span class="sourceLineNo">465</span>      String msg = 
resourceType.toString() + " '" + resourceName + "', shared lock count=" +<a 
name="line.465"></a>
+<span class="sourceLineNo">466</span>          
lockedResource.getSharedLockCount();<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span>      Procedure&lt;?&gt; proc = 
lockedResource.getExclusiveLockOwnerProcedure();<a name="line.468"></a>
+<span class="sourceLineNo">469</span>      if (proc != null) {<a 
name="line.469"></a>
+<span class="sourceLineNo">470</span>        msg += ", exclusively locked by 
procId=" + proc.getProcId();<a name="line.470"></a>
+<span class="sourceLineNo">471</span>      }<a name="line.471"></a>
+<span class="sourceLineNo">472</span>      LOG.debug(msg);<a 
name="line.472"></a>
+<span class="sourceLineNo">473</span>    }<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>  /**<a name="line.476"></a>
+<span class="sourceLineNo">477</span>   * Suspend the procedure if the 
specified table is already locked.<a name="line.477"></a>
+<span class="sourceLineNo">478</span>   * Other operations in the table-queue 
will be executed after the lock is released.<a name="line.478"></a>
+<span class="sourceLineNo">479</span>   * @param procedure the procedure 
trying to acquire the lock<a name="line.479"></a>
+<span class="sourceLineNo">480</span>   * @param table Table to lock<a 
name="line.480"></a>
+<span class="sourceLineNo">481</span>   * @return true if the procedure has to 
wait for the table to be available<a name="line.481"></a>
+<span class="sourceLineNo">482</span>   */<a name="line.482"></a>
+<span class="sourceLineNo">483</span>  public boolean 
waitTableExclusiveLock(final Procedure procedure, final TableName table) {<a 
name="line.483"></a>
+<span class="sourceLineNo">484</span>    schedLock();<a name="line.484"></a>
+<span class="sourceLineNo">485</span>    try {<a name="line.485"></a>
+<span class="sourceLineNo">486</span>      final String namespace = 
table.getNamespaceAsString();<a name="line.486"></a>
+<span class="sourceLineNo">487</span>      final LockAndQueue namespaceLock = 
locking.getNamespaceLock(namespace);<a name="line.487"></a>
+<span class="sourceLineNo">488</span>      final LockAndQueue tableLock = 
locking.getTableLock(table);<a name="line.488"></a>
+<span class="sourceLineNo">489</span>      if (!namespaceLock.trySharedLock()) 
{<a name="line.489"></a>
+<span class="sourceLineNo">490</span>        waitProcedure(namespaceLock, 
procedure);<a name="line.490"></a>
+<span class="sourceLineNo">491</span>        
logLockedResource(LockedResourceType.NAMESPACE,

<TRUNCATED>

Reply via email to