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:55:17 UTC
[35/51] [partial] hbase-site git commit: Published site at
d5e4faacc354c1bc4d93efa71ca97ee3a056123e.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b5e107c3/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/Queue.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/Queue.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/Queue.html
index 885a217..4166ebf 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/Queue.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/Queue.html
@@ -68,70 +68,57 @@
<span class="sourceLineNo">060</span> return lockStatus;<a name="line.60"></a>
<span class="sourceLineNo">061</span> }<a name="line.61"></a>
<span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span> // This should go away when we have the new AM and its events<a name="line.63"></a>
-<span class="sourceLineNo">064</span> // and we move xlock to the lock-event-queue.<a name="line.64"></a>
-<span class="sourceLineNo">065</span> public boolean isAvailable() {<a name="line.65"></a>
-<span class="sourceLineNo">066</span> if (isEmpty()) {<a name="line.66"></a>
-<span class="sourceLineNo">067</span> return false;<a name="line.67"></a>
-<span class="sourceLineNo">068</span> }<a name="line.68"></a>
-<span class="sourceLineNo">069</span> if (getLockStatus().hasExclusiveLock()) {<a name="line.69"></a>
-<span class="sourceLineNo">070</span> // If we have an exclusive lock already taken, only child of the lock owner can be executed<a name="line.70"></a>
-<span class="sourceLineNo">071</span> // And now we will restore locks when master restarts, so it is possible that the procedure<a name="line.71"></a>
-<span class="sourceLineNo">072</span> // which is holding the lock is also in the queue, so we need to use hasLockAccess here<a name="line.72"></a>
-<span class="sourceLineNo">073</span> // instead of hasParentLock<a name="line.73"></a>
-<span class="sourceLineNo">074</span> Procedure<?> nextProc = peek();<a name="line.74"></a>
-<span class="sourceLineNo">075</span> return nextProc != null && getLockStatus().hasLockAccess(nextProc);<a name="line.75"></a>
-<span class="sourceLineNo">076</span> }<a name="line.76"></a>
-<span class="sourceLineNo">077</span> return true;<a name="line.77"></a>
-<span class="sourceLineNo">078</span> }<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span> // ======================================================================<a name="line.80"></a>
-<span class="sourceLineNo">081</span> // Functions to handle procedure queue<a name="line.81"></a>
-<span class="sourceLineNo">082</span> // ======================================================================<a name="line.82"></a>
-<span class="sourceLineNo">083</span> public void add(Procedure<?> proc, boolean addToFront) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> if (addToFront) {<a name="line.84"></a>
-<span class="sourceLineNo">085</span> runnables.addFirst(proc);<a name="line.85"></a>
-<span class="sourceLineNo">086</span> } else {<a name="line.86"></a>
-<span class="sourceLineNo">087</span> runnables.addLast(proc);<a name="line.87"></a>
-<span class="sourceLineNo">088</span> }<a name="line.88"></a>
-<span class="sourceLineNo">089</span> }<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span> public Procedure<?> peek() {<a name="line.91"></a>
-<span class="sourceLineNo">092</span> return runnables.peek();<a name="line.92"></a>
-<span class="sourceLineNo">093</span> }<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span> public Procedure<?> poll() {<a name="line.95"></a>
-<span class="sourceLineNo">096</span> return runnables.poll();<a name="line.96"></a>
-<span class="sourceLineNo">097</span> }<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span> public boolean isEmpty() {<a name="line.99"></a>
-<span class="sourceLineNo">100</span> return runnables.isEmpty();<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> public int size() {<a name="line.103"></a>
-<span class="sourceLineNo">104</span> return runnables.size();<a name="line.104"></a>
-<span class="sourceLineNo">105</span> }<a name="line.105"></a>
-<span class="sourceLineNo">106</span><a name="line.106"></a>
-<span class="sourceLineNo">107</span> // ======================================================================<a name="line.107"></a>
-<span class="sourceLineNo">108</span> // Generic Helpers<a name="line.108"></a>
-<span class="sourceLineNo">109</span> // ======================================================================<a name="line.109"></a>
-<span class="sourceLineNo">110</span> public int compareKey(TKey cmpKey) {<a name="line.110"></a>
-<span class="sourceLineNo">111</span> return key.compareTo(cmpKey);<a name="line.111"></a>
+<span class="sourceLineNo">063</span> public boolean isAvailable() {<a name="line.63"></a>
+<span class="sourceLineNo">064</span> return !isEmpty();<a name="line.64"></a>
+<span class="sourceLineNo">065</span> }<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span> // ======================================================================<a name="line.67"></a>
+<span class="sourceLineNo">068</span> // Functions to handle procedure queue<a name="line.68"></a>
+<span class="sourceLineNo">069</span> // ======================================================================<a name="line.69"></a>
+<span class="sourceLineNo">070</span> public void add(Procedure<?> proc, boolean addToFront) {<a name="line.70"></a>
+<span class="sourceLineNo">071</span> if (addToFront) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> runnables.addFirst(proc);<a name="line.72"></a>
+<span class="sourceLineNo">073</span> } else {<a name="line.73"></a>
+<span class="sourceLineNo">074</span> runnables.addLast(proc);<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><a name="line.77"></a>
+<span class="sourceLineNo">078</span> public Procedure<?> peek() {<a name="line.78"></a>
+<span class="sourceLineNo">079</span> return runnables.peek();<a name="line.79"></a>
+<span class="sourceLineNo">080</span> }<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span> public Procedure<?> poll() {<a name="line.82"></a>
+<span class="sourceLineNo">083</span> return runnables.poll();<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> public boolean isEmpty() {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> return runnables.isEmpty();<a name="line.87"></a>
+<span class="sourceLineNo">088</span> }<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span> public int size() {<a name="line.90"></a>
+<span class="sourceLineNo">091</span> return runnables.size();<a name="line.91"></a>
+<span class="sourceLineNo">092</span> }<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span> // ======================================================================<a name="line.94"></a>
+<span class="sourceLineNo">095</span> // Generic Helpers<a name="line.95"></a>
+<span class="sourceLineNo">096</span> // ======================================================================<a name="line.96"></a>
+<span class="sourceLineNo">097</span> public int compareKey(TKey cmpKey) {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> return key.compareTo(cmpKey);<a name="line.98"></a>
+<span class="sourceLineNo">099</span> }<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span> @Override<a name="line.101"></a>
+<span class="sourceLineNo">102</span> public int compareTo(Queue<TKey> other) {<a name="line.102"></a>
+<span class="sourceLineNo">103</span> return compareKey(other.key);<a name="line.103"></a>
+<span class="sourceLineNo">104</span> }<a name="line.104"></a>
+<span class="sourceLineNo">105</span><a name="line.105"></a>
+<span class="sourceLineNo">106</span> @Override<a name="line.106"></a>
+<span class="sourceLineNo">107</span> public String toString() {<a name="line.107"></a>
+<span class="sourceLineNo">108</span> return String.format("%s(%s, xlock=%s sharedLock=%s size=%s)", getClass().getSimpleName(), key,<a name="line.108"></a>
+<span class="sourceLineNo">109</span> lockStatus.hasExclusiveLock() ? "true (" + lockStatus.getExclusiveLockProcIdOwner() + ")"<a name="line.109"></a>
+<span class="sourceLineNo">110</span> : "false",<a name="line.110"></a>
+<span class="sourceLineNo">111</span> lockStatus.getSharedLockCount(), size());<a name="line.111"></a>
<span class="sourceLineNo">112</span> }<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span> @Override<a name="line.114"></a>
-<span class="sourceLineNo">115</span> public int compareTo(Queue<TKey> other) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span> return compareKey(other.key);<a name="line.116"></a>
-<span class="sourceLineNo">117</span> }<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span> @Override<a name="line.119"></a>
-<span class="sourceLineNo">120</span> public String toString() {<a name="line.120"></a>
-<span class="sourceLineNo">121</span> return String.format("%s(%s, xlock=%s sharedLock=%s size=%s)", getClass().getSimpleName(), key,<a name="line.121"></a>
-<span class="sourceLineNo">122</span> lockStatus.hasExclusiveLock() ? "true (" + lockStatus.getExclusiveLockProcIdOwner() + ")"<a name="line.122"></a>
-<span class="sourceLineNo">123</span> : "false",<a name="line.123"></a>
-<span class="sourceLineNo">124</span> lockStatus.getSharedLockCount(), size());<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">113</span>}<a name="line.113"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b5e107c3/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/SchemaLocking.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/SchemaLocking.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/SchemaLocking.html
index ce02013..fd63007 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/SchemaLocking.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/SchemaLocking.html
@@ -53,189 +53,196 @@
<span class="sourceLineNo">045</span> */<a name="line.45"></a>
<span class="sourceLineNo">046</span>@InterfaceAudience.Private<a name="line.46"></a>
<span class="sourceLineNo">047</span>class SchemaLocking {<a name="line.47"></a>
-<span class="sourceLineNo">048</span> private final Map<ServerName, LockAndQueue> serverLocks = new HashMap<>();<a name="line.48"></a>
-<span class="sourceLineNo">049</span> private final Map<String, LockAndQueue> namespaceLocks = new HashMap<>();<a name="line.49"></a>
-<span class="sourceLineNo">050</span> private final Map<TableName, LockAndQueue> tableLocks = new HashMap<>();<a name="line.50"></a>
-<span class="sourceLineNo">051</span> // Single map for all regions irrespective of tables. Key is encoded region name.<a name="line.51"></a>
-<span class="sourceLineNo">052</span> private final Map<String, LockAndQueue> regionLocks = new HashMap<>();<a name="line.52"></a>
-<span class="sourceLineNo">053</span> private final Map<String, LockAndQueue> peerLocks = new HashMap<>();<a name="line.53"></a>
-<span class="sourceLineNo">054</span> private final LockAndQueue metaLock = new LockAndQueue();<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span> private <T> LockAndQueue getLock(Map<T, LockAndQueue> map, T key) {<a name="line.56"></a>
-<span class="sourceLineNo">057</span> LockAndQueue lock = map.get(key);<a name="line.57"></a>
-<span class="sourceLineNo">058</span> if (lock == null) {<a name="line.58"></a>
-<span class="sourceLineNo">059</span> lock = new LockAndQueue();<a name="line.59"></a>
-<span class="sourceLineNo">060</span> map.put(key, lock);<a name="line.60"></a>
-<span class="sourceLineNo">061</span> }<a name="line.61"></a>
-<span class="sourceLineNo">062</span> return lock;<a name="line.62"></a>
-<span class="sourceLineNo">063</span> }<a name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span> LockAndQueue getTableLock(TableName tableName) {<a name="line.65"></a>
-<span class="sourceLineNo">066</span> return getLock(tableLocks, tableName);<a name="line.66"></a>
-<span class="sourceLineNo">067</span> }<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span> LockAndQueue removeTableLock(TableName tableName) {<a name="line.69"></a>
-<span class="sourceLineNo">070</span> return tableLocks.remove(tableName);<a name="line.70"></a>
-<span class="sourceLineNo">071</span> }<a name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span> LockAndQueue getNamespaceLock(String namespace) {<a name="line.73"></a>
-<span class="sourceLineNo">074</span> return getLock(namespaceLocks, namespace);<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> LockAndQueue getRegionLock(String encodedRegionName) {<a name="line.77"></a>
-<span class="sourceLineNo">078</span> return getLock(regionLocks, encodedRegionName);<a name="line.78"></a>
-<span class="sourceLineNo">079</span> }<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span> /**<a name="line.81"></a>
-<span class="sourceLineNo">082</span> * @deprecated only used for {@link RecoverMetaProcedure}. Should be removed along with<a name="line.82"></a>
-<span class="sourceLineNo">083</span> * {@link RecoverMetaProcedure}.<a name="line.83"></a>
-<span class="sourceLineNo">084</span> */<a name="line.84"></a>
-<span class="sourceLineNo">085</span> @Deprecated<a name="line.85"></a>
-<span class="sourceLineNo">086</span> LockAndQueue getMetaLock() {<a name="line.86"></a>
-<span class="sourceLineNo">087</span> return metaLock;<a name="line.87"></a>
-<span class="sourceLineNo">088</span> }<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span> LockAndQueue removeRegionLock(String encodedRegionName) {<a name="line.90"></a>
-<span class="sourceLineNo">091</span> return regionLocks.remove(encodedRegionName);<a name="line.91"></a>
-<span class="sourceLineNo">092</span> }<a name="line.92"></a>
-<span class="sourceLineNo">093</span><a name="line.93"></a>
-<span class="sourceLineNo">094</span> LockAndQueue getServerLock(ServerName serverName) {<a name="line.94"></a>
-<span class="sourceLineNo">095</span> return getLock(serverLocks, serverName);<a name="line.95"></a>
-<span class="sourceLineNo">096</span> }<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span> LockAndQueue removeServerLock(ServerName serverName) {<a name="line.98"></a>
-<span class="sourceLineNo">099</span> return serverLocks.remove(serverName);<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> LockAndQueue getPeerLock(String peerId) {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> return getLock(peerLocks, peerId);<a name="line.103"></a>
-<span class="sourceLineNo">104</span> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span> LockAndQueue removePeerLock(String peerId) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span> return peerLocks.remove(peerId);<a name="line.107"></a>
-<span class="sourceLineNo">108</span> }<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span> private LockedResource createLockedResource(LockedResourceType resourceType, String resourceName,<a name="line.110"></a>
-<span class="sourceLineNo">111</span> LockAndQueue queue) {<a name="line.111"></a>
-<span class="sourceLineNo">112</span> LockType lockType;<a name="line.112"></a>
-<span class="sourceLineNo">113</span> Procedure<?> exclusiveLockOwnerProcedure;<a name="line.113"></a>
-<span class="sourceLineNo">114</span> int sharedLockCount;<a name="line.114"></a>
-<span class="sourceLineNo">115</span><a name="line.115"></a>
-<span class="sourceLineNo">116</span> if (queue.hasExclusiveLock()) {<a name="line.116"></a>
-<span class="sourceLineNo">117</span> lockType = LockType.EXCLUSIVE;<a name="line.117"></a>
-<span class="sourceLineNo">118</span> exclusiveLockOwnerProcedure = queue.getExclusiveLockOwnerProcedure();<a name="line.118"></a>
-<span class="sourceLineNo">119</span> sharedLockCount = 0;<a name="line.119"></a>
-<span class="sourceLineNo">120</span> } else {<a name="line.120"></a>
-<span class="sourceLineNo">121</span> lockType = LockType.SHARED;<a name="line.121"></a>
-<span class="sourceLineNo">122</span> exclusiveLockOwnerProcedure = null;<a name="line.122"></a>
-<span class="sourceLineNo">123</span> sharedLockCount = queue.getSharedLockCount();<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> List<Procedure<?>> waitingProcedures = new ArrayList<>();<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span> queue.filterWaitingQueue(p -> p instanceof LockProcedure)<a name="line.128"></a>
-<span class="sourceLineNo">129</span> .forEachOrdered(waitingProcedures::add);<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span> return new LockedResource(resourceType, resourceName, lockType, exclusiveLockOwnerProcedure,<a name="line.131"></a>
-<span class="sourceLineNo">132</span> sharedLockCount, waitingProcedures);<a name="line.132"></a>
-<span class="sourceLineNo">133</span> }<a name="line.133"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span> private final Function<Long, Procedure<?>> procedureRetriever;<a name="line.49"></a>
+<span class="sourceLineNo">050</span> private final Map<ServerName, LockAndQueue> serverLocks = new HashMap<>();<a name="line.50"></a>
+<span class="sourceLineNo">051</span> private final Map<String, LockAndQueue> namespaceLocks = new HashMap<>();<a name="line.51"></a>
+<span class="sourceLineNo">052</span> private final Map<TableName, LockAndQueue> tableLocks = new HashMap<>();<a name="line.52"></a>
+<span class="sourceLineNo">053</span> // Single map for all regions irrespective of tables. Key is encoded region name.<a name="line.53"></a>
+<span class="sourceLineNo">054</span> private final Map<String, LockAndQueue> regionLocks = new HashMap<>();<a name="line.54"></a>
+<span class="sourceLineNo">055</span> private final Map<String, LockAndQueue> peerLocks = new HashMap<>();<a name="line.55"></a>
+<span class="sourceLineNo">056</span> private final LockAndQueue metaLock;<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span> public SchemaLocking(Function<Long, Procedure<?>> procedureRetriever) {<a name="line.58"></a>
+<span class="sourceLineNo">059</span> this.procedureRetriever = procedureRetriever;<a name="line.59"></a>
+<span class="sourceLineNo">060</span> this.metaLock = new LockAndQueue(procedureRetriever);<a name="line.60"></a>
+<span class="sourceLineNo">061</span> }<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span> private <T> LockAndQueue getLock(Map<T, LockAndQueue> map, T key) {<a name="line.63"></a>
+<span class="sourceLineNo">064</span> LockAndQueue lock = map.get(key);<a name="line.64"></a>
+<span class="sourceLineNo">065</span> if (lock == null) {<a name="line.65"></a>
+<span class="sourceLineNo">066</span> lock = new LockAndQueue(procedureRetriever);<a name="line.66"></a>
+<span class="sourceLineNo">067</span> map.put(key, lock);<a name="line.67"></a>
+<span class="sourceLineNo">068</span> }<a name="line.68"></a>
+<span class="sourceLineNo">069</span> return lock;<a name="line.69"></a>
+<span class="sourceLineNo">070</span> }<a name="line.70"></a>
+<span class="sourceLineNo">071</span><a name="line.71"></a>
+<span class="sourceLineNo">072</span> LockAndQueue getTableLock(TableName tableName) {<a name="line.72"></a>
+<span class="sourceLineNo">073</span> return getLock(tableLocks, tableName);<a name="line.73"></a>
+<span class="sourceLineNo">074</span> }<a name="line.74"></a>
+<span class="sourceLineNo">075</span><a name="line.75"></a>
+<span class="sourceLineNo">076</span> LockAndQueue removeTableLock(TableName tableName) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span> return tableLocks.remove(tableName);<a name="line.77"></a>
+<span class="sourceLineNo">078</span> }<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span> LockAndQueue getNamespaceLock(String namespace) {<a name="line.80"></a>
+<span class="sourceLineNo">081</span> return getLock(namespaceLocks, namespace);<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> LockAndQueue getRegionLock(String encodedRegionName) {<a name="line.84"></a>
+<span class="sourceLineNo">085</span> return getLock(regionLocks, encodedRegionName);<a name="line.85"></a>
+<span class="sourceLineNo">086</span> }<a name="line.86"></a>
+<span class="sourceLineNo">087</span><a name="line.87"></a>
+<span class="sourceLineNo">088</span> /**<a name="line.88"></a>
+<span class="sourceLineNo">089</span> * @deprecated only used for {@link RecoverMetaProcedure}. Should be removed along with<a name="line.89"></a>
+<span class="sourceLineNo">090</span> * {@link RecoverMetaProcedure}.<a name="line.90"></a>
+<span class="sourceLineNo">091</span> */<a name="line.91"></a>
+<span class="sourceLineNo">092</span> @Deprecated<a name="line.92"></a>
+<span class="sourceLineNo">093</span> LockAndQueue getMetaLock() {<a name="line.93"></a>
+<span class="sourceLineNo">094</span> return metaLock;<a name="line.94"></a>
+<span class="sourceLineNo">095</span> }<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span> LockAndQueue removeRegionLock(String encodedRegionName) {<a name="line.97"></a>
+<span class="sourceLineNo">098</span> return regionLocks.remove(encodedRegionName);<a name="line.98"></a>
+<span class="sourceLineNo">099</span> }<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span> LockAndQueue getServerLock(ServerName serverName) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> return getLock(serverLocks, serverName);<a name="line.102"></a>
+<span class="sourceLineNo">103</span> }<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span> LockAndQueue removeServerLock(ServerName serverName) {<a name="line.105"></a>
+<span class="sourceLineNo">106</span> return serverLocks.remove(serverName);<a name="line.106"></a>
+<span class="sourceLineNo">107</span> }<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span> LockAndQueue getPeerLock(String peerId) {<a name="line.109"></a>
+<span class="sourceLineNo">110</span> return getLock(peerLocks, peerId);<a name="line.110"></a>
+<span class="sourceLineNo">111</span> }<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span> LockAndQueue removePeerLock(String peerId) {<a name="line.113"></a>
+<span class="sourceLineNo">114</span> return peerLocks.remove(peerId);<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> private LockedResource createLockedResource(LockedResourceType resourceType, String resourceName,<a name="line.117"></a>
+<span class="sourceLineNo">118</span> LockAndQueue queue) {<a name="line.118"></a>
+<span class="sourceLineNo">119</span> LockType lockType;<a name="line.119"></a>
+<span class="sourceLineNo">120</span> Procedure<?> exclusiveLockOwnerProcedure;<a name="line.120"></a>
+<span class="sourceLineNo">121</span> int sharedLockCount;<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span> if (queue.hasExclusiveLock()) {<a name="line.123"></a>
+<span class="sourceLineNo">124</span> lockType = LockType.EXCLUSIVE;<a name="line.124"></a>
+<span class="sourceLineNo">125</span> exclusiveLockOwnerProcedure = queue.getExclusiveLockOwnerProcedure();<a name="line.125"></a>
+<span class="sourceLineNo">126</span> sharedLockCount = 0;<a name="line.126"></a>
+<span class="sourceLineNo">127</span> } else {<a name="line.127"></a>
+<span class="sourceLineNo">128</span> lockType = LockType.SHARED;<a name="line.128"></a>
+<span class="sourceLineNo">129</span> exclusiveLockOwnerProcedure = null;<a name="line.129"></a>
+<span class="sourceLineNo">130</span> sharedLockCount = queue.getSharedLockCount();<a name="line.130"></a>
+<span class="sourceLineNo">131</span> }<a name="line.131"></a>
+<span class="sourceLineNo">132</span><a name="line.132"></a>
+<span class="sourceLineNo">133</span> List<Procedure<?>> waitingProcedures = new ArrayList<>();<a name="line.133"></a>
<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span> private <T> void addToLockedResources(List<LockedResource> lockedResources,<a name="line.135"></a>
-<span class="sourceLineNo">136</span> Map<T, LockAndQueue> locks, Function<T, String> keyTransformer,<a name="line.136"></a>
-<span class="sourceLineNo">137</span> LockedResourceType resourcesType) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span> locks.entrySet().stream().filter(e -> e.getValue().isLocked())<a name="line.138"></a>
-<span class="sourceLineNo">139</span> .map(e -> createLockedResource(resourcesType, keyTransformer.apply(e.getKey()), e.getValue()))<a name="line.139"></a>
-<span class="sourceLineNo">140</span> .forEachOrdered(lockedResources::add);<a name="line.140"></a>
-<span class="sourceLineNo">141</span> }<a name="line.141"></a>
-<span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span> /**<a name="line.143"></a>
-<span class="sourceLineNo">144</span> * List lock queues.<a name="line.144"></a>
-<span class="sourceLineNo">145</span> * @return the locks<a name="line.145"></a>
-<span class="sourceLineNo">146</span> */<a name="line.146"></a>
-<span class="sourceLineNo">147</span> List<LockedResource> getLocks() {<a name="line.147"></a>
-<span class="sourceLineNo">148</span> List<LockedResource> lockedResources = new ArrayList<>();<a name="line.148"></a>
-<span class="sourceLineNo">149</span> addToLockedResources(lockedResources, serverLocks, sn -> sn.getServerName(),<a name="line.149"></a>
-<span class="sourceLineNo">150</span> LockedResourceType.SERVER);<a name="line.150"></a>
-<span class="sourceLineNo">151</span> addToLockedResources(lockedResources, namespaceLocks, Function.identity(),<a name="line.151"></a>
-<span class="sourceLineNo">152</span> LockedResourceType.NAMESPACE);<a name="line.152"></a>
-<span class="sourceLineNo">153</span> addToLockedResources(lockedResources, tableLocks, tn -> tn.getNameAsString(),<a name="line.153"></a>
-<span class="sourceLineNo">154</span> LockedResourceType.TABLE);<a name="line.154"></a>
-<span class="sourceLineNo">155</span> addToLockedResources(lockedResources, regionLocks, Function.identity(),<a name="line.155"></a>
-<span class="sourceLineNo">156</span> LockedResourceType.REGION);<a name="line.156"></a>
-<span class="sourceLineNo">157</span> addToLockedResources(lockedResources, peerLocks, Function.identity(), LockedResourceType.PEER);<a name="line.157"></a>
-<span class="sourceLineNo">158</span> addToLockedResources(lockedResources, ImmutableMap.of(TableName.META_TABLE_NAME, metaLock),<a name="line.158"></a>
-<span class="sourceLineNo">159</span> tn -> tn.getNameAsString(), LockedResourceType.META);<a name="line.159"></a>
-<span class="sourceLineNo">160</span> return lockedResources;<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> * @return {@link LockedResource} for resource of specified type & name. null if resource is not<a name="line.164"></a>
-<span class="sourceLineNo">165</span> * locked.<a name="line.165"></a>
-<span class="sourceLineNo">166</span> */<a name="line.166"></a>
-<span class="sourceLineNo">167</span> LockedResource getLockResource(LockedResourceType resourceType, String resourceName) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span> LockAndQueue queue;<a name="line.168"></a>
-<span class="sourceLineNo">169</span> switch (resourceType) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span> case SERVER:<a name="line.170"></a>
-<span class="sourceLineNo">171</span> queue = serverLocks.get(ServerName.valueOf(resourceName));<a name="line.171"></a>
-<span class="sourceLineNo">172</span> break;<a name="line.172"></a>
-<span class="sourceLineNo">173</span> case NAMESPACE:<a name="line.173"></a>
-<span class="sourceLineNo">174</span> queue = namespaceLocks.get(resourceName);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> break;<a name="line.175"></a>
-<span class="sourceLineNo">176</span> case TABLE:<a name="line.176"></a>
-<span class="sourceLineNo">177</span> queue = tableLocks.get(TableName.valueOf(resourceName));<a name="line.177"></a>
-<span class="sourceLineNo">178</span> break;<a name="line.178"></a>
-<span class="sourceLineNo">179</span> case REGION:<a name="line.179"></a>
-<span class="sourceLineNo">180</span> queue = regionLocks.get(resourceName);<a name="line.180"></a>
-<span class="sourceLineNo">181</span> break;<a name="line.181"></a>
-<span class="sourceLineNo">182</span> case PEER:<a name="line.182"></a>
-<span class="sourceLineNo">183</span> queue = peerLocks.get(resourceName);<a name="line.183"></a>
-<span class="sourceLineNo">184</span> break;<a name="line.184"></a>
-<span class="sourceLineNo">185</span> case META:<a name="line.185"></a>
-<span class="sourceLineNo">186</span> queue = metaLock;<a name="line.186"></a>
-<span class="sourceLineNo">187</span> default:<a name="line.187"></a>
-<span class="sourceLineNo">188</span> queue = null;<a name="line.188"></a>
-<span class="sourceLineNo">189</span> break;<a name="line.189"></a>
-<span class="sourceLineNo">190</span> }<a name="line.190"></a>
-<span class="sourceLineNo">191</span> return queue != null ? createLockedResource(resourceType, resourceName, queue) : null;<a name="line.191"></a>
-<span class="sourceLineNo">192</span> }<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span> /**<a name="line.194"></a>
-<span class="sourceLineNo">195</span> * Removes all locks by clearing the maps. Used when procedure executor is stopped for failure and<a name="line.195"></a>
-<span class="sourceLineNo">196</span> * recovery testing.<a name="line.196"></a>
-<span class="sourceLineNo">197</span> */<a name="line.197"></a>
-<span class="sourceLineNo">198</span> void clear() {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> serverLocks.clear();<a name="line.199"></a>
-<span class="sourceLineNo">200</span> namespaceLocks.clear();<a name="line.200"></a>
-<span class="sourceLineNo">201</span> tableLocks.clear();<a name="line.201"></a>
-<span class="sourceLineNo">202</span> regionLocks.clear();<a name="line.202"></a>
-<span class="sourceLineNo">203</span> peerLocks.clear();<a name="line.203"></a>
-<span class="sourceLineNo">204</span> }<a name="line.204"></a>
-<span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span> @Override<a name="line.206"></a>
-<span class="sourceLineNo">207</span> public String toString() {<a name="line.207"></a>
-<span class="sourceLineNo">208</span> return "serverLocks=" + filterUnlocked(this.serverLocks) + ", namespaceLocks=" +<a name="line.208"></a>
-<span class="sourceLineNo">209</span> filterUnlocked(this.namespaceLocks) + ", tableLocks=" + filterUnlocked(this.tableLocks) +<a name="line.209"></a>
-<span class="sourceLineNo">210</span> ", regionLocks=" + filterUnlocked(this.regionLocks) + ", peerLocks=" +<a name="line.210"></a>
-<span class="sourceLineNo">211</span> filterUnlocked(this.peerLocks) + ", metaLocks=" +<a name="line.211"></a>
-<span class="sourceLineNo">212</span> filterUnlocked(ImmutableMap.of(TableName.META_TABLE_NAME, metaLock));<a name="line.212"></a>
-<span class="sourceLineNo">213</span> }<a name="line.213"></a>
-<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span> private String filterUnlocked(Map<?, LockAndQueue> locks) {<a name="line.215"></a>
-<span class="sourceLineNo">216</span> StringBuilder sb = new StringBuilder("{");<a name="line.216"></a>
-<span class="sourceLineNo">217</span> int initialLength = sb.length();<a name="line.217"></a>
-<span class="sourceLineNo">218</span> for (Map.Entry<?, LockAndQueue> entry : locks.entrySet()) {<a name="line.218"></a>
-<span class="sourceLineNo">219</span> if (!entry.getValue().isLocked()) {<a name="line.219"></a>
-<span class="sourceLineNo">220</span> continue;<a name="line.220"></a>
-<span class="sourceLineNo">221</span> }<a name="line.221"></a>
-<span class="sourceLineNo">222</span> if (sb.length() > initialLength) {<a name="line.222"></a>
-<span class="sourceLineNo">223</span> sb.append(", ");<a name="line.223"></a>
-<span class="sourceLineNo">224</span> }<a name="line.224"></a>
-<span class="sourceLineNo">225</span> sb.append("{").append(entry.getKey()).append("=").append(entry.getValue()).append("}");<a name="line.225"></a>
-<span class="sourceLineNo">226</span> }<a name="line.226"></a>
-<span class="sourceLineNo">227</span> sb.append("}");<a name="line.227"></a>
-<span class="sourceLineNo">228</span> return sb.toString();<a name="line.228"></a>
-<span class="sourceLineNo">229</span> }<a name="line.229"></a>
-<span class="sourceLineNo">230</span>}<a name="line.230"></a>
+<span class="sourceLineNo">135</span> queue.filterWaitingQueue(p -> p instanceof LockProcedure)<a name="line.135"></a>
+<span class="sourceLineNo">136</span> .forEachOrdered(waitingProcedures::add);<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span> return new LockedResource(resourceType, resourceName, lockType, exclusiveLockOwnerProcedure,<a name="line.138"></a>
+<span class="sourceLineNo">139</span> sharedLockCount, waitingProcedures);<a name="line.139"></a>
+<span class="sourceLineNo">140</span> }<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span> private <T> void addToLockedResources(List<LockedResource> lockedResources,<a name="line.142"></a>
+<span class="sourceLineNo">143</span> Map<T, LockAndQueue> locks, Function<T, String> keyTransformer,<a name="line.143"></a>
+<span class="sourceLineNo">144</span> LockedResourceType resourcesType) {<a name="line.144"></a>
+<span class="sourceLineNo">145</span> locks.entrySet().stream().filter(e -> e.getValue().isLocked())<a name="line.145"></a>
+<span class="sourceLineNo">146</span> .map(e -> createLockedResource(resourcesType, keyTransformer.apply(e.getKey()), e.getValue()))<a name="line.146"></a>
+<span class="sourceLineNo">147</span> .forEachOrdered(lockedResources::add);<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> * List lock queues.<a name="line.151"></a>
+<span class="sourceLineNo">152</span> * @return the locks<a name="line.152"></a>
+<span class="sourceLineNo">153</span> */<a name="line.153"></a>
+<span class="sourceLineNo">154</span> List<LockedResource> getLocks() {<a name="line.154"></a>
+<span class="sourceLineNo">155</span> List<LockedResource> lockedResources = new ArrayList<>();<a name="line.155"></a>
+<span class="sourceLineNo">156</span> addToLockedResources(lockedResources, serverLocks, sn -> sn.getServerName(),<a name="line.156"></a>
+<span class="sourceLineNo">157</span> LockedResourceType.SERVER);<a name="line.157"></a>
+<span class="sourceLineNo">158</span> addToLockedResources(lockedResources, namespaceLocks, Function.identity(),<a name="line.158"></a>
+<span class="sourceLineNo">159</span> LockedResourceType.NAMESPACE);<a name="line.159"></a>
+<span class="sourceLineNo">160</span> addToLockedResources(lockedResources, tableLocks, tn -> tn.getNameAsString(),<a name="line.160"></a>
+<span class="sourceLineNo">161</span> LockedResourceType.TABLE);<a name="line.161"></a>
+<span class="sourceLineNo">162</span> addToLockedResources(lockedResources, regionLocks, Function.identity(),<a name="line.162"></a>
+<span class="sourceLineNo">163</span> LockedResourceType.REGION);<a name="line.163"></a>
+<span class="sourceLineNo">164</span> addToLockedResources(lockedResources, peerLocks, Function.identity(), LockedResourceType.PEER);<a name="line.164"></a>
+<span class="sourceLineNo">165</span> addToLockedResources(lockedResources, ImmutableMap.of(TableName.META_TABLE_NAME, metaLock),<a name="line.165"></a>
+<span class="sourceLineNo">166</span> tn -> tn.getNameAsString(), LockedResourceType.META);<a name="line.166"></a>
+<span class="sourceLineNo">167</span> return lockedResources;<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> /**<a name="line.170"></a>
+<span class="sourceLineNo">171</span> * @return {@link LockedResource} for resource of specified type & name. null if resource is not<a name="line.171"></a>
+<span class="sourceLineNo">172</span> * locked.<a name="line.172"></a>
+<span class="sourceLineNo">173</span> */<a name="line.173"></a>
+<span class="sourceLineNo">174</span> LockedResource getLockResource(LockedResourceType resourceType, String resourceName) {<a name="line.174"></a>
+<span class="sourceLineNo">175</span> LockAndQueue queue;<a name="line.175"></a>
+<span class="sourceLineNo">176</span> switch (resourceType) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span> case SERVER:<a name="line.177"></a>
+<span class="sourceLineNo">178</span> queue = serverLocks.get(ServerName.valueOf(resourceName));<a name="line.178"></a>
+<span class="sourceLineNo">179</span> break;<a name="line.179"></a>
+<span class="sourceLineNo">180</span> case NAMESPACE:<a name="line.180"></a>
+<span class="sourceLineNo">181</span> queue = namespaceLocks.get(resourceName);<a name="line.181"></a>
+<span class="sourceLineNo">182</span> break;<a name="line.182"></a>
+<span class="sourceLineNo">183</span> case TABLE:<a name="line.183"></a>
+<span class="sourceLineNo">184</span> queue = tableLocks.get(TableName.valueOf(resourceName));<a name="line.184"></a>
+<span class="sourceLineNo">185</span> break;<a name="line.185"></a>
+<span class="sourceLineNo">186</span> case REGION:<a name="line.186"></a>
+<span class="sourceLineNo">187</span> queue = regionLocks.get(resourceName);<a name="line.187"></a>
+<span class="sourceLineNo">188</span> break;<a name="line.188"></a>
+<span class="sourceLineNo">189</span> case PEER:<a name="line.189"></a>
+<span class="sourceLineNo">190</span> queue = peerLocks.get(resourceName);<a name="line.190"></a>
+<span class="sourceLineNo">191</span> break;<a name="line.191"></a>
+<span class="sourceLineNo">192</span> case META:<a name="line.192"></a>
+<span class="sourceLineNo">193</span> queue = metaLock;<a name="line.193"></a>
+<span class="sourceLineNo">194</span> default:<a name="line.194"></a>
+<span class="sourceLineNo">195</span> queue = null;<a name="line.195"></a>
+<span class="sourceLineNo">196</span> break;<a name="line.196"></a>
+<span class="sourceLineNo">197</span> }<a name="line.197"></a>
+<span class="sourceLineNo">198</span> return queue != null ? createLockedResource(resourceType, resourceName, queue) : null;<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> /**<a name="line.201"></a>
+<span class="sourceLineNo">202</span> * Removes all locks by clearing the maps. Used when procedure executor is stopped for failure and<a name="line.202"></a>
+<span class="sourceLineNo">203</span> * recovery testing.<a name="line.203"></a>
+<span class="sourceLineNo">204</span> */<a name="line.204"></a>
+<span class="sourceLineNo">205</span> void clear() {<a name="line.205"></a>
+<span class="sourceLineNo">206</span> serverLocks.clear();<a name="line.206"></a>
+<span class="sourceLineNo">207</span> namespaceLocks.clear();<a name="line.207"></a>
+<span class="sourceLineNo">208</span> tableLocks.clear();<a name="line.208"></a>
+<span class="sourceLineNo">209</span> regionLocks.clear();<a name="line.209"></a>
+<span class="sourceLineNo">210</span> peerLocks.clear();<a name="line.210"></a>
+<span class="sourceLineNo">211</span> }<a name="line.211"></a>
+<span class="sourceLineNo">212</span><a name="line.212"></a>
+<span class="sourceLineNo">213</span> @Override<a name="line.213"></a>
+<span class="sourceLineNo">214</span> public String toString() {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> return "serverLocks=" + filterUnlocked(this.serverLocks) + ", namespaceLocks=" +<a name="line.215"></a>
+<span class="sourceLineNo">216</span> filterUnlocked(this.namespaceLocks) + ", tableLocks=" + filterUnlocked(this.tableLocks) +<a name="line.216"></a>
+<span class="sourceLineNo">217</span> ", regionLocks=" + filterUnlocked(this.regionLocks) + ", peerLocks=" +<a name="line.217"></a>
+<span class="sourceLineNo">218</span> filterUnlocked(this.peerLocks) + ", metaLocks=" +<a name="line.218"></a>
+<span class="sourceLineNo">219</span> filterUnlocked(ImmutableMap.of(TableName.META_TABLE_NAME, metaLock));<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span><a name="line.221"></a>
+<span class="sourceLineNo">222</span> private String filterUnlocked(Map<?, LockAndQueue> locks) {<a name="line.222"></a>
+<span class="sourceLineNo">223</span> StringBuilder sb = new StringBuilder("{");<a name="line.223"></a>
+<span class="sourceLineNo">224</span> int initialLength = sb.length();<a name="line.224"></a>
+<span class="sourceLineNo">225</span> for (Map.Entry<?, LockAndQueue> entry : locks.entrySet()) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span> if (!entry.getValue().isLocked()) {<a name="line.226"></a>
+<span class="sourceLineNo">227</span> continue;<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span> if (sb.length() > initialLength) {<a name="line.229"></a>
+<span class="sourceLineNo">230</span> sb.append(", ");<a name="line.230"></a>
+<span class="sourceLineNo">231</span> }<a name="line.231"></a>
+<span class="sourceLineNo">232</span> sb.append("{").append(entry.getKey()).append("=").append(entry.getValue()).append("}");<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<a name="line.233"></a>
+<span class="sourceLineNo">234</span> sb.append("}");<a name="line.234"></a>
+<span class="sourceLineNo">235</span> return sb.toString();<a name="line.235"></a>
+<span class="sourceLineNo">236</span> }<a name="line.236"></a>
+<span class="sourceLineNo">237</span>}<a name="line.237"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b5e107c3/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TableQueue.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TableQueue.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TableQueue.html
index 204df9b..96806bc 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TableQueue.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/procedure/TableQueue.html
@@ -42,59 +42,45 @@
<span class="sourceLineNo">034</span><a name="line.34"></a>
<span class="sourceLineNo">035</span> @Override<a name="line.35"></a>
<span class="sourceLineNo">036</span> public boolean isAvailable() {<a name="line.36"></a>
-<span class="sourceLineNo">037</span> // if there are no items in the queue, or the namespace is locked.<a name="line.37"></a>
-<span class="sourceLineNo">038</span> // we can't execute operation on this table<a name="line.38"></a>
-<span class="sourceLineNo">039</span> if (isEmpty() || namespaceLockStatus.hasExclusiveLock()) {<a name="line.39"></a>
-<span class="sourceLineNo">040</span> return false;<a name="line.40"></a>
-<span class="sourceLineNo">041</span> }<a name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span> if (getLockStatus().hasExclusiveLock()) {<a name="line.43"></a>
-<span class="sourceLineNo">044</span> // if we have an exclusive lock already taken<a name="line.44"></a>
-<span class="sourceLineNo">045</span> // only child of the lock owner can be executed<a name="line.45"></a>
-<span class="sourceLineNo">046</span> final Procedure<?> nextProc = peek();<a name="line.46"></a>
-<span class="sourceLineNo">047</span> return nextProc != null && getLockStatus().hasLockAccess(nextProc);<a name="line.47"></a>
-<span class="sourceLineNo">048</span> }<a name="line.48"></a>
-<span class="sourceLineNo">049</span><a name="line.49"></a>
-<span class="sourceLineNo">050</span> // no xlock<a name="line.50"></a>
-<span class="sourceLineNo">051</span> return true;<a name="line.51"></a>
-<span class="sourceLineNo">052</span> }<a name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span> @Override<a name="line.54"></a>
-<span class="sourceLineNo">055</span> public boolean requireExclusiveLock(Procedure<?> proc) {<a name="line.55"></a>
-<span class="sourceLineNo">056</span> return requireTableExclusiveLock((TableProcedureInterface) proc);<a name="line.56"></a>
-<span class="sourceLineNo">057</span> }<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span> /**<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * @param proc must not be null<a name="line.60"></a>
-<span class="sourceLineNo">061</span> */<a name="line.61"></a>
-<span class="sourceLineNo">062</span> private static boolean requireTableExclusiveLock(TableProcedureInterface proc) {<a name="line.62"></a>
-<span class="sourceLineNo">063</span> switch (proc.getTableOperationType()) {<a name="line.63"></a>
-<span class="sourceLineNo">064</span> case CREATE:<a name="line.64"></a>
-<span class="sourceLineNo">065</span> case DELETE:<a name="line.65"></a>
-<span class="sourceLineNo">066</span> case DISABLE:<a name="line.66"></a>
-<span class="sourceLineNo">067</span> case ENABLE:<a name="line.67"></a>
-<span class="sourceLineNo">068</span> return true;<a name="line.68"></a>
-<span class="sourceLineNo">069</span> case EDIT:<a name="line.69"></a>
-<span class="sourceLineNo">070</span> // we allow concurrent edit on the NS table<a name="line.70"></a>
-<span class="sourceLineNo">071</span> return !proc.getTableName().equals(TableName.NAMESPACE_TABLE_NAME);<a name="line.71"></a>
-<span class="sourceLineNo">072</span> case READ:<a name="line.72"></a>
-<span class="sourceLineNo">073</span> return false;<a name="line.73"></a>
-<span class="sourceLineNo">074</span> // region operations are using the shared-lock on the table<a name="line.74"></a>
-<span class="sourceLineNo">075</span> // and then they will grab an xlock on the region.<a name="line.75"></a>
-<span class="sourceLineNo">076</span> case REGION_SPLIT:<a name="line.76"></a>
-<span class="sourceLineNo">077</span> case REGION_MERGE:<a name="line.77"></a>
-<span class="sourceLineNo">078</span> case REGION_ASSIGN:<a name="line.78"></a>
-<span class="sourceLineNo">079</span> case REGION_UNASSIGN:<a name="line.79"></a>
-<span class="sourceLineNo">080</span> case REGION_EDIT:<a name="line.80"></a>
-<span class="sourceLineNo">081</span> case REGION_GC:<a name="line.81"></a>
-<span class="sourceLineNo">082</span> case MERGED_REGIONS_GC:<a name="line.82"></a>
-<span class="sourceLineNo">083</span> return false;<a name="line.83"></a>
-<span class="sourceLineNo">084</span> default:<a name="line.84"></a>
-<span class="sourceLineNo">085</span> break;<a name="line.85"></a>
-<span class="sourceLineNo">086</span> }<a name="line.86"></a>
-<span class="sourceLineNo">087</span> throw new UnsupportedOperationException("unexpected type " + proc.getTableOperationType());<a name="line.87"></a>
-<span class="sourceLineNo">088</span> }<a name="line.88"></a>
-<span class="sourceLineNo">089</span>}<a name="line.89"></a>
+<span class="sourceLineNo">037</span> return !isEmpty() && !namespaceLockStatus.hasExclusiveLock();<a name="line.37"></a>
+<span class="sourceLineNo">038</span> }<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span> @Override<a name="line.40"></a>
+<span class="sourceLineNo">041</span> public boolean requireExclusiveLock(Procedure<?> proc) {<a name="line.41"></a>
+<span class="sourceLineNo">042</span> return requireTableExclusiveLock((TableProcedureInterface) proc);<a name="line.42"></a>
+<span class="sourceLineNo">043</span> }<a name="line.43"></a>
+<span class="sourceLineNo">044</span><a name="line.44"></a>
+<span class="sourceLineNo">045</span> /**<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * @param proc must not be null<a name="line.46"></a>
+<span class="sourceLineNo">047</span> */<a name="line.47"></a>
+<span class="sourceLineNo">048</span> private static boolean requireTableExclusiveLock(TableProcedureInterface proc) {<a name="line.48"></a>
+<span class="sourceLineNo">049</span> switch (proc.getTableOperationType()) {<a name="line.49"></a>
+<span class="sourceLineNo">050</span> case CREATE:<a name="line.50"></a>
+<span class="sourceLineNo">051</span> case DELETE:<a name="line.51"></a>
+<span class="sourceLineNo">052</span> case DISABLE:<a name="line.52"></a>
+<span class="sourceLineNo">053</span> case ENABLE:<a name="line.53"></a>
+<span class="sourceLineNo">054</span> return true;<a name="line.54"></a>
+<span class="sourceLineNo">055</span> case EDIT:<a name="line.55"></a>
+<span class="sourceLineNo">056</span> // we allow concurrent edit on the NS table<a name="line.56"></a>
+<span class="sourceLineNo">057</span> return !proc.getTableName().equals(TableName.NAMESPACE_TABLE_NAME);<a name="line.57"></a>
+<span class="sourceLineNo">058</span> case READ:<a name="line.58"></a>
+<span class="sourceLineNo">059</span> return false;<a name="line.59"></a>
+<span class="sourceLineNo">060</span> // region operations are using the shared-lock on the table<a name="line.60"></a>
+<span class="sourceLineNo">061</span> // and then they will grab an xlock on the region.<a name="line.61"></a>
+<span class="sourceLineNo">062</span> case REGION_SPLIT:<a name="line.62"></a>
+<span class="sourceLineNo">063</span> case REGION_MERGE:<a name="line.63"></a>
+<span class="sourceLineNo">064</span> case REGION_ASSIGN:<a name="line.64"></a>
+<span class="sourceLineNo">065</span> case REGION_UNASSIGN:<a name="line.65"></a>
+<span class="sourceLineNo">066</span> case REGION_EDIT:<a name="line.66"></a>
+<span class="sourceLineNo">067</span> case REGION_GC:<a name="line.67"></a>
+<span class="sourceLineNo">068</span> case MERGED_REGIONS_GC:<a name="line.68"></a>
+<span class="sourceLineNo">069</span> return false;<a name="line.69"></a>
+<span class="sourceLineNo">070</span> default:<a name="line.70"></a>
+<span class="sourceLineNo">071</span> break;<a name="line.71"></a>
+<span class="sourceLineNo">072</span> }<a name="line.72"></a>
+<span class="sourceLineNo">073</span> throw new UnsupportedOperationException("unexpected type " + proc.getTableOperationType());<a name="line.73"></a>
+<span class="sourceLineNo">074</span> }<a name="line.74"></a>
+<span class="sourceLineNo">075</span>}<a name="line.75"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b5e107c3/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/LockAndQueue.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/LockAndQueue.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/LockAndQueue.html
index 1c77e4e..7f1a900 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/LockAndQueue.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/LockAndQueue.html
@@ -26,132 +26,132 @@
<span class="sourceLineNo">018</span><a name="line.18"></a>
<span class="sourceLineNo">019</span>package org.apache.hadoop.hbase.procedure2;<a name="line.19"></a>
<span class="sourceLineNo">020</span><a name="line.20"></a>
-<span class="sourceLineNo">021</span>import java.util.function.Predicate;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import java.util.stream.Stream;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.23"></a>
-<span class="sourceLineNo">024</span><a name="line.24"></a>
-<span class="sourceLineNo">025</span>/**<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * Locking for mutual exclusion between procedures. Used only by procedure framework internally.<a name="line.26"></a>
-<span class="sourceLineNo">027</span> * {@link LockAndQueue} has two purposes:<a name="line.27"></a>
-<span class="sourceLineNo">028</span> * <ol><a name="line.28"></a>
-<span class="sourceLineNo">029</span> * <li>Acquire/release exclusive/shared locks.</li><a name="line.29"></a>
-<span class="sourceLineNo">030</span> * <li>Maintains a list of procedures waiting on this lock.<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * {@link LockAndQueue} extends {@link ProcedureDeque} class. Blocked Procedures are added<a name="line.31"></a>
-<span class="sourceLineNo">032</span> * to our super Deque. Using inheritance over composition to keep the Deque of waiting<a name="line.32"></a>
-<span class="sourceLineNo">033</span> * Procedures is unusual, but we do it this way because in certain cases, there will be<a name="line.33"></a>
-<span class="sourceLineNo">034</span> * millions of regions. This layout uses less memory.<a name="line.34"></a>
+<span class="sourceLineNo">021</span>import java.util.function.Function;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.function.Predicate;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.util.stream.Stream;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.24"></a>
+<span class="sourceLineNo">025</span><a name="line.25"></a>
+<span class="sourceLineNo">026</span>/**<a name="line.26"></a>
+<span class="sourceLineNo">027</span> * Locking for mutual exclusion between procedures. Used only by procedure framework internally.<a name="line.27"></a>
+<span class="sourceLineNo">028</span> * {@link LockAndQueue} has two purposes:<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * <ol><a name="line.29"></a>
+<span class="sourceLineNo">030</span> * <li>Acquire/release exclusive/shared locks.</li><a name="line.30"></a>
+<span class="sourceLineNo">031</span> * <li>Maintains a list of procedures waiting on this lock. {@link LockAndQueue} extends<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * {@link ProcedureDeque} class. Blocked Procedures are added to our super Deque. Using inheritance<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * over composition to keep the Deque of waiting Procedures is unusual, but we do it this way<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * because in certain cases, there will be millions of regions. This layout uses less memory.<a name="line.34"></a>
<span class="sourceLineNo">035</span> * </ol><a name="line.35"></a>
-<span class="sourceLineNo">036</span> *<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * <p>NOT thread-safe. Needs external concurrency control: e.g. uses in MasterProcedureScheduler are<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * guarded by schedLock().<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * <br><a name="line.39"></a>
-<span class="sourceLineNo">040</span> * There is no need of 'volatile' keyword for member variables because of memory synchronization<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * guarantees of locks (see 'Memory Synchronization',<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/locks/Lock.html)<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * <br><a name="line.43"></a>
-<span class="sourceLineNo">044</span> * We do not implement Lock interface because we need exclusive and shared locking, and also<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * because try-lock functions require procedure id.<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * <br><a name="line.46"></a>
-<span class="sourceLineNo">047</span> * We do not use ReentrantReadWriteLock directly because of its high memory overhead.<a name="line.47"></a>
-<span class="sourceLineNo">048</span> */<a name="line.48"></a>
-<span class="sourceLineNo">049</span>@InterfaceAudience.Private<a name="line.49"></a>
-<span class="sourceLineNo">050</span>public class LockAndQueue implements LockStatus {<a name="line.50"></a>
-<span class="sourceLineNo">051</span> private final ProcedureDeque queue = new ProcedureDeque();<a name="line.51"></a>
-<span class="sourceLineNo">052</span> private Procedure<?> exclusiveLockOwnerProcedure = null;<a name="line.52"></a>
-<span class="sourceLineNo">053</span> private int sharedLock = 0;<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span> // ======================================================================<a name="line.55"></a>
-<span class="sourceLineNo">056</span> // Lock Status<a name="line.56"></a>
-<span class="sourceLineNo">057</span> // ======================================================================<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span> @Override<a name="line.59"></a>
-<span class="sourceLineNo">060</span> public boolean isLocked() {<a name="line.60"></a>
-<span class="sourceLineNo">061</span> return hasExclusiveLock() || sharedLock > 0;<a name="line.61"></a>
-<span class="sourceLineNo">062</span> }<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> @Override<a name="line.64"></a>
-<span class="sourceLineNo">065</span> public boolean hasExclusiveLock() {<a name="line.65"></a>
-<span class="sourceLineNo">066</span> return this.exclusiveLockOwnerProcedure != null;<a name="line.66"></a>
-<span class="sourceLineNo">067</span> }<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span> @Override<a name="line.69"></a>
-<span class="sourceLineNo">070</span> public boolean isLockOwner(long procId) {<a name="line.70"></a>
-<span class="sourceLineNo">071</span> return getExclusiveLockProcIdOwner() == procId;<a name="line.71"></a>
-<span class="sourceLineNo">072</span> }<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span> @Override<a name="line.74"></a>
-<span class="sourceLineNo">075</span> public boolean hasParentLock(Procedure<?> proc) {<a name="line.75"></a>
-<span class="sourceLineNo">076</span> // TODO: need to check all the ancestors. need to passed in the procedures<a name="line.76"></a>
-<span class="sourceLineNo">077</span> // to find the ancestors.<a name="line.77"></a>
-<span class="sourceLineNo">078</span> return proc.hasParent() &&<a name="line.78"></a>
-<span class="sourceLineNo">079</span> (isLockOwner(proc.getParentProcId()) || isLockOwner(proc.getRootProcId()));<a name="line.79"></a>
-<span class="sourceLineNo">080</span> }<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span> @Override<a name="line.82"></a>
-<span class="sourceLineNo">083</span> public boolean hasLockAccess(Procedure<?> proc) {<a name="line.83"></a>
-<span class="sourceLineNo">084</span> return isLockOwner(proc.getProcId()) || hasParentLock(proc);<a name="line.84"></a>
-<span class="sourceLineNo">085</span> }<a name="line.85"></a>
-<span class="sourceLineNo">086</span><a name="line.86"></a>
-<span class="sourceLineNo">087</span> @Override<a name="line.87"></a>
-<span class="sourceLineNo">088</span> public Procedure<?> getExclusiveLockOwnerProcedure() {<a name="line.88"></a>
-<span class="sourceLineNo">089</span> return exclusiveLockOwnerProcedure;<a name="line.89"></a>
-<span class="sourceLineNo">090</span> }<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span> @Override<a name="line.92"></a>
-<span class="sourceLineNo">093</span> public long getExclusiveLockProcIdOwner() {<a name="line.93"></a>
-<span class="sourceLineNo">094</span> if (exclusiveLockOwnerProcedure == null) {<a name="line.94"></a>
-<span class="sourceLineNo">095</span> return Long.MIN_VALUE;<a name="line.95"></a>
-<span class="sourceLineNo">096</span> } else {<a name="line.96"></a>
-<span class="sourceLineNo">097</span> return exclusiveLockOwnerProcedure.getProcId();<a name="line.97"></a>
-<span class="sourceLineNo">098</span> }<a name="line.98"></a>
-<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span><a name="line.100"></a>
-<span class="sourceLineNo">101</span> @Override<a name="line.101"></a>
-<span class="sourceLineNo">102</span> public int getSharedLockCount() {<a name="line.102"></a>
-<span class="sourceLineNo">103</span> return sharedLock;<a name="line.103"></a>
-<span class="sourceLineNo">104</span> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span> // ======================================================================<a name="line.106"></a>
-<span class="sourceLineNo">107</span> // try/release Shared/Exclusive lock<a name="line.107"></a>
-<span class="sourceLineNo">108</span> // ======================================================================<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span> /**<a name="line.110"></a>
-<span class="sourceLineNo">111</span> * @return whether we have succesfully acquired the shared lock.<a name="line.111"></a>
-<span class="sourceLineNo">112</span> */<a name="line.112"></a>
-<span class="sourceLineNo">113</span> public boolean trySharedLock(Procedure<?> proc) {<a name="line.113"></a>
-<span class="sourceLineNo">114</span> if (hasExclusiveLock() && !hasLockAccess(proc)) {<a name="line.114"></a>
-<span class="sourceLineNo">115</span> return false;<a name="line.115"></a>
-<span class="sourceLineNo">116</span> }<a name="line.116"></a>
-<span class="sourceLineNo">117</span> // If no one holds the xlock, then we are free to hold the sharedLock<a name="line.117"></a>
-<span class="sourceLineNo">118</span> // If the parent proc or we have already held the xlock, then we return true here as<a name="line.118"></a>
-<span class="sourceLineNo">119</span> // xlock is more powerful then shared lock.<a name="line.119"></a>
-<span class="sourceLineNo">120</span> sharedLock++;<a name="line.120"></a>
-<span class="sourceLineNo">121</span> return true;<a name="line.121"></a>
-<span class="sourceLineNo">122</span> }<a name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span> /**<a name="line.124"></a>
-<span class="sourceLineNo">125</span> * @return whether we should wake the procedures waiting on the lock here.<a name="line.125"></a>
-<span class="sourceLineNo">126</span> */<a name="line.126"></a>
-<span class="sourceLineNo">127</span> public boolean releaseSharedLock() {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> // hasExclusiveLock could be true, it usually means we acquire shared lock while we or our<a name="line.128"></a>
-<span class="sourceLineNo">129</span> // parent have held the xlock. And since there is still an exclusive lock, we do not need to<a name="line.129"></a>
-<span class="sourceLineNo">130</span> // wake any procedures.<a name="line.130"></a>
-<span class="sourceLineNo">131</span> return --sharedLock == 0 && !hasExclusiveLock();<a name="line.131"></a>
-<span class="sourceLineNo">132</span> }<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span> public boolean tryExclusiveLock(Procedure<?> proc) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> if (isLocked()) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span> return hasLockAccess(proc);<a name="line.136"></a>
-<span class="sourceLineNo">137</span> }<a name="line.137"></a>
-<span class="sourceLineNo">138</span> exclusiveLockOwnerProcedure = proc;<a name="line.138"></a>
-<span class="sourceLineNo">139</span> return true;<a name="line.139"></a>
-<span class="sourceLineNo">140</span> }<a name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span> /**<a name="line.142"></a>
-<span class="sourceLineNo">143</span> * @return whether we should wake the procedures waiting on the lock here.<a name="line.143"></a>
-<span class="sourceLineNo">144</span> */<a name="line.144"></a>
-<span class="sourceLineNo">145</span> public boolean releaseExclusiveLock(Procedure<?> proc) {<a name="line.145"></a>
-<span class="sourceLineNo">146</span> if (!isLockOwner(proc.getProcId())) {<a name="line.146"></a>
+<span class="sourceLineNo">036</span> * <p/><a name="line.36"></a>
+<span class="sourceLineNo">037</span> * NOT thread-safe. Needs external concurrency control: e.g. uses in MasterProcedureScheduler are<a name="line.37"></a>
+<span class="sourceLineNo">038</span> * guarded by schedLock(). <br/><a name="line.38"></a>
+<span class="sourceLineNo">039</span> * There is no need of 'volatile' keyword for member variables because of memory synchronization<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * guarantees of locks (see 'Memory Synchronization',<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * http://docs.oracle.com/javase/8/docs/api/java/util/concurrent/locks/Lock.html) <br/><a name="line.41"></a>
+<span class="sourceLineNo">042</span> * We do not implement Lock interface because we need exclusive and shared locking, and also because<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * try-lock functions require procedure id. <br/><a name="line.43"></a>
+<span class="sourceLineNo">044</span> * We do not use ReentrantReadWriteLock directly because of its high memory overhead.<a name="line.44"></a>
+<span class="sourceLineNo">045</span> */<a name="line.45"></a>
+<span class="sourceLineNo">046</span>@InterfaceAudience.Private<a name="line.46"></a>
+<span class="sourceLineNo">047</span>public class LockAndQueue implements LockStatus {<a name="line.47"></a>
+<span class="sourceLineNo">048</span><a name="line.48"></a>
+<span class="sourceLineNo">049</span> private final Function<Long, Procedure<?>> procedureRetriever;<a name="line.49"></a>
+<span class="sourceLineNo">050</span> private final ProcedureDeque queue = new ProcedureDeque();<a name="line.50"></a>
+<span class="sourceLineNo">051</span> private Procedure<?> exclusiveLockOwnerProcedure = null;<a name="line.51"></a>
+<span class="sourceLineNo">052</span> private int sharedLock = 0;<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span> // ======================================================================<a name="line.54"></a>
+<span class="sourceLineNo">055</span> // Lock Status<a name="line.55"></a>
+<span class="sourceLineNo">056</span> // ======================================================================<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span> public LockAndQueue(Function<Long, Procedure<?>> procedureRetriever) {<a name="line.58"></a>
+<span class="sourceLineNo">059</span> this.procedureRetriever = procedureRetriever;<a name="line.59"></a>
+<span class="sourceLineNo">060</span> }<a name="line.60"></a>
+<span class="sourceLineNo">061</span><a name="line.61"></a>
+<span class="sourceLineNo">062</span> @Override<a name="line.62"></a>
+<span class="sourceLineNo">063</span> public boolean hasExclusiveLock() {<a name="line.63"></a>
+<span class="sourceLineNo">064</span> return this.exclusiveLockOwnerProcedure != null;<a name="line.64"></a>
+<span class="sourceLineNo">065</span> }<a name="line.65"></a>
+<span class="sourceLineNo">066</span><a name="line.66"></a>
+<span class="sourceLineNo">067</span> @Override<a name="line.67"></a>
+<span class="sourceLineNo">068</span> public boolean hasLockAccess(Procedure<?> proc) {<a name="line.68"></a>
+<span class="sourceLineNo">069</span> if (exclusiveLockOwnerProcedure == null) {<a name="line.69"></a>
+<span class="sourceLineNo">070</span> return false;<a name="line.70"></a>
+<span class="sourceLineNo">071</span> }<a name="line.71"></a>
+<span class="sourceLineNo">072</span> long lockOwnerId = exclusiveLockOwnerProcedure.getProcId();<a name="line.72"></a>
+<span class="sourceLineNo">073</span> if (proc.getProcId() == lockOwnerId) {<a name="line.73"></a>
+<span class="sourceLineNo">074</span> return true;<a name="line.74"></a>
+<span class="sourceLineNo">075</span> }<a name="line.75"></a>
+<span class="sourceLineNo">076</span> if (!proc.hasParent()) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span> return false;<a name="line.77"></a>
+<span class="sourceLineNo">078</span> }<a name="line.78"></a>
+<span class="sourceLineNo">079</span> // fast path to check root procedure<a name="line.79"></a>
+<span class="sourceLineNo">080</span> if (proc.getRootProcId() == lockOwnerId) {<a name="line.80"></a>
+<span class="sourceLineNo">081</span> return true;<a name="line.81"></a>
+<span class="sourceLineNo">082</span> }<a name="line.82"></a>
+<span class="sourceLineNo">083</span> // check ancestors<a name="line.83"></a>
+<span class="sourceLineNo">084</span> for (Procedure<?> p = proc;;) {<a name="line.84"></a>
+<span class="sourceLineNo">085</span> if (p.getParentProcId() == lockOwnerId) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> return true;<a name="line.86"></a>
+<span class="sourceLineNo">087</span> }<a name="line.87"></a>
+<span class="sourceLineNo">088</span> p = procedureRetriever.apply(p.getParentProcId());<a name="line.88"></a>
+<span class="sourceLineNo">089</span> if (p == null || !p.hasParent()) {<a name="line.89"></a>
+<span class="sourceLineNo">090</span> return false;<a name="line.90"></a>
+<span class="sourceLineNo">091</span> }<a name="line.91"></a>
+<span class="sourceLineNo">092</span> }<a name="line.92"></a>
+<span class="sourceLineNo">093</span> }<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span> @Override<a name="line.95"></a>
+<span class="sourceLineNo">096</span> public Procedure<?> getExclusiveLockOwnerProcedure() {<a name="line.96"></a>
+<span class="sourceLineNo">097</span> return exclusiveLockOwnerProcedure;<a name="line.97"></a>
+<span class="sourceLineNo">098</span> }<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span> @Override<a name="line.100"></a>
+<span class="sourceLineNo">101</span> public int getSharedLockCount() {<a name="line.101"></a>
+<span class="sourceLineNo">102</span> return sharedLock;<a name="line.102"></a>
+<span class="sourceLineNo">103</span> }<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span> // ======================================================================<a name="line.105"></a>
+<span class="sourceLineNo">106</span> // try/release Shared/Exclusive lock<a name="line.106"></a>
+<span class="sourceLineNo">107</span> // ======================================================================<a name="line.107"></a>
+<span class="sourceLineNo">108</span><a name="line.108"></a>
+<span class="sourceLineNo">109</span> /**<a name="line.109"></a>
+<span class="sourceLineNo">110</span> * @return whether we have succesfully acquired the shared lock.<a name="line.110"></a>
+<span class="sourceLineNo">111</span> */<a name="line.111"></a>
+<span class="sourceLineNo">112</span> public boolean trySharedLock(Procedure<?> proc) {<a name="line.112"></a>
+<span class="sourceLineNo">113</span> if (hasExclusiveLock() && !hasLockAccess(proc)) {<a name="line.113"></a>
+<span class="sourceLineNo">114</span> return false;<a name="line.114"></a>
+<span class="sourceLineNo">115</span> }<a name="line.115"></a>
+<span class="sourceLineNo">116</span> // If no one holds the xlock, then we are free to hold the sharedLock<a name="line.116"></a>
+<span class="sourceLineNo">117</span> // If the parent proc or we have already held the xlock, then we return true here as<a name="line.117"></a>
+<span class="sourceLineNo">118</span> // xlock is more powerful then shared lock.<a name="line.118"></a>
+<span class="sourceLineNo">119</span> sharedLock++;<a name="line.119"></a>
+<span class="sourceLineNo">120</span> return true;<a name="line.120"></a>
+<span class="sourceLineNo">121</span> }<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> * @return whether we should wake the procedures waiting on the lock here.<a name="line.124"></a>
+<span class="sourceLineNo">125</span> */<a name="line.125"></a>
+<span class="sourceLineNo">126</span> public boolean releaseSharedLock() {<a name="line.126"></a>
+<span class="sourceLineNo">127</span> // hasExclusiveLock could be true, it usually means we acquire shared lock while we or our<a name="line.127"></a>
+<span class="sourceLineNo">128</span> // parent have held the xlock. And since there is still an exclusive lock, we do not need to<a name="line.128"></a>
+<span class="sourceLineNo">129</span> // wake any procedures.<a name="line.129"></a>
+<span class="sourceLineNo">130</span> return --sharedLock == 0 && !hasExclusiveLock();<a name="line.130"></a>
+<span class="sourceLineNo">131</span> }<a name="line.131"></a>
+<span class="sourceLineNo">132</span><a name="line.132"></a>
+<span class="sourceLineNo">133</span> public boolean tryExclusiveLock(Procedure<?> proc) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> if (isLocked()) {<a name="line.134"></a>
+<span class="sourceLineNo">135</span> return hasLockAccess(proc);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> }<a name="line.136"></a>
+<span class="sourceLineNo">137</span> exclusiveLockOwnerProcedure = proc;<a name="line.137"></a>
+<span class="sourceLineNo">138</span> return true;<a name="line.138"></a>
+<span class="sourceLineNo">139</span> }<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span> /**<a name="line.141"></a>
+<span class="sourceLineNo">142</span> * @return whether we should wake the procedures waiting on the lock here.<a name="line.142"></a>
+<span class="sourceLineNo">143</span> */<a name="line.143"></a>
+<span class="sourceLineNo">144</span> public boolean releaseExclusiveLock(Procedure<?> proc) {<a name="line.144"></a>
+<span class="sourceLineNo">145</span> if (exclusiveLockOwnerProcedure == null ||<a name="line.145"></a>
+<span class="sourceLineNo">146</span> exclusiveLockOwnerProcedure.getProcId() != proc.getProcId()) {<a name="line.146"></a>
<span class="sourceLineNo">147</span> // We are not the lock owner, it is probably inherited from the parent procedures.<a name="line.147"></a>
<span class="sourceLineNo">148</span> return false;<a name="line.148"></a>
<span class="sourceLineNo">149</span> }<a name="line.149"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/b5e107c3/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/LockStatus.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/LockStatus.html b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/LockStatus.html
index b8676a4..5c166ca 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/LockStatus.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/procedure2/LockStatus.html
@@ -29,28 +29,55 @@
<span class="sourceLineNo">021</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.21"></a>
<span class="sourceLineNo">022</span><a name="line.22"></a>
<span class="sourceLineNo">023</span>/**<a name="line.23"></a>
-<span class="sourceLineNo">024</span> * Interface to get status of a Lock without getting access to acquire/release lock.<a name="line.24"></a>
-<span class="sourceLineNo">025</span> * Currently used in MasterProcedureScheduler where we want to give Queues access to lock's<a name="line.25"></a>
-<span class="sourceLineNo">026</span> * status for scheduling purposes, but not the ability to acquire/release it.<a name="line.26"></a>
+<span class="sourceLineNo">024</span> * Interface to get status of a Lock without getting access to acquire/release lock. Currently used<a name="line.24"></a>
+<span class="sourceLineNo">025</span> * in MasterProcedureScheduler where we want to give Queues access to lock's status for scheduling<a name="line.25"></a>
+<span class="sourceLineNo">026</span> * purposes, but not the ability to acquire/release it.<a name="line.26"></a>
<span class="sourceLineNo">027</span> */<a name="line.27"></a>
<span class="sourceLineNo">028</span>@InterfaceAudience.Private<a name="line.28"></a>
<span class="sourceLineNo">029</span>public interface LockStatus {<a name="line.29"></a>
-<span class="sourceLineNo">030</span> boolean isLocked();<a name="line.30"></a>
-<span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span> boolean hasExclusiveLock();<a name="line.32"></a>
-<span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span> boolean isLockOwner(long procId);<a name="line.34"></a>
-<span class="sourceLineNo">035</span><a name="line.35"></a>
-<span class="sourceLineNo">036</span> boolean hasParentLock(Procedure<?> proc);<a name="line.36"></a>
-<span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span> boolean hasLockAccess(Procedure<?> proc);<a name="line.38"></a>
-<span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span> Procedure<?> getExclusiveLockOwnerProcedure();<a name="line.40"></a>
-<span class="sourceLineNo">041</span><a name="line.41"></a>
-<span class="sourceLineNo">042</span> long getExclusiveLockProcIdOwner();<a name="line.42"></a>
-<span class="sourceLineNo">043</span><a name="line.43"></a>
-<span class="sourceLineNo">044</span> int getSharedLockCount();<a name="line.44"></a>
-<span class="sourceLineNo">045</span>}<a name="line.45"></a>
+<span class="sourceLineNo">030</span><a name="line.30"></a>
+<span class="sourceLineNo">031</span> /**<a name="line.31"></a>
+<span class="sourceLineNo">032</span> * Return whether this lock has already been held,<a name="line.32"></a>
+<span class="sourceLineNo">033</span> * <p/><a name="line.33"></a>
+<span class="sourceLineNo">034</span> * Notice that, holding the exclusive lock or shared lock are both considered as locked, i.e, this<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * method usually equals to {@code hasExclusiveLock() || getSharedLockCount() > 0}.<a name="line.35"></a>
+<span class="sourceLineNo">036</span> */<a name="line.36"></a>
+<span class="sourceLineNo">037</span> default boolean isLocked() {<a name="line.37"></a>
+<span class="sourceLineNo">038</span> return hasExclusiveLock() || getSharedLockCount() > 0;<a name="line.38"></a>
+<span class="sourceLineNo">039</span> }<a name="line.39"></a>
+<span class="sourceLineNo">040</span><a name="line.40"></a>
+<span class="sourceLineNo">041</span> /**<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * Whether the exclusive lock has been held.<a name="line.42"></a>
+<span class="sourceLineNo">043</span> */<a name="line.43"></a>
+<span class="sourceLineNo">044</span> boolean hasExclusiveLock();<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> * Return true if the procedure itself holds the exclusive lock, or any ancestors of the give<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * procedure hold the exclusive lock.<a name="line.48"></a>
+<span class="sourceLineNo">049</span> */<a name="line.49"></a>
+<span class="sourceLineNo">050</span> boolean hasLockAccess(Procedure<?> proc);<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span> /**<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * Get the procedure which holds the exclusive lock.<a name="line.53"></a>
+<span class="sourceLineNo">054</span> */<a name="line.54"></a>
+<span class="sourceLineNo">055</span> Procedure<?> getExclusiveLockOwnerProcedure();<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span> /**<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * Return the id of the procedure which holds the exclusive lock, if exists. Or a negative value<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * which means no one holds the exclusive lock.<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * <p/><a name="line.60"></a>
+<span class="sourceLineNo">061</span> * Notice that, in HBase, we assume that the procedure id is positive, or at least non-negative.<a name="line.61"></a>
+<span class="sourceLineNo">062</span> */<a name="line.62"></a>
+<span class="sourceLineNo">063</span> default long getExclusiveLockProcIdOwner() {<a name="line.63"></a>
+<span class="sourceLineNo">064</span> Procedure<?> proc = getExclusiveLockOwnerProcedure();<a name="line.64"></a>
+<span class="sourceLineNo">065</span> return proc != null ? proc.getProcId() : -1L;<a name="line.65"></a>
+<span class="sourceLineNo">066</span> }<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span> /**<a name="line.68"></a>
+<span class="sourceLineNo">069</span> * Get the number of procedures which hold the shared lock.<a name="line.69"></a>
+<span class="sourceLineNo">070</span> */<a name="line.70"></a>
+<span class="sourceLineNo">071</span> int getSharedLockCount();<a name="line.71"></a>
+<span class="sourceLineNo">072</span>}<a name="line.72"></a>