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/04/20 14:46:48 UTC

[07/27] hbase-site git commit: Published site at 914de1141699142bce1486468a742233d9440b23.

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1facf1d3/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/throttle/StoreHotnessProtector.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/throttle/StoreHotnessProtector.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/throttle/StoreHotnessProtector.html
index 09e41f8..e103c0d 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/throttle/StoreHotnessProtector.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/throttle/StoreHotnessProtector.html
@@ -29,179 +29,182 @@
 <span class="sourceLineNo">021</span>import java.util.Map;<a name="line.21"></a>
 <span class="sourceLineNo">022</span>import java.util.concurrent.ConcurrentSkipListMap;<a name="line.22"></a>
 <span class="sourceLineNo">023</span>import java.util.concurrent.atomic.AtomicInteger;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import org.apache.commons.logging.Log;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import org.apache.commons.logging.LogFactory;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.hadoop.conf.Configuration;<a name="line.26"></a>
-<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.Cell;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.RegionTooBusyException;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.regionserver.Region;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.regionserver.Store;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.util.ClassSize;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>/**<a name="line.35"></a>
-<span class="sourceLineNo">036</span> * StoreHotnessProtector is designed to help limit the concurrency of puts with dense columns, it<a name="line.36"></a>
-<span class="sourceLineNo">037</span> * does best-effort to avoid exhausting all RS's handlers. When a lot of clients write requests with<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * dense (hundreds) columns to a Store at the same time, it will lead to blocking of RS because CSLM<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * degrades when concurrency goes up. It's not a kind of throttling. Throttling is user-oriented,<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * while StoreHotnessProtector is system-oriented, RS-self-protected mechanism.<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * &lt;p&gt;<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * There are three key parameters:<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * &lt;p&gt;<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * 1. parallelPutToStoreThreadLimitCheckMinColumnCount: If the amount of columns exceed this<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * threshold, the HotProtector will work, 100 by default<a name="line.45"></a>
+<span class="sourceLineNo">024</span>import org.apache.hadoop.conf.Configuration;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.hadoop.hbase.Cell;<a name="line.25"></a>
+<span class="sourceLineNo">026</span>import org.apache.hadoop.hbase.RegionTooBusyException;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.hbase.regionserver.Region;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.regionserver.Store;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.util.ClassSize;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.31"></a>
+<span class="sourceLineNo">032</span><a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.slf4j.Logger;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.slf4j.LoggerFactory;<a name="line.34"></a>
+<span class="sourceLineNo">035</span><a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.36"></a>
+<span class="sourceLineNo">037</span><a name="line.37"></a>
+<span class="sourceLineNo">038</span>/**<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * StoreHotnessProtector is designed to help limit the concurrency of puts with dense columns, it<a name="line.39"></a>
+<span class="sourceLineNo">040</span> * does best-effort to avoid exhausting all RS's handlers. When a lot of clients write requests with<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * dense (hundreds) columns to a Store at the same time, it will lead to blocking of RS because CSLM<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * degrades when concurrency goes up. It's not a kind of throttling. Throttling is user-oriented,<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * while StoreHotnessProtector is system-oriented, RS-self-protected mechanism.<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * &lt;p&gt;<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * There are three key parameters:<a name="line.45"></a>
 <span class="sourceLineNo">046</span> * &lt;p&gt;<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * 2. parallelPutToStoreThreadLimit: The amount of concurrency allowed to write puts to a Store at<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * the same time.<a name="line.48"></a>
+<span class="sourceLineNo">047</span> * 1. parallelPutToStoreThreadLimitCheckMinColumnCount: If the amount of columns exceed this<a name="line.47"></a>
+<span class="sourceLineNo">048</span> * threshold, the HotProtector will work, 100 by default<a name="line.48"></a>
 <span class="sourceLineNo">049</span> * &lt;p&gt;<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * 3. parallelPreparePutToStoreThreadLimit: The amount of concurrency allowed to<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * prepare writing puts to a Store at the same time.<a name="line.51"></a>
+<span class="sourceLineNo">050</span> * 2. parallelPutToStoreThreadLimit: The amount of concurrency allowed to write puts to a Store at<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * the same time.<a name="line.51"></a>
 <span class="sourceLineNo">052</span> * &lt;p&gt;<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * Notice that our writing pipeline includes three key process: MVCC acquire, writing MemStore, and<a name="line.53"></a>
-<span class="sourceLineNo">054</span> * WAL. Only limit the concurrency of writing puts to Store(parallelPutToStoreThreadLimit) is not<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * enough since the actual concurrency of puts may still exceed the limit when MVCC contention or<a name="line.55"></a>
-<span class="sourceLineNo">056</span> * slow WAL sync happens. This is why parallelPreparePutToStoreThreadLimit is needed.<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * &lt;p&gt;<a name="line.57"></a>
-<span class="sourceLineNo">058</span> * This protector is enabled by default and could be turned off by setting<a name="line.58"></a>
-<span class="sourceLineNo">059</span> * hbase.region.store.parallel.put.limit to 0, supporting online configuration change.<a name="line.59"></a>
-<span class="sourceLineNo">060</span> */<a name="line.60"></a>
-<span class="sourceLineNo">061</span>@InterfaceAudience.Private<a name="line.61"></a>
-<span class="sourceLineNo">062</span>public class StoreHotnessProtector {<a name="line.62"></a>
-<span class="sourceLineNo">063</span>  private static final Log LOG = LogFactory.getLog(StoreHotnessProtector.class);<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  private volatile int parallelPutToStoreThreadLimit;<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>  private volatile int parallelPreparePutToStoreThreadLimit;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>  public final static String PARALLEL_PUT_STORE_THREADS_LIMIT =<a name="line.67"></a>
-<span class="sourceLineNo">068</span>      "hbase.region.store.parallel.put.limit";<a name="line.68"></a>
-<span class="sourceLineNo">069</span>  public final static String PARALLEL_PREPARE_PUT_STORE_MULTIPLIER =<a name="line.69"></a>
-<span class="sourceLineNo">070</span>      "hbase.region.store.parallel.prepare.put.multiplier";<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  private final static int DEFAULT_PARALLEL_PUT_STORE_THREADS_LIMIT = 10;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>  private volatile int parallelPutToStoreThreadLimitCheckMinColumnCount;<a name="line.72"></a>
-<span class="sourceLineNo">073</span>  public final static String PARALLEL_PUT_STORE_THREADS_LIMIT_MIN_COLUMN_COUNT =<a name="line.73"></a>
-<span class="sourceLineNo">074</span>      "hbase.region.store.parallel.put.limit.min.column.count";<a name="line.74"></a>
-<span class="sourceLineNo">075</span>  private final static int DEFAULT_PARALLEL_PUT_STORE_THREADS_LIMIT_MIN_COLUMN_NUM = 100;<a name="line.75"></a>
-<span class="sourceLineNo">076</span>  private final static int DEFAULT_PARALLEL_PREPARE_PUT_STORE_MULTIPLIER = 2;<a name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span>  private final Map&lt;byte[], AtomicInteger&gt; preparePutToStoreMap =<a name="line.78"></a>
-<span class="sourceLineNo">079</span>      new ConcurrentSkipListMap&lt;&gt;(Bytes.BYTES_RAWCOMPARATOR);<a name="line.79"></a>
-<span class="sourceLineNo">080</span>  private final Region region;<a name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span>  public StoreHotnessProtector(Region region, Configuration conf) {<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    init(conf);<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    this.region = region;<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>  public void init(Configuration conf) {<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    this.parallelPutToStoreThreadLimit =<a name="line.88"></a>
-<span class="sourceLineNo">089</span>        conf.getInt(PARALLEL_PUT_STORE_THREADS_LIMIT, DEFAULT_PARALLEL_PUT_STORE_THREADS_LIMIT);<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    this.parallelPreparePutToStoreThreadLimit = conf.getInt(PARALLEL_PREPARE_PUT_STORE_MULTIPLIER,<a name="line.90"></a>
-<span class="sourceLineNo">091</span>        DEFAULT_PARALLEL_PREPARE_PUT_STORE_MULTIPLIER) * parallelPutToStoreThreadLimit;<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    this.parallelPutToStoreThreadLimitCheckMinColumnCount =<a name="line.92"></a>
-<span class="sourceLineNo">093</span>        conf.getInt(PARALLEL_PUT_STORE_THREADS_LIMIT_MIN_COLUMN_COUNT,<a name="line.93"></a>
-<span class="sourceLineNo">094</span>            DEFAULT_PARALLEL_PUT_STORE_THREADS_LIMIT_MIN_COLUMN_NUM);<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><a name="line.97"></a>
-<span class="sourceLineNo">098</span>  public void update(Configuration conf) {<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    init(conf);<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    preparePutToStoreMap.clear();<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    LOG.debug("update config: " + toString());<a name="line.101"></a>
-<span class="sourceLineNo">102</span>  }<a name="line.102"></a>
-<span class="sourceLineNo">103</span><a name="line.103"></a>
-<span class="sourceLineNo">104</span>  public void start(Map&lt;byte[], List&lt;Cell&gt;&gt; familyMaps) throws RegionTooBusyException {<a name="line.104"></a>
-<span class="sourceLineNo">105</span>    if (!isEnable()) {<a name="line.105"></a>
-<span class="sourceLineNo">106</span>      return;<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>    String tooBusyStore = null;<a name="line.109"></a>
-<span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span>    for (Map.Entry&lt;byte[], List&lt;Cell&gt;&gt; e : familyMaps.entrySet()) {<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      Store store = this.region.getStore(e.getKey());<a name="line.112"></a>
-<span class="sourceLineNo">113</span>      if (store == null || e.getValue() == null) {<a name="line.113"></a>
-<span class="sourceLineNo">114</span>        continue;<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>      if (e.getValue().size() &gt; this.parallelPutToStoreThreadLimitCheckMinColumnCount) {<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span>        //we need to try to add #preparePutCount at first because preparePutToStoreMap will be<a name="line.119"></a>
-<span class="sourceLineNo">120</span>        //cleared when changing the configuration.<a name="line.120"></a>
-<span class="sourceLineNo">121</span>        preparePutToStoreMap.putIfAbsent(e.getKey(), new AtomicInteger());<a name="line.121"></a>
-<span class="sourceLineNo">122</span>        AtomicInteger preparePutCounter = preparePutToStoreMap.get(e.getKey());<a name="line.122"></a>
-<span class="sourceLineNo">123</span>        if (preparePutCounter == null) {<a name="line.123"></a>
-<span class="sourceLineNo">124</span>          preparePutCounter = new AtomicInteger();<a name="line.124"></a>
-<span class="sourceLineNo">125</span>          preparePutToStoreMap.putIfAbsent(e.getKey(), preparePutCounter);<a name="line.125"></a>
-<span class="sourceLineNo">126</span>        }<a name="line.126"></a>
-<span class="sourceLineNo">127</span>        int preparePutCount = preparePutCounter.incrementAndGet();<a name="line.127"></a>
-<span class="sourceLineNo">128</span>        if (store.getCurrentParallelPutCount() &gt; this.parallelPutToStoreThreadLimit<a name="line.128"></a>
-<span class="sourceLineNo">129</span>            || preparePutCount &gt; this.parallelPreparePutToStoreThreadLimit) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>          tooBusyStore = (tooBusyStore == null ?<a name="line.130"></a>
-<span class="sourceLineNo">131</span>              store.getColumnFamilyName() :<a name="line.131"></a>
-<span class="sourceLineNo">132</span>              tooBusyStore + "," + store.getColumnFamilyName());<a name="line.132"></a>
-<span class="sourceLineNo">133</span>        }<a name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span>        if (LOG.isTraceEnabled()) {<a name="line.135"></a>
-<span class="sourceLineNo">136</span>          LOG.trace(store.getColumnFamilyName() + ": preparePutCount=" + preparePutCount<a name="line.136"></a>
-<span class="sourceLineNo">137</span>              + "; currentParallelPutCount=" + store.getCurrentParallelPutCount());<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><a name="line.141"></a>
-<span class="sourceLineNo">142</span>    if (tooBusyStore != null) {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>      String msg =<a name="line.143"></a>
-<span class="sourceLineNo">144</span>          "StoreTooBusy," + this.region.getRegionInfo().getRegionNameAsString() + ":" + tooBusyStore<a name="line.144"></a>
-<span class="sourceLineNo">145</span>              + " Above parallelPutToStoreThreadLimit(" + this.parallelPutToStoreThreadLimit + ")";<a name="line.145"></a>
-<span class="sourceLineNo">146</span>      if (LOG.isTraceEnabled()) {<a name="line.146"></a>
-<span class="sourceLineNo">147</span>        LOG.trace(msg);<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      }<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      throw new RegionTooBusyException(msg);<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    }<a name="line.150"></a>
-<span class="sourceLineNo">151</span>  }<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>  public void finish(Map&lt;byte[], List&lt;Cell&gt;&gt; familyMaps) {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    if (!isEnable()) {<a name="line.154"></a>
-<span class="sourceLineNo">155</span>      return;<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>    for (Map.Entry&lt;byte[], List&lt;Cell&gt;&gt; e : familyMaps.entrySet()) {<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      Store store = this.region.getStore(e.getKey());<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      if (store == null || e.getValue() == null) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span>        continue;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      }<a name="line.162"></a>
-<span class="sourceLineNo">163</span>      if (e.getValue().size() &gt; this.parallelPutToStoreThreadLimitCheckMinColumnCount) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span>        AtomicInteger counter = preparePutToStoreMap.get(e.getKey());<a name="line.164"></a>
-<span class="sourceLineNo">165</span>        // preparePutToStoreMap will be cleared when changing the configuration, so it may turn<a name="line.165"></a>
-<span class="sourceLineNo">166</span>        // into a negative value. It will be not accuracy in a short time, it's a trade-off for<a name="line.166"></a>
-<span class="sourceLineNo">167</span>        // performance.<a name="line.167"></a>
-<span class="sourceLineNo">168</span>        if (counter != null &amp;&amp; counter.decrementAndGet() &lt; 0) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>          counter.incrementAndGet();<a name="line.169"></a>
-<span class="sourceLineNo">170</span>        }<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      }<a name="line.171"></a>
-<span class="sourceLineNo">172</span>    }<a name="line.172"></a>
-<span class="sourceLineNo">173</span>  }<a name="line.173"></a>
-<span class="sourceLineNo">174</span><a name="line.174"></a>
-<span class="sourceLineNo">175</span>  public String toString() {<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    return "StoreHotnessProtector, parallelPutToStoreThreadLimit="<a name="line.176"></a>
-<span class="sourceLineNo">177</span>        + this.parallelPutToStoreThreadLimit + " ; minColumnNum="<a name="line.177"></a>
-<span class="sourceLineNo">178</span>        + this.parallelPutToStoreThreadLimitCheckMinColumnCount + " ; preparePutThreadLimit="<a name="line.178"></a>
-<span class="sourceLineNo">179</span>        + this.parallelPreparePutToStoreThreadLimit + " ; hotProtect now " + (this.isEnable() ?<a name="line.179"></a>
-<span class="sourceLineNo">180</span>        "enable" :<a name="line.180"></a>
-<span class="sourceLineNo">181</span>        "disable");<a name="line.181"></a>
-<span class="sourceLineNo">182</span>  }<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span>  public boolean isEnable() {<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    // feature is enabled when parallelPutToStoreThreadLimit &gt; 0<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    return this.parallelPutToStoreThreadLimit &gt; 0;<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>  @VisibleForTesting<a name="line.189"></a>
-<span class="sourceLineNo">190</span>  Map&lt;byte[], AtomicInteger&gt; getPreparePutToStoreMap() {<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    return preparePutToStoreMap;<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>  public static final long FIXED_SIZE =<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      ClassSize.align(ClassSize.OBJECT + 2 * ClassSize.REFERENCE + 3 * Bytes.SIZEOF_INT);<a name="line.195"></a>
-<span class="sourceLineNo">196</span>}<a name="line.196"></a>
+<span class="sourceLineNo">053</span> * 3. parallelPreparePutToStoreThreadLimit: The amount of concurrency allowed to<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * prepare writing puts to a Store at the same time.<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * &lt;p&gt;<a name="line.55"></a>
+<span class="sourceLineNo">056</span> * Notice that our writing pipeline includes three key process: MVCC acquire, writing MemStore, and<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * WAL. Only limit the concurrency of writing puts to Store(parallelPutToStoreThreadLimit) is not<a name="line.57"></a>
+<span class="sourceLineNo">058</span> * enough since the actual concurrency of puts may still exceed the limit when MVCC contention or<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * slow WAL sync happens. This is why parallelPreparePutToStoreThreadLimit is needed.<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * &lt;p&gt;<a name="line.60"></a>
+<span class="sourceLineNo">061</span> * This protector is enabled by default and could be turned off by setting<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * hbase.region.store.parallel.put.limit to 0, supporting online configuration change.<a name="line.62"></a>
+<span class="sourceLineNo">063</span> */<a name="line.63"></a>
+<span class="sourceLineNo">064</span>@InterfaceAudience.Private<a name="line.64"></a>
+<span class="sourceLineNo">065</span>public class StoreHotnessProtector {<a name="line.65"></a>
+<span class="sourceLineNo">066</span>  private static final Logger LOG = LoggerFactory.getLogger(StoreHotnessProtector.class);<a name="line.66"></a>
+<span class="sourceLineNo">067</span>  private volatile int parallelPutToStoreThreadLimit;<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span>  private volatile int parallelPreparePutToStoreThreadLimit;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  public final static String PARALLEL_PUT_STORE_THREADS_LIMIT =<a name="line.70"></a>
+<span class="sourceLineNo">071</span>      "hbase.region.store.parallel.put.limit";<a name="line.71"></a>
+<span class="sourceLineNo">072</span>  public final static String PARALLEL_PREPARE_PUT_STORE_MULTIPLIER =<a name="line.72"></a>
+<span class="sourceLineNo">073</span>      "hbase.region.store.parallel.prepare.put.multiplier";<a name="line.73"></a>
+<span class="sourceLineNo">074</span>  private final static int DEFAULT_PARALLEL_PUT_STORE_THREADS_LIMIT = 10;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  private volatile int parallelPutToStoreThreadLimitCheckMinColumnCount;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>  public final static String PARALLEL_PUT_STORE_THREADS_LIMIT_MIN_COLUMN_COUNT =<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      "hbase.region.store.parallel.put.limit.min.column.count";<a name="line.77"></a>
+<span class="sourceLineNo">078</span>  private final static int DEFAULT_PARALLEL_PUT_STORE_THREADS_LIMIT_MIN_COLUMN_NUM = 100;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>  private final static int DEFAULT_PARALLEL_PREPARE_PUT_STORE_MULTIPLIER = 2;<a name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span>  private final Map&lt;byte[], AtomicInteger&gt; preparePutToStoreMap =<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      new ConcurrentSkipListMap&lt;&gt;(Bytes.BYTES_RAWCOMPARATOR);<a name="line.82"></a>
+<span class="sourceLineNo">083</span>  private final Region region;<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span>  public StoreHotnessProtector(Region region, Configuration conf) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    init(conf);<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    this.region = region;<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 void init(Configuration conf) {<a name="line.90"></a>
+<span class="sourceLineNo">091</span>    this.parallelPutToStoreThreadLimit =<a name="line.91"></a>
+<span class="sourceLineNo">092</span>        conf.getInt(PARALLEL_PUT_STORE_THREADS_LIMIT, DEFAULT_PARALLEL_PUT_STORE_THREADS_LIMIT);<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    this.parallelPreparePutToStoreThreadLimit = conf.getInt(PARALLEL_PREPARE_PUT_STORE_MULTIPLIER,<a name="line.93"></a>
+<span class="sourceLineNo">094</span>        DEFAULT_PARALLEL_PREPARE_PUT_STORE_MULTIPLIER) * parallelPutToStoreThreadLimit;<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    this.parallelPutToStoreThreadLimitCheckMinColumnCount =<a name="line.95"></a>
+<span class="sourceLineNo">096</span>        conf.getInt(PARALLEL_PUT_STORE_THREADS_LIMIT_MIN_COLUMN_COUNT,<a name="line.96"></a>
+<span class="sourceLineNo">097</span>            DEFAULT_PARALLEL_PUT_STORE_THREADS_LIMIT_MIN_COLUMN_NUM);<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>  public void update(Configuration conf) {<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    init(conf);<a name="line.102"></a>
+<span class="sourceLineNo">103</span>    preparePutToStoreMap.clear();<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    LOG.debug("update config: " + toString());<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>  public void start(Map&lt;byte[], List&lt;Cell&gt;&gt; familyMaps) throws RegionTooBusyException {<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    if (!isEnable()) {<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      return;<a name="line.109"></a>
+<span class="sourceLineNo">110</span>    }<a name="line.110"></a>
+<span class="sourceLineNo">111</span><a name="line.111"></a>
+<span class="sourceLineNo">112</span>    String tooBusyStore = null;<a name="line.112"></a>
+<span class="sourceLineNo">113</span><a name="line.113"></a>
+<span class="sourceLineNo">114</span>    for (Map.Entry&lt;byte[], List&lt;Cell&gt;&gt; e : familyMaps.entrySet()) {<a name="line.114"></a>
+<span class="sourceLineNo">115</span>      Store store = this.region.getStore(e.getKey());<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      if (store == null || e.getValue() == null) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>        continue;<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      }<a name="line.118"></a>
+<span class="sourceLineNo">119</span><a name="line.119"></a>
+<span class="sourceLineNo">120</span>      if (e.getValue().size() &gt; this.parallelPutToStoreThreadLimitCheckMinColumnCount) {<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span>        //we need to try to add #preparePutCount at first because preparePutToStoreMap will be<a name="line.122"></a>
+<span class="sourceLineNo">123</span>        //cleared when changing the configuration.<a name="line.123"></a>
+<span class="sourceLineNo">124</span>        preparePutToStoreMap.putIfAbsent(e.getKey(), new AtomicInteger());<a name="line.124"></a>
+<span class="sourceLineNo">125</span>        AtomicInteger preparePutCounter = preparePutToStoreMap.get(e.getKey());<a name="line.125"></a>
+<span class="sourceLineNo">126</span>        if (preparePutCounter == null) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span>          preparePutCounter = new AtomicInteger();<a name="line.127"></a>
+<span class="sourceLineNo">128</span>          preparePutToStoreMap.putIfAbsent(e.getKey(), preparePutCounter);<a name="line.128"></a>
+<span class="sourceLineNo">129</span>        }<a name="line.129"></a>
+<span class="sourceLineNo">130</span>        int preparePutCount = preparePutCounter.incrementAndGet();<a name="line.130"></a>
+<span class="sourceLineNo">131</span>        if (store.getCurrentParallelPutCount() &gt; this.parallelPutToStoreThreadLimit<a name="line.131"></a>
+<span class="sourceLineNo">132</span>            || preparePutCount &gt; this.parallelPreparePutToStoreThreadLimit) {<a name="line.132"></a>
+<span class="sourceLineNo">133</span>          tooBusyStore = (tooBusyStore == null ?<a name="line.133"></a>
+<span class="sourceLineNo">134</span>              store.getColumnFamilyName() :<a name="line.134"></a>
+<span class="sourceLineNo">135</span>              tooBusyStore + "," + store.getColumnFamilyName());<a name="line.135"></a>
+<span class="sourceLineNo">136</span>        }<a name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span>        if (LOG.isTraceEnabled()) {<a name="line.138"></a>
+<span class="sourceLineNo">139</span>          LOG.trace(store.getColumnFamilyName() + ": preparePutCount=" + preparePutCount<a name="line.139"></a>
+<span class="sourceLineNo">140</span>              + "; currentParallelPutCount=" + store.getCurrentParallelPutCount());<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><a name="line.144"></a>
+<span class="sourceLineNo">145</span>    if (tooBusyStore != null) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span>      String msg =<a name="line.146"></a>
+<span class="sourceLineNo">147</span>          "StoreTooBusy," + this.region.getRegionInfo().getRegionNameAsString() + ":" + tooBusyStore<a name="line.147"></a>
+<span class="sourceLineNo">148</span>              + " Above parallelPutToStoreThreadLimit(" + this.parallelPutToStoreThreadLimit + ")";<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      if (LOG.isTraceEnabled()) {<a name="line.149"></a>
+<span class="sourceLineNo">150</span>        LOG.trace(msg);<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      }<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      throw new RegionTooBusyException(msg);<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 finish(Map&lt;byte[], List&lt;Cell&gt;&gt; familyMaps) {<a name="line.156"></a>
+<span class="sourceLineNo">157</span>    if (!isEnable()) {<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><a name="line.160"></a>
+<span class="sourceLineNo">161</span>    for (Map.Entry&lt;byte[], List&lt;Cell&gt;&gt; e : familyMaps.entrySet()) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span>      Store store = this.region.getStore(e.getKey());<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      if (store == null || e.getValue() == null) {<a name="line.163"></a>
+<span class="sourceLineNo">164</span>        continue;<a name="line.164"></a>
+<span class="sourceLineNo">165</span>      }<a name="line.165"></a>
+<span class="sourceLineNo">166</span>      if (e.getValue().size() &gt; this.parallelPutToStoreThreadLimitCheckMinColumnCount) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span>        AtomicInteger counter = preparePutToStoreMap.get(e.getKey());<a name="line.167"></a>
+<span class="sourceLineNo">168</span>        // preparePutToStoreMap will be cleared when changing the configuration, so it may turn<a name="line.168"></a>
+<span class="sourceLineNo">169</span>        // into a negative value. It will be not accuracy in a short time, it's a trade-off for<a name="line.169"></a>
+<span class="sourceLineNo">170</span>        // performance.<a name="line.170"></a>
+<span class="sourceLineNo">171</span>        if (counter != null &amp;&amp; counter.decrementAndGet() &lt; 0) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span>          counter.incrementAndGet();<a name="line.172"></a>
+<span class="sourceLineNo">173</span>        }<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      }<a name="line.174"></a>
+<span class="sourceLineNo">175</span>    }<a name="line.175"></a>
+<span class="sourceLineNo">176</span>  }<a name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span>  public String toString() {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>    return "StoreHotnessProtector, parallelPutToStoreThreadLimit="<a name="line.179"></a>
+<span class="sourceLineNo">180</span>        + this.parallelPutToStoreThreadLimit + " ; minColumnNum="<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        + this.parallelPutToStoreThreadLimitCheckMinColumnCount + " ; preparePutThreadLimit="<a name="line.181"></a>
+<span class="sourceLineNo">182</span>        + this.parallelPreparePutToStoreThreadLimit + " ; hotProtect now " + (this.isEnable() ?<a name="line.182"></a>
+<span class="sourceLineNo">183</span>        "enable" :<a name="line.183"></a>
+<span class="sourceLineNo">184</span>        "disable");<a name="line.184"></a>
+<span class="sourceLineNo">185</span>  }<a name="line.185"></a>
+<span class="sourceLineNo">186</span><a name="line.186"></a>
+<span class="sourceLineNo">187</span>  public boolean isEnable() {<a name="line.187"></a>
+<span class="sourceLineNo">188</span>    // feature is enabled when parallelPutToStoreThreadLimit &gt; 0<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    return this.parallelPutToStoreThreadLimit &gt; 0;<a name="line.189"></a>
+<span class="sourceLineNo">190</span>  }<a name="line.190"></a>
+<span class="sourceLineNo">191</span><a name="line.191"></a>
+<span class="sourceLineNo">192</span>  @VisibleForTesting<a name="line.192"></a>
+<span class="sourceLineNo">193</span>  Map&lt;byte[], AtomicInteger&gt; getPreparePutToStoreMap() {<a name="line.193"></a>
+<span class="sourceLineNo">194</span>    return preparePutToStoreMap;<a name="line.194"></a>
+<span class="sourceLineNo">195</span>  }<a name="line.195"></a>
+<span class="sourceLineNo">196</span><a name="line.196"></a>
+<span class="sourceLineNo">197</span>  public static final long FIXED_SIZE =<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      ClassSize.align(ClassSize.OBJECT + 2 * ClassSize.REFERENCE + 3 * Bytes.SIZEOF_INT);<a name="line.198"></a>
+<span class="sourceLineNo">199</span>}<a name="line.199"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1facf1d3/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/FSWALEntry.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/FSWALEntry.html b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/FSWALEntry.html
index a9224f0..e3e1a34 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/FSWALEntry.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/regionserver/wal/FSWALEntry.html
@@ -33,20 +33,20 @@
 <span class="sourceLineNo">025</span>import java.util.Set;<a name="line.25"></a>
 <span class="sourceLineNo">026</span>import java.util.TreeSet;<a name="line.26"></a>
 <span class="sourceLineNo">027</span><a name="line.27"></a>
-<span class="sourceLineNo">028</span>import org.apache.commons.collections.CollectionUtils;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.Cell;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.PrivateCellUtil;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.regionserver.MultiVersionConcurrencyControl;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.wal.WAL.Entry;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.wal.WALEdit;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.wal.WALKeyImpl;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.39"></a>
-<span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.41"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.hbase.Cell;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.hbase.PrivateCellUtil;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.hbase.regionserver.MultiVersionConcurrencyControl;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.wal.WAL.Entry;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.wal.WALEdit;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.wal.WALKeyImpl;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.38"></a>
+<span class="sourceLineNo">039</span><a name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import org.apache.hbase.thirdparty.org.apache.commons.collections4.CollectionUtils;<a name="line.41"></a>
 <span class="sourceLineNo">042</span><a name="line.42"></a>
 <span class="sourceLineNo">043</span>/**<a name="line.43"></a>
 <span class="sourceLineNo">044</span> * A WAL Entry for {@link AbstractFSWAL} implementation.  Immutable.<a name="line.44"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1facf1d3/devapidocs/src-html/org/apache/hadoop/hbase/replication/ZKReplicationQueueStorage.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/replication/ZKReplicationQueueStorage.html b/devapidocs/src-html/org/apache/hadoop/hbase/replication/ZKReplicationQueueStorage.html
index c90e6fa..338eb9c 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/replication/ZKReplicationQueueStorage.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/replication/ZKReplicationQueueStorage.html
@@ -37,30 +37,30 @@
 <span class="sourceLineNo">029</span>import java.util.SortedSet;<a name="line.29"></a>
 <span class="sourceLineNo">030</span>import java.util.TreeSet;<a name="line.30"></a>
 <span class="sourceLineNo">031</span>import java.util.stream.Collectors;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.commons.collections.CollectionUtils;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.conf.Configuration;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.fs.Path;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.HConstants;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.ServerName;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.zookeeper.ZKUtil;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.zookeeper.ZKUtil.ZKUtilOp;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.zookeeper.ZKWatcher;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.zookeeper.ZNodePaths;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.zookeeper.KeeperException;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.zookeeper.KeeperException.BadVersionException;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.zookeeper.KeeperException.NoNodeException;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.apache.zookeeper.KeeperException.NodeExistsException;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.zookeeper.KeeperException.NotEmptyException;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.zookeeper.data.Stat;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.slf4j.Logger;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.slf4j.LoggerFactory;<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.55"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.conf.Configuration;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.fs.Path;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.hbase.HConstants;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.hbase.ServerName;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.client.RegionInfo;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.exceptions.DeserializationException;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.util.Pair;<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.ZKUtil.ZKUtilOp;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.zookeeper.ZKWatcher;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.zookeeper.ZNodePaths;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.zookeeper.KeeperException;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.zookeeper.KeeperException.BadVersionException;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.zookeeper.KeeperException.NoNodeException;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.apache.zookeeper.KeeperException.NodeExistsException;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.apache.zookeeper.KeeperException.NotEmptyException;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.zookeeper.data.Stat;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.slf4j.Logger;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.slf4j.LoggerFactory;<a name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hbase.thirdparty.org.apache.commons.collections4.CollectionUtils;<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> * ZK based replication queue storage.<a name="line.58"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1facf1d3/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.ByteArrayComparator.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.ByteArrayComparator.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.ByteArrayComparator.html
index e606e82..a242321 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.ByteArrayComparator.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.ByteArrayComparator.html
@@ -46,18 +46,18 @@
 <span class="sourceLineNo">038</span>import java.util.Iterator;<a name="line.38"></a>
 <span class="sourceLineNo">039</span>import java.util.List;<a name="line.39"></a>
 <span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.commons.collections.CollectionUtils;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.Cell;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.io.RawComparator;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.io.WritableComparator;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.io.WritableUtils;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.slf4j.Logger;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.slf4j.LoggerFactory;<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.52"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.Cell;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.io.RawComparator;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.io.WritableComparator;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.io.WritableUtils;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.slf4j.Logger;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.slf4j.LoggerFactory;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hbase.thirdparty.org.apache.commons.collections4.CollectionUtils;<a name="line.52"></a>
 <span class="sourceLineNo">053</span><a name="line.53"></a>
 <span class="sourceLineNo">054</span>import com.google.protobuf.ByteString;<a name="line.54"></a>
 <span class="sourceLineNo">055</span><a name="line.55"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1facf1d3/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.Comparer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.Comparer.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.Comparer.html
index e606e82..a242321 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.Comparer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.Comparer.html
@@ -46,18 +46,18 @@
 <span class="sourceLineNo">038</span>import java.util.Iterator;<a name="line.38"></a>
 <span class="sourceLineNo">039</span>import java.util.List;<a name="line.39"></a>
 <span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.commons.collections.CollectionUtils;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.Cell;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.io.RawComparator;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.io.WritableComparator;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.io.WritableUtils;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.slf4j.Logger;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.slf4j.LoggerFactory;<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.52"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.Cell;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.io.RawComparator;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.io.WritableComparator;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.io.WritableUtils;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.slf4j.Logger;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.slf4j.LoggerFactory;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hbase.thirdparty.org.apache.commons.collections4.CollectionUtils;<a name="line.52"></a>
 <span class="sourceLineNo">053</span><a name="line.53"></a>
 <span class="sourceLineNo">054</span>import com.google.protobuf.ByteString;<a name="line.54"></a>
 <span class="sourceLineNo">055</span><a name="line.55"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1facf1d3/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html
index e606e82..a242321 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.PureJavaComparer.html
@@ -46,18 +46,18 @@
 <span class="sourceLineNo">038</span>import java.util.Iterator;<a name="line.38"></a>
 <span class="sourceLineNo">039</span>import java.util.List;<a name="line.39"></a>
 <span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.commons.collections.CollectionUtils;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.Cell;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.io.RawComparator;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.io.WritableComparator;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.io.WritableUtils;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.slf4j.Logger;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.slf4j.LoggerFactory;<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.52"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.Cell;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.io.RawComparator;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.io.WritableComparator;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.io.WritableUtils;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.slf4j.Logger;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.slf4j.LoggerFactory;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hbase.thirdparty.org.apache.commons.collections4.CollectionUtils;<a name="line.52"></a>
 <span class="sourceLineNo">053</span><a name="line.53"></a>
 <span class="sourceLineNo">054</span>import com.google.protobuf.ByteString;<a name="line.54"></a>
 <span class="sourceLineNo">055</span><a name="line.55"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1facf1d3/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html
index e606e82..a242321 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.UnsafeComparer.html
@@ -46,18 +46,18 @@
 <span class="sourceLineNo">038</span>import java.util.Iterator;<a name="line.38"></a>
 <span class="sourceLineNo">039</span>import java.util.List;<a name="line.39"></a>
 <span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.commons.collections.CollectionUtils;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.Cell;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.io.RawComparator;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.io.WritableComparator;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.io.WritableUtils;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.slf4j.Logger;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.slf4j.LoggerFactory;<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.52"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.Cell;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.io.RawComparator;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.io.WritableComparator;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.io.WritableUtils;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.slf4j.Logger;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.slf4j.LoggerFactory;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hbase.thirdparty.org.apache.commons.collections4.CollectionUtils;<a name="line.52"></a>
 <span class="sourceLineNo">053</span><a name="line.53"></a>
 <span class="sourceLineNo">054</span>import com.google.protobuf.ByteString;<a name="line.54"></a>
 <span class="sourceLineNo">055</span><a name="line.55"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1facf1d3/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.html
index e606e82..a242321 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.LexicographicalComparerHolder.html
@@ -46,18 +46,18 @@
 <span class="sourceLineNo">038</span>import java.util.Iterator;<a name="line.38"></a>
 <span class="sourceLineNo">039</span>import java.util.List;<a name="line.39"></a>
 <span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.commons.collections.CollectionUtils;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.Cell;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.io.RawComparator;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.io.WritableComparator;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.io.WritableUtils;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.slf4j.Logger;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.slf4j.LoggerFactory;<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.52"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.Cell;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.io.RawComparator;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.io.WritableComparator;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.io.WritableUtils;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.slf4j.Logger;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.slf4j.LoggerFactory;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hbase.thirdparty.org.apache.commons.collections4.CollectionUtils;<a name="line.52"></a>
 <span class="sourceLineNo">053</span><a name="line.53"></a>
 <span class="sourceLineNo">054</span>import com.google.protobuf.ByteString;<a name="line.54"></a>
 <span class="sourceLineNo">055</span><a name="line.55"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1facf1d3/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.RowEndKeyComparator.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.RowEndKeyComparator.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.RowEndKeyComparator.html
index e606e82..a242321 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.RowEndKeyComparator.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.RowEndKeyComparator.html
@@ -46,18 +46,18 @@
 <span class="sourceLineNo">038</span>import java.util.Iterator;<a name="line.38"></a>
 <span class="sourceLineNo">039</span>import java.util.List;<a name="line.39"></a>
 <span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.commons.collections.CollectionUtils;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.Cell;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.io.RawComparator;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.io.WritableComparator;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.io.WritableUtils;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.slf4j.Logger;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.slf4j.LoggerFactory;<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.52"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.Cell;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.io.RawComparator;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.io.WritableComparator;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.io.WritableUtils;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.slf4j.Logger;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.slf4j.LoggerFactory;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hbase.thirdparty.org.apache.commons.collections4.CollectionUtils;<a name="line.52"></a>
 <span class="sourceLineNo">053</span><a name="line.53"></a>
 <span class="sourceLineNo">054</span>import com.google.protobuf.ByteString;<a name="line.54"></a>
 <span class="sourceLineNo">055</span><a name="line.55"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1facf1d3/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.html b/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.html
index e606e82..a242321 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/util/Bytes.html
@@ -46,18 +46,18 @@
 <span class="sourceLineNo">038</span>import java.util.Iterator;<a name="line.38"></a>
 <span class="sourceLineNo">039</span>import java.util.List;<a name="line.39"></a>
 <span class="sourceLineNo">040</span><a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.commons.collections.CollectionUtils;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.Cell;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.apache.hadoop.io.RawComparator;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.apache.hadoop.io.WritableComparator;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.apache.hadoop.io.WritableUtils;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.slf4j.Logger;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.slf4j.LoggerFactory;<a name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.52"></a>
+<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.Cell;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.CellComparator;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.KeyValue;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.io.RawComparator;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.apache.hadoop.io.WritableComparator;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.apache.hadoop.io.WritableUtils;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.slf4j.Logger;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import org.slf4j.LoggerFactory;<a name="line.49"></a>
+<span class="sourceLineNo">050</span><a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hbase.thirdparty.org.apache.commons.collections4.CollectionUtils;<a name="line.52"></a>
 <span class="sourceLineNo">053</span><a name="line.53"></a>
 <span class="sourceLineNo">054</span>import com.google.protobuf.ByteString;<a name="line.54"></a>
 <span class="sourceLineNo">055</span><a name="line.55"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/1facf1d3/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html
index 9f6a1bd..99f53c4 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/wal/WALSplitter.BoundedLogWriterCreationOutputSink.html
@@ -54,55 +54,55 @@
 <span class="sourceLineNo">046</span>import java.util.concurrent.atomic.AtomicReference;<a name="line.46"></a>
 <span class="sourceLineNo">047</span>import java.util.regex.Matcher;<a name="line.47"></a>
 <span class="sourceLineNo">048</span>import java.util.regex.Pattern;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.apache.commons.collections.CollectionUtils;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.apache.commons.collections.MapUtils;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import org.apache.commons.lang3.ArrayUtils;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import org.apache.hadoop.conf.Configuration;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import org.apache.hadoop.fs.FileAlreadyExistsException;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import org.apache.hadoop.fs.FileStatus;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import org.apache.hadoop.fs.FileSystem;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import org.apache.hadoop.fs.Path;<a name="line.56"></a>
-<span class="sourceLineNo">057</span>import org.apache.hadoop.fs.PathFilter;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.Cell;<a name="line.58"></a>
-<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.CellScanner;<a name="line.59"></a>
-<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.60"></a>
-<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.61"></a>
-<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.HConstants;<a name="line.62"></a>
-<span class="sourceLineNo">063</span>import org.apache.hadoop.hbase.TableName;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>import org.apache.hadoop.hbase.client.Delete;<a name="line.64"></a>
-<span class="sourceLineNo">065</span>import org.apache.hadoop.hbase.client.Durability;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>import org.apache.hadoop.hbase.client.Mutation;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>import org.apache.hadoop.hbase.client.Put;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>import org.apache.hadoop.hbase.coordination.SplitLogWorkerCoordination;<a name="line.68"></a>
-<span class="sourceLineNo">069</span>import org.apache.hadoop.hbase.io.HeapSize;<a name="line.69"></a>
-<span class="sourceLineNo">070</span>import org.apache.hadoop.hbase.log.HBaseMarkers;<a name="line.70"></a>
-<span class="sourceLineNo">071</span>import org.apache.hadoop.hbase.master.SplitLogManager;<a name="line.71"></a>
-<span class="sourceLineNo">072</span>import org.apache.hadoop.hbase.monitoring.MonitoredTask;<a name="line.72"></a>
-<span class="sourceLineNo">073</span>import org.apache.hadoop.hbase.monitoring.TaskMonitor;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>import org.apache.hadoop.hbase.regionserver.HRegion;<a name="line.74"></a>
-<span class="sourceLineNo">075</span>import org.apache.hadoop.hbase.regionserver.LastSequenceId;<a name="line.75"></a>
-<span class="sourceLineNo">076</span>import org.apache.hadoop.hbase.regionserver.wal.AbstractFSWAL;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>import org.apache.hadoop.hbase.regionserver.wal.WALCellCodec;<a name="line.77"></a>
-<span class="sourceLineNo">078</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.78"></a>
-<span class="sourceLineNo">079</span>import org.apache.hadoop.hbase.util.CancelableProgressable;<a name="line.79"></a>
-<span class="sourceLineNo">080</span>import org.apache.hadoop.hbase.util.ClassSize;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.82"></a>
-<span class="sourceLineNo">083</span>import org.apache.hadoop.hbase.util.Threads;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>import org.apache.hadoop.hbase.wal.WAL.Entry;<a name="line.84"></a>
-<span class="sourceLineNo">085</span>import org.apache.hadoop.hbase.wal.WAL.Reader;<a name="line.85"></a>
-<span class="sourceLineNo">086</span>import org.apache.hadoop.hbase.wal.WALProvider.Writer;<a name="line.86"></a>
-<span class="sourceLineNo">087</span>import org.apache.hadoop.hbase.zookeeper.ZKSplitLog;<a name="line.87"></a>
-<span class="sourceLineNo">088</span>import org.apache.hadoop.io.MultipleIOException;<a name="line.88"></a>
-<span class="sourceLineNo">089</span>import org.apache.hadoop.ipc.RemoteException;<a name="line.89"></a>
-<span class="sourceLineNo">090</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.90"></a>
-<span class="sourceLineNo">091</span>import org.slf4j.Logger;<a name="line.91"></a>
-<span class="sourceLineNo">092</span>import org.slf4j.LoggerFactory;<a name="line.92"></a>
-<span class="sourceLineNo">093</span><a name="line.93"></a>
-<span class="sourceLineNo">094</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.94"></a>
-<span class="sourceLineNo">095</span>import org.apache.hbase.thirdparty.com.google.common.base.Preconditions;<a name="line.95"></a>
-<span class="sourceLineNo">096</span>import org.apache.hbase.thirdparty.com.google.common.collect.Lists;<a name="line.96"></a>
-<span class="sourceLineNo">097</span>import org.apache.hbase.thirdparty.com.google.protobuf.TextFormat;<a name="line.97"></a>
+<span class="sourceLineNo">049</span>import org.apache.commons.lang3.ArrayUtils;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.apache.hadoop.conf.Configuration;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.apache.hadoop.fs.FileAlreadyExistsException;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.apache.hadoop.fs.FileStatus;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import org.apache.hadoop.fs.FileSystem;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.apache.hadoop.fs.Path;<a name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.apache.hadoop.fs.PathFilter;<a name="line.55"></a>
+<span class="sourceLineNo">056</span>import org.apache.hadoop.hbase.Cell;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>import org.apache.hadoop.hbase.CellScanner;<a name="line.57"></a>
+<span class="sourceLineNo">058</span>import org.apache.hadoop.hbase.CellUtil;<a name="line.58"></a>
+<span class="sourceLineNo">059</span>import org.apache.hadoop.hbase.HBaseConfiguration;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>import org.apache.hadoop.hbase.HConstants;<a name="line.60"></a>
+<span class="sourceLineNo">061</span>import org.apache.hadoop.hbase.TableName;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>import org.apache.hadoop.hbase.client.Delete;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>import org.apache.hadoop.hbase.client.Durability;<a name="line.63"></a>
+<span class="sourceLineNo">064</span>import org.apache.hadoop.hbase.client.Mutation;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>import org.apache.hadoop.hbase.client.Put;<a name="line.65"></a>
+<span class="sourceLineNo">066</span>import org.apache.hadoop.hbase.coordination.SplitLogWorkerCoordination;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>import org.apache.hadoop.hbase.io.HeapSize;<a name="line.67"></a>
+<span class="sourceLineNo">068</span>import org.apache.hadoop.hbase.log.HBaseMarkers;<a name="line.68"></a>
+<span class="sourceLineNo">069</span>import org.apache.hadoop.hbase.master.SplitLogManager;<a name="line.69"></a>
+<span class="sourceLineNo">070</span>import org.apache.hadoop.hbase.monitoring.MonitoredTask;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>import org.apache.hadoop.hbase.monitoring.TaskMonitor;<a name="line.71"></a>
+<span class="sourceLineNo">072</span>import org.apache.hadoop.hbase.regionserver.HRegion;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>import org.apache.hadoop.hbase.regionserver.LastSequenceId;<a name="line.73"></a>
+<span class="sourceLineNo">074</span>import org.apache.hadoop.hbase.regionserver.wal.AbstractFSWAL;<a name="line.74"></a>
+<span class="sourceLineNo">075</span>import org.apache.hadoop.hbase.regionserver.wal.WALCellCodec;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>import org.apache.hadoop.hbase.util.Bytes;<a name="line.76"></a>
+<span class="sourceLineNo">077</span>import org.apache.hadoop.hbase.util.CancelableProgressable;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>import org.apache.hadoop.hbase.util.ClassSize;<a name="line.78"></a>
+<span class="sourceLineNo">079</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.79"></a>
+<span class="sourceLineNo">080</span>import org.apache.hadoop.hbase.util.Pair;<a name="line.80"></a>
+<span class="sourceLineNo">081</span>import org.apache.hadoop.hbase.util.Threads;<a name="line.81"></a>
+<span class="sourceLineNo">082</span>import org.apache.hadoop.hbase.wal.WAL.Entry;<a name="line.82"></a>
+<span class="sourceLineNo">083</span>import org.apache.hadoop.hbase.wal.WAL.Reader;<a name="line.83"></a>
+<span class="sourceLineNo">084</span>import org.apache.hadoop.hbase.wal.WALProvider.Writer;<a name="line.84"></a>
+<span class="sourceLineNo">085</span>import org.apache.hadoop.hbase.zookeeper.ZKSplitLog;<a name="line.85"></a>
+<span class="sourceLineNo">086</span>import org.apache.hadoop.io.MultipleIOException;<a name="line.86"></a>
+<span class="sourceLineNo">087</span>import org.apache.hadoop.ipc.RemoteException;<a name="line.87"></a>
+<span class="sourceLineNo">088</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.88"></a>
+<span class="sourceLineNo">089</span>import org.slf4j.Logger;<a name="line.89"></a>
+<span class="sourceLineNo">090</span>import org.slf4j.LoggerFactory;<a name="line.90"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span>import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a name="line.92"></a>
+<span class="sourceLineNo">093</span>import org.apache.hbase.thirdparty.com.google.common.base.Preconditions;<a name="line.93"></a>
+<span class="sourceLineNo">094</span>import org.apache.hbase.thirdparty.com.google.common.collect.Lists;<a name="line.94"></a>
+<span class="sourceLineNo">095</span>import org.apache.hbase.thirdparty.com.google.protobuf.TextFormat;<a name="line.95"></a>
+<span class="sourceLineNo">096</span>import org.apache.hbase.thirdparty.org.apache.commons.collections4.CollectionUtils;<a name="line.96"></a>
+<span class="sourceLineNo">097</span>import org.apache.hbase.thirdparty.org.apache.commons.collections4.MapUtils;<a name="line.97"></a>
 <span class="sourceLineNo">098</span><a name="line.98"></a>
 <span class="sourceLineNo">099</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.WALEntry;<a name="line.99"></a>
 <span class="sourceLineNo">100</span>import org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.MutationProto.MutationType;<a name="line.100"></a>