http://git-wip-us.apache.org/repos/asf/hbase-site/blob/32453e2d/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoadWithOldClient.AtomicHFileLoader.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoadWithOldClient.AtomicHFileLoader.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoadWithOldClient.AtomicHFileLoader.html
index d4f7627..4496495 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoadWithOldClient.AtomicHFileLoader.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoadWithOldClient.AtomicHFileLoader.html
@@ -28,152 +28,151 @@
 <span class="sourceLineNo">020</span>import java.io.IOException;<a 
name="line.20"></a>
 <span class="sourceLineNo">021</span>import java.util.ArrayList;<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.Optional;<a 
name="line.23"></a>
-<span class="sourceLineNo">024</span>import 
java.util.concurrent.atomic.AtomicLong;<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.fs.FileSystem;<a 
name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.fs.Path;<a 
name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.MultithreadedTestUtil.RepeatingTestThread;<a 
name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.MultithreadedTestUtil.TestContext;<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.client.ClientServiceCallable;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.client.ClusterConnection;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.client.RpcRetryingCaller;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.client.RpcRetryingCallerFactory;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.ipc.RpcControllerFactory;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.shaded.protobuf.RequestConverter;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos;<a 
name="line.40"></a>
-<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CompactRegionRequest;<a
 name="line.41"></a>
-<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.BulkLoadHFileRequest;<a
 name="line.42"></a>
-<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.testclassification.RegionServerTests;<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.util.Pair;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
org.junit.experimental.categories.Category;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.junit.runner.RunWith;<a 
name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.junit.runners.Parameterized;<a 
name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<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> * Tests bulk loading of HFiles with old 
non-secure client for backward compatibility. Will be<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * removed when old non-secure client for 
backward compatibility is not supported.<a name="line.55"></a>
-<span class="sourceLineNo">056</span> */<a name="line.56"></a>
-<span class="sourceLineNo">057</span>@RunWith(Parameterized.class)<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>@Category({RegionServerTests.class, 
LargeTests.class})<a name="line.58"></a>
-<span class="sourceLineNo">059</span>public class 
TestHRegionServerBulkLoadWithOldClient extends TestHRegionServerBulkLoad {<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span>  public 
TestHRegionServerBulkLoadWithOldClient(int duration) {<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    super(duration);<a name="line.61"></a>
-<span class="sourceLineNo">062</span>  }<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>  private static final Log LOG = 
LogFactory.getLog(TestHRegionServerBulkLoadWithOldClient.class);<a 
name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>  public static class AtomicHFileLoader 
extends RepeatingTestThread {<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    final AtomicLong numBulkLoads = new 
AtomicLong();<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    final AtomicLong numCompactions = new 
AtomicLong();<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    private TableName tableName;<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span>    public AtomicHFileLoader(TableName 
tableName, TestContext ctx,<a name="line.71"></a>
-<span class="sourceLineNo">072</span>        byte targetFamilies[][]) throws 
IOException {<a name="line.72"></a>
-<span class="sourceLineNo">073</span>      super(ctx);<a name="line.73"></a>
-<span class="sourceLineNo">074</span>      this.tableName = tableName;<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 void doAnAction() throws 
Exception {<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      long iteration = 
numBulkLoads.getAndIncrement();<a name="line.78"></a>
-<span class="sourceLineNo">079</span>      Path dir =  
UTIL.getDataTestDirOnTestFS(String.format("bulkLoad_%08d",<a name="line.79"></a>
-<span class="sourceLineNo">080</span>          iteration));<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span>      // create HFiles for different 
column families<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      FileSystem fs = 
UTIL.getTestFileSystem();<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      byte[] val = 
Bytes.toBytes(String.format("%010d", iteration));<a name="line.84"></a>
-<span class="sourceLineNo">085</span>      final List&lt;Pair&lt;byte[], 
String&gt;&gt; famPaths = new ArrayList&lt;&gt;(NUM_CFS);<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      for (int i = 0; i &lt; NUM_CFS; 
i++) {<a name="line.86"></a>
-<span class="sourceLineNo">087</span>        Path hfile = new Path(dir, 
family(i));<a name="line.87"></a>
-<span class="sourceLineNo">088</span>        byte[] fam = 
Bytes.toBytes(family(i));<a name="line.88"></a>
-<span class="sourceLineNo">089</span>        createHFile(fs, hfile, fam, QUAL, 
val, 1000);<a name="line.89"></a>
-<span class="sourceLineNo">090</span>        famPaths.add(new 
Pair&lt;&gt;(fam, hfile.toString()));<a name="line.90"></a>
-<span class="sourceLineNo">091</span>      }<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span>      // bulk load HFiles<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>      final ClusterConnection conn = 
(ClusterConnection) UTIL.getAdmin().getConnection();<a name="line.94"></a>
-<span class="sourceLineNo">095</span>      RpcControllerFactory 
rpcControllerFactory = new RpcControllerFactory(UTIL.getConfiguration());<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span>      ClientServiceCallable&lt;Void&gt; 
callable =<a name="line.96"></a>
-<span class="sourceLineNo">097</span>          new 
ClientServiceCallable&lt;Void&gt;(conn, tableName,<a name="line.97"></a>
-<span class="sourceLineNo">098</span>              Bytes.toBytes("aaa"), 
rpcControllerFactory.newController(), HConstants.PRIORITY_UNSET) {<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>        @Override<a name="line.99"></a>
-<span class="sourceLineNo">100</span>        protected Void rpcCall() throws 
Exception {<a name="line.100"></a>
-<span class="sourceLineNo">101</span>          LOG.info("Non-secure old 
client");<a name="line.101"></a>
-<span class="sourceLineNo">102</span>          byte[] regionName = 
getLocation().getRegionInfo().getRegionName();<a name="line.102"></a>
-<span class="sourceLineNo">103</span>              BulkLoadHFileRequest 
request =<a name="line.103"></a>
-<span class="sourceLineNo">104</span>                  RequestConverter<a 
name="line.104"></a>
-<span class="sourceLineNo">105</span>                      
.buildBulkLoadHFileRequest(famPaths, regionName, true, null, null);<a 
name="line.105"></a>
-<span class="sourceLineNo">106</span>              
getStub().bulkLoadHFile(null, request);<a name="line.106"></a>
-<span class="sourceLineNo">107</span>              return null;<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>        }<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      };<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      RpcRetryingCallerFactory factory = 
new RpcRetryingCallerFactory(conf);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      RpcRetryingCaller&lt;Void&gt; 
caller = factory.&lt;Void&gt; newCaller();<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      caller.callWithRetries(callable, 
Integer.MAX_VALUE);<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span>      // Periodically do compaction to 
reduce the number of open file handles.<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      if (numBulkLoads.get() % 5 == 0) 
{<a name="line.115"></a>
-<span class="sourceLineNo">116</span>        // 5 * 50 = 250 open file 
handles!<a name="line.116"></a>
-<span class="sourceLineNo">117</span>        callable = new 
ClientServiceCallable&lt;Void&gt;(conn, tableName,<a name="line.117"></a>
-<span class="sourceLineNo">118</span>            Bytes.toBytes("aaa"), 
rpcControllerFactory.newController(), HConstants.PRIORITY_UNSET) {<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>          @Override<a name="line.119"></a>
-<span class="sourceLineNo">120</span>          protected Void rpcCall() throws 
Exception {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>            LOG.debug("compacting " + 
getLocation() + " for row "<a name="line.121"></a>
-<span class="sourceLineNo">122</span>                + 
Bytes.toStringBinary(getRow()));<a name="line.122"></a>
-<span class="sourceLineNo">123</span>            
AdminProtos.AdminService.BlockingInterface server =<a name="line.123"></a>
-<span class="sourceLineNo">124</span>              
conn.getAdmin(getLocation().getServerName());<a name="line.124"></a>
-<span class="sourceLineNo">125</span>            CompactRegionRequest request 
=<a name="line.125"></a>
-<span class="sourceLineNo">126</span>              
RequestConverter.buildCompactRegionRequest(<a name="line.126"></a>
-<span class="sourceLineNo">127</span>                
getLocation().getRegionInfo().getRegionName(), true, Optional.empty());<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>            server.compactRegion(null, 
request);<a name="line.128"></a>
-<span class="sourceLineNo">129</span>            
numCompactions.incrementAndGet();<a name="line.129"></a>
-<span class="sourceLineNo">130</span>            return null;<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>          }<a name="line.131"></a>
-<span class="sourceLineNo">132</span>        };<a name="line.132"></a>
-<span class="sourceLineNo">133</span>        caller.callWithRetries(callable, 
Integer.MAX_VALUE);<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      }<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>  void runAtomicBulkloadTest(TableName 
tableName, int millisToRun, int numScanners)<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      throws Exception {<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>    setupTable(tableName, 10);<a 
name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>    TestContext ctx = new 
TestContext(UTIL.getConfiguration());<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span>    AtomicHFileLoader loader = new 
AtomicHFileLoader(tableName, ctx, null);<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    ctx.addThread(loader);<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span>    List&lt;AtomicScanReader&gt; scanners 
= Lists.newArrayList();<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    for (int i = 0; i &lt; numScanners; 
i++) {<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      AtomicScanReader scanner = new 
AtomicScanReader(tableName, ctx, families);<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      scanners.add(scanner);<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>      ctx.addThread(scanner);<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>    ctx.startThreads();<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>    ctx.waitFor(millisToRun);<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>    ctx.stop();<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span>    LOG.info("Loaders:");<a 
name="line.158"></a>
-<span class="sourceLineNo">159</span>    LOG.info("  loaded " + 
loader.numBulkLoads.get());<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    LOG.info("  compations " + 
loader.numCompactions.get());<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span>    LOG.info("Scanners:");<a 
name="line.162"></a>
-<span class="sourceLineNo">163</span>    for (AtomicScanReader scanner : 
scanners) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span>      LOG.info("  scanned " + 
scanner.numScans.get());<a name="line.164"></a>
-<span class="sourceLineNo">165</span>      LOG.info("  verified " + 
scanner.numRowsScanned.get() + " rows");<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    }<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">023</span>import 
java.util.concurrent.atomic.AtomicLong;<a name="line.23"></a>
+<span class="sourceLineNo">024</span><a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.commons.logging.Log;<a 
name="line.25"></a>
+<span class="sourceLineNo">026</span>import 
org.apache.commons.logging.LogFactory;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.fs.FileSystem;<a 
name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.fs.Path;<a 
name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.MultithreadedTestUtil.RepeatingTestThread;<a 
name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.MultithreadedTestUtil.TestContext;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.client.ClientServiceCallable;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.client.ClusterConnection;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.client.RpcRetryingCaller;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.client.RpcRetryingCallerFactory;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.ipc.RpcControllerFactory;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.shaded.protobuf.RequestConverter;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos;<a 
name="line.39"></a>
+<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CompactRegionRequest;<a
 name="line.40"></a>
+<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.BulkLoadHFileRequest;<a
 name="line.41"></a>
+<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.testclassification.RegionServerTests;<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.util.Pair;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import 
org.junit.experimental.categories.Category;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.junit.runner.RunWith;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.junit.runners.Parameterized;<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<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> * Tests bulk loading of HFiles with old 
non-secure client for backward compatibility. Will be<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * removed when old non-secure client for 
backward compatibility is not supported.<a name="line.54"></a>
+<span class="sourceLineNo">055</span> */<a name="line.55"></a>
+<span class="sourceLineNo">056</span>@RunWith(Parameterized.class)<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span>@Category({RegionServerTests.class, 
LargeTests.class})<a name="line.57"></a>
+<span class="sourceLineNo">058</span>public class 
TestHRegionServerBulkLoadWithOldClient extends TestHRegionServerBulkLoad {<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>  public 
TestHRegionServerBulkLoadWithOldClient(int duration) {<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    super(duration);<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>  private static final Log LOG = 
LogFactory.getLog(TestHRegionServerBulkLoadWithOldClient.class);<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span>  public static class AtomicHFileLoader 
extends RepeatingTestThread {<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    final AtomicLong numBulkLoads = new 
AtomicLong();<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    final AtomicLong numCompactions = new 
AtomicLong();<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    private TableName tableName;<a 
name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span>    public AtomicHFileLoader(TableName 
tableName, TestContext ctx,<a name="line.70"></a>
+<span class="sourceLineNo">071</span>        byte targetFamilies[][]) throws 
IOException {<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      super(ctx);<a name="line.72"></a>
+<span class="sourceLineNo">073</span>      this.tableName = tableName;<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>    public void doAnAction() throws 
Exception {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      long iteration = 
numBulkLoads.getAndIncrement();<a name="line.77"></a>
+<span class="sourceLineNo">078</span>      Path dir =  
UTIL.getDataTestDirOnTestFS(String.format("bulkLoad_%08d",<a name="line.78"></a>
+<span class="sourceLineNo">079</span>          iteration));<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span>      // create HFiles for different 
column families<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      FileSystem fs = 
UTIL.getTestFileSystem();<a name="line.82"></a>
+<span class="sourceLineNo">083</span>      byte[] val = 
Bytes.toBytes(String.format("%010d", iteration));<a name="line.83"></a>
+<span class="sourceLineNo">084</span>      final List&lt;Pair&lt;byte[], 
String&gt;&gt; famPaths = new ArrayList&lt;&gt;(NUM_CFS);<a name="line.84"></a>
+<span class="sourceLineNo">085</span>      for (int i = 0; i &lt; NUM_CFS; 
i++) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span>        Path hfile = new Path(dir, 
family(i));<a name="line.86"></a>
+<span class="sourceLineNo">087</span>        byte[] fam = 
Bytes.toBytes(family(i));<a name="line.87"></a>
+<span class="sourceLineNo">088</span>        createHFile(fs, hfile, fam, QUAL, 
val, 1000);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>        famPaths.add(new 
Pair&lt;&gt;(fam, hfile.toString()));<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      }<a name="line.90"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span>      // bulk load HFiles<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>      final ClusterConnection conn = 
(ClusterConnection) UTIL.getAdmin().getConnection();<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      RpcControllerFactory 
rpcControllerFactory = new RpcControllerFactory(UTIL.getConfiguration());<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>      ClientServiceCallable&lt;Void&gt; 
callable =<a name="line.95"></a>
+<span class="sourceLineNo">096</span>          new 
ClientServiceCallable&lt;Void&gt;(conn, tableName,<a name="line.96"></a>
+<span class="sourceLineNo">097</span>              Bytes.toBytes("aaa"), 
rpcControllerFactory.newController(), HConstants.PRIORITY_UNSET) {<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>        @Override<a name="line.98"></a>
+<span class="sourceLineNo">099</span>        protected Void rpcCall() throws 
Exception {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>          LOG.info("Non-secure old 
client");<a name="line.100"></a>
+<span class="sourceLineNo">101</span>          byte[] regionName = 
getLocation().getRegionInfo().getRegionName();<a name="line.101"></a>
+<span class="sourceLineNo">102</span>              BulkLoadHFileRequest 
request =<a name="line.102"></a>
+<span class="sourceLineNo">103</span>                  RequestConverter<a 
name="line.103"></a>
+<span class="sourceLineNo">104</span>                      
.buildBulkLoadHFileRequest(famPaths, regionName, true, null, null);<a 
name="line.104"></a>
+<span class="sourceLineNo">105</span>              
getStub().bulkLoadHFile(null, request);<a name="line.105"></a>
+<span class="sourceLineNo">106</span>              return null;<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>        }<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      };<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      RpcRetryingCallerFactory factory = 
new RpcRetryingCallerFactory(conf);<a name="line.109"></a>
+<span class="sourceLineNo">110</span>      RpcRetryingCaller&lt;Void&gt; 
caller = factory.&lt;Void&gt; newCaller();<a name="line.110"></a>
+<span class="sourceLineNo">111</span>      caller.callWithRetries(callable, 
Integer.MAX_VALUE);<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span>      // Periodically do compaction to 
reduce the number of open file handles.<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      if (numBulkLoads.get() % 5 == 0) 
{<a name="line.114"></a>
+<span class="sourceLineNo">115</span>        // 5 * 50 = 250 open file 
handles!<a name="line.115"></a>
+<span class="sourceLineNo">116</span>        callable = new 
ClientServiceCallable&lt;Void&gt;(conn, tableName,<a name="line.116"></a>
+<span class="sourceLineNo">117</span>            Bytes.toBytes("aaa"), 
rpcControllerFactory.newController(), HConstants.PRIORITY_UNSET) {<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>          @Override<a name="line.118"></a>
+<span class="sourceLineNo">119</span>          protected Void rpcCall() throws 
Exception {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>            LOG.debug("compacting " + 
getLocation() + " for row "<a name="line.120"></a>
+<span class="sourceLineNo">121</span>                + 
Bytes.toStringBinary(getRow()));<a name="line.121"></a>
+<span class="sourceLineNo">122</span>            
AdminProtos.AdminService.BlockingInterface server =<a name="line.122"></a>
+<span class="sourceLineNo">123</span>              
conn.getAdmin(getLocation().getServerName());<a name="line.123"></a>
+<span class="sourceLineNo">124</span>            CompactRegionRequest request 
=<a name="line.124"></a>
+<span class="sourceLineNo">125</span>              
RequestConverter.buildCompactRegionRequest(<a name="line.125"></a>
+<span class="sourceLineNo">126</span>                
getLocation().getRegionInfo().getRegionName(), true, null);<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>            server.compactRegion(null, 
request);<a name="line.127"></a>
+<span class="sourceLineNo">128</span>            
numCompactions.incrementAndGet();<a name="line.128"></a>
+<span class="sourceLineNo">129</span>            return null;<a 
name="line.129"></a>
+<span class="sourceLineNo">130</span>          }<a name="line.130"></a>
+<span class="sourceLineNo">131</span>        };<a name="line.131"></a>
+<span class="sourceLineNo">132</span>        caller.callWithRetries(callable, 
Integer.MAX_VALUE);<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>  }<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span>  void runAtomicBulkloadTest(TableName 
tableName, int millisToRun, int numScanners)<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      throws Exception {<a 
name="line.138"></a>
+<span class="sourceLineNo">139</span>    setupTable(tableName, 10);<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span>    TestContext ctx = new 
TestContext(UTIL.getConfiguration());<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span>    AtomicHFileLoader loader = new 
AtomicHFileLoader(tableName, ctx, null);<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    ctx.addThread(loader);<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span>    List&lt;AtomicScanReader&gt; scanners 
= Lists.newArrayList();<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    for (int i = 0; i &lt; numScanners; 
i++) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      AtomicScanReader scanner = new 
AtomicScanReader(tableName, ctx, families);<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      scanners.add(scanner);<a 
name="line.149"></a>
+<span class="sourceLineNo">150</span>      ctx.addThread(scanner);<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>    ctx.startThreads();<a 
name="line.153"></a>
+<span class="sourceLineNo">154</span>    ctx.waitFor(millisToRun);<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>    ctx.stop();<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span>    LOG.info("Loaders:");<a 
name="line.157"></a>
+<span class="sourceLineNo">158</span>    LOG.info("  loaded " + 
loader.numBulkLoads.get());<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    LOG.info("  compations " + 
loader.numCompactions.get());<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span>    LOG.info("Scanners:");<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>    for (AtomicScanReader scanner : 
scanners) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      LOG.info("  scanned " + 
scanner.numScans.get());<a name="line.163"></a>
+<span class="sourceLineNo">164</span>      LOG.info("  verified " + 
scanner.numRowsScanned.get() + " rows");<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    }<a name="line.165"></a>
+<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
+<span class="sourceLineNo">167</span>}<a name="line.167"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/32453e2d/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoadWithOldClient.html
----------------------------------------------------------------------
diff --git 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoadWithOldClient.html
 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoadWithOldClient.html
index d4f7627..4496495 100644
--- 
a/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoadWithOldClient.html
+++ 
b/testdevapidocs/src-html/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoadWithOldClient.html
@@ -28,152 +28,151 @@
 <span class="sourceLineNo">020</span>import java.io.IOException;<a 
name="line.20"></a>
 <span class="sourceLineNo">021</span>import java.util.ArrayList;<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.Optional;<a 
name="line.23"></a>
-<span class="sourceLineNo">024</span>import 
java.util.concurrent.atomic.AtomicLong;<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.fs.FileSystem;<a 
name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.hadoop.fs.Path;<a 
name="line.29"></a>
-<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.MultithreadedTestUtil.RepeatingTestThread;<a 
name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.MultithreadedTestUtil.TestContext;<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.client.ClientServiceCallable;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.client.ClusterConnection;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.client.RpcRetryingCaller;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.client.RpcRetryingCallerFactory;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.ipc.RpcControllerFactory;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.shaded.protobuf.RequestConverter;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos;<a 
name="line.40"></a>
-<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CompactRegionRequest;<a
 name="line.41"></a>
-<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.BulkLoadHFileRequest;<a
 name="line.42"></a>
-<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.testclassification.RegionServerTests;<a 
name="line.44"></a>
-<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.util.Pair;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
org.junit.experimental.categories.Category;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.junit.runner.RunWith;<a 
name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.junit.runners.Parameterized;<a 
name="line.49"></a>
-<span class="sourceLineNo">050</span><a name="line.50"></a>
-<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<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> * Tests bulk loading of HFiles with old 
non-secure client for backward compatibility. Will be<a name="line.54"></a>
-<span class="sourceLineNo">055</span> * removed when old non-secure client for 
backward compatibility is not supported.<a name="line.55"></a>
-<span class="sourceLineNo">056</span> */<a name="line.56"></a>
-<span class="sourceLineNo">057</span>@RunWith(Parameterized.class)<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>@Category({RegionServerTests.class, 
LargeTests.class})<a name="line.58"></a>
-<span class="sourceLineNo">059</span>public class 
TestHRegionServerBulkLoadWithOldClient extends TestHRegionServerBulkLoad {<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span>  public 
TestHRegionServerBulkLoadWithOldClient(int duration) {<a name="line.60"></a>
-<span class="sourceLineNo">061</span>    super(duration);<a name="line.61"></a>
-<span class="sourceLineNo">062</span>  }<a name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>  private static final Log LOG = 
LogFactory.getLog(TestHRegionServerBulkLoadWithOldClient.class);<a 
name="line.64"></a>
-<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span>  public static class AtomicHFileLoader 
extends RepeatingTestThread {<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    final AtomicLong numBulkLoads = new 
AtomicLong();<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    final AtomicLong numCompactions = new 
AtomicLong();<a name="line.68"></a>
-<span class="sourceLineNo">069</span>    private TableName tableName;<a 
name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span>    public AtomicHFileLoader(TableName 
tableName, TestContext ctx,<a name="line.71"></a>
-<span class="sourceLineNo">072</span>        byte targetFamilies[][]) throws 
IOException {<a name="line.72"></a>
-<span class="sourceLineNo">073</span>      super(ctx);<a name="line.73"></a>
-<span class="sourceLineNo">074</span>      this.tableName = tableName;<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 void doAnAction() throws 
Exception {<a name="line.77"></a>
-<span class="sourceLineNo">078</span>      long iteration = 
numBulkLoads.getAndIncrement();<a name="line.78"></a>
-<span class="sourceLineNo">079</span>      Path dir =  
UTIL.getDataTestDirOnTestFS(String.format("bulkLoad_%08d",<a name="line.79"></a>
-<span class="sourceLineNo">080</span>          iteration));<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span><a name="line.81"></a>
-<span class="sourceLineNo">082</span>      // create HFiles for different 
column families<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      FileSystem fs = 
UTIL.getTestFileSystem();<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      byte[] val = 
Bytes.toBytes(String.format("%010d", iteration));<a name="line.84"></a>
-<span class="sourceLineNo">085</span>      final List&lt;Pair&lt;byte[], 
String&gt;&gt; famPaths = new ArrayList&lt;&gt;(NUM_CFS);<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      for (int i = 0; i &lt; NUM_CFS; 
i++) {<a name="line.86"></a>
-<span class="sourceLineNo">087</span>        Path hfile = new Path(dir, 
family(i));<a name="line.87"></a>
-<span class="sourceLineNo">088</span>        byte[] fam = 
Bytes.toBytes(family(i));<a name="line.88"></a>
-<span class="sourceLineNo">089</span>        createHFile(fs, hfile, fam, QUAL, 
val, 1000);<a name="line.89"></a>
-<span class="sourceLineNo">090</span>        famPaths.add(new 
Pair&lt;&gt;(fam, hfile.toString()));<a name="line.90"></a>
-<span class="sourceLineNo">091</span>      }<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span>      // bulk load HFiles<a 
name="line.93"></a>
-<span class="sourceLineNo">094</span>      final ClusterConnection conn = 
(ClusterConnection) UTIL.getAdmin().getConnection();<a name="line.94"></a>
-<span class="sourceLineNo">095</span>      RpcControllerFactory 
rpcControllerFactory = new RpcControllerFactory(UTIL.getConfiguration());<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span>      ClientServiceCallable&lt;Void&gt; 
callable =<a name="line.96"></a>
-<span class="sourceLineNo">097</span>          new 
ClientServiceCallable&lt;Void&gt;(conn, tableName,<a name="line.97"></a>
-<span class="sourceLineNo">098</span>              Bytes.toBytes("aaa"), 
rpcControllerFactory.newController(), HConstants.PRIORITY_UNSET) {<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>        @Override<a name="line.99"></a>
-<span class="sourceLineNo">100</span>        protected Void rpcCall() throws 
Exception {<a name="line.100"></a>
-<span class="sourceLineNo">101</span>          LOG.info("Non-secure old 
client");<a name="line.101"></a>
-<span class="sourceLineNo">102</span>          byte[] regionName = 
getLocation().getRegionInfo().getRegionName();<a name="line.102"></a>
-<span class="sourceLineNo">103</span>              BulkLoadHFileRequest 
request =<a name="line.103"></a>
-<span class="sourceLineNo">104</span>                  RequestConverter<a 
name="line.104"></a>
-<span class="sourceLineNo">105</span>                      
.buildBulkLoadHFileRequest(famPaths, regionName, true, null, null);<a 
name="line.105"></a>
-<span class="sourceLineNo">106</span>              
getStub().bulkLoadHFile(null, request);<a name="line.106"></a>
-<span class="sourceLineNo">107</span>              return null;<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>        }<a name="line.108"></a>
-<span class="sourceLineNo">109</span>      };<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      RpcRetryingCallerFactory factory = 
new RpcRetryingCallerFactory(conf);<a name="line.110"></a>
-<span class="sourceLineNo">111</span>      RpcRetryingCaller&lt;Void&gt; 
caller = factory.&lt;Void&gt; newCaller();<a name="line.111"></a>
-<span class="sourceLineNo">112</span>      caller.callWithRetries(callable, 
Integer.MAX_VALUE);<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span>      // Periodically do compaction to 
reduce the number of open file handles.<a name="line.114"></a>
-<span class="sourceLineNo">115</span>      if (numBulkLoads.get() % 5 == 0) 
{<a name="line.115"></a>
-<span class="sourceLineNo">116</span>        // 5 * 50 = 250 open file 
handles!<a name="line.116"></a>
-<span class="sourceLineNo">117</span>        callable = new 
ClientServiceCallable&lt;Void&gt;(conn, tableName,<a name="line.117"></a>
-<span class="sourceLineNo">118</span>            Bytes.toBytes("aaa"), 
rpcControllerFactory.newController(), HConstants.PRIORITY_UNSET) {<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>          @Override<a name="line.119"></a>
-<span class="sourceLineNo">120</span>          protected Void rpcCall() throws 
Exception {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>            LOG.debug("compacting " + 
getLocation() + " for row "<a name="line.121"></a>
-<span class="sourceLineNo">122</span>                + 
Bytes.toStringBinary(getRow()));<a name="line.122"></a>
-<span class="sourceLineNo">123</span>            
AdminProtos.AdminService.BlockingInterface server =<a name="line.123"></a>
-<span class="sourceLineNo">124</span>              
conn.getAdmin(getLocation().getServerName());<a name="line.124"></a>
-<span class="sourceLineNo">125</span>            CompactRegionRequest request 
=<a name="line.125"></a>
-<span class="sourceLineNo">126</span>              
RequestConverter.buildCompactRegionRequest(<a name="line.126"></a>
-<span class="sourceLineNo">127</span>                
getLocation().getRegionInfo().getRegionName(), true, Optional.empty());<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>            server.compactRegion(null, 
request);<a name="line.128"></a>
-<span class="sourceLineNo">129</span>            
numCompactions.incrementAndGet();<a name="line.129"></a>
-<span class="sourceLineNo">130</span>            return null;<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>          }<a name="line.131"></a>
-<span class="sourceLineNo">132</span>        };<a name="line.132"></a>
-<span class="sourceLineNo">133</span>        caller.callWithRetries(callable, 
Integer.MAX_VALUE);<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      }<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>  void runAtomicBulkloadTest(TableName 
tableName, int millisToRun, int numScanners)<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      throws Exception {<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>    setupTable(tableName, 10);<a 
name="line.140"></a>
-<span class="sourceLineNo">141</span><a name="line.141"></a>
-<span class="sourceLineNo">142</span>    TestContext ctx = new 
TestContext(UTIL.getConfiguration());<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span>    AtomicHFileLoader loader = new 
AtomicHFileLoader(tableName, ctx, null);<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    ctx.addThread(loader);<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span>    List&lt;AtomicScanReader&gt; scanners 
= Lists.newArrayList();<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    for (int i = 0; i &lt; numScanners; 
i++) {<a name="line.148"></a>
-<span class="sourceLineNo">149</span>      AtomicScanReader scanner = new 
AtomicScanReader(tableName, ctx, families);<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      scanners.add(scanner);<a 
name="line.150"></a>
-<span class="sourceLineNo">151</span>      ctx.addThread(scanner);<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>    ctx.startThreads();<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>    ctx.waitFor(millisToRun);<a 
name="line.155"></a>
-<span class="sourceLineNo">156</span>    ctx.stop();<a name="line.156"></a>
-<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span>    LOG.info("Loaders:");<a 
name="line.158"></a>
-<span class="sourceLineNo">159</span>    LOG.info("  loaded " + 
loader.numBulkLoads.get());<a name="line.159"></a>
-<span class="sourceLineNo">160</span>    LOG.info("  compations " + 
loader.numCompactions.get());<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span>    LOG.info("Scanners:");<a 
name="line.162"></a>
-<span class="sourceLineNo">163</span>    for (AtomicScanReader scanner : 
scanners) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span>      LOG.info("  scanned " + 
scanner.numScans.get());<a name="line.164"></a>
-<span class="sourceLineNo">165</span>      LOG.info("  verified " + 
scanner.numRowsScanned.get() + " rows");<a name="line.165"></a>
-<span class="sourceLineNo">166</span>    }<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">023</span>import 
java.util.concurrent.atomic.AtomicLong;<a name="line.23"></a>
+<span class="sourceLineNo">024</span><a name="line.24"></a>
+<span class="sourceLineNo">025</span>import org.apache.commons.logging.Log;<a 
name="line.25"></a>
+<span class="sourceLineNo">026</span>import 
org.apache.commons.logging.LogFactory;<a name="line.26"></a>
+<span class="sourceLineNo">027</span>import org.apache.hadoop.fs.FileSystem;<a 
name="line.27"></a>
+<span class="sourceLineNo">028</span>import org.apache.hadoop.fs.Path;<a 
name="line.28"></a>
+<span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.HConstants;<a name="line.29"></a>
+<span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.MultithreadedTestUtil.RepeatingTestThread;<a 
name="line.30"></a>
+<span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.MultithreadedTestUtil.TestContext;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.TableName;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.client.ClientServiceCallable;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.client.ClusterConnection;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.client.RpcRetryingCaller;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.client.RpcRetryingCallerFactory;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.ipc.RpcControllerFactory;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.shaded.protobuf.RequestConverter;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos;<a 
name="line.39"></a>
+<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos.CompactRegionRequest;<a
 name="line.40"></a>
+<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.ClientProtos.BulkLoadHFileRequest;<a
 name="line.41"></a>
+<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.testclassification.RegionServerTests;<a 
name="line.43"></a>
+<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.util.Pair;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import 
org.junit.experimental.categories.Category;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.junit.runner.RunWith;<a 
name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.junit.runners.Parameterized;<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span><a name="line.49"></a>
+<span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.shaded.com.google.common.collect.Lists;<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> * Tests bulk loading of HFiles with old 
non-secure client for backward compatibility. Will be<a name="line.53"></a>
+<span class="sourceLineNo">054</span> * removed when old non-secure client for 
backward compatibility is not supported.<a name="line.54"></a>
+<span class="sourceLineNo">055</span> */<a name="line.55"></a>
+<span class="sourceLineNo">056</span>@RunWith(Parameterized.class)<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span>@Category({RegionServerTests.class, 
LargeTests.class})<a name="line.57"></a>
+<span class="sourceLineNo">058</span>public class 
TestHRegionServerBulkLoadWithOldClient extends TestHRegionServerBulkLoad {<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>  public 
TestHRegionServerBulkLoadWithOldClient(int duration) {<a name="line.59"></a>
+<span class="sourceLineNo">060</span>    super(duration);<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>  private static final Log LOG = 
LogFactory.getLog(TestHRegionServerBulkLoadWithOldClient.class);<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span>  public static class AtomicHFileLoader 
extends RepeatingTestThread {<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    final AtomicLong numBulkLoads = new 
AtomicLong();<a name="line.66"></a>
+<span class="sourceLineNo">067</span>    final AtomicLong numCompactions = new 
AtomicLong();<a name="line.67"></a>
+<span class="sourceLineNo">068</span>    private TableName tableName;<a 
name="line.68"></a>
+<span class="sourceLineNo">069</span><a name="line.69"></a>
+<span class="sourceLineNo">070</span>    public AtomicHFileLoader(TableName 
tableName, TestContext ctx,<a name="line.70"></a>
+<span class="sourceLineNo">071</span>        byte targetFamilies[][]) throws 
IOException {<a name="line.71"></a>
+<span class="sourceLineNo">072</span>      super(ctx);<a name="line.72"></a>
+<span class="sourceLineNo">073</span>      this.tableName = tableName;<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>    public void doAnAction() throws 
Exception {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      long iteration = 
numBulkLoads.getAndIncrement();<a name="line.77"></a>
+<span class="sourceLineNo">078</span>      Path dir =  
UTIL.getDataTestDirOnTestFS(String.format("bulkLoad_%08d",<a name="line.78"></a>
+<span class="sourceLineNo">079</span>          iteration));<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span><a name="line.80"></a>
+<span class="sourceLineNo">081</span>      // create HFiles for different 
column families<a name="line.81"></a>
+<span class="sourceLineNo">082</span>      FileSystem fs = 
UTIL.getTestFileSystem();<a name="line.82"></a>
+<span class="sourceLineNo">083</span>      byte[] val = 
Bytes.toBytes(String.format("%010d", iteration));<a name="line.83"></a>
+<span class="sourceLineNo">084</span>      final List&lt;Pair&lt;byte[], 
String&gt;&gt; famPaths = new ArrayList&lt;&gt;(NUM_CFS);<a name="line.84"></a>
+<span class="sourceLineNo">085</span>      for (int i = 0; i &lt; NUM_CFS; 
i++) {<a name="line.85"></a>
+<span class="sourceLineNo">086</span>        Path hfile = new Path(dir, 
family(i));<a name="line.86"></a>
+<span class="sourceLineNo">087</span>        byte[] fam = 
Bytes.toBytes(family(i));<a name="line.87"></a>
+<span class="sourceLineNo">088</span>        createHFile(fs, hfile, fam, QUAL, 
val, 1000);<a name="line.88"></a>
+<span class="sourceLineNo">089</span>        famPaths.add(new 
Pair&lt;&gt;(fam, hfile.toString()));<a name="line.89"></a>
+<span class="sourceLineNo">090</span>      }<a name="line.90"></a>
+<span class="sourceLineNo">091</span><a name="line.91"></a>
+<span class="sourceLineNo">092</span>      // bulk load HFiles<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>      final ClusterConnection conn = 
(ClusterConnection) UTIL.getAdmin().getConnection();<a name="line.93"></a>
+<span class="sourceLineNo">094</span>      RpcControllerFactory 
rpcControllerFactory = new RpcControllerFactory(UTIL.getConfiguration());<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>      ClientServiceCallable&lt;Void&gt; 
callable =<a name="line.95"></a>
+<span class="sourceLineNo">096</span>          new 
ClientServiceCallable&lt;Void&gt;(conn, tableName,<a name="line.96"></a>
+<span class="sourceLineNo">097</span>              Bytes.toBytes("aaa"), 
rpcControllerFactory.newController(), HConstants.PRIORITY_UNSET) {<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>        @Override<a name="line.98"></a>
+<span class="sourceLineNo">099</span>        protected Void rpcCall() throws 
Exception {<a name="line.99"></a>
+<span class="sourceLineNo">100</span>          LOG.info("Non-secure old 
client");<a name="line.100"></a>
+<span class="sourceLineNo">101</span>          byte[] regionName = 
getLocation().getRegionInfo().getRegionName();<a name="line.101"></a>
+<span class="sourceLineNo">102</span>              BulkLoadHFileRequest 
request =<a name="line.102"></a>
+<span class="sourceLineNo">103</span>                  RequestConverter<a 
name="line.103"></a>
+<span class="sourceLineNo">104</span>                      
.buildBulkLoadHFileRequest(famPaths, regionName, true, null, null);<a 
name="line.104"></a>
+<span class="sourceLineNo">105</span>              
getStub().bulkLoadHFile(null, request);<a name="line.105"></a>
+<span class="sourceLineNo">106</span>              return null;<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>        }<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      };<a name="line.108"></a>
+<span class="sourceLineNo">109</span>      RpcRetryingCallerFactory factory = 
new RpcRetryingCallerFactory(conf);<a name="line.109"></a>
+<span class="sourceLineNo">110</span>      RpcRetryingCaller&lt;Void&gt; 
caller = factory.&lt;Void&gt; newCaller();<a name="line.110"></a>
+<span class="sourceLineNo">111</span>      caller.callWithRetries(callable, 
Integer.MAX_VALUE);<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span>      // Periodically do compaction to 
reduce the number of open file handles.<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      if (numBulkLoads.get() % 5 == 0) 
{<a name="line.114"></a>
+<span class="sourceLineNo">115</span>        // 5 * 50 = 250 open file 
handles!<a name="line.115"></a>
+<span class="sourceLineNo">116</span>        callable = new 
ClientServiceCallable&lt;Void&gt;(conn, tableName,<a name="line.116"></a>
+<span class="sourceLineNo">117</span>            Bytes.toBytes("aaa"), 
rpcControllerFactory.newController(), HConstants.PRIORITY_UNSET) {<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>          @Override<a name="line.118"></a>
+<span class="sourceLineNo">119</span>          protected Void rpcCall() throws 
Exception {<a name="line.119"></a>
+<span class="sourceLineNo">120</span>            LOG.debug("compacting " + 
getLocation() + " for row "<a name="line.120"></a>
+<span class="sourceLineNo">121</span>                + 
Bytes.toStringBinary(getRow()));<a name="line.121"></a>
+<span class="sourceLineNo">122</span>            
AdminProtos.AdminService.BlockingInterface server =<a name="line.122"></a>
+<span class="sourceLineNo">123</span>              
conn.getAdmin(getLocation().getServerName());<a name="line.123"></a>
+<span class="sourceLineNo">124</span>            CompactRegionRequest request 
=<a name="line.124"></a>
+<span class="sourceLineNo">125</span>              
RequestConverter.buildCompactRegionRequest(<a name="line.125"></a>
+<span class="sourceLineNo">126</span>                
getLocation().getRegionInfo().getRegionName(), true, null);<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>            server.compactRegion(null, 
request);<a name="line.127"></a>
+<span class="sourceLineNo">128</span>            
numCompactions.incrementAndGet();<a name="line.128"></a>
+<span class="sourceLineNo">129</span>            return null;<a 
name="line.129"></a>
+<span class="sourceLineNo">130</span>          }<a name="line.130"></a>
+<span class="sourceLineNo">131</span>        };<a name="line.131"></a>
+<span class="sourceLineNo">132</span>        caller.callWithRetries(callable, 
Integer.MAX_VALUE);<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>  }<a name="line.135"></a>
+<span class="sourceLineNo">136</span><a name="line.136"></a>
+<span class="sourceLineNo">137</span>  void runAtomicBulkloadTest(TableName 
tableName, int millisToRun, int numScanners)<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      throws Exception {<a 
name="line.138"></a>
+<span class="sourceLineNo">139</span>    setupTable(tableName, 10);<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span>    TestContext ctx = new 
TestContext(UTIL.getConfiguration());<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span>    AtomicHFileLoader loader = new 
AtomicHFileLoader(tableName, ctx, null);<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    ctx.addThread(loader);<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span><a name="line.145"></a>
+<span class="sourceLineNo">146</span>    List&lt;AtomicScanReader&gt; scanners 
= Lists.newArrayList();<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    for (int i = 0; i &lt; numScanners; 
i++) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span>      AtomicScanReader scanner = new 
AtomicScanReader(tableName, ctx, families);<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      scanners.add(scanner);<a 
name="line.149"></a>
+<span class="sourceLineNo">150</span>      ctx.addThread(scanner);<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>    ctx.startThreads();<a 
name="line.153"></a>
+<span class="sourceLineNo">154</span>    ctx.waitFor(millisToRun);<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>    ctx.stop();<a name="line.155"></a>
+<span class="sourceLineNo">156</span><a name="line.156"></a>
+<span class="sourceLineNo">157</span>    LOG.info("Loaders:");<a 
name="line.157"></a>
+<span class="sourceLineNo">158</span>    LOG.info("  loaded " + 
loader.numBulkLoads.get());<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    LOG.info("  compations " + 
loader.numCompactions.get());<a name="line.159"></a>
+<span class="sourceLineNo">160</span><a name="line.160"></a>
+<span class="sourceLineNo">161</span>    LOG.info("Scanners:");<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>    for (AtomicScanReader scanner : 
scanners) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      LOG.info("  scanned " + 
scanner.numScans.get());<a name="line.163"></a>
+<span class="sourceLineNo">164</span>      LOG.info("  verified " + 
scanner.numRowsScanned.get() + " rows");<a name="line.164"></a>
+<span class="sourceLineNo">165</span>    }<a name="line.165"></a>
+<span class="sourceLineNo">166</span>  }<a name="line.166"></a>
+<span class="sourceLineNo">167</span>}<a name="line.167"></a>
 
 
 

Reply via email to