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/10/29 14:54:45 UTC
[03/51] [partial] hbase-site git commit: Published site at
d5e4faacc354c1bc4d93efa71ca97ee3a056123e.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b5e107c3/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureScheduler.TestRegionProcedure.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureScheduler.TestRegionProcedure.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureScheduler.TestRegionProcedure.html
index c9e0e55..f1b9105 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureScheduler.TestRegionProcedure.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureScheduler.TestRegionProcedure.html
@@ -37,157 +37,157 @@
<span class="sourceLineNo">029</span>import java.util.Arrays;<a name="line.29"></a>
<span class="sourceLineNo">030</span>import java.util.List;<a name="line.30"></a>
<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.HRegionInfo;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.ServerName;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.TableName;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.client.RegionInfoBuilder;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.master.locking.LockProcedure;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.master.procedure.TableProcedureInterface.TableOperationType;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.procedure2.LockType;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.procedure2.LockedResource;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.procedure2.LockedResourceType;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.procedure2.ProcedureEvent;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility.TestProcedure;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.junit.After;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.junit.Before;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.junit.ClassRule;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.junit.Rule;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.junit.Test;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.junit.experimental.categories.Category;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.junit.rules.TestName;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.slf4j.Logger;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.slf4j.LoggerFactory;<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>@Category({MasterTests.class, SmallTests.class})<a name="line.58"></a>
-<span class="sourceLineNo">059</span>public class TestMasterProcedureScheduler {<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span> @ClassRule<a name="line.61"></a>
-<span class="sourceLineNo">062</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.62"></a>
-<span class="sourceLineNo">063</span> HBaseClassTestRule.forClass(TestMasterProcedureScheduler.class);<a name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span> private static final Logger LOG = LoggerFactory.getLogger(TestMasterProcedureScheduler.class);<a name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span> private MasterProcedureScheduler queue;<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span> @Rule<a name="line.69"></a>
-<span class="sourceLineNo">070</span> public TestName name = new TestName();<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span> @Before<a name="line.72"></a>
-<span class="sourceLineNo">073</span> public void setUp() throws IOException {<a name="line.73"></a>
-<span class="sourceLineNo">074</span> queue = new MasterProcedureScheduler();<a name="line.74"></a>
-<span class="sourceLineNo">075</span> queue.start();<a name="line.75"></a>
-<span class="sourceLineNo">076</span> }<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span> @After<a name="line.78"></a>
-<span class="sourceLineNo">079</span> public void tearDown() throws IOException {<a name="line.79"></a>
-<span class="sourceLineNo">080</span> assertEquals("proc-queue expected to be empty", 0, queue.size());<a name="line.80"></a>
-<span class="sourceLineNo">081</span> queue.stop();<a name="line.81"></a>
-<span class="sourceLineNo">082</span> queue.clear();<a name="line.82"></a>
-<span class="sourceLineNo">083</span> }<a name="line.83"></a>
-<span class="sourceLineNo">084</span><a name="line.84"></a>
-<span class="sourceLineNo">085</span> /**<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * Verify simple create/insert/fetch/delete of the table queue.<a name="line.86"></a>
-<span class="sourceLineNo">087</span> */<a name="line.87"></a>
-<span class="sourceLineNo">088</span> @Test<a name="line.88"></a>
-<span class="sourceLineNo">089</span> public void testSimpleTableOpsQueues() throws Exception {<a name="line.89"></a>
-<span class="sourceLineNo">090</span> final int NUM_TABLES = 10;<a name="line.90"></a>
-<span class="sourceLineNo">091</span> final int NUM_ITEMS = 10;<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span> int count = 0;<a name="line.93"></a>
-<span class="sourceLineNo">094</span> for (int i = 1; i <= NUM_TABLES; ++i) {<a name="line.94"></a>
-<span class="sourceLineNo">095</span> TableName tableName = TableName.valueOf(String.format("test-%04d", i));<a name="line.95"></a>
-<span class="sourceLineNo">096</span> // insert items<a name="line.96"></a>
-<span class="sourceLineNo">097</span> for (int j = 1; j <= NUM_ITEMS; ++j) {<a name="line.97"></a>
-<span class="sourceLineNo">098</span> queue.addBack(new TestTableProcedure(i * 1000 + j, tableName,<a name="line.98"></a>
-<span class="sourceLineNo">099</span> TableProcedureInterface.TableOperationType.EDIT));<a name="line.99"></a>
-<span class="sourceLineNo">100</span> assertEquals(++count, queue.size());<a name="line.100"></a>
-<span class="sourceLineNo">101</span> }<a name="line.101"></a>
-<span class="sourceLineNo">102</span> }<a name="line.102"></a>
-<span class="sourceLineNo">103</span> assertEquals(NUM_TABLES * NUM_ITEMS, queue.size());<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span> for (int j = 1; j <= NUM_ITEMS; ++j) {<a name="line.105"></a>
-<span class="sourceLineNo">106</span> for (int i = 1; i <= NUM_TABLES; ++i) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span> Procedure proc = queue.poll();<a name="line.107"></a>
-<span class="sourceLineNo">108</span> assertTrue(proc != null);<a name="line.108"></a>
-<span class="sourceLineNo">109</span> TableName tableName = ((TestTableProcedure)proc).getTableName();<a name="line.109"></a>
-<span class="sourceLineNo">110</span> queue.waitTableExclusiveLock(proc, tableName);<a name="line.110"></a>
-<span class="sourceLineNo">111</span> queue.wakeTableExclusiveLock(proc, tableName);<a name="line.111"></a>
-<span class="sourceLineNo">112</span> queue.completionCleanup(proc);<a name="line.112"></a>
-<span class="sourceLineNo">113</span> assertEquals(--count, queue.size());<a name="line.113"></a>
-<span class="sourceLineNo">114</span> assertEquals(i * 1000 + j, proc.getProcId());<a name="line.114"></a>
-<span class="sourceLineNo">115</span> }<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span> assertEquals(0, queue.size());<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span> for (int i = 1; i <= NUM_TABLES; ++i) {<a name="line.119"></a>
-<span class="sourceLineNo">120</span> final TableName tableName = TableName.valueOf(String.format("test-%04d", i));<a name="line.120"></a>
-<span class="sourceLineNo">121</span> final TestTableProcedure dummyProc = new TestTableProcedure(100, tableName,<a name="line.121"></a>
-<span class="sourceLineNo">122</span> TableProcedureInterface.TableOperationType.DELETE);<a name="line.122"></a>
-<span class="sourceLineNo">123</span> // complete the table deletion<a name="line.123"></a>
-<span class="sourceLineNo">124</span> assertTrue(queue.markTableAsDeleted(tableName, dummyProc));<a name="line.124"></a>
-<span class="sourceLineNo">125</span> }<a name="line.125"></a>
-<span class="sourceLineNo">126</span> }<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> * Check that the table queue is not deletable until every procedure<a name="line.129"></a>
-<span class="sourceLineNo">130</span> * in-progress is completed (this is a special case for write-locks).<a name="line.130"></a>
-<span class="sourceLineNo">131</span> */<a name="line.131"></a>
-<span class="sourceLineNo">132</span> @Test<a name="line.132"></a>
-<span class="sourceLineNo">133</span> public void testCreateDeleteTableOperationsWithWriteLock() throws Exception {<a name="line.133"></a>
-<span class="sourceLineNo">134</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.134"></a>
-<span class="sourceLineNo">135</span><a name="line.135"></a>
-<span class="sourceLineNo">136</span> final TestTableProcedure dummyProc = new TestTableProcedure(100, tableName,<a name="line.136"></a>
-<span class="sourceLineNo">137</span> TableProcedureInterface.TableOperationType.DELETE);<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span> queue.addBack(new TestTableProcedure(1, tableName,<a name="line.139"></a>
-<span class="sourceLineNo">140</span> TableProcedureInterface.TableOperationType.EDIT));<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> // table can't be deleted because one item is in the queue<a name="line.142"></a>
-<span class="sourceLineNo">143</span> assertFalse(queue.markTableAsDeleted(tableName, dummyProc));<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span> // fetch item and take a lock<a name="line.145"></a>
-<span class="sourceLineNo">146</span> Procedure proc = queue.poll();<a name="line.146"></a>
-<span class="sourceLineNo">147</span> assertEquals(1, proc.getProcId());<a name="line.147"></a>
-<span class="sourceLineNo">148</span> // take the xlock<a name="line.148"></a>
-<span class="sourceLineNo">149</span> assertEquals(false, queue.waitTableExclusiveLock(proc, tableName));<a name="line.149"></a>
-<span class="sourceLineNo">150</span> // table can't be deleted because we have the lock<a name="line.150"></a>
-<span class="sourceLineNo">151</span> assertEquals(0, queue.size());<a name="line.151"></a>
-<span class="sourceLineNo">152</span> assertFalse(queue.markTableAsDeleted(tableName, dummyProc));<a name="line.152"></a>
-<span class="sourceLineNo">153</span> // release the xlock<a name="line.153"></a>
-<span class="sourceLineNo">154</span> queue.wakeTableExclusiveLock(proc, tableName);<a name="line.154"></a>
-<span class="sourceLineNo">155</span> // complete the table deletion<a name="line.155"></a>
-<span class="sourceLineNo">156</span> assertTrue(queue.markTableAsDeleted(tableName, proc));<a name="line.156"></a>
-<span class="sourceLineNo">157</span> }<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span> /**<a name="line.159"></a>
-<span class="sourceLineNo">160</span> * Check that the table queue is not deletable until every procedure<a name="line.160"></a>
-<span class="sourceLineNo">161</span> * in-progress is completed (this is a special case for read-locks).<a name="line.161"></a>
-<span class="sourceLineNo">162</span> */<a name="line.162"></a>
-<span class="sourceLineNo">163</span> @Test<a name="line.163"></a>
-<span class="sourceLineNo">164</span> public void testCreateDeleteTableOperationsWithReadLock() throws Exception {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.165"></a>
-<span class="sourceLineNo">166</span> final int nitems = 2;<a name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span> final TestTableProcedure dummyProc = new TestTableProcedure(100, tableName,<a name="line.168"></a>
-<span class="sourceLineNo">169</span> TableProcedureInterface.TableOperationType.DELETE);<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span> for (int i = 1; i <= nitems; ++i) {<a name="line.171"></a>
-<span class="sourceLineNo">172</span> queue.addBack(new TestTableProcedure(i, tableName,<a name="line.172"></a>
-<span class="sourceLineNo">173</span> TableProcedureInterface.TableOperationType.READ));<a name="line.173"></a>
-<span class="sourceLineNo">174</span> }<a name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span> // table can't be deleted because one item is in the queue<a name="line.176"></a>
-<span class="sourceLineNo">177</span> assertFalse(queue.markTableAsDeleted(tableName, dummyProc));<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span> Procedure[] procs = new Procedure[nitems];<a name="line.179"></a>
-<span class="sourceLineNo">180</span> for (int i = 0; i < nitems; ++i) {<a name="line.180"></a>
-<span class="sourceLineNo">181</span> // fetch item and take a lock<a name="line.181"></a>
-<span class="sourceLineNo">182</span> Procedure proc = procs[i] = queue.poll();<a name="line.182"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.ServerName;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.TableName;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.client.RegionInfoBuilder;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.master.locking.LockProcedure;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.master.procedure.TableProcedureInterface.TableOperationType;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.procedure2.LockType;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.procedure2.LockedResource;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.procedure2.LockedResourceType;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.procedure2.Procedure;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.procedure2.ProcedureEvent;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility.TestProcedure;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.testclassification.MasterTests;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.testclassification.SmallTests;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.junit.After;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.junit.Before;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.junit.ClassRule;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.junit.Rule;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.junit.Test;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.junit.experimental.categories.Category;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.junit.rules.TestName;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.slf4j.Logger;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.slf4j.LoggerFactory;<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>@Category({ MasterTests.class, SmallTests.class })<a name="line.57"></a>
+<span class="sourceLineNo">058</span>public class TestMasterProcedureScheduler {<a name="line.58"></a>
+<span class="sourceLineNo">059</span><a name="line.59"></a>
+<span class="sourceLineNo">060</span> @ClassRule<a name="line.60"></a>
+<span class="sourceLineNo">061</span> public static final HBaseClassTestRule CLASS_RULE =<a name="line.61"></a>
+<span class="sourceLineNo">062</span> HBaseClassTestRule.forClass(TestMasterProcedureScheduler.class);<a name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span> private static final Logger LOG = LoggerFactory.getLogger(TestMasterProcedureScheduler.class);<a name="line.64"></a>
+<span class="sourceLineNo">065</span><a name="line.65"></a>
+<span class="sourceLineNo">066</span> private MasterProcedureScheduler queue;<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span> @Rule<a name="line.68"></a>
+<span class="sourceLineNo">069</span> public TestName name = new TestName();<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span> @Before<a name="line.71"></a>
+<span class="sourceLineNo">072</span> public void setUp() throws IOException {<a name="line.72"></a>
+<span class="sourceLineNo">073</span> queue = new MasterProcedureScheduler(pid -> null);<a name="line.73"></a>
+<span class="sourceLineNo">074</span> queue.start();<a name="line.74"></a>
+<span class="sourceLineNo">075</span> }<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span> @After<a name="line.77"></a>
+<span class="sourceLineNo">078</span> public void tearDown() throws IOException {<a name="line.78"></a>
+<span class="sourceLineNo">079</span> assertEquals("proc-queue expected to be empty", 0, queue.size());<a name="line.79"></a>
+<span class="sourceLineNo">080</span> queue.stop();<a name="line.80"></a>
+<span class="sourceLineNo">081</span> queue.clear();<a name="line.81"></a>
+<span class="sourceLineNo">082</span> }<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span> /**<a name="line.84"></a>
+<span class="sourceLineNo">085</span> * Verify simple create/insert/fetch/delete of the table queue.<a name="line.85"></a>
+<span class="sourceLineNo">086</span> */<a name="line.86"></a>
+<span class="sourceLineNo">087</span> @Test<a name="line.87"></a>
+<span class="sourceLineNo">088</span> public void testSimpleTableOpsQueues() throws Exception {<a name="line.88"></a>
+<span class="sourceLineNo">089</span> final int NUM_TABLES = 10;<a name="line.89"></a>
+<span class="sourceLineNo">090</span> final int NUM_ITEMS = 10;<a name="line.90"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span> int count = 0;<a name="line.92"></a>
+<span class="sourceLineNo">093</span> for (int i = 1; i <= NUM_TABLES; ++i) {<a name="line.93"></a>
+<span class="sourceLineNo">094</span> TableName tableName = TableName.valueOf(String.format("test-%04d", i));<a name="line.94"></a>
+<span class="sourceLineNo">095</span> // insert items<a name="line.95"></a>
+<span class="sourceLineNo">096</span> for (int j = 1; j <= NUM_ITEMS; ++j) {<a name="line.96"></a>
+<span class="sourceLineNo">097</span> queue.addBack(new TestTableProcedure(i * 1000 + j, tableName,<a name="line.97"></a>
+<span class="sourceLineNo">098</span> TableProcedureInterface.TableOperationType.EDIT));<a name="line.98"></a>
+<span class="sourceLineNo">099</span> assertEquals(++count, queue.size());<a name="line.99"></a>
+<span class="sourceLineNo">100</span> }<a name="line.100"></a>
+<span class="sourceLineNo">101</span> }<a name="line.101"></a>
+<span class="sourceLineNo">102</span> assertEquals(NUM_TABLES * NUM_ITEMS, queue.size());<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span> for (int j = 1; j <= NUM_ITEMS; ++j) {<a name="line.104"></a>
+<span class="sourceLineNo">105</span> for (int i = 1; i <= NUM_TABLES; ++i) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> Procedure<?> proc = queue.poll();<a name="line.106"></a>
+<span class="sourceLineNo">107</span> assertTrue(proc != null);<a name="line.107"></a>
+<span class="sourceLineNo">108</span> TableName tableName = ((TestTableProcedure) proc).getTableName();<a name="line.108"></a>
+<span class="sourceLineNo">109</span> queue.waitTableExclusiveLock(proc, tableName);<a name="line.109"></a>
+<span class="sourceLineNo">110</span> queue.wakeTableExclusiveLock(proc, tableName);<a name="line.110"></a>
+<span class="sourceLineNo">111</span> queue.completionCleanup(proc);<a name="line.111"></a>
+<span class="sourceLineNo">112</span> assertEquals(--count, queue.size());<a name="line.112"></a>
+<span class="sourceLineNo">113</span> assertEquals(i * 1000 + j, proc.getProcId());<a name="line.113"></a>
+<span class="sourceLineNo">114</span> }<a name="line.114"></a>
+<span class="sourceLineNo">115</span> }<a name="line.115"></a>
+<span class="sourceLineNo">116</span> assertEquals(0, queue.size());<a name="line.116"></a>
+<span class="sourceLineNo">117</span><a name="line.117"></a>
+<span class="sourceLineNo">118</span> for (int i = 1; i <= NUM_TABLES; ++i) {<a name="line.118"></a>
+<span class="sourceLineNo">119</span> final TableName tableName = TableName.valueOf(String.format("test-%04d", i));<a name="line.119"></a>
+<span class="sourceLineNo">120</span> final TestTableProcedure dummyProc =<a name="line.120"></a>
+<span class="sourceLineNo">121</span> new TestTableProcedure(100, tableName, TableProcedureInterface.TableOperationType.DELETE);<a name="line.121"></a>
+<span class="sourceLineNo">122</span> // complete the table deletion<a name="line.122"></a>
+<span class="sourceLineNo">123</span> assertTrue(queue.markTableAsDeleted(tableName, dummyProc));<a name="line.123"></a>
+<span class="sourceLineNo">124</span> }<a name="line.124"></a>
+<span class="sourceLineNo">125</span> }<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span> /**<a name="line.127"></a>
+<span class="sourceLineNo">128</span> * Check that the table queue is not deletable until every procedure in-progress is completed<a name="line.128"></a>
+<span class="sourceLineNo">129</span> * (this is a special case for write-locks).<a name="line.129"></a>
+<span class="sourceLineNo">130</span> */<a name="line.130"></a>
+<span class="sourceLineNo">131</span> @Test<a name="line.131"></a>
+<span class="sourceLineNo">132</span> public void testCreateDeleteTableOperationsWithWriteLock() throws Exception {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span> final TestTableProcedure dummyProc =<a name="line.135"></a>
+<span class="sourceLineNo">136</span> new TestTableProcedure(100, tableName, TableProcedureInterface.TableOperationType.DELETE);<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span> queue.addBack(<a name="line.138"></a>
+<span class="sourceLineNo">139</span> new TestTableProcedure(1, tableName, TableProcedureInterface.TableOperationType.EDIT));<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span> // table can't be deleted because one item is in the queue<a name="line.141"></a>
+<span class="sourceLineNo">142</span> assertFalse(queue.markTableAsDeleted(tableName, dummyProc));<a name="line.142"></a>
+<span class="sourceLineNo">143</span><a name="line.143"></a>
+<span class="sourceLineNo">144</span> // fetch item and take a lock<a name="line.144"></a>
+<span class="sourceLineNo">145</span> Procedure<?> proc = queue.poll();<a name="line.145"></a>
+<span class="sourceLineNo">146</span> assertEquals(1, proc.getProcId());<a name="line.146"></a>
+<span class="sourceLineNo">147</span> // take the xlock<a name="line.147"></a>
+<span class="sourceLineNo">148</span> assertEquals(false, queue.waitTableExclusiveLock(proc, tableName));<a name="line.148"></a>
+<span class="sourceLineNo">149</span> // table can't be deleted because we have the lock<a name="line.149"></a>
+<span class="sourceLineNo">150</span> assertEquals(0, queue.size());<a name="line.150"></a>
+<span class="sourceLineNo">151</span> assertFalse(queue.markTableAsDeleted(tableName, dummyProc));<a name="line.151"></a>
+<span class="sourceLineNo">152</span> // release the xlock<a name="line.152"></a>
+<span class="sourceLineNo">153</span> queue.wakeTableExclusiveLock(proc, tableName);<a name="line.153"></a>
+<span class="sourceLineNo">154</span> // complete the table deletion<a name="line.154"></a>
+<span class="sourceLineNo">155</span> assertTrue(queue.markTableAsDeleted(tableName, proc));<a name="line.155"></a>
+<span class="sourceLineNo">156</span> }<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span> /**<a name="line.158"></a>
+<span class="sourceLineNo">159</span> * Check that the table queue is not deletable until every procedure in-progress is completed<a name="line.159"></a>
+<span class="sourceLineNo">160</span> * (this is a special case for read-locks).<a name="line.160"></a>
+<span class="sourceLineNo">161</span> */<a name="line.161"></a>
+<span class="sourceLineNo">162</span> @Test<a name="line.162"></a>
+<span class="sourceLineNo">163</span> public void testCreateDeleteTableOperationsWithReadLock() throws Exception {<a name="line.163"></a>
+<span class="sourceLineNo">164</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.164"></a>
+<span class="sourceLineNo">165</span> final int nitems = 2;<a name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span> final TestTableProcedure dummyProc =<a name="line.167"></a>
+<span class="sourceLineNo">168</span> new TestTableProcedure(100, tableName, TableProcedureInterface.TableOperationType.DELETE);<a name="line.168"></a>
+<span class="sourceLineNo">169</span><a name="line.169"></a>
+<span class="sourceLineNo">170</span> for (int i = 1; i <= nitems; ++i) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> queue.addBack(<a name="line.171"></a>
+<span class="sourceLineNo">172</span> new TestTableProcedure(i, tableName, TableProcedureInterface.TableOperationType.READ));<a name="line.172"></a>
+<span class="sourceLineNo">173</span> }<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span> // table can't be deleted because one item is in the queue<a name="line.175"></a>
+<span class="sourceLineNo">176</span> assertFalse(queue.markTableAsDeleted(tableName, dummyProc));<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span> Procedure<?>[] procs = new Procedure[nitems];<a name="line.178"></a>
+<span class="sourceLineNo">179</span> for (int i = 0; i < nitems; ++i) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> // fetch item and take a lock<a name="line.180"></a>
+<span class="sourceLineNo">181</span> Procedure<?> proc = queue.poll();<a name="line.181"></a>
+<span class="sourceLineNo">182</span> procs[i] = proc;<a name="line.182"></a>
<span class="sourceLineNo">183</span> assertEquals(i + 1, proc.getProcId());<a name="line.183"></a>
<span class="sourceLineNo">184</span> // take the rlock<a name="line.184"></a>
<span class="sourceLineNo">185</span> assertEquals(false, queue.waitTableSharedLock(proc, tableName));<a name="line.185"></a>
@@ -214,160 +214,160 @@
<span class="sourceLineNo">206</span> @Test<a name="line.206"></a>
<span class="sourceLineNo">207</span> public void testVerifyRwLocks() throws Exception {<a name="line.207"></a>
<span class="sourceLineNo">208</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.208"></a>
-<span class="sourceLineNo">209</span> queue.addBack(new TestTableProcedure(1, tableName,<a name="line.209"></a>
-<span class="sourceLineNo">210</span> TableProcedureInterface.TableOperationType.EDIT));<a name="line.210"></a>
-<span class="sourceLineNo">211</span> queue.addBack(new TestTableProcedure(2, tableName,<a name="line.211"></a>
-<span class="sourceLineNo">212</span> TableProcedureInterface.TableOperationType.READ));<a name="line.212"></a>
-<span class="sourceLineNo">213</span> queue.addBack(new TestTableProcedure(3, tableName,<a name="line.213"></a>
-<span class="sourceLineNo">214</span> TableProcedureInterface.TableOperationType.EDIT));<a name="line.214"></a>
-<span class="sourceLineNo">215</span> queue.addBack(new TestTableProcedure(4, tableName,<a name="line.215"></a>
-<span class="sourceLineNo">216</span> TableProcedureInterface.TableOperationType.READ));<a name="line.216"></a>
-<span class="sourceLineNo">217</span> queue.addBack(new TestTableProcedure(5, tableName,<a name="line.217"></a>
-<span class="sourceLineNo">218</span> TableProcedureInterface.TableOperationType.READ));<a name="line.218"></a>
-<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span> // Fetch the 1st item and take the write lock<a name="line.220"></a>
-<span class="sourceLineNo">221</span> Procedure proc = queue.poll();<a name="line.221"></a>
-<span class="sourceLineNo">222</span> assertEquals(1, proc.getProcId());<a name="line.222"></a>
-<span class="sourceLineNo">223</span> assertEquals(false, queue.waitTableExclusiveLock(proc, tableName));<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span> // Fetch the 2nd item and verify that the lock can't be acquired<a name="line.225"></a>
-<span class="sourceLineNo">226</span> assertEquals(null, queue.poll(0));<a name="line.226"></a>
-<span class="sourceLineNo">227</span><a name="line.227"></a>
-<span class="sourceLineNo">228</span> // Release the write lock and acquire the read lock<a name="line.228"></a>
-<span class="sourceLineNo">229</span> queue.wakeTableExclusiveLock(proc, tableName);<a name="line.229"></a>
-<span class="sourceLineNo">230</span><a name="line.230"></a>
-<span class="sourceLineNo">231</span> // Fetch the 2nd item and take the read lock<a name="line.231"></a>
-<span class="sourceLineNo">232</span> Procedure rdProc = queue.poll();<a name="line.232"></a>
-<span class="sourceLineNo">233</span> assertEquals(2, rdProc.getProcId());<a name="line.233"></a>
-<span class="sourceLineNo">234</span> assertEquals(false, queue.waitTableSharedLock(rdProc, tableName));<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span> // Fetch the 3rd item and verify that the lock can't be acquired<a name="line.236"></a>
-<span class="sourceLineNo">237</span> assertEquals(null, queue.poll(0));<a name="line.237"></a>
-<span class="sourceLineNo">238</span><a name="line.238"></a>
-<span class="sourceLineNo">239</span> // release the rdlock of item 2 and take the wrlock for the 3d item<a name="line.239"></a>
-<span class="sourceLineNo">240</span> queue.wakeTableSharedLock(rdProc, tableName);<a name="line.240"></a>
-<span class="sourceLineNo">241</span><a name="line.241"></a>
-<span class="sourceLineNo">242</span> // Fetch the 3rd item and take the write lock<a name="line.242"></a>
-<span class="sourceLineNo">243</span> Procedure wrProc = queue.poll();<a name="line.243"></a>
-<span class="sourceLineNo">244</span> assertEquals(false, queue.waitTableExclusiveLock(wrProc, tableName));<a name="line.244"></a>
-<span class="sourceLineNo">245</span><a name="line.245"></a>
-<span class="sourceLineNo">246</span> // Fetch 4th item and verify that the lock can't be acquired<a name="line.246"></a>
-<span class="sourceLineNo">247</span> assertEquals(null, queue.poll(0));<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span> // Release the write lock and acquire the read lock<a name="line.249"></a>
-<span class="sourceLineNo">250</span> queue.wakeTableExclusiveLock(wrProc, tableName);<a name="line.250"></a>
-<span class="sourceLineNo">251</span><a name="line.251"></a>
-<span class="sourceLineNo">252</span> // Fetch the 4th item and take the read lock<a name="line.252"></a>
-<span class="sourceLineNo">253</span> rdProc = queue.poll();<a name="line.253"></a>
-<span class="sourceLineNo">254</span> assertEquals(4, rdProc.getProcId());<a name="line.254"></a>
-<span class="sourceLineNo">255</span> assertEquals(false, queue.waitTableSharedLock(rdProc, tableName));<a name="line.255"></a>
-<span class="sourceLineNo">256</span><a name="line.256"></a>
-<span class="sourceLineNo">257</span> // Fetch the 4th item and take the read lock<a name="line.257"></a>
-<span class="sourceLineNo">258</span> Procedure rdProc2 = queue.poll();<a name="line.258"></a>
-<span class="sourceLineNo">259</span> assertEquals(5, rdProc2.getProcId());<a name="line.259"></a>
-<span class="sourceLineNo">260</span> assertEquals(false, queue.waitTableSharedLock(rdProc2, tableName));<a name="line.260"></a>
-<span class="sourceLineNo">261</span><a name="line.261"></a>
-<span class="sourceLineNo">262</span> // Release 4th and 5th read-lock<a name="line.262"></a>
-<span class="sourceLineNo">263</span> queue.wakeTableSharedLock(rdProc, tableName);<a name="line.263"></a>
-<span class="sourceLineNo">264</span> queue.wakeTableSharedLock(rdProc2, tableName);<a name="line.264"></a>
-<span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span> // remove table queue<a name="line.266"></a>
-<span class="sourceLineNo">267</span> assertEquals(0, queue.size());<a name="line.267"></a>
-<span class="sourceLineNo">268</span> assertTrue("queue should be deleted", queue.markTableAsDeleted(tableName, wrProc));<a name="line.268"></a>
-<span class="sourceLineNo">269</span> }<a name="line.269"></a>
-<span class="sourceLineNo">270</span><a name="line.270"></a>
-<span class="sourceLineNo">271</span> @Test<a name="line.271"></a>
-<span class="sourceLineNo">272</span> public void testVerifyNamespaceRwLocks() throws Exception {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> String nsName1 = "ns1";<a name="line.273"></a>
-<span class="sourceLineNo">274</span> String nsName2 = "ns2";<a name="line.274"></a>
-<span class="sourceLineNo">275</span> TableName tableName1 = TableName.valueOf(nsName1, name.getMethodName());<a name="line.275"></a>
-<span class="sourceLineNo">276</span> TableName tableName2 = TableName.valueOf(nsName2, name.getMethodName());<a name="line.276"></a>
-<span class="sourceLineNo">277</span> queue.addBack(new TestNamespaceProcedure(1, nsName1,<a name="line.277"></a>
-<span class="sourceLineNo">278</span> TableProcedureInterface.TableOperationType.EDIT));<a name="line.278"></a>
-<span class="sourceLineNo">279</span> queue.addBack(new TestTableProcedure(2, tableName1,<a name="line.279"></a>
-<span class="sourceLineNo">280</span> TableProcedureInterface.TableOperationType.EDIT));<a name="line.280"></a>
-<span class="sourceLineNo">281</span> queue.addBack(new TestTableProcedure(3, tableName2,<a name="line.281"></a>
-<span class="sourceLineNo">282</span> TableProcedureInterface.TableOperationType.EDIT));<a name="line.282"></a>
-<span class="sourceLineNo">283</span> queue.addBack(new TestNamespaceProcedure(4, nsName2,<a name="line.283"></a>
-<span class="sourceLineNo">284</span> TableProcedureInterface.TableOperationType.EDIT));<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span> // Fetch the 1st item and take the write lock<a name="line.286"></a>
-<span class="sourceLineNo">287</span> Procedure procNs1 = queue.poll();<a name="line.287"></a>
-<span class="sourceLineNo">288</span> assertEquals(1, procNs1.getProcId());<a name="line.288"></a>
-<span class="sourceLineNo">289</span> assertFalse(queue.waitNamespaceExclusiveLock(procNs1, nsName1));<a name="line.289"></a>
-<span class="sourceLineNo">290</span><a name="line.290"></a>
-<span class="sourceLineNo">291</span> // namespace table has higher priority so we still return procedure for it<a name="line.291"></a>
-<span class="sourceLineNo">292</span> Procedure procNs2 = queue.poll();<a name="line.292"></a>
-<span class="sourceLineNo">293</span> assertEquals(4, procNs2.getProcId());<a name="line.293"></a>
-<span class="sourceLineNo">294</span> assertFalse(queue.waitNamespaceExclusiveLock(procNs2, nsName2));<a name="line.294"></a>
-<span class="sourceLineNo">295</span> queue.wakeNamespaceExclusiveLock(procNs2, nsName2);<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span> // add procNs2 back in the queue<a name="line.297"></a>
-<span class="sourceLineNo">298</span> queue.yield(procNs2);<a name="line.298"></a>
-<span class="sourceLineNo">299</span><a name="line.299"></a>
-<span class="sourceLineNo">300</span> // again<a name="line.300"></a>
-<span class="sourceLineNo">301</span> procNs2 = queue.poll();<a name="line.301"></a>
-<span class="sourceLineNo">302</span> assertEquals(4, procNs2.getProcId());<a name="line.302"></a>
-<span class="sourceLineNo">303</span> assertFalse(queue.waitNamespaceExclusiveLock(procNs2, nsName2));<a name="line.303"></a>
-<span class="sourceLineNo">304</span><a name="line.304"></a>
-<span class="sourceLineNo">305</span> // ns1 and ns2 are both locked so we get nothing<a name="line.305"></a>
-<span class="sourceLineNo">306</span> assertNull(queue.poll());<a name="line.306"></a>
-<span class="sourceLineNo">307</span><a name="line.307"></a>
-<span class="sourceLineNo">308</span> // release the ns1 lock<a name="line.308"></a>
-<span class="sourceLineNo">309</span> queue.wakeNamespaceExclusiveLock(procNs1, nsName1);<a name="line.309"></a>
-<span class="sourceLineNo">310</span><a name="line.310"></a>
-<span class="sourceLineNo">311</span> // we are now able to execute table of ns1<a name="line.311"></a>
-<span class="sourceLineNo">312</span> long procId = queue.poll().getProcId();<a name="line.312"></a>
-<span class="sourceLineNo">313</span> assertEquals(2, procId);<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span> // release ns2<a name="line.315"></a>
-<span class="sourceLineNo">316</span> queue.wakeNamespaceExclusiveLock(procNs2, nsName2);<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span> // we are now able to execute table of ns2<a name="line.318"></a>
-<span class="sourceLineNo">319</span> procId = queue.poll().getProcId();<a name="line.319"></a>
-<span class="sourceLineNo">320</span> assertEquals(3, procId);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> }<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span> @Test<a name="line.323"></a>
-<span class="sourceLineNo">324</span> public void testVerifyNamespaceXLock() throws Exception {<a name="line.324"></a>
-<span class="sourceLineNo">325</span> String nsName = "ns1";<a name="line.325"></a>
-<span class="sourceLineNo">326</span> TableName tableName = TableName.valueOf(nsName, name.getMethodName());<a name="line.326"></a>
-<span class="sourceLineNo">327</span> queue.addBack(new TestNamespaceProcedure(1, nsName,<a name="line.327"></a>
-<span class="sourceLineNo">328</span> TableProcedureInterface.TableOperationType.CREATE));<a name="line.328"></a>
-<span class="sourceLineNo">329</span> queue.addBack(new TestTableProcedure(2, tableName,<a name="line.329"></a>
-<span class="sourceLineNo">330</span> TableProcedureInterface.TableOperationType.READ));<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span> // Fetch the ns item and take the xlock<a name="line.332"></a>
-<span class="sourceLineNo">333</span> Procedure proc = queue.poll();<a name="line.333"></a>
-<span class="sourceLineNo">334</span> assertEquals(1, proc.getProcId());<a name="line.334"></a>
-<span class="sourceLineNo">335</span> assertEquals(false, queue.waitNamespaceExclusiveLock(proc, nsName));<a name="line.335"></a>
-<span class="sourceLineNo">336</span><a name="line.336"></a>
-<span class="sourceLineNo">337</span> // the table operation can't be executed because the ns is locked<a name="line.337"></a>
-<span class="sourceLineNo">338</span> assertEquals(null, queue.poll(0));<a name="line.338"></a>
-<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span> // release the ns lock<a name="line.340"></a>
-<span class="sourceLineNo">341</span> queue.wakeNamespaceExclusiveLock(proc, nsName);<a name="line.341"></a>
-<span class="sourceLineNo">342</span><a name="line.342"></a>
-<span class="sourceLineNo">343</span> proc = queue.poll();<a name="line.343"></a>
-<span class="sourceLineNo">344</span> assertEquals(2, proc.getProcId());<a name="line.344"></a>
-<span class="sourceLineNo">345</span> assertEquals(false, queue.waitTableExclusiveLock(proc, tableName));<a name="line.345"></a>
-<span class="sourceLineNo">346</span> queue.wakeTableExclusiveLock(proc, tableName);<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> @Test<a name="line.349"></a>
-<span class="sourceLineNo">350</span> public void testXLockWaitingForExecutingSharedLockToRelease() {<a name="line.350"></a>
-<span class="sourceLineNo">351</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.351"></a>
-<span class="sourceLineNo">352</span> final HRegionInfo regionA = new HRegionInfo(tableName, Bytes.toBytes("a"), Bytes.toBytes("b"));<a name="line.352"></a>
-<span class="sourceLineNo">353</span><a name="line.353"></a>
-<span class="sourceLineNo">354</span> queue.addBack(new TestRegionProcedure(1, tableName,<a name="line.354"></a>
-<span class="sourceLineNo">355</span> TableProcedureInterface.TableOperationType.REGION_ASSIGN, regionA));<a name="line.355"></a>
-<span class="sourceLineNo">356</span> queue.addBack(new TestTableProcedure(2, tableName,<a name="line.356"></a>
-<span class="sourceLineNo">357</span> TableProcedureInterface.TableOperationType.EDIT));<a name="line.357"></a>
-<span class="sourceLineNo">358</span> queue.addBack(new TestRegionProcedure(3, tableName,<a name="line.358"></a>
-<span class="sourceLineNo">359</span> TableProcedureInterface.TableOperationType.REGION_UNASSIGN, regionA));<a name="line.359"></a>
+<span class="sourceLineNo">209</span> queue.addBack(<a name="line.209"></a>
+<span class="sourceLineNo">210</span> new TestTableProcedure(1, tableName, TableProcedureInterface.TableOperationType.EDIT));<a name="line.210"></a>
+<span class="sourceLineNo">211</span> queue.addBack(<a name="line.211"></a>
+<span class="sourceLineNo">212</span> new TestTableProcedure(2, tableName, TableProcedureInterface.TableOperationType.READ));<a name="line.212"></a>
+<span class="sourceLineNo">213</span> queue.addBack(<a name="line.213"></a>
+<span class="sourceLineNo">214</span> new TestTableProcedure(3, tableName, TableProcedureInterface.TableOperationType.EDIT));<a name="line.214"></a>
+<span class="sourceLineNo">215</span><a name="line.215"></a>
+<span class="sourceLineNo">216</span> // Fetch the 1st item and take the write lock<a name="line.216"></a>
+<span class="sourceLineNo">217</span> Procedure<?> proc = queue.poll();<a name="line.217"></a>
+<span class="sourceLineNo">218</span> assertEquals(1, proc.getProcId());<a name="line.218"></a>
+<span class="sourceLineNo">219</span> assertEquals(false, queue.waitTableExclusiveLock(proc, tableName));<a name="line.219"></a>
+<span class="sourceLineNo">220</span><a name="line.220"></a>
+<span class="sourceLineNo">221</span> // Fetch the 2nd item and verify that the lock can't be acquired<a name="line.221"></a>
+<span class="sourceLineNo">222</span> assertEquals(null, queue.poll(0));<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span> // Release the write lock and acquire the read lock<a name="line.224"></a>
+<span class="sourceLineNo">225</span> queue.wakeTableExclusiveLock(proc, tableName);<a name="line.225"></a>
+<span class="sourceLineNo">226</span><a name="line.226"></a>
+<span class="sourceLineNo">227</span> // Fetch the 2nd item and take the read lock<a name="line.227"></a>
+<span class="sourceLineNo">228</span> Procedure<?> rdProc = queue.poll();<a name="line.228"></a>
+<span class="sourceLineNo">229</span> assertEquals(2, rdProc.getProcId());<a name="line.229"></a>
+<span class="sourceLineNo">230</span> assertEquals(false, queue.waitTableSharedLock(rdProc, tableName));<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span> // Fetch the 3rd item and verify that the lock can't be acquired<a name="line.232"></a>
+<span class="sourceLineNo">233</span> assertEquals(null, queue.poll(0));<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span> // release the rdlock of item 2 and take the wrlock for the 3d item<a name="line.235"></a>
+<span class="sourceLineNo">236</span> queue.wakeTableSharedLock(rdProc, tableName);<a name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span> queue.addBack(<a name="line.238"></a>
+<span class="sourceLineNo">239</span> new TestTableProcedure(4, tableName, TableProcedureInterface.TableOperationType.READ));<a name="line.239"></a>
+<span class="sourceLineNo">240</span> queue.addBack(<a name="line.240"></a>
+<span class="sourceLineNo">241</span> new TestTableProcedure(5, tableName, TableProcedureInterface.TableOperationType.READ));<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span> // Fetch the 3rd item and take the write lock<a name="line.243"></a>
+<span class="sourceLineNo">244</span> Procedure<?> wrProc = queue.poll();<a name="line.244"></a>
+<span class="sourceLineNo">245</span> assertEquals(false, queue.waitTableExclusiveLock(wrProc, tableName));<a name="line.245"></a>
+<span class="sourceLineNo">246</span><a name="line.246"></a>
+<span class="sourceLineNo">247</span> // Fetch 4th item and verify that the lock can't be acquired<a name="line.247"></a>
+<span class="sourceLineNo">248</span> assertEquals(null, queue.poll(0));<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span> // Release the write lock and acquire the read lock<a name="line.250"></a>
+<span class="sourceLineNo">251</span> queue.wakeTableExclusiveLock(wrProc, tableName);<a name="line.251"></a>
+<span class="sourceLineNo">252</span><a name="line.252"></a>
+<span class="sourceLineNo">253</span> // Fetch the 4th item and take the read lock<a name="line.253"></a>
+<span class="sourceLineNo">254</span> rdProc = queue.poll();<a name="line.254"></a>
+<span class="sourceLineNo">255</span> assertEquals(4, rdProc.getProcId());<a name="line.255"></a>
+<span class="sourceLineNo">256</span> assertEquals(false, queue.waitTableSharedLock(rdProc, tableName));<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span> // Fetch the 4th item and take the read lock<a name="line.258"></a>
+<span class="sourceLineNo">259</span> Procedure<?> rdProc2 = queue.poll();<a name="line.259"></a>
+<span class="sourceLineNo">260</span> assertEquals(5, rdProc2.getProcId());<a name="line.260"></a>
+<span class="sourceLineNo">261</span> assertEquals(false, queue.waitTableSharedLock(rdProc2, tableName));<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span> // Release 4th and 5th read-lock<a name="line.263"></a>
+<span class="sourceLineNo">264</span> queue.wakeTableSharedLock(rdProc, tableName);<a name="line.264"></a>
+<span class="sourceLineNo">265</span> queue.wakeTableSharedLock(rdProc2, tableName);<a name="line.265"></a>
+<span class="sourceLineNo">266</span><a name="line.266"></a>
+<span class="sourceLineNo">267</span> // remove table queue<a name="line.267"></a>
+<span class="sourceLineNo">268</span> assertEquals(0, queue.size());<a name="line.268"></a>
+<span class="sourceLineNo">269</span> assertTrue("queue should be deleted", queue.markTableAsDeleted(tableName, wrProc));<a name="line.269"></a>
+<span class="sourceLineNo">270</span> }<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span> @Test<a name="line.272"></a>
+<span class="sourceLineNo">273</span> public void testVerifyNamespaceRwLocks() throws Exception {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> String nsName1 = "ns1";<a name="line.274"></a>
+<span class="sourceLineNo">275</span> String nsName2 = "ns2";<a name="line.275"></a>
+<span class="sourceLineNo">276</span> TableName tableName1 = TableName.valueOf(nsName1, name.getMethodName());<a name="line.276"></a>
+<span class="sourceLineNo">277</span> TableName tableName2 = TableName.valueOf(nsName2, name.getMethodName());<a name="line.277"></a>
+<span class="sourceLineNo">278</span> queue.addBack(<a name="line.278"></a>
+<span class="sourceLineNo">279</span> new TestNamespaceProcedure(1, nsName1, TableProcedureInterface.TableOperationType.EDIT));<a name="line.279"></a>
+<span class="sourceLineNo">280</span> queue.addBack(<a name="line.280"></a>
+<span class="sourceLineNo">281</span> new TestTableProcedure(2, tableName1, TableProcedureInterface.TableOperationType.EDIT));<a name="line.281"></a>
+<span class="sourceLineNo">282</span> queue.addBack(<a name="line.282"></a>
+<span class="sourceLineNo">283</span> new TestTableProcedure(3, tableName2, TableProcedureInterface.TableOperationType.EDIT));<a name="line.283"></a>
+<span class="sourceLineNo">284</span> queue.addBack(<a name="line.284"></a>
+<span class="sourceLineNo">285</span> new TestNamespaceProcedure(4, nsName2, TableProcedureInterface.TableOperationType.EDIT));<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span> // Fetch the 1st item and take the write lock<a name="line.287"></a>
+<span class="sourceLineNo">288</span> Procedure<?> procNs1 = queue.poll();<a name="line.288"></a>
+<span class="sourceLineNo">289</span> assertEquals(1, procNs1.getProcId());<a name="line.289"></a>
+<span class="sourceLineNo">290</span> assertFalse(queue.waitNamespaceExclusiveLock(procNs1, nsName1));<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span> // namespace table has higher priority so we still return procedure for it<a name="line.292"></a>
+<span class="sourceLineNo">293</span> Procedure<?> procNs2 = queue.poll();<a name="line.293"></a>
+<span class="sourceLineNo">294</span> assertEquals(4, procNs2.getProcId());<a name="line.294"></a>
+<span class="sourceLineNo">295</span> assertFalse(queue.waitNamespaceExclusiveLock(procNs2, nsName2));<a name="line.295"></a>
+<span class="sourceLineNo">296</span> queue.wakeNamespaceExclusiveLock(procNs2, nsName2);<a name="line.296"></a>
+<span class="sourceLineNo">297</span><a name="line.297"></a>
+<span class="sourceLineNo">298</span> // add procNs2 back in the queue<a name="line.298"></a>
+<span class="sourceLineNo">299</span> queue.yield(procNs2);<a name="line.299"></a>
+<span class="sourceLineNo">300</span><a name="line.300"></a>
+<span class="sourceLineNo">301</span> // again<a name="line.301"></a>
+<span class="sourceLineNo">302</span> procNs2 = queue.poll();<a name="line.302"></a>
+<span class="sourceLineNo">303</span> assertEquals(4, procNs2.getProcId());<a name="line.303"></a>
+<span class="sourceLineNo">304</span> assertFalse(queue.waitNamespaceExclusiveLock(procNs2, nsName2));<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span> // ns1 and ns2 are both locked so we get nothing<a name="line.306"></a>
+<span class="sourceLineNo">307</span> assertNull(queue.poll());<a name="line.307"></a>
+<span class="sourceLineNo">308</span><a name="line.308"></a>
+<span class="sourceLineNo">309</span> // release the ns1 lock<a name="line.309"></a>
+<span class="sourceLineNo">310</span> queue.wakeNamespaceExclusiveLock(procNs1, nsName1);<a name="line.310"></a>
+<span class="sourceLineNo">311</span><a name="line.311"></a>
+<span class="sourceLineNo">312</span> // we are now able to execute table of ns1<a name="line.312"></a>
+<span class="sourceLineNo">313</span> long procId = queue.poll().getProcId();<a name="line.313"></a>
+<span class="sourceLineNo">314</span> assertEquals(2, procId);<a name="line.314"></a>
+<span class="sourceLineNo">315</span><a name="line.315"></a>
+<span class="sourceLineNo">316</span> // release ns2<a name="line.316"></a>
+<span class="sourceLineNo">317</span> queue.wakeNamespaceExclusiveLock(procNs2, nsName2);<a name="line.317"></a>
+<span class="sourceLineNo">318</span><a name="line.318"></a>
+<span class="sourceLineNo">319</span> // we are now able to execute table of ns2<a name="line.319"></a>
+<span class="sourceLineNo">320</span> procId = queue.poll().getProcId();<a name="line.320"></a>
+<span class="sourceLineNo">321</span> assertEquals(3, procId);<a name="line.321"></a>
+<span class="sourceLineNo">322</span> }<a name="line.322"></a>
+<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">324</span> @Test<a name="line.324"></a>
+<span class="sourceLineNo">325</span> public void testVerifyNamespaceXLock() throws Exception {<a name="line.325"></a>
+<span class="sourceLineNo">326</span> String nsName = "ns1";<a name="line.326"></a>
+<span class="sourceLineNo">327</span> TableName tableName = TableName.valueOf(nsName, name.getMethodName());<a name="line.327"></a>
+<span class="sourceLineNo">328</span> queue.addBack(<a name="line.328"></a>
+<span class="sourceLineNo">329</span> new TestNamespaceProcedure(1, nsName, TableProcedureInterface.TableOperationType.CREATE));<a name="line.329"></a>
+<span class="sourceLineNo">330</span> queue.addBack(<a name="line.330"></a>
+<span class="sourceLineNo">331</span> new TestTableProcedure(2, tableName, TableProcedureInterface.TableOperationType.READ));<a name="line.331"></a>
+<span class="sourceLineNo">332</span><a name="line.332"></a>
+<span class="sourceLineNo">333</span> // Fetch the ns item and take the xlock<a name="line.333"></a>
+<span class="sourceLineNo">334</span> Procedure<?> proc = queue.poll();<a name="line.334"></a>
+<span class="sourceLineNo">335</span> assertEquals(1, proc.getProcId());<a name="line.335"></a>
+<span class="sourceLineNo">336</span> assertEquals(false, queue.waitNamespaceExclusiveLock(proc, nsName));<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span> // the table operation can't be executed because the ns is locked<a name="line.338"></a>
+<span class="sourceLineNo">339</span> assertEquals(null, queue.poll(0));<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span> // release the ns lock<a name="line.341"></a>
+<span class="sourceLineNo">342</span> queue.wakeNamespaceExclusiveLock(proc, nsName);<a name="line.342"></a>
+<span class="sourceLineNo">343</span><a name="line.343"></a>
+<span class="sourceLineNo">344</span> proc = queue.poll();<a name="line.344"></a>
+<span class="sourceLineNo">345</span> assertEquals(2, proc.getProcId());<a name="line.345"></a>
+<span class="sourceLineNo">346</span> assertEquals(false, queue.waitTableExclusiveLock(proc, tableName));<a name="line.346"></a>
+<span class="sourceLineNo">347</span> queue.wakeTableExclusiveLock(proc, tableName);<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> @Test<a name="line.350"></a>
+<span class="sourceLineNo">351</span> public void testXLockWaitingForExecutingSharedLockToRelease() {<a name="line.351"></a>
+<span class="sourceLineNo">352</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.352"></a>
+<span class="sourceLineNo">353</span> final RegionInfo regionA = RegionInfoBuilder.newBuilder(tableName)<a name="line.353"></a>
+<span class="sourceLineNo">354</span> .setStartKey(Bytes.toBytes("a")).setEndKey(Bytes.toBytes("b")).build();<a name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span> queue.addBack(new TestRegionProcedure(1, tableName,<a name="line.356"></a>
+<span class="sourceLineNo">357</span> TableProcedureInterface.TableOperationType.REGION_ASSIGN, regionA));<a name="line.357"></a>
+<span class="sourceLineNo">358</span> queue.addBack(<a name="line.358"></a>
+<span class="sourceLineNo">359</span> new TestTableProcedure(2, tableName, TableProcedureInterface.TableOperationType.EDIT));<a name="line.359"></a>
<span class="sourceLineNo">360</span><a name="line.360"></a>
<span class="sourceLineNo">361</span> // Fetch the 1st item and take the shared lock<a name="line.361"></a>
-<span class="sourceLineNo">362</span> Procedure proc = queue.poll();<a name="line.362"></a>
+<span class="sourceLineNo">362</span> Procedure<?> proc = queue.poll();<a name="line.362"></a>
<span class="sourceLineNo">363</span> assertEquals(1, proc.getProcId());<a name="line.363"></a>
<span class="sourceLineNo">364</span> assertEquals(false, queue.waitRegion(proc, regionA));<a name="line.364"></a>
<span class="sourceLineNo">365</span><a name="line.365"></a>
@@ -382,777 +382,785 @@
<span class="sourceLineNo">374</span> assertEquals(2, proc.getProcId());<a name="line.374"></a>
<span class="sourceLineNo">375</span> assertEquals(false, queue.waitTableExclusiveLock(proc, tableName));<a name="line.375"></a>
<span class="sourceLineNo">376</span><a name="line.376"></a>
-<span class="sourceLineNo">377</span> // everything is locked by the table operation<a name="line.377"></a>
-<span class="sourceLineNo">378</span> assertEquals(null, queue.poll(0));<a name="line.378"></a>
+<span class="sourceLineNo">377</span> queue.addBack(new TestRegionProcedure(3, tableName,<a name="line.377"></a>
+<span class="sourceLineNo">378</span> TableProcedureInterface.TableOperationType.REGION_UNASSIGN, regionA));<a name="line.378"></a>
<span class="sourceLineNo">379</span><a name="line.379"></a>
-<span class="sourceLineNo">380</span> // release the table xlock<a name="line.380"></a>
-<span class="sourceLineNo">381</span> queue.wakeTableExclusiveLock(proc, tableName);<a name="line.381"></a>
+<span class="sourceLineNo">380</span> // everything is locked by the table operation<a name="line.380"></a>
+<span class="sourceLineNo">381</span> assertEquals(null, queue.poll(0));<a name="line.381"></a>
<span class="sourceLineNo">382</span><a name="line.382"></a>
-<span class="sourceLineNo">383</span> // grab the last item in the queue<a name="line.383"></a>
-<span class="sourceLineNo">384</span> proc = queue.poll();<a name="line.384"></a>
-<span class="sourceLineNo">385</span> assertEquals(3, proc.getProcId());<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span> // lock and unlock the region<a name="line.387"></a>
-<span class="sourceLineNo">388</span> assertEquals(false, queue.waitRegion(proc, regionA));<a name="line.388"></a>
-<span class="sourceLineNo">389</span> assertEquals(null, queue.poll(0));<a name="line.389"></a>
-<span class="sourceLineNo">390</span> queue.wakeRegion(proc, regionA);<a name="line.390"></a>
-<span class="sourceLineNo">391</span> }<a name="line.391"></a>
-<span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span> @Test<a name="line.393"></a>
-<span class="sourceLineNo">394</span> public void testVerifyRegionLocks() throws Exception {<a name="line.394"></a>
-<span class="sourceLineNo">395</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.395"></a>
-<span class="sourceLineNo">396</span> final HRegionInfo regionA = new HRegionInfo(tableName, Bytes.toBytes("a"), Bytes.toBytes("b"));<a name="line.396"></a>
-<span class="sourceLineNo">397</span> final HRegionInfo regionB = new HRegionInfo(tableName, Bytes.toBytes("b"), Bytes.toBytes("c"));<a name="line.397"></a>
-<span class="sourceLineNo">398</span> final HRegionInfo regionC = new HRegionInfo(tableName, Bytes.toBytes("c"), Bytes.toBytes("d"));<a name="line.398"></a>
-<span class="sourceLineNo">399</span><a name="line.399"></a>
-<span class="sourceLineNo">400</span> queue.addBack(new TestTableProcedure(1, tableName,<a name="line.400"></a>
-<span class="sourceLineNo">401</span> TableProcedureInterface.TableOperationType.EDIT));<a name="line.401"></a>
-<span class="sourceLineNo">402</span> queue.addBack(new TestRegionProcedure(2, tableName,<a name="line.402"></a>
-<span class="sourceLineNo">403</span> TableProcedureInterface.TableOperationType.REGION_MERGE, regionA, regionB));<a name="line.403"></a>
-<span class="sourceLineNo">404</span> queue.addBack(new TestRegionProcedure(3, tableName,<a name="line.404"></a>
-<span class="sourceLineNo">405</span> TableProcedureInterface.TableOperationType.REGION_SPLIT, regionA));<a name="line.405"></a>
-<span class="sourceLineNo">406</span> queue.addBack(new TestRegionProcedure(4, tableName,<a name="line.406"></a>
-<span class="sourceLineNo">407</span> TableProcedureInterface.TableOperationType.REGION_SPLIT, regionB));<a name="line.407"></a>
-<span class="sourceLineNo">408</span> queue.addBack(new TestRegionProcedure(5, tableName,<a name="line.408"></a>
-<span class="sourceLineNo">409</span> TableProcedureInterface.TableOperationType.REGION_UNASSIGN, regionC));<a name="line.409"></a>
-<span class="sourceLineNo">410</span><a name="line.410"></a>
-<span class="sourceLineNo">411</span> // Fetch the 1st item and take the write lock<a name="line.411"></a>
-<span class="sourceLineNo">412</span> Procedure proc = queue.poll();<a name="line.412"></a>
-<span class="sourceLineNo">413</span> assertEquals(1, proc.getProcId());<a name="line.413"></a>
-<span class="sourceLineNo">414</span> assertEquals(false, queue.waitTableExclusiveLock(proc, tableName));<a name="line.414"></a>
-<span class="sourceLineNo">415</span><a name="line.415"></a>
-<span class="sourceLineNo">416</span> // everything is locked by the table operation<a name="line.416"></a>
-<span class="sourceLineNo">417</span> assertEquals(null, queue.poll(0));<a name="line.417"></a>
-<span class="sourceLineNo">418</span><a name="line.418"></a>
-<span class="sourceLineNo">419</span> // release the table lock<a name="line.419"></a>
-<span class="sourceLineNo">420</span> queue.wakeTableExclusiveLock(proc, tableName);<a name="line.420"></a>
+<span class="sourceLineNo">383</span> // release the table xlock<a name="line.383"></a>
+<span class="sourceLineNo">384</span> queue.wakeTableExclusiveLock(proc, tableName);<a name="line.384"></a>
+<span class="sourceLineNo">385</span><a name="line.385"></a>
+<span class="sourceLineNo">386</span> // grab the last item in the queue<a name="line.386"></a>
+<span class="sourceLineNo">387</span> proc = queue.poll();<a name="line.387"></a>
+<span class="sourceLineNo">388</span> assertEquals(3, proc.getProcId());<a name="line.388"></a>
+<span class="sourceLineNo">389</span><a name="line.389"></a>
+<span class="sourceLineNo">390</span> // lock and unlock the region<a name="line.390"></a>
+<span class="sourceLineNo">391</span> assertEquals(false, queue.waitRegion(proc, regionA));<a name="line.391"></a>
+<span class="sourceLineNo">392</span> assertEquals(null, queue.poll(0));<a name="line.392"></a>
+<span class="sourceLineNo">393</span> queue.wakeRegion(proc, regionA);<a name="line.393"></a>
+<span class="sourceLineNo">394</span> }<a name="line.394"></a>
+<span class="sourceLineNo">395</span><a name="line.395"></a>
+<span class="sourceLineNo">396</span> @Test<a name="line.396"></a>
+<span class="sourceLineNo">397</span> public void testVerifyRegionLocks() throws Exception {<a name="line.397"></a>
+<span class="sourceLineNo">398</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.398"></a>
+<span class="sourceLineNo">399</span> final RegionInfo regionA = RegionInfoBuilder.newBuilder(tableName)<a name="line.399"></a>
+<span class="sourceLineNo">400</span> .setStartKey(Bytes.toBytes("a")).setEndKey(Bytes.toBytes("b")).build();<a name="line.400"></a>
+<span class="sourceLineNo">401</span> final RegionInfo regionB = RegionInfoBuilder.newBuilder(tableName)<a name="line.401"></a>
+<span class="sourceLineNo">402</span> .setStartKey(Bytes.toBytes("b")).setEndKey(Bytes.toBytes("c")).build();<a name="line.402"></a>
+<span class="sourceLineNo">403</span> final RegionInfo regionC = RegionInfoBuilder.newBuilder(tableName)<a name="line.403"></a>
+<span class="sourceLineNo">404</span> .setStartKey(Bytes.toBytes("c")).setEndKey(Bytes.toBytes("d")).build();<a name="line.404"></a>
+<span class="sourceLineNo">405</span><a name="line.405"></a>
+<span class="sourceLineNo">406</span> queue.addBack(<a name="line.406"></a>
+<span class="sourceLineNo">407</span> new TestTableProcedure(1, tableName, TableProcedureInterface.TableOperationType.EDIT));<a name="line.407"></a>
+<span class="sourceLineNo">408</span> queue.addBack(new TestRegionProcedure(2, tableName,<a name="line.408"></a>
+<span class="sourceLineNo">409</span> TableProcedureInterface.TableOperationType.REGION_MERGE, regionA, regionB));<a name="line.409"></a>
+<span class="sourceLineNo">410</span> queue.addBack(new TestRegionProcedure(3, tableName,<a name="line.410"></a>
+<span class="sourceLineNo">411</span> TableProcedureInterface.TableOperationType.REGION_SPLIT, regionA));<a name="line.411"></a>
+<span class="sourceLineNo">412</span> queue.addBack(new TestRegionProcedure(4, tableName,<a name="line.412"></a>
+<span class="sourceLineNo">413</span> TableProcedureInterface.TableOperationType.REGION_SPLIT, regionB));<a name="line.413"></a>
+<span class="sourceLineNo">414</span> queue.addBack(new TestRegionProcedure(5, tableName,<a name="line.414"></a>
+<span class="sourceLineNo">415</span> TableProcedureInterface.TableOperationType.REGION_UNASSIGN, regionC));<a name="line.415"></a>
+<span class="sourceLineNo">416</span><a name="line.416"></a>
+<span class="sourceLineNo">417</span> // Fetch the 1st item and take the write lock<a name="line.417"></a>
+<span class="sourceLineNo">418</span> Procedure<?> proc = queue.poll();<a name="line.418"></a>
+<span class="sourceLineNo">419</span> assertEquals(1, proc.getProcId());<a name="line.419"></a>
+<span class="sourceLineNo">420</span> assertEquals(false, queue.waitTableExclusiveLock(proc, tableName));<a name="line.420"></a>
<span class="sourceLineNo">421</span><a name="line.421"></a>
-<span class="sourceLineNo">422</span> // Fetch the 2nd item and the the lock on regionA and regionB<a name="line.422"></a>
-<span class="sourceLineNo">423</span> Procedure mergeProc = queue.poll();<a name="line.423"></a>
-<span class="sourceLineNo">424</span> assertEquals(2, mergeProc.getProcId());<a name="line.424"></a>
-<span class="sourceLineNo">425</span> assertEquals(false, queue.waitRegions(mergeProc, tableName, regionA, regionB));<a name="line.425"></a>
-<span class="sourceLineNo">426</span><a name="line.426"></a>
-<span class="sourceLineNo">427</span> // Fetch the 3rd item and the try to lock region A which will fail<a name="line.427"></a>
-<span class="sourceLineNo">428</span> // because already locked. this procedure will go in waiting.<a name="line.428"></a>
-<span class="sourceLineNo">429</span> // (this stuff will be explicit until we get rid of the zk-lock)<a name="line.429"></a>
-<span class="sourceLineNo">430</span> Procedure procA = queue.poll();<a name="line.430"></a>
-<span class="sourceLineNo">431</span> assertEquals(3, procA.getProcId());<a name="line.431"></a>
-<span class="sourceLineNo">432</span> assertEquals(true, queue.waitRegions(procA, tableName, regionA));<a name="line.432"></a>
-<span class="sourceLineNo">433</span><a name="line.433"></a>
-<span class="sourceLineNo">434</span> // Fetch the 4th item, same story as the 3rd<a name="line.434"></a>
-<span class="sourceLineNo">435</span> Procedure procB = queue.poll();<a name="line.435"></a>
-<span class="sourceLineNo">436</span> assertEquals(4, procB.getProcId());<a name="line.436"></a>
-<span class="sourceLineNo">437</span> assertEquals(true, queue.waitRegions(procB, tableName, regionB));<a name="line.437"></a>
-<span class="sourceLineNo">438</span><a name="line.438"></a>
-<span class="sourceLineNo">439</span> // Fetch the 5th item, since it is a non-locked region we are able to execute it<a name="line.439"></a>
-<span class="sourceLineNo">440</span> Procedure procC = queue.poll();<a name="line.440"></a>
-<span class="sourceLineNo">441</span> assertEquals(5, procC.getProcId());<a name="line.441"></a>
-<span class="sourceLineNo">442</span> assertEquals(false, queue.waitRegions(procC, tableName, regionC));<a name="line.442"></a>
-<span class="sourceLineNo">443</span><a name="line.443"></a>
-<span class="sourceLineNo">444</span> // 3rd and 4th are in the region suspended queue<a name="line.444"></a>
-<span class="sourceLineNo">445</span> assertEquals(null, queue.poll(0));<a name="line.445"></a>
-<span class="sourceLineNo">446</span><a name="line.446"></a>
-<span class="sourceLineNo">447</span> // Release region A-B from merge operation (procId=2)<a name="line.447"></a>
-<span class="sourceLineNo">448</span> queue.wakeRegions(mergeProc, tableName, regionA, regionB);<a name="line.448"></a>
+<span class="sourceLineNo">422</span> // everything is locked by the table operation<a name="line.422"></a>
+<span class="sourceLineNo">423</span> assertEquals(null, queue.poll(0));<a name="line.423"></a>
+<span class="sourceLineNo">424</span><a name="line.424"></a>
+<span class="sourceLineNo">425</span> // release the table lock<a name="line.425"></a>
+<span class="sourceLineNo">426</span> queue.wakeTableExclusiveLock(proc, tableName);<a name="line.426"></a>
+<span class="sourceLineNo">427</span><a name="line.427"></a>
+<span class="sourceLineNo">428</span> // Fetch the 2nd item and the the lock on regionA and regionB<a name="line.428"></a>
+<span class="sourceLineNo">429</span> Procedure<?> mergeProc = queue.poll();<a name="line.429"></a>
+<span class="sourceLineNo">430</span> assertEquals(2, mergeProc.getProcId());<a name="line.430"></a>
+<span class="sourceLineNo">431</span> assertEquals(false, queue.waitRegions(mergeProc, tableName, regionA, regionB));<a name="line.431"></a>
+<span class="sourceLineNo">432</span><a name="line.432"></a>
+<span class="sourceLineNo">433</span> // Fetch the 3rd item and the try to lock region A which will fail<a name="line.433"></a>
+<span class="sourceLineNo">434</span> // because already locked. this procedure will go in waiting.<a name="line.434"></a>
+<span class="sourceLineNo">435</span> // (this stuff will be explicit until we get rid of the zk-lock)<a name="line.435"></a>
+<span class="sourceLineNo">436</span> Procedure<?> procA = queue.poll();<a name="line.436"></a>
+<span class="sourceLineNo">437</span> assertEquals(3, procA.getProcId());<a name="line.437"></a>
+<span class="sourceLineNo">438</span> assertEquals(true, queue.waitRegions(procA, tableName, regionA));<a name="line.438"></a>
+<span class="sourceLineNo">439</span><a name="line.439"></a>
+<span class="sourceLineNo">440</span> // Fetch the 4th item, same story as the 3rd<a name="line.440"></a>
+<span class="sourceLineNo">441</span> Procedure<?> procB = queue.poll();<a name="line.441"></a>
+<span class="sourceLineNo">442</span> assertEquals(4, procB.getProcId());<a name="line.442"></a>
+<span class="sourceLineNo">443</span> assertEquals(true, queue.waitRegions(procB, tableName, regionB));<a name="line.443"></a>
+<span class="sourceLineNo">444</span><a name="line.444"></a>
+<span class="sourceLineNo">445</span> // Fetch the 5th item, since it is a non-locked region we are able to execute it<a name="line.445"></a>
+<span class="sourceLineNo">446</span> Procedure<?> procC = queue.poll();<a name="line.446"></a>
+<span class="sourceLineNo">447</span> assertEquals(5, procC.getProcId());<a name="line.447"></a>
+<span class="sourceLineNo">448</span> assertEquals(false, queue.waitRegions(procC, tableName, regionC));<a name="line.448"></a>
<span class="sourceLineNo">449</span><a name="line.449"></a>
-<span class="sourceLineNo">450</span> // Fetch the 3rd item, now the lock on the region is available<a name="line.450"></a>
-<span class="sourceLineNo">451</span> procA = queue.poll();<a name="line.451"></a>
-<span class="sourceLineNo">452</span> assertEquals(3, procA.getProcId());<a name="line.452"></a>
-<span class="sourceLineNo">453</span> assertEquals(false, queue.waitRegions(procA, tableName, regionA));<a name="line.453"></a>
-<span class="sourceLineNo">454</span><a name="line.454"></a>
-<span class="sourceLineNo">455</span> // Fetch the 4th item, now the lock on the region is available<a name="line.455"></a>
-<span class="sourceLineNo">456</span> procB = queue.poll();<a name="line.456"></a>
-<span class="sourceLineNo">457</span> assertEquals(4, procB.getProcId());<a name="line.457"></a>
-<span class="sourceLineNo">458</span> assertEquals(false, queue.waitRegions(procB, tableName, regionB));<a name="line.458"></a>
-<span class="sourceLineNo">459</span><a name="line.459"></a>
-<span class="sourceLineNo">460</span> // release the locks on the regions<a name="line.460"></a>
-<span class="sourceLineNo">461</span> queue.wakeRegions(procA, tableName, regionA);<a name="line.461"></a>
-<span class="sourceLineNo">462</span> queue.wakeRegions(procB, tableName, regionB);<a name="line.462"></a>
-<span class="sourceLineNo">463</span> queue.wakeRegions(procC, tableName, regionC);<a name="line.463"></a>
-<span class="sourceLineNo">464</span> }<a name="line.464"></a>
+<span class="sourceLineNo">450</span> // 3rd and 4th are in the region suspended queue<a name="line.450"></a>
+<span class="sourceLineNo">451</span> assertEquals(null, queue.poll(0));<a name="line.451"></a>
+<span class="sourceLineNo">452</span><a name="line.452"></a>
+<span class="sourceLineNo">453</span> // Release region A-B from merge operation (procId=2)<a name="line.453"></a>
+<span class="sourceLineNo">454</span> queue.wakeRegions(mergeProc, tableName, regionA, regionB);<a name="line.454"></a>
+<span class="sourceLineNo">455</span><a name="line.455"></a>
+<span class="sourceLineNo">456</span> // Fetch the 3rd item, now the lock on the region is available<a name="line.456"></a>
+<span class="sourceLineNo">457</span> procA = queue.poll();<a name="line.457"></a>
+<span class="sourceLineNo">458</span> assertEquals(3, procA.getProcId());<a name="line.458"></a>
+<span class="sourceLineNo">459</span> assertEquals(false, queue.waitRegions(procA, tableName, regionA));<a name="line.459"></a>
+<span class="sourceLineNo">460</span><a name="line.460"></a>
+<span class="sourceLineNo">461</span> // Fetch the 4th item, now the lock on the region is available<a name="line.461"></a>
+<span class="sourceLineNo">462</span> procB = queue.poll();<a name="line.462"></a>
+<span class="sourceLineNo">463</span> assertEquals(4, procB.getProcId());<a name="line.463"></a>
+<span class="sourceLineNo">464</span> assertEquals(false, queue.waitRegions(procB, tableName, regionB));<a name="line.464"></a>
<span class="sourceLineNo">465</span><a name="line.465"></a>
-<span class="sourceLineNo">466</span> @Test<a name="line.466"></a>
-<span class="sourceLineNo">467</span> public void testVerifySubProcRegionLocks() throws Exception {<a name="line.467"></a>
-<span class="sourceLineNo">468</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.468"></a>
-<span class="sourceLineNo">469</span> final HRegionInfo regionA = new HRegionInfo(tableName, Bytes.toBytes("a"), Bytes.toBytes("b"));<a name="line.469"></a>
-<span class="sourceLineNo">470</span> final HRegionInfo regionB = new HRegionInfo(tableName, Bytes.toBytes("b"), Bytes.toBytes("c"));<a name="line.470"></a>
-<span class="sourceLineNo">471</span> final HRegionInfo regionC = new HRegionInfo(tableName, Bytes.toBytes("c"), Bytes.toBytes("d"));<a name="line.471"></a>
-<span class="sourceLineNo">472</span><a name="line.472"></a>
-<span class="sourceLineNo">473</span> queue.addBack(new TestTableProcedure(1, tableName,<a name="line.473"></a>
-<span class="sourceLineNo">474</span> TableProcedureInterface.TableOperationType.ENABLE));<a name="line.474"></a>
-<span class="sourceLineNo">475</span><a name="line.475"></a>
-<span class="sourceLineNo">476</span> // Fetch the 1st item from the queue, "the root procedure" and take the table lock<a name="line.476"></a>
-<span class="sourceLineNo">477</span> Procedure rootProc = queue.poll();<a name="line.477"></a>
-<span class="sourceLineNo">478</span> assertEquals(1, rootProc.getProcId());<a name="line.478"></a>
-<span class="sourceLineNo">479</span> assertEquals(false, queue.waitTableExclusiveLock(rootProc, tableName));<a name="line.479"></a>
-<span class="sourceLineNo">480</span> assertEquals(null, queue.poll(0));<a name="line.480"></a>
+<span class="sourceLineNo">466</span> // release the locks on the regions<a name="line.466"></a>
+<span class="sourceLineNo">467</span> queue.wakeRegions(procA, tableName, regionA);<a name="line.467"></a>
+<span class="sourceLineNo">468</span> queue.wakeRegions(procB, tableName, regionB);<a name="line.468"></a>
+<span class="sourceLineNo">469</span> queue.wakeRegions(procC, tableName, regionC);<a name="line.469"></a>
+<span class="sourceLineNo">470</span> }<a name="line.470"></a>
+<span class="sourceLineNo">471</span><a name="line.471"></a>
+<span class="sourceLineNo">472</span> @Test<a name="line.472"></a>
+<span class="sourceLineNo">473</span> public void testVerifySubProcRegionLocks() throws Exception {<a name="line.473"></a>
+<span class="sourceLineNo">474</span> final TableName tableName = TableName.valueOf(name.getMethodName());<a name="line.474"></a>
+<span class="sourceLineNo">475</span> final RegionInfo regionA = RegionInfoBuilder.newBuilder(tableName)<a name="line.475"></a>
+<span class="sourceLineNo">476</span> .setStartKey(Bytes.toBytes("a")).setEndKey(Bytes.toBytes("b")).build();<a name="line.476"></a>
+<span class="sourceLineNo">477</span> final RegionInfo regionB = RegionInfoBuilder.newBuilder(tableName)<a name="line.477"></a>
+<span class="sourceLineNo">478</span> .setStartKey(Bytes.toBytes("b")).setEndKey(Bytes.toBytes("c")).build();<a name="line.478"></a>
+<span class="sourceLineNo">479</span> final RegionInfo regionC = RegionInfoBuilder.newBuilder(tableName)<a name="line.479"></a>
+<span class="sourceLineNo">480</span> .setStartKey(Bytes.toBytes("c")).setEndKey(Bytes.toBytes("d")).build();<a name="line.480"></a>
<span class="sourceLineNo">481</span><a name="line.481"></a>
-<span class="sourceLineNo">482</span> // Execute the 1st step of the root-proc.<a name="line.482"></a>
-<span class="sourceLineNo">483</span> // we should get 3 sub-proc back, one for each region.<a name="line.483"></a>
-<span class="sourceLineNo">484</span> // (this step is done by the executor/rootProc, we are simulating it)<a name="line.484"></a>
-<span class="sourceLineNo">485</span> Procedure[] subProcs = new Procedure[] {<a name="line.485"></a>
-<span class="sourceLineNo">486</span> new TestRegionProcedure(1, 2, tableName,<a name="line.486"></a>
-<span class="sourceLineNo">487</span> TableProcedureInterface.TableOperationType.REGION_EDIT, regionA),<a name="line.487"></a>
-<span class="sourceLineNo">488</span> new TestRegionProcedure(1, 3, tableName,<a name="line.488"></a>
-<span class="sourceLineNo">489</span> TableProcedureInterface.TableOperationType.REGION_EDIT, regionB),<a name="line.489"></a>
-<span class="sourceLineNo">490</span> new TestRegionProcedure(1, 4, tableName,<a name="line.490"></a>
-<span class="sourceLineNo">491</span> TableProcedureInterface.TableOperationType.REGION_EDIT, regionC),<a name="line.491"></a>
-<span class="sourceLineNo">492</span> };<a name="line.492"></a>
-<span class="sourceLineNo">493</span><a name="line.493"></a>
-<span class="sourceLineNo">494</span> // at this point the rootProc is going in a waiting state<a name="line.494"></a>
-<span class="sourceLineNo">495</span> // and the sub-procedures will be added in the queue.<a name="line.495"></a>
-<span class="sourceLineNo">496</span> // (this step is done by the executor, we are simulating it)<a name="line.496"></a>
-<span class="sourceLineNo">497</span> for (int i = subProcs.length - 1; i >= 0; --i) {<a name="line.497"></a>
-<span class="sourceLineNo">498</span> queue.addFront(subProcs[i]);<a name="line.498"></a>
-<span class="sourceLineNo">499</span> }<a name="line.499"></a>
-<span class="sourceLineNo">500</span> assertEquals(subProcs.length, queue.size());<a name="line.500"></a>
+<span class="sourceLineNo">482</span> queue.addBack(<a name="line.482"></a>
+<span class="sourceLineNo">483</span> new TestTableProcedure(1, tableName, TableProcedureInterface.TableOperationType.ENABLE));<a name="line.483"></a>
+<span class="sourceLineNo">484</span><a name="line.484"></a>
+<span class="sourceLineNo">485</span> // Fetch the 1st item from the queue, "the root procedure" and take the table lock<a name="line.485"></a>
+<span class="sourceLineNo">486</span> Procedure<?> rootProc = queue.poll();<a name="line.486"></a>
+<span class="sourceLineNo">487</span> assertEquals(1, rootProc.getProcId());<a name="line.487"></a>
+<span class="sourceLineNo">488</span> assertEquals(false, queue.waitTableExclusiveLock(rootProc, tableName));<a name="line.488"></a>
+<span class="sourceLineNo">489</span> assertEquals(null, queue.poll(0));<a name="line.489"></a>
+<span class="sourceLineNo">490</span><a name="line.490"></a>
+<span class="sourceLineNo">491</span> // Execute the 1st step of the root-proc.<a name="line.491"></a>
+<span class="sourceLineNo">492</span> // we should get 3 sub-proc back, one for each region.<a name="line.492"></a>
+<span class="sourceLineNo">493</span> // (this step is done by the executor/rootProc, we are simulating it)<a name="line.493"></a>
+<span class="sourceLineNo">494</span> Procedure<?>[] subProcs = new Procedure[] {<a name="line.494"></a>
+<span class="sourceLineNo">495</span> new TestRegionProcedure(1, 2, tableName,<a name="line.495"></a>
+<span class="sourceLineNo">496</span> TableProcedureInterface.TableOperationType.REGION_EDIT, regionA),<a name="line.496"></a>
+<span class="sourceLineNo">497</span> new TestRegionProcedure(1, 3, tableName,<a name="line.497"></a>
+<span class="sourceLineNo">498</span> TableProcedureInterface.TableOperationType.REGION_EDIT, regionB),<a name="line.498"></a>
+<span class="sourceLineNo">499</span> new TestRegionProcedure(1, 4, tableName,<a name="line.499"></a>
+<span class="sourceLineNo">500</span> TableProcedureInterface.TableOperationType.REGION_EDIT, regionC), };<a name="line.500"></a>
<span class="sourceLineNo">501</span><a name="line.501"></a>
-<span class="sourceLineNo">502</span> // we should be able to fetch and execute all the sub-procs,<a name="line.502"></a>
-<span class="sourceLineNo">503</span> // since they are operating on different regions<a name="line.503"></a>
-<span class="sourceLineNo">504</span> for (int i = 0; i < subProcs.length; ++i) {<a name="line.504"></a>
-<span class="sourceLineNo">505</span> TestRegionProcedure regionProc = (TestRegionProcedure)queue.poll(0);<a name="line.505"></a>
-<span class="sourceLineNo">506</span> assertEquals(subProcs[i].getProcId(), regionProc.getProcId());<a name="line.506"></a>
-<span class="sourceLineNo"
<TRUNCATED>