hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From git-site-r...@apache.org
Subject [18/43] hbase-site git commit: Published site at 82d554e3783372cc6b05489452c815b57c06f6cd.
Date Tue, 01 Aug 2017 15:08:00 GMT
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/110df817/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.ServerQueue.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.ServerQueue.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.ServerQueue.html
index 38cee64..d900251 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.ServerQueue.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.ServerQueue.html
@@ -220,1065 +220,1075 @@
 <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>    final Procedure pollResult = rq.peek();<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    final boolean xlockReq = rq.requireExclusiveLock(pollResult);<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    if (xlockReq &amp;&amp; rq.getLockStatus().isLocked() &amp;&amp; !rq.getLockStatus().hasLockAccess(pollResult)) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      // someone is already holding the lock (e.g. shared lock). avoid a yield<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      removeFromRunQueue(fairq, rq);<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      return null;<a name="line.219"></a>
-<span class="sourceLineNo">220</span>    }<a name="line.220"></a>
-<span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span>    rq.poll();<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    if (rq.isEmpty() || xlockReq) {<a name="line.223"></a>
-<span class="sourceLineNo">224</span>      removeFromRunQueue(fairq, rq);<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    } else if (rq.getLockStatus().hasParentLock(pollResult)) {<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      // if the rq is in the fairq because of runnable child<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      // check if the next procedure is still a child.<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      // if not, remove the rq from the fairq and go back to the xlock state<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      Procedure nextProc = rq.peek();<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      if (nextProc != null &amp;&amp; !Procedure.haveSameParent(nextProc, pollResult)) {<a name="line.230"></a>
-<span class="sourceLineNo">231</span>        removeFromRunQueue(fairq, rq);<a name="line.231"></a>
-<span class="sourceLineNo">232</span>      }<a name="line.232"></a>
-<span class="sourceLineNo">233</span>    }<a name="line.233"></a>
-<span class="sourceLineNo">234</span><a name="line.234"></a>
-<span class="sourceLineNo">235</span>    return pollResult;<a name="line.235"></a>
-<span class="sourceLineNo">236</span>  }<a name="line.236"></a>
+<span class="sourceLineNo">215</span>    if (pollResult == null) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span>      return null;<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    }<a name="line.217"></a>
+<span class="sourceLineNo">218</span>    final boolean xlockReq = rq.requireExclusiveLock(pollResult);<a name="line.218"></a>
+<span class="sourceLineNo">219</span>    if (xlockReq &amp;&amp; rq.getLockStatus().isLocked() &amp;&amp; !rq.getLockStatus().hasLockAccess(pollResult)) {<a name="line.219"></a>
+<span class="sourceLineNo">220</span>      // someone is already holding the lock (e.g. shared lock). avoid a yield<a name="line.220"></a>
+<span class="sourceLineNo">221</span>      removeFromRunQueue(fairq, rq);<a name="line.221"></a>
+<span class="sourceLineNo">222</span>      return null;<a name="line.222"></a>
+<span class="sourceLineNo">223</span>    }<a name="line.223"></a>
+<span class="sourceLineNo">224</span><a name="line.224"></a>
+<span class="sourceLineNo">225</span>    rq.poll();<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    if (rq.isEmpty() || xlockReq) {<a name="line.226"></a>
+<span class="sourceLineNo">227</span>      removeFromRunQueue(fairq, rq);<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    } else if (rq.getLockStatus().hasParentLock(pollResult)) {<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      // if the rq is in the fairq because of runnable child<a name="line.229"></a>
+<span class="sourceLineNo">230</span>      // check if the next procedure is still a child.<a name="line.230"></a>
+<span class="sourceLineNo">231</span>      // if not, remove the rq from the fairq and go back to the xlock state<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      Procedure nextProc = rq.peek();<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      if (nextProc != null &amp;&amp; !Procedure.haveSameParent(nextProc, pollResult)) {<a name="line.233"></a>
+<span class="sourceLineNo">234</span>        removeFromRunQueue(fairq, rq);<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>  private LockInfo createLockInfo(LockInfo.ResourceType resourceType,<a name="line.238"></a>
-<span class="sourceLineNo">239</span>      String resourceName, LockAndQueue queue) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    LockInfo info = new LockInfo();<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span>    info.setResourceType(resourceType);<a name="line.242"></a>
-<span class="sourceLineNo">243</span>    info.setResourceName(resourceName);<a name="line.243"></a>
+<span class="sourceLineNo">238</span>    return pollResult;<a name="line.238"></a>
+<span class="sourceLineNo">239</span>  }<a name="line.239"></a>
+<span class="sourceLineNo">240</span><a name="line.240"></a>
+<span class="sourceLineNo">241</span>  private LockInfo createLockInfo(LockInfo.ResourceType resourceType,<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      String resourceName, LockAndQueue queue) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    LockInfo info = new LockInfo();<a name="line.243"></a>
 <span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span>    if (queue.hasExclusiveLock()) {<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      info.setLockType(LockInfo.LockType.EXCLUSIVE);<a name="line.246"></a>
+<span class="sourceLineNo">245</span>    info.setResourceType(resourceType);<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    info.setResourceName(resourceName);<a name="line.246"></a>
 <span class="sourceLineNo">247</span><a name="line.247"></a>
-<span class="sourceLineNo">248</span>      Procedure&lt;?&gt; exclusiveLockOwnerProcedure = queue.getExclusiveLockOwnerProcedure();<a name="line.248"></a>
-<span class="sourceLineNo">249</span>      ProcedureInfo exclusiveLockOwnerProcedureInfo =<a name="line.249"></a>
-<span class="sourceLineNo">250</span>          ProcedureUtil.convertToProcedureInfo(exclusiveLockOwnerProcedure);<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      info.setExclusiveLockOwnerProcedure(exclusiveLockOwnerProcedureInfo);<a name="line.251"></a>
-<span class="sourceLineNo">252</span>    } else if (queue.getSharedLockCount() &gt; 0) {<a name="line.252"></a>
-<span class="sourceLineNo">253</span>      info.setLockType(LockInfo.LockType.SHARED);<a name="line.253"></a>
-<span class="sourceLineNo">254</span>      info.setSharedLockCount(queue.getSharedLockCount());<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>    for (Procedure&lt;?&gt; procedure : queue) {<a name="line.257"></a>
-<span class="sourceLineNo">258</span>      if (!(procedure instanceof LockProcedure)) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>        continue;<a name="line.259"></a>
-<span class="sourceLineNo">260</span>      }<a name="line.260"></a>
-<span class="sourceLineNo">261</span><a name="line.261"></a>
-<span class="sourceLineNo">262</span>      LockProcedure lockProcedure = (LockProcedure)procedure;<a name="line.262"></a>
-<span class="sourceLineNo">263</span>      LockInfo.WaitingProcedure waitingProcedure = new LockInfo.WaitingProcedure();<a name="line.263"></a>
+<span class="sourceLineNo">248</span>    if (queue.hasExclusiveLock()) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span>      info.setLockType(LockInfo.LockType.EXCLUSIVE);<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span>      Procedure&lt;?&gt; exclusiveLockOwnerProcedure = queue.getExclusiveLockOwnerProcedure();<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      ProcedureInfo exclusiveLockOwnerProcedureInfo =<a name="line.252"></a>
+<span class="sourceLineNo">253</span>          ProcedureUtil.convertToProcedureInfo(exclusiveLockOwnerProcedure);<a name="line.253"></a>
+<span class="sourceLineNo">254</span>      info.setExclusiveLockOwnerProcedure(exclusiveLockOwnerProcedureInfo);<a name="line.254"></a>
+<span class="sourceLineNo">255</span>    } else if (queue.getSharedLockCount() &gt; 0) {<a name="line.255"></a>
+<span class="sourceLineNo">256</span>      info.setLockType(LockInfo.LockType.SHARED);<a name="line.256"></a>
+<span class="sourceLineNo">257</span>      info.setSharedLockCount(queue.getSharedLockCount());<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    }<a name="line.258"></a>
+<span class="sourceLineNo">259</span><a name="line.259"></a>
+<span class="sourceLineNo">260</span>    for (Procedure&lt;?&gt; procedure : queue) {<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      if (!(procedure instanceof LockProcedure)) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span>        continue;<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>      switch (lockProcedure.getType()) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span>      case EXCLUSIVE:<a name="line.266"></a>
-<span class="sourceLineNo">267</span>        waitingProcedure.setLockType(LockInfo.LockType.EXCLUSIVE);<a name="line.267"></a>
-<span class="sourceLineNo">268</span>        break;<a name="line.268"></a>
-<span class="sourceLineNo">269</span>      case SHARED:<a name="line.269"></a>
-<span class="sourceLineNo">270</span>        waitingProcedure.setLockType(LockInfo.LockType.SHARED);<a name="line.270"></a>
+<span class="sourceLineNo">265</span>      LockProcedure lockProcedure = (LockProcedure)procedure;<a name="line.265"></a>
+<span class="sourceLineNo">266</span>      LockInfo.WaitingProcedure waitingProcedure = new LockInfo.WaitingProcedure();<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span>      switch (lockProcedure.getType()) {<a name="line.268"></a>
+<span class="sourceLineNo">269</span>      case EXCLUSIVE:<a name="line.269"></a>
+<span class="sourceLineNo">270</span>        waitingProcedure.setLockType(LockInfo.LockType.EXCLUSIVE);<a name="line.270"></a>
 <span class="sourceLineNo">271</span>        break;<a name="line.271"></a>
-<span class="sourceLineNo">272</span>      }<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span>      ProcedureInfo procedureInfo = ProcedureUtil.convertToProcedureInfo(lockProcedure);<a name="line.274"></a>
-<span class="sourceLineNo">275</span>      waitingProcedure.setProcedure(procedureInfo);<a name="line.275"></a>
+<span class="sourceLineNo">272</span>      case SHARED:<a name="line.272"></a>
+<span class="sourceLineNo">273</span>        waitingProcedure.setLockType(LockInfo.LockType.SHARED);<a name="line.273"></a>
+<span class="sourceLineNo">274</span>        break;<a name="line.274"></a>
+<span class="sourceLineNo">275</span>      }<a name="line.275"></a>
 <span class="sourceLineNo">276</span><a name="line.276"></a>
-<span class="sourceLineNo">277</span>      info.addWaitingProcedure(waitingProcedure);<a name="line.277"></a>
-<span class="sourceLineNo">278</span>    }<a name="line.278"></a>
+<span class="sourceLineNo">277</span>      ProcedureInfo procedureInfo = ProcedureUtil.convertToProcedureInfo(lockProcedure);<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      waitingProcedure.setProcedure(procedureInfo);<a name="line.278"></a>
 <span class="sourceLineNo">279</span><a name="line.279"></a>
-<span class="sourceLineNo">280</span>    return info;<a name="line.280"></a>
-<span class="sourceLineNo">281</span>  }<a name="line.281"></a>
+<span class="sourceLineNo">280</span>      info.addWaitingProcedure(waitingProcedure);<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    }<a name="line.281"></a>
 <span class="sourceLineNo">282</span><a name="line.282"></a>
-<span class="sourceLineNo">283</span>  @Override<a name="line.283"></a>
-<span class="sourceLineNo">284</span>  public List&lt;LockInfo&gt; listLocks() {<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    schedLock();<a name="line.285"></a>
-<span class="sourceLineNo">286</span><a name="line.286"></a>
-<span class="sourceLineNo">287</span>    try {<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      List&lt;LockInfo&gt; lockInfos = new ArrayList&lt;&gt;();<a name="line.288"></a>
+<span class="sourceLineNo">283</span>    return info;<a name="line.283"></a>
+<span class="sourceLineNo">284</span>  }<a name="line.284"></a>
+<span class="sourceLineNo">285</span><a name="line.285"></a>
+<span class="sourceLineNo">286</span>  @Override<a name="line.286"></a>
+<span class="sourceLineNo">287</span>  public List&lt;LockInfo&gt; listLocks() {<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    schedLock();<a name="line.288"></a>
 <span class="sourceLineNo">289</span><a name="line.289"></a>
-<span class="sourceLineNo">290</span>      for (Entry&lt;ServerName, LockAndQueue&gt; entry : locking.serverLocks<a name="line.290"></a>
-<span class="sourceLineNo">291</span>          .entrySet()) {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>        String serverName = entry.getKey().getServerName();<a name="line.292"></a>
-<span class="sourceLineNo">293</span>        LockAndQueue queue = entry.getValue();<a name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span>        if (queue.isLocked()) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span>          LockInfo lockInfo = createLockInfo(LockInfo.ResourceType.SERVER,<a name="line.296"></a>
-<span class="sourceLineNo">297</span>              serverName, queue);<a name="line.297"></a>
-<span class="sourceLineNo">298</span>          lockInfos.add(lockInfo);<a name="line.298"></a>
-<span class="sourceLineNo">299</span>        }<a name="line.299"></a>
-<span class="sourceLineNo">300</span>      }<a name="line.300"></a>
-<span class="sourceLineNo">301</span><a name="line.301"></a>
-<span class="sourceLineNo">302</span>      for (Entry&lt;String, LockAndQueue&gt; entry : locking.namespaceLocks<a name="line.302"></a>
-<span class="sourceLineNo">303</span>          .entrySet()) {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>        String namespaceName = entry.getKey();<a name="line.304"></a>
-<span class="sourceLineNo">305</span>        LockAndQueue queue = entry.getValue();<a name="line.305"></a>
-<span class="sourceLineNo">306</span><a name="line.306"></a>
-<span class="sourceLineNo">307</span>        if (queue.isLocked()) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>          LockInfo lockInfo = createLockInfo(LockInfo.ResourceType.NAMESPACE,<a name="line.308"></a>
-<span class="sourceLineNo">309</span>              namespaceName, queue);<a name="line.309"></a>
-<span class="sourceLineNo">310</span>          lockInfos.add(lockInfo);<a name="line.310"></a>
-<span class="sourceLineNo">311</span>        }<a name="line.311"></a>
-<span class="sourceLineNo">312</span>      }<a name="line.312"></a>
-<span class="sourceLineNo">313</span><a name="line.313"></a>
-<span class="sourceLineNo">314</span>      for (Entry&lt;TableName, LockAndQueue&gt; entry : locking.tableLocks<a name="line.314"></a>
-<span class="sourceLineNo">315</span>          .entrySet()) {<a name="line.315"></a>
-<span class="sourceLineNo">316</span>        String tableName = entry.getKey().getNameAsString();<a name="line.316"></a>
-<span class="sourceLineNo">317</span>        LockAndQueue queue = entry.getValue();<a name="line.317"></a>
-<span class="sourceLineNo">318</span><a name="line.318"></a>
-<span class="sourceLineNo">319</span>        if (queue.isLocked()) {<a name="line.319"></a>
-<span class="sourceLineNo">320</span>          LockInfo lockInfo = createLockInfo(LockInfo.ResourceType.TABLE,<a name="line.320"></a>
-<span class="sourceLineNo">321</span>              tableName, queue);<a name="line.321"></a>
-<span class="sourceLineNo">322</span>          lockInfos.add(lockInfo);<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><a name="line.325"></a>
-<span class="sourceLineNo">326</span>      for (Entry&lt;String, LockAndQueue&gt; entry : locking.regionLocks.entrySet()) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span>        String regionName = entry.getKey();<a name="line.327"></a>
-<span class="sourceLineNo">328</span>        LockAndQueue queue = entry.getValue();<a name="line.328"></a>
-<span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span>        if (queue.isLocked()) {<a name="line.330"></a>
-<span class="sourceLineNo">331</span>          LockInfo lockInfo = createLockInfo(LockInfo.ResourceType.REGION,<a name="line.331"></a>
-<span class="sourceLineNo">332</span>              regionName, queue);<a name="line.332"></a>
-<span class="sourceLineNo">333</span>          lockInfos.add(lockInfo);<a name="line.333"></a>
-<span class="sourceLineNo">334</span>        }<a name="line.334"></a>
-<span class="sourceLineNo">335</span>      }<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span>      return lockInfos;<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    } finally {<a name="line.338"></a>
-<span class="sourceLineNo">339</span>      schedUnlock();<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><a name="line.342"></a>
-<span class="sourceLineNo">343</span>  @Override<a name="line.343"></a>
-<span class="sourceLineNo">344</span>  public LockInfo getLockInfoForResource(LockInfo.ResourceType resourceType, String resourceName) {<a name="line.344"></a>
-<span class="sourceLineNo">345</span>    LockAndQueue queue = null;<a name="line.345"></a>
-<span class="sourceLineNo">346</span>    schedLock();<a name="line.346"></a>
-<span class="sourceLineNo">347</span>    try {<a name="line.347"></a>
-<span class="sourceLineNo">348</span>      switch (resourceType) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span>        case SERVER:<a name="line.349"></a>
-<span class="sourceLineNo">350</span>          queue = locking.serverLocks.get(ServerName.valueOf(resourceName));<a name="line.350"></a>
-<span class="sourceLineNo">351</span>          break;<a name="line.351"></a>
-<span class="sourceLineNo">352</span>        case NAMESPACE:<a name="line.352"></a>
-<span class="sourceLineNo">353</span>          queue = locking.namespaceLocks.get(resourceName);<a name="line.353"></a>
+<span class="sourceLineNo">290</span>    try {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>      List&lt;LockInfo&gt; lockInfos = new ArrayList&lt;&gt;();<a name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span>      for (Entry&lt;ServerName, LockAndQueue&gt; entry : locking.serverLocks<a name="line.293"></a>
+<span class="sourceLineNo">294</span>          .entrySet()) {<a name="line.294"></a>
+<span class="sourceLineNo">295</span>        String serverName = entry.getKey().getServerName();<a name="line.295"></a>
+<span class="sourceLineNo">296</span>        LockAndQueue queue = entry.getValue();<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span>        if (queue.isLocked()) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span>          LockInfo lockInfo = createLockInfo(LockInfo.ResourceType.SERVER,<a name="line.299"></a>
+<span class="sourceLineNo">300</span>              serverName, queue);<a name="line.300"></a>
+<span class="sourceLineNo">301</span>          lockInfos.add(lockInfo);<a name="line.301"></a>
+<span class="sourceLineNo">302</span>        }<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      }<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span>      for (Entry&lt;String, LockAndQueue&gt; entry : locking.namespaceLocks<a name="line.305"></a>
+<span class="sourceLineNo">306</span>          .entrySet()) {<a name="line.306"></a>
+<span class="sourceLineNo">307</span>        String namespaceName = entry.getKey();<a name="line.307"></a>
+<span class="sourceLineNo">308</span>        LockAndQueue queue = entry.getValue();<a name="line.308"></a>
+<span class="sourceLineNo">309</span><a name="line.309"></a>
+<span class="sourceLineNo">310</span>        if (queue.isLocked()) {<a name="line.310"></a>
+<span class="sourceLineNo">311</span>          LockInfo lockInfo = createLockInfo(LockInfo.ResourceType.NAMESPACE,<a name="line.311"></a>
+<span class="sourceLineNo">312</span>              namespaceName, queue);<a name="line.312"></a>
+<span class="sourceLineNo">313</span>          lockInfos.add(lockInfo);<a name="line.313"></a>
+<span class="sourceLineNo">314</span>        }<a name="line.314"></a>
+<span class="sourceLineNo">315</span>      }<a name="line.315"></a>
+<span class="sourceLineNo">316</span><a name="line.316"></a>
+<span class="sourceLineNo">317</span>      for (Entry&lt;TableName, LockAndQueue&gt; entry : locking.tableLocks<a name="line.317"></a>
+<span class="sourceLineNo">318</span>          .entrySet()) {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>        String tableName = entry.getKey().getNameAsString();<a name="line.319"></a>
+<span class="sourceLineNo">320</span>        LockAndQueue queue = entry.getValue();<a name="line.320"></a>
+<span class="sourceLineNo">321</span><a name="line.321"></a>
+<span class="sourceLineNo">322</span>        if (queue.isLocked()) {<a name="line.322"></a>
+<span class="sourceLineNo">323</span>          LockInfo lockInfo = createLockInfo(LockInfo.ResourceType.TABLE,<a name="line.323"></a>
+<span class="sourceLineNo">324</span>              tableName, queue);<a name="line.324"></a>
+<span class="sourceLineNo">325</span>          lockInfos.add(lockInfo);<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><a name="line.328"></a>
+<span class="sourceLineNo">329</span>      for (Entry&lt;String, LockAndQueue&gt; entry : locking.regionLocks.entrySet()) {<a name="line.329"></a>
+<span class="sourceLineNo">330</span>        String regionName = entry.getKey();<a name="line.330"></a>
+<span class="sourceLineNo">331</span>        LockAndQueue queue = entry.getValue();<a name="line.331"></a>
+<span class="sourceLineNo">332</span><a name="line.332"></a>
+<span class="sourceLineNo">333</span>        if (queue.isLocked()) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span>          LockInfo lockInfo = createLockInfo(LockInfo.ResourceType.REGION,<a name="line.334"></a>
+<span class="sourceLineNo">335</span>              regionName, queue);<a name="line.335"></a>
+<span class="sourceLineNo">336</span>          lockInfos.add(lockInfo);<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><a name="line.339"></a>
+<span class="sourceLineNo">340</span>      return lockInfos;<a name="line.340"></a>
+<span class="sourceLineNo">341</span>    } finally {<a name="line.341"></a>
+<span class="sourceLineNo">342</span>      schedUnlock();<a name="line.342"></a>
+<span class="sourceLineNo">343</span>    }<a name="line.343"></a>
+<span class="sourceLineNo">344</span>  }<a name="line.344"></a>
+<span class="sourceLineNo">345</span><a name="line.345"></a>
+<span class="sourceLineNo">346</span>  @Override<a name="line.346"></a>
+<span class="sourceLineNo">347</span>  public LockInfo getLockInfoForResource(LockInfo.ResourceType resourceType, String resourceName) {<a name="line.347"></a>
+<span class="sourceLineNo">348</span>    LockAndQueue queue = null;<a name="line.348"></a>
+<span class="sourceLineNo">349</span>    schedLock();<a name="line.349"></a>
+<span class="sourceLineNo">350</span>    try {<a name="line.350"></a>
+<span class="sourceLineNo">351</span>      switch (resourceType) {<a name="line.351"></a>
+<span class="sourceLineNo">352</span>        case SERVER:<a name="line.352"></a>
+<span class="sourceLineNo">353</span>          queue = locking.serverLocks.get(ServerName.valueOf(resourceName));<a name="line.353"></a>
 <span class="sourceLineNo">354</span>          break;<a name="line.354"></a>
-<span class="sourceLineNo">355</span>        case TABLE:<a name="line.355"></a>
-<span class="sourceLineNo">356</span>          queue = locking.tableLocks.get(TableName.valueOf(resourceName));<a name="line.356"></a>
+<span class="sourceLineNo">355</span>        case NAMESPACE:<a name="line.355"></a>
+<span class="sourceLineNo">356</span>          queue = locking.namespaceLocks.get(resourceName);<a name="line.356"></a>
 <span class="sourceLineNo">357</span>          break;<a name="line.357"></a>
-<span class="sourceLineNo">358</span>        case REGION:<a name="line.358"></a>
-<span class="sourceLineNo">359</span>          queue = locking.regionLocks.get(resourceName);<a name="line.359"></a>
+<span class="sourceLineNo">358</span>        case TABLE:<a name="line.358"></a>
+<span class="sourceLineNo">359</span>          queue = locking.tableLocks.get(TableName.valueOf(resourceName));<a name="line.359"></a>
 <span class="sourceLineNo">360</span>          break;<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>      return queue != null ? createLockInfo(resourceType, resourceName, queue) : null;<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    } finally {<a name="line.364"></a>
-<span class="sourceLineNo">365</span>      schedUnlock();<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><a name="line.368"></a>
-<span class="sourceLineNo">369</span>  @Override<a name="line.369"></a>
-<span class="sourceLineNo">370</span>  public void clear() {<a name="line.370"></a>
-<span class="sourceLineNo">371</span>    schedLock();<a name="line.371"></a>
-<span class="sourceLineNo">372</span>    try {<a name="line.372"></a>
-<span class="sourceLineNo">373</span>      clearQueue();<a name="line.373"></a>
-<span class="sourceLineNo">374</span>      locking.clear();<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    } finally {<a name="line.375"></a>
-<span class="sourceLineNo">376</span>      schedUnlock();<a name="line.376"></a>
-<span class="sourceLineNo">377</span>    }<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>  protected void clearQueue() {<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    // Remove Servers<a name="line.381"></a>
-<span class="sourceLineNo">382</span>    for (int i = 0; i &lt; serverBuckets.length; ++i) {<a name="line.382"></a>
-<span class="sourceLineNo">383</span>      clear(serverBuckets[i], serverRunQueue, SERVER_QUEUE_KEY_COMPARATOR);<a name="line.383"></a>
-<span class="sourceLineNo">384</span>      serverBuckets[i] = null;<a name="line.384"></a>
-<span class="sourceLineNo">385</span>    }<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span>    // Remove Tables<a name="line.387"></a>
-<span class="sourceLineNo">388</span>    clear(tableMap, tableRunQueue, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    tableMap = null;<a name="line.389"></a>
-<span class="sourceLineNo">390</span><a name="line.390"></a>
-<span class="sourceLineNo">391</span>    assert size() == 0 : "expected queue size to be 0, got " + size();<a name="line.391"></a>
-<span class="sourceLineNo">392</span>  }<a name="line.392"></a>
+<span class="sourceLineNo">361</span>        case REGION:<a name="line.361"></a>
+<span class="sourceLineNo">362</span>          queue = locking.regionLocks.get(resourceName);<a name="line.362"></a>
+<span class="sourceLineNo">363</span>          break;<a name="line.363"></a>
+<span class="sourceLineNo">364</span>      }<a name="line.364"></a>
+<span class="sourceLineNo">365</span><a name="line.365"></a>
+<span class="sourceLineNo">366</span>      return queue != null ? createLockInfo(resourceType, resourceName, queue) : null;<a name="line.366"></a>
+<span class="sourceLineNo">367</span>    } finally {<a name="line.367"></a>
+<span class="sourceLineNo">368</span>      schedUnlock();<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    }<a name="line.369"></a>
+<span class="sourceLineNo">370</span>  }<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span>  @Override<a name="line.372"></a>
+<span class="sourceLineNo">373</span>  public void clear() {<a name="line.373"></a>
+<span class="sourceLineNo">374</span>    schedLock();<a name="line.374"></a>
+<span class="sourceLineNo">375</span>    try {<a name="line.375"></a>
+<span class="sourceLineNo">376</span>      clearQueue();<a name="line.376"></a>
+<span class="sourceLineNo">377</span>      locking.clear();<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    } finally {<a name="line.378"></a>
+<span class="sourceLineNo">379</span>      schedUnlock();<a name="line.379"></a>
+<span class="sourceLineNo">380</span>    }<a name="line.380"></a>
+<span class="sourceLineNo">381</span>  }<a name="line.381"></a>
+<span class="sourceLineNo">382</span><a name="line.382"></a>
+<span class="sourceLineNo">383</span>  protected void clearQueue() {<a name="line.383"></a>
+<span class="sourceLineNo">384</span>    // Remove Servers<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    for (int i = 0; i &lt; serverBuckets.length; ++i) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span>      clear(serverBuckets[i], serverRunQueue, SERVER_QUEUE_KEY_COMPARATOR);<a name="line.386"></a>
+<span class="sourceLineNo">387</span>      serverBuckets[i] = null;<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>    // Remove Tables<a name="line.390"></a>
+<span class="sourceLineNo">391</span>    clear(tableMap, tableRunQueue, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    tableMap = null;<a name="line.392"></a>
 <span class="sourceLineNo">393</span><a name="line.393"></a>
-<span class="sourceLineNo">394</span>  private &lt;T extends Comparable&lt;T&gt;, TNode extends Queue&lt;T&gt;&gt; void clear(TNode treeMap,<a name="line.394"></a>
-<span class="sourceLineNo">395</span>      final FairQueue&lt;T&gt; fairq, final AvlKeyComparator&lt;TNode&gt; comparator) {<a name="line.395"></a>
-<span class="sourceLineNo">396</span>    while (treeMap != null) {<a name="line.396"></a>
-<span class="sourceLineNo">397</span>      Queue&lt;T&gt; node = AvlTree.getFirst(treeMap);<a name="line.397"></a>
-<span class="sourceLineNo">398</span>      treeMap = AvlTree.remove(treeMap, node.getKey(), comparator);<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      if (fairq != null) removeFromRunQueue(fairq, 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><a name="line.402"></a>
-<span class="sourceLineNo">403</span>  @Override<a name="line.403"></a>
-<span class="sourceLineNo">404</span>  protected int queueSize() {<a name="line.404"></a>
-<span class="sourceLineNo">405</span>    int count = 0;<a name="line.405"></a>
-<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span>    // Server queues<a name="line.407"></a>
-<span class="sourceLineNo">408</span>    final AvlTreeIterator&lt;ServerQueue&gt; serverIter = new AvlTreeIterator&lt;&gt;();<a name="line.408"></a>
-<span class="sourceLineNo">409</span>    for (int i = 0; i &lt; serverBuckets.length; ++i) {<a name="line.409"></a>
-<span class="sourceLineNo">410</span>      serverIter.seekFirst(serverBuckets[i]);<a name="line.410"></a>
-<span class="sourceLineNo">411</span>      while (serverIter.hasNext()) {<a name="line.411"></a>
-<span class="sourceLineNo">412</span>        count += serverIter.next().size();<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><a name="line.415"></a>
-<span class="sourceLineNo">416</span>    // Table queues<a name="line.416"></a>
-<span class="sourceLineNo">417</span>    final AvlTreeIterator&lt;TableQueue&gt; tableIter = new AvlTreeIterator&lt;&gt;(tableMap);<a name="line.417"></a>
-<span class="sourceLineNo">418</span>    while (tableIter.hasNext()) {<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      count += tableIter.next().size();<a name="line.419"></a>
-<span class="sourceLineNo">420</span>    }<a name="line.420"></a>
-<span class="sourceLineNo">421</span>    return count;<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>  @Override<a name="line.424"></a>
-<span class="sourceLineNo">425</span>  public void completionCleanup(final Procedure proc) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>    if (proc instanceof TableProcedureInterface) {<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      TableProcedureInterface iProcTable = (TableProcedureInterface)proc;<a name="line.427"></a>
-<span class="sourceLineNo">428</span>      boolean tableDeleted;<a name="line.428"></a>
-<span class="sourceLineNo">429</span>      if (proc.hasException()) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span>        Exception procEx = proc.getException().unwrapRemoteException();<a name="line.430"></a>
-<span class="sourceLineNo">431</span>        if (iProcTable.getTableOperationType() == TableOperationType.CREATE) {<a name="line.431"></a>
-<span class="sourceLineNo">432</span>          // create failed because the table already exist<a name="line.432"></a>
-<span class="sourceLineNo">433</span>          tableDeleted = !(procEx instanceof TableExistsException);<a name="line.433"></a>
-<span class="sourceLineNo">434</span>        } else {<a name="line.434"></a>
-<span class="sourceLineNo">435</span>          // the operation failed because the table does not exist<a name="line.435"></a>
-<span class="sourceLineNo">436</span>          tableDeleted = (procEx instanceof TableNotFoundException);<a name="line.436"></a>
-<span class="sourceLineNo">437</span>        }<a name="line.437"></a>
-<span class="sourceLineNo">438</span>      } else {<a name="line.438"></a>
-<span class="sourceLineNo">439</span>        // the table was deleted<a name="line.439"></a>
-<span class="sourceLineNo">440</span>        tableDeleted = (iProcTable.getTableOperationType() == TableOperationType.DELETE);<a name="line.440"></a>
-<span class="sourceLineNo">441</span>      }<a name="line.441"></a>
-<span class="sourceLineNo">442</span>      if (tableDeleted) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span>        markTableAsDeleted(iProcTable.getTableName(), proc);<a name="line.443"></a>
-<span class="sourceLineNo">444</span>        return;<a name="line.444"></a>
-<span class="sourceLineNo">445</span>      }<a name="line.445"></a>
-<span class="sourceLineNo">446</span>    } else {<a name="line.446"></a>
-<span class="sourceLineNo">447</span>      // No cleanup for ServerProcedureInterface types, yet.<a name="line.447"></a>
-<span class="sourceLineNo">448</span>      return;<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    }<a name="line.449"></a>
-<span class="sourceLineNo">450</span>  }<a name="line.450"></a>
-<span class="sourceLineNo">451</span><a name="line.451"></a>
-<span class="sourceLineNo">452</span>  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.452"></a>
-<span class="sourceLineNo">453</span>    if (!AvlIterableList.isLinked(queue) &amp;&amp; !queue.isEmpty()) {<a name="line.453"></a>
-<span class="sourceLineNo">454</span>      fairq.add(queue);<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>  private static &lt;T extends Comparable&lt;T&gt;&gt; void removeFromRunQueue(<a name="line.458"></a>
-<span class="sourceLineNo">459</span>      FairQueue&lt;T&gt; fairq, Queue&lt;T&gt; queue) {<a name="line.459"></a>
-<span class="sourceLineNo">460</span>    if (AvlIterableList.isLinked(queue)) {<a name="line.460"></a>
-<span class="sourceLineNo">461</span>      fairq.remove(queue);<a name="line.461"></a>
-<span class="sourceLineNo">462</span>    }<a name="line.462"></a>
-<span class="sourceLineNo">463</span>  }<a name="line.463"></a>
-<span class="sourceLineNo">464</span><a name="line.464"></a>
-<span class="sourceLineNo">465</span>  // ============================================================================<a name="line.465"></a>
-<span class="sourceLineNo">466</span>  //  Table Queue Lookup Helpers<a name="line.466"></a>
-<span class="sourceLineNo">467</span>  // ============================================================================<a name="line.467"></a>
-<span class="sourceLineNo">468</span>  private TableQueue getTableQueue(TableName tableName) {<a name="line.468"></a>
-<span class="sourceLineNo">469</span>    TableQueue node = AvlTree.get(tableMap, tableName, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>    if (node != null) return node;<a name="line.470"></a>
-<span class="sourceLineNo">471</span><a name="line.471"></a>
-<span class="sourceLineNo">472</span>    node = new TableQueue(tableName, tablePriorities.getPriority(tableName),<a name="line.472"></a>
-<span class="sourceLineNo">473</span>        locking.getTableLock(tableName), locking.getNamespaceLock(tableName.getNamespaceAsString()));<a name="line.473"></a>
-<span class="sourceLineNo">474</span>    tableMap = AvlTree.insert(tableMap, node);<a name="line.474"></a>
-<span class="sourceLineNo">475</span>    return node;<a name="line.475"></a>
-<span class="sourceLineNo">476</span>  }<a name="line.476"></a>
-<span class="sourceLineNo">477</span><a name="line.477"></a>
-<span class="sourceLineNo">478</span>  private void removeTableQueue(TableName tableName) {<a name="line.478"></a>
-<span class="sourceLineNo">479</span>    tableMap = AvlTree.remove(tableMap, tableName, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.479"></a>
-<span class="sourceLineNo">480</span>    locking.removeTableLock(tableName);<a name="line.480"></a>
-<span class="sourceLineNo">481</span>  }<a name="line.481"></a>
-<span class="sourceLineNo">482</span><a name="line.482"></a>
-<span class="sourceLineNo">483</span><a name="line.483"></a>
-<span class="sourceLineNo">484</span>  private static boolean isTableProcedure(Procedure proc) {<a name="line.484"></a>
-<span class="sourceLineNo">485</span>    return proc instanceof TableProcedureInterface;<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>  private static TableName getTableName(Procedure proc) {<a name="line.488"></a>
-<span class="sourceLineNo">489</span>    return ((TableProcedureInterface)proc).getTableName();<a name="line.489"></a>
-<span class="sourceLineNo">490</span>  }<a name="line.490"></a>
-<span class="sourceLineNo">491</span><a name="line.491"></a>
-<span class="sourceLineNo">492</span>  // ============================================================================<a name="line.492"></a>
-<span class="sourceLineNo">493</span>  //  Server Queue Lookup Helpers<a name="line.493"></a>
-<span class="sourceLineNo">494</span>  // ============================================================================<a name="line.494"></a>
-<span class="sourceLineNo">495</span>  private ServerQueue getServerQueue(ServerName serverName) {<a name="line.495"></a>
-<span class="sourceLineNo">496</span>    final int index = getBucketIndex(serverBuckets, serverName.hashCode());<a name="line.496"></a>
-<span class="sourceLineNo">497</span>    ServerQueue node = AvlTree.get(serverBuckets[index], serverName, SERVER_QUEUE_KEY_COMPARATOR);<a name="line.497"></a>
-<span class="sourceLineNo">498</span>    if (node != null) return node;<a name="line.498"></a>
-<span class="sourceLineNo">499</span><a name="line.499"></a>
-<span class="sourceLineNo">500</span>    node = new ServerQueue(serverName, locking.getServerLock(serverName));<a name="line.500"></a>
-<span class="sourceLineNo">501</span>    serverBuckets[index] = AvlTree.insert(serverBuckets[index], node);<a name="line.501"></a>
-<span class="sourceLineNo">502</span>    return node;<a name="line.502"></a>
-<span class="sourceLineNo">503</span>  }<a name="line.503"></a>
-<span class="sourceLineNo">504</span><a name="line.504"></a>
-<span class="sourceLineNo">505</span>  private static int getBucketIndex(Object[] buckets, int hashCode) {<a name="line.505"></a>
-<span class="sourceLineNo">506</span>    return Math.abs(hashCode) % buckets.length;<a name="line.506"></a>
-<span class="sourceLineNo">507</span>  }<a name="line.507"></a>
-<span class="sourceLineNo">508</span><a name="line.508"></a>
-<span class="sourceLineNo">509</span>  private static boolean isServerProcedure(Procedure proc) {<a name="line.509"></a>
-<span class="sourceLineNo">510</span>    return proc instanceof ServerProcedureInterface;<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>  private static ServerName getServerName(Procedure proc) {<a name="line.513"></a>
-<span class="sourceLineNo">514</span>    return ((ServerProcedureInterface)proc).getServerName();<a name="line.514"></a>
-<span class="sourceLineNo">515</span>  }<a name="line.515"></a>
-<span class="sourceLineNo">516</span><a name="line.516"></a>
-<span class="sourceLineNo">517</span>  // ============================================================================<a name="line.517"></a>
-<span class="sourceLineNo">518</span>  //  Table and Server Queue Implementation<a name="line.518"></a>
-<span class="sourceLineNo">519</span>  // ============================================================================<a name="line.519"></a>
-<span class="sourceLineNo">520</span>  private static class ServerQueueKeyComparator implements AvlKeyComparator&lt;ServerQueue&gt; {<a name="line.520"></a>
-<span class="sourceLineNo">521</span>    @Override<a name="line.521"></a>
-<span class="sourceLineNo">522</span>    public int compareKey(ServerQueue node, Object key) {<a name="line.522"></a>
-<span class="sourceLineNo">523</span>      return node.compareKey((ServerName)key);<a name="line.523"></a>
-<span class="sourceLineNo">524</span>    }<a name="line.524"></a>
-<span class="sourceLineNo">525</span>  }<a name="line.525"></a>
-<span class="sourceLineNo">526</span><a name="line.526"></a>
-<span class="sourceLineNo">527</span>  public static class ServerQueue extends Queue&lt;ServerName&gt; {<a name="line.527"></a>
-<span class="sourceLineNo">528</span>    public ServerQueue(ServerName serverName, LockStatus serverLock) {<a name="line.528"></a>
-<span class="sourceLineNo">529</span>      super(serverName, serverLock);<a name="line.529"></a>
-<span class="sourceLineNo">530</span>    }<a name="line.530"></a>
-<span class="sourceLineNo">531</span><a name="line.531"></a>
-<span class="sourceLineNo">532</span>    @Override<a name="line.532"></a>
-<span class="sourceLineNo">533</span>    public boolean requireExclusiveLock(Procedure proc) {<a name="line.533"></a>
-<span class="sourceLineNo">534</span>      ServerProcedureInterface spi = (ServerProcedureInterface)proc;<a name="line.534"></a>
-<span class="sourceLineNo">535</span>      switch (spi.getServerOperationType()) {<a name="line.535"></a>
-<span class="sourceLineNo">536</span>        case CRASH_HANDLER:<a name="line.536"></a>
-<span class="sourceLineNo">537</span>          return true;<a name="line.537"></a>
-<span class="sourceLineNo">538</span>        default:<a name="line.538"></a>
-<span class="sourceLineNo">539</span>          break;<a name="line.539"></a>
-<span class="sourceLineNo">540</span>      }<a name="line.540"></a>
-<span class="sourceLineNo">541</span>      throw new UnsupportedOperationException("unexpected type " + spi.getServerOperationType());<a name="line.541"></a>
-<span class="sourceLineNo">542</span>    }<a name="line.542"></a>
-<span class="sourceLineNo">543</span>  }<a name="line.543"></a>
-<span class="sourceLineNo">544</span><a name="line.544"></a>
-<span class="sourceLineNo">545</span>  private static class TableQueueKeyComparator implements AvlKeyComparator&lt;TableQueue&gt; {<a name="line.545"></a>
-<span class="sourceLineNo">546</span>    @Override<a name="line.546"></a>
-<span class="sourceLineNo">547</span>    public int compareKey(TableQueue node, Object key) {<a name="line.547"></a>
-<span class="sourceLineNo">548</span>      return node.compareKey((TableName)key);<a name="line.548"></a>
-<span class="sourceLineNo">549</span>    }<a name="line.549"></a>
-<span class="sourceLineNo">550</span>  }<a name="line.550"></a>
-<span class="sourceLineNo">551</span><a name="line.551"></a>
-<span class="sourceLineNo">552</span>  public static class TableQueue extends Queue&lt;TableName&gt; {<a name="line.552"></a>
-<span class="sourceLineNo">553</span>    private final LockStatus namespaceLockStatus;<a name="line.553"></a>
+<span class="sourceLineNo">394</span>    assert size() == 0 : "expected queue size to be 0, got " + size();<a name="line.394"></a>
+<span class="sourceLineNo">395</span>  }<a name="line.395"></a>
+<span class="sourceLineNo">396</span><a name="line.396"></a>
+<span class="sourceLineNo">397</span>  private &lt;T extends Comparable&lt;T&gt;, TNode extends Queue&lt;T&gt;&gt; void clear(TNode treeMap,<a name="line.397"></a>
+<span class="sourceLineNo">398</span>      final FairQueue&lt;T&gt; fairq, final AvlKeyComparator&lt;TNode&gt; comparator) {<a name="line.398"></a>
+<span class="sourceLineNo">399</span>    while (treeMap != null) {<a name="line.399"></a>
+<span class="sourceLineNo">400</span>      Queue&lt;T&gt; node = AvlTree.getFirst(treeMap);<a name="line.400"></a>
+<span class="sourceLineNo">401</span>      treeMap = AvlTree.remove(treeMap, node.getKey(), comparator);<a name="line.401"></a>
+<span class="sourceLineNo">402</span>      if (fairq != null) removeFromRunQueue(fairq, 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><a name="line.405"></a>
+<span class="sourceLineNo">406</span>  @Override<a name="line.406"></a>
+<span class="sourceLineNo">407</span>  protected int queueSize() {<a name="line.407"></a>
+<span class="sourceLineNo">408</span>    int count = 0;<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span>    // Server queues<a name="line.410"></a>
+<span class="sourceLineNo">411</span>    final AvlTreeIterator&lt;ServerQueue&gt; serverIter = new AvlTreeIterator&lt;&gt;();<a name="line.411"></a>
+<span class="sourceLineNo">412</span>    for (int i = 0; i &lt; serverBuckets.length; ++i) {<a name="line.412"></a>
+<span class="sourceLineNo">413</span>      serverIter.seekFirst(serverBuckets[i]);<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      while (serverIter.hasNext()) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span>        count += serverIter.next().size();<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><a name="line.418"></a>
+<span class="sourceLineNo">419</span>    // Table queues<a name="line.419"></a>
+<span class="sourceLineNo">420</span>    final AvlTreeIterator&lt;TableQueue&gt; tableIter = new AvlTreeIterator&lt;&gt;(tableMap);<a name="line.420"></a>
+<span class="sourceLineNo">421</span>    while (tableIter.hasNext()) {<a name="line.421"></a>
+<span class="sourceLineNo">422</span>      count += tableIter.next().size();<a name="line.422"></a>
+<span class="sourceLineNo">423</span>    }<a name="line.423"></a>
+<span class="sourceLineNo">424</span>    return count;<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>  @Override<a name="line.427"></a>
+<span class="sourceLineNo">428</span>  public void completionCleanup(final Procedure proc) {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>    if (proc instanceof TableProcedureInterface) {<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      TableProcedureInterface iProcTable = (TableProcedureInterface)proc;<a name="line.430"></a>
+<span class="sourceLineNo">431</span>      boolean tableDeleted;<a name="line.431"></a>
+<span class="sourceLineNo">432</span>      if (proc.hasException()) {<a name="line.432"></a>
+<span class="sourceLineNo">433</span>        Exception procEx = proc.getException().unwrapRemoteException();<a name="line.433"></a>
+<span class="sourceLineNo">434</span>        if (iProcTable.getTableOperationType() == TableOperationType.CREATE) {<a name="line.434"></a>
+<span class="sourceLineNo">435</span>          // create failed because the table already exist<a name="line.435"></a>
+<span class="sourceLineNo">436</span>          tableDeleted = !(procEx instanceof TableExistsException);<a name="line.436"></a>
+<span class="sourceLineNo">437</span>        } else {<a name="line.437"></a>
+<span class="sourceLineNo">438</span>          // the operation failed because the table does not exist<a name="line.438"></a>
+<span class="sourceLineNo">439</span>          tableDeleted = (procEx instanceof TableNotFoundException);<a name="line.439"></a>
+<span class="sourceLineNo">440</span>        }<a name="line.440"></a>
+<span class="sourceLineNo">441</span>      } else {<a name="line.441"></a>
+<span class="sourceLineNo">442</span>        // the table was deleted<a name="line.442"></a>
+<span class="sourceLineNo">443</span>        tableDeleted = (iProcTable.getTableOperationType() == TableOperationType.DELETE);<a name="line.443"></a>
+<span class="sourceLineNo">444</span>      }<a name="line.444"></a>
+<span class="sourceLineNo">445</span>      if (tableDeleted) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span>        markTableAsDeleted(iProcTable.getTableName(), proc);<a name="line.446"></a>
+<span class="sourceLineNo">447</span>        return;<a name="line.447"></a>
+<span class="sourceLineNo">448</span>      }<a name="line.448"></a>
+<span class="sourceLineNo">449</span>    } else {<a name="line.449"></a>
+<span class="sourceLineNo">450</span>      // No cleanup for ServerProcedureInterface types, yet.<a name="line.450"></a>
+<span class="sourceLineNo">451</span>      return;<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    }<a name="line.452"></a>
+<span class="sourceLineNo">453</span>  }<a name="line.453"></a>
+<span class="sourceLineNo">454</span><a name="line.454"></a>
+<span class="sourceLineNo">455</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.455"></a>
+<span class="sourceLineNo">456</span>    if (!AvlIterableList.isLinked(queue) &amp;&amp; !queue.isEmpty()) {<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      fairq.add(queue);<a name="line.457"></a>
+<span class="sourceLineNo">458</span>    }<a name="line.458"></a>
+<span class="sourceLineNo">459</span>  }<a name="line.459"></a>
+<span class="sourceLineNo">460</span><a name="line.460"></a>
+<span class="sourceLineNo">461</span>  private static &lt;T extends Comparable&lt;T&gt;&gt; void removeFromRunQueue(<a name="line.461"></a>
+<span class="sourceLineNo">462</span>      FairQueue&lt;T&gt; fairq, Queue&lt;T&gt; queue) {<a name="line.462"></a>
+<span class="sourceLineNo">463</span>    if (AvlIterableList.isLinked(queue)) {<a name="line.463"></a>
+<span class="sourceLineNo">464</span>      fairq.remove(queue);<a name="line.464"></a>
+<span class="sourceLineNo">465</span>    }<a name="line.465"></a>
+<span class="sourceLineNo">466</span>  }<a name="line.466"></a>
+<span class="sourceLineNo">467</span><a name="line.467"></a>
+<span class="sourceLineNo">468</span>  // ============================================================================<a name="line.468"></a>
+<span class="sourceLineNo">469</span>  //  Table Queue Lookup Helpers<a name="line.469"></a>
+<span class="sourceLineNo">470</span>  // ============================================================================<a name="line.470"></a>
+<span class="sourceLineNo">471</span>  private TableQueue getTableQueue(TableName tableName) {<a name="line.471"></a>
+<span class="sourceLineNo">472</span>    TableQueue node = AvlTree.get(tableMap, tableName, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.472"></a>
+<span class="sourceLineNo">473</span>    if (node != null) return node;<a name="line.473"></a>
+<span class="sourceLineNo">474</span><a name="line.474"></a>
+<span class="sourceLineNo">475</span>    node = new TableQueue(tableName, tablePriorities.getPriority(tableName),<a name="line.475"></a>
+<span class="sourceLineNo">476</span>        locking.getTableLock(tableName), locking.getNamespaceLock(tableName.getNamespaceAsString()));<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    tableMap = AvlTree.insert(tableMap, node);<a name="line.477"></a>
+<span class="sourceLineNo">478</span>    return node;<a name="line.478"></a>
+<span class="sourceLineNo">479</span>  }<a name="line.479"></a>
+<span class="sourceLineNo">480</span><a name="line.480"></a>
+<span class="sourceLineNo">481</span>  private void removeTableQueue(TableName tableName) {<a name="line.481"></a>
+<span class="sourceLineNo">482</span>    tableMap = AvlTree.remove(tableMap, tableName, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.482"></a>
+<span class="sourceLineNo">483</span>    locking.removeTableLock(tableName);<a name="line.483"></a>
+<span class="sourceLineNo">484</span>  }<a name="line.484"></a>
+<span class="sourceLineNo">485</span><a name="line.485"></a>
+<span class="sourceLineNo">486</span><a name="line.486"></a>
+<span class="sourceLineNo">487</span>  private static boolean isTableProcedure(Procedure proc) {<a name="line.487"></a>
+<span class="sourceLineNo">488</span>    return proc instanceof TableProcedureInterface;<a name="line.488"></a>
+<span class="sourceLineNo">489</span>  }<a name="line.489"></a>
+<span class="sourceLineNo">490</span><a name="line.490"></a>
+<span class="sourceLineNo">491</span>  private static TableName getTableName(Procedure proc) {<a name="line.491"></a>
+<span class="sourceLineNo">492</span>    return ((TableProcedureInterface)proc).getTableName();<a name="line.492"></a>
+<span class="sourceLineNo">493</span>  }<a name="line.493"></a>
+<span class="sourceLineNo">494</span><a name="line.494"></a>
+<span class="sourceLineNo">495</span>  // ============================================================================<a name="line.495"></a>
+<span class="sourceLineNo">496</span>  //  Server Queue Lookup Helpers<a name="line.496"></a>
+<span class="sourceLineNo">497</span>  // ============================================================================<a name="line.497"></a>
+<span class="sourceLineNo">498</span>  private ServerQueue getServerQueue(ServerName serverName) {<a name="line.498"></a>
+<span class="sourceLineNo">499</span>    final int index = getBucketIndex(serverBuckets, serverName.hashCode());<a name="line.499"></a>
+<span class="sourceLineNo">500</span>    ServerQueue node = AvlTree.get(serverBuckets[index], serverName, SERVER_QUEUE_KEY_COMPARATOR);<a name="line.500"></a>
+<span class="sourceLineNo">501</span>    if (node != null) return node;<a name="line.501"></a>
+<span class="sourceLineNo">502</span><a name="line.502"></a>
+<span class="sourceLineNo">503</span>    node = new ServerQueue(serverName, locking.getServerLock(serverName));<a name="line.503"></a>
+<span class="sourceLineNo">504</span>    serverBuckets[index] = AvlTree.insert(serverBuckets[index], node);<a name="line.504"></a>
+<span class="sourceLineNo">505</span>    return node;<a name="line.505"></a>
+<span class="sourceLineNo">506</span>  }<a name="line.506"></a>
+<span class="sourceLineNo">507</span><a name="line.507"></a>
+<span class="sourceLineNo">508</span>  private static int getBucketIndex(Object[] buckets, int hashCode) {<a name="line.508"></a>
+<span class="sourceLineNo">509</span>    return Math.abs(hashCode) % buckets.length;<a name="line.509"></a>
+<span class="sourceLineNo">510</span>  }<a name="line.510"></a>
+<span class="sourceLineNo">511</span><a name="line.511"></a>
+<span class="sourceLineNo">512</span>  private static boolean isServerProcedure(Procedure proc) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span>    return proc instanceof ServerProcedureInterface;<a name="line.513"></a>
+<span class="sourceLineNo">514</span>  }<a name="line.514"></a>
+<span class="sourceLineNo">515</span><a name="line.515"></a>
+<span class="sourceLineNo">516</span>  private static ServerName getServerName(Procedure proc) {<a name="line.516"></a>
+<span class="sourceLineNo">517</span>    return ((ServerProcedureInterface)proc).getServerName();<a name="line.517"></a>
+<span class="sourceLineNo">518</span>  }<a name="line.518"></a>
+<span class="sourceLineNo">519</span><a name="line.519"></a>
+<span class="sourceLineNo">520</span>  // ============================================================================<a name="line.520"></a>
+<span class="sourceLineNo">521</span>  //  Table and Server Queue Implementation<a name="line.521"></a>
+<span class="sourceLineNo">522</span>  // ============================================================================<a name="line.522"></a>
+<span class="sourceLineNo">523</span>  private static class ServerQueueKeyComparator implements AvlKeyComparator&lt;ServerQueue&gt; {<a name="line.523"></a>
+<span class="sourceLineNo">524</span>    @Override<a name="line.524"></a>
+<span class="sourceLineNo">525</span>    public int compareKey(ServerQueue node, Object key) {<a name="line.525"></a>
+<span class="sourceLineNo">526</span>      return node.compareKey((ServerName)key);<a name="line.526"></a>
+<span class="sourceLineNo">527</span>    }<a name="line.527"></a>
+<span class="sourceLineNo">528</span>  }<a name="line.528"></a>
+<span class="sourceLineNo">529</span><a name="line.529"></a>
+<span class="sourceLineNo">530</span>  public static class ServerQueue extends Queue&lt;ServerName&gt; {<a name="line.530"></a>
+<span class="sourceLineNo">531</span>    public ServerQueue(ServerName serverName, LockStatus serverLock) {<a name="line.531"></a>
+<span class="sourceLineNo">532</span>      super(serverName, serverLock);<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>    @Override<a name="line.535"></a>
+<span class="sourceLineNo">536</span>    public boolean requireExclusiveLock(Procedure proc) {<a name="line.536"></a>
+<span class="sourceLineNo">537</span>      ServerProcedureInterface spi = (ServerProcedureInterface)proc;<a name="line.537"></a>
+<span class="sourceLineNo">538</span>      switch (spi.getServerOperationType()) {<a name="line.538"></a>
+<span class="sourceLineNo">539</span>        case CRASH_HANDLER:<a name="line.539"></a>
+<span class="sourceLineNo">540</span>          return true;<a name="line.540"></a>
+<span class="sourceLineNo">541</span>        default:<a name="line.541"></a>
+<span class="sourceLineNo">542</span>          break;<a name="line.542"></a>
+<span class="sourceLineNo">543</span>      }<a name="line.543"></a>
+<span class="sourceLineNo">544</span>      throw new UnsupportedOperationException("unexpected type " + spi.getServerOperationType());<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>  private static class TableQueueKeyComparator implements AvlKeyComparator&lt;TableQueue&gt; {<a name="line.548"></a>
+<span class="sourceLineNo">549</span>    @Override<a name="line.549"></a>
+<span class="sourceLineNo">550</span>    public int compareKey(TableQueue node, Object key) {<a name="line.550"></a>
+<span class="sourceLineNo">551</span>      return node.compareKey((TableName)key);<a name="line.551"></a>
+<span class="sourceLineNo">552</span>    }<a name="line.552"></a>
+<span class="sourceLineNo">553</span>  }<a name="line.553"></a>
 <span class="sourceLineNo">554</span><a name="line.554"></a>
-<span class="sourceLineNo">555</span>    public TableQueue(TableName tableName, int priority, LockStatus tableLock,<a name="line.555"></a>
-<span class="sourceLineNo">556</span>        LockStatus namespaceLockStatus) {<a name="line.556"></a>
-<span class="sourceLineNo">557</span>      super(tableName, priority, tableLock);<a name="line.557"></a>
-<span class="sourceLineNo">558</span>      this.namespaceLockStatus = namespaceLockStatus;<a name="line.558"></a>
-<span class="sourceLineNo">559</span>    }<a name="line.559"></a>
-<span class="sourceLineNo">560</span><a name="line.560"></a>
-<span class="sourceLineNo">561</span>    @Override<a name="line.561"></a>
-<span class="sourceLineNo">562</span>    public boolean isAvailable() {<a name="line.562"></a>
-<span class="sourceLineNo">563</span>      // if there are no items in the queue, or the namespace is locked.<a name="line.563"></a>
-<span class="sourceLineNo">564</span>      // we can't execute operation on this table<a name="line.564"></a>
-<span class="sourceLineNo">565</span>      if (isEmpty() || namespaceLockStatus.hasExclusiveLock()) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span>        return false;<a name="line.566"></a>
-<span class="sourceLineNo">567</span>      }<a name="line.567"></a>
-<span class="sourceLineNo">568</span><a name="line.568"></a>
-<span class="sourceLineNo">569</span>      if (getLockStatus().hasExclusiveLock()) {<a name="line.569"></a>
-<span class="sourceLineNo">570</span>        // if we have an exclusive lock already taken<a name="line.570"></a>
-<span class="sourceLineNo">571</span>        // only child of the lock owner can be executed<a name="line.571"></a>
-<span class="sourceLineNo">572</span>        final Procedure nextProc = peek();<a name="line.572"></a>
-<span class="sourceLineNo">573</span>        return nextProc != null &amp;&amp; getLockStatus().hasLockAccess(nextProc);<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>      // no xlock<a name="line.576"></a>
-<span class="sourceLineNo">577</span>      return true;<a name="line.577"></a>
-<span class="sourceLineNo">578</span>    }<a name="line.578"></a>
-<span class="sourceLineNo">579</span><a name="line.579"></a>
-<span class="sourceLineNo">580</span>    @Override<a name="line.580"></a>
-<span class="sourceLineNo">581</span>    public boolean requireExclusiveLock(Procedure proc) {<a name="line.581"></a>
-<span class="sourceLineNo">582</span>      return requireTableExclusiveLock((TableProcedureInterface)proc);<a name="line.582"></a>
-<span class="sourceLineNo">583</span>    }<a name="line.583"></a>
-<span class="sourceLineNo">584</span>  }<a name="line.584"></a>
-<span class="sourceLineNo">585</span><a name="line.585"></a>
-<span class="sourceLineNo">586</span>  // ============================================================================<a name="line.586"></a>
-<span class="sourceLineNo">587</span>  //  Table Locking Helpers<a name="line.587"></a>
-<span class="sourceLineNo">588</span>  // ============================================================================<a name="line.588"></a>
-<span class="sourceLineNo">589</span>  private static boolean requireTableExclusiveLock(TableProcedureInterface proc) {<a name="line.589"></a>
-<span class="sourceLineNo">590</span>    switch (proc.getTableOperationType()) {<a name="line.590"></a>
-<span class="sourceLineNo">591</span>      case CREATE:<a name="line.591"></a>
-<span class="sourceLineNo">592</span>      case DELETE:<a name="line.592"></a>
-<span class="sourceLineNo">593</span>      case DISABLE:<a name="line.593"></a>
-<span class="sourceLineNo">594</span>      case ENABLE:<a name="line.594"></a>
-<span class="sourceLineNo">595</span>        return true;<a name="line.595"></a>
-<span class="sourceLineNo">596</span>      case EDIT:<a name="line.596"></a>
-<span class="sourceLineNo">597</span>        // we allow concurrent edit on the NS table<a name="line.597"></a>
-<span class="sourceLineNo">598</span>        return !proc.getTableName().equals(TableName.NAMESPACE_TABLE_NAME);<a name="line.598"></a>
-<span class="sourceLineNo">599</span>      case READ:<a name="line.599"></a>
-<span class="sourceLineNo">600</span>        return false;<a name="line.600"></a>
-<span class="sourceLineNo">601</span>      // region operations are using the shared-lock on the table<a name="line.601"></a>
-<span class="sourceLineNo">602</span>      // and then they will grab an xlock on the region.<a name="line.602"></a>
-<span class="sourceLineNo">603</span>      case REGION_SPLIT:<a name="line.603"></a>
-<span class="sourceLineNo">604</span>      case REGION_MERGE:<a name="line.604"></a>
-<span class="sourceLineNo">605</span>      case REGION_ASSIGN:<a name="line.605"></a>
-<span class="sourceLineNo">606</span>      case REGION_UNASSIGN:<a name="line.606"></a>
-<span class="sourceLineNo">607</span>      case REGION_EDIT:<a name="line.607"></a>
-<span class="sourceLineNo">608</span>      case REGION_GC:<a name="line.608"></a>
-<span class="sourceLineNo">609</span>      case MERGED_REGIONS_GC:<a name="line.609"></a>
-<span class="sourceLineNo">610</span>        return false;<a name="line.610"></a>
-<span class="sourceLineNo">611</span>      default:<a name="line.611"></a>
-<span class="sourceLineNo">612</span>        break;<a name="line.612"></a>
-<span class="sourceLineNo">613</span>    }<a name="line.613"></a>
-<span class="sourceLineNo">614</span>    throw new UnsupportedOperationException("unexpected type " +<a name="line.614"></a>
-<span class="sourceLineNo">615</span>        proc.getTableOperationType());<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>  /**<a name="line.618"></a>
-<span class="sourceLineNo">619</span>   * Get lock info for a resource of specified type and name and log details<a name="line.619"></a>
-<span class="sourceLineNo">620</span>   */<a name="line.620"></a>
-<span class="sourceLineNo">621</span>  protected void logLockInfoForResource(LockInfo.ResourceType resourceType, String resourceName) {<a name="line.621"></a>
-<span class="sourceLineNo">622</span>    if (!LOG.isDebugEnabled()) {<a name="line.622"></a>
-<span class="sourceLineNo">623</span>      return;<a name="line.623"></a>
-<span class="sourceLineNo">624</span>    }<a name="line.624"></a>
-<span class="sourceLineNo">625</span><a name="line.625"></a>
-<span class="sourceLineNo">626</span>    LockInfo lockInfo = getLockInfoForResource(resourceType, resourceName);<a name="line.626"></a>
-<span class="sourceLineNo">627</span>    if (lockInfo != null) {<a name="line.627"></a>
-<span class="sourceLineNo">628</span>      String msg = resourceType.toString() + " '" + resourceName + "', shared lock count=" +<a name="line.628"></a>
-<span class="sourceLineNo">629</span>          lockInfo.getSharedLockCount();<a name="line.629"></a>
-<span class="sourceLineNo">630</span><a name="line.630"></a>
-<span class="sourceLineNo">631</span>      ProcedureInfo proc = lockInfo.getExclusiveLockOwnerProcedure();<a name="line.631"></a>
-<span class="sourceLineNo">632</span>      if (proc != null) {<a name="line.632"></a>
-<span class="sourceLineNo">633</span>        msg += ", exclusively locked by procId=" + proc.getProcId();<a name="line.633"></a>
-<span class="sourceLineNo">634</span>      }<a name="line.634"></a>
-<span class="sourceLineNo">635</span>      LOG.debug(msg);<a name="line.635"></a>
-<span class="sourceLineNo">636</span>    }<a name="line.636"></a>
-<span class="sourceLineNo">637</span>  }<a name="line.637"></a>
-<span class="sourceLineNo">638</span><a name="line.638"></a>
-<span class="sourceLineNo">639</span>  /**<a name="line.639"></a>
-<span class="sourceLineNo">640</span>   * Suspend the procedure if the specified table is already locked.<a name="line.640"></a>
-<span class="sourceLineNo">641</span>   * Other operations in the table-queue will be executed after the lock is released.<a name="line.641"></a>
-<span class="sourceLineNo">642</span>   * @param procedure the procedure trying to acquire the lock<a name="line.642"></a>
-<span class="sourceLineNo">643</span>   * @param table Table to lock<a name="line.643"></a>
-<span class="sourceLineNo">644</span>   * @return true if the procedure has to wait for the table to be available<a name="line.644"></a>
-<span class="sourceLineNo">645</span>   */<a name="line.645"></a>
-<span class="sourceLineNo">646</span>  public boolean waitTableExclusiveLock(final Procedure procedure, final TableName table) {<a name="line.646"></a>
-<span class="sourceLineNo">647</span>    schedLock();<a name="line.647"></a>
-<span class="sourceLineNo">648</span>    try {<a name="line.648"></a>
-<span class="sourceLineNo">649</span>      final String namespace = table.getNamespaceAsString();<a name="line.649"></a>
-<span class="sourceLineNo">650</span>      final LockAndQueue namespaceLock = locking.getNamespaceLock(namespace);<a name="line.650"></a>
-<span class="sourceLineNo">651</span>      final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.651"></a>
-<span class="sourceLineNo">652</span>      if (!namespaceLock.trySharedLock()) {<a name="line.652"></a>
-<span class="sourceLineNo">653</span>        waitProcedure(namespaceLock, procedure);<a name="line.653"></a>
-<span class="sourceLineNo">654</span>        logLockInfoForResource(LockInfo.ResourceType.NAMESPACE, namespace);<a name="line.654"></a>
-<span class="sourceLineNo">655</span>        return true;<a name="line.655"></a>
-<span class="sourceLineNo">656</span>      }<a name="line.656"></a>
-<span class="sourceLineNo">657</span>      if (!tableLock.tryExclusiveLock(procedure)) {<a name="line.657"></a>
-<span class="sourceLineNo">658</span>        namespaceLock.releaseSharedLock();<a name="line.658"></a>
-<span class="sourceLineNo">659</span>        waitProcedure(tableLock, procedure);<a name="line.659"></a>
-<span class="sourceLineNo">660</span>        logLockInfoForResource(LockInfo.ResourceType.TABLE, table.getNameAsString());<a name="line.660"></a>
+<span class="sourceLineNo">555</span>  public static class TableQueue extends Queue&lt;TableName&gt; {<a name="line.555"></a>
+<span class="sourceLineNo">556</span>    private final LockStatus namespaceLockStatus;<a name="line.556"></a>
+<span class="sourceLineNo">557</span><a name="line.557"></a>
+<span class="sourceLineNo">558</span>    public TableQueue(TableName tableName, int priority, LockStatus tableLock,<a name="line.558"></a>
+<span class="sourceLineNo">559</span>        LockStatus namespaceLockStatus) {<a name="line.559"></a>
+<span class="sourceLineNo">560</span>      super(tableName, priority, tableLock);<a name="line.560"></a>
+<span class="sourceLineNo">561</span>      this.namespaceLockStatus = namespaceLockStatus;<a name="line.561"></a>
+<span class="sourceLineNo">562</span>    }<a name="line.562"></a>
+<span class="sourceLineNo">563</span><a name="line.563"></a>
+<span class="sourceLineNo">564</span>    @Override<a name="line.564"></a>
+<span class="sourceLineNo">565</span>    public boolean isAvailable() {<a name="line.565"></a>
+<span class="sourceLineNo">566</span>      // if there are no items in the queue, or the namespace is locked.<a name="line.566"></a>
+<span class="sourceLineNo">567</span>      // we can't execute operation on this table<a name="line.567"></a>
+<span class="sourceLineNo">568</span>      if (isEmpty() || namespaceLockStatus.hasExclusiveLock()) {<a name="line.568"></a>
+<span class="sourceLineNo">569</span>        return false;<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>      if (getLockStatus().hasExclusiveLock()) {<a name="line.572"></a>
+<span class="sourceLineNo">573</span>        // if we have an exclusive lock already taken<a name="line.573"></a>
+<span class="sourceLineNo">574</span>        // only child of the lock owner can be executed<a name="line.574"></a>
+<span class="sourceLineNo">575</span>        final Procedure nextProc = peek();<a name="line.575"></a>
+<span class="sourceLineNo">576</span>        return nextProc != null &amp;&amp; getLockStatus().hasLockAccess(nextProc);<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>      // no xlock<a name="line.579"></a>
+<span class="sourceLineNo">580</span>      return true;<a name="line.580"></a>
+<span class="sourceLineNo">581</span>    }<a name="line.581"></a>
+<span class="sourceLineNo">582</span><a name="line.582"></a>
+<span class="sourceLineNo">583</span>    @Override<a name="line.583"></a>
+<span class="sourceLineNo">584</span>    public boolean requireExclusiveLock(Procedure proc) {<a name="line.584"></a>
+<span class="sourceLineNo">585</span>      return requireTableExclusiveLock((TableProcedureInterface)proc);<a name="line.585"></a>
+<span class="sourceLineNo">586</span>    }<a name="line.586"></a>
+<span class="sourceLineNo">587</span>  }<a name="line.587"></a>
+<span class="sourceLineNo">588</span><a name="line.588"></a>
+<span class="sourceLineNo">589</span>  // ============================================================================<a name="line.589"></a>
+<span class="sourceLineNo">590</span>  //  Table Locking Helpers<a name="line.590"></a>
+<span class="sourceLineNo">591</span>  // ============================================================================<a name="line.591"></a>
+<span class="sourceLineNo">592</span>  /**<a name="line.592"></a>
+<span class="sourceLineNo">593</span>   * @param proc must not be null<a name="line.593"></a>
+<span class="sourceLineNo">594</span>   */<a name="line.594"></a>
+<span class="sourceLineNo">595</span>  private static boolean requireTableExclusiveLock(TableProcedureInterface proc) {<a name="line.595"></a>
+<span class="sourceLineNo">596</span>    switch (proc.getTableOperationType()) {<a name="line.596"></a>
+<span class="sourceLineNo">597</span>      case CREATE:<a name="line.597"></a>
+<span class="sourceLineNo">598</span>      case DELETE:<a name="line.598"></a>
+<span class="sourceLineNo">599</span>      case DISABLE:<a name="line.599"></a>
+<span class="sourceLineNo">600</span>      case ENABLE:<a name="line.600"></a>
+<span class="sourceLineNo">601</span>        return true;<a name="line.601"></a>
+<span class="sourceLineNo">602</span>      case EDIT:<a name="line.602"></a>
+<span class="sourceLineNo">603</span>        // we allow concurrent edit on the NS table<a name="line.603"></a>
+<span class="sourceLineNo">604</span>        return !proc.getTableName().equals(TableName.NAMESPACE_TABLE_NAME);<a name="line.604"></a>
+<span class="sourceLineNo">605</span>      case READ:<a name="line.605"></a>
+<span class="sourceLineNo">606</span>        return false;<a name="line.606"></a>
+<span class="sourceLineNo">607</span>      // region operations are using the shared-lock on the table<a name="line.607"></a>
+<span class="sourceLineNo">608</span>      // and then they will grab an xlock on the region.<a name="line.608"></a>
+<span class="sourceLineNo">609</span>      case REGION_SPLIT:<a name="line.609"></a>
+<span class="sourceLineNo">610</span>      case REGION_MERGE:<a name="line.610"></a>
+<span class="sourceLineNo">611</span>      case REGION_ASSIGN:<a name="line.611"></a>
+<span class="sourceLineNo">612</span>      case REGION_UNASSIGN:<a name="line.612"></a>
+<span class="sourceLineNo">613</span>      case REGION_EDIT:<a name="line.613"></a>
+<span class="sourceLineNo">614</span>      case REGION_GC:<a name="line.614"></a>
+<span class="sourceLineNo">615</span>      case MERGED_REGIONS_GC:<a name="line.615"></a>
+<span class="sourceLineNo">616</span>        return false;<a name="line.616"></a>
+<span class="sourceLineNo">617</span>      default:<a name="line.617"></a>
+<span class="sourceLineNo">618</span>        break;<a name="line.618"></a>
+<span class="sourceLineNo">619</span>    }<a name="line.619"></a>
+<span class="sourceLineNo">620</span>    throw new UnsupportedOperationException("unexpected type " +<a name="line.620"></a>
+<span class="sourceLineNo">621</span>        proc.getTableOperationType());<a name="line.621"></a>
+<span class="sourceLineNo">622</span>  }<a name="line.622"></a>
+<span class="sourceLineNo">623</span><a name="line.623"></a>
+<span class="sourceLineNo">624</span>  /**<a name="line.624"></a>
+<span class="sourceLineNo">625</span>   * Get lock info for a resource of specified type and name and log details<a name="line.625"></a>
+<span class="sourceLineNo">626</span>   */<a name="line.626"></a>
+<span class="sourceLineNo">627</span>  protected void logLockInfoForResource(LockInfo.ResourceType resourceType, String resourceName) {<a name="line.627"></a>
+<span class="sourceLineNo">628</span>    if (!LOG.isDebugEnabled()) {<a name="line.628"></a>
+<span class="sourceLineNo">629</span>      return;<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>    LockInfo lockInfo = getLockInfoForResource(resourceType, resourceName);<a name="line.632"></a>
+<span class="sourceLineNo">633</span>    if (lockInfo != null) {<a name="line.633"></a>
+<span class="sourceLineNo">634</span>      String msg = resourceType.toString() + " '" + resourceName + "', shared lock count=" +<a name="line.634"></a>
+<span class="sourceLineNo">635</span>          lockInfo.getSharedLockCount();<a name="line.635"></a>
+<span class="sourceLineNo">636</span><a name="line.636"></a>
+<span class="sourceLineNo">637</span>      ProcedureInfo proc = lockInfo.getExclusiveLockOwnerProcedure();<a name="line.637"></a>
+<span class="sourceLineNo">638</span>      if (proc != null) {<a name="line.638"></a>
+<span class="sourceLineNo">639</span>        msg += ", exclusively locked by procId=" + proc.getProcId();<a name="line.639"></a>
+<span class="sourceLineNo">640</span>      }<a name="line.640"></a>
+<span class="sourceLineNo">641</span>      LOG.debug(msg);<a name="line.641"></a>
+<span class="sourceLineNo">642</span>    }<a name="line.642"></a>
+<span class="sourceLineNo">643</span>  }<a name="line.643"></a>
+<span class="sourceLineNo">644</span><a name="line.644"></a>
+<span class="sourceLineNo">645</span>  /**<a name="line.645"></a>
+<span class="sourceLineNo">646</span>   * Suspend the procedure if the specified table is already locked.<a name="line.646"></a>
+<span class="sourceLineNo">647</span>   * Other operations in the table-queue will be executed after the lock is released.<a name="line.647"></a>
+<span class="sourceLineNo">648</span>   * @param procedure the procedure trying to acquire the lock<a name="line.648"></a>
+<span class="sourceLineNo">649</span>   * @param table Table to lock<a name="line.649"></a>
+<span class="sourceLineNo">650</span>   * @return true if the procedure has to wait for the table to be available<a name="line.650"></a>
+<span class="sourceLineNo">651</span>   */<a name="line.651"></a>
+<span class="sourceLineNo">652</span>  public boolean waitTableExclusiveLock(final Procedure procedure, final TableName table) {<a name="line.652"></a>
+<span class="sourceLineNo">653</span>    schedLock();<a name="line.653"></a>
+<span class="sourceLineNo">654</span>    try {<a name="line.654"></a>
+<span class="sourceLineNo">655</span>      final String namespace = table.getNamespaceAsString();<a name="line.655"></a>
+<span class="sourceLineNo">656</span>      final LockAndQueue namespaceLock = locking.getNamespaceLock(namespace);<a name="line.656"></a>
+<span class="sourceLineNo">657</span>      final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.657"></a>
+<span class="sourceLineNo">658</span>      if (!namespaceLock.trySharedLock()) {<a name="line.658"></a>
+<span class="sourceLineNo">659</span>        waitProcedure(namespaceLock, procedure);<a name="line.659"></a>
+<span class="sourceLineNo">660</span>        logLockInfoForResource(LockInfo.ResourceType.NAMESPACE, namespace);<a name="line.660"></a>
 <span class="sourceLineNo">661</span>        return true;<a name="line.661"></a>
 <span class="sourceLineNo">662</span>      }<a name="line.662"></a>
-<span class="sourceLineNo">663</span>      removeFromRunQueue(tableRunQueue, getTableQueue(table));<a name="line.663"></a>
-<span class="sourceLineNo">664</span>      return false;<a name="line.664"></a>
-<span class="sourceLineNo">665</span>    } finally {<a name="line.665"></a>
-<span class="sourceLineNo">666</span>      schedUnlock();<a name="line.666"></a>
-<span class="sourceLineNo">667</span>    }<a name="line.667"></a>
-<span class="sourceLineNo">668</span>  }<a name="line.668"></a>
-<span class="sourceLineNo">669</span><a name="line.669"></a>
-<span class="sourceLineNo">670</span>  /**<a name="line.670"></a>
-<span class="sourceLineNo">671</span>   * Wake the procedures waiting for the specified table<a name="line.671"></a>
-<span class="sourceLineNo">672</span>   * @param procedure the procedure releasing the lock<a name="line.672"></a>
-<span class="sourceLineNo">673</span>   * @param table the name of the table that has the exclusive lock<a name="line.673"></a>
-<span class="sourceLineNo">674</span>   */<a name="line.674"></a>
-<span class="sourceLineNo">675</span>  public void wakeTableExclusiveLock(final Procedure procedure, final TableName table) {<a name="line.675"></a>
-<span class="sourceLineNo">676</span>    schedLock();<a name="line.676"></a>
-<span class="sourceLineNo">677</span>    try {<a name="line.677"></a>
-<span class="sourceLineNo">678</span>      final LockAndQueue namespaceLock = locking.getNamespaceLock(table.getNamespaceAsString());<a name="line.678"></a>
-<span class="sourceLineNo">679</span>      final LockAndQueue tableLock = locking.getTableLock(table);<a name="line.679"></a>
-<span class="sourceLineNo">680</span>      int waitingCount = 0;<a name="line.680"></a>
-<span class="sourceLineNo">681</span><a name="line.681"></a>
-<span class="sourceLineNo">682</span>      if (!tableLock.hasParentLock(procedure)) {<a name="line.682"></a>
-<span class="sourceLineNo">683</span>        tableLock.releaseExclusiveLock(procedure);<a name="line.683"></a>
-<span class="sourceLineNo">684</span>        waitingCount += wakeWaitingProcedures(tableLock);<a name="line.684"></a>
-<span class="sourceLineNo">685</span>      }<a name="line.685"></a>
-<span class="sourceLineNo">686</span>      if (namespaceLock.releaseSharedLock()) {<a name="line.686"></a>
-<span class="sourceLineNo">687</span>        waitingCount += wakeWaitingProcedures(namespaceLock);<a name="line.687"></a>
-<span class="sourceLineNo">688</span>      }<a name="line.688"></a>
-<span class="sourceLineNo">689</span>      addToRunQueue(tableRunQueue, getTableQueue(table));<a name="line.689"></a>
-<span class="sourceLineNo">690</span>      wakePollIfNeeded(waitingCount);<a name="line.690"></a>
-<span class="sourceLineNo">691</span>    } finally {<a name="line.691"></a>
-<span class="sourceLineNo">692</span>      schedUnlock();<a name="line.692"></a>
-<span class="sourceLineNo">693</span>    }<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>  /**<a name="line.696"></a>
-<span class="sourceLineNo">697</span>   * Suspend the procedure if the specified table is already locked.<a name="line.697"></a>
-<span class="sourceLineNo">698</span>   * other "read" operations in the table-queue may be executed concurrently,<a name="line.698"></a>
-<span class="sourceLineNo">699</span>   * @param procedure the procedure trying to acquire the lock<a name="line.699"></a>
-<span class="sourceLineNo">700</span>   * @param table Table to lock<a name="line.700"></a>
-<span class="sourceLineNo">701</span>   * @return true if the procedure has to wait for the table to be available<a name="line.701"></a>
-<span class="sourceLineNo">702</span>   */<a name="line.702"></a>
-<span class="sourceLineNo">703</span>  public boolean waitTableSharedLock(final Procedure procedure, final TableName table) {<a name="line.703"></a>
-<span class="sourceLineNo">704</span>    return waitTableQueueSharedLock(procedure, table) == null;<a name="line.704"></a>
-<span class="sourceLineNo">705</span>  }<a name="line.705"></a>
-<span class="sourceLineNo">706</span><a name="line.706"></a>
-<span class="sourceLineNo">707</span>  private TableQueue waitTableQueueSharedLock(final Procedure procedure, final TableName table) {<a name="line.707"></a>
-<span class="sourceLineNo">708</span>    schedLock();<a name="line.708"></a>
-<span class="sou

<TRUNCATED>

Mime
View raw message