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/08/10 14:48:52 UTC
[09/18] hbase-site git commit: Published site at
397388316ead020d005a33e233364d166d4add00.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5c5e961f/devapidocs/src-html/org/apache/hadoop/hbase/master/TableStateManager.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/master/TableStateManager.html b/devapidocs/src-html/org/apache/hadoop/hbase/master/TableStateManager.html
index 39f61de..623d575 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/master/TableStateManager.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/master/TableStateManager.html
@@ -6,7 +6,7 @@
</head>
<body>
<div class="sourceContainer">
-<pre><span class="sourceLineNo">001</span>/*<a name="line.1"></a>
+<pre><span class="sourceLineNo">001</span>/**<a name="line.1"></a>
<span class="sourceLineNo">002</span> * Licensed to the Apache Software Foundation (ASF) under one<a name="line.2"></a>
<span class="sourceLineNo">003</span> * or more contributor license agreements. See the NOTICE file<a name="line.3"></a>
<span class="sourceLineNo">004</span> * distributed with this work for additional information<a name="line.4"></a>
@@ -25,318 +25,367 @@
<span class="sourceLineNo">017</span> */<a name="line.17"></a>
<span class="sourceLineNo">018</span>package org.apache.hadoop.hbase.master;<a name="line.18"></a>
<span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import java.io.IOException;<a name="line.20"></a>
-<span class="sourceLineNo">021</span>import java.util.HashMap;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import java.util.Map;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import java.util.Set;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import java.util.concurrent.locks.ReadWriteLock;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import java.util.concurrent.locks.ReentrantReadWriteLock;<a name="line.25"></a>
-<span class="sourceLineNo">026</span><a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.exceptions.IllegalArgumentIOException;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.util.ZKDataMigrator;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.zookeeper.ZNodePaths;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hbase.thirdparty.com.google.common.collect.Sets;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import edu.umd.cs.findbugs.annotations.NonNull;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import edu.umd.cs.findbugs.annotations.Nullable;<a name="line.34"></a>
-<span class="sourceLineNo">035</span><a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.TableDescriptors;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.TableName;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.zookeeper.KeeperException;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.slf4j.Logger;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.slf4j.LoggerFactory;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.hbase.client.Result;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.hbase.client.TableState;<a name="line.46"></a>
-<span class="sourceLineNo">047</span><a name="line.47"></a>
-<span class="sourceLineNo">048</span>/**<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * This is a helper class used to manage table states.<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * This class uses hbase:meta as its store for table state so hbase:meta must be online before<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * {@link #start()} is called.<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * TODO: Cache state. Cut down on meta looksups.<a name="line.52"></a>
-<span class="sourceLineNo">053</span> */<a name="line.53"></a>
-<span class="sourceLineNo">054</span>// TODO: Make this a guava Service<a name="line.54"></a>
-<span class="sourceLineNo">055</span>@InterfaceAudience.Private<a name="line.55"></a>
-<span class="sourceLineNo">056</span>public class TableStateManager {<a name="line.56"></a>
+<span class="sourceLineNo">020</span>import edu.umd.cs.findbugs.annotations.NonNull;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import edu.umd.cs.findbugs.annotations.Nullable;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.io.IOException;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.util.HashMap;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import java.util.Map;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.util.Set;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.concurrent.ConcurrentHashMap;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import java.util.concurrent.ConcurrentMap;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import java.util.concurrent.locks.ReadWriteLock;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.MetaTableAccessor;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.TableDescriptors;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.TableName;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.TableNotFoundException;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.client.Result;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.client.TableDescriptor;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.client.TableState;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.exceptions.IllegalArgumentIOException;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.util.IdReadWriteLock;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.util.ZKDataMigrator;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.zookeeper.ZNodePaths;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.zookeeper.KeeperException;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.slf4j.Logger;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.slf4j.LoggerFactory;<a name="line.45"></a>
+<span class="sourceLineNo">046</span><a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.hbase.thirdparty.com.google.common.collect.Sets;<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> * This is a helper class used to manage table states. This class uses hbase:meta as its store for<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * table state so hbase:meta must be online before {@link #start()} is called.<a name="line.51"></a>
+<span class="sourceLineNo">052</span> */<a name="line.52"></a>
+<span class="sourceLineNo">053</span>// TODO: Make this a guava Service<a name="line.53"></a>
+<span class="sourceLineNo">054</span>@InterfaceAudience.Private<a name="line.54"></a>
+<span class="sourceLineNo">055</span>public class TableStateManager {<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
<span class="sourceLineNo">057</span> private static final Logger LOG = LoggerFactory.getLogger(TableStateManager.class);<a name="line.57"></a>
<span class="sourceLineNo">058</span> /**<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * Set this key to false in Configuration to disable migrating table state from zookeeper<a name="line.59"></a>
-<span class="sourceLineNo">060</span> * so hbase:meta table.<a name="line.60"></a>
+<span class="sourceLineNo">059</span> * Set this key to false in Configuration to disable migrating table state from zookeeper so<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * hbase:meta table.<a name="line.60"></a>
<span class="sourceLineNo">061</span> */<a name="line.61"></a>
-<span class="sourceLineNo">062</span> static final String MIGRATE_TABLE_STATE_FROM_ZK_KEY = "hbase.migrate.table.state.from.zookeeper";<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> final ReadWriteLock lock = new ReentrantReadWriteLock();<a name="line.64"></a>
-<span class="sourceLineNo">065</span> final MasterServices master;<a name="line.65"></a>
-<span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span> public TableStateManager(MasterServices master) {<a name="line.67"></a>
-<span class="sourceLineNo">068</span> this.master = master;<a name="line.68"></a>
-<span class="sourceLineNo">069</span> }<a name="line.69"></a>
+<span class="sourceLineNo">062</span> private static final String MIGRATE_TABLE_STATE_FROM_ZK_KEY =<a name="line.62"></a>
+<span class="sourceLineNo">063</span> "hbase.migrate.table.state.from.zookeeper";<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span> private final IdReadWriteLock<TableName> tnLock = new IdReadWriteLock<>();<a name="line.65"></a>
+<span class="sourceLineNo">066</span> protected final MasterServices master;<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span> private final ConcurrentMap<TableName, TableState.State> tableName2State =<a name="line.68"></a>
+<span class="sourceLineNo">069</span> new ConcurrentHashMap<>();<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> * Set table state to provided.<a name="line.72"></a>
-<span class="sourceLineNo">073</span> * Caller should lock table on write.<a name="line.73"></a>
-<span class="sourceLineNo">074</span> * @param tableName table to change state for<a name="line.74"></a>
-<span class="sourceLineNo">075</span> * @param newState new state<a name="line.75"></a>
-<span class="sourceLineNo">076</span> * @throws IOException<a name="line.76"></a>
-<span class="sourceLineNo">077</span> */<a name="line.77"></a>
-<span class="sourceLineNo">078</span> public void setTableState(TableName tableName, TableState.State newState) throws IOException {<a name="line.78"></a>
-<span class="sourceLineNo">079</span> lock.writeLock().lock();<a name="line.79"></a>
-<span class="sourceLineNo">080</span> try {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> updateMetaState(tableName, newState);<a name="line.81"></a>
-<span class="sourceLineNo">082</span> } finally {<a name="line.82"></a>
-<span class="sourceLineNo">083</span> lock.writeLock().unlock();<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><a name="line.86"></a>
-<span class="sourceLineNo">087</span> /**<a name="line.87"></a>
-<span class="sourceLineNo">088</span> * Set table state to provided but only if table in specified states<a name="line.88"></a>
-<span class="sourceLineNo">089</span> * Caller should lock table on write.<a name="line.89"></a>
-<span class="sourceLineNo">090</span> * @param tableName table to change state for<a name="line.90"></a>
-<span class="sourceLineNo">091</span> * @param newState new state<a name="line.91"></a>
-<span class="sourceLineNo">092</span> * @param states states to check against<a name="line.92"></a>
-<span class="sourceLineNo">093</span> * @return null if succeed or table state if failed<a name="line.93"></a>
-<span class="sourceLineNo">094</span> * @throws IOException<a name="line.94"></a>
-<span class="sourceLineNo">095</span> */<a name="line.95"></a>
-<span class="sourceLineNo">096</span> public TableState setTableStateIfInStates(TableName tableName,<a name="line.96"></a>
-<span class="sourceLineNo">097</span> TableState.State newState,<a name="line.97"></a>
-<span class="sourceLineNo">098</span> TableState.State... states)<a name="line.98"></a>
-<span class="sourceLineNo">099</span> throws IOException {<a name="line.99"></a>
-<span class="sourceLineNo">100</span> lock.writeLock().lock();<a name="line.100"></a>
-<span class="sourceLineNo">101</span> try {<a name="line.101"></a>
-<span class="sourceLineNo">102</span> TableState currentState = readMetaState(tableName);<a name="line.102"></a>
-<span class="sourceLineNo">103</span> if (currentState == null) {<a name="line.103"></a>
-<span class="sourceLineNo">104</span> throw new TableNotFoundException(tableName);<a name="line.104"></a>
-<span class="sourceLineNo">105</span> }<a name="line.105"></a>
-<span class="sourceLineNo">106</span> if (currentState.inStates(states)) {<a name="line.106"></a>
-<span class="sourceLineNo">107</span> updateMetaState(tableName, newState);<a name="line.107"></a>
-<span class="sourceLineNo">108</span> return null;<a name="line.108"></a>
-<span class="sourceLineNo">109</span> } else {<a name="line.109"></a>
-<span class="sourceLineNo">110</span> return currentState;<a name="line.110"></a>
-<span class="sourceLineNo">111</span> }<a name="line.111"></a>
-<span class="sourceLineNo">112</span> } finally {<a name="line.112"></a>
-<span class="sourceLineNo">113</span> lock.writeLock().unlock();<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><a name="line.116"></a>
-<span class="sourceLineNo">117</span> /**<a name="line.117"></a>
-<span class="sourceLineNo">118</span> * Set table state to provided but only if table not in specified states<a name="line.118"></a>
-<span class="sourceLineNo">119</span> * Caller should lock table on write.<a name="line.119"></a>
-<span class="sourceLineNo">120</span> * @param tableName table to change state for<a name="line.120"></a>
-<span class="sourceLineNo">121</span> * @param newState new state<a name="line.121"></a>
-<span class="sourceLineNo">122</span> * @param states states to check against<a name="line.122"></a>
-<span class="sourceLineNo">123</span> * @throws IOException<a name="line.123"></a>
+<span class="sourceLineNo">071</span> public TableStateManager(MasterServices master) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> this.master = master;<a name="line.72"></a>
+<span class="sourceLineNo">073</span> }<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> * Set table state to provided. Caller should lock table on write.<a name="line.76"></a>
+<span class="sourceLineNo">077</span> * @param tableName table to change state for<a name="line.77"></a>
+<span class="sourceLineNo">078</span> * @param newState new state<a name="line.78"></a>
+<span class="sourceLineNo">079</span> */<a name="line.79"></a>
+<span class="sourceLineNo">080</span> public void setTableState(TableName tableName, TableState.State newState) throws IOException {<a name="line.80"></a>
+<span class="sourceLineNo">081</span> ReadWriteLock lock = tnLock.getLock(tableName);<a name="line.81"></a>
+<span class="sourceLineNo">082</span> lock.writeLock().lock();<a name="line.82"></a>
+<span class="sourceLineNo">083</span> try {<a name="line.83"></a>
+<span class="sourceLineNo">084</span> updateMetaState(tableName, newState);<a name="line.84"></a>
+<span class="sourceLineNo">085</span> } finally {<a name="line.85"></a>
+<span class="sourceLineNo">086</span> lock.writeLock().unlock();<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><a name="line.89"></a>
+<span class="sourceLineNo">090</span> /**<a name="line.90"></a>
+<span class="sourceLineNo">091</span> * Set table state to provided but only if table in specified states Caller should lock table on<a name="line.91"></a>
+<span class="sourceLineNo">092</span> * write.<a name="line.92"></a>
+<span class="sourceLineNo">093</span> * @param tableName table to change state for<a name="line.93"></a>
+<span class="sourceLineNo">094</span> * @param newState new state<a name="line.94"></a>
+<span class="sourceLineNo">095</span> * @param states states to check against<a name="line.95"></a>
+<span class="sourceLineNo">096</span> * @return null if succeed or table state if failed<a name="line.96"></a>
+<span class="sourceLineNo">097</span> */<a name="line.97"></a>
+<span class="sourceLineNo">098</span> public TableState setTableStateIfInStates(TableName tableName, TableState.State newState,<a name="line.98"></a>
+<span class="sourceLineNo">099</span> TableState.State... states) throws IOException {<a name="line.99"></a>
+<span class="sourceLineNo">100</span> ReadWriteLock lock = tnLock.getLock(tableName);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> lock.writeLock().lock();<a name="line.101"></a>
+<span class="sourceLineNo">102</span> try {<a name="line.102"></a>
+<span class="sourceLineNo">103</span> TableState currentState = readMetaState(tableName);<a name="line.103"></a>
+<span class="sourceLineNo">104</span> if (currentState == null) {<a name="line.104"></a>
+<span class="sourceLineNo">105</span> throw new TableNotFoundException(tableName);<a name="line.105"></a>
+<span class="sourceLineNo">106</span> }<a name="line.106"></a>
+<span class="sourceLineNo">107</span> if (currentState.inStates(states)) {<a name="line.107"></a>
+<span class="sourceLineNo">108</span> updateMetaState(tableName, newState);<a name="line.108"></a>
+<span class="sourceLineNo">109</span> return null;<a name="line.109"></a>
+<span class="sourceLineNo">110</span> } else {<a name="line.110"></a>
+<span class="sourceLineNo">111</span> return currentState;<a name="line.111"></a>
+<span class="sourceLineNo">112</span> }<a name="line.112"></a>
+<span class="sourceLineNo">113</span> } finally {<a name="line.113"></a>
+<span class="sourceLineNo">114</span> lock.writeLock().unlock();<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><a name="line.117"></a>
+<span class="sourceLineNo">118</span> /**<a name="line.118"></a>
+<span class="sourceLineNo">119</span> * Set table state to provided but only if table not in specified states Caller should lock table<a name="line.119"></a>
+<span class="sourceLineNo">120</span> * on write.<a name="line.120"></a>
+<span class="sourceLineNo">121</span> * @param tableName table to change state for<a name="line.121"></a>
+<span class="sourceLineNo">122</span> * @param newState new state<a name="line.122"></a>
+<span class="sourceLineNo">123</span> * @param states states to check against<a name="line.123"></a>
<span class="sourceLineNo">124</span> */<a name="line.124"></a>
-<span class="sourceLineNo">125</span> public boolean setTableStateIfNotInStates(TableName tableName,<a name="line.125"></a>
-<span class="sourceLineNo">126</span> TableState.State newState,<a name="line.126"></a>
-<span class="sourceLineNo">127</span> TableState.State... states)<a name="line.127"></a>
-<span class="sourceLineNo">128</span> throws IOException {<a name="line.128"></a>
-<span class="sourceLineNo">129</span> TableState currentState = readMetaState(tableName);<a name="line.129"></a>
-<span class="sourceLineNo">130</span> if (currentState == null) {<a name="line.130"></a>
-<span class="sourceLineNo">131</span> throw new TableNotFoundException(tableName);<a name="line.131"></a>
-<span class="sourceLineNo">132</span> }<a name="line.132"></a>
-<span class="sourceLineNo">133</span> if (!currentState.inStates(states)) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span> updateMetaState(tableName, newState);<a name="line.134"></a>
-<span class="sourceLineNo">135</span> return true;<a name="line.135"></a>
-<span class="sourceLineNo">136</span> } else {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> return false;<a name="line.137"></a>
-<span class="sourceLineNo">138</span> }<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> public boolean isTableState(TableName tableName, TableState.State... states) {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> try {<a name="line.142"></a>
-<span class="sourceLineNo">143</span> TableState tableState = getTableState(tableName);<a name="line.143"></a>
-<span class="sourceLineNo">144</span> return tableState.isInStates(states);<a name="line.144"></a>
-<span class="sourceLineNo">145</span> } catch (IOException e) {<a name="line.145"></a>
-<span class="sourceLineNo">146</span> LOG.error("Unable to get table " + tableName + " state", e);<a name="line.146"></a>
-<span class="sourceLineNo">147</span> return false;<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> public void setDeletedTable(TableName tableName) throws IOException {<a name="line.151"></a>
-<span class="sourceLineNo">152</span> if (tableName.equals(TableName.META_TABLE_NAME)) {<a name="line.152"></a>
-<span class="sourceLineNo">153</span> return;<a name="line.153"></a>
-<span class="sourceLineNo">154</span> }<a name="line.154"></a>
-<span class="sourceLineNo">155</span> MetaTableAccessor.deleteTableState(master.getConnection(), tableName);<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> public boolean isTablePresent(TableName tableName) throws IOException {<a name="line.158"></a>
-<span class="sourceLineNo">159</span> return readMetaState(tableName) != null;<a name="line.159"></a>
-<span class="sourceLineNo">160</span> }<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> * Return all tables in given states.<a name="line.163"></a>
-<span class="sourceLineNo">164</span> *<a name="line.164"></a>
-<span class="sourceLineNo">165</span> * @param states filter by states<a name="line.165"></a>
-<span class="sourceLineNo">166</span> * @return tables in given states<a name="line.166"></a>
-<span class="sourceLineNo">167</span> * @throws IOException<a name="line.167"></a>
-<span class="sourceLineNo">168</span> */<a name="line.168"></a>
-<span class="sourceLineNo">169</span> public Set<TableName> getTablesInStates(final TableState.State... states) throws IOException {<a name="line.169"></a>
-<span class="sourceLineNo">170</span> final Set<TableName> rv = Sets.newHashSet();<a name="line.170"></a>
-<span class="sourceLineNo">171</span> MetaTableAccessor.fullScanTables(master.getConnection(), new MetaTableAccessor.Visitor() {<a name="line.171"></a>
-<span class="sourceLineNo">172</span> @Override<a name="line.172"></a>
-<span class="sourceLineNo">173</span> public boolean visit(Result r) throws IOException {<a name="line.173"></a>
-<span class="sourceLineNo">174</span> TableState tableState = MetaTableAccessor.getTableState(r);<a name="line.174"></a>
-<span class="sourceLineNo">175</span> if (tableState != null && tableState.inStates(states))<a name="line.175"></a>
-<span class="sourceLineNo">176</span> rv.add(tableState.getTableName());<a name="line.176"></a>
-<span class="sourceLineNo">177</span> return true;<a name="line.177"></a>
-<span class="sourceLineNo">178</span> }<a name="line.178"></a>
-<span class="sourceLineNo">179</span> });<a name="line.179"></a>
-<span class="sourceLineNo">180</span> return rv;<a name="line.180"></a>
-<span class="sourceLineNo">181</span> }<a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span> public static class TableStateNotFoundException extends TableNotFoundException {<a name="line.183"></a>
-<span class="sourceLineNo">184</span> TableStateNotFoundException(TableName tableName) {<a name="line.184"></a>
-<span class="sourceLineNo">185</span> super(tableName.getNameAsString());<a name="line.185"></a>
-<span class="sourceLineNo">186</span> }<a name="line.186"></a>
-<span class="sourceLineNo">187</span> }<a name="line.187"></a>
-<span class="sourceLineNo">188</span><a name="line.188"></a>
-<span class="sourceLineNo">189</span> @NonNull<a name="line.189"></a>
-<span class="sourceLineNo">190</span> public TableState getTableState(TableName tableName) throws IOException {<a name="line.190"></a>
-<span class="sourceLineNo">191</span> TableState currentState = readMetaState(tableName);<a name="line.191"></a>
-<span class="sourceLineNo">192</span> if (currentState == null) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> throw new TableStateNotFoundException(tableName);<a name="line.193"></a>
-<span class="sourceLineNo">194</span> }<a name="line.194"></a>
-<span class="sourceLineNo">195</span> return currentState;<a name="line.195"></a>
-<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span> protected void updateMetaState(TableName tableName, TableState.State newState)<a name="line.198"></a>
-<span class="sourceLineNo">199</span> throws IOException {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> if (tableName.equals(TableName.META_TABLE_NAME)) {<a name="line.200"></a>
-<span class="sourceLineNo">201</span> if (TableState.State.DISABLING.equals(newState) ||<a name="line.201"></a>
-<span class="sourceLineNo">202</span> TableState.State.DISABLED.equals(newState)) {<a name="line.202"></a>
-<span class="sourceLineNo">203</span> throw new IllegalArgumentIOException("Cannot disable the meta table; " + newState);<a name="line.203"></a>
-<span class="sourceLineNo">204</span> }<a name="line.204"></a>
-<span class="sourceLineNo">205</span> // Otherwise, just return; no need to set ENABLED on meta -- it is always ENABLED.<a name="line.205"></a>
-<span class="sourceLineNo">206</span> return;<a name="line.206"></a>
-<span class="sourceLineNo">207</span> }<a name="line.207"></a>
-<span class="sourceLineNo">208</span> MetaTableAccessor.updateTableState(master.getConnection(), tableName, newState);<a name="line.208"></a>
-<span class="sourceLineNo">209</span> }<a name="line.209"></a>
-<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span> @Nullable<a name="line.211"></a>
-<span class="sourceLineNo">212</span> protected TableState readMetaState(TableName tableName) throws IOException {<a name="line.212"></a>
-<span class="sourceLineNo">213</span> return MetaTableAccessor.getTableState(master.getConnection(), tableName);<a name="line.213"></a>
-<span class="sourceLineNo">214</span> }<a name="line.214"></a>
-<span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span> public void start() throws IOException {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> TableDescriptors tableDescriptors = master.getTableDescriptors();<a name="line.217"></a>
-<span class="sourceLineNo">218</span> migrateZooKeeper();<a name="line.218"></a>
-<span class="sourceLineNo">219</span> Connection connection = master.getConnection();<a name="line.219"></a>
-<span class="sourceLineNo">220</span> fixTableStates(tableDescriptors, connection);<a name="line.220"></a>
+<span class="sourceLineNo">125</span> public boolean setTableStateIfNotInStates(TableName tableName, TableState.State newState,<a name="line.125"></a>
+<span class="sourceLineNo">126</span> TableState.State... states) throws IOException {<a name="line.126"></a>
+<span class="sourceLineNo">127</span> ReadWriteLock lock = tnLock.getLock(tableName);<a name="line.127"></a>
+<span class="sourceLineNo">128</span> lock.writeLock().lock();<a name="line.128"></a>
+<span class="sourceLineNo">129</span> try {<a name="line.129"></a>
+<span class="sourceLineNo">130</span> TableState currentState = readMetaState(tableName);<a name="line.130"></a>
+<span class="sourceLineNo">131</span> if (currentState == null) {<a name="line.131"></a>
+<span class="sourceLineNo">132</span> throw new TableNotFoundException(tableName);<a name="line.132"></a>
+<span class="sourceLineNo">133</span> }<a name="line.133"></a>
+<span class="sourceLineNo">134</span> if (!currentState.inStates(states)) {<a name="line.134"></a>
+<span class="sourceLineNo">135</span> updateMetaState(tableName, newState);<a name="line.135"></a>
+<span class="sourceLineNo">136</span> return true;<a name="line.136"></a>
+<span class="sourceLineNo">137</span> } else {<a name="line.137"></a>
+<span class="sourceLineNo">138</span> return false;<a name="line.138"></a>
+<span class="sourceLineNo">139</span> }<a name="line.139"></a>
+<span class="sourceLineNo">140</span> } finally {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> lock.writeLock().unlock();<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><a name="line.144"></a>
+<span class="sourceLineNo">145</span> public boolean isTableState(TableName tableName, TableState.State... states) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> try {<a name="line.146"></a>
+<span class="sourceLineNo">147</span> TableState tableState = getTableState(tableName);<a name="line.147"></a>
+<span class="sourceLineNo">148</span> return tableState.isInStates(states);<a name="line.148"></a>
+<span class="sourceLineNo">149</span> } catch (IOException e) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span> LOG.error("Unable to get table " + tableName + " state", e);<a name="line.150"></a>
+<span class="sourceLineNo">151</span> // XXX: is it safe to just return false here?<a name="line.151"></a>
+<span class="sourceLineNo">152</span> return false;<a name="line.152"></a>
+<span class="sourceLineNo">153</span> }<a name="line.153"></a>
+<span class="sourceLineNo">154</span> }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span> public void setDeletedTable(TableName tableName) throws IOException {<a name="line.156"></a>
+<span class="sourceLineNo">157</span> if (tableName.equals(TableName.META_TABLE_NAME)) {<a name="line.157"></a>
+<span class="sourceLineNo">158</span> return;<a name="line.158"></a>
+<span class="sourceLineNo">159</span> }<a name="line.159"></a>
+<span class="sourceLineNo">160</span> ReadWriteLock lock = tnLock.getLock(tableName);<a name="line.160"></a>
+<span class="sourceLineNo">161</span> lock.writeLock().lock();<a name="line.161"></a>
+<span class="sourceLineNo">162</span> try {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> MetaTableAccessor.deleteTableState(master.getConnection(), tableName);<a name="line.163"></a>
+<span class="sourceLineNo">164</span> metaStateDeleted(tableName);<a name="line.164"></a>
+<span class="sourceLineNo">165</span> } finally {<a name="line.165"></a>
+<span class="sourceLineNo">166</span> tableName2State.remove(tableName);<a name="line.166"></a>
+<span class="sourceLineNo">167</span> lock.writeLock().unlock();<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> public boolean isTablePresent(TableName tableName) throws IOException {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> ReadWriteLock lock = tnLock.getLock(tableName);<a name="line.172"></a>
+<span class="sourceLineNo">173</span> lock.readLock().lock();<a name="line.173"></a>
+<span class="sourceLineNo">174</span> try {<a name="line.174"></a>
+<span class="sourceLineNo">175</span> return readMetaState(tableName) != null;<a name="line.175"></a>
+<span class="sourceLineNo">176</span> } finally {<a name="line.176"></a>
+<span class="sourceLineNo">177</span> lock.readLock().unlock();<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span> }<a name="line.179"></a>
+<span class="sourceLineNo">180</span><a name="line.180"></a>
+<span class="sourceLineNo">181</span> /**<a name="line.181"></a>
+<span class="sourceLineNo">182</span> * Return all tables in given states.<a name="line.182"></a>
+<span class="sourceLineNo">183</span> * @param states filter by states<a name="line.183"></a>
+<span class="sourceLineNo">184</span> * @return tables in given states<a name="line.184"></a>
+<span class="sourceLineNo">185</span> */<a name="line.185"></a>
+<span class="sourceLineNo">186</span> public Set<TableName> getTablesInStates(TableState.State... states) throws IOException {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> // Only be called in region normalizer, will not use cache.<a name="line.187"></a>
+<span class="sourceLineNo">188</span> final Set<TableName> rv = Sets.newHashSet();<a name="line.188"></a>
+<span class="sourceLineNo">189</span> MetaTableAccessor.fullScanTables(master.getConnection(), new MetaTableAccessor.Visitor() {<a name="line.189"></a>
+<span class="sourceLineNo">190</span> @Override<a name="line.190"></a>
+<span class="sourceLineNo">191</span> public boolean visit(Result r) throws IOException {<a name="line.191"></a>
+<span class="sourceLineNo">192</span> TableState tableState = MetaTableAccessor.getTableState(r);<a name="line.192"></a>
+<span class="sourceLineNo">193</span> if (tableState != null && tableState.inStates(states)) {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> rv.add(tableState.getTableName());<a name="line.194"></a>
+<span class="sourceLineNo">195</span> }<a name="line.195"></a>
+<span class="sourceLineNo">196</span> return true;<a name="line.196"></a>
+<span class="sourceLineNo">197</span> }<a name="line.197"></a>
+<span class="sourceLineNo">198</span> });<a name="line.198"></a>
+<span class="sourceLineNo">199</span> return rv;<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> public static class TableStateNotFoundException extends TableNotFoundException {<a name="line.202"></a>
+<span class="sourceLineNo">203</span> TableStateNotFoundException(TableName tableName) {<a name="line.203"></a>
+<span class="sourceLineNo">204</span> super(tableName.getNameAsString());<a name="line.204"></a>
+<span class="sourceLineNo">205</span> }<a name="line.205"></a>
+<span class="sourceLineNo">206</span> }<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span> @NonNull<a name="line.208"></a>
+<span class="sourceLineNo">209</span> public TableState getTableState(TableName tableName) throws IOException {<a name="line.209"></a>
+<span class="sourceLineNo">210</span> ReadWriteLock lock = tnLock.getLock(tableName);<a name="line.210"></a>
+<span class="sourceLineNo">211</span> lock.readLock().lock();<a name="line.211"></a>
+<span class="sourceLineNo">212</span> try {<a name="line.212"></a>
+<span class="sourceLineNo">213</span> TableState currentState = readMetaState(tableName);<a name="line.213"></a>
+<span class="sourceLineNo">214</span> if (currentState == null) {<a name="line.214"></a>
+<span class="sourceLineNo">215</span> throw new TableStateNotFoundException(tableName);<a name="line.215"></a>
+<span class="sourceLineNo">216</span> }<a name="line.216"></a>
+<span class="sourceLineNo">217</span> return currentState;<a name="line.217"></a>
+<span class="sourceLineNo">218</span> } finally {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> lock.readLock().unlock();<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><a name="line.222"></a>
-<span class="sourceLineNo">223</span> private void fixTableStates(TableDescriptors tableDescriptors, Connection connection)<a name="line.223"></a>
-<span class="sourceLineNo">224</span> throws IOException {<a name="line.224"></a>
-<span class="sourceLineNo">225</span> final Map<String, TableDescriptor> allDescriptors = tableDescriptors.getAll();<a name="line.225"></a>
-<span class="sourceLineNo">226</span> final Map<String, TableState> states = new HashMap<>();<a name="line.226"></a>
-<span class="sourceLineNo">227</span> // NOTE: Ful hbase:meta table scan!<a name="line.227"></a>
-<span class="sourceLineNo">228</span> MetaTableAccessor.fullScanTables(connection, new MetaTableAccessor.Visitor() {<a name="line.228"></a>
-<span class="sourceLineNo">229</span> @Override<a name="line.229"></a>
-<span class="sourceLineNo">230</span> public boolean visit(Result r) throws IOException {<a name="line.230"></a>
-<span class="sourceLineNo">231</span> TableState state = MetaTableAccessor.getTableState(r);<a name="line.231"></a>
-<span class="sourceLineNo">232</span> states.put(state.getTableName().getNameAsString(), state);<a name="line.232"></a>
-<span class="sourceLineNo">233</span> return true;<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<a name="line.234"></a>
-<span class="sourceLineNo">235</span> });<a name="line.235"></a>
-<span class="sourceLineNo">236</span> for (Map.Entry<String, TableDescriptor> entry: allDescriptors.entrySet()) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span> String table = entry.getKey();<a name="line.237"></a>
-<span class="sourceLineNo">238</span> if (table.equals(TableName.META_TABLE_NAME.getNameAsString())) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> // This table is always enabled. No fixup needed. No entry in hbase:meta needed.<a name="line.239"></a>
-<span class="sourceLineNo">240</span> // Call through to fixTableState though in case a super class wants to do something.<a name="line.240"></a>
-<span class="sourceLineNo">241</span> fixTableState(new TableState(TableName.valueOf(table), TableState.State.ENABLED));<a name="line.241"></a>
-<span class="sourceLineNo">242</span> continue;<a name="line.242"></a>
-<span class="sourceLineNo">243</span> }<a name="line.243"></a>
-<span class="sourceLineNo">244</span> TableState tableState = states.get(table);<a name="line.244"></a>
-<span class="sourceLineNo">245</span> if (tableState == null) {<a name="line.245"></a>
-<span class="sourceLineNo">246</span> LOG.warn(table + " has no table state in hbase:meta, assuming ENABLED");<a name="line.246"></a>
-<span class="sourceLineNo">247</span> MetaTableAccessor.updateTableState(connection, TableName.valueOf(table),<a name="line.247"></a>
-<span class="sourceLineNo">248</span> TableState.State.ENABLED);<a name="line.248"></a>
-<span class="sourceLineNo">249</span> fixTableState(new TableState(TableName.valueOf(table), TableState.State.ENABLED));<a name="line.249"></a>
-<span class="sourceLineNo">250</span> } else {<a name="line.250"></a>
-<span class="sourceLineNo">251</span> fixTableState(tableState);<a name="line.251"></a>
-<span class="sourceLineNo">252</span> }<a name="line.252"></a>
-<span class="sourceLineNo">253</span> }<a name="line.253"></a>
-<span class="sourceLineNo">254</span> }<a name="line.254"></a>
-<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span> /**<a name="line.256"></a>
-<span class="sourceLineNo">257</span> * For subclasses in case they want to do fixup post hbase:meta.<a name="line.257"></a>
-<span class="sourceLineNo">258</span> */<a name="line.258"></a>
-<span class="sourceLineNo">259</span> protected void fixTableState(TableState tableState) throws IOException {}<a name="line.259"></a>
-<span class="sourceLineNo">260</span><a name="line.260"></a>
-<span class="sourceLineNo">261</span> /**<a name="line.261"></a>
-<span class="sourceLineNo">262</span> * This code is for case where a hbase2 Master is starting for the first time. ZooKeeper is<a name="line.262"></a>
-<span class="sourceLineNo">263</span> * where we used to keep table state. On first startup, read zookeeper and update hbase:meta<a name="line.263"></a>
-<span class="sourceLineNo">264</span> * with the table states found in zookeeper. This is tricky as we'll do this check every time we<a name="line.264"></a>
-<span class="sourceLineNo">265</span> * startup until mirroring is disabled. See the {@link #MIGRATE_TABLE_STATE_FROM_ZK_KEY} flag.<a name="line.265"></a>
-<span class="sourceLineNo">266</span> * Original form of this migration came in with HBASE-13032. It deleted all znodes when done.<a name="line.266"></a>
-<span class="sourceLineNo">267</span> * We can't do that if we want to support hbase-1.x clients who need to be able to read table<a name="line.267"></a>
-<span class="sourceLineNo">268</span> * state out of zk. See {@link MirroringTableStateManager}.<a name="line.268"></a>
-<span class="sourceLineNo">269</span> * @deprecated Since 2.0.0. Remove in hbase-3.0.0.<a name="line.269"></a>
-<span class="sourceLineNo">270</span> */<a name="line.270"></a>
-<span class="sourceLineNo">271</span> @Deprecated<a name="line.271"></a>
-<span class="sourceLineNo">272</span> private void migrateZooKeeper() throws IOException {<a name="line.272"></a>
-<span class="sourceLineNo">273</span> if (!this.master.getConfiguration().getBoolean(MIGRATE_TABLE_STATE_FROM_ZK_KEY,<a name="line.273"></a>
-<span class="sourceLineNo">274</span> true)) {<a name="line.274"></a>
-<span class="sourceLineNo">275</span> return;<a name="line.275"></a>
-<span class="sourceLineNo">276</span> }<a name="line.276"></a>
-<span class="sourceLineNo">277</span> try {<a name="line.277"></a>
-<span class="sourceLineNo">278</span> for (Map.Entry<TableName, TableState.State> entry:<a name="line.278"></a>
-<span class="sourceLineNo">279</span> ZKDataMigrator.queryForTableStates(this.master.getZooKeeper()).entrySet()) {<a name="line.279"></a>
-<span class="sourceLineNo">280</span> if (this.master.getTableDescriptors().get(entry.getKey()) == null) {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> deleteZooKeeper(entry.getKey());<a name="line.281"></a>
-<span class="sourceLineNo">282</span> LOG.info("Purged table state entry from zookeepr for table not in hbase:meta: " +<a name="line.282"></a>
-<span class="sourceLineNo">283</span> entry.getKey());<a name="line.283"></a>
-<span class="sourceLineNo">284</span> continue;<a name="line.284"></a>
-<span class="sourceLineNo">285</span> }<a name="line.285"></a>
-<span class="sourceLineNo">286</span> TableState ts = null;<a name="line.286"></a>
-<span class="sourceLineNo">287</span> try {<a name="line.287"></a>
-<span class="sourceLineNo">288</span> ts = getTableState(entry.getKey());<a name="line.288"></a>
-<span class="sourceLineNo">289</span> } catch (TableStateNotFoundException e) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span> // This can happen; table exists but no TableState.<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span> if (ts == null) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span> TableState.State zkstate = entry.getValue();<a name="line.293"></a>
-<span class="sourceLineNo">294</span> // Only migrate if it is an enable or disabled table. If in-between -- ENABLING or<a name="line.294"></a>
-<span class="sourceLineNo">295</span> // DISABLING then we have a problem; we are starting up an hbase-2 on a cluster with<a name="line.295"></a>
-<span class="sourceLineNo">296</span> // RIT. It is going to be rough!<a name="line.296"></a>
-<span class="sourceLineNo">297</span> if (zkstate.equals(TableState.State.ENABLED) ||<a name="line.297"></a>
-<span class="sourceLineNo">298</span> zkstate.equals(TableState.State.DISABLED)) {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> LOG.info("Migrating table state from zookeeper to hbase:meta; tableName=" +<a name="line.299"></a>
-<span class="sourceLineNo">300</span> entry.getKey() + ", state=" + entry.getValue());<a name="line.300"></a>
-<span class="sourceLineNo">301</span> updateMetaState(entry.getKey(), entry.getValue());<a name="line.301"></a>
-<span class="sourceLineNo">302</span> } else {<a name="line.302"></a>
-<span class="sourceLineNo">303</span> LOG.warn("Table={} has no state and zookeeper state is in-between={} (neither " +<a name="line.303"></a>
-<span class="sourceLineNo">304</span> "ENABLED or DISABLED); NOT MIGRATING table state", entry.getKey(), zkstate);<a name="line.304"></a>
-<span class="sourceLineNo">305</span> }<a name="line.305"></a>
-<span class="sourceLineNo">306</span> }<a name="line.306"></a>
-<span class="sourceLineNo">307</span> // What if the table states disagree? Defer to the hbase:meta setting rather than have the<a name="line.307"></a>
-<span class="sourceLineNo">308</span> // hbase-1.x support prevail.<a name="line.308"></a>
-<span class="sourceLineNo">309</span> }<a name="line.309"></a>
-<span class="sourceLineNo">310</span> } catch (KeeperException |InterruptedException e) {<a name="line.310"></a>
-<span class="sourceLineNo">311</span> LOG.warn("Failed reading table state from zookeeper", e);<a name="line.311"></a>
-<span class="sourceLineNo">312</span> }<a name="line.312"></a>
-<span class="sourceLineNo">313</span> }<a name="line.313"></a>
-<span class="sourceLineNo">314</span><a name="line.314"></a>
-<span class="sourceLineNo">315</span> /**<a name="line.315"></a>
-<span class="sourceLineNo">316</span> * Utility method that knows how to delete the old hbase-1.x table state znode.<a name="line.316"></a>
-<span class="sourceLineNo">317</span> * Used also by the Mirroring subclass.<a name="line.317"></a>
-<span class="sourceLineNo">318</span> * @deprecated Since 2.0.0. To be removed in hbase-3.0.0.<a name="line.318"></a>
-<span class="sourceLineNo">319</span> */<a name="line.319"></a>
-<span class="sourceLineNo">320</span> @Deprecated<a name="line.320"></a>
-<span class="sourceLineNo">321</span> protected void deleteZooKeeper(TableName tableName) {<a name="line.321"></a>
-<span class="sourceLineNo">322</span> try {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> // Delete from ZooKeeper<a name="line.323"></a>
-<span class="sourceLineNo">324</span> String znode = ZNodePaths.joinZNode(this.master.getZooKeeper().getZNodePaths().tableZNode,<a name="line.324"></a>
-<span class="sourceLineNo">325</span> tableName.getNameAsString());<a name="line.325"></a>
-<span class="sourceLineNo">326</span> ZKUtil.deleteNodeFailSilent(this.master.getZooKeeper(), znode);<a name="line.326"></a>
-<span class="sourceLineNo">327</span> } catch (KeeperException e) {<a name="line.327"></a>
-<span class="sourceLineNo">328</span> LOG.warn("Failed deleting table state from zookeeper", e);<a name="line.328"></a>
-<span class="sourceLineNo">329</span> }<a name="line.329"></a>
-<span class="sourceLineNo">330</span> }<a name="line.330"></a>
-<span class="sourceLineNo">331</span>}<a name="line.331"></a>
+<span class="sourceLineNo">223</span> private void updateMetaState(TableName tableName, TableState.State newState) throws IOException {<a name="line.223"></a>
+<span class="sourceLineNo">224</span> if (tableName.equals(TableName.META_TABLE_NAME)) {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> if (TableState.State.DISABLING.equals(newState) ||<a name="line.225"></a>
+<span class="sourceLineNo">226</span> TableState.State.DISABLED.equals(newState)) {<a name="line.226"></a>
+<span class="sourceLineNo">227</span> throw new IllegalArgumentIOException("Cannot disable the meta table; " + newState);<a name="line.227"></a>
+<span class="sourceLineNo">228</span> }<a name="line.228"></a>
+<span class="sourceLineNo">229</span> // Otherwise, just return; no need to set ENABLED on meta -- it is always ENABLED.<a name="line.229"></a>
+<span class="sourceLineNo">230</span> return;<a name="line.230"></a>
+<span class="sourceLineNo">231</span> }<a name="line.231"></a>
+<span class="sourceLineNo">232</span> boolean succ = false;<a name="line.232"></a>
+<span class="sourceLineNo">233</span> try {<a name="line.233"></a>
+<span class="sourceLineNo">234</span> MetaTableAccessor.updateTableState(master.getConnection(), tableName, newState);<a name="line.234"></a>
+<span class="sourceLineNo">235</span> tableName2State.put(tableName, newState);<a name="line.235"></a>
+<span class="sourceLineNo">236</span> } finally {<a name="line.236"></a>
+<span class="sourceLineNo">237</span> if (!succ) {<a name="line.237"></a>
+<span class="sourceLineNo">238</span> tableName2State.remove(tableName);<a name="line.238"></a>
+<span class="sourceLineNo">239</span> }<a name="line.239"></a>
+<span class="sourceLineNo">240</span> }<a name="line.240"></a>
+<span class="sourceLineNo">241</span> metaStateUpdated(tableName, newState);<a name="line.241"></a>
+<span class="sourceLineNo">242</span> }<a name="line.242"></a>
+<span class="sourceLineNo">243</span><a name="line.243"></a>
+<span class="sourceLineNo">244</span> protected void metaStateUpdated(TableName tableName, TableState.State newState)<a name="line.244"></a>
+<span class="sourceLineNo">245</span> throws IOException {<a name="line.245"></a>
+<span class="sourceLineNo">246</span> }<a name="line.246"></a>
+<span class="sourceLineNo">247</span><a name="line.247"></a>
+<span class="sourceLineNo">248</span> protected void metaStateDeleted(TableName tableName) throws IOException {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> }<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span> @Nullable<a name="line.251"></a>
+<span class="sourceLineNo">252</span> private TableState readMetaState(TableName tableName) throws IOException {<a name="line.252"></a>
+<span class="sourceLineNo">253</span> TableState.State state = tableName2State.get(tableName);<a name="line.253"></a>
+<span class="sourceLineNo">254</span> if (state != null) {<a name="line.254"></a>
+<span class="sourceLineNo">255</span> return new TableState(tableName, state);<a name="line.255"></a>
+<span class="sourceLineNo">256</span> }<a name="line.256"></a>
+<span class="sourceLineNo">257</span> TableState tableState = MetaTableAccessor.getTableState(master.getConnection(), tableName);<a name="line.257"></a>
+<span class="sourceLineNo">258</span> if (tableState != null) {<a name="line.258"></a>
+<span class="sourceLineNo">259</span> tableName2State.putIfAbsent(tableName, tableState.getState());<a name="line.259"></a>
+<span class="sourceLineNo">260</span> }<a name="line.260"></a>
+<span class="sourceLineNo">261</span> return tableState;<a name="line.261"></a>
+<span class="sourceLineNo">262</span> }<a name="line.262"></a>
+<span class="sourceLineNo">263</span><a name="line.263"></a>
+<span class="sourceLineNo">264</span> public void start() throws IOException {<a name="line.264"></a>
+<span class="sourceLineNo">265</span> TableDescriptors tableDescriptors = master.getTableDescriptors();<a name="line.265"></a>
+<span class="sourceLineNo">266</span> migrateZooKeeper();<a name="line.266"></a>
+<span class="sourceLineNo">267</span> Connection connection = master.getConnection();<a name="line.267"></a>
+<span class="sourceLineNo">268</span> fixTableStates(tableDescriptors, connection);<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> private void fixTableStates(TableDescriptors tableDescriptors, Connection connection)<a name="line.271"></a>
+<span class="sourceLineNo">272</span> throws IOException {<a name="line.272"></a>
+<span class="sourceLineNo">273</span> Map<String, TableDescriptor> allDescriptors = tableDescriptors.getAll();<a name="line.273"></a>
+<span class="sourceLineNo">274</span> Map<String, TableState> states = new HashMap<>();<a name="line.274"></a>
+<span class="sourceLineNo">275</span> // NOTE: Ful hbase:meta table scan!<a name="line.275"></a>
+<span class="sourceLineNo">276</span> MetaTableAccessor.fullScanTables(connection, new MetaTableAccessor.Visitor() {<a name="line.276"></a>
+<span class="sourceLineNo">277</span> @Override<a name="line.277"></a>
+<span class="sourceLineNo">278</span> public boolean visit(Result r) throws IOException {<a name="line.278"></a>
+<span class="sourceLineNo">279</span> TableState state = MetaTableAccessor.getTableState(r);<a name="line.279"></a>
+<span class="sourceLineNo">280</span> states.put(state.getTableName().getNameAsString(), state);<a name="line.280"></a>
+<span class="sourceLineNo">281</span> return true;<a name="line.281"></a>
+<span class="sourceLineNo">282</span> }<a name="line.282"></a>
+<span class="sourceLineNo">283</span> });<a name="line.283"></a>
+<span class="sourceLineNo">284</span> for (Map.Entry<String, TableDescriptor> entry : allDescriptors.entrySet()) {<a name="line.284"></a>
+<span class="sourceLineNo">285</span> TableName tableName = TableName.valueOf(entry.getKey());<a name="line.285"></a>
+<span class="sourceLineNo">286</span> if (TableName.isMetaTableName(tableName)) {<a name="line.286"></a>
+<span class="sourceLineNo">287</span> // This table is always enabled. No fixup needed. No entry in hbase:meta needed.<a name="line.287"></a>
+<span class="sourceLineNo">288</span> // Call through to fixTableState though in case a super class wants to do something.<a name="line.288"></a>
+<span class="sourceLineNo">289</span> fixTableState(new TableState(tableName, TableState.State.ENABLED));<a name="line.289"></a>
+<span class="sourceLineNo">290</span> continue;<a name="line.290"></a>
+<span class="sourceLineNo">291</span> }<a name="line.291"></a>
+<span class="sourceLineNo">292</span> TableState tableState = states.get(entry.getKey());<a name="line.292"></a>
+<span class="sourceLineNo">293</span> if (tableState == null) {<a name="line.293"></a>
+<span class="sourceLineNo">294</span> LOG.warn(tableName + " has no table state in hbase:meta, assuming ENABLED");<a name="line.294"></a>
+<span class="sourceLineNo">295</span> MetaTableAccessor.updateTableState(connection, tableName, TableState.State.ENABLED);<a name="line.295"></a>
+<span class="sourceLineNo">296</span> fixTableState(new TableState(tableName, TableState.State.ENABLED));<a name="line.296"></a>
+<span class="sourceLineNo">297</span> tableName2State.put(tableName, TableState.State.ENABLED);<a name="line.297"></a>
+<span class="sourceLineNo">298</span> } else {<a name="line.298"></a>
+<span class="sourceLineNo">299</span> fixTableState(tableState);<a name="line.299"></a>
+<span class="sourceLineNo">300</span> tableName2State.put(tableName, tableState.getState());<a name="line.300"></a>
+<span class="sourceLineNo">301</span> }<a name="line.301"></a>
+<span class="sourceLineNo">302</span> }<a name="line.302"></a>
+<span class="sourceLineNo">303</span> }<a name="line.303"></a>
+<span class="sourceLineNo">304</span><a name="line.304"></a>
+<span class="sourceLineNo">305</span> /**<a name="line.305"></a>
+<span class="sourceLineNo">306</span> * For subclasses in case they want to do fixup post hbase:meta.<a name="line.306"></a>
+<span class="sourceLineNo">307</span> */<a name="line.307"></a>
+<span class="sourceLineNo">308</span> protected void fixTableState(TableState tableState) throws IOException {<a name="line.308"></a>
+<span class="sourceLineNo">309</span> }<a name="line.309"></a>
+<span class="sourceLineNo">310</span><a name="line.310"></a>
+<span class="sourceLineNo">311</span> /**<a name="line.311"></a>
+<span class="sourceLineNo">312</span> * This code is for case where a hbase2 Master is starting for the first time. ZooKeeper is where<a name="line.312"></a>
+<span class="sourceLineNo">313</span> * we used to keep table state. On first startup, read zookeeper and update hbase:meta with the<a name="line.313"></a>
+<span class="sourceLineNo">314</span> * table states found in zookeeper. This is tricky as we'll do this check every time we startup<a name="line.314"></a>
+<span class="sourceLineNo">315</span> * until mirroring is disabled. See the {@link #MIGRATE_TABLE_STATE_FROM_ZK_KEY} flag. Original<a name="line.315"></a>
+<span class="sourceLineNo">316</span> * form of this migration came in with HBASE-13032. It deleted all znodes when done. We can't do<a name="line.316"></a>
+<span class="sourceLineNo">317</span> * that if we want to support hbase-1.x clients who need to be able to read table state out of zk.<a name="line.317"></a>
+<span class="sourceLineNo">318</span> * See {@link MirroringTableStateManager}.<a name="line.318"></a>
+<span class="sourceLineNo">319</span> * @deprecated Since 2.0.0. Remove in hbase-3.0.0.<a name="line.319"></a>
+<span class="sourceLineNo">320</span> */<a name="line.320"></a>
+<span class="sourceLineNo">321</span> @Deprecated<a name="line.321"></a>
+<span class="sourceLineNo">322</span> private void migrateZooKeeper() throws IOException {<a name="line.322"></a>
+<span class="sourceLineNo">323</span> if (!this.master.getConfiguration().getBoolean(MIGRATE_TABLE_STATE_FROM_ZK_KEY, true)) {<a name="line.323"></a>
+<span class="sourceLineNo">324</span> return;<a name="line.324"></a>
+<span class="sourceLineNo">325</span> }<a name="line.325"></a>
+<span class="sourceLineNo">326</span> try {<a name="line.326"></a>
+<span class="sourceLineNo">327</span> for (Map.Entry<TableName, TableState.State> entry : ZKDataMigrator<a name="line.327"></a>
+<span class="sourceLineNo">328</span> .queryForTableStates(this.master.getZooKeeper()).entrySet()) {<a name="line.328"></a>
+<span class="sourceLineNo">329</span> if (this.master.getTableDescriptors().get(entry.getKey()) == null) {<a name="line.329"></a>
+<span class="sourceLineNo">330</span> deleteZooKeeper(entry.getKey());<a name="line.330"></a>
+<span class="sourceLineNo">331</span> LOG.info("Purged table state entry from zookeepr for table not in hbase:meta: " +<a name="line.331"></a>
+<span class="sourceLineNo">332</span> entry.getKey());<a name="line.332"></a>
+<span class="sourceLineNo">333</span> continue;<a name="line.333"></a>
+<span class="sourceLineNo">334</span> }<a name="line.334"></a>
+<span class="sourceLineNo">335</span> TableState ts = null;<a name="line.335"></a>
+<span class="sourceLineNo">336</span> try {<a name="line.336"></a>
+<span class="sourceLineNo">337</span> ts = getTableState(entry.getKey());<a name="line.337"></a>
+<span class="sourceLineNo">338</span> } catch (TableStateNotFoundException e) {<a name="line.338"></a>
+<span class="sourceLineNo">339</span> // This can happen; table exists but no TableState.<a name="line.339"></a>
+<span class="sourceLineNo">340</span> }<a name="line.340"></a>
+<span class="sourceLineNo">341</span> if (ts == null) {<a name="line.341"></a>
+<span class="sourceLineNo">342</span> TableState.State zkstate = entry.getValue();<a name="line.342"></a>
+<span class="sourceLineNo">343</span> // Only migrate if it is an enable or disabled table. If in-between -- ENABLING or<a name="line.343"></a>
+<span class="sourceLineNo">344</span> // DISABLING then we have a problem; we are starting up an hbase-2 on a cluster with<a name="line.344"></a>
+<span class="sourceLineNo">345</span> // RIT. It is going to be rough!<a name="line.345"></a>
+<span class="sourceLineNo">346</span> if (zkstate.equals(TableState.State.ENABLED) ||<a name="line.346"></a>
+<span class="sourceLineNo">347</span> zkstate.equals(TableState.State.DISABLED)) {<a name="line.347"></a>
+<span class="sourceLineNo">348</span> LOG.info("Migrating table state from zookeeper to hbase:meta; tableName=" +<a name="line.348"></a>
+<span class="sourceLineNo">349</span> entry.getKey() + ", state=" + entry.getValue());<a name="line.349"></a>
+<span class="sourceLineNo">350</span> updateMetaState(entry.getKey(), entry.getValue());<a name="line.350"></a>
+<span class="sourceLineNo">351</span> } else {<a name="line.351"></a>
+<span class="sourceLineNo">352</span> LOG.warn("Table={} has no state and zookeeper state is in-between={} (neither " +<a name="line.352"></a>
+<span class="sourceLineNo">353</span> "ENABLED or DISABLED); NOT MIGRATING table state", entry.getKey(), zkstate);<a name="line.353"></a>
+<span class="sourceLineNo">354</span> }<a name="line.354"></a>
+<span class="sourceLineNo">355</span> }<a name="line.355"></a>
+<span class="sourceLineNo">356</span> // What if the table states disagree? Defer to the hbase:meta setting rather than have the<a name="line.356"></a>
+<span class="sourceLineNo">357</span> // hbase-1.x support prevail.<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span> } catch (KeeperException | InterruptedException e) {<a name="line.359"></a>
+<span class="sourceLineNo">360</span> LOG.warn("Failed reading table state from zookeeper", e);<a name="line.360"></a>
+<span class="sourceLineNo">361</span> }<a name="line.361"></a>
+<span class="sourceLineNo">362</span> }<a name="line.362"></a>
+<span class="sourceLineNo">363</span><a name="line.363"></a>
+<span class="sourceLineNo">364</span> /**<a name="line.364"></a>
+<span class="sourceLineNo">365</span> * Utility method that knows how to delete the old hbase-1.x table state znode. Used also by the<a name="line.365"></a>
+<span class="sourceLineNo">366</span> * Mirroring subclass.<a name="line.366"></a>
+<span class="sourceLineNo">367</span> * @deprecated Since 2.0.0. To be removed in hbase-3.0.0.<a name="line.367"></a>
+<span class="sourceLineNo">368</span> */<a name="line.368"></a>
+<span class="sourceLineNo">369</span> @Deprecated<a name="line.369"></a>
+<span class="sourceLineNo">370</span> protected void deleteZooKeeper(TableName tableName) {<a name="line.370"></a>
+<span class="sourceLineNo">371</span> try {<a name="line.371"></a>
+<span class="sourceLineNo">372</span> // Delete from ZooKeeper<a name="line.372"></a>
+<span class="sourceLineNo">373</span> String znode = ZNodePaths.joinZNode(this.master.getZooKeeper().getZNodePaths().tableZNode,<a name="line.373"></a>
+<span class="sourceLineNo">374</span> tableName.getNameAsString());<a name="line.374"></a>
+<span class="sourceLineNo">375</span> ZKUtil.deleteNodeFailSilent(this.master.getZooKeeper(), znode);<a name="line.375"></a>
+<span class="sourceLineNo">376</span> } catch (KeeperException e) {<a name="line.376"></a>
+<span class="sourceLineNo">377</span> LOG.warn("Failed deleting table state from zookeeper", e);<a name="line.377"></a>
+<span class="sourceLineNo">378</span> }<a name="line.378"></a>
+<span class="sourceLineNo">379</span> }<a name="line.379"></a>
+<span class="sourceLineNo">380</span>}<a name="line.380"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5c5e961f/devapidocs/src-html/org/apache/hadoop/hbase/util/IdReadWriteLock.ReferenceType.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/IdReadWriteLock.ReferenceType.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/IdReadWriteLock.ReferenceType.html
index 8829dc2..4a0ae9f 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/IdReadWriteLock.ReferenceType.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/IdReadWriteLock.ReferenceType.html
@@ -50,14 +50,14 @@
<span class="sourceLineNo">042</span> * For write lock, use lock.writeLock()<a name="line.42"></a>
<span class="sourceLineNo">043</span> */<a name="line.43"></a>
<span class="sourceLineNo">044</span>@InterfaceAudience.Private<a name="line.44"></a>
-<span class="sourceLineNo">045</span>public class IdReadWriteLock {<a name="line.45"></a>
+<span class="sourceLineNo">045</span>public class IdReadWriteLock<T> {<a name="line.45"></a>
<span class="sourceLineNo">046</span> // The number of lock we want to easily support. It's not a maximum.<a name="line.46"></a>
<span class="sourceLineNo">047</span> private static final int NB_CONCURRENT_LOCKS = 1000;<a name="line.47"></a>
<span class="sourceLineNo">048</span> /**<a name="line.48"></a>
<span class="sourceLineNo">049</span> * The pool to get entry from, entries are mapped by {@link Reference} and will be automatically<a name="line.49"></a>
<span class="sourceLineNo">050</span> * garbage-collected by JVM<a name="line.50"></a>
<span class="sourceLineNo">051</span> */<a name="line.51"></a>
-<span class="sourceLineNo">052</span> private final ObjectPool<Long, ReentrantReadWriteLock> lockPool;<a name="line.52"></a>
+<span class="sourceLineNo">052</span> private final ObjectPool<T, ReentrantReadWriteLock> lockPool;<a name="line.52"></a>
<span class="sourceLineNo">053</span> private final ReferenceType refType;<a name="line.53"></a>
<span class="sourceLineNo">054</span><a name="line.54"></a>
<span class="sourceLineNo">055</span> public IdReadWriteLock() {<a name="line.55"></a>
@@ -73,22 +73,22 @@
<span class="sourceLineNo">065</span> public IdReadWriteLock(ReferenceType referenceType) {<a name="line.65"></a>
<span class="sourceLineNo">066</span> this.refType = referenceType;<a name="line.66"></a>
<span class="sourceLineNo">067</span> switch (referenceType) {<a name="line.67"></a>
-<span class="sourceLineNo">068</span> case SOFT:<a name="line.68"></a>
-<span class="sourceLineNo">069</span> lockPool = new SoftObjectPool<>(new ObjectPool.ObjectFactory<Long, ReentrantReadWriteLock>() {<a name="line.69"></a>
-<span class="sourceLineNo">070</span> @Override<a name="line.70"></a>
-<span class="sourceLineNo">071</span> public ReentrantReadWriteLock createObject(Long id) {<a name="line.71"></a>
-<span class="sourceLineNo">072</span> return new ReentrantReadWriteLock();<a name="line.72"></a>
-<span class="sourceLineNo">073</span> }<a name="line.73"></a>
-<span class="sourceLineNo">074</span> }, NB_CONCURRENT_LOCKS);<a name="line.74"></a>
-<span class="sourceLineNo">075</span> break;<a name="line.75"></a>
-<span class="sourceLineNo">076</span> case WEAK:<a name="line.76"></a>
-<span class="sourceLineNo">077</span> default:<a name="line.77"></a>
-<span class="sourceLineNo">078</span> lockPool = new WeakObjectPool<>(new ObjectPool.ObjectFactory<Long, ReentrantReadWriteLock>() {<a name="line.78"></a>
-<span class="sourceLineNo">079</span> @Override<a name="line.79"></a>
-<span class="sourceLineNo">080</span> public ReentrantReadWriteLock createObject(Long id) {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> return new ReentrantReadWriteLock();<a name="line.81"></a>
-<span class="sourceLineNo">082</span> }<a name="line.82"></a>
-<span class="sourceLineNo">083</span> }, NB_CONCURRENT_LOCKS);<a name="line.83"></a>
+<span class="sourceLineNo">068</span> case SOFT:<a name="line.68"></a>
+<span class="sourceLineNo">069</span> lockPool = new SoftObjectPool<>(new ObjectPool.ObjectFactory<T, ReentrantReadWriteLock>() {<a name="line.69"></a>
+<span class="sourceLineNo">070</span> @Override<a name="line.70"></a>
+<span class="sourceLineNo">071</span> public ReentrantReadWriteLock createObject(T id) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> return new ReentrantReadWriteLock();<a name="line.72"></a>
+<span class="sourceLineNo">073</span> }<a name="line.73"></a>
+<span class="sourceLineNo">074</span> }, NB_CONCURRENT_LOCKS);<a name="line.74"></a>
+<span class="sourceLineNo">075</span> break;<a name="line.75"></a>
+<span class="sourceLineNo">076</span> case WEAK:<a name="line.76"></a>
+<span class="sourceLineNo">077</span> default:<a name="line.77"></a>
+<span class="sourceLineNo">078</span> lockPool = new WeakObjectPool<>(new ObjectPool.ObjectFactory<T, ReentrantReadWriteLock>() {<a name="line.78"></a>
+<span class="sourceLineNo">079</span> @Override<a name="line.79"></a>
+<span class="sourceLineNo">080</span> public ReentrantReadWriteLock createObject(T id) {<a name="line.80"></a>
+<span class="sourceLineNo">081</span> return new ReentrantReadWriteLock();<a name="line.81"></a>
+<span class="sourceLineNo">082</span> }<a name="line.82"></a>
+<span class="sourceLineNo">083</span> }, NB_CONCURRENT_LOCKS);<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><a name="line.86"></a>
@@ -100,7 +100,7 @@
<span class="sourceLineNo">092</span> * Get the ReentrantReadWriteLock corresponding to the given id<a name="line.92"></a>
<span class="sourceLineNo">093</span> * @param id an arbitrary number to identify the lock<a name="line.93"></a>
<span class="sourceLineNo">094</span> */<a name="line.94"></a>
-<span class="sourceLineNo">095</span> public ReentrantReadWriteLock getLock(long id) {<a name="line.95"></a>
+<span class="sourceLineNo">095</span> public ReentrantReadWriteLock getLock(T id) {<a name="line.95"></a>
<span class="sourceLineNo">096</span> lockPool.purge();<a name="line.96"></a>
<span class="sourceLineNo">097</span> ReentrantReadWriteLock readWriteLock = lockPool.get(id);<a name="line.97"></a>
<span class="sourceLineNo">098</span> return readWriteLock;<a name="line.98"></a>
@@ -121,7 +121,7 @@
<span class="sourceLineNo">113</span> }<a name="line.113"></a>
<span class="sourceLineNo">114</span><a name="line.114"></a>
<span class="sourceLineNo">115</span> @VisibleForTesting<a name="line.115"></a>
-<span class="sourceLineNo">116</span> public void waitForWaiters(long id, int numWaiters) throws InterruptedException {<a name="line.116"></a>
+<span class="sourceLineNo">116</span> public void waitForWaiters(T id, int numWaiters) throws InterruptedException {<a name="line.116"></a>
<span class="sourceLineNo">117</span> for (ReentrantReadWriteLock readWriteLock;;) {<a name="line.117"></a>
<span class="sourceLineNo">118</span> readWriteLock = lockPool.get(id);<a name="line.118"></a>
<span class="sourceLineNo">119</span> if (readWriteLock != null) {<a name="line.119"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5c5e961f/devapidocs/src-html/org/apache/hadoop/hbase/util/IdReadWriteLock.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/IdReadWriteLock.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/IdReadWriteLock.html
index 8829dc2..4a0ae9f 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/IdReadWriteLock.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/IdReadWriteLock.html
@@ -50,14 +50,14 @@
<span class="sourceLineNo">042</span> * For write lock, use lock.writeLock()<a name="line.42"></a>
<span class="sourceLineNo">043</span> */<a name="line.43"></a>
<span class="sourceLineNo">044</span>@InterfaceAudience.Private<a name="line.44"></a>
-<span class="sourceLineNo">045</span>public class IdReadWriteLock {<a name="line.45"></a>
+<span class="sourceLineNo">045</span>public class IdReadWriteLock<T> {<a name="line.45"></a>
<span class="sourceLineNo">046</span> // The number of lock we want to easily support. It's not a maximum.<a name="line.46"></a>
<span class="sourceLineNo">047</span> private static final int NB_CONCURRENT_LOCKS = 1000;<a name="line.47"></a>
<span class="sourceLineNo">048</span> /**<a name="line.48"></a>
<span class="sourceLineNo">049</span> * The pool to get entry from, entries are mapped by {@link Reference} and will be automatically<a name="line.49"></a>
<span class="sourceLineNo">050</span> * garbage-collected by JVM<a name="line.50"></a>
<span class="sourceLineNo">051</span> */<a name="line.51"></a>
-<span class="sourceLineNo">052</span> private final ObjectPool<Long, ReentrantReadWriteLock> lockPool;<a name="line.52"></a>
+<span class="sourceLineNo">052</span> private final ObjectPool<T, ReentrantReadWriteLock> lockPool;<a name="line.52"></a>
<span class="sourceLineNo">053</span> private final ReferenceType refType;<a name="line.53"></a>
<span class="sourceLineNo">054</span><a name="line.54"></a>
<span class="sourceLineNo">055</span> public IdReadWriteLock() {<a name="line.55"></a>
@@ -73,22 +73,22 @@
<span class="sourceLineNo">065</span> public IdReadWriteLock(ReferenceType referenceType) {<a name="line.65"></a>
<span class="sourceLineNo">066</span> this.refType = referenceType;<a name="line.66"></a>
<span class="sourceLineNo">067</span> switch (referenceType) {<a name="line.67"></a>
-<span class="sourceLineNo">068</span> case SOFT:<a name="line.68"></a>
-<span class="sourceLineNo">069</span> lockPool = new SoftObjectPool<>(new ObjectPool.ObjectFactory<Long, ReentrantReadWriteLock>() {<a name="line.69"></a>
-<span class="sourceLineNo">070</span> @Override<a name="line.70"></a>
-<span class="sourceLineNo">071</span> public ReentrantReadWriteLock createObject(Long id) {<a name="line.71"></a>
-<span class="sourceLineNo">072</span> return new ReentrantReadWriteLock();<a name="line.72"></a>
-<span class="sourceLineNo">073</span> }<a name="line.73"></a>
-<span class="sourceLineNo">074</span> }, NB_CONCURRENT_LOCKS);<a name="line.74"></a>
-<span class="sourceLineNo">075</span> break;<a name="line.75"></a>
-<span class="sourceLineNo">076</span> case WEAK:<a name="line.76"></a>
-<span class="sourceLineNo">077</span> default:<a name="line.77"></a>
-<span class="sourceLineNo">078</span> lockPool = new WeakObjectPool<>(new ObjectPool.ObjectFactory<Long, ReentrantReadWriteLock>() {<a name="line.78"></a>
-<span class="sourceLineNo">079</span> @Override<a name="line.79"></a>
-<span class="sourceLineNo">080</span> public ReentrantReadWriteLock createObject(Long id) {<a name="line.80"></a>
-<span class="sourceLineNo">081</span> return new ReentrantReadWriteLock();<a name="line.81"></a>
-<span class="sourceLineNo">082</span> }<a name="line.82"></a>
-<span class="sourceLineNo">083</span> }, NB_CONCURRENT_LOCKS);<a name="line.83"></a>
+<span class="sourceLineNo">068</span> case SOFT:<a name="line.68"></a>
+<span class="sourceLineNo">069</span> lockPool = new SoftObjectPool<>(new ObjectPool.ObjectFactory<T, ReentrantReadWriteLock>() {<a name="line.69"></a>
+<span class="sourceLineNo">070</span> @Override<a name="line.70"></a>
+<span class="sourceLineNo">071</span> public ReentrantReadWriteLock createObject(T id) {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> return new ReentrantReadWriteLock();<a name="line.72"></a>
+<span class="sourceLineNo">073</span> }<a name="line.73"></a>
+<span class="sourceLineNo">074</span> }, NB_CONCURRENT_LOCKS);<a name="line.74"></a>
+<span class="sourceLineNo">075</span> break;<a name="line.75"></a>
+<span class="sourceLineNo">076</span> case WEAK:<a name="line.76"></a>
+<span class="sourceLineNo">077</span> default:<a name="line.77"></a>
+<span class="sourceLineNo">078</span> lockPool = new WeakObjectPool<>(new ObjectPool.ObjectFactory<T, ReentrantReadWriteLock>() {<a name="line.78"></a>
+<span class="sourceLineNo">079</span> @Override<a name="line.79"></a>
+<span class="sourceLineNo">080</span> public ReentrantReadWriteLock createObject(T id) {<a name="line.80"></a>
+<span class="sourceLineNo">081</span> return new ReentrantReadWriteLock();<a name="line.81"></a>
+<span class="sourceLineNo">082</span> }<a name="line.82"></a>
+<span class="sourceLineNo">083</span> }, NB_CONCURRENT_LOCKS);<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><a name="line.86"></a>
@@ -100,7 +100,7 @@
<span class="sourceLineNo">092</span> * Get the ReentrantReadWriteLock corresponding to the given id<a name="line.92"></a>
<span class="sourceLineNo">093</span> * @param id an arbitrary number to identify the lock<a name="line.93"></a>
<span class="sourceLineNo">094</span> */<a name="line.94"></a>
-<span class="sourceLineNo">095</span> public ReentrantReadWriteLock getLock(long id) {<a name="line.95"></a>
+<span class="sourceLineNo">095</span> public ReentrantReadWriteLock getLock(T id) {<a name="line.95"></a>
<span class="sourceLineNo">096</span> lockPool.purge();<a name="line.96"></a>
<span class="sourceLineNo">097</span> ReentrantReadWriteLock readWriteLock = lockPool.get(id);<a name="line.97"></a>
<span class="sourceLineNo">098</span> return readWriteLock;<a name="line.98"></a>
@@ -121,7 +121,7 @@
<span class="sourceLineNo">113</span> }<a name="line.113"></a>
<span class="sourceLineNo">114</span><a name="line.114"></a>
<span class="sourceLineNo">115</span> @VisibleForTesting<a name="line.115"></a>
-<span class="sourceLineNo">116</span> public void waitForWaiters(long id, int numWaiters) throws InterruptedException {<a name="line.116"></a>
+<span class="sourceLineNo">116</span> public void waitForWaiters(T id, int numWaiters) throws InterruptedException {<a name="line.116"></a>
<span class="sourceLineNo">117</span> for (ReentrantReadWriteLock readWriteLock;;) {<a name="line.117"></a>
<span class="sourceLineNo">118</span> readWriteLock = lockPool.get(id);<a name="line.118"></a>
<span class="sourceLineNo">119</span> if (readWriteLock != null) {<a name="line.119"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5c5e961f/downloads.html
----------------------------------------------------------------------
diff --git a/downloads.html b/downloads.html
index 54314ea..0e257eb 100644
--- a/downloads.html
+++ b/downloads.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180809" />
+ <meta name="Date-Revision-yyyymmdd" content="20180810" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Apache HBase Downloads</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -423,7 +423,7 @@ under the License. -->
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-08-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-08-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5c5e961f/export_control.html
----------------------------------------------------------------------
diff --git a/export_control.html b/export_control.html
index 44abb39..782b920 100644
--- a/export_control.html
+++ b/export_control.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180809" />
+ <meta name="Date-Revision-yyyymmdd" content="20180810" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase –
Export Control
@@ -331,7 +331,7 @@ for more details.</p>
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-08-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-08-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5c5e961f/index.html
----------------------------------------------------------------------
diff --git a/index.html b/index.html
index 81b77b0..7472ae0 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180809" />
+ <meta name="Date-Revision-yyyymmdd" content="20180810" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Apache HBase™ Home</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -411,7 +411,7 @@ Apache HBase is an open-source, distributed, versioned, non-relational database
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-08-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-08-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5c5e961f/integration.html
----------------------------------------------------------------------
diff --git a/integration.html b/integration.html
index 18d7134..0e97d03 100644
--- a/integration.html
+++ b/integration.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180809" />
+ <meta name="Date-Revision-yyyymmdd" content="20180810" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – CI Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -291,7 +291,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-08-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-08-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5c5e961f/issue-tracking.html
----------------------------------------------------------------------
diff --git a/issue-tracking.html b/issue-tracking.html
index 6d7de69..f9cee6a 100644
--- a/issue-tracking.html
+++ b/issue-tracking.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180809" />
+ <meta name="Date-Revision-yyyymmdd" content="20180810" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Issue Management</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -288,7 +288,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-08-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-08-10</li>
</p>
</div>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/5c5e961f/license.html
----------------------------------------------------------------------
diff --git a/license.html b/license.html
index 1a3eaa7..c44acb5 100644
--- a/license.html
+++ b/license.html
@@ -7,7 +7,7 @@
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <meta name="Date-Revision-yyyymmdd" content="20180809" />
+ <meta name="Date-Revision-yyyymmdd" content="20180810" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache HBase – Project Licenses</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.5-HBASE.min.css" />
@@ -491,7 +491,7 @@
<a href="https://www.apache.org/">The Apache Software Foundation</a>.
All rights reserved.
- <li id="publishDate" class="pull-right">Last Published: 2018-08-09</li>
+ <li id="publishDate" class="pull-right">Last Published: 2018-08-10</li>
</p>
</div>