http://git-wip-us.apache.org/repos/asf/hbase-site/blob/505bbb2e/apidocs/src-html/org/apache/hadoop/hbase/client/Scan.ReadType.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/client/Scan.ReadType.html 
b/apidocs/src-html/org/apache/hadoop/hbase/client/Scan.ReadType.html
index ffeadbf..935839d 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/client/Scan.ReadType.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/client/Scan.ReadType.html
@@ -37,10 +37,10 @@
 <span class="sourceLineNo">029</span>import java.util.TreeMap;<a 
name="line.29"></a>
 <span class="sourceLineNo">030</span>import java.util.TreeSet;<a 
name="line.30"></a>
 <span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.commons.logging.Log;<a 
name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.commons.logging.LogFactory;<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.yetus.audience.InterfaceAudience;<a name="line.35"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.HConstants;<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.slf4j.Logger;<a 
name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.slf4j.LoggerFactory;<a 
name="line.35"></a>
 <span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.client.metrics.ScanMetrics;<a name="line.36"></a>
 <span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.filter.Filter;<a name="line.37"></a>
 <span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.filter.IncompatibleFilterException;<a 
name="line.38"></a>
@@ -95,7 +95,7 @@
 <span class="sourceLineNo">087</span> */<a name="line.87"></a>
 <span class="sourceLineNo">088</span>@InterfaceAudience.Public<a 
name="line.88"></a>
 <span class="sourceLineNo">089</span>public class Scan extends Query {<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>  private static final Log LOG = 
LogFactory.getLog(Scan.class);<a name="line.90"></a>
+<span class="sourceLineNo">090</span>  private static final Logger LOG = 
LoggerFactory.getLogger(Scan.class);<a name="line.90"></a>
 <span class="sourceLineNo">091</span><a name="line.91"></a>
 <span class="sourceLineNo">092</span>  private static final String RAW_ATTR = 
"_raw_";<a name="line.92"></a>
 <span class="sourceLineNo">093</span><a name="line.93"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/505bbb2e/apidocs/src-html/org/apache/hadoop/hbase/client/Scan.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/client/Scan.html 
b/apidocs/src-html/org/apache/hadoop/hbase/client/Scan.html
index ffeadbf..935839d 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/client/Scan.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/client/Scan.html
@@ -37,10 +37,10 @@
 <span class="sourceLineNo">029</span>import java.util.TreeMap;<a 
name="line.29"></a>
 <span class="sourceLineNo">030</span>import java.util.TreeSet;<a 
name="line.30"></a>
 <span class="sourceLineNo">031</span><a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.commons.logging.Log;<a 
name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.commons.logging.LogFactory;<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.yetus.audience.InterfaceAudience;<a name="line.35"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.HConstants;<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.slf4j.Logger;<a 
name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.slf4j.LoggerFactory;<a 
name="line.35"></a>
 <span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.client.metrics.ScanMetrics;<a name="line.36"></a>
 <span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.filter.Filter;<a name="line.37"></a>
 <span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.filter.IncompatibleFilterException;<a 
name="line.38"></a>
@@ -95,7 +95,7 @@
 <span class="sourceLineNo">087</span> */<a name="line.87"></a>
 <span class="sourceLineNo">088</span>@InterfaceAudience.Public<a 
name="line.88"></a>
 <span class="sourceLineNo">089</span>public class Scan extends Query {<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>  private static final Log LOG = 
LogFactory.getLog(Scan.class);<a name="line.90"></a>
+<span class="sourceLineNo">090</span>  private static final Logger LOG = 
LoggerFactory.getLogger(Scan.class);<a name="line.90"></a>
 <span class="sourceLineNo">091</span><a name="line.91"></a>
 <span class="sourceLineNo">092</span>  private static final String RAW_ATTR = 
"_raw_";<a name="line.92"></a>
 <span class="sourceLineNo">093</span><a name="line.93"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/505bbb2e/apidocs/src-html/org/apache/hadoop/hbase/client/TableDescriptorBuilder.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/client/TableDescriptorBuilder.html 
b/apidocs/src-html/org/apache/hadoop/hbase/client/TableDescriptorBuilder.html
index 0e05116..a4a6614 100644
--- 
a/apidocs/src-html/org/apache/hadoop/hbase/client/TableDescriptorBuilder.html
+++ 
b/apidocs/src-html/org/apache/hadoop/hbase/client/TableDescriptorBuilder.html
@@ -42,25 +42,25 @@
 <span class="sourceLineNo">034</span>import java.util.regex.Matcher;<a 
name="line.34"></a>
 <span class="sourceLineNo">035</span>import java.util.stream.Stream;<a 
name="line.35"></a>
 <span class="sourceLineNo">036</span><a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.commons.logging.Log;<a 
name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.apache.commons.logging.LogFactory;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.fs.Path;<a 
name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.Coprocessor;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.exceptions.DeserializationException;<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.security.User;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;<a 
name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.48"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.fs.Path;<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.Coprocessor;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.exceptions.DeserializationException;<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.security.User;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos;<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.slf4j.Logger;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.slf4j.LoggerFactory;<a 
name="line.48"></a>
 <span class="sourceLineNo">049</span><a name="line.49"></a>
 <span class="sourceLineNo">050</span>/**<a name="line.50"></a>
 <span class="sourceLineNo">051</span> * @since 2.0.0<a name="line.51"></a>
 <span class="sourceLineNo">052</span> */<a name="line.52"></a>
 <span class="sourceLineNo">053</span>@InterfaceAudience.Public<a 
name="line.53"></a>
 <span class="sourceLineNo">054</span>public class TableDescriptorBuilder {<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span>  public static final Log LOG = 
LogFactory.getLog(TableDescriptorBuilder.class);<a name="line.55"></a>
+<span class="sourceLineNo">055</span>  public static final Logger LOG = 
LoggerFactory.getLogger(TableDescriptorBuilder.class);<a name="line.55"></a>
 <span class="sourceLineNo">056</span>  @InterfaceAudience.Private<a 
name="line.56"></a>
 <span class="sourceLineNo">057</span>  public static final String SPLIT_POLICY 
= "SPLIT_POLICY";<a name="line.57"></a>
 <span class="sourceLineNo">058</span>  private static final Bytes 
SPLIT_POLICY_KEY = new Bytes(Bytes.toBytes(SPLIT_POLICY));<a name="line.58"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/505bbb2e/apidocs/src-html/org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.html
 
b/apidocs/src-html/org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.html
index 9f78f7e..e440b04 100644
--- 
a/apidocs/src-html/org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.html
+++ 
b/apidocs/src-html/org/apache/hadoop/hbase/client/backoff/ExponentialClientBackoffPolicy.html
@@ -25,92 +25,91 @@
 <span class="sourceLineNo">017</span> */<a name="line.17"></a>
 <span class="sourceLineNo">018</span>package 
org.apache.hadoop.hbase.client.backoff;<a name="line.18"></a>
 <span class="sourceLineNo">019</span><a name="line.19"></a>
-<span class="sourceLineNo">020</span>import org.apache.commons.logging.Log;<a 
name="line.20"></a>
-<span class="sourceLineNo">021</span>import 
org.apache.commons.logging.LogFactory;<a name="line.21"></a>
-<span class="sourceLineNo">022</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.22"></a>
-<span class="sourceLineNo">023</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import 
org.apache.hadoop.hbase.ServerName;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import 
org.apache.yetus.audience.InterfaceAudience;<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.shaded.com.google.common.base.Preconditions;<a 
name="line.27"></a>
-<span class="sourceLineNo">028</span><a name="line.28"></a>
-<span class="sourceLineNo">029</span>/**<a name="line.29"></a>
-<span class="sourceLineNo">030</span> * Simple exponential backoff policy on 
for the client that uses a  percent^4 times the<a name="line.30"></a>
-<span class="sourceLineNo">031</span> * max backoff to generate the backoff 
time.<a name="line.31"></a>
-<span class="sourceLineNo">032</span> */<a name="line.32"></a>
-<span class="sourceLineNo">033</span>@InterfaceAudience.Public<a 
name="line.33"></a>
-<span class="sourceLineNo">034</span>public class 
ExponentialClientBackoffPolicy implements ClientBackoffPolicy {<a 
name="line.34"></a>
-<span class="sourceLineNo">035</span><a name="line.35"></a>
-<span class="sourceLineNo">036</span>  private static final Log LOG = 
LogFactory.getLog(ExponentialClientBackoffPolicy.class);<a name="line.36"></a>
-<span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span>  private static final long ONE_MINUTE = 
60 * 1000;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>  public static final long 
DEFAULT_MAX_BACKOFF = 5 * ONE_MINUTE;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>  public static final String 
MAX_BACKOFF_KEY = "hbase.client.exponential-backoff.max";<a name="line.40"></a>
-<span class="sourceLineNo">041</span>  private long maxBackoff;<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span>  private float 
heapOccupancyLowWatermark;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>  private float 
heapOccupancyHighWatermark;<a name="line.43"></a>
-<span class="sourceLineNo">044</span><a name="line.44"></a>
-<span class="sourceLineNo">045</span>  public 
ExponentialClientBackoffPolicy(Configuration conf) {<a name="line.45"></a>
-<span class="sourceLineNo">046</span>    this.maxBackoff = 
conf.getLong(MAX_BACKOFF_KEY, DEFAULT_MAX_BACKOFF);<a name="line.46"></a>
-<span class="sourceLineNo">047</span>    this.heapOccupancyLowWatermark = 
conf.getFloat(HConstants.HEAP_OCCUPANCY_LOW_WATERMARK_KEY,<a name="line.47"></a>
-<span class="sourceLineNo">048</span>      
HConstants.DEFAULT_HEAP_OCCUPANCY_LOW_WATERMARK);<a name="line.48"></a>
-<span class="sourceLineNo">049</span>    this.heapOccupancyHighWatermark = 
conf.getFloat(HConstants.HEAP_OCCUPANCY_HIGH_WATERMARK_KEY,<a 
name="line.49"></a>
-<span class="sourceLineNo">050</span>      
HConstants.DEFAULT_HEAP_OCCUPANCY_HIGH_WATERMARK);<a name="line.50"></a>
-<span class="sourceLineNo">051</span>  }<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span>  @Override<a name="line.53"></a>
-<span class="sourceLineNo">054</span>  public long getBackoffTime(ServerName 
serverName, byte[] region, ServerStatistics stats) {<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    // no stats for the server yet, so 
don't backoff<a name="line.55"></a>
-<span class="sourceLineNo">056</span>    if (stats == null) {<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span>      return 0;<a name="line.57"></a>
-<span class="sourceLineNo">058</span>    }<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span>    ServerStatistics.RegionStatistics 
regionStats = stats.getStatsForRegion(region);<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    // no stats for the region yet - 
don't backoff<a name="line.61"></a>
-<span class="sourceLineNo">062</span>    if (regionStats == null) {<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span>      return 0;<a name="line.63"></a>
-<span class="sourceLineNo">064</span>    }<a name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>    // Factor in memstore load<a 
name="line.66"></a>
-<span class="sourceLineNo">067</span>    double percent = 
regionStats.getMemStoreLoadPercent() / 100.0;<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>    // Factor in heap occupancy<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span>    float heapOccupancy = 
regionStats.getHeapOccupancyPercent() / 100.0f;<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span>    // Factor in compaction pressure, 1.0 
means heavy compaction pressure<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    float compactionPressure = 
regionStats.getCompactionPressure() / 100.0f;<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    if (heapOccupancy &gt;= 
heapOccupancyLowWatermark) {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>      // If we are higher than the high 
watermark, we are already applying max<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      // backoff and cannot scale more 
(see scale() below)<a name="line.76"></a>
-<span class="sourceLineNo">077</span>      if (heapOccupancy &gt; 
heapOccupancyHighWatermark) {<a name="line.77"></a>
-<span class="sourceLineNo">078</span>        heapOccupancy = 
heapOccupancyHighWatermark;<a name="line.78"></a>
-<span class="sourceLineNo">079</span>      }<a name="line.79"></a>
-<span class="sourceLineNo">080</span>      percent = Math.max(percent,<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>          scale(heapOccupancy, 
heapOccupancyLowWatermark, heapOccupancyHighWatermark,<a name="line.81"></a>
-<span class="sourceLineNo">082</span>              0.1, 1.0));<a 
name="line.82"></a>
-<span class="sourceLineNo">083</span>    }<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    percent = Math.max(percent, 
compactionPressure);<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    // square the percent as a value less 
than 1. Closer we move to 100 percent,<a name="line.85"></a>
-<span class="sourceLineNo">086</span>    // the percent moves to 1, but 
squaring causes the exponential curve<a name="line.86"></a>
-<span class="sourceLineNo">087</span>    double multiplier = Math.pow(percent, 
4.0);<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    if (multiplier &gt; 1) {<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span>      multiplier = 1;<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>    }<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    return (long) (multiplier * 
maxBackoff);<a name="line.91"></a>
-<span class="sourceLineNo">092</span>  }<a name="line.92"></a>
-<span class="sourceLineNo">093</span><a name="line.93"></a>
-<span class="sourceLineNo">094</span>  /** Scale valueIn in the range 
[baseMin,baseMax] to the range [limitMin,limitMax] */<a name="line.94"></a>
-<span class="sourceLineNo">095</span>  private static double scale(double 
valueIn, double baseMin, double baseMax, double limitMin,<a name="line.95"></a>
-<span class="sourceLineNo">096</span>      double limitMax) {<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span>    Preconditions.checkArgument(baseMin 
&lt;= baseMax, "Illegal source range [%s,%s]",<a name="line.97"></a>
-<span class="sourceLineNo">098</span>        baseMin, baseMax);<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>    Preconditions.checkArgument(limitMin 
&lt;= limitMax, "Illegal target range [%s,%s]",<a name="line.99"></a>
-<span class="sourceLineNo">100</span>        limitMin, limitMax);<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>    Preconditions.checkArgument(valueIn 
&gt;= baseMin &amp;&amp; valueIn &lt;= baseMax,<a name="line.101"></a>
-<span class="sourceLineNo">102</span>        "Value %s must be within the 
range [%s,%s]", valueIn, baseMin, baseMax);<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    return ((limitMax - limitMin) * 
(valueIn - baseMin) / (baseMax - baseMin)) + limitMin;<a name="line.103"></a>
-<span class="sourceLineNo">104</span>  }<a name="line.104"></a>
-<span class="sourceLineNo">105</span>}<a name="line.105"></a>
+<span class="sourceLineNo">020</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.20"></a>
+<span class="sourceLineNo">021</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.21"></a>
+<span class="sourceLineNo">022</span>import 
org.apache.hadoop.hbase.ServerName;<a name="line.22"></a>
+<span class="sourceLineNo">023</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.23"></a>
+<span class="sourceLineNo">024</span>import org.slf4j.Logger;<a 
name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.slf4j.LoggerFactory;<a 
name="line.25"></a>
+<span class="sourceLineNo">026</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.base.Preconditions;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span><a name="line.27"></a>
+<span class="sourceLineNo">028</span>/**<a name="line.28"></a>
+<span class="sourceLineNo">029</span> * Simple exponential backoff policy on 
for the client that uses a  percent^4 times the<a name="line.29"></a>
+<span class="sourceLineNo">030</span> * max backoff to generate the backoff 
time.<a name="line.30"></a>
+<span class="sourceLineNo">031</span> */<a name="line.31"></a>
+<span class="sourceLineNo">032</span>@InterfaceAudience.Public<a 
name="line.32"></a>
+<span class="sourceLineNo">033</span>public class 
ExponentialClientBackoffPolicy implements ClientBackoffPolicy {<a 
name="line.33"></a>
+<span class="sourceLineNo">034</span><a name="line.34"></a>
+<span class="sourceLineNo">035</span>  private static final Logger LOG = 
LoggerFactory.getLogger(ExponentialClientBackoffPolicy.class);<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span><a name="line.36"></a>
+<span class="sourceLineNo">037</span>  private static final long ONE_MINUTE = 
60 * 1000;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>  public static final long 
DEFAULT_MAX_BACKOFF = 5 * ONE_MINUTE;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>  public static final String 
MAX_BACKOFF_KEY = "hbase.client.exponential-backoff.max";<a name="line.39"></a>
+<span class="sourceLineNo">040</span>  private long maxBackoff;<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span>  private float 
heapOccupancyLowWatermark;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>  private float 
heapOccupancyHighWatermark;<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span>  public 
ExponentialClientBackoffPolicy(Configuration conf) {<a name="line.44"></a>
+<span class="sourceLineNo">045</span>    this.maxBackoff = 
conf.getLong(MAX_BACKOFF_KEY, DEFAULT_MAX_BACKOFF);<a name="line.45"></a>
+<span class="sourceLineNo">046</span>    this.heapOccupancyLowWatermark = 
conf.getFloat(HConstants.HEAP_OCCUPANCY_LOW_WATERMARK_KEY,<a name="line.46"></a>
+<span class="sourceLineNo">047</span>      
HConstants.DEFAULT_HEAP_OCCUPANCY_LOW_WATERMARK);<a name="line.47"></a>
+<span class="sourceLineNo">048</span>    this.heapOccupancyHighWatermark = 
conf.getFloat(HConstants.HEAP_OCCUPANCY_HIGH_WATERMARK_KEY,<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>      
HConstants.DEFAULT_HEAP_OCCUPANCY_HIGH_WATERMARK);<a name="line.49"></a>
+<span class="sourceLineNo">050</span>  }<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span>  @Override<a name="line.52"></a>
+<span class="sourceLineNo">053</span>  public long getBackoffTime(ServerName 
serverName, byte[] region, ServerStatistics stats) {<a name="line.53"></a>
+<span class="sourceLineNo">054</span>    // no stats for the server yet, so 
don't backoff<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    if (stats == null) {<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span>      return 0;<a name="line.56"></a>
+<span class="sourceLineNo">057</span>    }<a name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span>    ServerStatistics.RegionStatistics 
regionStats = stats.getStatsForRegion(region);<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    // no stats for the region yet - 
don't backoff<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    if (regionStats == null) {<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>      return 0;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>    }<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span>    // Factor in memstore load<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span>    double percent = 
regionStats.getMemStoreLoadPercent() / 100.0;<a name="line.66"></a>
+<span class="sourceLineNo">067</span><a name="line.67"></a>
+<span class="sourceLineNo">068</span>    // Factor in heap occupancy<a 
name="line.68"></a>
+<span class="sourceLineNo">069</span>    float heapOccupancy = 
regionStats.getHeapOccupancyPercent() / 100.0f;<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>    // Factor in compaction pressure, 1.0 
means heavy compaction pressure<a name="line.71"></a>
+<span class="sourceLineNo">072</span>    float compactionPressure = 
regionStats.getCompactionPressure() / 100.0f;<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    if (heapOccupancy &gt;= 
heapOccupancyLowWatermark) {<a name="line.73"></a>
+<span class="sourceLineNo">074</span>      // If we are higher than the high 
watermark, we are already applying max<a name="line.74"></a>
+<span class="sourceLineNo">075</span>      // backoff and cannot scale more 
(see scale() below)<a name="line.75"></a>
+<span class="sourceLineNo">076</span>      if (heapOccupancy &gt; 
heapOccupancyHighWatermark) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>        heapOccupancy = 
heapOccupancyHighWatermark;<a name="line.77"></a>
+<span class="sourceLineNo">078</span>      }<a name="line.78"></a>
+<span class="sourceLineNo">079</span>      percent = Math.max(percent,<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>          scale(heapOccupancy, 
heapOccupancyLowWatermark, heapOccupancyHighWatermark,<a name="line.80"></a>
+<span class="sourceLineNo">081</span>              0.1, 1.0));<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>    }<a name="line.82"></a>
+<span class="sourceLineNo">083</span>    percent = Math.max(percent, 
compactionPressure);<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    // square the percent as a value less 
than 1. Closer we move to 100 percent,<a name="line.84"></a>
+<span class="sourceLineNo">085</span>    // the percent moves to 1, but 
squaring causes the exponential curve<a name="line.85"></a>
+<span class="sourceLineNo">086</span>    double multiplier = Math.pow(percent, 
4.0);<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    if (multiplier &gt; 1) {<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>      multiplier = 1;<a 
name="line.88"></a>
+<span class="sourceLineNo">089</span>    }<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    return (long) (multiplier * 
maxBackoff);<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  }<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>  /** Scale valueIn in the range 
[baseMin,baseMax] to the range [limitMin,limitMax] */<a name="line.93"></a>
+<span class="sourceLineNo">094</span>  private static double scale(double 
valueIn, double baseMin, double baseMax, double limitMin,<a name="line.94"></a>
+<span class="sourceLineNo">095</span>      double limitMax) {<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span>    Preconditions.checkArgument(baseMin 
&lt;= baseMax, "Illegal source range [%s,%s]",<a name="line.96"></a>
+<span class="sourceLineNo">097</span>        baseMin, baseMax);<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>    Preconditions.checkArgument(limitMin 
&lt;= limitMax, "Illegal target range [%s,%s]",<a name="line.98"></a>
+<span class="sourceLineNo">099</span>        limitMin, limitMax);<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span>    Preconditions.checkArgument(valueIn 
&gt;= baseMin &amp;&amp; valueIn &lt;= baseMax,<a name="line.100"></a>
+<span class="sourceLineNo">101</span>        "Value %s must be within the 
range [%s,%s]", valueIn, baseMin, baseMax);<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    return ((limitMax - limitMin) * 
(valueIn - baseMin) / (baseMax - baseMin)) + limitMin;<a name="line.102"></a>
+<span class="sourceLineNo">103</span>  }<a name="line.103"></a>
+<span class="sourceLineNo">104</span>}<a name="line.104"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/505bbb2e/apidocs/src-html/org/apache/hadoop/hbase/client/locking/EntityLock.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/client/locking/EntityLock.html 
b/apidocs/src-html/org/apache/hadoop/hbase/client/locking/EntityLock.html
index 1115e91..21fcb44 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/client/locking/EntityLock.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/client/locking/EntityLock.html
@@ -31,11 +31,11 @@
 <span class="sourceLineNo">023</span>import java.util.concurrent.TimeUnit;<a 
name="line.23"></a>
 <span class="sourceLineNo">024</span>import 
java.util.concurrent.atomic.AtomicBoolean;<a name="line.24"></a>
 <span class="sourceLineNo">025</span><a name="line.25"></a>
-<span class="sourceLineNo">026</span>import org.apache.commons.logging.Log;<a 
name="line.26"></a>
-<span class="sourceLineNo">027</span>import 
org.apache.commons.logging.LogFactory;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.Abortable;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.30"></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.Abortable;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import org.slf4j.Logger;<a 
name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.slf4j.LoggerFactory;<a 
name="line.30"></a>
 <span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;<a name="line.31"></a>
 <span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.LockServiceProtos.LockHeartbeatRequest;<a
 name="line.32"></a>
 <span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.LockServiceProtos.LockHeartbeatResponse;<a
 name="line.33"></a>
@@ -89,7 +89,7 @@
 <span class="sourceLineNo">081</span> */<a name="line.81"></a>
 <span class="sourceLineNo">082</span>@InterfaceAudience.Public<a 
name="line.82"></a>
 <span class="sourceLineNo">083</span>public class EntityLock {<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>  private static final Log LOG = 
LogFactory.getLog(EntityLock.class);<a name="line.84"></a>
+<span class="sourceLineNo">084</span>  private static final Logger LOG = 
LoggerFactory.getLogger(EntityLock.class);<a name="line.84"></a>
 <span class="sourceLineNo">085</span><a name="line.85"></a>
 <span class="sourceLineNo">086</span>  public static final String 
HEARTBEAT_TIME_BUFFER =<a name="line.86"></a>
 <span class="sourceLineNo">087</span>      
"hbase.client.locks.heartbeat.time.buffer.ms";<a name="line.87"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/505bbb2e/apidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html
 
b/apidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html
index f79037e..5446e3c 100644
--- 
a/apidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html
+++ 
b/apidocs/src-html/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.html
@@ -38,13 +38,13 @@
 <span class="sourceLineNo">030</span>import java.util.TreeMap;<a 
name="line.30"></a>
 <span class="sourceLineNo">031</span>import java.util.regex.Pattern;<a 
name="line.31"></a>
 <span class="sourceLineNo">032</span><a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.commons.logging.Log;<a 
name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.commons.logging.LogFactory;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.ReplicationPeerNotFoundException;<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.yetus.audience.InterfaceAudience;<a name="line.39"></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.hbase.HConstants;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.ReplicationPeerNotFoundException;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.slf4j.Logger;<a 
name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.slf4j.LoggerFactory;<a 
name="line.39"></a>
 <span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.client.Admin;<a name="line.40"></a>
 <span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.41"></a>
 <span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.42"></a>
@@ -80,7 +80,7 @@
 <span class="sourceLineNo">072</span>@InterfaceAudience.Public<a 
name="line.72"></a>
 <span class="sourceLineNo">073</span>@Deprecated<a name="line.73"></a>
 <span class="sourceLineNo">074</span>public class ReplicationAdmin implements 
Closeable {<a name="line.74"></a>
-<span class="sourceLineNo">075</span>  private static final Log LOG = 
LogFactory.getLog(ReplicationAdmin.class);<a name="line.75"></a>
+<span class="sourceLineNo">075</span>  private static final Logger LOG = 
LoggerFactory.getLogger(ReplicationAdmin.class);<a name="line.75"></a>
 <span class="sourceLineNo">076</span><a name="line.76"></a>
 <span class="sourceLineNo">077</span>  public static final String TNAME = 
"tableName";<a name="line.77"></a>
 <span class="sourceLineNo">078</span>  public static final String CFNAME = 
"columnFamilyName";<a name="line.78"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/505bbb2e/apidocs/src-html/org/apache/hadoop/hbase/filter/ParseFilter.html
----------------------------------------------------------------------
diff --git a/apidocs/src-html/org/apache/hadoop/hbase/filter/ParseFilter.html 
b/apidocs/src-html/org/apache/hadoop/hbase/filter/ParseFilter.html
index 50a85d6..49de9ff 100644
--- a/apidocs/src-html/org/apache/hadoop/hbase/filter/ParseFilter.html
+++ b/apidocs/src-html/org/apache/hadoop/hbase/filter/ParseFilter.html
@@ -39,10 +39,10 @@
 <span class="sourceLineNo">031</span>import java.util.Set;<a 
name="line.31"></a>
 <span class="sourceLineNo">032</span>import java.util.Stack;<a 
name="line.32"></a>
 <span class="sourceLineNo">033</span><a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.commons.logging.Log;<a 
name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.commons.logging.LogFactory;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.CompareOperator;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.37"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.CompareOperator;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.slf4j.Logger;<a 
name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.slf4j.LoggerFactory;<a 
name="line.37"></a>
 <span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.filter.CompareFilter.CompareOp;<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><a name="line.40"></a>
@@ -57,7 +57,7 @@
 <span class="sourceLineNo">049</span> */<a name="line.49"></a>
 <span class="sourceLineNo">050</span>@InterfaceAudience.Public<a 
name="line.50"></a>
 <span class="sourceLineNo">051</span>public class ParseFilter {<a 
name="line.51"></a>
-<span class="sourceLineNo">052</span>  private static final Log LOG = 
LogFactory.getLog(ParseFilter.class);<a name="line.52"></a>
+<span class="sourceLineNo">052</span>  private static final Logger LOG = 
LoggerFactory.getLogger(ParseFilter.class);<a name="line.52"></a>
 <span class="sourceLineNo">053</span><a name="line.53"></a>
 <span class="sourceLineNo">054</span>  private static HashMap&lt;ByteBuffer, 
Integer&gt; operatorPrecedenceHashMap;<a name="line.54"></a>
 <span class="sourceLineNo">055</span>  private static HashMap&lt;String, 
String&gt; filterHashMap;<a name="line.55"></a>

Reply via email to