http://git-wip-us.apache.org/repos/asf/hbase-site/blob/2211f347/devapidocs/src-html/org/apache/hadoop/hbase/client/RegionServerCallable.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/RegionServerCallable.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/RegionServerCallable.html
index 2676565..40a7cc0 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/RegionServerCallable.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/RegionServerCallable.html
@@ -28,147 +28,132 @@
 <span class="sourceLineNo">020</span>package org.apache.hadoop.hbase.client;<a 
name="line.20"></a>
 <span class="sourceLineNo">021</span><a name="line.21"></a>
 <span class="sourceLineNo">022</span>import java.io.IOException;<a 
name="line.22"></a>
-<span class="sourceLineNo">023</span>import java.net.ConnectException;<a 
name="line.23"></a>
-<span class="sourceLineNo">024</span>import java.net.SocketTimeoutException;<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.hbase.HRegionInfo;<a name="line.28"></a>
-<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.HRegionLocation;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.NotServingRegionException;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.exceptions.RegionMovedException;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ClientService;<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><a name="line.36"></a>
-<span class="sourceLineNo">037</span>/**<a name="line.37"></a>
-<span class="sourceLineNo">038</span> * Implementations call a RegionServer 
and implement {@link #call(int)}.<a name="line.38"></a>
-<span class="sourceLineNo">039</span> * Passed to a {@link RpcRetryingCaller} 
so we retry on fail.<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * TODO: this class is actually tied to 
one region, because most of the paths make use of<a name="line.40"></a>
-<span class="sourceLineNo">041</span> *       the regioninfo part of location 
when building requests. The only reason it works for<a name="line.41"></a>
-<span class="sourceLineNo">042</span> *       multi-region requests (e.g. 
batch) is that they happen to not use the region parts.<a name="line.42"></a>
-<span class="sourceLineNo">043</span> *       This could be done cleaner (e.g. 
having a generic parameter and 2 derived classes,<a name="line.43"></a>
-<span class="sourceLineNo">044</span> *       RegionCallable and actual 
RegionServerCallable with ServerName.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * @param &lt;T&gt; the class that the 
ServerCallable handles<a name="line.45"></a>
-<span class="sourceLineNo">046</span> */<a name="line.46"></a>
-<span class="sourceLineNo">047</span>@InterfaceAudience.Private<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span>public abstract class 
RegionServerCallable&lt;T&gt; implements RetryingCallable&lt;T&gt; {<a 
name="line.48"></a>
-<span class="sourceLineNo">049</span>  // Public because used outside of this 
package over in ipc.<a name="line.49"></a>
-<span class="sourceLineNo">050</span>  private static final Log LOG = 
LogFactory.getLog(RegionServerCallable.class);<a name="line.50"></a>
-<span class="sourceLineNo">051</span>  protected final Connection 
connection;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>  protected final TableName tableName;<a 
name="line.52"></a>
-<span class="sourceLineNo">053</span>  protected final byte[] row;<a 
name="line.53"></a>
-<span class="sourceLineNo">054</span>  protected HRegionLocation location;<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span>  private ClientService.BlockingInterface 
stub;<a name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span>  protected final static int 
MIN_WAIT_DEAD_SERVER = 10000;<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>  /**<a name="line.59"></a>
-<span class="sourceLineNo">060</span>   * @param connection Connection to 
use.<a name="line.60"></a>
-<span class="sourceLineNo">061</span>   * @param tableName Table name to which 
&lt;code&gt;row&lt;/code&gt; belongs.<a name="line.61"></a>
-<span class="sourceLineNo">062</span>   * @param row The row we want in 
&lt;code&gt;tableName&lt;/code&gt;.<a name="line.62"></a>
-<span class="sourceLineNo">063</span>   */<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  public RegionServerCallable(Connection 
connection, TableName tableName, byte [] row) {<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    this.connection = connection;<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span>    this.tableName = tableName;<a 
name="line.66"></a>
-<span class="sourceLineNo">067</span>    this.row = row;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>  }<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>  /**<a name="line.70"></a>
-<span class="sourceLineNo">071</span>   * Prepare for connection to the server 
hosting region with row from tablename.  Does lookup<a name="line.71"></a>
-<span class="sourceLineNo">072</span>   * to find region location and hosting 
server.<a name="line.72"></a>
-<span class="sourceLineNo">073</span>   * @param reload Set this to true if 
connection should re-find the region<a name="line.73"></a>
-<span class="sourceLineNo">074</span>   * @throws IOException e<a 
name="line.74"></a>
-<span class="sourceLineNo">075</span>   */<a name="line.75"></a>
-<span class="sourceLineNo">076</span>  @Override<a name="line.76"></a>
-<span class="sourceLineNo">077</span>  public void prepare(final boolean 
reload) throws IOException {<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    try (RegionLocator regionLocator = 
connection.getRegionLocator(tableName)) {<a name="line.78"></a>
-<span class="sourceLineNo">079</span>      this.location = 
regionLocator.getRegionLocation(row, reload);<a name="line.79"></a>
+<span class="sourceLineNo">023</span><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.hbase.HRegionInfo;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import 
org.apache.hadoop.hbase.HRegionLocation;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.classification.InterfaceAudience;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ClientService;<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><a name="line.32"></a>
+<span class="sourceLineNo">033</span>/**<a name="line.33"></a>
+<span class="sourceLineNo">034</span> * Implementations call a RegionServer 
and implement {@link #call(int)}.<a name="line.34"></a>
+<span class="sourceLineNo">035</span> * Passed to a {@link RpcRetryingCaller} 
so we retry on fail.<a name="line.35"></a>
+<span class="sourceLineNo">036</span> * TODO: this class is actually tied to 
one region, because most of the paths make use of<a name="line.36"></a>
+<span class="sourceLineNo">037</span> *       the regioninfo part of location 
when building requests. The only reason it works for<a name="line.37"></a>
+<span class="sourceLineNo">038</span> *       multi-region requests (e.g. 
batch) is that they happen to not use the region parts.<a name="line.38"></a>
+<span class="sourceLineNo">039</span> *       This could be done cleaner (e.g. 
having a generic parameter and 2 derived classes,<a name="line.39"></a>
+<span class="sourceLineNo">040</span> *       RegionCallable and actual 
RegionServerCallable with ServerName.<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * @param &lt;T&gt; the class that the 
ServerCallable handles<a name="line.41"></a>
+<span class="sourceLineNo">042</span> */<a name="line.42"></a>
+<span class="sourceLineNo">043</span>@InterfaceAudience.Private<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>public abstract class 
RegionServerCallable&lt;T&gt; implements RetryingCallable&lt;T&gt; {<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>  // Public because used outside of this 
package over in ipc.<a name="line.45"></a>
+<span class="sourceLineNo">046</span>  private static final Log LOG = 
LogFactory.getLog(RegionServerCallable.class);<a name="line.46"></a>
+<span class="sourceLineNo">047</span>  protected final Connection 
connection;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>  protected final TableName tableName;<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>  protected final byte[] row;<a 
name="line.49"></a>
+<span class="sourceLineNo">050</span>  protected HRegionLocation location;<a 
name="line.50"></a>
+<span class="sourceLineNo">051</span>  private ClientService.BlockingInterface 
stub;<a name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>  protected final static int 
MIN_WAIT_DEAD_SERVER = 10000;<a name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>  /**<a name="line.55"></a>
+<span class="sourceLineNo">056</span>   * @param connection Connection to 
use.<a name="line.56"></a>
+<span class="sourceLineNo">057</span>   * @param tableName Table name to which 
&lt;code&gt;row&lt;/code&gt; belongs.<a name="line.57"></a>
+<span class="sourceLineNo">058</span>   * @param row The row we want in 
&lt;code&gt;tableName&lt;/code&gt;.<a name="line.58"></a>
+<span class="sourceLineNo">059</span>   */<a name="line.59"></a>
+<span class="sourceLineNo">060</span>  public RegionServerCallable(Connection 
connection, TableName tableName, byte [] row) {<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    this.connection = connection;<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>    this.tableName = tableName;<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span>    this.row = row;<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>  /**<a name="line.66"></a>
+<span class="sourceLineNo">067</span>   * Prepare for connection to the server 
hosting region with row from tablename.  Does lookup<a name="line.67"></a>
+<span class="sourceLineNo">068</span>   * to find region location and hosting 
server.<a name="line.68"></a>
+<span class="sourceLineNo">069</span>   * @param reload Set this to true if 
connection should re-find the region<a name="line.69"></a>
+<span class="sourceLineNo">070</span>   * @throws IOException e<a 
name="line.70"></a>
+<span class="sourceLineNo">071</span>   */<a name="line.71"></a>
+<span class="sourceLineNo">072</span>  @Override<a name="line.72"></a>
+<span class="sourceLineNo">073</span>  public void prepare(final boolean 
reload) throws IOException {<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    try (RegionLocator regionLocator = 
connection.getRegionLocator(tableName)) {<a name="line.74"></a>
+<span class="sourceLineNo">075</span>      this.location = 
regionLocator.getRegionLocation(row, reload);<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    }<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    if (this.location == null) {<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>      throw new IOException("Failed to 
find location, tableName=" + tableName +<a name="line.78"></a>
+<span class="sourceLineNo">079</span>        ", row=" + Bytes.toString(row) + 
", reload=" + reload);<a name="line.79"></a>
 <span class="sourceLineNo">080</span>    }<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    if (this.location == null) {<a 
name="line.81"></a>
-<span class="sourceLineNo">082</span>      throw new IOException("Failed to 
find location, tableName=" + tableName +<a name="line.82"></a>
-<span class="sourceLineNo">083</span>        ", row=" + Bytes.toString(row) + 
", reload=" + reload);<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    }<a name="line.84"></a>
-<span class="sourceLineNo">085</span>    
setStub(getConnection().getClient(this.location.getServerName()));<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span>  }<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span>  /**<a name="line.88"></a>
-<span class="sourceLineNo">089</span>   * @return {@link HConnection} instance 
used by this Callable.<a name="line.89"></a>
-<span class="sourceLineNo">090</span>   */<a name="line.90"></a>
-<span class="sourceLineNo">091</span>  HConnection getConnection() {<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span>    return (HConnection) 
this.connection;<a name="line.92"></a>
+<span class="sourceLineNo">081</span>    
setStub(getConnection().getClient(this.location.getServerName()));<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>  }<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span>  /**<a name="line.84"></a>
+<span class="sourceLineNo">085</span>   * @return {@link HConnection} instance 
used by this Callable.<a name="line.85"></a>
+<span class="sourceLineNo">086</span>   */<a name="line.86"></a>
+<span class="sourceLineNo">087</span>  HConnection getConnection() {<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>    return (HConnection) 
this.connection;<a name="line.88"></a>
+<span class="sourceLineNo">089</span>  }<a name="line.89"></a>
+<span class="sourceLineNo">090</span><a name="line.90"></a>
+<span class="sourceLineNo">091</span>  protected 
ClientService.BlockingInterface getStub() {<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    return this.stub;<a 
name="line.92"></a>
 <span class="sourceLineNo">093</span>  }<a name="line.93"></a>
 <span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span>  protected 
ClientService.BlockingInterface getStub() {<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    return this.stub;<a 
name="line.96"></a>
+<span class="sourceLineNo">095</span>  void setStub(final 
ClientService.BlockingInterface stub) {<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    this.stub = stub;<a 
name="line.96"></a>
 <span class="sourceLineNo">097</span>  }<a name="line.97"></a>
 <span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span>  void setStub(final 
ClientService.BlockingInterface stub) {<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    this.stub = stub;<a 
name="line.100"></a>
+<span class="sourceLineNo">099</span>  protected HRegionLocation getLocation() 
{<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    return this.location;<a 
name="line.100"></a>
 <span class="sourceLineNo">101</span>  }<a name="line.101"></a>
 <span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span>  protected HRegionLocation getLocation() 
{<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    return this.location;<a 
name="line.104"></a>
+<span class="sourceLineNo">103</span>  protected void setLocation(final 
HRegionLocation location) {<a name="line.103"></a>
+<span class="sourceLineNo">104</span>    this.location = location;<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>  protected void setLocation(final 
HRegionLocation location) {<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    this.location = location;<a 
name="line.108"></a>
+<span class="sourceLineNo">107</span>  public TableName getTableName() {<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>    return this.tableName;<a 
name="line.108"></a>
 <span class="sourceLineNo">109</span>  }<a name="line.109"></a>
 <span class="sourceLineNo">110</span><a name="line.110"></a>
-<span class="sourceLineNo">111</span>  public TableName getTableName() {<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>    return this.tableName;<a 
name="line.112"></a>
+<span class="sourceLineNo">111</span>  public byte [] getRow() {<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>    return this.row;<a 
name="line.112"></a>
 <span class="sourceLineNo">113</span>  }<a name="line.113"></a>
 <span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span>  public byte [] getRow() {<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>    return this.row;<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>  }<a name="line.117"></a>
-<span class="sourceLineNo">118</span><a name="line.118"></a>
-<span class="sourceLineNo">119</span>  @Override<a name="line.119"></a>
-<span class="sourceLineNo">120</span>  public void throwable(Throwable t, 
boolean retrying) {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>    if (t instanceof 
SocketTimeoutException ||<a name="line.121"></a>
-<span class="sourceLineNo">122</span>        t instanceof ConnectException 
||<a name="line.122"></a>
-<span class="sourceLineNo">123</span>        t instanceof 
RetriesExhaustedException ||<a name="line.123"></a>
-<span class="sourceLineNo">124</span>        (location != null &amp;&amp; 
getConnection().isDeadServer(location.getServerName()))) {<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>      // if thrown these exceptions, we 
clear all the cache entries that<a name="line.125"></a>
-<span class="sourceLineNo">126</span>      // map to that slow/dead server; 
otherwise, let cache miss and ask<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      // hbase:meta again to find the new 
location<a name="line.127"></a>
-<span class="sourceLineNo">128</span>      if (this.location != null) 
getConnection().clearCaches(location.getServerName());<a name="line.128"></a>
-<span class="sourceLineNo">129</span>    } else if (t instanceof 
RegionMovedException) {<a name="line.129"></a>
-<span class="sourceLineNo">130</span>      
getConnection().updateCachedLocations(tableName, row, t, location);<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>    } else if (t instanceof 
NotServingRegionException &amp;&amp; !retrying) {<a name="line.131"></a>
-<span class="sourceLineNo">132</span>      // Purge cache entries for this 
specific region from hbase:meta cache<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      // since we don't call 
connect(true) when number of retries is 1.<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      
getConnection().deleteCachedRegionLocation(location);<a name="line.134"></a>
+<span class="sourceLineNo">115</span>  @Override<a name="line.115"></a>
+<span class="sourceLineNo">116</span>  public void throwable(Throwable t, 
boolean retrying) {<a name="line.116"></a>
+<span class="sourceLineNo">117</span>    if (location != null) {<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>      
getConnection().updateCachedLocations(tableName, 
location.getRegionInfo().getRegionName(),<a name="line.118"></a>
+<span class="sourceLineNo">119</span>          row, t, 
location.getServerName());<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    }<a name="line.120"></a>
+<span class="sourceLineNo">121</span>  }<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span>  @Override<a name="line.123"></a>
+<span class="sourceLineNo">124</span>  public String 
getExceptionMessageAdditionalDetail() {<a name="line.124"></a>
+<span class="sourceLineNo">125</span>    return "row '" + Bytes.toString(row) 
+ "' on table '" + tableName + "' at " + location;<a name="line.125"></a>
+<span class="sourceLineNo">126</span>  }<a name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span>  @Override<a name="line.128"></a>
+<span class="sourceLineNo">129</span>  public long sleep(long pause, int 
tries) {<a name="line.129"></a>
+<span class="sourceLineNo">130</span>    // Tries hasn't been bumped up yet so 
we use "tries + 1" to get right pause time<a name="line.130"></a>
+<span class="sourceLineNo">131</span>    long sleep = 
ConnectionUtils.getPauseTime(pause, tries + 1);<a name="line.131"></a>
+<span class="sourceLineNo">132</span>    if (sleep &lt; MIN_WAIT_DEAD_SERVER<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>        &amp;&amp; (location == null || 
getConnection().isDeadServer(location.getServerName()))) {<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>      sleep = 
ConnectionUtils.addJitter(MIN_WAIT_DEAD_SERVER, 0.10f);<a name="line.134"></a>
 <span class="sourceLineNo">135</span>    }<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>  @Override<a name="line.138"></a>
-<span class="sourceLineNo">139</span>  public String 
getExceptionMessageAdditionalDetail() {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    return "row '" + Bytes.toString(row) 
+ "' on table '" + tableName + "' at " + location;<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>  @Override<a name="line.143"></a>
-<span class="sourceLineNo">144</span>  public long sleep(long pause, int 
tries) {<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    // Tries hasn't been bumped up yet so 
we use "tries + 1" to get right pause time<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    long sleep = 
ConnectionUtils.getPauseTime(pause, tries + 1);<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    if (sleep &lt; MIN_WAIT_DEAD_SERVER<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span>        &amp;&amp; (location == null || 
getConnection().isDeadServer(location.getServerName()))) {<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>      sleep = 
ConnectionUtils.addJitter(MIN_WAIT_DEAD_SERVER, 0.10f);<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    }<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    return sleep;<a name="line.151"></a>
-<span class="sourceLineNo">152</span>  }<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>   * @return the HRegionInfo for the 
current region<a name="line.155"></a>
-<span class="sourceLineNo">156</span>   */<a name="line.156"></a>
-<span class="sourceLineNo">157</span>  public HRegionInfo getHRegionInfo() {<a 
name="line.157"></a>
-<span class="sourceLineNo">158</span>    if (this.location == null) {<a 
name="line.158"></a>
-<span class="sourceLineNo">159</span>      return null;<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    }<a name="line.160"></a>
-<span class="sourceLineNo">161</span>    return 
this.location.getRegionInfo();<a name="line.161"></a>
-<span class="sourceLineNo">162</span>  }<a name="line.162"></a>
-<span class="sourceLineNo">163</span>}<a name="line.163"></a>
+<span class="sourceLineNo">136</span>    return sleep;<a name="line.136"></a>
+<span class="sourceLineNo">137</span>  }<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>   * @return the HRegionInfo for the 
current region<a name="line.140"></a>
+<span class="sourceLineNo">141</span>   */<a name="line.141"></a>
+<span class="sourceLineNo">142</span>  public HRegionInfo getHRegionInfo() {<a 
name="line.142"></a>
+<span class="sourceLineNo">143</span>    if (this.location == null) {<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span>      return null;<a name="line.144"></a>
+<span class="sourceLineNo">145</span>    }<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    return 
this.location.getRegionInfo();<a name="line.146"></a>
+<span class="sourceLineNo">147</span>  }<a name="line.147"></a>
+<span class="sourceLineNo">148</span>}<a name="line.148"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/2211f347/devapidocs/src-html/org/apache/hadoop/hbase/client/ResultStatsUtil.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ResultStatsUtil.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ResultStatsUtil.html
index 44ec921..22450fd 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/ResultStatsUtil.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/ResultStatsUtil.html
@@ -63,25 +63,29 @@
 <span class="sourceLineNo">055</span>      return r;<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>    if (regionName != null) {<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span>      
serverStats.updateRegionStats(server, regionName, stats);<a name="line.59"></a>
-<span class="sourceLineNo">060</span>    }<a name="line.60"></a>
+<span class="sourceLineNo">058</span>    updateStats(serverStats, server, 
regionName, stats);<a name="line.58"></a>
+<span class="sourceLineNo">059</span>    return r;<a name="line.59"></a>
+<span class="sourceLineNo">060</span>  }<a name="line.60"></a>
 <span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>    return r;<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>  public static &lt;T&gt; T updateStats(T 
r, ServerStatisticTracker stats,<a name="line.65"></a>
-<span class="sourceLineNo">066</span>      HRegionLocation regionLocation) {<a 
name="line.66"></a>
-<span class="sourceLineNo">067</span>    byte[] regionName = null;<a 
name="line.67"></a>
-<span class="sourceLineNo">068</span>    ServerName server = null;<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>    if (regionLocation != null) {<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span>      server = 
regionLocation.getServerName();<a name="line.70"></a>
-<span class="sourceLineNo">071</span>      regionName = 
regionLocation.getRegionInfo().getRegionName();<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    }<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span>    return updateStats(r, stats, server, 
regionName);<a name="line.74"></a>
-<span class="sourceLineNo">075</span>  }<a name="line.75"></a>
-<span class="sourceLineNo">076</span>}<a name="line.76"></a>
+<span class="sourceLineNo">062</span>  public static void 
updateStats(StatisticTrackable tracker, ServerName server, byte[] regionName,<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span>    ClientProtos.RegionLoadStats stats) 
{<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    if (regionName != null &amp;&amp; 
stats != null &amp;&amp; tracker != null) {<a name="line.64"></a>
+<span class="sourceLineNo">065</span>      tracker.updateRegionStats(server, 
regionName, stats);<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    }<a name="line.66"></a>
+<span class="sourceLineNo">067</span>  }<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span>  public static &lt;T&gt; T updateStats(T 
r, ServerStatisticTracker stats,<a name="line.69"></a>
+<span class="sourceLineNo">070</span>      HRegionLocation regionLocation) {<a 
name="line.70"></a>
+<span class="sourceLineNo">071</span>    byte[] regionName = null;<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>    ServerName server = null;<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span>    if (regionLocation != null) {<a 
name="line.73"></a>
+<span class="sourceLineNo">074</span>      server = 
regionLocation.getServerName();<a name="line.74"></a>
+<span class="sourceLineNo">075</span>      regionName = 
regionLocation.getRegionInfo().getRegionName();<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    }<a name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span>    return updateStats(r, stats, server, 
regionName);<a name="line.78"></a>
+<span class="sourceLineNo">079</span>  }<a name="line.79"></a>
+<span class="sourceLineNo">080</span>}<a name="line.80"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/2211f347/devapidocs/src-html/org/apache/hadoop/hbase/client/RetryingTimeTracker.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/RetryingTimeTracker.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/RetryingTimeTracker.html
new file mode 100644
index 0000000..b458946
--- /dev/null
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/RetryingTimeTracker.html
@@ -0,0 +1,129 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<html lang="en">
+<head>
+<title>Source code</title>
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" 
title="Style">
+</head>
+<body>
+<div class="sourceContainer">
+<pre><span class="sourceLineNo">001</span>/*<a name="line.1"></a>
+<span class="sourceLineNo">002</span> * Licensed to the Apache Software 
Foundation (ASF) under one or more<a name="line.2"></a>
+<span class="sourceLineNo">003</span> * contributor license agreements.  See 
the NOTICE file distributed with<a name="line.3"></a>
+<span class="sourceLineNo">004</span> * this work for additional information 
regarding copyright ownership.<a name="line.4"></a>
+<span class="sourceLineNo">005</span> * The ASF licenses this file to you 
under the Apache License, Version 2.0<a name="line.5"></a>
+<span class="sourceLineNo">006</span> * (the "License"); you may not use this 
file except in compliance with<a name="line.6"></a>
+<span class="sourceLineNo">007</span> * the License.  You may obtain a copy of 
the License at<a name="line.7"></a>
+<span class="sourceLineNo">008</span> *<a name="line.8"></a>
+<span class="sourceLineNo">009</span> * 
http://www.apache.org/licenses/LICENSE-2.0<a name="line.9"></a>
+<span class="sourceLineNo">010</span> *<a name="line.10"></a>
+<span class="sourceLineNo">011</span> * Unless required by applicable law or 
agreed to in writing, software<a name="line.11"></a>
+<span class="sourceLineNo">012</span> * distributed under the License is 
distributed on an "AS IS" BASIS,<a name="line.12"></a>
+<span class="sourceLineNo">013</span> * WITHOUT WARRANTIES OR CONDITIONS OF 
ANY KIND, either express or implied.<a name="line.13"></a>
+<span class="sourceLineNo">014</span> * See the License for the specific 
language governing permissions and<a name="line.14"></a>
+<span class="sourceLineNo">015</span> * limitations under the License.<a 
name="line.15"></a>
+<span class="sourceLineNo">016</span> */<a name="line.16"></a>
+<span class="sourceLineNo">017</span>package org.apache.hadoop.hbase.client;<a 
name="line.17"></a>
+<span class="sourceLineNo">018</span><a name="line.18"></a>
+<span class="sourceLineNo">019</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.19"></a>
+<span class="sourceLineNo">020</span><a name="line.20"></a>
+<span class="sourceLineNo">021</span>/**<a name="line.21"></a>
+<span class="sourceLineNo">022</span> * Tracks the amount of time remaining 
for an operation.<a name="line.22"></a>
+<span class="sourceLineNo">023</span> */<a name="line.23"></a>
+<span class="sourceLineNo">024</span>class RetryingTimeTracker {<a 
name="line.24"></a>
+<span class="sourceLineNo">025</span><a name="line.25"></a>
+<span class="sourceLineNo">026</span>  private long globalStartTime = -1;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span><a name="line.27"></a>
+<span class="sourceLineNo">028</span>  public void start() {<a 
name="line.28"></a>
+<span class="sourceLineNo">029</span>    if (this.globalStartTime &lt; 0) {<a 
name="line.29"></a>
+<span class="sourceLineNo">030</span>      this.globalStartTime = 
EnvironmentEdgeManager.currentTime();<a name="line.30"></a>
+<span class="sourceLineNo">031</span>    }<a name="line.31"></a>
+<span class="sourceLineNo">032</span>  }<a name="line.32"></a>
+<span class="sourceLineNo">033</span><a name="line.33"></a>
+<span class="sourceLineNo">034</span>  public int getRemainingTime(int 
callTimeout) {<a name="line.34"></a>
+<span class="sourceLineNo">035</span>    if (callTimeout &lt;= 0) {<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span>      return 0;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>    } else {<a name="line.37"></a>
+<span class="sourceLineNo">038</span>      if (callTimeout == 
Integer.MAX_VALUE) {<a name="line.38"></a>
+<span class="sourceLineNo">039</span>        return Integer.MAX_VALUE;<a 
name="line.39"></a>
+<span class="sourceLineNo">040</span>      }<a name="line.40"></a>
+<span class="sourceLineNo">041</span>      int remainingTime = (int) (<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span>        callTimeout -<a 
name="line.42"></a>
+<span class="sourceLineNo">043</span>        
(EnvironmentEdgeManager.currentTime() - this.globalStartTime));<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>      if (remainingTime &lt; 1) {<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>        // If there is no time left, 
we're trying anyway. It's too late.<a name="line.45"></a>
+<span class="sourceLineNo">046</span>        // 0 means no timeout, and it's 
not the intent here. So we secure both cases by<a name="line.46"></a>
+<span class="sourceLineNo">047</span>        // resetting to the minimum.<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>        remainingTime = 1;<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>      }<a name="line.49"></a>
+<span class="sourceLineNo">050</span>      return remainingTime;<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><a name="line.53"></a>
+<span class="sourceLineNo">054</span>  public long getStartTime() {<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span>    return this.globalStartTime;<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>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/2211f347/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerFactory.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerFactory.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerFactory.html
index 513d211..25c61a7 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerFactory.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerFactory.html
@@ -75,43 +75,37 @@
 <span class="sourceLineNo">067</span>    //  is cheap as it does not require 
parsing a complex structure.<a name="line.67"></a>
 <span class="sourceLineNo">068</span>    RpcRetryingCaller&lt;T&gt; caller = 
new RpcRetryingCallerImpl&lt;T&gt;(pause, retries, interceptor,<a 
name="line.68"></a>
 <span class="sourceLineNo">069</span>        startLogErrorsCnt);<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span>    // wrap it with stats, if we are 
tracking them<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    if (enableBackPressure &amp;&amp; 
this.stats != null) {<a name="line.72"></a>
-<span class="sourceLineNo">073</span>      caller = new 
StatsTrackingRpcRetryingCaller&lt;T&gt;(caller, this.stats);<a 
name="line.73"></a>
-<span class="sourceLineNo">074</span>    }<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span>    return caller;<a name="line.76"></a>
-<span class="sourceLineNo">077</span>  }<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span>  public static RpcRetryingCallerFactory 
instantiate(Configuration configuration) {<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    return instantiate(configuration, 
RetryingCallerInterceptorFactory.NO_OP_INTERCEPTOR, null);<a name="line.80"></a>
-<span class="sourceLineNo">081</span>  }<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span>  public static RpcRetryingCallerFactory 
instantiate(Configuration configuration,<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      ServerStatisticTracker stats) {<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>    return instantiate(configuration, 
RetryingCallerInterceptorFactory.NO_OP_INTERCEPTOR, stats);<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span>  }<a name="line.86"></a>
-<span class="sourceLineNo">087</span><a name="line.87"></a>
-<span class="sourceLineNo">088</span>  public static RpcRetryingCallerFactory 
instantiate(Configuration configuration,<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      RetryingCallerInterceptor 
interceptor, ServerStatisticTracker stats) {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    String clazzName = 
RpcRetryingCallerFactory.class.getName();<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    String rpcCallerFactoryClazz =<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span>        
configuration.get(RpcRetryingCallerFactory.CUSTOM_CALLER_CONF_KEY, 
clazzName);<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    RpcRetryingCallerFactory factory;<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>    if 
(rpcCallerFactoryClazz.equals(clazzName)) {<a name="line.94"></a>
-<span class="sourceLineNo">095</span>      factory = new 
RpcRetryingCallerFactory(configuration, interceptor);<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    } else {<a name="line.96"></a>
-<span class="sourceLineNo">097</span>      factory = 
ReflectionUtils.instantiateWithCustomCtor(<a name="line.97"></a>
-<span class="sourceLineNo">098</span>          rpcCallerFactoryClazz, new 
Class[] { Configuration.class },<a name="line.98"></a>
-<span class="sourceLineNo">099</span>          new Object[] { configuration 
});<a name="line.99"></a>
-<span class="sourceLineNo">100</span>    }<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
-<span class="sourceLineNo">102</span>    // setting for backwards compat with 
existing caller factories, rather than in the ctor<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    factory.setStatisticTracker(stats);<a 
name="line.103"></a>
-<span class="sourceLineNo">104</span>    return factory;<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">070</span>    return caller;<a name="line.70"></a>
+<span class="sourceLineNo">071</span>  }<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span>  public static RpcRetryingCallerFactory 
instantiate(Configuration configuration) {<a name="line.73"></a>
+<span class="sourceLineNo">074</span>    return instantiate(configuration, 
RetryingCallerInterceptorFactory.NO_OP_INTERCEPTOR, null);<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  }<a name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span>  public static RpcRetryingCallerFactory 
instantiate(Configuration configuration,<a name="line.77"></a>
+<span class="sourceLineNo">078</span>      ServerStatisticTracker stats) {<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>    return instantiate(configuration, 
RetryingCallerInterceptorFactory.NO_OP_INTERCEPTOR, stats);<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>  }<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span>  public static RpcRetryingCallerFactory 
instantiate(Configuration configuration,<a name="line.82"></a>
+<span class="sourceLineNo">083</span>      RetryingCallerInterceptor 
interceptor, ServerStatisticTracker stats) {<a name="line.83"></a>
+<span class="sourceLineNo">084</span>    String clazzName = 
RpcRetryingCallerFactory.class.getName();<a name="line.84"></a>
+<span class="sourceLineNo">085</span>    String rpcCallerFactoryClazz =<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>        
configuration.get(RpcRetryingCallerFactory.CUSTOM_CALLER_CONF_KEY, 
clazzName);<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    RpcRetryingCallerFactory factory;<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>    if 
(rpcCallerFactoryClazz.equals(clazzName)) {<a name="line.88"></a>
+<span class="sourceLineNo">089</span>      factory = new 
RpcRetryingCallerFactory(configuration, interceptor);<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    } else {<a name="line.90"></a>
+<span class="sourceLineNo">091</span>      factory = 
ReflectionUtils.instantiateWithCustomCtor(<a name="line.91"></a>
+<span class="sourceLineNo">092</span>          rpcCallerFactoryClazz, new 
Class[] { Configuration.class },<a name="line.92"></a>
+<span class="sourceLineNo">093</span>          new Object[] { configuration 
});<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    }<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span>    // setting for backwards compat with 
existing caller factories, rather than in the ctor<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    factory.setStatisticTracker(stats);<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>    return factory;<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/2211f347/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.html
index 3aaa29e..23144ac 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.html
@@ -59,190 +59,170 @@
 <span class="sourceLineNo">051</span>public class 
RpcRetryingCallerImpl&lt;T&gt; implements RpcRetryingCaller&lt;T&gt; {<a 
name="line.51"></a>
 <span class="sourceLineNo">052</span>  // LOG is being used in 
TestMultiRowRangeFilter, hence leaving it public<a name="line.52"></a>
 <span class="sourceLineNo">053</span>  public static final Log LOG = 
LogFactory.getLog(RpcRetryingCallerImpl.class);<a name="line.53"></a>
-<span class="sourceLineNo">054</span>  /**<a name="line.54"></a>
-<span class="sourceLineNo">055</span>   * When we started making calls.<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>   */<a name="line.56"></a>
-<span class="sourceLineNo">057</span>  private long globalStartTime;<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>  /** How many retries are allowed before 
we start to log */<a name="line.59"></a>
-<span class="sourceLineNo">060</span>  private final int startLogErrorsCnt;<a 
name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>  private final long pause;<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span>  private final int maxAttempts;// how 
many times to try<a name="line.63"></a>
-<span class="sourceLineNo">064</span>  private final AtomicBoolean cancelled = 
new AtomicBoolean(false);<a name="line.64"></a>
-<span class="sourceLineNo">065</span>  private final RetryingCallerInterceptor 
interceptor;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  private final 
RetryingCallerInterceptorContext context;<a name="line.66"></a>
-<span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span>  public RpcRetryingCallerImpl(long 
pause, int retries, int startLogErrorsCnt) {<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    this(pause, retries, 
RetryingCallerInterceptorFactory.NO_OP_INTERCEPTOR, startLogErrorsCnt);<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span>  }<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  <a name="line.71"></a>
-<span class="sourceLineNo">072</span>  public RpcRetryingCallerImpl(long 
pause, int retries,<a name="line.72"></a>
-<span class="sourceLineNo">073</span>      RetryingCallerInterceptor 
interceptor, int startLogErrorsCnt) {<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    this.pause = pause;<a 
name="line.74"></a>
-<span class="sourceLineNo">075</span>    this.maxAttempts = retries + 1;<a 
name="line.75"></a>
-<span class="sourceLineNo">076</span>    this.interceptor = interceptor;<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>    context = 
interceptor.createEmptyContext();<a name="line.77"></a>
-<span class="sourceLineNo">078</span>    this.startLogErrorsCnt = 
startLogErrorsCnt;<a name="line.78"></a>
-<span class="sourceLineNo">079</span>  }<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span>  private int getRemainingTime(int 
callTimeout) {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    if (callTimeout &lt;= 0) {<a 
name="line.82"></a>
-<span class="sourceLineNo">083</span>      return 0;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>    } else {<a name="line.84"></a>
-<span class="sourceLineNo">085</span>      if (callTimeout == 
Integer.MAX_VALUE) return Integer.MAX_VALUE;<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      int remainingTime = (int) 
(callTimeout -<a name="line.86"></a>
-<span class="sourceLineNo">087</span>          
(EnvironmentEdgeManager.currentTime() - this.globalStartTime));<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>      if (remainingTime &lt; 1) {<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span>        // If there is no time left, 
we're trying anyway. It's too late.<a name="line.89"></a>
-<span class="sourceLineNo">090</span>        // 0 means no timeout, and it's 
not the intent here. So we secure both cases by<a name="line.90"></a>
-<span class="sourceLineNo">091</span>        // resetting to the minimum.<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span>        remainingTime = 1;<a 
name="line.92"></a>
-<span class="sourceLineNo">093</span>      }<a name="line.93"></a>
-<span class="sourceLineNo">094</span>      return remainingTime;<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>  @Override<a name="line.98"></a>
-<span class="sourceLineNo">099</span>  public void cancel(){<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>    cancelled.set(true);<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>    synchronized (cancelled){<a 
name="line.101"></a>
-<span class="sourceLineNo">102</span>      cancelled.notifyAll();<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>    }<a name="line.103"></a>
-<span class="sourceLineNo">104</span>  }<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span>  @Override<a name="line.106"></a>
-<span class="sourceLineNo">107</span>  public T 
callWithRetries(RetryingCallable&lt;T&gt; callable, int callTimeout)<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>  throws IOException, RuntimeException 
{<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    
List&lt;RetriesExhaustedException.ThrowableWithExtraContext&gt; exceptions =<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>      new 
ArrayList&lt;RetriesExhaustedException.ThrowableWithExtraContext&gt;();<a 
name="line.110"></a>
-<span class="sourceLineNo">111</span>    this.globalStartTime = 
EnvironmentEdgeManager.currentTime();<a name="line.111"></a>
-<span class="sourceLineNo">112</span>    context.clear();<a 
name="line.112"></a>
-<span class="sourceLineNo">113</span>    for (int tries = 0;; tries++) {<a 
name="line.113"></a>
-<span class="sourceLineNo">114</span>      long expectedSleep;<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>      try {<a name="line.115"></a>
-<span class="sourceLineNo">116</span>        callable.prepare(tries != 0); // 
if called with false, check table status on ZK<a name="line.116"></a>
-<span class="sourceLineNo">117</span>        
interceptor.intercept(context.prepare(callable, tries));<a name="line.117"></a>
-<span class="sourceLineNo">118</span>        return 
callable.call(getRemainingTime(callTimeout));<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      } catch 
(PreemptiveFastFailException e) {<a name="line.119"></a>
-<span class="sourceLineNo">120</span>        throw e;<a name="line.120"></a>
-<span class="sourceLineNo">121</span>      } catch (Throwable t) {<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span>        
ExceptionUtil.rethrowIfInterrupt(t);<a name="line.122"></a>
-<span class="sourceLineNo">123</span>        if (tries &gt; startLogErrorsCnt) 
{<a name="line.123"></a>
-<span class="sourceLineNo">124</span>          LOG.info("Call exception, 
tries=" + tries + ", maxAttempts=" + maxAttempts + ", started="<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>              + 
(EnvironmentEdgeManager.currentTime() - this.globalStartTime) + " ms ago, "<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>              + "cancelled=" + 
cancelled.get() + ", msg="<a name="line.126"></a>
-<span class="sourceLineNo">127</span>              + 
callable.getExceptionMessageAdditionalDetail());<a name="line.127"></a>
-<span class="sourceLineNo">128</span>        }<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>        // translateException throws 
exception when should not retry: i.e. when request is bad.<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>        
interceptor.handleFailure(context, t);<a name="line.131"></a>
-<span class="sourceLineNo">132</span>        t = translateException(t);<a 
name="line.132"></a>
-<span class="sourceLineNo">133</span>        callable.throwable(t, maxAttempts 
!= 1);<a name="line.133"></a>
-<span class="sourceLineNo">134</span>        
RetriesExhaustedException.ThrowableWithExtraContext qt =<a name="line.134"></a>
-<span class="sourceLineNo">135</span>            new 
RetriesExhaustedException.ThrowableWithExtraContext(t,<a name="line.135"></a>
-<span class="sourceLineNo">136</span>                
EnvironmentEdgeManager.currentTime(), toString());<a name="line.136"></a>
-<span class="sourceLineNo">137</span>        exceptions.add(qt);<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span>        if (tries &gt;= maxAttempts - 1) 
{<a name="line.138"></a>
-<span class="sourceLineNo">139</span>          throw new 
RetriesExhaustedException(tries, exceptions);<a name="line.139"></a>
-<span class="sourceLineNo">140</span>        }<a name="line.140"></a>
-<span class="sourceLineNo">141</span>        // If the server is dead, we need 
to wait a little before retrying, to give<a name="line.141"></a>
-<span class="sourceLineNo">142</span>        //  a chance to the regions to 
be<a name="line.142"></a>
-<span class="sourceLineNo">143</span>        // tries hasn't been bumped up 
yet so we use "tries + 1" to get right pause time<a name="line.143"></a>
-<span class="sourceLineNo">144</span>        expectedSleep = 
callable.sleep(pause, tries + 1);<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span>        // If, after the planned sleep, 
there won't be enough time left, we stop now.<a name="line.146"></a>
-<span class="sourceLineNo">147</span>        long duration = 
singleCallDuration(expectedSleep);<a name="line.147"></a>
-<span class="sourceLineNo">148</span>        if (duration &gt; callTimeout) 
{<a name="line.148"></a>
-<span class="sourceLineNo">149</span>          String msg = "callTimeout=" + 
callTimeout + ", callDuration=" + duration +<a name="line.149"></a>
-<span class="sourceLineNo">150</span>              ": " + 
callable.getExceptionMessageAdditionalDetail();<a name="line.150"></a>
-<span class="sourceLineNo">151</span>          throw 
(SocketTimeoutException)(new SocketTimeoutException(msg).initCause(t));<a 
name="line.151"></a>
-<span class="sourceLineNo">152</span>        }<a name="line.152"></a>
-<span class="sourceLineNo">153</span>      } finally {<a name="line.153"></a>
-<span class="sourceLineNo">154</span>        
interceptor.updateFailureInfo(context);<a name="line.154"></a>
-<span class="sourceLineNo">155</span>      }<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      try {<a name="line.156"></a>
-<span class="sourceLineNo">157</span>        if (expectedSleep &gt; 0) {<a 
name="line.157"></a>
-<span class="sourceLineNo">158</span>          synchronized (cancelled) {<a 
name="line.158"></a>
-<span class="sourceLineNo">159</span>            if (cancelled.get()) return 
null;<a name="line.159"></a>
-<span class="sourceLineNo">160</span>            
cancelled.wait(expectedSleep);<a name="line.160"></a>
-<span class="sourceLineNo">161</span>          }<a name="line.161"></a>
-<span class="sourceLineNo">162</span>        }<a name="line.162"></a>
-<span class="sourceLineNo">163</span>        if (cancelled.get()) return 
null;<a name="line.163"></a>
-<span class="sourceLineNo">164</span>      } catch (InterruptedException e) 
{<a name="line.164"></a>
-<span class="sourceLineNo">165</span>        throw new 
InterruptedIOException("Interrupted after " + tries<a name="line.165"></a>
-<span class="sourceLineNo">166</span>            + " tries while maxAttempts=" 
+ maxAttempts);<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      }<a name="line.167"></a>
-<span class="sourceLineNo">168</span>    }<a name="line.168"></a>
-<span class="sourceLineNo">169</span>  }<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span>  /**<a name="line.171"></a>
-<span class="sourceLineNo">172</span>   * @return Calculate how long a single 
call took<a name="line.172"></a>
-<span class="sourceLineNo">173</span>   */<a name="line.173"></a>
-<span class="sourceLineNo">174</span>  private long singleCallDuration(final 
long expectedSleep) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>    return 
(EnvironmentEdgeManager.currentTime() - this.globalStartTime) + 
expectedSleep;<a name="line.175"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>  /** How many retries are allowed before 
we start to log */<a name="line.55"></a>
+<span class="sourceLineNo">056</span>  private final int startLogErrorsCnt;<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>  private final long pause;<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>  private final int maxAttempts;// how 
many times to try<a name="line.59"></a>
+<span class="sourceLineNo">060</span>  private final AtomicBoolean cancelled = 
new AtomicBoolean(false);<a name="line.60"></a>
+<span class="sourceLineNo">061</span>  private final RetryingCallerInterceptor 
interceptor;<a name="line.61"></a>
+<span class="sourceLineNo">062</span>  private final 
RetryingCallerInterceptorContext context;<a name="line.62"></a>
+<span class="sourceLineNo">063</span>  private final RetryingTimeTracker 
tracker;<a name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span>  public RpcRetryingCallerImpl(long 
pause, int retries, int startLogErrorsCnt) {<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    this(pause, retries, 
RetryingCallerInterceptorFactory.NO_OP_INTERCEPTOR, startLogErrorsCnt);<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span>  }<a name="line.67"></a>
+<span class="sourceLineNo">068</span>  <a name="line.68"></a>
+<span class="sourceLineNo">069</span>  public RpcRetryingCallerImpl(long 
pause, int retries,<a name="line.69"></a>
+<span class="sourceLineNo">070</span>      RetryingCallerInterceptor 
interceptor, int startLogErrorsCnt) {<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    this.pause = pause;<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>    this.maxAttempts = retries + 1;<a 
name="line.72"></a>
+<span class="sourceLineNo">073</span>    this.interceptor = interceptor;<a 
name="line.73"></a>
+<span class="sourceLineNo">074</span>    context = 
interceptor.createEmptyContext();<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    this.startLogErrorsCnt = 
startLogErrorsCnt;<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    this.tracker = new 
RetryingTimeTracker();<a name="line.76"></a>
+<span class="sourceLineNo">077</span>  }<a name="line.77"></a>
+<span class="sourceLineNo">078</span>  <a name="line.78"></a>
+<span class="sourceLineNo">079</span>  @Override<a name="line.79"></a>
+<span class="sourceLineNo">080</span>  public void cancel(){<a 
name="line.80"></a>
+<span class="sourceLineNo">081</span>    cancelled.set(true);<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>    synchronized (cancelled){<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>      cancelled.notifyAll();<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>    }<a name="line.84"></a>
+<span class="sourceLineNo">085</span>  }<a name="line.85"></a>
+<span class="sourceLineNo">086</span><a name="line.86"></a>
+<span class="sourceLineNo">087</span>  @Override<a name="line.87"></a>
+<span class="sourceLineNo">088</span>  public T 
callWithRetries(RetryingCallable&lt;T&gt; callable, int callTimeout)<a 
name="line.88"></a>
+<span class="sourceLineNo">089</span>  throws IOException, RuntimeException 
{<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    
List&lt;RetriesExhaustedException.ThrowableWithExtraContext&gt; exceptions =<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>      new 
ArrayList&lt;RetriesExhaustedException.ThrowableWithExtraContext&gt;();<a 
name="line.91"></a>
+<span class="sourceLineNo">092</span>    tracker.start();<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    context.clear();<a name="line.93"></a>
+<span class="sourceLineNo">094</span>    for (int tries = 0;; tries++) {<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>      long expectedSleep;<a 
name="line.95"></a>
+<span class="sourceLineNo">096</span>      try {<a name="line.96"></a>
+<span class="sourceLineNo">097</span>        callable.prepare(tries != 0); // 
if called with false, check table status on ZK<a name="line.97"></a>
+<span class="sourceLineNo">098</span>        
interceptor.intercept(context.prepare(callable, tries));<a name="line.98"></a>
+<span class="sourceLineNo">099</span>        return 
callable.call(tracker.getRemainingTime(callTimeout));<a name="line.99"></a>
+<span class="sourceLineNo">100</span>      } catch 
(PreemptiveFastFailException e) {<a name="line.100"></a>
+<span class="sourceLineNo">101</span>        throw e;<a name="line.101"></a>
+<span class="sourceLineNo">102</span>      } catch (Throwable t) {<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>        
ExceptionUtil.rethrowIfInterrupt(t);<a name="line.103"></a>
+<span class="sourceLineNo">104</span>        if (tries &gt; startLogErrorsCnt) 
{<a name="line.104"></a>
+<span class="sourceLineNo">105</span>          LOG.info("Call exception, 
tries=" + tries + ", maxAttempts=" + maxAttempts + ", started="<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>              + 
(EnvironmentEdgeManager.currentTime() - tracker.getStartTime()) + " ms ago, "<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>              + "cancelled=" + 
cancelled.get() + ", msg="<a name="line.107"></a>
+<span class="sourceLineNo">108</span>              + 
callable.getExceptionMessageAdditionalDetail());<a name="line.108"></a>
+<span class="sourceLineNo">109</span>        }<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span>        // translateException throws 
exception when should not retry: i.e. when request is bad.<a 
name="line.111"></a>
+<span class="sourceLineNo">112</span>        
interceptor.handleFailure(context, t);<a name="line.112"></a>
+<span class="sourceLineNo">113</span>        t = translateException(t);<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span>        callable.throwable(t, maxAttempts 
!= 1);<a name="line.114"></a>
+<span class="sourceLineNo">115</span>        
RetriesExhaustedException.ThrowableWithExtraContext qt =<a name="line.115"></a>
+<span class="sourceLineNo">116</span>            new 
RetriesExhaustedException.ThrowableWithExtraContext(t,<a name="line.116"></a>
+<span class="sourceLineNo">117</span>                
EnvironmentEdgeManager.currentTime(), toString());<a name="line.117"></a>
+<span class="sourceLineNo">118</span>        exceptions.add(qt);<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>        if (tries &gt;= maxAttempts - 1) 
{<a name="line.119"></a>
+<span class="sourceLineNo">120</span>          throw new 
RetriesExhaustedException(tries, exceptions);<a name="line.120"></a>
+<span class="sourceLineNo">121</span>        }<a name="line.121"></a>
+<span class="sourceLineNo">122</span>        // If the server is dead, we need 
to wait a little before retrying, to give<a name="line.122"></a>
+<span class="sourceLineNo">123</span>        //  a chance to the regions to 
be<a name="line.123"></a>
+<span class="sourceLineNo">124</span>        // tries hasn't been bumped up 
yet so we use "tries + 1" to get right pause time<a name="line.124"></a>
+<span class="sourceLineNo">125</span>        expectedSleep = 
callable.sleep(pause, tries + 1);<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span>        // If, after the planned sleep, 
there won't be enough time left, we stop now.<a name="line.127"></a>
+<span class="sourceLineNo">128</span>        long duration = 
singleCallDuration(expectedSleep);<a name="line.128"></a>
+<span class="sourceLineNo">129</span>        if (duration &gt; callTimeout) 
{<a name="line.129"></a>
+<span class="sourceLineNo">130</span>          String msg = "callTimeout=" + 
callTimeout + ", callDuration=" + duration +<a name="line.130"></a>
+<span class="sourceLineNo">131</span>              ": " + 
callable.getExceptionMessageAdditionalDetail();<a name="line.131"></a>
+<span class="sourceLineNo">132</span>          throw 
(SocketTimeoutException)(new SocketTimeoutException(msg).initCause(t));<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>        }<a name="line.133"></a>
+<span class="sourceLineNo">134</span>      } finally {<a name="line.134"></a>
+<span class="sourceLineNo">135</span>        
interceptor.updateFailureInfo(context);<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      }<a name="line.136"></a>
+<span class="sourceLineNo">137</span>      try {<a name="line.137"></a>
+<span class="sourceLineNo">138</span>        if (expectedSleep &gt; 0) {<a 
name="line.138"></a>
+<span class="sourceLineNo">139</span>          synchronized (cancelled) {<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span>            if (cancelled.get()) return 
null;<a name="line.140"></a>
+<span class="sourceLineNo">141</span>            
cancelled.wait(expectedSleep);<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>        if (cancelled.get()) return 
null;<a name="line.144"></a>
+<span class="sourceLineNo">145</span>      } catch (InterruptedException e) 
{<a name="line.145"></a>
+<span class="sourceLineNo">146</span>        throw new 
InterruptedIOException("Interrupted after " + tries<a name="line.146"></a>
+<span class="sourceLineNo">147</span>            + " tries while maxAttempts=" 
+ maxAttempts);<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      }<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    }<a name="line.149"></a>
+<span class="sourceLineNo">150</span>  }<a name="line.150"></a>
+<span class="sourceLineNo">151</span><a name="line.151"></a>
+<span class="sourceLineNo">152</span>  /**<a name="line.152"></a>
+<span class="sourceLineNo">153</span>   * @return Calculate how long a single 
call took<a name="line.153"></a>
+<span class="sourceLineNo">154</span>   */<a name="line.154"></a>
+<span class="sourceLineNo">155</span>  private long singleCallDuration(final 
long expectedSleep) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    return 
(EnvironmentEdgeManager.currentTime() - tracker.getStartTime()) + 
expectedSleep;<a name="line.156"></a>
+<span class="sourceLineNo">157</span>  }<a name="line.157"></a>
+<span class="sourceLineNo">158</span><a name="line.158"></a>
+<span class="sourceLineNo">159</span>  @Override<a name="line.159"></a>
+<span class="sourceLineNo">160</span>  public T 
callWithoutRetries(RetryingCallable&lt;T&gt; callable, int callTimeout)<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>  throws IOException, RuntimeException 
{<a name="line.161"></a>
+<span class="sourceLineNo">162</span>    // The code of this method should be 
shared with withRetries.<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    try {<a name="line.163"></a>
+<span class="sourceLineNo">164</span>      callable.prepare(false);<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span>      return 
callable.call(callTimeout);<a name="line.165"></a>
+<span class="sourceLineNo">166</span>    } catch (Throwable t) {<a 
name="line.166"></a>
+<span class="sourceLineNo">167</span>      Throwable t2 = 
translateException(t);<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      
ExceptionUtil.rethrowIfInterrupt(t2);<a name="line.168"></a>
+<span class="sourceLineNo">169</span>      // It would be nice to clear the 
location cache here.<a name="line.169"></a>
+<span class="sourceLineNo">170</span>      if (t2 instanceof IOException) {<a 
name="line.170"></a>
+<span class="sourceLineNo">171</span>        throw (IOException)t2;<a 
name="line.171"></a>
+<span class="sourceLineNo">172</span>      } else {<a name="line.172"></a>
+<span class="sourceLineNo">173</span>        throw new RuntimeException(t2);<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>  @Override<a name="line.178"></a>
-<span class="sourceLineNo">179</span>  public T 
callWithoutRetries(RetryingCallable&lt;T&gt; callable, int callTimeout)<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>  throws IOException, RuntimeException 
{<a name="line.180"></a>
-<span class="sourceLineNo">181</span>    // The code of this method should be 
shared with withRetries.<a name="line.181"></a>
-<span class="sourceLineNo">182</span>    this.globalStartTime = 
EnvironmentEdgeManager.currentTime();<a name="line.182"></a>
-<span class="sourceLineNo">183</span>    try {<a name="line.183"></a>
-<span class="sourceLineNo">184</span>      callable.prepare(false);<a 
name="line.184"></a>
-<span class="sourceLineNo">185</span>      return 
callable.call(callTimeout);<a name="line.185"></a>
-<span class="sourceLineNo">186</span>    } catch (Throwable t) {<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span>      Throwable t2 = 
translateException(t);<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      
ExceptionUtil.rethrowIfInterrupt(t2);<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      // It would be nice to clear the 
location cache here.<a name="line.189"></a>
-<span class="sourceLineNo">190</span>      if (t2 instanceof IOException) {<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>        throw (IOException)t2;<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>      } else {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>        throw new RuntimeException(t2);<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>      }<a name="line.194"></a>
+<span class="sourceLineNo">177</span>  <a name="line.177"></a>
+<span class="sourceLineNo">178</span>  /**<a name="line.178"></a>
+<span class="sourceLineNo">179</span>   * Get the good or the remote exception 
if any, throws the DoNotRetryIOException.<a name="line.179"></a>
+<span class="sourceLineNo">180</span>   * @param t the throwable to analyze<a 
name="line.180"></a>
+<span class="sourceLineNo">181</span>   * @return the translated exception, if 
it's not a DoNotRetryIOException<a name="line.181"></a>
+<span class="sourceLineNo">182</span>   * @throws DoNotRetryIOException - if 
we find it, we throw it instead of translating.<a name="line.182"></a>
+<span class="sourceLineNo">183</span>   */<a name="line.183"></a>
+<span class="sourceLineNo">184</span>  static Throwable 
translateException(Throwable t) throws DoNotRetryIOException {<a 
name="line.184"></a>
+<span class="sourceLineNo">185</span>    if (t instanceof 
UndeclaredThrowableException) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      if (t.getCause() != null) {<a 
name="line.186"></a>
+<span class="sourceLineNo">187</span>        t = t.getCause();<a 
name="line.187"></a>
+<span class="sourceLineNo">188</span>      }<a name="line.188"></a>
+<span class="sourceLineNo">189</span>    }<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    if (t instanceof RemoteException) {<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>      t = 
((RemoteException)t).unwrapRemoteException();<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    }<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    if (t instanceof LinkageError) {<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span>      throw new 
DoNotRetryIOException(t);<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>  <a name="line.197"></a>
-<span class="sourceLineNo">198</span>  /**<a name="line.198"></a>
-<span class="sourceLineNo">199</span>   * Get the good or the remote exception 
if any, throws the DoNotRetryIOException.<a name="line.199"></a>
-<span class="sourceLineNo">200</span>   * @param t the throwable to analyze<a 
name="line.200"></a>
-<span class="sourceLineNo">201</span>   * @return the translated exception, if 
it's not a DoNotRetryIOException<a name="line.201"></a>
-<span class="sourceLineNo">202</span>   * @throws DoNotRetryIOException - if 
we find it, we throw it instead of translating.<a name="line.202"></a>
-<span class="sourceLineNo">203</span>   */<a name="line.203"></a>
-<span class="sourceLineNo">204</span>  static Throwable 
translateException(Throwable t) throws DoNotRetryIOException {<a 
name="line.204"></a>
-<span class="sourceLineNo">205</span>    if (t instanceof 
UndeclaredThrowableException) {<a name="line.205"></a>
-<span class="sourceLineNo">206</span>      if (t.getCause() != null) {<a 
name="line.206"></a>
-<span class="sourceLineNo">207</span>        t = t.getCause();<a 
name="line.207"></a>
-<span class="sourceLineNo">208</span>      }<a name="line.208"></a>
-<span class="sourceLineNo">209</span>    }<a name="line.209"></a>
-<span class="sourceLineNo">210</span>    if (t instanceof RemoteException) {<a 
name="line.210"></a>
-<span class="sourceLineNo">211</span>      t = 
((RemoteException)t).unwrapRemoteException();<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    }<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    if (t instanceof LinkageError) {<a 
name="line.213"></a>
-<span class="sourceLineNo">214</span>      throw new 
DoNotRetryIOException(t);<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    }<a name="line.215"></a>
-<span class="sourceLineNo">216</span>    if (t instanceof ServiceException) 
{<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      ServiceException se = 
(ServiceException)t;<a name="line.217"></a>
-<span class="sourceLineNo">218</span>      Throwable cause = se.getCause();<a 
name="line.218"></a>
-<span class="sourceLineNo">219</span>      if (cause != null &amp;&amp; cause 
instanceof DoNotRetryIOException) {<a name="line.219"></a>
-<span class="sourceLineNo">220</span>        throw 
(DoNotRetryIOException)cause;<a name="line.220"></a>
-<span class="sourceLineNo">221</span>      }<a name="line.221"></a>
-<span class="sourceLineNo">222</span>      // Don't let ServiceException out; 
its rpc specific.<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      t = cause;<a name="line.223"></a>
-<span class="sourceLineNo">224</span>      // t could be a RemoteException so 
go around again.<a name="line.224"></a>
-<span class="sourceLineNo">225</span>      translateException(t);<a 
name="line.225"></a>
-<span class="sourceLineNo">226</span>    } else if (t instanceof 
DoNotRetryIOException) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      throw (DoNotRetryIOException)t;<a 
name="line.227"></a>
-<span class="sourceLineNo">228</span>    }<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    return t;<a name="line.229"></a>
-<span class="sourceLineNo">230</span>  }<a name="line.230"></a>
-<span class="sourceLineNo">231</span><a name="line.231"></a>
-<span class="sourceLineNo">232</span>  @Override<a name="line.232"></a>
-<span class="sourceLineNo">233</span>  public String toString() {<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>    return "RpcRetryingCaller{" + 
"globalStartTime=" + globalStartTime +<a name="line.234"></a>
-<span class="sourceLineNo">235</span>        ", pause=" + pause + ", 
maxAttempts=" + maxAttempts + '}';<a name="line.235"></a>
-<span class="sourceLineNo">236</span>  }<a name="line.236"></a>
-<span class="sourceLineNo">237</span>}<a name="line.237"></a>
+<span class="sourceLineNo">196</span>    if (t instanceof ServiceException) 
{<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      ServiceException se = 
(ServiceException)t;<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      Throwable cause = se.getCause();<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>      if (cause != null &amp;&amp; cause 
instanceof DoNotRetryIOException) {<a name="line.199"></a>
+<span class="sourceLineNo">200</span>        throw 
(DoNotRetryIOException)cause;<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      }<a name="line.201"></a>
+<span class="sourceLineNo">202</span>      // Don't let ServiceException out; 
its rpc specific.<a name="line.202"></a>
+<span class="sourceLineNo">203</span>      t = cause;<a name="line.203"></a>
+<span class="sourceLineNo">204</span>      // t could be a RemoteException so 
go around again.<a name="line.204"></a>
+<span class="sourceLineNo">205</span>      translateException(t);<a 
name="line.205"></a>
+<span class="sourceLineNo">206</span>    } else if (t instanceof 
DoNotRetryIOException) {<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      throw (DoNotRetryIOException)t;<a 
name="line.207"></a>
+<span class="sourceLineNo">208</span>    }<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    return t;<a name="line.209"></a>
+<span class="sourceLineNo">210</span>  }<a name="line.210"></a>
+<span class="sourceLineNo">211</span><a name="line.211"></a>
+<span class="sourceLineNo">212</span>  @Override<a name="line.212"></a>
+<span class="sourceLineNo">213</span>  public String toString() {<a 
name="line.213"></a>
+<span class="sourceLineNo">214</span>    return "RpcRetryingCaller{" + 
"globalStartTime=" + tracker.getStartTime() +<a name="line.214"></a>
+<span class="sourceLineNo">215</span>        ", pause=" + pause + ", 
maxAttempts=" + maxAttempts + '}';<a name="line.215"></a>
+<span class="sourceLineNo">216</span>  }<a name="line.216"></a>
+<span class="sourceLineNo">217</span>}<a name="line.217"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/2211f347/devapidocs/src-html/org/apache/hadoop/hbase/client/ServerStatisticTracker.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ServerStatisticTracker.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ServerStatisticTracker.html
index 55ea6de..2b52a04 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/ServerStatisticTracker.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/ServerStatisticTracker.html
@@ -39,47 +39,48 @@
 <span class="sourceLineNo">031</span> * Tracks the statistics for multiple 
regions<a name="line.31"></a>
 <span class="sourceLineNo">032</span> */<a name="line.32"></a>
 <span class="sourceLineNo">033</span>@InterfaceAudience.Private<a 
name="line.33"></a>
-<span class="sourceLineNo">034</span>public class ServerStatisticTracker {<a 
name="line.34"></a>
+<span class="sourceLineNo">034</span>public class ServerStatisticTracker 
implements StatisticTrackable {<a name="line.34"></a>
 <span class="sourceLineNo">035</span><a name="line.35"></a>
 <span class="sourceLineNo">036</span>  private final 
ConcurrentHashMap&lt;ServerName, ServerStatistics&gt; stats =<a 
name="line.36"></a>
 <span class="sourceLineNo">037</span>      new 
ConcurrentHashMap&lt;ServerName, ServerStatistics&gt;();<a name="line.37"></a>
 <span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>  public void 
updateRegionStats(ServerName server, byte[] region, 
ClientProtos.RegionLoadStats<a name="line.39"></a>
-<span class="sourceLineNo">040</span>      currentStats) {<a 
name="line.40"></a>
-<span class="sourceLineNo">041</span>    ServerStatistics stat = 
stats.get(server);<a name="line.41"></a>
-<span class="sourceLineNo">042</span><a name="line.42"></a>
-<span class="sourceLineNo">043</span>    if (stat == null) {<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>      stat = stats.get(server);<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>      // We don't have stats for that 
server yet, so we need to make an entry.<a name="line.45"></a>
-<span class="sourceLineNo">046</span>      // If we race with another thread 
it's a harmless unnecessary allocation.<a name="line.46"></a>
-<span class="sourceLineNo">047</span>      if (stat == null) {<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span>        stat = new ServerStatistics();<a 
name="line.48"></a>
-<span class="sourceLineNo">049</span>        ServerStatistics old = 
stats.putIfAbsent(server, stat);<a name="line.49"></a>
-<span class="sourceLineNo">050</span>        if (old != null) {<a 
name="line.50"></a>
-<span class="sourceLineNo">051</span>          stat = old;<a 
name="line.51"></a>
-<span class="sourceLineNo">052</span>        }<a name="line.52"></a>
-<span class="sourceLineNo">053</span>      }<a name="line.53"></a>
-<span class="sourceLineNo">054</span>    }<a name="line.54"></a>
-<span class="sourceLineNo">055</span>    stat.update(region, currentStats);<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>  }<a name="line.56"></a>
-<span class="sourceLineNo">057</span><a name="line.57"></a>
-<span class="sourceLineNo">058</span>  public ServerStatistics 
getStats(ServerName server) {<a name="line.58"></a>
-<span class="sourceLineNo">059</span>    return this.stats.get(server);<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span>  }<a name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>  public static ServerStatisticTracker 
create(Configuration conf) {<a name="line.62"></a>
-<span class="sourceLineNo">063</span>    if 
(!conf.getBoolean(HConstants.ENABLE_CLIENT_BACKPRESSURE,<a name="line.63"></a>
-<span class="sourceLineNo">064</span>        
HConstants.DEFAULT_ENABLE_CLIENT_BACKPRESSURE)) {<a name="line.64"></a>
-<span class="sourceLineNo">065</span>      return null;<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    }<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    return new 
ServerStatisticTracker();<a name="line.67"></a>
-<span class="sourceLineNo">068</span>  }<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>  @VisibleForTesting<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  ServerStatistics 
getServerStatsForTesting(ServerName server) {<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    return stats.get(server);<a 
name="line.72"></a>
-<span class="sourceLineNo">073</span>  }<a name="line.73"></a>
-<span class="sourceLineNo">074</span>}<a name="line.74"></a>
+<span class="sourceLineNo">039</span>  @Override<a name="line.39"></a>
+<span class="sourceLineNo">040</span>  public void 
updateRegionStats(ServerName server, byte[] region, 
ClientProtos.RegionLoadStats<a name="line.40"></a>
+<span class="sourceLineNo">041</span>      currentStats) {<a 
name="line.41"></a>
+<span class="sourceLineNo">042</span>    ServerStatistics stat = 
stats.get(server);<a name="line.42"></a>
+<span class="sourceLineNo">043</span><a name="line.43"></a>
+<span class="sourceLineNo">044</span>    if (stat == null) {<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>      stat = stats.get(server);<a 
name="line.45"></a>
+<span class="sourceLineNo">046</span>      // We don't have stats for that 
server yet, so we need to make an entry.<a name="line.46"></a>
+<span class="sourceLineNo">047</span>      // If we race with another thread 
it's a harmless unnecessary allocation.<a name="line.47"></a>
+<span class="sourceLineNo">048</span>      if (stat == null) {<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>        stat = new ServerStatistics();<a 
name="line.49"></a>
+<span class="sourceLineNo">050</span>        ServerStatistics old = 
stats.putIfAbsent(server, stat);<a name="line.50"></a>
+<span class="sourceLineNo">051</span>        if (old != null) {<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>          stat = old;<a 
name="line.52"></a>
+<span class="sourceLineNo">053</span>        }<a name="line.53"></a>
+<span class="sourceLineNo">054</span>      }<a name="line.54"></a>
+<span class="sourceLineNo">055</span>    }<a name="line.55"></a>
+<span class="sourceLineNo">056</span>    stat.update(region, currentStats);<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>  public ServerStatistics 
getStats(ServerName server) {<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    return this.stats.get(server);<a 
name="line.60"></a>
+<span class="sourceLineNo">061</span>  }<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span>  public static ServerStatisticTracker 
create(Configuration conf) {<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    if 
(!conf.getBoolean(HConstants.ENABLE_CLIENT_BACKPRESSURE,<a name="line.64"></a>
+<span class="sourceLineNo">065</span>        
HConstants.DEFAULT_ENABLE_CLIENT_BACKPRESSURE)) {<a name="line.65"></a>
+<span class="sourceLineNo">066</span>      return null;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    }<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    return new 
ServerStatisticTracker();<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  }<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>  @VisibleForTesting<a name="line.71"></a>
+<span class="sourceLineNo">072</span>  ServerStatistics 
getServerStatsForTesting(ServerName server) {<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    return stats.get(server);<a 
name="line.73"></a>
+<span class="sourceLineNo">074</span>  }<a name="line.74"></a>
+<span class="sourceLineNo">075</span>}<a name="line.75"></a>
 
 
 

Reply via email to