http://git-wip-us.apache.org/repos/asf/hbase-site/blob/83bf6175/devapidocs/src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html
index 9b405b1..6cf82f8 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/client/BufferedMutatorImpl.QueueRowAccess.html
@@ -23,383 +23,485 @@
 <span class="sourceLineNo">015</span> */<a name="line.15"></a>
 <span class="sourceLineNo">016</span>package org.apache.hadoop.hbase.client;<a 
name="line.16"></a>
 <span class="sourceLineNo">017</span><a name="line.17"></a>
-<span class="sourceLineNo">018</span>import java.io.IOException;<a 
name="line.18"></a>
-<span class="sourceLineNo">019</span>import java.io.InterruptedIOException;<a 
name="line.19"></a>
-<span class="sourceLineNo">020</span>import java.util.Collections;<a 
name="line.20"></a>
-<span class="sourceLineNo">021</span>import java.util.Iterator;<a 
name="line.21"></a>
-<span class="sourceLineNo">022</span>import java.util.List;<a 
name="line.22"></a>
-<span class="sourceLineNo">023</span>import 
java.util.NoSuchElementException;<a name="line.23"></a>
-<span class="sourceLineNo">024</span>import 
java.util.concurrent.ConcurrentLinkedQueue;<a name="line.24"></a>
-<span class="sourceLineNo">025</span>import 
java.util.concurrent.ExecutorService;<a name="line.25"></a>
-<span class="sourceLineNo">026</span>import java.util.concurrent.TimeUnit;<a 
name="line.26"></a>
-<span class="sourceLineNo">027</span>import 
java.util.concurrent.atomic.AtomicInteger;<a name="line.27"></a>
-<span class="sourceLineNo">028</span>import 
java.util.concurrent.atomic.AtomicLong;<a name="line.28"></a>
-<span class="sourceLineNo">029</span><a name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.conf.Configuration;<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.ipc.RpcControllerFactory;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import 
org.apache.yetus.audience.InterfaceStability;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.slf4j.Logger;<a 
name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.slf4j.LoggerFactory;<a 
name="line.36"></a>
-<span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a 
name="line.38"></a>
+<span class="sourceLineNo">018</span>import static 
org.apache.hadoop.hbase.client.BufferedMutatorParams.UNSET;<a 
name="line.18"></a>
+<span class="sourceLineNo">019</span>import java.io.IOException;<a 
name="line.19"></a>
+<span class="sourceLineNo">020</span>import java.io.InterruptedIOException;<a 
name="line.20"></a>
+<span class="sourceLineNo">021</span>import java.util.Collections;<a 
name="line.21"></a>
+<span class="sourceLineNo">022</span>import java.util.Iterator;<a 
name="line.22"></a>
+<span class="sourceLineNo">023</span>import java.util.List;<a 
name="line.23"></a>
+<span class="sourceLineNo">024</span>import 
java.util.NoSuchElementException;<a name="line.24"></a>
+<span class="sourceLineNo">025</span>import java.util.Timer;<a 
name="line.25"></a>
+<span class="sourceLineNo">026</span>import java.util.TimerTask;<a 
name="line.26"></a>
+<span class="sourceLineNo">027</span>import 
java.util.concurrent.ConcurrentLinkedQueue;<a name="line.27"></a>
+<span class="sourceLineNo">028</span>import 
java.util.concurrent.ExecutorService;<a name="line.28"></a>
+<span class="sourceLineNo">029</span>import java.util.concurrent.TimeUnit;<a 
name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
java.util.concurrent.atomic.AtomicInteger;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
java.util.concurrent.atomic.AtomicLong;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.conf.Configuration;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.ipc.RpcControllerFactory;<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.apache.yetus.audience.InterfaceStability;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.slf4j.Logger;<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.slf4j.LoggerFactory;<a 
name="line.38"></a>
 <span class="sourceLineNo">039</span><a name="line.39"></a>
-<span class="sourceLineNo">040</span>/**<a name="line.40"></a>
-<span class="sourceLineNo">041</span> * &lt;p&gt;<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * Used to communicate with a single 
HBase table similar to {@link Table}<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * but meant for batched, potentially 
asynchronous puts. Obtain an instance from<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * a {@link Connection} and call {@link 
#close()} afterwards. Provide an alternate<a name="line.44"></a>
-<span class="sourceLineNo">045</span> * to this implementation by setting 
{@link BufferedMutatorParams#implementationClassName(String)}<a 
name="line.45"></a>
-<span class="sourceLineNo">046</span> * or by setting alternate classname via 
the key {} in Configuration.<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * &lt;/p&gt;<a name="line.47"></a>
-<span class="sourceLineNo">048</span> *<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * &lt;p&gt;<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * While this can be used across threads, 
great care should be used when doing so.<a name="line.50"></a>
-<span class="sourceLineNo">051</span> * Errors are global to the buffered 
mutator and the Exceptions can be thrown on any<a name="line.51"></a>
-<span class="sourceLineNo">052</span> * thread that causes the flush for 
requests.<a name="line.52"></a>
-<span class="sourceLineNo">053</span> * &lt;/p&gt;<a name="line.53"></a>
-<span class="sourceLineNo">054</span> *<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * @see ConnectionFactory<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span> * @see Connection<a name="line.56"></a>
-<span class="sourceLineNo">057</span> * @since 1.0.0<a name="line.57"></a>
-<span class="sourceLineNo">058</span> */<a name="line.58"></a>
-<span class="sourceLineNo">059</span>@InterfaceAudience.Private<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span>@InterfaceStability.Evolving<a 
name="line.60"></a>
-<span class="sourceLineNo">061</span>public class BufferedMutatorImpl 
implements BufferedMutator {<a name="line.61"></a>
-<span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span>  private static final Logger LOG = 
LoggerFactory.getLogger(BufferedMutatorImpl.class);<a name="line.63"></a>
+<span class="sourceLineNo">040</span>import 
org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;<a 
name="line.40"></a>
+<span class="sourceLineNo">041</span><a name="line.41"></a>
+<span class="sourceLineNo">042</span>/**<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * &lt;p&gt;<a name="line.43"></a>
+<span class="sourceLineNo">044</span> * Used to communicate with a single 
HBase table similar to {@link Table}<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * but meant for batched, potentially 
asynchronous puts. Obtain an instance from<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * a {@link Connection} and call {@link 
#close()} afterwards. Provide an alternate<a name="line.46"></a>
+<span class="sourceLineNo">047</span> * to this implementation by setting 
{@link BufferedMutatorParams#implementationClassName(String)}<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span> * or by setting alternate classname via 
the key {} in Configuration.<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * &lt;/p&gt;<a name="line.49"></a>
+<span class="sourceLineNo">050</span> *<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * &lt;p&gt;<a name="line.51"></a>
+<span class="sourceLineNo">052</span> * While this can be used across threads, 
great care should be used when doing so.<a name="line.52"></a>
+<span class="sourceLineNo">053</span> * Errors are global to the buffered 
mutator and the Exceptions can be thrown on any<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * thread that causes the flush for 
requests.<a name="line.54"></a>
+<span class="sourceLineNo">055</span> * &lt;/p&gt;<a name="line.55"></a>
+<span class="sourceLineNo">056</span> *<a name="line.56"></a>
+<span class="sourceLineNo">057</span> * @see ConnectionFactory<a 
name="line.57"></a>
+<span class="sourceLineNo">058</span> * @see Connection<a name="line.58"></a>
+<span class="sourceLineNo">059</span> * @since 1.0.0<a name="line.59"></a>
+<span class="sourceLineNo">060</span> */<a name="line.60"></a>
+<span class="sourceLineNo">061</span>@InterfaceAudience.Private<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>@InterfaceStability.Evolving<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span>public class BufferedMutatorImpl 
implements BufferedMutator {<a name="line.63"></a>
 <span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span>  private final ExceptionListener 
listener;<a name="line.65"></a>
+<span class="sourceLineNo">065</span>  private static final Logger LOG = 
LoggerFactory.getLogger(BufferedMutatorImpl.class);<a name="line.65"></a>
 <span class="sourceLineNo">066</span><a name="line.66"></a>
-<span class="sourceLineNo">067</span>  private final TableName tableName;<a 
name="line.67"></a>
+<span class="sourceLineNo">067</span>  private final ExceptionListener 
listener;<a name="line.67"></a>
 <span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>  private final Configuration conf;<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span>  private final 
ConcurrentLinkedQueue&lt;Mutation&gt; writeAsyncBuffer = new 
ConcurrentLinkedQueue&lt;&gt;();<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  private final AtomicLong 
currentWriteBufferSize = new AtomicLong(0);<a name="line.71"></a>
-<span class="sourceLineNo">072</span>  /**<a name="line.72"></a>
-<span class="sourceLineNo">073</span>   * Count the size of {@link 
BufferedMutatorImpl#writeAsyncBuffer}.<a name="line.73"></a>
-<span class="sourceLineNo">074</span>   * The {@link 
ConcurrentLinkedQueue#size()} is NOT a constant-time operation.<a 
name="line.74"></a>
-<span class="sourceLineNo">075</span>   */<a name="line.75"></a>
-<span class="sourceLineNo">076</span>  private final AtomicInteger 
undealtMutationCount = new AtomicInteger(0);<a name="line.76"></a>
-<span class="sourceLineNo">077</span>  private final long writeBufferSize;<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>  private final int maxKeyValueSize;<a 
name="line.78"></a>
-<span class="sourceLineNo">079</span>  private final ExecutorService pool;<a 
name="line.79"></a>
-<span class="sourceLineNo">080</span>  private final AtomicInteger 
rpcTimeout;<a name="line.80"></a>
-<span class="sourceLineNo">081</span>  private final AtomicInteger 
operationTimeout;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>  private final boolean 
cleanupPoolOnClose;<a name="line.82"></a>
-<span class="sourceLineNo">083</span>  private volatile boolean closed = 
false;<a name="line.83"></a>
-<span class="sourceLineNo">084</span>  private final AsyncProcess ap;<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span>  @VisibleForTesting<a name="line.86"></a>
-<span class="sourceLineNo">087</span>  BufferedMutatorImpl(ClusterConnection 
conn, BufferedMutatorParams params, AsyncProcess ap) {<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    if (conn == null || conn.isClosed()) 
{<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      throw new 
IllegalArgumentException("Connection is null or closed.");<a name="line.89"></a>
-<span class="sourceLineNo">090</span>    }<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    this.tableName = 
params.getTableName();<a name="line.91"></a>
-<span class="sourceLineNo">092</span>    this.conf = 
conn.getConfiguration();<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    this.listener = 
params.getListener();<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    if (params.getPool() == null) {<a 
name="line.94"></a>
-<span class="sourceLineNo">095</span>      this.pool = 
HTable.getDefaultExecutor(conf);<a name="line.95"></a>
-<span class="sourceLineNo">096</span>      cleanupPoolOnClose = true;<a 
name="line.96"></a>
-<span class="sourceLineNo">097</span>    } else {<a name="line.97"></a>
-<span class="sourceLineNo">098</span>      this.pool = params.getPool();<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>      cleanupPoolOnClose = false;<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>    }<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    ConnectionConfiguration tableConf = 
new ConnectionConfiguration(conf);<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    this.writeBufferSize = 
params.getWriteBufferSize() != BufferedMutatorParams.UNSET ?<a 
name="line.102"></a>
-<span class="sourceLineNo">103</span>        params.getWriteBufferSize() : 
tableConf.getWriteBufferSize();<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    this.maxKeyValueSize = 
params.getMaxKeyValueSize() != BufferedMutatorParams.UNSET ?<a 
name="line.104"></a>
-<span class="sourceLineNo">105</span>        params.getMaxKeyValueSize() : 
tableConf.getMaxKeyValueSize();<a name="line.105"></a>
-<span class="sourceLineNo">106</span><a name="line.106"></a>
-<span class="sourceLineNo">107</span>    this.rpcTimeout = new 
AtomicInteger(params.getRpcTimeout() != BufferedMutatorParams.UNSET ?<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>    params.getRpcTimeout() : 
conn.getConnectionConfiguration().getWriteRpcTimeout());<a name="line.108"></a>
-<span class="sourceLineNo">109</span>    this.operationTimeout = new 
AtomicInteger(params.getOperationTimeout()!= BufferedMutatorParams.UNSET ?<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>    params.getOperationTimeout() : 
conn.getConnectionConfiguration().getOperationTimeout());<a name="line.110"></a>
-<span class="sourceLineNo">111</span>    this.ap = ap;<a name="line.111"></a>
-<span class="sourceLineNo">112</span>  }<a name="line.112"></a>
-<span class="sourceLineNo">113</span>  BufferedMutatorImpl(ClusterConnection 
conn, RpcRetryingCallerFactory rpcCallerFactory,<a name="line.113"></a>
-<span class="sourceLineNo">114</span>      RpcControllerFactory rpcFactory, 
BufferedMutatorParams params) {<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    this(conn, params,<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>      // puts need to track errors 
globally due to how the APIs currently work.<a name="line.116"></a>
-<span class="sourceLineNo">117</span>      new AsyncProcess(conn, 
conn.getConfiguration(), rpcCallerFactory, true, rpcFactory));<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>  }<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>  @VisibleForTesting<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>  ExecutorService getPool() {<a 
name="line.121"></a>
-<span class="sourceLineNo">122</span>    return pool;<a name="line.122"></a>
-<span class="sourceLineNo">123</span>  }<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span>  @VisibleForTesting<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>  AsyncProcess getAsyncProcess() {<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>    return ap;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>  }<a name="line.128"></a>
+<span class="sourceLineNo">069</span>  private final TableName tableName;<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span>  private final Configuration conf;<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>  private final 
ConcurrentLinkedQueue&lt;Mutation&gt; writeAsyncBuffer = new 
ConcurrentLinkedQueue&lt;&gt;();<a name="line.72"></a>
+<span class="sourceLineNo">073</span>  private final AtomicLong 
currentWriteBufferSize = new AtomicLong(0);<a name="line.73"></a>
+<span class="sourceLineNo">074</span>  /**<a name="line.74"></a>
+<span class="sourceLineNo">075</span>   * Count the size of {@link 
BufferedMutatorImpl#writeAsyncBuffer}.<a name="line.75"></a>
+<span class="sourceLineNo">076</span>   * The {@link 
ConcurrentLinkedQueue#size()} is NOT a constant-time operation.<a 
name="line.76"></a>
+<span class="sourceLineNo">077</span>   */<a name="line.77"></a>
+<span class="sourceLineNo">078</span>  private final AtomicInteger 
undealtMutationCount = new AtomicInteger(0);<a name="line.78"></a>
+<span class="sourceLineNo">079</span>  private final long writeBufferSize;<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span>  private long  
writeBufferPeriodicFlushTimeoutMs;<a name="line.81"></a>
+<span class="sourceLineNo">082</span>  private long  
writeBufferPeriodicFlushTimerTickMs = 
MIN_WRITE_BUFFER_PERIODIC_FLUSH_TIMERTICK_MS;<a name="line.82"></a>
+<span class="sourceLineNo">083</span>  private Timer 
writeBufferPeriodicFlushTimer = null;<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span>  private final int maxKeyValueSize;<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>  private final ExecutorService pool;<a 
name="line.86"></a>
+<span class="sourceLineNo">087</span>  private final AtomicInteger 
rpcTimeout;<a name="line.87"></a>
+<span class="sourceLineNo">088</span>  private final AtomicInteger 
operationTimeout;<a name="line.88"></a>
+<span class="sourceLineNo">089</span>  private final boolean 
cleanupPoolOnClose;<a name="line.89"></a>
+<span class="sourceLineNo">090</span>  private volatile boolean closed = 
false;<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  private final AsyncProcess ap;<a 
name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>  @VisibleForTesting<a name="line.93"></a>
+<span class="sourceLineNo">094</span>  BufferedMutatorImpl(ClusterConnection 
conn, BufferedMutatorParams params, AsyncProcess ap) {<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    if (conn == null || conn.isClosed()) 
{<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      throw new 
IllegalArgumentException("Connection is null or closed.");<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    }<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    this.tableName = 
params.getTableName();<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    this.conf = 
conn.getConfiguration();<a name="line.99"></a>
+<span class="sourceLineNo">100</span>    this.listener = 
params.getListener();<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    if (params.getPool() == null) {<a 
name="line.101"></a>
+<span class="sourceLineNo">102</span>      this.pool = 
HTable.getDefaultExecutor(conf);<a name="line.102"></a>
+<span class="sourceLineNo">103</span>      cleanupPoolOnClose = true;<a 
name="line.103"></a>
+<span class="sourceLineNo">104</span>    } else {<a name="line.104"></a>
+<span class="sourceLineNo">105</span>      this.pool = params.getPool();<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>      cleanupPoolOnClose = false;<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>    }<a name="line.107"></a>
+<span class="sourceLineNo">108</span>    ConnectionConfiguration tableConf = 
new ConnectionConfiguration(conf);<a name="line.108"></a>
+<span class="sourceLineNo">109</span>    this.writeBufferSize =<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>            params.getWriteBufferSize() 
!= UNSET ?<a name="line.110"></a>
+<span class="sourceLineNo">111</span>            params.getWriteBufferSize() : 
tableConf.getWriteBufferSize();<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span>    // Set via the setter because it does 
value validation and starts/stops the TimerTask<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    long 
newWriteBufferPeriodicFlushTimeoutMs =<a name="line.114"></a>
+<span class="sourceLineNo">115</span>            
params.getWriteBufferPeriodicFlushTimeoutMs() != UNSET<a name="line.115"></a>
+<span class="sourceLineNo">116</span>              ? 
params.getWriteBufferPeriodicFlushTimeoutMs()<a name="line.116"></a>
+<span class="sourceLineNo">117</span>              : 
tableConf.getWriteBufferPeriodicFlushTimeoutMs();<a name="line.117"></a>
+<span class="sourceLineNo">118</span>    long 
newWriteBufferPeriodicFlushTimerTickMs =<a name="line.118"></a>
+<span class="sourceLineNo">119</span>            
params.getWriteBufferPeriodicFlushTimerTickMs() != UNSET<a name="line.119"></a>
+<span class="sourceLineNo">120</span>              ? 
params.getWriteBufferPeriodicFlushTimerTickMs()<a name="line.120"></a>
+<span class="sourceLineNo">121</span>              : 
tableConf.getWriteBufferPeriodicFlushTimerTickMs();<a name="line.121"></a>
+<span class="sourceLineNo">122</span>    this.setWriteBufferPeriodicFlush(<a 
name="line.122"></a>
+<span class="sourceLineNo">123</span>            
newWriteBufferPeriodicFlushTimeoutMs,<a name="line.123"></a>
+<span class="sourceLineNo">124</span>            
newWriteBufferPeriodicFlushTimerTickMs);<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span>    this.maxKeyValueSize =<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>            params.getMaxKeyValueSize() 
!= UNSET ?<a name="line.127"></a>
+<span class="sourceLineNo">128</span>            params.getMaxKeyValueSize() : 
tableConf.getMaxKeyValueSize();<a name="line.128"></a>
 <span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>  @Override<a name="line.130"></a>
-<span class="sourceLineNo">131</span>  public TableName getName() {<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>    return tableName;<a 
name="line.132"></a>
-<span class="sourceLineNo">133</span>  }<a name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span>  @Override<a name="line.135"></a>
-<span class="sourceLineNo">136</span>  public Configuration getConfiguration() 
{<a name="line.136"></a>
-<span class="sourceLineNo">137</span>    return conf;<a name="line.137"></a>
+<span class="sourceLineNo">130</span>    this.rpcTimeout = new 
AtomicInteger(<a name="line.130"></a>
+<span class="sourceLineNo">131</span>            params.getRpcTimeout() != 
UNSET ?<a name="line.131"></a>
+<span class="sourceLineNo">132</span>            params.getRpcTimeout() : 
conn.getConnectionConfiguration().getWriteRpcTimeout());<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span>    this.operationTimeout = new 
AtomicInteger(<a name="line.134"></a>
+<span class="sourceLineNo">135</span>            params.getOperationTimeout() 
!= UNSET ?<a name="line.135"></a>
+<span class="sourceLineNo">136</span>            params.getOperationTimeout() 
: conn.getConnectionConfiguration().getOperationTimeout());<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>    this.ap = ap;<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>  @Override<a name="line.140"></a>
-<span class="sourceLineNo">141</span>  public void mutate(Mutation m) throws 
InterruptedIOException,<a name="line.141"></a>
-<span class="sourceLineNo">142</span>      
RetriesExhaustedWithDetailsException {<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    
mutate(Collections.singletonList(m));<a name="line.143"></a>
+<span class="sourceLineNo">139</span>  BufferedMutatorImpl(ClusterConnection 
conn, RpcRetryingCallerFactory rpcCallerFactory,<a name="line.139"></a>
+<span class="sourceLineNo">140</span>      RpcControllerFactory rpcFactory, 
BufferedMutatorParams params) {<a name="line.140"></a>
+<span class="sourceLineNo">141</span>    this(conn, params,<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span>      // puts need to track errors 
globally due to how the APIs currently work.<a name="line.142"></a>
+<span class="sourceLineNo">143</span>      new AsyncProcess(conn, 
conn.getConfiguration(), rpcCallerFactory, true, rpcFactory));<a 
name="line.143"></a>
 <span class="sourceLineNo">144</span>  }<a name="line.144"></a>
 <span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span>  @Override<a name="line.146"></a>
-<span class="sourceLineNo">147</span>  public void mutate(List&lt;? extends 
Mutation&gt; ms) throws InterruptedIOException,<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      
RetriesExhaustedWithDetailsException {<a name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span>    if (closed) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>      throw new 
IllegalStateException("Cannot put when the BufferedMutator is closed.");<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>    long toAddSize = 0;<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>    int toAddCount = 0;<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>    for (Mutation m : ms) {<a 
name="line.156"></a>
-<span class="sourceLineNo">157</span>      if (m instanceof Put) {<a 
name="line.157"></a>
-<span class="sourceLineNo">158</span>        validatePut((Put) m);<a 
name="line.158"></a>
-<span class="sourceLineNo">159</span>      }<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      toAddSize += m.heapSize();<a 
name="line.160"></a>
-<span class="sourceLineNo">161</span>      ++toAddCount;<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    }<a name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>    // This behavior is highly 
non-intuitive... it does not protect us against<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    // 94-incompatible behavior, which is 
a timing issue because hasError, the below code<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    // and setter of hasError are not 
synchronized. Perhaps it should be removed.<a name="line.166"></a>
-<span class="sourceLineNo">167</span>    if (ap.hasError()) {<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>      
currentWriteBufferSize.addAndGet(toAddSize);<a name="line.168"></a>
-<span class="sourceLineNo">169</span>      writeAsyncBuffer.addAll(ms);<a 
name="line.169"></a>
-<span class="sourceLineNo">170</span>      
undealtMutationCount.addAndGet(toAddCount);<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      backgroundFlushCommits(true);<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>    } else {<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      
currentWriteBufferSize.addAndGet(toAddSize);<a name="line.173"></a>
-<span class="sourceLineNo">174</span>      writeAsyncBuffer.addAll(ms);<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>      
undealtMutationCount.addAndGet(toAddCount);<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>    // Now try and queue what needs to be 
queued.<a name="line.178"></a>
-<span class="sourceLineNo">179</span>    while (undealtMutationCount.get() != 
0<a name="line.179"></a>
-<span class="sourceLineNo">180</span>        &amp;&amp; 
currentWriteBufferSize.get() &gt; writeBufferSize) {<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      backgroundFlushCommits(false);<a 
name="line.181"></a>
-<span class="sourceLineNo">182</span>    }<a name="line.182"></a>
-<span class="sourceLineNo">183</span>  }<a name="line.183"></a>
-<span class="sourceLineNo">184</span><a name="line.184"></a>
-<span class="sourceLineNo">185</span>  // validate for well-formedness<a 
name="line.185"></a>
-<span class="sourceLineNo">186</span>  public void validatePut(final Put put) 
throws IllegalArgumentException {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    HTable.validatePut(put, 
maxKeyValueSize);<a name="line.187"></a>
-<span class="sourceLineNo">188</span>  }<a name="line.188"></a>
+<span class="sourceLineNo">146</span>  @VisibleForTesting<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span>  ExecutorService getPool() {<a 
name="line.147"></a>
+<span class="sourceLineNo">148</span>    return pool;<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>  @VisibleForTesting<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>  AsyncProcess getAsyncProcess() {<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>    return ap;<a name="line.153"></a>
+<span class="sourceLineNo">154</span>  }<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span>  @Override<a name="line.156"></a>
+<span class="sourceLineNo">157</span>  public TableName getName() {<a 
name="line.157"></a>
+<span class="sourceLineNo">158</span>    return tableName;<a 
name="line.158"></a>
+<span class="sourceLineNo">159</span>  }<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span>  @Override<a name="line.161"></a>
+<span class="sourceLineNo">162</span>  public Configuration getConfiguration() 
{<a name="line.162"></a>
+<span class="sourceLineNo">163</span>    return conf;<a name="line.163"></a>
+<span class="sourceLineNo">164</span>  }<a name="line.164"></a>
+<span class="sourceLineNo">165</span><a name="line.165"></a>
+<span class="sourceLineNo">166</span>  @Override<a name="line.166"></a>
+<span class="sourceLineNo">167</span>  public void mutate(Mutation m) throws 
InterruptedIOException,<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      
RetriesExhaustedWithDetailsException {<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    
mutate(Collections.singletonList(m));<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>  @Override<a name="line.172"></a>
+<span class="sourceLineNo">173</span>  public void mutate(List&lt;? extends 
Mutation&gt; ms) throws InterruptedIOException,<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      
RetriesExhaustedWithDetailsException {<a name="line.174"></a>
+<span class="sourceLineNo">175</span><a name="line.175"></a>
+<span class="sourceLineNo">176</span>    if (closed) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span>      throw new 
IllegalStateException("Cannot put when the BufferedMutator is closed.");<a 
name="line.177"></a>
+<span class="sourceLineNo">178</span>    }<a name="line.178"></a>
+<span class="sourceLineNo">179</span><a name="line.179"></a>
+<span class="sourceLineNo">180</span>    long toAddSize = 0;<a 
name="line.180"></a>
+<span class="sourceLineNo">181</span>    int toAddCount = 0;<a 
name="line.181"></a>
+<span class="sourceLineNo">182</span>    for (Mutation m : ms) {<a 
name="line.182"></a>
+<span class="sourceLineNo">183</span>      if (m instanceof Put) {<a 
name="line.183"></a>
+<span class="sourceLineNo">184</span>        validatePut((Put) m);<a 
name="line.184"></a>
+<span class="sourceLineNo">185</span>      }<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      toAddSize += m.heapSize();<a 
name="line.186"></a>
+<span class="sourceLineNo">187</span>      ++toAddCount;<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>  @Override<a name="line.190"></a>
-<span class="sourceLineNo">191</span>  public synchronized void close() throws 
IOException {<a name="line.191"></a>
-<span class="sourceLineNo">192</span>    try {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      if (this.closed) {<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>        return;<a name="line.194"></a>
-<span class="sourceLineNo">195</span>      }<a name="line.195"></a>
-<span class="sourceLineNo">196</span>      // As we can have an operation in 
progress even if the buffer is empty, we call<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      // backgroundFlushCommits at least 
one time.<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      backgroundFlushCommits(true);<a 
name="line.198"></a>
-<span class="sourceLineNo">199</span>      if (cleanupPoolOnClose) {<a 
name="line.199"></a>
-<span class="sourceLineNo">200</span>        this.pool.shutdown();<a 
name="line.200"></a>
-<span class="sourceLineNo">201</span>        boolean terminated;<a 
name="line.201"></a>
-<span class="sourceLineNo">202</span>        int loopCnt = 0;<a 
name="line.202"></a>
-<span class="sourceLineNo">203</span>        do {<a name="line.203"></a>
-<span class="sourceLineNo">204</span>          // wait until the pool has 
terminated<a name="line.204"></a>
-<span class="sourceLineNo">205</span>          terminated = 
this.pool.awaitTermination(60, TimeUnit.SECONDS);<a name="line.205"></a>
-<span class="sourceLineNo">206</span>          loopCnt += 1;<a 
name="line.206"></a>
-<span class="sourceLineNo">207</span>          if (loopCnt &gt;= 10) {<a 
name="line.207"></a>
-<span class="sourceLineNo">208</span>            LOG.warn("close() failed to 
terminate pool after 10 minutes. Abandoning pool.");<a name="line.208"></a>
-<span class="sourceLineNo">209</span>            break;<a name="line.209"></a>
-<span class="sourceLineNo">210</span>          }<a name="line.210"></a>
-<span class="sourceLineNo">211</span>        } while (!terminated);<a 
name="line.211"></a>
-<span class="sourceLineNo">212</span>      }<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    } catch (InterruptedException e) {<a 
name="line.213"></a>
-<span class="sourceLineNo">214</span>      LOG.warn("waitForTermination 
interrupted");<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    } finally {<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      this.closed = true;<a 
name="line.216"></a>
-<span class="sourceLineNo">217</span>    }<a name="line.217"></a>
+<span class="sourceLineNo">190</span>    if (currentWriteBufferSize.get() == 
0) {<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      firstRecordInBufferTimestamp = 
System.currentTimeMillis();<a name="line.191"></a>
+<span class="sourceLineNo">192</span>    }<a name="line.192"></a>
+<span class="sourceLineNo">193</span><a name="line.193"></a>
+<span class="sourceLineNo">194</span>    // This behavior is highly 
non-intuitive... it does not protect us against<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    // 94-incompatible behavior, which is 
a timing issue because hasError, the below code<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    // and setter of hasError are not 
synchronized. Perhaps it should be removed.<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    if (ap.hasError()) {<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>      
currentWriteBufferSize.addAndGet(toAddSize);<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      writeAsyncBuffer.addAll(ms);<a 
name="line.199"></a>
+<span class="sourceLineNo">200</span>      
undealtMutationCount.addAndGet(toAddCount);<a name="line.200"></a>
+<span class="sourceLineNo">201</span>      backgroundFlushCommits(true);<a 
name="line.201"></a>
+<span class="sourceLineNo">202</span>    } else {<a name="line.202"></a>
+<span class="sourceLineNo">203</span>      
currentWriteBufferSize.addAndGet(toAddSize);<a name="line.203"></a>
+<span class="sourceLineNo">204</span>      writeAsyncBuffer.addAll(ms);<a 
name="line.204"></a>
+<span class="sourceLineNo">205</span>      
undealtMutationCount.addAndGet(toAddCount);<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    }<a name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span>    // Now try and queue what needs to be 
queued.<a name="line.208"></a>
+<span class="sourceLineNo">209</span>    while (undealtMutationCount.get() != 
0<a name="line.209"></a>
+<span class="sourceLineNo">210</span>        &amp;&amp; 
currentWriteBufferSize.get() &gt; writeBufferSize) {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>      backgroundFlushCommits(false);<a 
name="line.211"></a>
+<span class="sourceLineNo">212</span>    }<a name="line.212"></a>
+<span class="sourceLineNo">213</span>  }<a name="line.213"></a>
+<span class="sourceLineNo">214</span><a name="line.214"></a>
+<span class="sourceLineNo">215</span>  @VisibleForTesting<a 
name="line.215"></a>
+<span class="sourceLineNo">216</span>  protected long 
getExecutedWriteBufferPeriodicFlushes() {<a name="line.216"></a>
+<span class="sourceLineNo">217</span>    return 
executedWriteBufferPeriodicFlushes;<a name="line.217"></a>
 <span class="sourceLineNo">218</span>  }<a name="line.218"></a>
 <span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span>  @Override<a name="line.220"></a>
-<span class="sourceLineNo">221</span>  public synchronized void flush() throws 
InterruptedIOException,<a name="line.221"></a>
-<span class="sourceLineNo">222</span>      
RetriesExhaustedWithDetailsException {<a name="line.222"></a>
-<span class="sourceLineNo">223</span>    // As we can have an operation in 
progress even if the buffer is empty, we call<a name="line.223"></a>
-<span class="sourceLineNo">224</span>    // backgroundFlushCommits at least 
one time.<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    backgroundFlushCommits(true);<a 
name="line.225"></a>
-<span class="sourceLineNo">226</span>  }<a name="line.226"></a>
-<span class="sourceLineNo">227</span><a name="line.227"></a>
-<span class="sourceLineNo">228</span>  /**<a name="line.228"></a>
-<span class="sourceLineNo">229</span>   * Send the operations in the buffer to 
the servers. Does not wait for the server's answer. If<a name="line.229"></a>
-<span class="sourceLineNo">230</span>   * the is an error (max retried reach 
from a previous flush or bad operation), it tries to send<a name="line.230"></a>
-<span class="sourceLineNo">231</span>   * all operations in the buffer and 
sends an exception.<a name="line.231"></a>
-<span class="sourceLineNo">232</span>   *<a name="line.232"></a>
-<span class="sourceLineNo">233</span>   * @param synchronous - if true, sends 
all the writes and wait for all of them to finish before<a name="line.233"></a>
-<span class="sourceLineNo">234</span>   *        returning.<a 
name="line.234"></a>
-<span class="sourceLineNo">235</span>   */<a name="line.235"></a>
-<span class="sourceLineNo">236</span>  private void 
backgroundFlushCommits(boolean synchronous) throws<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      InterruptedIOException,<a 
name="line.237"></a>
-<span class="sourceLineNo">238</span>      
RetriesExhaustedWithDetailsException {<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    if (!synchronous &amp;&amp; 
writeAsyncBuffer.isEmpty()) {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>      return;<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    }<a name="line.241"></a>
-<span class="sourceLineNo">242</span><a name="line.242"></a>
-<span class="sourceLineNo">243</span>    if (!synchronous) {<a 
name="line.243"></a>
-<span class="sourceLineNo">244</span>      QueueRowAccess taker = new 
QueueRowAccess();<a name="line.244"></a>
-<span class="sourceLineNo">245</span>      AsyncProcessTask task = 
wrapAsyncProcessTask(taker);<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      try {<a name="line.246"></a>
-<span class="sourceLineNo">247</span>        ap.submit(task);<a 
name="line.247"></a>
-<span class="sourceLineNo">248</span>        if (ap.hasError()) {<a 
name="line.248"></a>
-<span class="sourceLineNo">249</span>          LOG.debug(tableName + ": One or 
more of the operations have failed -"<a name="line.249"></a>
-<span class="sourceLineNo">250</span>              + " waiting for all 
operation in progress to finish (successfully or not)");<a name="line.250"></a>
-<span class="sourceLineNo">251</span>        }<a name="line.251"></a>
-<span class="sourceLineNo">252</span>      } finally {<a name="line.252"></a>
-<span class="sourceLineNo">253</span>        taker.restoreRemainder();<a 
name="line.253"></a>
-<span class="sourceLineNo">254</span>      }<a name="line.254"></a>
-<span class="sourceLineNo">255</span>    }<a name="line.255"></a>
-<span class="sourceLineNo">256</span>    if (synchronous || ap.hasError()) {<a 
name="line.256"></a>
-<span class="sourceLineNo">257</span>      QueueRowAccess taker = new 
QueueRowAccess();<a name="line.257"></a>
-<span class="sourceLineNo">258</span>      AsyncProcessTask task = 
wrapAsyncProcessTask(taker);<a name="line.258"></a>
-<span class="sourceLineNo">259</span>      try {<a name="line.259"></a>
-<span class="sourceLineNo">260</span>        while (!taker.isEmpty()) {<a 
name="line.260"></a>
-<span class="sourceLineNo">261</span>          ap.submit(task);<a 
name="line.261"></a>
-<span class="sourceLineNo">262</span>          taker.reset();<a 
name="line.262"></a>
-<span class="sourceLineNo">263</span>        }<a name="line.263"></a>
-<span class="sourceLineNo">264</span>      } finally {<a name="line.264"></a>
-<span class="sourceLineNo">265</span>        taker.restoreRemainder();<a 
name="line.265"></a>
-<span class="sourceLineNo">266</span>      }<a name="line.266"></a>
-<span class="sourceLineNo">267</span>      
RetriesExhaustedWithDetailsException error =<a name="line.267"></a>
-<span class="sourceLineNo">268</span>          
ap.waitForAllPreviousOpsAndReset(null, tableName);<a name="line.268"></a>
-<span class="sourceLineNo">269</span>      if (error != null) {<a 
name="line.269"></a>
-<span class="sourceLineNo">270</span>        if (listener == null) {<a 
name="line.270"></a>
-<span class="sourceLineNo">271</span>          throw error;<a 
name="line.271"></a>
-<span class="sourceLineNo">272</span>        } else {<a name="line.272"></a>
-<span class="sourceLineNo">273</span>          
this.listener.onException(error, this);<a name="line.273"></a>
-<span class="sourceLineNo">274</span>        }<a name="line.274"></a>
-<span class="sourceLineNo">275</span>      }<a name="line.275"></a>
+<span class="sourceLineNo">220</span>  private long 
firstRecordInBufferTimestamp = 0;<a name="line.220"></a>
+<span class="sourceLineNo">221</span>  private long 
executedWriteBufferPeriodicFlushes = 0;<a name="line.221"></a>
+<span class="sourceLineNo">222</span><a name="line.222"></a>
+<span class="sourceLineNo">223</span>  private void 
timerCallbackForWriteBufferPeriodicFlush() {<a name="line.223"></a>
+<span class="sourceLineNo">224</span>    if (currentWriteBufferSize.get() == 
0) {<a name="line.224"></a>
+<span class="sourceLineNo">225</span>      return; // Nothing to flush<a 
name="line.225"></a>
+<span class="sourceLineNo">226</span>    }<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    long now = 
System.currentTimeMillis();<a name="line.227"></a>
+<span class="sourceLineNo">228</span>    if (firstRecordInBufferTimestamp + 
writeBufferPeriodicFlushTimeoutMs &gt; now) {<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      return; // No need to flush yet<a 
name="line.229"></a>
+<span class="sourceLineNo">230</span>    }<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    // The first record in the 
writebuffer has been in there too long --&gt; flush<a name="line.231"></a>
+<span class="sourceLineNo">232</span>    try {<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      
executedWriteBufferPeriodicFlushes++;<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      flush();<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    } catch (InterruptedIOException | 
RetriesExhaustedWithDetailsException e) {<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      LOG.error("Exception during 
timerCallbackForWriteBufferPeriodicFlush --&gt; " + e.getMessage());<a 
name="line.236"></a>
+<span class="sourceLineNo">237</span>    }<a name="line.237"></a>
+<span class="sourceLineNo">238</span>  }<a name="line.238"></a>
+<span class="sourceLineNo">239</span><a name="line.239"></a>
+<span class="sourceLineNo">240</span>  // validate for well-formedness<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>  public void validatePut(final Put put) 
throws IllegalArgumentException {<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    HTable.validatePut(put, 
maxKeyValueSize);<a name="line.242"></a>
+<span class="sourceLineNo">243</span>  }<a name="line.243"></a>
+<span class="sourceLineNo">244</span><a name="line.244"></a>
+<span class="sourceLineNo">245</span>  @Override<a name="line.245"></a>
+<span class="sourceLineNo">246</span>  public synchronized void close() throws 
IOException {<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    try {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      if (this.closed) {<a 
name="line.248"></a>
+<span class="sourceLineNo">249</span>        return;<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      }<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span>      // Stop any running Periodic Flush 
timer.<a name="line.252"></a>
+<span class="sourceLineNo">253</span>      
disableWriteBufferPeriodicFlush();<a name="line.253"></a>
+<span class="sourceLineNo">254</span><a name="line.254"></a>
+<span class="sourceLineNo">255</span>      // As we can have an operation in 
progress even if the buffer is empty, we call<a name="line.255"></a>
+<span class="sourceLineNo">256</span>      // backgroundFlushCommits at least 
one time.<a name="line.256"></a>
+<span class="sourceLineNo">257</span>      backgroundFlushCommits(true);<a 
name="line.257"></a>
+<span class="sourceLineNo">258</span>      if (cleanupPoolOnClose) {<a 
name="line.258"></a>
+<span class="sourceLineNo">259</span>        this.pool.shutdown();<a 
name="line.259"></a>
+<span class="sourceLineNo">260</span>        boolean terminated;<a 
name="line.260"></a>
+<span class="sourceLineNo">261</span>        int loopCnt = 0;<a 
name="line.261"></a>
+<span class="sourceLineNo">262</span>        do {<a name="line.262"></a>
+<span class="sourceLineNo">263</span>          // wait until the pool has 
terminated<a name="line.263"></a>
+<span class="sourceLineNo">264</span>          terminated = 
this.pool.awaitTermination(60, TimeUnit.SECONDS);<a name="line.264"></a>
+<span class="sourceLineNo">265</span>          loopCnt += 1;<a 
name="line.265"></a>
+<span class="sourceLineNo">266</span>          if (loopCnt &gt;= 10) {<a 
name="line.266"></a>
+<span class="sourceLineNo">267</span>            LOG.warn("close() failed to 
terminate pool after 10 minutes. Abandoning pool.");<a name="line.267"></a>
+<span class="sourceLineNo">268</span>            break;<a name="line.268"></a>
+<span class="sourceLineNo">269</span>          }<a name="line.269"></a>
+<span class="sourceLineNo">270</span>        } while (!terminated);<a 
name="line.270"></a>
+<span class="sourceLineNo">271</span>      }<a name="line.271"></a>
+<span class="sourceLineNo">272</span>    } catch (InterruptedException e) {<a 
name="line.272"></a>
+<span class="sourceLineNo">273</span>      LOG.warn("waitForTermination 
interrupted");<a name="line.273"></a>
+<span class="sourceLineNo">274</span>    } finally {<a name="line.274"></a>
+<span class="sourceLineNo">275</span>      this.closed = true;<a 
name="line.275"></a>
 <span class="sourceLineNo">276</span>    }<a name="line.276"></a>
 <span class="sourceLineNo">277</span>  }<a name="line.277"></a>
 <span class="sourceLineNo">278</span><a name="line.278"></a>
-<span class="sourceLineNo">279</span>  /**<a name="line.279"></a>
-<span class="sourceLineNo">280</span>   * Reuse the AsyncProcessTask when 
calling {@link BufferedMutatorImpl#backgroundFlushCommits(boolean)}.<a 
name="line.280"></a>
-<span class="sourceLineNo">281</span>   * @param taker access the inner 
buffer.<a name="line.281"></a>
-<span class="sourceLineNo">282</span>   * @return An AsyncProcessTask which 
always returns the latest rpc and operation timeout.<a name="line.282"></a>
-<span class="sourceLineNo">283</span>   */<a name="line.283"></a>
-<span class="sourceLineNo">284</span>  private AsyncProcessTask 
wrapAsyncProcessTask(QueueRowAccess taker) {<a name="line.284"></a>
-<span class="sourceLineNo">285</span>    AsyncProcessTask task = 
AsyncProcessTask.newBuilder()<a name="line.285"></a>
-<span class="sourceLineNo">286</span>        .setPool(pool)<a 
name="line.286"></a>
-<span class="sourceLineNo">287</span>        .setTableName(tableName)<a 
name="line.287"></a>
-<span class="sourceLineNo">288</span>        .setRowAccess(taker)<a 
name="line.288"></a>
-<span class="sourceLineNo">289</span>        
.setSubmittedRows(AsyncProcessTask.SubmittedRows.AT_LEAST_ONE)<a 
name="line.289"></a>
-<span class="sourceLineNo">290</span>        .build();<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    return new AsyncProcessTask(task) {<a 
name="line.291"></a>
-<span class="sourceLineNo">292</span>      @Override<a name="line.292"></a>
-<span class="sourceLineNo">293</span>      public int getRpcTimeout() {<a 
name="line.293"></a>
-<span class="sourceLineNo">294</span>        return rpcTimeout.get();<a 
name="line.294"></a>
-<span class="sourceLineNo">295</span>      }<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span>      @Override<a name="line.297"></a>
-<span class="sourceLineNo">298</span>      public int getOperationTimeout() 
{<a name="line.298"></a>
-<span class="sourceLineNo">299</span>        return operationTimeout.get();<a 
name="line.299"></a>
-<span class="sourceLineNo">300</span>      }<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    };<a name="line.301"></a>
-<span class="sourceLineNo">302</span>  }<a name="line.302"></a>
-<span class="sourceLineNo">303</span><a name="line.303"></a>
-<span class="sourceLineNo">304</span>  /**<a name="line.304"></a>
-<span class="sourceLineNo">305</span>   * {@inheritDoc}<a name="line.305"></a>
-<span class="sourceLineNo">306</span>   */<a name="line.306"></a>
-<span class="sourceLineNo">307</span>  @Override<a name="line.307"></a>
-<span class="sourceLineNo">308</span>  public long getWriteBufferSize() {<a 
name="line.308"></a>
-<span class="sourceLineNo">309</span>    return this.writeBufferSize;<a 
name="line.309"></a>
-<span class="sourceLineNo">310</span>  }<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span>  @Override<a name="line.312"></a>
-<span class="sourceLineNo">313</span>  public void setRpcTimeout(int 
rpcTimeout) {<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    this.rpcTimeout.set(rpcTimeout);<a 
name="line.314"></a>
-<span class="sourceLineNo">315</span>  }<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span>  @Override<a name="line.317"></a>
-<span class="sourceLineNo">318</span>  public void setOperationTimeout(int 
operationTimeout) {<a name="line.318"></a>
-<span class="sourceLineNo">319</span>    
this.operationTimeout.set(operationTimeout);<a name="line.319"></a>
-<span class="sourceLineNo">320</span>  }<a name="line.320"></a>
-<span class="sourceLineNo">321</span><a name="line.321"></a>
-<span class="sourceLineNo">322</span>  @VisibleForTesting<a 
name="line.322"></a>
-<span class="sourceLineNo">323</span>  long getCurrentWriteBufferSize() {<a 
name="line.323"></a>
-<span class="sourceLineNo">324</span>    return 
currentWriteBufferSize.get();<a name="line.324"></a>
-<span class="sourceLineNo">325</span>  }<a name="line.325"></a>
-<span class="sourceLineNo">326</span><a name="line.326"></a>
-<span class="sourceLineNo">327</span>  @VisibleForTesting<a 
name="line.327"></a>
-<span class="sourceLineNo">328</span>  int size() {<a name="line.328"></a>
-<span class="sourceLineNo">329</span>    return undealtMutationCount.get();<a 
name="line.329"></a>
-<span class="sourceLineNo">330</span>  }<a name="line.330"></a>
-<span class="sourceLineNo">331</span><a name="line.331"></a>
-<span class="sourceLineNo">332</span>  private class QueueRowAccess implements 
RowAccess&lt;Row&gt; {<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    private int remainder = 
undealtMutationCount.getAndSet(0);<a name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span>    void reset() {<a name="line.335"></a>
-<span class="sourceLineNo">336</span>      restoreRemainder();<a 
name="line.336"></a>
-<span class="sourceLineNo">337</span>      remainder = 
undealtMutationCount.getAndSet(0);<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    }<a name="line.338"></a>
-<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span>    @Override<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    public Iterator&lt;Row&gt; iterator() 
{<a name="line.341"></a>
-<span class="sourceLineNo">342</span>      return new Iterator&lt;Row&gt;() 
{<a name="line.342"></a>
-<span class="sourceLineNo">343</span>        private final 
Iterator&lt;Mutation&gt; iter = writeAsyncBuffer.iterator();<a 
name="line.343"></a>
-<span class="sourceLineNo">344</span>        private int countDown = 
remainder;<a name="line.344"></a>
-<span class="sourceLineNo">345</span>        private Mutation last = null;<a 
name="line.345"></a>
-<span class="sourceLineNo">346</span>        @Override<a name="line.346"></a>
-<span class="sourceLineNo">347</span>        public boolean hasNext() {<a 
name="line.347"></a>
-<span class="sourceLineNo">348</span>          if (countDown &lt;= 0) {<a 
name="line.348"></a>
-<span class="sourceLineNo">349</span>            return false;<a 
name="line.349"></a>
-<span class="sourceLineNo">350</span>          }<a name="line.350"></a>
-<span class="sourceLineNo">351</span>          return iter.hasNext();<a 
name="line.351"></a>
-<span class="sourceLineNo">352</span>        }<a name="line.352"></a>
-<span class="sourceLineNo">353</span>        @Override<a name="line.353"></a>
-<span class="sourceLineNo">354</span>        public Row next() {<a 
name="line.354"></a>
-<span class="sourceLineNo">355</span>          if (!hasNext()) {<a 
name="line.355"></a>
-<span class="sourceLineNo">356</span>            throw new 
NoSuchElementException();<a name="line.356"></a>
-<span class="sourceLineNo">357</span>          }<a name="line.357"></a>
-<span class="sourceLineNo">358</span>          last = iter.next();<a 
name="line.358"></a>
-<span class="sourceLineNo">359</span>          if (last == null) {<a 
name="line.359"></a>
-<span class="sourceLineNo">360</span>            throw new 
NoSuchElementException();<a name="line.360"></a>
-<span class="sourceLineNo">361</span>          }<a name="line.361"></a>
-<span class="sourceLineNo">362</span>          --countDown;<a 
name="line.362"></a>
-<span class="sourceLineNo">363</span>          return last;<a 
name="line.363"></a>
-<span class="sourceLineNo">364</span>        }<a name="line.364"></a>
-<span class="sourceLineNo">365</span>        @Override<a name="line.365"></a>
-<span class="sourceLineNo">366</span>        public void remove() {<a 
name="line.366"></a>
-<span class="sourceLineNo">367</span>          if (last == null) {<a 
name="line.367"></a>
-<span class="sourceLineNo">368</span>            throw new 
IllegalStateException();<a name="line.368"></a>
-<span class="sourceLineNo">369</span>          }<a name="line.369"></a>
-<span class="sourceLineNo">370</span>          iter.remove();<a 
name="line.370"></a>
-<span class="sourceLineNo">371</span>          
currentWriteBufferSize.addAndGet(-last.heapSize());<a name="line.371"></a>
-<span class="sourceLineNo">372</span>          --remainder;<a 
name="line.372"></a>
-<span class="sourceLineNo">373</span>        }<a name="line.373"></a>
-<span class="sourceLineNo">374</span>      };<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    }<a name="line.375"></a>
+<span class="sourceLineNo">279</span>  @Override<a name="line.279"></a>
+<span class="sourceLineNo">280</span>  public synchronized void flush() throws 
InterruptedIOException,<a name="line.280"></a>
+<span class="sourceLineNo">281</span>      
RetriesExhaustedWithDetailsException {<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    // As we can have an operation in 
progress even if the buffer is empty, we call<a name="line.282"></a>
+<span class="sourceLineNo">283</span>    // backgroundFlushCommits at least 
one time.<a name="line.283"></a>
+<span class="sourceLineNo">284</span>    backgroundFlushCommits(true);<a 
name="line.284"></a>
+<span class="sourceLineNo">285</span>  }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span>  /**<a name="line.287"></a>
+<span class="sourceLineNo">288</span>   * Send the operations in the buffer to 
the servers. Does not wait for the server's answer. If<a name="line.288"></a>
+<span class="sourceLineNo">289</span>   * the is an error (max retried reach 
from a previous flush or bad operation), it tries to send<a name="line.289"></a>
+<span class="sourceLineNo">290</span>   * all operations in the buffer and 
sends an exception.<a name="line.290"></a>
+<span class="sourceLineNo">291</span>   *<a name="line.291"></a>
+<span class="sourceLineNo">292</span>   * @param synchronous - if true, sends 
all the writes and wait for all of them to finish before<a name="line.292"></a>
+<span class="sourceLineNo">293</span>   *        returning.<a 
name="line.293"></a>
+<span class="sourceLineNo">294</span>   */<a name="line.294"></a>
+<span class="sourceLineNo">295</span>  private void 
backgroundFlushCommits(boolean synchronous) throws<a name="line.295"></a>
+<span class="sourceLineNo">296</span>      InterruptedIOException,<a 
name="line.296"></a>
+<span class="sourceLineNo">297</span>      
RetriesExhaustedWithDetailsException {<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    if (!synchronous &amp;&amp; 
writeAsyncBuffer.isEmpty()) {<a name="line.298"></a>
+<span class="sourceLineNo">299</span>      return;<a name="line.299"></a>
+<span class="sourceLineNo">300</span>    }<a name="line.300"></a>
+<span class="sourceLineNo">301</span><a name="line.301"></a>
+<span class="sourceLineNo">302</span>    if (!synchronous) {<a 
name="line.302"></a>
+<span class="sourceLineNo">303</span>      QueueRowAccess taker = new 
QueueRowAccess();<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      AsyncProcessTask task = 
wrapAsyncProcessTask(taker);<a name="line.304"></a>
+<span class="sourceLineNo">305</span>      try {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>        ap.submit(task);<a 
name="line.306"></a>
+<span class="sourceLineNo">307</span>        if (ap.hasError()) {<a 
name="line.307"></a>
+<span class="sourceLineNo">308</span>          LOG.debug(tableName + ": One or 
more of the operations have failed -"<a name="line.308"></a>
+<span class="sourceLineNo">309</span>              + " waiting for all 
operation in progress to finish (successfully or not)");<a name="line.309"></a>
+<span class="sourceLineNo">310</span>        }<a name="line.310"></a>
+<span class="sourceLineNo">311</span>      } finally {<a name="line.311"></a>
+<span class="sourceLineNo">312</span>        taker.restoreRemainder();<a 
name="line.312"></a>
+<span class="sourceLineNo">313</span>      }<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    }<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    if (synchronous || ap.hasError()) {<a 
name="line.315"></a>
+<span class="sourceLineNo">316</span>      QueueRowAccess taker = new 
QueueRowAccess();<a name="line.316"></a>
+<span class="sourceLineNo">317</span>      AsyncProcessTask task = 
wrapAsyncProcessTask(taker);<a name="line.317"></a>
+<span class="sourceLineNo">318</span>      try {<a name="line.318"></a>
+<span class="sourceLineNo">319</span>        while (!taker.isEmpty()) {<a 
name="line.319"></a>
+<span class="sourceLineNo">320</span>          ap.submit(task);<a 
name="line.320"></a>
+<span class="sourceLineNo">321</span>          taker.reset();<a 
name="line.321"></a>
+<span class="sourceLineNo">322</span>        }<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      } finally {<a name="line.323"></a>
+<span class="sourceLineNo">324</span>        taker.restoreRemainder();<a 
name="line.324"></a>
+<span class="sourceLineNo">325</span>      }<a name="line.325"></a>
+<span class="sourceLineNo">326</span>      
RetriesExhaustedWithDetailsException error =<a name="line.326"></a>
+<span class="sourceLineNo">327</span>          
ap.waitForAllPreviousOpsAndReset(null, tableName);<a name="line.327"></a>
+<span class="sourceLineNo">328</span>      if (error != null) {<a 
name="line.328"></a>
+<span class="sourceLineNo">329</span>        if (listener == null) {<a 
name="line.329"></a>
+<span class="sourceLineNo">330</span>          throw error;<a 
name="line.330"></a>
+<span class="sourceLineNo">331</span>        } else {<a name="line.331"></a>
+<span class="sourceLineNo">332</span>          
this.listener.onException(error, this);<a name="line.332"></a>
+<span class="sourceLineNo">333</span>        }<a name="line.333"></a>
+<span class="sourceLineNo">334</span>      }<a name="line.334"></a>
+<span class="sourceLineNo">335</span>    }<a name="line.335"></a>
+<span class="sourceLineNo">336</span>  }<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span>  /**<a name="line.338"></a>
+<span class="sourceLineNo">339</span>   * Reuse the AsyncProcessTask when 
calling<a name="line.339"></a>
+<span class="sourceLineNo">340</span>   * {@link 
BufferedMutatorImpl#backgroundFlushCommits(boolean)}.<a name="line.340"></a>
+<span class="sourceLineNo">341</span>   * @param taker access the inner 
buffer.<a name="line.341"></a>
+<span class="sourceLineNo">342</span>   * @return An AsyncProcessTask which 
always returns the latest rpc and operation timeout.<a name="line.342"></a>
+<span class="sourceLineNo">343</span>   */<a name="line.343"></a>
+<span class="sourceLineNo">344</span>  private AsyncProcessTask 
wrapAsyncProcessTask(QueueRowAccess taker) {<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    AsyncProcessTask task = 
AsyncProcessTask.newBuilder()<a name="line.345"></a>
+<span class="sourceLineNo">346</span>        .setPool(pool)<a 
name="line.346"></a>
+<span class="sourceLineNo">347</span>        .setTableName(tableName)<a 
name="line.347"></a>
+<span class="sourceLineNo">348</span>        .setRowAccess(taker)<a 
name="line.348"></a>
+<span class="sourceLineNo">349</span>        
.setSubmittedRows(AsyncProcessTask.SubmittedRows.AT_LEAST_ONE)<a 
name="line.349"></a>
+<span class="sourceLineNo">350</span>        .build();<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    return new AsyncProcessTask(task) {<a 
name="line.351"></a>
+<span class="sourceLineNo">352</span>      @Override<a name="line.352"></a>
+<span class="sourceLineNo">353</span>      public int getRpcTimeout() {<a 
name="line.353"></a>
+<span class="sourceLineNo">354</span>        return rpcTimeout.get();<a 
name="line.354"></a>
+<span class="sourceLineNo">355</span>      }<a name="line.355"></a>
+<span class="sourceLineNo">356</span><a name="line.356"></a>
+<span class="sourceLineNo">357</span>      @Override<a name="line.357"></a>
+<span class="sourceLineNo">358</span>      public int getOperationTimeout() 
{<a name="line.358"></a>
+<span class="sourceLineNo">359</span>        return operationTimeout.get();<a 
name="line.359"></a>
+<span class="sourceLineNo">360</span>      }<a name="line.360"></a>
+<span class="sourceLineNo">361</span>    };<a name="line.361"></a>
+<span class="sourceLineNo">362</span>  }<a name="line.362"></a>
+<span class="sourceLineNo">363</span><a name="line.363"></a>
+<span class="sourceLineNo">364</span>  /**<a name="line.364"></a>
+<span class="sourceLineNo">365</span>   * {@inheritDoc}<a name="line.365"></a>
+<span class="sourceLineNo">366</span>   */<a name="line.366"></a>
+<span class="sourceLineNo">367</span>  @Override<a name="line.367"></a>
+<span class="sourceLineNo">368</span>  public long getWriteBufferSize() {<a 
name="line.368"></a>
+<span class="sourceLineNo">369</span>    return this.writeBufferSize;<a 
name="line.369"></a>
+<span class="sourceLineNo">370</span>  }<a name="line.370"></a>
+<span class="sourceLineNo">371</span><a name="line.371"></a>
+<span class="sourceLineNo">372</span>  @Override<a name="line.372"></a>
+<span class="sourceLineNo">373</span>  public void 
setWriteBufferPeriodicFlush(long timeoutMs, long timerTickMs) {<a 
name="line.373"></a>
+<span class="sourceLineNo">374</span>    long originalTimeoutMs   = 
this.writeBufferPeriodicFlushTimeoutMs;<a name="line.374"></a>
+<span class="sourceLineNo">375</span>    long originalTimerTickMs = 
this.writeBufferPeriodicFlushTimerTickMs;<a name="line.375"></a>
 <span class="sourceLineNo">376</span><a name="line.376"></a>
-<span class="sourceLineNo">377</span>    @Override<a name="line.377"></a>
-<span class="sourceLineNo">378</span>    public int size() {<a 
name="line.378"></a>
-<span class="sourceLineNo">379</span>      return remainder;<a 
name="line.379"></a>
-<span class="sourceLineNo">380</span>    }<a name="line.380"></a>
+<span class="sourceLineNo">377</span>    // Both parameters have minimal 
values.<a name="line.377"></a>
+<span class="sourceLineNo">378</span>    
this.writeBufferPeriodicFlushTimeoutMs   = Math.max(0, timeoutMs);<a 
name="line.378"></a>
+<span class="sourceLineNo">379</span>    
this.writeBufferPeriodicFlushTimerTickMs =<a name="line.379"></a>
+<span class="sourceLineNo">380</span>            
Math.max(MIN_WRITE_BUFFER_PERIODIC_FLUSH_TIMERTICK_MS, timerTickMs);<a 
name="line.380"></a>
 <span class="sourceLineNo">381</span><a name="line.381"></a>
-<span class="sourceLineNo">382</span>    void restoreRemainder() {<a 
name="line.382"></a>
-<span class="sourceLineNo">383</span>      if (remainder &gt; 0) {<a 
name="line.383"></a>
-<span class="sourceLineNo">384</span>        
undealtMutationCount.addAndGet(remainder);<a name="line.384"></a>
-<span class="sourceLineNo">385</span>        remainder = 0;<a 
name="line.385"></a>
-<span class="sourceLineNo">386</span>      }<a name="line.386"></a>
-<span class="sourceLineNo">387</span>    }<a name="line.387"></a>
-<span class="sourceLineNo">388</span><a name="line.388"></a>
-<span class="sourceLineNo">389</span>    @Override<a name="line.389"></a>
-<span class="sourceLineNo">390</span>    public boolean isEmpty() {<a 
name="line.390"></a>
-<span class="sourceLineNo">391</span>      return remainder &lt;= 0;<a 
name="line.391"></a>
-<span class="sourceLineNo">392</span>    }<a name="line.392"></a>
-<span class="sourceLineNo">393</span>  }<a name="line.393"></a>
-<span class="sourceLineNo">394</span>}<a name="line.394"></a>
+<span class="sourceLineNo">382</span>    // If something changed we stop the 
old Timer.<a name="line.382"></a>
+<span class="sourceLineNo">383</span>    if 
(this.writeBufferPeriodicFlushTimeoutMs   != originalTimeoutMs  ||<a 
name="line.383"></a>
+<span class="sourceLineNo">384</span>        
this.writeBufferPeriodicFlushTimerTickMs != originalTimerTickMs) {<a 
name="line.384"></a>
+<span class="sourceLineNo">385</span>      if (writeBufferPeriodicFlushTimer 
!= null) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span>        
writeBufferPeriodicFlushTimer.cancel();<a name="line.386"></a>
+<span class="sourceLineNo">387</span>        writeBufferPeriodicFlushTimer = 
null;<a name="line.387"></a>
+<span class="sourceLineNo">388</span>      }<a name="line.388"></a>
+<span class="sourceLineNo">389</span>    }<a name="line.389"></a>
+<span class="sourceLineNo">390</span><a name="line.390"></a>
+<span class="sourceLineNo">391</span>    // If we have the need for a timer 
and there is none we start it<a name="line.391"></a>
+<span class="sourceLineNo">392</span>    if (writeBufferPeriodicFlushTimer == 
null &amp;&amp;<a name="line.392"></a>
+<span class="sourceLineNo">393</span>        writeBufferPeriodicFlushTimeoutMs 
&gt; 0) {<a name="line.393"></a>
+<span class="sourceLineNo">394</span>      writeBufferPeriodicFlushTimer = new 
Timer(true); // Create Timer running as Daemon.<a name="line.394"></a>
+<span class="sourceLineNo">395</span>      
writeBufferPeriodicFlushTimer.schedule(new TimerTask() {<a name="line.395"></a>
+<span class="sourceLineNo">396</span>        @Override<a name="line.396"></a>
+<span class="sourceLineNo">397</span>        public void run() {<a 
name="line.397"></a>
+<span class="sourceLineNo">398</span>          
BufferedMutatorImpl.this.timerCallbackForWriteBufferPeriodicFlush();<a 
name="line.398"></a>
+<span class="sourceLineNo">399</span>        }<a name="line.399"></a>
+<span class="sourceLineNo">400</span>      }, 
writeBufferPeriodicFlushTimerTickMs, writeBufferPeriodicFlushTimerTickMs);<a 
name="line.400"></a>
+<span class="sourceLineNo">401</span>    }<a name="line.401"></a>
+<span class="sourceLineNo">402</span>  }<a name="line.402"></a>
+<span class="sourceLineNo">403</span><a name="line.403"></a>
+<span class="sourceLineNo">404</span>  @Override<a name="line.404"></a>
+<span class="sourceLineNo">405</span>  public long 
getWriteBufferPeriodicFlushTimeoutMs() {<a name="line.405"></a>
+<span class="sourceLineNo">406</span>    return 
this.writeBufferPeriodicFlushTimeoutMs;<a name="line.406"></a>
+<span class="sourceLineNo">407</span>  }<a name="line.407"></a>
+<span class="sourceLineNo">408</span><a name="line.408"></a>
+<span class="sourceLineNo">409</span>  @Override<a name="line.409"></a>
+<span class="sourceLineNo">410</span>  public long 
getWriteBufferPeriodicFlushTimerTickMs() {<a name="line.410"></a>
+<span class="sourceLineNo">411</span>    return 
this.writeBufferPeriodicFlushTimerTickMs;<a name="line.411"></a>
+<span class="sourceLineNo">412</span>  }<a name="line.412"></a>
+<span class="sourceLineNo">413</span><a name="line.413"></a>
+<span class="sourceLineNo">414</span>  @Override<a name="line.414"></a>
+<span class="sourceLineNo">415</span>  public void setRpcTimeout(int 
rpcTimeout) {<a name="line.415"></a>
+<span class="sourceLineNo">416</span>    this.rpcTimeout.set(rpcTimeout);<a 
name="line.416"></a>
+<span class="sourceLineNo">417</span>  }<a name="line.417"></a>
+<span class="sourceLineNo">418</span><a name="line.418"></a>
+<span class="sourceLineNo">419</span>  @Override<a name="line.419"></a>
+<span class="sourceLineNo">420</span>  public void setOperationTimeout(int 
operationTimeout) {<a name="line.420"></a>
+<span class="sourceLineNo">421</span>    
this.operationTimeout.set(operationTimeout);<a name="line.421"></a>
+<span class="sourceLineNo">422</span>  }<a name="line.422"></a>
+<span class="sourceLineNo">423</span><a name="line.423"></a>
+<span class="sourceLineNo">424</span>  @VisibleForTesting<a 
name="line.424"></a>
+<span class="sourceLineNo">425</span>  long getCurrentWriteBufferSize() {<a 
name="line.425"></a>
+<span class="sourceLineNo">426</span>    return 
currentWriteBufferSize.get();<a name="line.426"></a>
+<span class="sourceLineNo">427</span>  }<a name="line.427"></a>
+<span class="sourceLineNo">428</span><a name="line.428"></a>
+<span class="sourceLineNo">429</span>  @VisibleForTesting<a 
name="line.429"></a>
+<span class="sourceLineNo">430</span>  int size() {<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    return undealtMutationCount.get();<a 
name="line.431"></a>
+<span class="sourceLineNo">432</span>  }<a name="line.432"></a>
+<span class="sourceLineNo">433</span><a name="line.433"></a>
+<span class="sourceLineNo">434</span>  private class QueueRowAccess implements 
RowAccess&lt;Row&gt; {<a name="line.434"></a>
+<span class="sourceLineNo">435</span>    private int remainder = 
undealtMutationCount.getAndSet(0);<a name="line.435"></a>
+<span class="sourceLineNo">436</span><a name="line.436"></a>
+<span class="sourceLineNo">437</span>    void reset() {<a name="line.437"></a>
+<span class="sourceLineNo">438</span>      restoreRemainder();<a 
name="line.438"></a>
+<span class="sourceLineNo">439</span>      remainder = 
undealtMutationCount.getAndSet(0);<a name="line.439"></a>
+<span class="sourceLineNo">440</span>    }<a name="line.440"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span>    @Override<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    public Iterator&lt;Row&gt; iterator() 
{<a name="line.443"></a>
+<span class="sourceLineNo">444</span>      return new Iterator&lt;Row&gt;() 
{<a name="line.444"></a>
+<span class="sourceLineNo">445</span>        private final 
Iterator&lt;Mutation&gt; iter = writeAsyncBuffer.iterator();<a 
name="line.445"></a>
+<span class="sourceLineNo">446</span>        private int countDown = 
remainder;<a name="line.446"></a>
+<span class="sourceLineNo">447</span>        private Mutation last = null;<a 
name="line.447"></a>
+<span class="sourceLineNo">448</span>        @Override<a name="line.448"></a>
+<span class="sourceLineNo">449</span>        public boolean hasNext() {<a 
name="line.449"></a>
+<span class="sourceLineNo">450</span>          if (countDown &lt;= 0) {<a 
name="line.450"></a>
+<span class="sourceLineNo">451</span>            return false;<a 
name="line.451"></a>
+<span class="sourceLineNo">452</span>          }<a name="line.452"></a>
+<span class="sourceLineNo">453</span>          return iter.hasNext();<a 
name="line.453"></a>
+<span class="sourceLineNo">454</span>        }<a name="line.454"></a>
+<span class="sourceLineNo">455</span>        @Override<a name="line.455"></a>
+<span class="sourceLineNo">456</span>        public Row next() {<a 
name="line.456"></a>
+<span class="sourceLineNo">457</span>          if (!hasNext()) {<a 
name="line.457"></a>
+<span class="sourceLineNo">458</span>            throw new 
NoSuchElementException();<a name="line.458"></a>
+<span class="sourceLineNo">459</span>          }<a name="line.459"></a>
+<span class="sourceLineNo">460</span>          last = iter.next();<a 
name="line.460"></a>
+<span class="sourceLineNo">461</span>          if (last == null) {<a 
name="line.461"></a>
+<span class="sourceLineNo">462</span>            throw new 
NoSuchElementException();<a name="line.462"></a>
+<span class="sourceLineNo">463</span>          }<a name="line.463"></a>
+<span class="sourceLineNo">464</span>          --countDown;<a 
name="line.464"></a>
+<span class="sourceLineNo">465</span>          return last;<a 
name="line.465"></a>
+<span class="sourceLineNo">466</span>        }<a name="line.466"></a>
+<span class="sourceLineNo">467</span>        @Override<a name="line.467"></a>
+<span class="sourceLineNo">468</span>        public void remove() {<a 
name="line.468"></a>
+<span class="sourceLineNo">469</span>          if (last == null) {<a 
name="line.469"></a>
+<span class="sourceLineNo">470</span>            throw new 
IllegalStateException();<a name="line.470"></a>
+<span class="sourceLineNo">471</span>          }<a name="line.471"></a>
+<span class="sourceLineNo">472</span>          iter.remove();<a 
name="line.472"></a>
+<span class="sourceLineNo">473</span>          
currentWriteBufferSize.addAndGet(-last.heapSize());<a name="line.473"></a>
+<span class="sourceLineNo">474</span>          --remainder;<a 
name="line.474"></a>
+<span class="sourceLineNo">475</span>        }<a name="line.475"></a>
+<span class="sourceLineNo">476</span>      };<a name="line.476"></a>
+<span class="sourceLineNo">477</span>    }<a name="line.477"></a>
+<span class="sourceLineNo">478</span><a name="line.478"></a>
+<span class="sourceLineNo">479</span>    @Override<a name="line.479"></a>
+<span class="sourceLineNo">480</span>    public int size() {<a 
name="line.480"></a>
+<span class="sourceLineNo">481</span>      return remainder;<a 
name="line.481"></a>
+<span class="sourceLineNo">482</span>    }<a name="line.482"></a>
+<span class="sourceLineNo">483</span><a name="line.483"></a>
+<span class="sourceLineNo">484</span>    void restoreRemainder() {<a 
name="line.484"></a>
+<span class="sourceLineNo">485</span>      if (remainder &gt; 0) {<a 
name="line.485"></a>
+<span class="sourceLineNo">486</span>        
undealtMutationCount.addAndGet(remainder);<a name="line.486"></a>
+<span class="sourceLineNo">487</span>        remainder = 0;<a 
name="line.487"></a>
+<span class="sourceLineNo">488</span>      }<a name="line.488"></a>
+<span class="sourceLineNo">489</span>    }<a name="line.489"></a>
+<span class="sourceLineNo">490</span><a name="line.490"></a>
+<span class="sourceLineNo">491</span>    @Override<a name="line.491"></a>
+<span class="sourceLineNo">492</span>    public boolean isEmpty() {<a 
name="line.492"></a>
+<span class="sourceLineNo">493</span>      return remainder &lt;= 0;<a 
name="line.493"></a>
+<span class="sourceLineNo">494</span>    }<a name="line.494"></a>
+<span class="sourceLineNo">495</span>  }<a name="line.495"></a>
+<span class="sourceLineNo">496</span>}<a name="line.496"></a>
 
 
 

Reply via email to