You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/11/10 14:51:15 UTC
[19/29] hbase-site git commit: Published site at
5e84997f2ffdbcf5f849d70c30ddbe2db4039ca4.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/27f5bfb5/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 d861bcd..437a019 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
@@ -29,982 +29,1010 @@
<span class="sourceLineNo">021</span>import java.util.Arrays;<a name="line.21"></a>
<span class="sourceLineNo">022</span>import java.util.List;<a name="line.22"></a>
<span class="sourceLineNo">023</span>import java.util.function.Function;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.hadoop.hbase.ServerName;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.TableExistsException;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.TableName;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.master.procedure.TableProcedureInterface.TableOperationType;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.procedure2.AbstractProcedureScheduler;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.procedure2.LockAndQueue;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.procedure2.LockStatus;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.procedure2.LockedResource;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.procedure2.LockedResourceType;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.util.AvlUtil.AvlIterableList;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.util.AvlUtil.AvlKeyComparator;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.util.AvlUtil.AvlTree;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.util.AvlUtil.AvlTreeIterator;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.slf4j.Logger;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.slf4j.LoggerFactory;<a name="line.42"></a>
-<span class="sourceLineNo">043</span><a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.44"></a>
-<span class="sourceLineNo">045</span><a name="line.45"></a>
-<span class="sourceLineNo">046</span>/**<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * ProcedureScheduler for the Master Procedures.<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * This ProcedureScheduler tries to provide to the ProcedureExecutor procedures<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * that can be executed without having to wait on a lock.<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * Most of the master operations can be executed concurrently, if they<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * are operating on different tables (e.g. two create table procedures can be performed<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * at the same time) or against two different servers; say two servers that crashed at<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * about the same time.<a name="line.53"></a>
-<span class="sourceLineNo">054</span> *<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * <p>Each procedure should implement an Interface providing information for this queue.<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * For example table related procedures should implement TableProcedureInterface.<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * Each procedure will be pushed in its own queue, and based on the operation type<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * we may make smarter decisions: e.g. we can abort all the operations preceding<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * a delete table, or similar.<a name="line.59"></a>
-<span class="sourceLineNo">060</span> *<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * <h4>Concurrency control</h4><a name="line.61"></a>
-<span class="sourceLineNo">062</span> * Concurrent access to member variables (tableRunQueue, serverRunQueue, locking, tableMap,<a name="line.62"></a>
-<span class="sourceLineNo">063</span> * serverBuckets) is controlled by schedLock(). This mainly includes:<br><a name="line.63"></a>
-<span class="sourceLineNo">064</span> * <ul><a name="line.64"></a>
-<span class="sourceLineNo">065</span> * <li><a name="line.65"></a>
-<span class="sourceLineNo">066</span> * {@link #push(Procedure, boolean, boolean)}: A push will add a Queue back to run-queue<a name="line.66"></a>
-<span class="sourceLineNo">067</span> * when:<a name="line.67"></a>
-<span class="sourceLineNo">068</span> * <ol><a name="line.68"></a>
-<span class="sourceLineNo">069</span> * <li>Queue was empty before push (so must have been out of run-queue)</li><a name="line.69"></a>
-<span class="sourceLineNo">070</span> * <li>Child procedure is added (which means parent procedure holds exclusive lock, and it<a name="line.70"></a>
-<span class="sourceLineNo">071</span> * must have moved Queue out of run-queue)</li><a name="line.71"></a>
-<span class="sourceLineNo">072</span> * </ol><a name="line.72"></a>
-<span class="sourceLineNo">073</span> * </li><a name="line.73"></a>
-<span class="sourceLineNo">074</span> * <li><a name="line.74"></a>
-<span class="sourceLineNo">075</span> * {@link #poll(long)}: A poll will remove a Queue from run-queue when:<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * <ol><a name="line.76"></a>
-<span class="sourceLineNo">077</span> * <li>Queue becomes empty after poll</li><a name="line.77"></a>
-<span class="sourceLineNo">078</span> * <li>Exclusive lock is requested by polled procedure and lock is available (returns the<a name="line.78"></a>
-<span class="sourceLineNo">079</span> * procedure)</li><a name="line.79"></a>
-<span class="sourceLineNo">080</span> * <li>Exclusive lock is requested but lock is not available (returns null)</li><a name="line.80"></a>
-<span class="sourceLineNo">081</span> * <li>Polled procedure is child of parent holding exclusive lock and the next procedure is<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * not a child</li><a name="line.82"></a>
-<span class="sourceLineNo">083</span> * </ol><a name="line.83"></a>
-<span class="sourceLineNo">084</span> * </li><a name="line.84"></a>
-<span class="sourceLineNo">085</span> * <li><a name="line.85"></a>
-<span class="sourceLineNo">086</span> * Namespace/table/region locks: Queue is added back to run-queue when lock being released is:<a name="line.86"></a>
-<span class="sourceLineNo">087</span> * <ol><a name="line.87"></a>
-<span class="sourceLineNo">088</span> * <li>Exclusive lock</li><a name="line.88"></a>
-<span class="sourceLineNo">089</span> * <li>Last shared lock (in case queue was removed because next procedure in queue required<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * exclusive lock)</li><a name="line.90"></a>
-<span class="sourceLineNo">091</span> * </ol><a name="line.91"></a>
-<span class="sourceLineNo">092</span> * </li><a name="line.92"></a>
-<span class="sourceLineNo">093</span> * </ul><a name="line.93"></a>
-<span class="sourceLineNo">094</span> */<a name="line.94"></a>
-<span class="sourceLineNo">095</span>@InterfaceAudience.Private<a name="line.95"></a>
-<span class="sourceLineNo">096</span>public class MasterProcedureScheduler extends AbstractProcedureScheduler {<a name="line.96"></a>
-<span class="sourceLineNo">097</span> private static final Logger LOG = LoggerFactory.getLogger(MasterProcedureScheduler.class);<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span> private static final AvlKeyComparator<ServerQueue> SERVER_QUEUE_KEY_COMPARATOR =<a name="line.99"></a>
-<span class="sourceLineNo">100</span> (n, k) -> n.compareKey((ServerName) k);<a name="line.100"></a>
-<span class="sourceLineNo">101</span> private final static AvlKeyComparator<TableQueue> TABLE_QUEUE_KEY_COMPARATOR =<a name="line.101"></a>
-<span class="sourceLineNo">102</span> (n, k) -> n.compareKey((TableName) k);<a name="line.102"></a>
-<span class="sourceLineNo">103</span> private final static AvlKeyComparator<PeerQueue> PEER_QUEUE_KEY_COMPARATOR =<a name="line.103"></a>
-<span class="sourceLineNo">104</span> (n, k) -> n.compareKey((String) k);<a name="line.104"></a>
-<span class="sourceLineNo">105</span> private final static AvlKeyComparator<MetaQueue> META_QUEUE_KEY_COMPARATOR =<a name="line.105"></a>
-<span class="sourceLineNo">106</span> (n, k) -> n.compareKey((TableName) k);<a name="line.106"></a>
-<span class="sourceLineNo">107</span><a name="line.107"></a>
-<span class="sourceLineNo">108</span> private final FairQueue<ServerName> serverRunQueue = new FairQueue<>();<a name="line.108"></a>
-<span class="sourceLineNo">109</span> private final FairQueue<TableName> tableRunQueue = new FairQueue<>();<a name="line.109"></a>
-<span class="sourceLineNo">110</span> private final FairQueue<String> peerRunQueue = new FairQueue<>();<a name="line.110"></a>
-<span class="sourceLineNo">111</span> private final FairQueue<TableName> metaRunQueue = new FairQueue<>();<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span> private final ServerQueue[] serverBuckets = new ServerQueue[128];<a name="line.113"></a>
-<span class="sourceLineNo">114</span> private TableQueue tableMap = null;<a name="line.114"></a>
-<span class="sourceLineNo">115</span> private PeerQueue peerMap = null;<a name="line.115"></a>
-<span class="sourceLineNo">116</span> private MetaQueue metaMap = null;<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> private final SchemaLocking locking;<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span> public MasterProcedureScheduler(Function<Long, Procedure<?>> procedureRetriever) {<a name="line.120"></a>
-<span class="sourceLineNo">121</span> locking = new SchemaLocking(procedureRetriever);<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> public void yield(final Procedure proc) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> push(proc, false, true);<a name="line.126"></a>
-<span class="sourceLineNo">127</span> }<a name="line.127"></a>
-<span class="sourceLineNo">128</span><a name="line.128"></a>
-<span class="sourceLineNo">129</span> @Override<a name="line.129"></a>
-<span class="sourceLineNo">130</span> protected void enqueue(final Procedure proc, final boolean addFront) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> if (isMetaProcedure(proc)) {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> doAdd(metaRunQueue, getMetaQueue(), proc, addFront);<a name="line.132"></a>
-<span class="sourceLineNo">133</span> } else if (isTableProcedure(proc)) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span> doAdd(tableRunQueue, getTableQueue(getTableName(proc)), proc, addFront);<a name="line.134"></a>
-<span class="sourceLineNo">135</span> } else if (isServerProcedure(proc)) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> ServerProcedureInterface spi = (ServerProcedureInterface) proc;<a name="line.136"></a>
-<span class="sourceLineNo">137</span> doAdd(serverRunQueue, getServerQueue(spi.getServerName(), spi), proc, addFront);<a name="line.137"></a>
-<span class="sourceLineNo">138</span> } else if (isPeerProcedure(proc)) {<a name="line.138"></a>
-<span class="sourceLineNo">139</span> doAdd(peerRunQueue, getPeerQueue(getPeerId(proc)), proc, addFront);<a name="line.139"></a>
-<span class="sourceLineNo">140</span> } else {<a name="line.140"></a>
-<span class="sourceLineNo">141</span> // TODO: at the moment we only have Table and Server procedures<a name="line.141"></a>
-<span class="sourceLineNo">142</span> // if you are implementing a non-table/non-server procedure, you have two options: create<a name="line.142"></a>
-<span class="sourceLineNo">143</span> // a group for all the non-table/non-server procedures or try to find a key for your<a name="line.143"></a>
-<span class="sourceLineNo">144</span> // non-table/non-server procedures and implement something similar to the TableRunQueue.<a name="line.144"></a>
-<span class="sourceLineNo">145</span> throw new UnsupportedOperationException(<a name="line.145"></a>
-<span class="sourceLineNo">146</span> "RQs for non-table/non-server procedures are not implemented yet: " + proc);<a name="line.146"></a>
-<span class="sourceLineNo">147</span> }<a name="line.147"></a>
-<span class="sourceLineNo">148</span> }<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span> private <T extends Comparable<T>> void doAdd(FairQueue<T> fairq, Queue<T> queue,<a name="line.150"></a>
-<span class="sourceLineNo">151</span> Procedure<?> proc, boolean addFront) {<a name="line.151"></a>
-<span class="sourceLineNo">152</span> queue.add(proc, addFront);<a name="line.152"></a>
-<span class="sourceLineNo">153</span> // For the following conditions, we will put the queue back into execution<a name="line.153"></a>
-<span class="sourceLineNo">154</span> // 1. The procedure has already held the lock, or the lock has been restored when restarting,<a name="line.154"></a>
-<span class="sourceLineNo">155</span> // which means it can be executed immediately.<a name="line.155"></a>
-<span class="sourceLineNo">156</span> // 2. The exclusive lock for this queue has not been held.<a name="line.156"></a>
-<span class="sourceLineNo">157</span> // 3. The given procedure has the exclusive lock permission for this queue.<a name="line.157"></a>
-<span class="sourceLineNo">158</span> if (proc.hasLock() || proc.isLockedWhenLoading() || !queue.getLockStatus().hasExclusiveLock() ||<a name="line.158"></a>
-<span class="sourceLineNo">159</span> queue.getLockStatus().hasLockAccess(proc)) {<a name="line.159"></a>
-<span class="sourceLineNo">160</span> addToRunQueue(fairq, queue);<a name="line.160"></a>
-<span class="sourceLineNo">161</span> }<a name="line.161"></a>
-<span class="sourceLineNo">162</span> }<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span> @Override<a name="line.164"></a>
-<span class="sourceLineNo">165</span> protected boolean queueHasRunnables() {<a name="line.165"></a>
-<span class="sourceLineNo">166</span> return metaRunQueue.hasRunnables() || tableRunQueue.hasRunnables() ||<a name="line.166"></a>
-<span class="sourceLineNo">167</span> serverRunQueue.hasRunnables() || peerRunQueue.hasRunnables();<a name="line.167"></a>
-<span class="sourceLineNo">168</span> }<a name="line.168"></a>
-<span class="sourceLineNo">169</span><a name="line.169"></a>
-<span class="sourceLineNo">170</span> @Override<a name="line.170"></a>
-<span class="sourceLineNo">171</span> protected Procedure dequeue() {<a name="line.171"></a>
-<span class="sourceLineNo">172</span> // meta procedure is always the first priority<a name="line.172"></a>
-<span class="sourceLineNo">173</span> Procedure<?> pollResult = doPoll(metaRunQueue);<a name="line.173"></a>
-<span class="sourceLineNo">174</span> // For now, let server handling have precedence over table handling; presumption is that it<a name="line.174"></a>
-<span class="sourceLineNo">175</span> // is more important handling crashed servers than it is running the<a name="line.175"></a>
-<span class="sourceLineNo">176</span> // enabling/disabling tables, etc.<a name="line.176"></a>
-<span class="sourceLineNo">177</span> if (pollResult == null) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span> pollResult = doPoll(serverRunQueue);<a name="line.178"></a>
-<span class="sourceLineNo">179</span> }<a name="line.179"></a>
-<span class="sourceLineNo">180</span> if (pollResult == null) {<a name="line.180"></a>
-<span class="sourceLineNo">181</span> pollResult = doPoll(peerRunQueue);<a name="line.181"></a>
-<span class="sourceLineNo">182</span> }<a name="line.182"></a>
-<span class="sourceLineNo">183</span> if (pollResult == null) {<a name="line.183"></a>
-<span class="sourceLineNo">184</span> pollResult = doPoll(tableRunQueue);<a name="line.184"></a>
-<span class="sourceLineNo">185</span> }<a name="line.185"></a>
-<span class="sourceLineNo">186</span> return pollResult;<a name="line.186"></a>
-<span class="sourceLineNo">187</span> }<a name="line.187"></a>
-<span class="sourceLineNo">188</span><a name="line.188"></a>
-<span class="sourceLineNo">189</span> private <T extends Comparable<T>> boolean isLockReady(Procedure<?> proc, Queue<T> rq) {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> LockStatus s = rq.getLockStatus();<a name="line.190"></a>
-<span class="sourceLineNo">191</span> // if we have the lock access, we are ready<a name="line.191"></a>
-<span class="sourceLineNo">192</span> if (s.hasLockAccess(proc)) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> return true;<a name="line.193"></a>
-<span class="sourceLineNo">194</span> }<a name="line.194"></a>
-<span class="sourceLineNo">195</span> boolean xlockReq = rq.requireExclusiveLock(proc);<a name="line.195"></a>
-<span class="sourceLineNo">196</span> // if we need to hold the xlock, then we need to make sure that no one holds any lock, including<a name="line.196"></a>
-<span class="sourceLineNo">197</span> // the shared lock, otherwise, we just need to make sure that no one holds the xlock<a name="line.197"></a>
-<span class="sourceLineNo">198</span> return xlockReq ? !s.isLocked() : !s.hasExclusiveLock();<a name="line.198"></a>
-<span class="sourceLineNo">199</span> }<a name="line.199"></a>
-<span class="sourceLineNo">200</span><a name="line.200"></a>
-<span class="sourceLineNo">201</span> private <T extends Comparable<T>> Procedure<?> doPoll(final FairQueue<T> fairq) {<a name="line.201"></a>
-<span class="sourceLineNo">202</span> Queue<T> rq = fairq.poll();<a name="line.202"></a>
-<span class="sourceLineNo">203</span> if (rq == null || !rq.isAvailable()) {<a name="line.203"></a>
-<span class="sourceLineNo">204</span> return null;<a name="line.204"></a>
-<span class="sourceLineNo">205</span> }<a name="line.205"></a>
-<span class="sourceLineNo">206</span> // loop until we find out a procedure which is ready to run, or if we have checked all the<a name="line.206"></a>
-<span class="sourceLineNo">207</span> // procedures, then we give up and remove the queue from run queue.<a name="line.207"></a>
-<span class="sourceLineNo">208</span> for (int i = 0, n = rq.size(); i < n; i++) {<a name="line.208"></a>
-<span class="sourceLineNo">209</span> Procedure<?> proc = rq.poll();<a name="line.209"></a>
-<span class="sourceLineNo">210</span> if (isLockReady(proc, rq)) {<a name="line.210"></a>
-<span class="sourceLineNo">211</span> // the queue is empty, remove from run queue<a name="line.211"></a>
-<span class="sourceLineNo">212</span> if (rq.isEmpty()) {<a name="line.212"></a>
-<span class="sourceLineNo">213</span> removeFromRunQueue(fairq, rq);<a name="line.213"></a>
-<span class="sourceLineNo">214</span> }<a name="line.214"></a>
-<span class="sourceLineNo">215</span> return proc;<a name="line.215"></a>
-<span class="sourceLineNo">216</span> }<a name="line.216"></a>
-<span class="sourceLineNo">217</span> // we are not ready to run, add back and try the next procedure<a name="line.217"></a>
-<span class="sourceLineNo">218</span> rq.add(proc, false);<a name="line.218"></a>
-<span class="sourceLineNo">219</span> }<a name="line.219"></a>
-<span class="sourceLineNo">220</span> // no procedure is ready for execution, remove from run queue<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> @Override<a name="line.225"></a>
-<span class="sourceLineNo">226</span> public List<LockedResource> getLocks() {<a name="line.226"></a>
-<span class="sourceLineNo">227</span> schedLock();<a name="line.227"></a>
-<span class="sourceLineNo">228</span> try {<a name="line.228"></a>
-<span class="sourceLineNo">229</span> return locking.getLocks();<a name="line.229"></a>
-<span class="sourceLineNo">230</span> } finally {<a name="line.230"></a>
-<span class="sourceLineNo">231</span> schedUnlock();<a name="line.231"></a>
-<span class="sourceLineNo">232</span> }<a name="line.232"></a>
+<span class="sourceLineNo">024</span>import java.util.function.Supplier;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.ServerName;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.TableExistsException;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.TableName;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.master.procedure.TableProcedureInterface.TableOperationType;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.procedure2.AbstractProcedureScheduler;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.procedure2.LockAndQueue;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.procedure2.LockStatus;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.procedure2.LockedResource;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.procedure2.LockedResourceType;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.util.AvlUtil.AvlIterableList;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.util.AvlUtil.AvlKeyComparator;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.util.AvlUtil.AvlTree;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.util.AvlUtil.AvlTreeIterator;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.slf4j.Logger;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.slf4j.LoggerFactory;<a name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>/**<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * ProcedureScheduler for the Master Procedures.<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * This ProcedureScheduler tries to provide to the ProcedureExecutor procedures<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * that can be executed without having to wait on a lock.<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * Most of the master operations can be executed concurrently, if they<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * are operating on different tables (e.g. two create table procedures can be performed<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * at the same time) or against two different servers; say two servers that crashed at<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * about the same time.<a name="line.54"></a>
+<span class="sourceLineNo">055</span> *<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * <p>Each procedure should implement an Interface providing information for this queue.<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * For example table related procedures should implement TableProcedureInterface.<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * Each procedure will be pushed in its own queue, and based on the operation type<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * we may make smarter decisions: e.g. we can abort all the operations preceding<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * a delete table, or similar.<a name="line.60"></a>
+<span class="sourceLineNo">061</span> *<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * <h4>Concurrency control</h4><a name="line.62"></a>
+<span class="sourceLineNo">063</span> * Concurrent access to member variables (tableRunQueue, serverRunQueue, locking, tableMap,<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * serverBuckets) is controlled by schedLock(). This mainly includes:<br><a name="line.64"></a>
+<span class="sourceLineNo">065</span> * <ul><a name="line.65"></a>
+<span class="sourceLineNo">066</span> * <li><a name="line.66"></a>
+<span class="sourceLineNo">067</span> * {@link #push(Procedure, boolean, boolean)}: A push will add a Queue back to run-queue<a name="line.67"></a>
+<span class="sourceLineNo">068</span> * when:<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * <ol><a name="line.69"></a>
+<span class="sourceLineNo">070</span> * <li>Queue was empty before push (so must have been out of run-queue)</li><a name="line.70"></a>
+<span class="sourceLineNo">071</span> * <li>Child procedure is added (which means parent procedure holds exclusive lock, and it<a name="line.71"></a>
+<span class="sourceLineNo">072</span> * must have moved Queue out of run-queue)</li><a name="line.72"></a>
+<span class="sourceLineNo">073</span> * </ol><a name="line.73"></a>
+<span class="sourceLineNo">074</span> * </li><a name="line.74"></a>
+<span class="sourceLineNo">075</span> * <li><a name="line.75"></a>
+<span class="sourceLineNo">076</span> * {@link #poll(long)}: A poll will remove a Queue from run-queue when:<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * <ol><a name="line.77"></a>
+<span class="sourceLineNo">078</span> * <li>Queue becomes empty after poll</li><a name="line.78"></a>
+<span class="sourceLineNo">079</span> * <li>Exclusive lock is requested by polled procedure and lock is available (returns the<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * procedure)</li><a name="line.80"></a>
+<span class="sourceLineNo">081</span> * <li>Exclusive lock is requested but lock is not available (returns null)</li><a name="line.81"></a>
+<span class="sourceLineNo">082</span> * <li>Polled procedure is child of parent holding exclusive lock and the next procedure is<a name="line.82"></a>
+<span class="sourceLineNo">083</span> * not a child</li><a name="line.83"></a>
+<span class="sourceLineNo">084</span> * </ol><a name="line.84"></a>
+<span class="sourceLineNo">085</span> * </li><a name="line.85"></a>
+<span class="sourceLineNo">086</span> * <li><a name="line.86"></a>
+<span class="sourceLineNo">087</span> * Namespace/table/region locks: Queue is added back to run-queue when lock being released is:<a name="line.87"></a>
+<span class="sourceLineNo">088</span> * <ol><a name="line.88"></a>
+<span class="sourceLineNo">089</span> * <li>Exclusive lock</li><a name="line.89"></a>
+<span class="sourceLineNo">090</span> * <li>Last shared lock (in case queue was removed because next procedure in queue required<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * exclusive lock)</li><a name="line.91"></a>
+<span class="sourceLineNo">092</span> * </ol><a name="line.92"></a>
+<span class="sourceLineNo">093</span> * </li><a name="line.93"></a>
+<span class="sourceLineNo">094</span> * </ul><a name="line.94"></a>
+<span class="sourceLineNo">095</span> */<a name="line.95"></a>
+<span class="sourceLineNo">096</span>@InterfaceAudience.Private<a name="line.96"></a>
+<span class="sourceLineNo">097</span>public class MasterProcedureScheduler extends AbstractProcedureScheduler {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> private static final Logger LOG = LoggerFactory.getLogger(MasterProcedureScheduler.class);<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span> private static final AvlKeyComparator<ServerQueue> SERVER_QUEUE_KEY_COMPARATOR =<a name="line.100"></a>
+<span class="sourceLineNo">101</span> (n, k) -> n.compareKey((ServerName) k);<a name="line.101"></a>
+<span class="sourceLineNo">102</span> private final static AvlKeyComparator<TableQueue> TABLE_QUEUE_KEY_COMPARATOR =<a name="line.102"></a>
+<span class="sourceLineNo">103</span> (n, k) -> n.compareKey((TableName) k);<a name="line.103"></a>
+<span class="sourceLineNo">104</span> private final static AvlKeyComparator<PeerQueue> PEER_QUEUE_KEY_COMPARATOR =<a name="line.104"></a>
+<span class="sourceLineNo">105</span> (n, k) -> n.compareKey((String) k);<a name="line.105"></a>
+<span class="sourceLineNo">106</span> private final static AvlKeyComparator<MetaQueue> META_QUEUE_KEY_COMPARATOR =<a name="line.106"></a>
+<span class="sourceLineNo">107</span> (n, k) -> n.compareKey((TableName) k);<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span> private final FairQueue<ServerName> serverRunQueue = new FairQueue<>();<a name="line.109"></a>
+<span class="sourceLineNo">110</span> private final FairQueue<TableName> tableRunQueue = new FairQueue<>();<a name="line.110"></a>
+<span class="sourceLineNo">111</span> private final FairQueue<String> peerRunQueue = new FairQueue<>();<a name="line.111"></a>
+<span class="sourceLineNo">112</span> private final FairQueue<TableName> metaRunQueue = new FairQueue<>();<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span> private final ServerQueue[] serverBuckets = new ServerQueue[128];<a name="line.114"></a>
+<span class="sourceLineNo">115</span> private TableQueue tableMap = null;<a name="line.115"></a>
+<span class="sourceLineNo">116</span> private PeerQueue peerMap = null;<a name="line.116"></a>
+<span class="sourceLineNo">117</span> private MetaQueue metaMap = null;<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> private final SchemaLocking locking;<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span> public MasterProcedureScheduler(Function<Long, Procedure<?>> procedureRetriever) {<a name="line.121"></a>
+<span class="sourceLineNo">122</span> locking = new SchemaLocking(procedureRetriever);<a name="line.122"></a>
+<span class="sourceLineNo">123</span> }<a name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span> @Override<a name="line.125"></a>
+<span class="sourceLineNo">126</span> public void yield(final Procedure proc) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span> push(proc, false, true);<a name="line.127"></a>
+<span class="sourceLineNo">128</span> }<a name="line.128"></a>
+<span class="sourceLineNo">129</span><a name="line.129"></a>
+<span class="sourceLineNo">130</span> @Override<a name="line.130"></a>
+<span class="sourceLineNo">131</span> protected void enqueue(final Procedure proc, final boolean addFront) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span> if (isMetaProcedure(proc)) {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> doAdd(metaRunQueue, getMetaQueue(), proc, addFront);<a name="line.133"></a>
+<span class="sourceLineNo">134</span> } else if (isTableProcedure(proc)) {<a name="line.134"></a>
+<span class="sourceLineNo">135</span> doAdd(tableRunQueue, getTableQueue(getTableName(proc)), proc, addFront);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> } else if (isServerProcedure(proc)) {<a name="line.136"></a>
+<span class="sourceLineNo">137</span> ServerProcedureInterface spi = (ServerProcedureInterface) proc;<a name="line.137"></a>
+<span class="sourceLineNo">138</span> doAdd(serverRunQueue, getServerQueue(spi.getServerName(), spi), proc, addFront);<a name="line.138"></a>
+<span class="sourceLineNo">139</span> } else if (isPeerProcedure(proc)) {<a name="line.139"></a>
+<span class="sourceLineNo">140</span> doAdd(peerRunQueue, getPeerQueue(getPeerId(proc)), proc, addFront);<a name="line.140"></a>
+<span class="sourceLineNo">141</span> } else {<a name="line.141"></a>
+<span class="sourceLineNo">142</span> // TODO: at the moment we only have Table and Server procedures<a name="line.142"></a>
+<span class="sourceLineNo">143</span> // if you are implementing a non-table/non-server procedure, you have two options: create<a name="line.143"></a>
+<span class="sourceLineNo">144</span> // a group for all the non-table/non-server procedures or try to find a key for your<a name="line.144"></a>
+<span class="sourceLineNo">145</span> // non-table/non-server procedures and implement something similar to the TableRunQueue.<a name="line.145"></a>
+<span class="sourceLineNo">146</span> throw new UnsupportedOperationException(<a name="line.146"></a>
+<span class="sourceLineNo">147</span> "RQs for non-table/non-server procedures are not implemented yet: " + proc);<a name="line.147"></a>
+<span class="sourceLineNo">148</span> }<a name="line.148"></a>
+<span class="sourceLineNo">149</span> }<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span> private <T extends Comparable<T>> void doAdd(FairQueue<T> fairq, Queue<T> queue,<a name="line.151"></a>
+<span class="sourceLineNo">152</span> Procedure<?> proc, boolean addFront) {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> queue.add(proc, addFront);<a name="line.153"></a>
+<span class="sourceLineNo">154</span> // For the following conditions, we will put the queue back into execution<a name="line.154"></a>
+<span class="sourceLineNo">155</span> // 1. The procedure has already held the lock, or the lock has been restored when restarting,<a name="line.155"></a>
+<span class="sourceLineNo">156</span> // which means it can be executed immediately.<a name="line.156"></a>
+<span class="sourceLineNo">157</span> // 2. The exclusive lock for this queue has not been held.<a name="line.157"></a>
+<span class="sourceLineNo">158</span> // 3. The given procedure has the exclusive lock permission for this queue.<a name="line.158"></a>
+<span class="sourceLineNo">159</span> Supplier<String> reason = null;<a name="line.159"></a>
+<span class="sourceLineNo">160</span> if (proc.hasLock()) {<a name="line.160"></a>
+<span class="sourceLineNo">161</span> reason = () -> proc + " has lock";<a name="line.161"></a>
+<span class="sourceLineNo">162</span> } else if (proc.isLockedWhenLoading()) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> reason = () -> proc + " restores lock when restarting";<a name="line.163"></a>
+<span class="sourceLineNo">164</span> } else if (!queue.getLockStatus().hasExclusiveLock()) {<a name="line.164"></a>
+<span class="sourceLineNo">165</span> reason = () -> "the exclusive lock is not held by anyone when adding " + proc;<a name="line.165"></a>
+<span class="sourceLineNo">166</span> } else if (queue.getLockStatus().hasLockAccess(proc)) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> reason = () -> proc + " has the excusive lock access";<a name="line.167"></a>
+<span class="sourceLineNo">168</span> }<a name="line.168"></a>
+<span class="sourceLineNo">169</span> if (reason != null) {<a name="line.169"></a>
+<span class="sourceLineNo">170</span> addToRunQueue(fairq, queue, reason);<a name="line.170"></a>
+<span class="sourceLineNo">171</span> }<a name="line.171"></a>
+<span class="sourceLineNo">172</span> }<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span> @Override<a name="line.174"></a>
+<span class="sourceLineNo">175</span> protected boolean queueHasRunnables() {<a name="line.175"></a>
+<span class="sourceLineNo">176</span> return metaRunQueue.hasRunnables() || tableRunQueue.hasRunnables() ||<a name="line.176"></a>
+<span class="sourceLineNo">177</span> serverRunQueue.hasRunnables() || peerRunQueue.hasRunnables();<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span><a name="line.179"></a>
+<span class="sourceLineNo">180</span> @Override<a name="line.180"></a>
+<span class="sourceLineNo">181</span> protected Procedure dequeue() {<a name="line.181"></a>
+<span class="sourceLineNo">182</span> // meta procedure is always the first priority<a name="line.182"></a>
+<span class="sourceLineNo">183</span> Procedure<?> pollResult = doPoll(metaRunQueue);<a name="line.183"></a>
+<span class="sourceLineNo">184</span> // For now, let server handling have precedence over table handling; presumption is that it<a name="line.184"></a>
+<span class="sourceLineNo">185</span> // is more important handling crashed servers than it is running the<a name="line.185"></a>
+<span class="sourceLineNo">186</span> // enabling/disabling tables, etc.<a name="line.186"></a>
+<span class="sourceLineNo">187</span> if (pollResult == null) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span> pollResult = doPoll(serverRunQueue);<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span> if (pollResult == null) {<a name="line.190"></a>
+<span class="sourceLineNo">191</span> pollResult = doPoll(peerRunQueue);<a name="line.191"></a>
+<span class="sourceLineNo">192</span> }<a name="line.192"></a>
+<span class="sourceLineNo">193</span> if (pollResult == null) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> pollResult = doPoll(tableRunQueue);<a name="line.194"></a>
+<span class="sourceLineNo">195</span> }<a name="line.195"></a>
+<span class="sourceLineNo">196</span> return pollResult;<a name="line.196"></a>
+<span class="sourceLineNo">197</span> }<a name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span> private <T extends Comparable<T>> boolean isLockReady(Procedure<?> proc, Queue<T> rq) {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> LockStatus s = rq.getLockStatus();<a name="line.200"></a>
+<span class="sourceLineNo">201</span> // if we have the lock access, we are ready<a name="line.201"></a>
+<span class="sourceLineNo">202</span> if (s.hasLockAccess(proc)) {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> return true;<a name="line.203"></a>
+<span class="sourceLineNo">204</span> }<a name="line.204"></a>
+<span class="sourceLineNo">205</span> boolean xlockReq = rq.requireExclusiveLock(proc);<a name="line.205"></a>
+<span class="sourceLineNo">206</span> // if we need to hold the xlock, then we need to make sure that no one holds any lock, including<a name="line.206"></a>
+<span class="sourceLineNo">207</span> // the shared lock, otherwise, we just need to make sure that no one holds the xlock<a name="line.207"></a>
+<span class="sourceLineNo">208</span> return xlockReq ? !s.isLocked() : !s.hasExclusiveLock();<a name="line.208"></a>
+<span class="sourceLineNo">209</span> }<a name="line.209"></a>
+<span class="sourceLineNo">210</span><a name="line.210"></a>
+<span class="sourceLineNo">211</span> private <T extends Comparable<T>> Procedure<?> doPoll(final FairQueue<T> fairq) {<a name="line.211"></a>
+<span class="sourceLineNo">212</span> Queue<T> rq = fairq.poll();<a name="line.212"></a>
+<span class="sourceLineNo">213</span> if (rq == null || !rq.isAvailable()) {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> return null;<a name="line.214"></a>
+<span class="sourceLineNo">215</span> }<a name="line.215"></a>
+<span class="sourceLineNo">216</span> // loop until we find out a procedure which is ready to run, or if we have checked all the<a name="line.216"></a>
+<span class="sourceLineNo">217</span> // procedures, then we give up and remove the queue from run queue.<a name="line.217"></a>
+<span class="sourceLineNo">218</span> for (int i = 0, n = rq.size(); i < n; i++) {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> Procedure<?> proc = rq.poll();<a name="line.219"></a>
+<span class="sourceLineNo">220</span> if (isLockReady(proc, rq)) {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> // the queue is empty, remove from run queue<a name="line.221"></a>
+<span class="sourceLineNo">222</span> if (rq.isEmpty()) {<a name="line.222"></a>
+<span class="sourceLineNo">223</span> removeFromRunQueue(fairq, rq, () -> "queue is empty after polling out " + proc);<a name="line.223"></a>
+<span class="sourceLineNo">224</span> }<a name="line.224"></a>
+<span class="sourceLineNo">225</span> return proc;<a name="line.225"></a>
+<span class="sourceLineNo">226</span> }<a name="line.226"></a>
+<span class="sourceLineNo">227</span> // we are not ready to run, add back and try the next procedure<a name="line.227"></a>
+<span class="sourceLineNo">228</span> rq.add(proc, false);<a name="line.228"></a>
+<span class="sourceLineNo">229</span> }<a name="line.229"></a>
+<span class="sourceLineNo">230</span> // no procedure is ready for execution, remove from run queue<a name="line.230"></a>
+<span class="sourceLineNo">231</span> removeFromRunQueue(fairq, rq, () -> "no procedure can be executed");<a name="line.231"></a>
+<span class="sourceLineNo">232</span> return null;<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> @Override<a name="line.235"></a>
-<span class="sourceLineNo">236</span> public LockedResource getLockResource(LockedResourceType resourceType, String resourceName) {<a name="line.236"></a>
+<span class="sourceLineNo">236</span> public List<LockedResource> getLocks() {<a name="line.236"></a>
<span class="sourceLineNo">237</span> schedLock();<a name="line.237"></a>
<span class="sourceLineNo">238</span> try {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> return locking.getLockResource(resourceType, resourceName);<a name="line.239"></a>
+<span class="sourceLineNo">239</span> return locking.getLocks();<a name="line.239"></a>
<span class="sourceLineNo">240</span> } finally {<a name="line.240"></a>
<span class="sourceLineNo">241</span> schedUnlock();<a name="line.241"></a>
<span class="sourceLineNo">242</span> }<a name="line.242"></a>
<span class="sourceLineNo">243</span> }<a name="line.243"></a>
<span class="sourceLineNo">244</span><a name="line.244"></a>
<span class="sourceLineNo">245</span> @Override<a name="line.245"></a>
-<span class="sourceLineNo">246</span> public void clear() {<a name="line.246"></a>
+<span class="sourceLineNo">246</span> public LockedResource getLockResource(LockedResourceType resourceType, String resourceName) {<a name="line.246"></a>
<span class="sourceLineNo">247</span> schedLock();<a name="line.247"></a>
<span class="sourceLineNo">248</span> try {<a name="line.248"></a>
-<span class="sourceLineNo">249</span> clearQueue();<a name="line.249"></a>
-<span class="sourceLineNo">250</span> locking.clear();<a name="line.250"></a>
-<span class="sourceLineNo">251</span> } finally {<a name="line.251"></a>
-<span class="sourceLineNo">252</span> schedUnlock();<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<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> private void clearQueue() {<a name="line.256"></a>
-<span class="sourceLineNo">257</span> // Remove Servers<a name="line.257"></a>
-<span class="sourceLineNo">258</span> for (int i = 0; i < serverBuckets.length; ++i) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span> clear(serverBuckets[i], serverRunQueue, SERVER_QUEUE_KEY_COMPARATOR);<a name="line.259"></a>
-<span class="sourceLineNo">260</span> serverBuckets[i] = null;<a name="line.260"></a>
-<span class="sourceLineNo">261</span> }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span> // Remove Tables<a name="line.263"></a>
-<span class="sourceLineNo">264</span> clear(tableMap, tableRunQueue, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.264"></a>
-<span class="sourceLineNo">265</span> tableMap = null;<a name="line.265"></a>
-<span class="sourceLineNo">266</span><a name="line.266"></a>
-<span class="sourceLineNo">267</span> // Remove Peers<a name="line.267"></a>
-<span class="sourceLineNo">268</span> clear(peerMap, peerRunQueue, PEER_QUEUE_KEY_COMPARATOR);<a name="line.268"></a>
-<span class="sourceLineNo">269</span> peerMap = null;<a name="line.269"></a>
-<span class="sourceLineNo">270</span><a name="line.270"></a>
-<span class="sourceLineNo">271</span> assert size() == 0 : "expected queue size to be 0, got " + size();<a name="line.271"></a>
-<span class="sourceLineNo">272</span> }<a name="line.272"></a>
-<span class="sourceLineNo">273</span><a name="line.273"></a>
-<span class="sourceLineNo">274</span> private <T extends Comparable<T>, TNode extends Queue<T>> void clear(TNode treeMap,<a name="line.274"></a>
-<span class="sourceLineNo">275</span> final FairQueue<T> fairq, final AvlKeyComparator<TNode> comparator) {<a name="line.275"></a>
-<span class="sourceLineNo">276</span> while (treeMap != null) {<a name="line.276"></a>
-<span class="sourceLineNo">277</span> Queue<T> node = AvlTree.getFirst(treeMap);<a name="line.277"></a>
-<span class="sourceLineNo">278</span> treeMap = AvlTree.remove(treeMap, node.getKey(), comparator);<a name="line.278"></a>
-<span class="sourceLineNo">279</span> if (fairq != null) removeFromRunQueue(fairq, node);<a name="line.279"></a>
-<span class="sourceLineNo">280</span> }<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> private int queueSize(Queue<?> head) {<a name="line.283"></a>
-<span class="sourceLineNo">284</span> int count = 0;<a name="line.284"></a>
-<span class="sourceLineNo">285</span> AvlTreeIterator<Queue<?>> iter = new AvlTreeIterator<Queue<?>>(head);<a name="line.285"></a>
-<span class="sourceLineNo">286</span> while (iter.hasNext()) {<a name="line.286"></a>
-<span class="sourceLineNo">287</span> count += iter.next().size();<a name="line.287"></a>
-<span class="sourceLineNo">288</span> }<a name="line.288"></a>
-<span class="sourceLineNo">289</span> return count;<a name="line.289"></a>
-<span class="sourceLineNo">290</span> }<a name="line.290"></a>
-<span class="sourceLineNo">291</span><a name="line.291"></a>
-<span class="sourceLineNo">292</span> @Override<a name="line.292"></a>
-<span class="sourceLineNo">293</span> protected int queueSize() {<a name="line.293"></a>
-<span class="sourceLineNo">294</span> int count = 0;<a name="line.294"></a>
-<span class="sourceLineNo">295</span> for (ServerQueue serverMap : serverBuckets) {<a name="line.295"></a>
-<span class="sourceLineNo">296</span> count += queueSize(serverMap);<a name="line.296"></a>
-<span class="sourceLineNo">297</span> }<a name="line.297"></a>
-<span class="sourceLineNo">298</span> count += queueSize(tableMap);<a name="line.298"></a>
-<span class="sourceLineNo">299</span> count += queueSize(peerMap);<a name="line.299"></a>
-<span class="sourceLineNo">300</span> count += queueSize(metaMap);<a name="line.300"></a>
+<span class="sourceLineNo">249</span> return locking.getLockResource(resourceType, resourceName);<a name="line.249"></a>
+<span class="sourceLineNo">250</span> } finally {<a name="line.250"></a>
+<span class="sourceLineNo">251</span> schedUnlock();<a name="line.251"></a>
+<span class="sourceLineNo">252</span> }<a name="line.252"></a>
+<span class="sourceLineNo">253</span> }<a name="line.253"></a>
+<span class="sourceLineNo">254</span><a name="line.254"></a>
+<span class="sourceLineNo">255</span> @Override<a name="line.255"></a>
+<span class="sourceLineNo">256</span> public void clear() {<a name="line.256"></a>
+<span class="sourceLineNo">257</span> schedLock();<a name="line.257"></a>
+<span class="sourceLineNo">258</span> try {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> clearQueue();<a name="line.259"></a>
+<span class="sourceLineNo">260</span> locking.clear();<a name="line.260"></a>
+<span class="sourceLineNo">261</span> } finally {<a name="line.261"></a>
+<span class="sourceLineNo">262</span> schedUnlock();<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> private void clearQueue() {<a name="line.266"></a>
+<span class="sourceLineNo">267</span> // Remove Servers<a name="line.267"></a>
+<span class="sourceLineNo">268</span> for (int i = 0; i < serverBuckets.length; ++i) {<a name="line.268"></a>
+<span class="sourceLineNo">269</span> clear(serverBuckets[i], serverRunQueue, SERVER_QUEUE_KEY_COMPARATOR);<a name="line.269"></a>
+<span class="sourceLineNo">270</span> serverBuckets[i] = null;<a name="line.270"></a>
+<span class="sourceLineNo">271</span> }<a name="line.271"></a>
+<span class="sourceLineNo">272</span><a name="line.272"></a>
+<span class="sourceLineNo">273</span> // Remove Tables<a name="line.273"></a>
+<span class="sourceLineNo">274</span> clear(tableMap, tableRunQueue, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.274"></a>
+<span class="sourceLineNo">275</span> tableMap = null;<a name="line.275"></a>
+<span class="sourceLineNo">276</span><a name="line.276"></a>
+<span class="sourceLineNo">277</span> // Remove Peers<a name="line.277"></a>
+<span class="sourceLineNo">278</span> clear(peerMap, peerRunQueue, PEER_QUEUE_KEY_COMPARATOR);<a name="line.278"></a>
+<span class="sourceLineNo">279</span> peerMap = null;<a name="line.279"></a>
+<span class="sourceLineNo">280</span><a name="line.280"></a>
+<span class="sourceLineNo">281</span> assert size() == 0 : "expected queue size to be 0, got " + size();<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span><a name="line.283"></a>
+<span class="sourceLineNo">284</span> private <T extends Comparable<T>, TNode extends Queue<T>> void clear(TNode treeMap,<a name="line.284"></a>
+<span class="sourceLineNo">285</span> FairQueue<T> fairq, AvlKeyComparator<TNode> comparator) {<a name="line.285"></a>
+<span class="sourceLineNo">286</span> while (treeMap != null) {<a name="line.286"></a>
+<span class="sourceLineNo">287</span> Queue<T> node = AvlTree.getFirst(treeMap);<a name="line.287"></a>
+<span class="sourceLineNo">288</span> treeMap = AvlTree.remove(treeMap, node.getKey(), comparator);<a name="line.288"></a>
+<span class="sourceLineNo">289</span> if (fairq != null) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> removeFromRunQueue(fairq, node, () -> "clear all queues");<a name="line.290"></a>
+<span class="sourceLineNo">291</span> }<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><a name="line.294"></a>
+<span class="sourceLineNo">295</span> private int queueSize(Queue<?> head) {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> int count = 0;<a name="line.296"></a>
+<span class="sourceLineNo">297</span> AvlTreeIterator<Queue<?>> iter = new AvlTreeIterator<Queue<?>>(head);<a name="line.297"></a>
+<span class="sourceLineNo">298</span> while (iter.hasNext()) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> count += iter.next().size();<a name="line.299"></a>
+<span class="sourceLineNo">300</span> }<a name="line.300"></a>
<span class="sourceLineNo">301</span> return count;<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> @Override<a name="line.304"></a>
-<span class="sourceLineNo">305</span> public void completionCleanup(final Procedure proc) {<a name="line.305"></a>
-<span class="sourceLineNo">306</span> if (proc instanceof TableProcedureInterface) {<a name="line.306"></a>
-<span class="sourceLineNo">307</span> TableProcedureInterface iProcTable = (TableProcedureInterface) proc;<a name="line.307"></a>
-<span class="sourceLineNo">308</span> boolean tableDeleted;<a name="line.308"></a>
-<span class="sourceLineNo">309</span> if (proc.hasException()) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span> Exception procEx = proc.getException().unwrapRemoteException();<a name="line.310"></a>
-<span class="sourceLineNo">311</span> if (iProcTable.getTableOperationType() == TableOperationType.CREATE) {<a name="line.311"></a>
-<span class="sourceLineNo">312</span> // create failed because the table already exist<a name="line.312"></a>
-<span class="sourceLineNo">313</span> tableDeleted = !(procEx instanceof TableExistsException);<a name="line.313"></a>
-<span class="sourceLineNo">314</span> } else {<a name="line.314"></a>
-<span class="sourceLineNo">315</span> // the operation failed because the table does not exist<a name="line.315"></a>
-<span class="sourceLineNo">316</span> tableDeleted = (procEx instanceof TableNotFoundException);<a name="line.316"></a>
-<span class="sourceLineNo">317</span> }<a name="line.317"></a>
-<span class="sourceLineNo">318</span> } else {<a name="line.318"></a>
-<span class="sourceLineNo">319</span> // the table was deleted<a name="line.319"></a>
-<span class="sourceLineNo">320</span> tableDeleted = (iProcTable.getTableOperationType() == TableOperationType.DELETE);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> }<a name="line.321"></a>
-<span class="sourceLineNo">322</span> if (tableDeleted) {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> markTableAsDeleted(iProcTable.getTableName(), proc);<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> } else if (proc instanceof PeerProcedureInterface) {<a name="line.326"></a>
-<span class="sourceLineNo">327</span> tryCleanupPeerQueue(getPeerId(proc), proc);<a name="line.327"></a>
-<span class="sourceLineNo">328</span> } else if (proc instanceof ServerProcedureInterface) {<a name="line.328"></a>
-<span class="sourceLineNo">329</span> tryCleanupServerQueue(getServerName(proc), proc);<a name="line.329"></a>
-<span class="sourceLineNo">330</span> } else {<a name="line.330"></a>
-<span class="sourceLineNo">331</span> // No cleanup for other procedure types, yet.<a name="line.331"></a>
-<span class="sourceLineNo">332</span> return;<a name="line.332"></a>
-<span class="sourceLineNo">333</span> }<a name="line.333"></a>
-<span class="sourceLineNo">334</span> }<a name="line.334"></a>
-<span class="sourceLineNo">335</span><a name="line.335"></a>
-<span class="sourceLineNo">336</span> private static <T extends Comparable<T>> void addToRunQueue(FairQueue<T> fairq, Queue<T> queue) {<a name="line.336"></a>
-<span class="sourceLineNo">337</span> if (!AvlIterableList.isLinked(queue) && !queue.isEmpty()) {<a name="line.337"></a>
-<span class="sourceLineNo">338</span> fairq.add(queue);<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> private static <T extends Comparable<T>> void removeFromRunQueue(<a name="line.342"></a>
-<span class="sourceLineNo">343</span> FairQueue<T> fairq, Queue<T> queue) {<a name="line.343"></a>
-<span class="sourceLineNo">344</span> if (AvlIterableList.isLinked(queue)) {<a name="line.344"></a>
-<span class="sourceLineNo">345</span> fairq.remove(queue);<a name="line.345"></a>
-<span class="sourceLineNo">346</span> }<a name="line.346"></a>
-<span class="sourceLineNo">347</span> }<a name="line.347"></a>
-<span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span> // ============================================================================<a name="line.349"></a>
-<span class="sourceLineNo">350</span> // Table Queue Lookup Helpers<a name="line.350"></a>
-<span class="sourceLineNo">351</span> // ============================================================================<a name="line.351"></a>
-<span class="sourceLineNo">352</span> private TableQueue getTableQueue(TableName tableName) {<a name="line.352"></a>
-<span class="sourceLineNo">353</span> TableQueue node = AvlTree.get(tableMap, tableName, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.353"></a>
-<span class="sourceLineNo">354</span> if (node != null) return node;<a name="line.354"></a>
-<span class="sourceLineNo">355</span><a name="line.355"></a>
-<span class="sourceLineNo">356</span> node = new TableQueue(tableName, MasterProcedureUtil.getTablePriority(tableName),<a name="line.356"></a>
-<span class="sourceLineNo">357</span> locking.getTableLock(tableName), locking.getNamespaceLock(tableName.getNamespaceAsString()));<a name="line.357"></a>
-<span class="sourceLineNo">358</span> tableMap = AvlTree.insert(tableMap, node);<a name="line.358"></a>
-<span class="sourceLineNo">359</span> return node;<a name="line.359"></a>
-<span class="sourceLineNo">360</span> }<a name="line.360"></a>
-<span class="sourceLineNo">361</span><a name="line.361"></a>
-<span class="sourceLineNo">362</span> private void removeTableQueue(TableName tableName) {<a name="line.362"></a>
-<span class="sourceLineNo">363</span> tableMap = AvlTree.remove(tableMap, tableName, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.363"></a>
-<span class="sourceLineNo">364</span> locking.removeTableLock(tableName);<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> private static boolean isTableProcedure(Procedure<?> proc) {<a name="line.367"></a>
-<span class="sourceLineNo">368</span> return proc instanceof TableProcedureInterface;<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> private static TableName getTableName(Procedure<?> proc) {<a name="line.371"></a>
-<span class="sourceLineNo">372</span> return ((TableProcedureInterface)proc).getTableName();<a name="line.372"></a>
-<span class="sourceLineNo">373</span> }<a name="line.373"></a>
+<span class="sourceLineNo">305</span> protected int queueSize() {<a name="line.305"></a>
+<span class="sourceLineNo">306</span> int count = 0;<a name="line.306"></a>
+<span class="sourceLineNo">307</span> for (ServerQueue serverMap : serverBuckets) {<a name="line.307"></a>
+<span class="sourceLineNo">308</span> count += queueSize(serverMap);<a name="line.308"></a>
+<span class="sourceLineNo">309</span> }<a name="line.309"></a>
+<span class="sourceLineNo">310</span> count += queueSize(tableMap);<a name="line.310"></a>
+<span class="sourceLineNo">311</span> count += queueSize(peerMap);<a name="line.311"></a>
+<span class="sourceLineNo">312</span> count += queueSize(metaMap);<a name="line.312"></a>
+<span class="sourceLineNo">313</span> return count;<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> @Override<a name="line.316"></a>
+<span class="sourceLineNo">317</span> public void completionCleanup(final Procedure proc) {<a name="line.317"></a>
+<span class="sourceLineNo">318</span> if (proc instanceof TableProcedureInterface) {<a name="line.318"></a>
+<span class="sourceLineNo">319</span> TableProcedureInterface iProcTable = (TableProcedureInterface) proc;<a name="line.319"></a>
+<span class="sourceLineNo">320</span> boolean tableDeleted;<a name="line.320"></a>
+<span class="sourceLineNo">321</span> if (proc.hasException()) {<a name="line.321"></a>
+<span class="sourceLineNo">322</span> Exception procEx = proc.getException().unwrapRemoteException();<a name="line.322"></a>
+<span class="sourceLineNo">323</span> if (iProcTable.getTableOperationType() == TableOperationType.CREATE) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span> // create failed because the table already exist<a name="line.324"></a>
+<span class="sourceLineNo">325</span> tableDeleted = !(procEx instanceof TableExistsException);<a name="line.325"></a>
+<span class="sourceLineNo">326</span> } else {<a name="line.326"></a>
+<span class="sourceLineNo">327</span> // the operation failed because the table does not exist<a name="line.327"></a>
+<span class="sourceLineNo">328</span> tableDeleted = (procEx instanceof TableNotFoundException);<a name="line.328"></a>
+<span class="sourceLineNo">329</span> }<a name="line.329"></a>
+<span class="sourceLineNo">330</span> } else {<a name="line.330"></a>
+<span class="sourceLineNo">331</span> // the table was deleted<a name="line.331"></a>
+<span class="sourceLineNo">332</span> tableDeleted = (iProcTable.getTableOperationType() == TableOperationType.DELETE);<a name="line.332"></a>
+<span class="sourceLineNo">333</span> }<a name="line.333"></a>
+<span class="sourceLineNo">334</span> if (tableDeleted) {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> markTableAsDeleted(iProcTable.getTableName(), proc);<a name="line.335"></a>
+<span class="sourceLineNo">336</span> return;<a name="line.336"></a>
+<span class="sourceLineNo">337</span> }<a name="line.337"></a>
+<span class="sourceLineNo">338</span> } else if (proc instanceof PeerProcedureInterface) {<a name="line.338"></a>
+<span class="sourceLineNo">339</span> tryCleanupPeerQueue(getPeerId(proc), proc);<a name="line.339"></a>
+<span class="sourceLineNo">340</span> } else if (proc instanceof ServerProcedureInterface) {<a name="line.340"></a>
+<span class="sourceLineNo">341</span> tryCleanupServerQueue(getServerName(proc), proc);<a name="line.341"></a>
+<span class="sourceLineNo">342</span> } else {<a name="line.342"></a>
+<span class="sourceLineNo">343</span> // No cleanup for other procedure types, yet.<a name="line.343"></a>
+<span class="sourceLineNo">344</span> return;<a name="line.344"></a>
+<span class="sourceLineNo">345</span> }<a name="line.345"></a>
+<span class="sourceLineNo">346</span> }<a name="line.346"></a>
+<span class="sourceLineNo">347</span><a name="line.347"></a>
+<span class="sourceLineNo">348</span> private static <T extends Comparable<T>> void addToRunQueue(FairQueue<T> fairq, Queue<T> queue,<a name="line.348"></a>
+<span class="sourceLineNo">349</span> Supplier<String> reason) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span> if (LOG.isDebugEnabled()) {<a name="line.350"></a>
+<span class="sourceLineNo">351</span> LOG.debug("Add {} to run queue because: {}", queue, reason.get());<a name="line.351"></a>
+<span class="sourceLineNo">352</span> }<a name="line.352"></a>
+<span class="sourceLineNo">353</span> if (!AvlIterableList.isLinked(queue) && !queue.isEmpty()) {<a name="line.353"></a>
+<span class="sourceLineNo">354</span> fairq.add(queue);<a name="line.354"></a>
+<span class="sourceLineNo">355</span> }<a name="line.355"></a>
+<span class="sourceLineNo">356</span> }<a name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span> private static <T extends Comparable<T>> void removeFromRunQueue(FairQueue<T> fairq,<a name="line.358"></a>
+<span class="sourceLineNo">359</span> Queue<T> queue, Supplier<String> reason) {<a name="line.359"></a>
+<span class="sourceLineNo">360</span> if (LOG.isDebugEnabled()) {<a name="line.360"></a>
+<span class="sourceLineNo">361</span> LOG.debug("Remove {} from run queue because: {}", queue, reason.get());<a name="line.361"></a>
+<span class="sourceLineNo">362</span> }<a name="line.362"></a>
+<span class="sourceLineNo">363</span> if (AvlIterableList.isLinked(queue)) {<a name="line.363"></a>
+<span class="sourceLineNo">364</span> fairq.remove(queue);<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> // ============================================================================<a name="line.368"></a>
+<span class="sourceLineNo">369</span> // Table Queue Lookup Helpers<a name="line.369"></a>
+<span class="sourceLineNo">370</span> // ============================================================================<a name="line.370"></a>
+<span class="sourceLineNo">371</span> private TableQueue getTableQueue(TableName tableName) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span> TableQueue node = AvlTree.get(tableMap, tableName, TABLE_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> // ============================================================================<a name="line.375"></a>
-<span class="sourceLineNo">376</span> // Server Queue Lookup Helpers<a name="line.376"></a>
-<span class="sourceLineNo">377</span> // ============================================================================<a name="line.377"></a>
-<span class="sourceLineNo">378</span> private ServerQueue getServerQueue(ServerName serverName, ServerProcedureInterface proc) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span> final int index = getBucketIndex(serverBuckets, serverName.hashCode());<a name="line.379"></a>
-<span class="sourceLineNo">380</span> ServerQueue node = AvlTree.get(serverBuckets[index], serverName, SERVER_QUEUE_KEY_COMPARATOR);<a name="line.380"></a>
-<span class="sourceLineNo">381</span> if (node != null) {<a name="line.381"></a>
-<span class="sourceLineNo">382</span> return node;<a name="line.382"></a>
-<span class="sourceLineNo">383</span> }<a name="line.383"></a>
-<span class="sourceLineNo">384</span> int priority;<a name="line.384"></a>
-<span class="sourceLineNo">385</span> if (proc != null) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span> priority = MasterProcedureUtil.getServerPriority(proc);<a name="line.386"></a>
-<span class="sourceLineNo">387</span> } else {<a name="line.387"></a>
-<span class="sourceLineNo">388</span> priority = 1;<a name="line.388"></a>
-<span class="sourceLineNo">389</span> }<a name="line.389"></a>
-<span class="sourceLineNo">390</span> node = new ServerQueue(serverName, priority, locking.getServerLock(serverName));<a name="line.390"></a>
-<span class="sourceLineNo">391</span> serverBuckets[index] = AvlTree.insert(serverBuckets[index], node);<a name="line.391"></a>
-<span class="sourceLineNo">392</span> return node;<a name="line.392"></a>
-<span class="sourceLineNo">393</span> }<a name="line.393"></a>
-<span class="sourceLineNo">394</span><a name="line.394"></a>
-<span class="sourceLineNo">395</span> private void removeServerQueue(ServerName serverName) {<a name="line.395"></a>
-<span class="sourceLineNo">396</span> int index = getBucketIndex(serverBuckets, serverName.hashCode());<a name="line.396"></a>
-<span class="sourceLineNo">397</span> serverBuckets[index] =<a name="line.397"></a>
-<span class="sourceLineNo">398</span> AvlTree.remove(serverBuckets[index], serverName, SERVER_QUEUE_KEY_COMPARATOR);<a name="line.398"></a>
-<span class="sourceLineNo">399</span> locking.removeServerLock(serverName);<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 tryCleanupServerQueue(ServerName serverName, Procedure<?> proc) {<a name="line.402"></a>
-<span class="sourceLineNo">403</span> schedLock();<a name="line.403"></a>
-<span class="sourceLineNo">404</span> try {<a name="line.404"></a>
-<span class="sourceLineNo">405</span> int index = getBucketIndex(serverBuckets, serverName.hashCode());<a name="line.405"></a>
-<span class="sourceLineNo">406</span> ServerQueue node = AvlTree.get(serverBuckets[index], serverName, SERVER_QUEUE_KEY_COMPARATOR);<a name="line.406"></a>
-<span class="sourceLineNo">407</span> if (node == null) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span> return;<a name="line.408"></a>
-<span class="sourceLineNo">409</span> }<a name="line.409"></a>
-<span class="sourceLineNo">410</span><a name="line.410"></a>
-<span class="sourceLineNo">411</span> LockAndQueue lock = locking.getServerLock(serverName);<a name="line.411"></a>
-<span class="sourceLineNo">412</span> if (node.isEmpty() && lock.tryExclusiveLock(proc)) {<a name="line.412"></a>
-<span class="sourceLineNo">413</span> removeFromRunQueue(serverRunQueue, node);<a name="line.413"></a>
-<span class="sourceLineNo">414</span> removeServerQueue(serverName);<a name="line.414"></a>
-<span class="sourceLineNo">415</span> }<a name="line.415"></a>
-<span class="sourceLineNo">416</span> } finally {<a name="line.416"></a>
-<span class="sourceLineNo">417</span> schedUnlock();<a name="line.417"></a>
-<span class="sourceLineNo">418</span> }<a name="line.418"></a>
+<span class="sourceLineNo">375</span> node = new TableQueue(tableName, MasterProcedureUtil.getTablePriority(tableName),<a name="line.375"></a>
+<span class="sourceLineNo">376</span> locking.getTableLock(tableName), locking.getNamespaceLock(tableName.getNamespaceAsString()));<a name="line.376"></a>
+<span class="sourceLineNo">377</span> tableMap = AvlTree.insert(tableMap, node);<a name="line.377"></a>
+<span class="sourceLineNo">378</span> return node;<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 void removeTableQueue(TableName tableName) {<a name="line.381"></a>
+<span class="sourceLineNo">382</span> tableMap = AvlTree.remove(tableMap, tableName, TABLE_QUEUE_KEY_COMPARATOR);<a name="line.382"></a>
+<span class="sourceLineNo">383</span> locking.removeTableLock(tableName);<a name="line.383"></a>
+<span class="sourceLineNo">384</span> }<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span> private static boolean isTableProcedure(Procedure<?> proc) {<a name="line.386"></a>
+<span class="sourceLineNo">387</span> return proc instanceof TableProcedureInterface;<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> private static TableName getTableName(Procedure<?> proc) {<a name="line.390"></a>
+<span class="sourceLineNo">391</span> return ((TableProcedureInterface)proc).getTableName();<a name="line.391"></a>
+<span class="sourceLineNo">392</span> }<a name="line.392"></a>
+<span class="sourceLineNo">393</span><a name="line.393"></a>
+<span class="sourceLineNo">394</span> // ============================================================================<a name="line.394"></a>
+<span class="sourceLineNo">395</span> // Server Queue Lookup Helpers<a name="line.395"></a>
+<span class="sourceLineNo">396</span> // ============================================================================<a name="line.396"></a>
+<span class="sourceLineNo">397</span> private ServerQueue getServerQueue(ServerName serverName, ServerProcedureInterface proc) {<a name="line.397"></a>
+<span class="sourceLineNo">398</span> final int index = getBucketIndex(serverBuckets, serverName.hashCode());<a name="line.398"></a>
+<span class="sourceLineNo">399</span> ServerQueue node = AvlTree.get(serverBuckets[index], serverName, SERVER_QUEUE_KEY_COMPARATOR);<a name="line.399"></a>
+<span class="sourceLineNo">400</span> if (node != null) {<a name="line.400"></a>
+<span class="sourceLineNo">401</span> return node;<a name="line.401"></a>
+<span class="sourceLineNo">402</span> }<a name="line.402"></a>
+<span class="sourceLineNo">403</span> int priority;<a name="line.403"></a>
+<span class="sourceLineNo">404</span> if (proc != null) {<a name="line.404"></a>
+<span class="sourceLineNo">405</span> priority = MasterProcedureUtil.getServerPriority(proc);<a name="line.405"></a>
+<span class="sourceLineNo">406</span> } else {<a name="line.406"></a>
+<span class="sourceLineNo">407</span> priority = 1;<a name="line.407"></a>
+<span class="sourceLineNo">408</span> }<a name="line.408"></a>
+<span class="sourceLineNo">409</span> node = new ServerQueue(serverName, priority, locking.getServerLock(serverName));<a name="line.409"></a>
+<span class="sourceLineNo">410</span> serverBuckets[index] = AvlTree.insert(serverBuckets[index], node);<a name="line.410"></a>
+<span class="sourceLineNo">411</span> return node;<a name="line.411"></a>
+<span class="sourceLineNo">412</span> }<a name="line.412"></a>
+<span class="sourceLineNo">413</span><a name="line.413"></a>
+<span class="sourceLineNo">414</span> private void removeServerQueue(ServerName serverName) {<a name="line.414"></a>
+<span class="sourceLineNo">415</span> int index = getBucketIndex(serverBuckets, serverName.hashCode());<a name="line.415"></a>
+<span class="sourceLineNo">416</span> serverBuckets[index] =<a name="line.416"></a>
+<span class="sourceLineNo">417</span> AvlTree.remove(serverBuckets[index], serverName, SERVER_QUEUE_KEY_COMPARATOR);<a name="line.417"></a>
+<span class="sourceLineNo">418</span> locking.removeServerLock(serverName);<a name="line.418"></a>
<span class="sourceLineNo">419</span> }<a name="line.419"></a>
<span class="sourceLineNo">420</span><a name="line.420"></a>
-<span class="sourceLineNo">421</span> private static int getBucketIndex(Object[] buckets, int hashCode) {<a name="line.421"></a>
-<span class="sourceLineNo">422</span> return Math.abs(hashCode) % buckets.length;<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 isServerProcedure(Procedure<?> proc) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span> return proc instanceof ServerProcedureInterface;<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 ServerName getServerName(Procedure<?> proc) {<a name="line.429"></a>
-<span class="sourceLineNo">430</span> return ((ServerProcedureInterface)proc).getServerName();<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> // Peer Queue Lookup Helpers<a name="line.434"></a>
-<span class="sourceLineNo">435</span> // ============================================================================<a name="line.435"></a>
-<span class="sourceLineNo">436</span> private PeerQueue getPeerQueue(String peerId) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span> PeerQueue node = AvlTree.get(peerMap, peerId, PEER_QUEUE_KEY_COMPARATOR);<a name="line.437"></a>
-<span class="sourceLineNo">438</span> if (node != null) {<a name="line.438"></a>
-<span class="sourceLineNo">439</span> return node;<a name="line.439"></a>
-<span class="sourceLineNo">440</span> }<a name="line.440"></a>
-<span class="sourceLineNo">441</span> node = new PeerQueue(peerId, locking.getPeerLock(peerId));<a name="line.441"></a>
-<span class="sourceLineNo">442</span> peerMap = AvlTree.insert(peerMap, node);<a name="line.442"></a>
-<span class="sourceLineNo">443</span> return node;<a name="line.443"></a>
-<span class="sourceLineNo">444</span> }<a name="line.444"></a>
-<span class="sourceLineNo">445</span><a name="line.445"></a>
-<span class="sourceLineNo">446</span> private void removePeerQueue(String peerId) {<a name="line.446"></a>
-<span class="sourceLineNo">447</span> peerMap = AvlTree.remove(peerMap, peerId, PEER_QUEUE_KEY_COMPARATOR);<a name="line.447"></a>
-<span class="sourceLineNo">448</span> locking.removePeerLock(peerId);<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> private void tryCleanupPeerQueue(String peerId, Procedure<?> procedure) {<a name="line.451"></a>
-<span class="sourceLineNo">452</span> schedLock();<a name="line.452"></a>
-<span class="sourceLineNo">453</span> try {<a name="line.453"></a>
-<span class="sourceLineNo">454</span> PeerQueue queue = AvlTree.get(peerMap, peerId, PEER_QUEUE_KEY_COMPARATOR);<a name="line.454"></a>
-<span class="sourceLineNo">455</span> if (queue == null) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span> return;<a name="line.456"></a>
-<span class="sourceLineNo">457</span> }<a name="line.457"></a>
-<span class="sourceLineNo">458</span><a name="line.458"></a>
-<span class="sourceLineNo">459</span> final LockAndQueue lock = locking.getPeerLock(peerId);<a name="line.459"></a>
-<span class="sourceLineNo">460</span> if (queue.isEmpty() && lock.tryExclusiveLock(procedure)) {<a name="line.460"></a>
-<span class="sourceLineNo">461</span> removeFromRunQueue(peerRunQueue, queue);<a name="line.461"></a>
-<span class="sourceLineNo">462</span> removePeerQueue(peerId);<a name="line.462"></a>
-<span class="sourceLineNo">463</span> }<a name="line.463"></a>
-<span class="sourceLineNo">464</span> } finally {<a name="line.464"></a>
-<span class="sourceLineNo">465</span> schedUnlock();<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> private static boolean isPeerProcedure(Procedure<?> proc) {<a name="line.469"></a>
-<span class="sourceLineNo">470</span> return proc instanceof PeerProcedureInterface;<a name="line.470"></a>
-<span class="sourceLineNo">471</span> }<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span> private static String getPeerId(Procedure<?> proc) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span> return ((PeerProcedureInterface) proc).getPeerId();<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> // ============================================================================<a name="line.477"></a>
-<span class="sourceLineNo">478</span> // Meta Queue Lookup Helpers<a name="line.478"></a>
-<span class="sourceLineNo">479</span> // ============================================================================<a name="line.479"></a>
-<span class="sourceLineNo">480</span> private MetaQueue getMetaQueue() {<a name="line.480"></a>
-<span class="sourceLineNo">481</span> MetaQueue node = AvlTree.get(metaMap, TableName.META_TABLE_NAME, META_QUEUE_KEY_COMPARATOR);<a name="line.481"></a>
-<span class="sourceLineNo">482</span> if (node != null) {<a name="line.482"></a>
-<span class="sourceLineNo">483</span> return node;<a name="line.483"></a>
-<span class="sourceLineNo">484</span> }<a name="line.484"></a>
-<span class="sourceLineNo">485</span> node = new MetaQueue(locking.getMetaLock());<a name="line.485"></a>
-<span class="sourceLineNo">486</span> metaMap = AvlTree.insert(metaMap, node);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> return node;<a name="line.487"></a>
+<span class="sourceLineNo">421</span> private void tryCleanupServerQueue(ServerName serverName, Procedure<?> proc) {<a name="line.421"></a>
+<span class="sourceLineNo">422</span> schedLock();<a name="line.422"></a>
+<span class="sourceLineNo">423</span> try {<a name="line.423"></a>
+<span class="sourceLineNo">424</span> int index = getBucketIndex(serverBuckets, serverName.hashCode());<a name="line.424"></a>
+<span class="sourceLineNo">425</span> ServerQueue node = AvlTree.get(serverBuckets[index], serverName, SERVER_QUEUE_KEY_COMPARATOR);<a name="line.425"></a>
+<span class="sourceLineNo">426</span> if (node == null) {<a name="line.426"></a>
+<span class="sourceLineNo">427</span> return;<a name="line.427"></a>
+<span class="sourceLineNo">428</span> }<a name="line.428"></a>
+<span class="sourceLineNo">429</span><a name="line.429"></a>
+<span class="sourceLineNo">430</span> LockAndQueue lock = locking.getServerLock(serverName);<a name="line.430"></a>
+<span class="sourceLineNo">431</span> if (node.isEmpty() && lock.tryExclusiveLock(proc)) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span> removeFromRunQueue(serverRunQueue, node,<a name="line.432"></a>
+<span class="sourceLineNo">433</span> () -> "clean up server queue after " + proc + " completed");<a name="line.433"></a>
+<span class="sourceLineNo">434</span> removeServerQueue(serverName);<a name="line.434"></a>
+<span class="sourceLineNo">435</span> }<a name="line.435"></a>
+<span class="sourceLineNo">436</span> } finally {<a name="line.436"></a>
+<span class="sourceLineNo">437</span> schedUnlock();<a name="line.437"></a>
+<span class="sourceLineNo">438</span> }<a name="line.438"></a>
+<span class="sourceLineNo">439</span> }<a name="line.439"></a>
+<span class="sourceLineNo">440</span><a name="line.440"></a>
+<span class="sourceLineNo">441</span> private static int getBucketIndex(Object[] buckets, int hashCode) {<a name="line.441"></a>
+<span class="sourceLineNo">442</span> return Math.abs(hashCode) % buckets.length;<a name="line.442"></a>
+<span class="sourceLineNo">443</span> }<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span> private static boolean isServerProcedure(Procedure<?> proc) {<a name="line.445"></a>
+<span class="sourceLineNo">446</span> return proc instanceof ServerProcedureInterface;<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> private static ServerName getServerName(Procedure<?> proc) {<a name="line.449"></a>
+<span class="sourceLineNo">450</span> return ((ServerProcedureInterface)proc).getServerName();<a name="line.450"></a>
+<span class="sourceLineNo">451</span> }<a name="line.451"></a>
+<span class="sourceLineNo">452</span><a name="line.452"></a>
+<span class="sourceLineNo">453</span> // ============================================================================<a name="line.453"></a>
+<span class="sourceLineNo">454</span> // Peer Queue Lookup Helpers<a name="line.454"></a>
+<span class="sourceLineNo">455</span> // ============================================================================<a name="line.455"></a>
<TRUNCATED>