http://git-wip-us.apache.org/repos/asf/hbase-site/blob/96543536/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html
----------------------------------------------------------------------
diff --git 
a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html 
b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html
index c585ec8..02fab2f 100644
--- 
a/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html
+++ 
b/apidocs/src-html/org/apache/hadoop/hbase/mapreduce/LoadIncrementalHFiles.html
@@ -126,969 +126,989 @@
 <span class="sourceLineNo">118</span>  private static final String 
ASSIGN_SEQ_IDS = "hbase.mapreduce.bulkload.assign.sequenceNumbers";<a 
name="line.118"></a>
 <span class="sourceLineNo">119</span>  public final static String 
CREATE_TABLE_CONF_KEY = "create.table";<a name="line.119"></a>
 <span class="sourceLineNo">120</span><a name="line.120"></a>
-<span class="sourceLineNo">121</span>  private int 
maxFilesPerRegionPerFamily;<a name="line.121"></a>
-<span class="sourceLineNo">122</span>  private boolean assignSeqIds;<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>  // Source filesystem<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>  private FileSystem fs;<a 
name="line.125"></a>
-<span class="sourceLineNo">126</span>  // Source delegation token<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>  private FsDelegationToken 
fsDelegationToken;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>  private String bulkToken;<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>  private UserProvider userProvider;<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>  private int nrThreads;<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span>  private LoadIncrementalHFiles() {}<a 
name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span>  public 
LoadIncrementalHFiles(Configuration conf) throws Exception {<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>    super(conf);<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    initialize();<a name="line.136"></a>
-<span class="sourceLineNo">137</span>  }<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>  private void initialize() throws 
Exception {<a name="line.139"></a>
-<span class="sourceLineNo">140</span>    if (initalized) {<a 
name="line.140"></a>
-<span class="sourceLineNo">141</span>      return;<a name="line.141"></a>
-<span class="sourceLineNo">142</span>    }<a name="line.142"></a>
-<span class="sourceLineNo">143</span>    // make a copy, just to be sure we're 
not overriding someone else's config<a name="line.143"></a>
-<span class="sourceLineNo">144</span>    
setConf(HBaseConfiguration.create(getConf()));<a name="line.144"></a>
-<span class="sourceLineNo">145</span>    Configuration conf = getConf();<a 
name="line.145"></a>
-<span class="sourceLineNo">146</span>    // disable blockcache for tool 
invocation, see HBASE-10500<a name="line.146"></a>
-<span class="sourceLineNo">147</span>    
conf.setFloat(HConstants.HFILE_BLOCK_CACHE_SIZE_KEY, 0);<a name="line.147"></a>
-<span class="sourceLineNo">148</span>    this.userProvider = 
UserProvider.instantiate(conf);<a name="line.148"></a>
-<span class="sourceLineNo">149</span>    this.fsDelegationToken = new 
FsDelegationToken(userProvider, "renewer");<a name="line.149"></a>
-<span class="sourceLineNo">150</span>    assignSeqIds = 
conf.getBoolean(ASSIGN_SEQ_IDS, true);<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    maxFilesPerRegionPerFamily = 
conf.getInt(MAX_FILES_PER_REGION_PER_FAMILY, 32);<a name="line.151"></a>
-<span class="sourceLineNo">152</span>    nrThreads = 
conf.getInt("hbase.loadincremental.threads.max",<a name="line.152"></a>
-<span class="sourceLineNo">153</span>      
Runtime.getRuntime().availableProcessors());<a name="line.153"></a>
-<span class="sourceLineNo">154</span>    initalized = true;<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>  }<a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span>  private void usage() {<a 
name="line.157"></a>
-<span class="sourceLineNo">158</span>    System.err.println("usage: " + NAME + 
" /path/to/hfileoutputformat-output tablename" + "\n -D"<a name="line.158"></a>
-<span class="sourceLineNo">159</span>        + CREATE_TABLE_CONF_KEY + "=no - 
can be used to avoid creation of table by this tool\n"<a name="line.159"></a>
-<span class="sourceLineNo">160</span>        + "  Note: if you set this to 
'no', then the target table must already exist in HBase\n"<a 
name="line.160"></a>
-<span class="sourceLineNo">161</span>        + "\n");<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>  private static interface 
BulkHFileVisitor&lt;TFamily&gt; {<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    TFamily bulkFamily(final byte[] 
familyName)<a name="line.165"></a>
-<span class="sourceLineNo">166</span>      throws IOException;<a 
name="line.166"></a>
-<span class="sourceLineNo">167</span>    void bulkHFile(final TFamily family, 
final FileStatus hfileStatus)<a name="line.167"></a>
-<span class="sourceLineNo">168</span>      throws IOException;<a 
name="line.168"></a>
-<span class="sourceLineNo">169</span>  }<a name="line.169"></a>
-<span class="sourceLineNo">170</span><a name="line.170"></a>
-<span class="sourceLineNo">171</span>  /**<a name="line.171"></a>
-<span class="sourceLineNo">172</span>   * Iterate over the bulkDir hfiles.<a 
name="line.172"></a>
-<span class="sourceLineNo">173</span>   * Skip reference, HFileLink, files 
starting with "_" and non-valid hfiles.<a name="line.173"></a>
-<span class="sourceLineNo">174</span>   */<a name="line.174"></a>
-<span class="sourceLineNo">175</span>  private static &lt;TFamily&gt; void 
visitBulkHFiles(final FileSystem fs, final Path bulkDir,<a name="line.175"></a>
-<span class="sourceLineNo">176</span>    final BulkHFileVisitor&lt;TFamily&gt; 
visitor) throws IOException {<a name="line.176"></a>
-<span class="sourceLineNo">177</span>    visitBulkHFiles(fs, bulkDir, visitor, 
true);<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>  /**<a name="line.180"></a>
-<span class="sourceLineNo">181</span>   * Iterate over the bulkDir hfiles.<a 
name="line.181"></a>
-<span class="sourceLineNo">182</span>   * Skip reference, HFileLink, files 
starting with "_".<a name="line.182"></a>
-<span class="sourceLineNo">183</span>   * Check and skip non-valid hfiles by 
default, or skip this validation by setting<a name="line.183"></a>
-<span class="sourceLineNo">184</span>   * 
'hbase.loadincremental.validate.hfile' to false.<a name="line.184"></a>
-<span class="sourceLineNo">185</span>   */<a name="line.185"></a>
-<span class="sourceLineNo">186</span>  private static &lt;TFamily&gt; void 
visitBulkHFiles(final FileSystem fs, final Path bulkDir,<a name="line.186"></a>
-<span class="sourceLineNo">187</span>    final BulkHFileVisitor&lt;TFamily&gt; 
visitor, final boolean validateHFile) throws IOException {<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>    if (!fs.exists(bulkDir)) {<a 
name="line.188"></a>
-<span class="sourceLineNo">189</span>      throw new 
FileNotFoundException("Bulkload dir " + bulkDir + " not found");<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>    }<a name="line.190"></a>
-<span class="sourceLineNo">191</span><a name="line.191"></a>
-<span class="sourceLineNo">192</span>    FileStatus[] familyDirStatuses = 
fs.listStatus(bulkDir);<a name="line.192"></a>
-<span class="sourceLineNo">193</span>    if (familyDirStatuses == null) {<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>      throw new FileNotFoundException("No 
families found in " + bulkDir);<a name="line.194"></a>
-<span class="sourceLineNo">195</span>    }<a name="line.195"></a>
-<span class="sourceLineNo">196</span><a name="line.196"></a>
-<span class="sourceLineNo">197</span>    for (FileStatus familyStat : 
familyDirStatuses) {<a name="line.197"></a>
-<span class="sourceLineNo">198</span>      if (!familyStat.isDirectory()) {<a 
name="line.198"></a>
-<span class="sourceLineNo">199</span>        LOG.warn("Skipping non-directory 
" + familyStat.getPath());<a name="line.199"></a>
-<span class="sourceLineNo">200</span>        continue;<a name="line.200"></a>
-<span class="sourceLineNo">201</span>      }<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      Path familyDir = 
familyStat.getPath();<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      byte[] familyName = 
familyDir.getName().getBytes();<a name="line.203"></a>
-<span class="sourceLineNo">204</span>      TFamily family = 
visitor.bulkFamily(familyName);<a name="line.204"></a>
-<span class="sourceLineNo">205</span><a name="line.205"></a>
-<span class="sourceLineNo">206</span>      FileStatus[] hfileStatuses = 
fs.listStatus(familyDir);<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      for (FileStatus hfileStatus : 
hfileStatuses) {<a name="line.207"></a>
-<span class="sourceLineNo">208</span>        if 
(!fs.isFile(hfileStatus.getPath())) {<a name="line.208"></a>
-<span class="sourceLineNo">209</span>          LOG.warn("Skipping non-file " + 
hfileStatus);<a name="line.209"></a>
-<span class="sourceLineNo">210</span>          continue;<a name="line.210"></a>
-<span class="sourceLineNo">211</span>        }<a name="line.211"></a>
-<span class="sourceLineNo">212</span><a name="line.212"></a>
-<span class="sourceLineNo">213</span>        Path hfile = 
hfileStatus.getPath();<a name="line.213"></a>
-<span class="sourceLineNo">214</span>        // Skip "_", reference, 
HFileLink<a name="line.214"></a>
-<span class="sourceLineNo">215</span>        String fileName = 
hfile.getName();<a name="line.215"></a>
-<span class="sourceLineNo">216</span>        if (fileName.startsWith("_")) {<a 
name="line.216"></a>
-<span class="sourceLineNo">217</span>          continue;<a name="line.217"></a>
-<span class="sourceLineNo">218</span>        }<a name="line.218"></a>
-<span class="sourceLineNo">219</span>        if 
(StoreFileInfo.isReference(fileName)) {<a name="line.219"></a>
-<span class="sourceLineNo">220</span>          LOG.warn("Skipping reference " 
+ fileName);<a name="line.220"></a>
-<span class="sourceLineNo">221</span>          continue;<a name="line.221"></a>
-<span class="sourceLineNo">222</span>        }<a name="line.222"></a>
-<span class="sourceLineNo">223</span>        if 
(HFileLink.isHFileLink(fileName)) {<a name="line.223"></a>
-<span class="sourceLineNo">224</span>          LOG.warn("Skipping HFileLink " 
+ fileName);<a name="line.224"></a>
-<span class="sourceLineNo">225</span>          continue;<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>        // Validate HFile Format if 
needed<a name="line.228"></a>
-<span class="sourceLineNo">229</span>        if (validateHFile) {<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>          try {<a name="line.230"></a>
-<span class="sourceLineNo">231</span>            if (!HFile.isHFileFormat(fs, 
hfile)) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span>              LOG.warn("the file " + 
hfile + " doesn't seems to be an hfile. skipping");<a name="line.232"></a>
-<span class="sourceLineNo">233</span>              continue;<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>            }<a name="line.234"></a>
-<span class="sourceLineNo">235</span>          } catch (FileNotFoundException 
e) {<a name="line.235"></a>
-<span class="sourceLineNo">236</span>            LOG.warn("the file " + hfile 
+ " was removed");<a name="line.236"></a>
-<span class="sourceLineNo">237</span>            continue;<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><a name="line.240"></a>
-<span class="sourceLineNo">241</span>        visitor.bulkHFile(family, 
hfileStatus);<a name="line.241"></a>
-<span class="sourceLineNo">242</span>      }<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><a name="line.245"></a>
-<span class="sourceLineNo">246</span>  /**<a name="line.246"></a>
-<span class="sourceLineNo">247</span>   * Represents an HFile waiting to be 
loaded. An queue is used<a name="line.247"></a>
-<span class="sourceLineNo">248</span>   * in this class in order to support 
the case where a region has<a name="line.248"></a>
-<span class="sourceLineNo">249</span>   * split during the process of the 
load. When this happens,<a name="line.249"></a>
-<span class="sourceLineNo">250</span>   * the HFile is split into two physical 
parts across the new<a name="line.250"></a>
-<span class="sourceLineNo">251</span>   * region boundary, and each part is 
added back into the queue.<a name="line.251"></a>
-<span class="sourceLineNo">252</span>   * The import process finishes when the 
queue is empty.<a name="line.252"></a>
-<span class="sourceLineNo">253</span>   */<a name="line.253"></a>
-<span class="sourceLineNo">254</span>  public static class LoadQueueItem {<a 
name="line.254"></a>
-<span class="sourceLineNo">255</span>    final byte[] family;<a 
name="line.255"></a>
-<span class="sourceLineNo">256</span>    final Path hfilePath;<a 
name="line.256"></a>
+<span class="sourceLineNo">121</span>  // We use a '.' prefix which is ignored 
when walking directory trees<a name="line.121"></a>
+<span class="sourceLineNo">122</span>  // above. It is invalid family name.<a 
name="line.122"></a>
+<span class="sourceLineNo">123</span>  final static String TMP_DIR = ".tmp";<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span><a name="line.124"></a>
+<span class="sourceLineNo">125</span>  private int 
maxFilesPerRegionPerFamily;<a name="line.125"></a>
+<span class="sourceLineNo">126</span>  private boolean assignSeqIds;<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span>  // Source filesystem<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>  private FileSystem fs;<a 
name="line.129"></a>
+<span class="sourceLineNo">130</span>  // Source delegation token<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>  private FsDelegationToken 
fsDelegationToken;<a name="line.131"></a>
+<span class="sourceLineNo">132</span>  private String bulkToken;<a 
name="line.132"></a>
+<span class="sourceLineNo">133</span>  private UserProvider userProvider;<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>  private int nrThreads;<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span>  private LoadIncrementalHFiles() {}<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span><a name="line.137"></a>
+<span class="sourceLineNo">138</span>  public 
LoadIncrementalHFiles(Configuration conf) throws Exception {<a 
name="line.138"></a>
+<span class="sourceLineNo">139</span>    super(conf);<a name="line.139"></a>
+<span class="sourceLineNo">140</span>    initialize();<a name="line.140"></a>
+<span class="sourceLineNo">141</span>  }<a name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span>  private void initialize() throws 
Exception {<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    if (initalized) {<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>      return;<a name="line.145"></a>
+<span class="sourceLineNo">146</span>    }<a name="line.146"></a>
+<span class="sourceLineNo">147</span>    // make a copy, just to be sure we're 
not overriding someone else's config<a name="line.147"></a>
+<span class="sourceLineNo">148</span>    
setConf(HBaseConfiguration.create(getConf()));<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    Configuration conf = getConf();<a 
name="line.149"></a>
+<span class="sourceLineNo">150</span>    // disable blockcache for tool 
invocation, see HBASE-10500<a name="line.150"></a>
+<span class="sourceLineNo">151</span>    
conf.setFloat(HConstants.HFILE_BLOCK_CACHE_SIZE_KEY, 0);<a name="line.151"></a>
+<span class="sourceLineNo">152</span>    this.userProvider = 
UserProvider.instantiate(conf);<a name="line.152"></a>
+<span class="sourceLineNo">153</span>    this.fsDelegationToken = new 
FsDelegationToken(userProvider, "renewer");<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    assignSeqIds = 
conf.getBoolean(ASSIGN_SEQ_IDS, true);<a name="line.154"></a>
+<span class="sourceLineNo">155</span>    maxFilesPerRegionPerFamily = 
conf.getInt(MAX_FILES_PER_REGION_PER_FAMILY, 32);<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    nrThreads = 
conf.getInt("hbase.loadincremental.threads.max",<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      
Runtime.getRuntime().availableProcessors());<a name="line.157"></a>
+<span class="sourceLineNo">158</span>    initalized = true;<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>  private void usage() {<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>    System.err.println("usage: " + NAME + 
" /path/to/hfileoutputformat-output tablename" + "\n -D"<a name="line.162"></a>
+<span class="sourceLineNo">163</span>        + CREATE_TABLE_CONF_KEY + "=no - 
can be used to avoid creation of table by this tool\n"<a name="line.163"></a>
+<span class="sourceLineNo">164</span>        + "  Note: if you set this to 
'no', then the target table must already exist in HBase\n"<a 
name="line.164"></a>
+<span class="sourceLineNo">165</span>        + "\n");<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>  private static interface 
BulkHFileVisitor&lt;TFamily&gt; {<a name="line.168"></a>
+<span class="sourceLineNo">169</span>    TFamily bulkFamily(final byte[] 
familyName)<a name="line.169"></a>
+<span class="sourceLineNo">170</span>      throws IOException;<a 
name="line.170"></a>
+<span class="sourceLineNo">171</span>    void bulkHFile(final TFamily family, 
final FileStatus hfileStatus)<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      throws IOException;<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span>  }<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span>  /**<a name="line.175"></a>
+<span class="sourceLineNo">176</span>   * Iterate over the bulkDir hfiles.<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span>   * Skip reference, HFileLink, files 
starting with "_" and non-valid hfiles.<a name="line.177"></a>
+<span class="sourceLineNo">178</span>   */<a name="line.178"></a>
+<span class="sourceLineNo">179</span>  private static &lt;TFamily&gt; void 
visitBulkHFiles(final FileSystem fs, final Path bulkDir,<a name="line.179"></a>
+<span class="sourceLineNo">180</span>    final BulkHFileVisitor&lt;TFamily&gt; 
visitor) throws IOException {<a name="line.180"></a>
+<span class="sourceLineNo">181</span>    visitBulkHFiles(fs, bulkDir, visitor, 
true);<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>   * Iterate over the bulkDir hfiles.<a 
name="line.185"></a>
+<span class="sourceLineNo">186</span>   * Skip reference, HFileLink, files 
starting with "_".<a name="line.186"></a>
+<span class="sourceLineNo">187</span>   * Check and skip non-valid hfiles by 
default, or skip this validation by setting<a name="line.187"></a>
+<span class="sourceLineNo">188</span>   * 
'hbase.loadincremental.validate.hfile' to false.<a name="line.188"></a>
+<span class="sourceLineNo">189</span>   */<a name="line.189"></a>
+<span class="sourceLineNo">190</span>  private static &lt;TFamily&gt; void 
visitBulkHFiles(final FileSystem fs, final Path bulkDir,<a name="line.190"></a>
+<span class="sourceLineNo">191</span>    final BulkHFileVisitor&lt;TFamily&gt; 
visitor, final boolean validateHFile) throws IOException {<a 
name="line.191"></a>
+<span class="sourceLineNo">192</span>    if (!fs.exists(bulkDir)) {<a 
name="line.192"></a>
+<span class="sourceLineNo">193</span>      throw new 
FileNotFoundException("Bulkload dir " + bulkDir + " not found");<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span>    }<a name="line.194"></a>
+<span class="sourceLineNo">195</span><a name="line.195"></a>
+<span class="sourceLineNo">196</span>    FileStatus[] familyDirStatuses = 
fs.listStatus(bulkDir);<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    if (familyDirStatuses == null) {<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>      throw new FileNotFoundException("No 
families found in " + bulkDir);<a name="line.198"></a>
+<span class="sourceLineNo">199</span>    }<a name="line.199"></a>
+<span class="sourceLineNo">200</span><a name="line.200"></a>
+<span class="sourceLineNo">201</span>    for (FileStatus familyStat : 
familyDirStatuses) {<a name="line.201"></a>
+<span class="sourceLineNo">202</span>      if (!familyStat.isDirectory()) {<a 
name="line.202"></a>
+<span class="sourceLineNo">203</span>        LOG.warn("Skipping non-directory 
" + familyStat.getPath());<a name="line.203"></a>
+<span class="sourceLineNo">204</span>        continue;<a name="line.204"></a>
+<span class="sourceLineNo">205</span>      }<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      Path familyDir = 
familyStat.getPath();<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      byte[] familyName = 
familyDir.getName().getBytes();<a name="line.207"></a>
+<span class="sourceLineNo">208</span>      // Skip invalid family<a 
name="line.208"></a>
+<span class="sourceLineNo">209</span>      try {<a name="line.209"></a>
+<span class="sourceLineNo">210</span>        
HColumnDescriptor.isLegalFamilyName(familyName);<a name="line.210"></a>
+<span class="sourceLineNo">211</span>      }<a name="line.211"></a>
+<span class="sourceLineNo">212</span>      catch (IllegalArgumentException e) 
{<a name="line.212"></a>
+<span class="sourceLineNo">213</span>        LOG.warn("Skipping invalid " + 
familyStat.getPath());<a name="line.213"></a>
+<span class="sourceLineNo">214</span>        continue;<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      }<a name="line.215"></a>
+<span class="sourceLineNo">216</span>      TFamily family = 
visitor.bulkFamily(familyName);<a name="line.216"></a>
+<span class="sourceLineNo">217</span><a name="line.217"></a>
+<span class="sourceLineNo">218</span>      FileStatus[] hfileStatuses = 
fs.listStatus(familyDir);<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      for (FileStatus hfileStatus : 
hfileStatuses) {<a name="line.219"></a>
+<span class="sourceLineNo">220</span>        if 
(!fs.isFile(hfileStatus.getPath())) {<a name="line.220"></a>
+<span class="sourceLineNo">221</span>          LOG.warn("Skipping non-file " + 
hfileStatus);<a name="line.221"></a>
+<span class="sourceLineNo">222</span>          continue;<a name="line.222"></a>
+<span class="sourceLineNo">223</span>        }<a name="line.223"></a>
+<span class="sourceLineNo">224</span><a name="line.224"></a>
+<span class="sourceLineNo">225</span>        Path hfile = 
hfileStatus.getPath();<a name="line.225"></a>
+<span class="sourceLineNo">226</span>        // Skip "_", reference, 
HFileLink<a name="line.226"></a>
+<span class="sourceLineNo">227</span>        String fileName = 
hfile.getName();<a name="line.227"></a>
+<span class="sourceLineNo">228</span>        if (fileName.startsWith("_")) {<a 
name="line.228"></a>
+<span class="sourceLineNo">229</span>          continue;<a name="line.229"></a>
+<span class="sourceLineNo">230</span>        }<a name="line.230"></a>
+<span class="sourceLineNo">231</span>        if 
(StoreFileInfo.isReference(fileName)) {<a name="line.231"></a>
+<span class="sourceLineNo">232</span>          LOG.warn("Skipping reference " 
+ fileName);<a name="line.232"></a>
+<span class="sourceLineNo">233</span>          continue;<a name="line.233"></a>
+<span class="sourceLineNo">234</span>        }<a name="line.234"></a>
+<span class="sourceLineNo">235</span>        if 
(HFileLink.isHFileLink(fileName)) {<a name="line.235"></a>
+<span class="sourceLineNo">236</span>          LOG.warn("Skipping HFileLink " 
+ fileName);<a name="line.236"></a>
+<span class="sourceLineNo">237</span>          continue;<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 HFile Format if 
needed<a name="line.240"></a>
+<span class="sourceLineNo">241</span>        if (validateHFile) {<a 
name="line.241"></a>
+<span class="sourceLineNo">242</span>          try {<a name="line.242"></a>
+<span class="sourceLineNo">243</span>            if (!HFile.isHFileFormat(fs, 
hfile)) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>              LOG.warn("the file " + 
hfile + " doesn't seems to be an hfile. skipping");<a name="line.244"></a>
+<span class="sourceLineNo">245</span>              continue;<a 
name="line.245"></a>
+<span class="sourceLineNo">246</span>            }<a name="line.246"></a>
+<span class="sourceLineNo">247</span>          } catch (FileNotFoundException 
e) {<a name="line.247"></a>
+<span class="sourceLineNo">248</span>            LOG.warn("the file " + hfile 
+ " was removed");<a name="line.248"></a>
+<span class="sourceLineNo">249</span>            continue;<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><a name="line.252"></a>
+<span class="sourceLineNo">253</span>        visitor.bulkHFile(family, 
hfileStatus);<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>  }<a name="line.256"></a>
 <span class="sourceLineNo">257</span><a name="line.257"></a>
-<span class="sourceLineNo">258</span>    public LoadQueueItem(byte[] family, 
Path hfilePath) {<a name="line.258"></a>
-<span class="sourceLineNo">259</span>      this.family = family;<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span>      this.hfilePath = hfilePath;<a 
name="line.260"></a>
-<span class="sourceLineNo">261</span>    }<a name="line.261"></a>
-<span class="sourceLineNo">262</span><a name="line.262"></a>
-<span class="sourceLineNo">263</span>    @Override<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    public String toString() {<a 
name="line.264"></a>
-<span class="sourceLineNo">265</span>      return "family:"+ 
Bytes.toString(family) + " path:" + hfilePath.toString();<a name="line.265"></a>
-<span class="sourceLineNo">266</span>    }<a name="line.266"></a>
-<span class="sourceLineNo">267</span>  }<a name="line.267"></a>
-<span class="sourceLineNo">268</span><a name="line.268"></a>
-<span class="sourceLineNo">269</span>  /**<a name="line.269"></a>
-<span class="sourceLineNo">270</span>   * Walk the given directory for all 
HFiles, and return a Queue<a name="line.270"></a>
-<span class="sourceLineNo">271</span>   * containing all such files.<a 
name="line.271"></a>
-<span class="sourceLineNo">272</span>   */<a name="line.272"></a>
-<span class="sourceLineNo">273</span>  private void discoverLoadQueue(final 
Deque&lt;LoadQueueItem&gt; ret, final Path hfofDir,<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    final boolean validateHFile) throws 
IOException {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    fs = 
hfofDir.getFileSystem(getConf());<a name="line.275"></a>
-<span class="sourceLineNo">276</span>    visitBulkHFiles(fs, hfofDir, new 
BulkHFileVisitor&lt;byte[]&gt;() {<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      @Override<a name="line.277"></a>
-<span class="sourceLineNo">278</span>      public byte[] bulkFamily(final 
byte[] familyName) {<a name="line.278"></a>
-<span class="sourceLineNo">279</span>        return familyName;<a 
name="line.279"></a>
-<span class="sourceLineNo">280</span>      }<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      @Override<a name="line.281"></a>
-<span class="sourceLineNo">282</span>      public void bulkHFile(final byte[] 
family, final FileStatus hfile) throws IOException {<a name="line.282"></a>
-<span class="sourceLineNo">283</span>        long length = hfile.getLen();<a 
name="line.283"></a>
-<span class="sourceLineNo">284</span>        if (length &gt; 
getConf().getLong(HConstants.HREGION_MAX_FILESIZE,<a name="line.284"></a>
-<span class="sourceLineNo">285</span>            
HConstants.DEFAULT_MAX_FILE_SIZE)) {<a name="line.285"></a>
-<span class="sourceLineNo">286</span>          LOG.warn("Trying to bulk load 
hfile " + hfile.getPath() + " with size: " +<a name="line.286"></a>
-<span class="sourceLineNo">287</span>              length + " bytes can be 
problematic as it may lead to oversplitting.");<a name="line.287"></a>
-<span class="sourceLineNo">288</span>        }<a name="line.288"></a>
-<span class="sourceLineNo">289</span>        ret.add(new LoadQueueItem(family, 
hfile.getPath()));<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      }<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    }, validateHFile);<a 
name="line.291"></a>
-<span class="sourceLineNo">292</span>  }<a name="line.292"></a>
-<span class="sourceLineNo">293</span><a name="line.293"></a>
-<span class="sourceLineNo">294</span>  /**<a name="line.294"></a>
-<span class="sourceLineNo">295</span>   * Perform a bulk load of the given 
directory into the given<a name="line.295"></a>
-<span class="sourceLineNo">296</span>   * pre-existing table.  This method is 
not threadsafe.<a name="line.296"></a>
-<span class="sourceLineNo">297</span>   *<a name="line.297"></a>
-<span class="sourceLineNo">298</span>   * @param hfofDir the directory that 
was provided as the output path<a name="line.298"></a>
-<span class="sourceLineNo">299</span>   * of a job using HFileOutputFormat<a 
name="line.299"></a>
-<span class="sourceLineNo">300</span>   * @param table the table to load 
into<a name="line.300"></a>
-<span class="sourceLineNo">301</span>   * @throws TableNotFoundException if 
table does not yet exist<a name="line.301"></a>
-<span class="sourceLineNo">302</span>   */<a name="line.302"></a>
-<span class="sourceLineNo">303</span>  @SuppressWarnings("deprecation")<a 
name="line.303"></a>
-<span class="sourceLineNo">304</span>  public void doBulkLoad(Path hfofDir, 
final HTable table)<a name="line.304"></a>
-<span class="sourceLineNo">305</span>      throws TableNotFoundException, 
IOException {<a name="line.305"></a>
-<span class="sourceLineNo">306</span>    try (Admin admin = 
table.getConnection().getAdmin();<a name="line.306"></a>
-<span class="sourceLineNo">307</span>        RegionLocator rl = 
table.getRegionLocator()) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span>      doBulkLoad(hfofDir, admin, table, 
rl);<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    }<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>  /**<a name="line.312"></a>
-<span class="sourceLineNo">313</span>   * Perform a bulk load of the given 
directory into the given<a name="line.313"></a>
-<span class="sourceLineNo">314</span>   * pre-existing table.  This method is 
not threadsafe.<a name="line.314"></a>
-<span class="sourceLineNo">315</span>   *<a name="line.315"></a>
-<span class="sourceLineNo">316</span>   * @param hfofDir the directory that 
was provided as the output path<a name="line.316"></a>
-<span class="sourceLineNo">317</span>   * of a job using HFileOutputFormat<a 
name="line.317"></a>
-<span class="sourceLineNo">318</span>   * @param table the table to load 
into<a name="line.318"></a>
-<span class="sourceLineNo">319</span>   * @throws TableNotFoundException if 
table does not yet exist<a name="line.319"></a>
-<span class="sourceLineNo">320</span>   */<a name="line.320"></a>
-<span class="sourceLineNo">321</span>  public void doBulkLoad(Path hfofDir, 
final Admin admin, Table table,<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      RegionLocator regionLocator) throws 
TableNotFoundException, IOException  {<a name="line.322"></a>
+<span class="sourceLineNo">258</span>  /**<a name="line.258"></a>
+<span class="sourceLineNo">259</span>   * Represents an HFile waiting to be 
loaded. An queue is used<a name="line.259"></a>
+<span class="sourceLineNo">260</span>   * in this class in order to support 
the case where a region has<a name="line.260"></a>
+<span class="sourceLineNo">261</span>   * split during the process of the 
load. When this happens,<a name="line.261"></a>
+<span class="sourceLineNo">262</span>   * the HFile is split into two physical 
parts across the new<a name="line.262"></a>
+<span class="sourceLineNo">263</span>   * region boundary, and each part is 
added back into the queue.<a name="line.263"></a>
+<span class="sourceLineNo">264</span>   * The import process finishes when the 
queue is empty.<a name="line.264"></a>
+<span class="sourceLineNo">265</span>   */<a name="line.265"></a>
+<span class="sourceLineNo">266</span>  public static class LoadQueueItem {<a 
name="line.266"></a>
+<span class="sourceLineNo">267</span>    final byte[] family;<a 
name="line.267"></a>
+<span class="sourceLineNo">268</span>    final Path hfilePath;<a 
name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span>    public LoadQueueItem(byte[] family, 
Path hfilePath) {<a name="line.270"></a>
+<span class="sourceLineNo">271</span>      this.family = family;<a 
name="line.271"></a>
+<span class="sourceLineNo">272</span>      this.hfilePath = hfilePath;<a 
name="line.272"></a>
+<span class="sourceLineNo">273</span>    }<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span>    @Override<a name="line.275"></a>
+<span class="sourceLineNo">276</span>    public String toString() {<a 
name="line.276"></a>
+<span class="sourceLineNo">277</span>      return "family:"+ 
Bytes.toString(family) + " path:" + hfilePath.toString();<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><a name="line.280"></a>
+<span class="sourceLineNo">281</span>  /**<a name="line.281"></a>
+<span class="sourceLineNo">282</span>   * Walk the given directory for all 
HFiles, and return a Queue<a name="line.282"></a>
+<span class="sourceLineNo">283</span>   * containing all such files.<a 
name="line.283"></a>
+<span class="sourceLineNo">284</span>   */<a name="line.284"></a>
+<span class="sourceLineNo">285</span>  private void discoverLoadQueue(final 
Deque&lt;LoadQueueItem&gt; ret, final Path hfofDir,<a name="line.285"></a>
+<span class="sourceLineNo">286</span>    final boolean validateHFile) throws 
IOException {<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    fs = 
hfofDir.getFileSystem(getConf());<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    visitBulkHFiles(fs, hfofDir, new 
BulkHFileVisitor&lt;byte[]&gt;() {<a name="line.288"></a>
+<span class="sourceLineNo">289</span>      @Override<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      public byte[] bulkFamily(final 
byte[] familyName) {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>        return familyName;<a 
name="line.291"></a>
+<span class="sourceLineNo">292</span>      }<a name="line.292"></a>
+<span class="sourceLineNo">293</span>      @Override<a name="line.293"></a>
+<span class="sourceLineNo">294</span>      public void bulkHFile(final byte[] 
family, final FileStatus hfile) throws IOException {<a name="line.294"></a>
+<span class="sourceLineNo">295</span>        long length = hfile.getLen();<a 
name="line.295"></a>
+<span class="sourceLineNo">296</span>        if (length &gt; 
getConf().getLong(HConstants.HREGION_MAX_FILESIZE,<a name="line.296"></a>
+<span class="sourceLineNo">297</span>            
HConstants.DEFAULT_MAX_FILE_SIZE)) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span>          LOG.warn("Trying to bulk load 
hfile " + hfile.getPath() + " with size: " +<a name="line.298"></a>
+<span class="sourceLineNo">299</span>              length + " bytes can be 
problematic as it may lead to oversplitting.");<a name="line.299"></a>
+<span class="sourceLineNo">300</span>        }<a name="line.300"></a>
+<span class="sourceLineNo">301</span>        ret.add(new LoadQueueItem(family, 
hfile.getPath()));<a name="line.301"></a>
+<span class="sourceLineNo">302</span>      }<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    }, validateHFile);<a 
name="line.303"></a>
+<span class="sourceLineNo">304</span>  }<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span>  /**<a name="line.306"></a>
+<span class="sourceLineNo">307</span>   * Perform a bulk load of the given 
directory into the given<a name="line.307"></a>
+<span class="sourceLineNo">308</span>   * pre-existing table.  This method is 
not threadsafe.<a name="line.308"></a>
+<span class="sourceLineNo">309</span>   *<a name="line.309"></a>
+<span class="sourceLineNo">310</span>   * @param hfofDir the directory that 
was provided as the output path<a name="line.310"></a>
+<span class="sourceLineNo">311</span>   * of a job using HFileOutputFormat<a 
name="line.311"></a>
+<span class="sourceLineNo">312</span>   * @param table the table to load 
into<a name="line.312"></a>
+<span class="sourceLineNo">313</span>   * @throws TableNotFoundException if 
table does not yet exist<a name="line.313"></a>
+<span class="sourceLineNo">314</span>   */<a name="line.314"></a>
+<span class="sourceLineNo">315</span>  @SuppressWarnings("deprecation")<a 
name="line.315"></a>
+<span class="sourceLineNo">316</span>  public void doBulkLoad(Path hfofDir, 
final HTable table)<a name="line.316"></a>
+<span class="sourceLineNo">317</span>      throws TableNotFoundException, 
IOException {<a name="line.317"></a>
+<span class="sourceLineNo">318</span>    try (Admin admin = 
table.getConnection().getAdmin();<a name="line.318"></a>
+<span class="sourceLineNo">319</span>        RegionLocator rl = 
table.getRegionLocator()) {<a name="line.319"></a>
+<span class="sourceLineNo">320</span>      doBulkLoad(hfofDir, admin, table, 
rl);<a name="line.320"></a>
+<span class="sourceLineNo">321</span>    }<a name="line.321"></a>
+<span class="sourceLineNo">322</span>  }<a name="line.322"></a>
 <span class="sourceLineNo">323</span><a name="line.323"></a>
-<span class="sourceLineNo">324</span>    if 
(!admin.isTableAvailable(regionLocator.getName())) {<a name="line.324"></a>
-<span class="sourceLineNo">325</span>      throw new 
TableNotFoundException("Table " + table.getName() + " is not currently 
available.");<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    }<a name="line.326"></a>
-<span class="sourceLineNo">327</span><a name="line.327"></a>
-<span class="sourceLineNo">328</span>    ExecutorService pool = 
createExecutorService();<a name="line.328"></a>
-<span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span>    // LQI queue does not need to be 
threadsafe -- all operations on this queue<a name="line.330"></a>
-<span class="sourceLineNo">331</span>    // happen in this thread<a 
name="line.331"></a>
-<span class="sourceLineNo">332</span>    Deque&lt;LoadQueueItem&gt; queue = 
new LinkedList&lt;LoadQueueItem&gt;();<a name="line.332"></a>
-<span class="sourceLineNo">333</span>    try {<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      /*<a name="line.334"></a>
-<span class="sourceLineNo">335</span>       * Checking hfile format is a 
time-consuming operation, we should have an option to skip<a 
name="line.335"></a>
-<span class="sourceLineNo">336</span>       * this step when bulkloading 
millions of HFiles. See HBASE-13985.<a name="line.336"></a>
-<span class="sourceLineNo">337</span>       */<a name="line.337"></a>
-<span class="sourceLineNo">338</span>      boolean validateHFile = 
getConf().getBoolean("hbase.loadincremental.validate.hfile", true);<a 
name="line.338"></a>
-<span class="sourceLineNo">339</span>      if(!validateHFile) {<a 
name="line.339"></a>
-<span class="sourceLineNo">340</span>  LOG.warn("You are skipping HFiles 
validation, it might cause some data loss if files " +<a name="line.340"></a>
-<span class="sourceLineNo">341</span>      "are not correct. If you fail to 
read data from your table after using this " +<a name="line.341"></a>
-<span class="sourceLineNo">342</span>      "option, consider removing the 
files and bulkload again without this option. " +<a name="line.342"></a>
-<span class="sourceLineNo">343</span>      "See HBASE-13985");<a 
name="line.343"></a>
-<span class="sourceLineNo">344</span>      }<a name="line.344"></a>
-<span class="sourceLineNo">345</span>      prepareHFileQueue(hfofDir, table, 
queue, validateHFile);<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span>      int count = 0;<a 
name="line.347"></a>
-<span class="sourceLineNo">348</span><a name="line.348"></a>
-<span class="sourceLineNo">349</span>      if (queue.isEmpty()) {<a 
name="line.349"></a>
-<span class="sourceLineNo">350</span>        LOG.warn("Bulk load operation did 
not find any files to load in " +<a name="line.350"></a>
-<span class="sourceLineNo">351</span>            "directory " + 
hfofDir.toUri() + ".  Does it contain files in " +<a name="line.351"></a>
-<span class="sourceLineNo">352</span>            "subdirectories that 
correspond to column family names?");<a name="line.352"></a>
-<span class="sourceLineNo">353</span>        return;<a name="line.353"></a>
-<span class="sourceLineNo">354</span>      }<a name="line.354"></a>
-<span class="sourceLineNo">355</span><a name="line.355"></a>
-<span class="sourceLineNo">356</span>      //If using secure bulk load, get 
source delegation token, and<a name="line.356"></a>
-<span class="sourceLineNo">357</span>      //prepare staging directory and 
token<a name="line.357"></a>
-<span class="sourceLineNo">358</span>      // fs is the source filesystem<a 
name="line.358"></a>
-<span class="sourceLineNo">359</span>      
fsDelegationToken.acquireDelegationToken(fs);<a name="line.359"></a>
-<span class="sourceLineNo">360</span>      
if(isSecureBulkLoadEndpointAvailable()) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>        bulkToken = new 
SecureBulkLoadClient(table).prepareBulkLoad(table.getName());<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>      // Assumes that region splits can 
happen while this occurs.<a name="line.364"></a>
-<span class="sourceLineNo">365</span>      while (!queue.isEmpty()) {<a 
name="line.365"></a>
-<span class="sourceLineNo">366</span>        // need to reload split keys each 
iteration.<a name="line.366"></a>
-<span class="sourceLineNo">367</span>        final Pair&lt;byte[][], 
byte[][]&gt; startEndKeys = regionLocator.getStartEndKeys();<a 
name="line.367"></a>
-<span class="sourceLineNo">368</span>        if (count != 0) {<a 
name="line.368"></a>
-<span class="sourceLineNo">369</span>          LOG.info("Split occured while 
grouping HFiles, retry attempt " +<a name="line.369"></a>
-<span class="sourceLineNo">370</span>              + count + " with " + 
queue.size() + " files remaining to group or split");<a name="line.370"></a>
-<span class="sourceLineNo">371</span>        }<a name="line.371"></a>
-<span class="sourceLineNo">372</span><a name="line.372"></a>
-<span class="sourceLineNo">373</span>        int maxRetries = 
getConf().getInt(HConstants.BULKLOAD_MAX_RETRIES_NUMBER, 10);<a 
name="line.373"></a>
-<span class="sourceLineNo">374</span>        maxRetries = Math.max(maxRetries, 
startEndKeys.getFirst().length + 1);<a name="line.374"></a>
-<span class="sourceLineNo">375</span>        if (maxRetries != 0 &amp;&amp; 
count &gt;= maxRetries) {<a name="line.375"></a>
-<span class="sourceLineNo">376</span>          throw new IOException("Retry 
attempted " + count +<a name="line.376"></a>
-<span class="sourceLineNo">377</span>            " times without completing, 
bailing out");<a name="line.377"></a>
-<span class="sourceLineNo">378</span>        }<a name="line.378"></a>
-<span class="sourceLineNo">379</span>        count++;<a name="line.379"></a>
-<span class="sourceLineNo">380</span><a name="line.380"></a>
-<span class="sourceLineNo">381</span>        // Using ByteBuffer for byte[] 
equality semantics<a name="line.381"></a>
-<span class="sourceLineNo">382</span>        Multimap&lt;ByteBuffer, 
LoadQueueItem&gt; regionGroups = groupOrSplitPhase(table,<a name="line.382"></a>
-<span class="sourceLineNo">383</span>            pool, queue, startEndKeys);<a 
name="line.383"></a>
+<span class="sourceLineNo">324</span>  /**<a name="line.324"></a>
+<span class="sourceLineNo">325</span>   * Perform a bulk load of the given 
directory into the given<a name="line.325"></a>
+<span class="sourceLineNo">326</span>   * pre-existing table.  This method is 
not threadsafe.<a name="line.326"></a>
+<span class="sourceLineNo">327</span>   *<a name="line.327"></a>
+<span class="sourceLineNo">328</span>   * @param hfofDir the directory that 
was provided as the output path<a name="line.328"></a>
+<span class="sourceLineNo">329</span>   * of a job using HFileOutputFormat<a 
name="line.329"></a>
+<span class="sourceLineNo">330</span>   * @param table the table to load 
into<a name="line.330"></a>
+<span class="sourceLineNo">331</span>   * @throws TableNotFoundException if 
table does not yet exist<a name="line.331"></a>
+<span class="sourceLineNo">332</span>   */<a name="line.332"></a>
+<span class="sourceLineNo">333</span>  public void doBulkLoad(Path hfofDir, 
final Admin admin, Table table,<a name="line.333"></a>
+<span class="sourceLineNo">334</span>      RegionLocator regionLocator) throws 
TableNotFoundException, IOException  {<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span>    if 
(!admin.isTableAvailable(regionLocator.getName())) {<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      throw new 
TableNotFoundException("Table " + table.getName() + " is not currently 
available.");<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>    ExecutorService pool = 
createExecutorService();<a name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span>    // LQI queue does not need to be 
threadsafe -- all operations on this queue<a name="line.342"></a>
+<span class="sourceLineNo">343</span>    // happen in this thread<a 
name="line.343"></a>
+<span class="sourceLineNo">344</span>    Deque&lt;LoadQueueItem&gt; queue = 
new LinkedList&lt;LoadQueueItem&gt;();<a name="line.344"></a>
+<span class="sourceLineNo">345</span>    try {<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      /*<a name="line.346"></a>
+<span class="sourceLineNo">347</span>       * Checking hfile format is a 
time-consuming operation, we should have an option to skip<a 
name="line.347"></a>
+<span class="sourceLineNo">348</span>       * this step when bulkloading 
millions of HFiles. See HBASE-13985.<a name="line.348"></a>
+<span class="sourceLineNo">349</span>       */<a name="line.349"></a>
+<span class="sourceLineNo">350</span>      boolean validateHFile = 
getConf().getBoolean("hbase.loadincremental.validate.hfile", true);<a 
name="line.350"></a>
+<span class="sourceLineNo">351</span>      if(!validateHFile) {<a 
name="line.351"></a>
+<span class="sourceLineNo">352</span>  LOG.warn("You are skipping HFiles 
validation, it might cause some data loss if files " +<a name="line.352"></a>
+<span class="sourceLineNo">353</span>      "are not correct. If you fail to 
read data from your table after using this " +<a name="line.353"></a>
+<span class="sourceLineNo">354</span>      "option, consider removing the 
files and bulkload again without this option. " +<a name="line.354"></a>
+<span class="sourceLineNo">355</span>      "See HBASE-13985");<a 
name="line.355"></a>
+<span class="sourceLineNo">356</span>      }<a name="line.356"></a>
+<span class="sourceLineNo">357</span>      prepareHFileQueue(hfofDir, table, 
queue, validateHFile);<a name="line.357"></a>
+<span class="sourceLineNo">358</span><a name="line.358"></a>
+<span class="sourceLineNo">359</span>      int count = 0;<a 
name="line.359"></a>
+<span class="sourceLineNo">360</span><a name="line.360"></a>
+<span class="sourceLineNo">361</span>      if (queue.isEmpty()) {<a 
name="line.361"></a>
+<span class="sourceLineNo">362</span>        LOG.warn("Bulk load operation did 
not find any files to load in " +<a name="line.362"></a>
+<span class="sourceLineNo">363</span>            "directory " + 
hfofDir.toUri() + ".  Does it contain files in " +<a name="line.363"></a>
+<span class="sourceLineNo">364</span>            "subdirectories that 
correspond to column family names?");<a name="line.364"></a>
+<span class="sourceLineNo">365</span>        return;<a name="line.365"></a>
+<span class="sourceLineNo">366</span>      }<a name="line.366"></a>
+<span class="sourceLineNo">367</span><a name="line.367"></a>
+<span class="sourceLineNo">368</span>      //If using secure bulk load, get 
source delegation token, and<a name="line.368"></a>
+<span class="sourceLineNo">369</span>      //prepare staging directory and 
token<a name="line.369"></a>
+<span class="sourceLineNo">370</span>      // fs is the source filesystem<a 
name="line.370"></a>
+<span class="sourceLineNo">371</span>      
fsDelegationToken.acquireDelegationToken(fs);<a name="line.371"></a>
+<span class="sourceLineNo">372</span>      
if(isSecureBulkLoadEndpointAvailable()) {<a name="line.372"></a>
+<span class="sourceLineNo">373</span>        bulkToken = new 
SecureBulkLoadClient(table).prepareBulkLoad(table.getName());<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">376</span>      // Assumes that region splits can 
happen while this occurs.<a name="line.376"></a>
+<span class="sourceLineNo">377</span>      while (!queue.isEmpty()) {<a 
name="line.377"></a>
+<span class="sourceLineNo">378</span>        // need to reload split keys each 
iteration.<a name="line.378"></a>
+<span class="sourceLineNo">379</span>        final Pair&lt;byte[][], 
byte[][]&gt; startEndKeys = regionLocator.getStartEndKeys();<a 
name="line.379"></a>
+<span class="sourceLineNo">380</span>        if (count != 0) {<a 
name="line.380"></a>
+<span class="sourceLineNo">381</span>          LOG.info("Split occured while 
grouping HFiles, retry attempt " +<a name="line.381"></a>
+<span class="sourceLineNo">382</span>              + count + " with " + 
queue.size() + " files remaining to group or split");<a name="line.382"></a>
+<span class="sourceLineNo">383</span>        }<a name="line.383"></a>
 <span class="sourceLineNo">384</span><a name="line.384"></a>
-<span class="sourceLineNo">385</span>        if 
(!checkHFilesCountPerRegionPerFamily(regionGroups)) {<a name="line.385"></a>
-<span class="sourceLineNo">386</span>          // Error is logged inside 
checkHFilesCountPerRegionPerFamily.<a name="line.386"></a>
-<span class="sourceLineNo">387</span>          throw new IOException("Trying 
to load more than " + maxFilesPerRegionPerFamily<a name="line.387"></a>
-<span class="sourceLineNo">388</span>            + " hfiles to one family of 
one region");<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>        bulkLoadPhase(table, 
admin.getConnection(), pool, queue, regionGroups);<a name="line.391"></a>
+<span class="sourceLineNo">385</span>        int maxRetries = 
getConf().getInt(HConstants.BULKLOAD_MAX_RETRIES_NUMBER, 10);<a 
name="line.385"></a>
+<span class="sourceLineNo">386</span>        maxRetries = Math.max(maxRetries, 
startEndKeys.getFirst().length + 1);<a name="line.386"></a>
+<span class="sourceLineNo">387</span>        if (maxRetries != 0 &amp;&amp; 
count &gt;= maxRetries) {<a name="line.387"></a>
+<span class="sourceLineNo">388</span>          throw new IOException("Retry 
attempted " + count +<a name="line.388"></a>
+<span class="sourceLineNo">389</span>            " times without completing, 
bailing out");<a name="line.389"></a>
+<span class="sourceLineNo">390</span>        }<a name="line.390"></a>
+<span class="sourceLineNo">391</span>        count++;<a name="line.391"></a>
 <span class="sourceLineNo">392</span><a name="line.392"></a>
-<span class="sourceLineNo">393</span>        // NOTE: The next iteration's 
split / group could happen in parallel to<a name="line.393"></a>
-<span class="sourceLineNo">394</span>        // atomic bulkloads assuming that 
there are splits and no merges, and<a name="line.394"></a>
-<span class="sourceLineNo">395</span>        // that we can atomically pull 
out the groups we want to retry.<a name="line.395"></a>
-<span class="sourceLineNo">396</span>      }<a name="line.396"></a>
-<span class="sourceLineNo">397</span><a name="line.397"></a>
-<span class="sourceLineNo">398</span>    } finally {<a name="line.398"></a>
-<span class="sourceLineNo">399</span>      
fsDelegationToken.releaseDelegationToken();<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      if(bulkToken != null) {<a 
name="line.400"></a>
-<span class="sourceLineNo">401</span>        new 
SecureBulkLoadClient(table).cleanupBulkLoad(bulkToken);<a name="line.401"></a>
-<span class="sourceLineNo">402</span>      }<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      pool.shutdown();<a 
name="line.403"></a>
-<span class="sourceLineNo">404</span>      if (queue != null &amp;&amp; 
!queue.isEmpty()) {<a name="line.404"></a>
-<span class="sourceLineNo">405</span>        StringBuilder err = new 
StringBuilder();<a name="line.405"></a>
-<span class="sourceLineNo">406</span>        
err.append("-------------------------------------------------\n");<a 
name="line.406"></a>
-<span class="sourceLineNo">407</span>        err.append("Bulk load aborted 
with some files not yet loaded:\n");<a name="line.407"></a>
-<span class="sourceLineNo">408</span>        
err.append("-------------------------------------------------\n");<a 
name="line.408"></a>
-<span class="sourceLineNo">409</span>        for (LoadQueueItem q : queue) {<a 
name="line.409"></a>
-<span class="sourceLineNo">410</span>          err.append("  
").append(q.hfilePath).append('\n');<a name="line.410"></a>
-<span class="sourceLineNo">411</span>        }<a name="line.411"></a>
-<span class="sourceLineNo">412</span>        LOG.error(err);<a 
name="line.412"></a>
-<span class="sourceLineNo">413</span>      }<a name="line.413"></a>
-<span class="sourceLineNo">414</span>    }<a name="line.414"></a>
-<span class="sourceLineNo">415</span><a name="line.415"></a>
-<span class="sourceLineNo">416</span>    if (queue != null &amp;&amp; 
!queue.isEmpty()) {<a name="line.416"></a>
-<span class="sourceLineNo">417</span>        throw new RuntimeException("Bulk 
load aborted with some files not yet loaded."<a name="line.417"></a>
-<span class="sourceLineNo">418</span>          + "Please check log for more 
details.");<a name="line.418"></a>
-<span class="sourceLineNo">419</span>    }<a name="line.419"></a>
-<span class="sourceLineNo">420</span>  }<a name="line.420"></a>
-<span class="sourceLineNo">421</span><a name="line.421"></a>
-<span class="sourceLineNo">422</span>  /**<a name="line.422"></a>
-<span class="sourceLineNo">423</span>   * Prepare a collection of {@link 
LoadQueueItem} from list of source hfiles contained in the<a 
name="line.423"></a>
-<span class="sourceLineNo">424</span>   * passed directory and validates 
whether the prepared queue has all the valid table column<a name="line.424"></a>
-<span class="sourceLineNo">425</span>   * families in it.<a 
name="line.425"></a>
-<span class="sourceLineNo">426</span>   * @param hfilesDir directory 
containing list of hfiles to be loaded into the table<a name="line.426"></a>
-<span class="sourceLineNo">427</span>   * @param table table to which hfiles 
should be loaded<a name="line.427"></a>
-<span class="sourceLineNo">428</span>   * @param queue queue which needs to be 
loaded into the table<a name="line.428"></a>
-<span class="sourceLineNo">429</span>   * @param validateHFile if true hfiles 
will be validated for its format<a name="line.429"></a>
-<span class="sourceLineNo">430</span>   * @throws IOException If any I/O or 
network error occurred<a name="line.430"></a>
-<span class="sourceLineNo">431</span>   */<a name="line.431"></a>
-<span class="sourceLineNo">432</span>  public void prepareHFileQueue(Path 
hfilesDir, Table table, Deque&lt;LoadQueueItem&gt; queue,<a name="line.432"></a>
-<span class="sourceLineNo">433</span>      boolean validateHFile) throws 
IOException {<a name="line.433"></a>
-<span class="sourceLineNo">434</span>    discoverLoadQueue(queue, hfilesDir, 
validateHFile);<a name="line.434"></a>
-<span class="sourceLineNo">435</span>    validateFamiliesInHFiles(table, 
queue);<a name="line.435"></a>
-<span class="sourceLineNo">436</span>  }<a name="line.436"></a>
-<span class="sourceLineNo">437</span><a name="line.437"></a>
-<span class="sourceLineNo">438</span>  // Initialize a thread pool<a 
name="line.438"></a>
-<span class="sourceLineNo">439</span>  private ExecutorService 
createExecutorService() {<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    ThreadFactoryBuilder builder = new 
ThreadFactoryBuilder();<a name="line.440"></a>
-<span class="sourceLineNo">441</span>    
builder.setNameFormat("LoadIncrementalHFiles-%1$d");<a name="line.441"></a>
-<span class="sourceLineNo">442</span>    ExecutorService pool = new 
ThreadPoolExecutor(nrThreads, nrThreads, 60, TimeUnit.SECONDS,<a 
name="line.442"></a>
-<span class="sourceLineNo">443</span>        new 
LinkedBlockingQueue&lt;Runnable&gt;(), builder.build());<a name="line.443"></a>
-<span class="sourceLineNo">444</span>    ((ThreadPoolExecutor) 
pool).allowCoreThreadTimeOut(true);<a name="line.444"></a>
-<span class="sourceLineNo">445</span>    return pool;<a name="line.445"></a>
-<span class="sourceLineNo">446</span>  }<a name="line.446"></a>
-<span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span>  /**<a name="line.448"></a>
-<span class="sourceLineNo">449</span>   * Checks whether there is any invalid 
family name in HFiles to be bulk loaded.<a name="line.449"></a>
-<span class="sourceLineNo">450</span>   */<a name="line.450"></a>
-<span class="sourceLineNo">451</span>  private void 
validateFamiliesInHFiles(Table table, Deque&lt;LoadQueueItem&gt; queue)<a 
name="line.451"></a>
-<span class="sourceLineNo">452</span>      throws IOException {<a 
name="line.452"></a>
-<span class="sourceLineNo">453</span>    Collection&lt;HColumnDescriptor&gt; 
families = table.getTableDescriptor().getFamilies();<a name="line.453"></a>
-<span class="sourceLineNo">454</span>    List&lt;String&gt; familyNames = new 
ArrayList&lt;String&gt;(families.size());<a name="line.454"></a>
-<span class="sourceLineNo">455</span>    for (HColumnDescriptor family : 
families) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span>      
familyNames.add(family.getNameAsString());<a name="line.456"></a>
-<span class="sourceLineNo">457</span>    }<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    List&lt;String&gt; unmatchedFamilies 
= new ArrayList&lt;String&gt;();<a name="line.458"></a>
-<span class="sourceLineNo">459</span>    Iterator&lt;LoadQueueItem&gt; 
queueIter = queue.iterator();<a name="line.459"></a>
-<span class="sourceLineNo">460</span>    while (queueIter.hasNext()) {<a 
name="line.460"></a>
-<span class="sourceLineNo">461</span>      LoadQueueItem lqi = 
queueIter.next();<a name="line.461"></a>
-<span class="sourceLineNo">462</span>      String familyNameInHFile = 
Bytes.toString(lqi.family);<a name="line.462"></a>
-<span class="sourceLineNo">463</span>      if 
(!familyNames.contains(familyNameInHFile)) {<a name="line.463"></a>
-<span class="sourceLineNo">464</span>        
unmatchedFamilies.add(familyNameInHFile);<a name="line.464"></a>
-<span class="sourceLineNo">465</span>      }<a name="line.465"></a>
-<span class="sourceLineNo">466</span>    }<a name="line.466"></a>
-<span class="sourceLineNo">467</span>    if (unmatchedFamilies.size() &gt; 0) 
{<a name="line.467"></a>
-<span class="sourceLineNo">468</span>      String msg =<a name="line.468"></a>
-<span class="sourceLineNo">469</span>          "Unmatched family names found: 
unmatched family names in HFiles to be bulkloaded: "<a name="line.469"></a>
-<span class="sourceLineNo">470</span>              + unmatchedFamilies + "; 
valid family names of table " + table.getName() + " are: "<a 
name="line.470"></a>
-<span class="sourceLineNo">471</span>              + familyNames;<a 
name="line.471"></a>
-<span class="sourceLineNo">472</span>      LOG.error(msg);<a 
name="line.472"></a>
-<span class="sourceLineNo">473</span>      throw new IOException(msg);<a 
name="line.473"></a>
-<span class="sourceLineNo">474</span>    }<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>   * Used by the replication sink to load 
the hfiles from the source cluster. It does the following,<a 
name="line.478"></a>
-<span class="sourceLineNo">479</span>   * 1. {@link 
LoadIncrementalHFiles#groupOrSplitPhase(Table, ExecutorService, Deque, Pair)} 
2.<a name="line.479"></a>
-<span class="sourceLineNo">480</span>   * {@link<a name="line.480"></a>
-<span class="sourceLineNo">481</span>   * 
LoadIncrementalHFiles#bulkLoadPhase(Table, Connection, ExecutorService, Deque, 
Multimap)}<a name="line.481"></a>
-<span class="sourceLineNo">482</span>   * @param table Table to which these 
hfiles should be loaded to<a name="line.482"></a>
-<span class="sourceLineNo">483</span>   * @param conn Connection to use<a 
name="line.483"></a>
-<span class="sourceLineNo">484</span>   * @param queue {@link LoadQueueItem} 
has hfiles yet to be loaded<a name="line.484"></a>
-<span class="sourceLineNo">485</span>   * @param startEndKeys starting and 
ending row keys of the region<a name="line.485"></a>
-<span class="sourceLineNo">486</span>   */<a name="line.486"></a>
-<span class="sourceLineNo">487</span>  public void loadHFileQueue(final Table 
table, final Connection conn, Deque&lt;LoadQueueItem&gt; queue,<a 
name="line.487"></a>
-<span class="sourceLineNo">488</span>      Pair&lt;byte[][], byte[][]&gt; 
startEndKeys) throws IOException {<a name="line.488"></a>
-<span class="sourceLineNo">489</span>    ExecutorService pool = null;<a 
name="line.489"></a>
-<span class="sourceLineNo">490</span>    try {<a name="line.490"></a>
-<span class="sourceLineNo">491</span>      pool = createExecutorService();<a 
name="line.491"></a>
-<span class="sourceLineNo">492</span>      Multimap&lt;ByteBuffer, 
LoadQueueItem&gt; regionGroups =<a name="line.492"></a>
-<span class="sourceLineNo">493</span>          groupOrSplitPhase(table, pool, 
queue, startEndKeys);<a name="line.493"></a>
-<span class="sourceLineNo">494</span>      bulkLoadPhase(table, conn, pool, 
queue, regionGroups);<a name="line.494"></a>
-<span class="sourceLineNo">495</span>    } finally {<a name="line.495"></a>
-<span class="sourceLineNo">496</span>      if (pool != null) {<a 
name="line.496"></a>
-<span class="sourceLineNo">497</span>        pool.shutdown();<a 
name="line.497"></a>
-<span class="sourceLineNo">498</span>      }<a name="line.498"></a>
-<span class="sourceLineNo">499</span>    }<a name="line.499"></a>
-<span class="sourceLineNo">500</span>  }<a name="line.500"></a>
-<span class="sourceLineNo">501</span><a name="line.501"></a>
-<span class="sourceLineNo">502</span>  /**<a name="line.502"></a>
-<span class="sourceLineNo">503</span>   * This takes the LQI's grouped by 
likely regions and attempts to bulk load<a name="line.503"></a>
-<span class="sourceLineNo">504</span>   * them.  Any failures are re-queued 
for another pass with the<a name="line.504"></a>
-<span class="sourceLineNo">505</span>   * groupOrSplitPhase.<a 
name="line.505"></a>
-<span class="sourceLineNo">506</span>   */<a name="line.506"></a>
-<span class="sourceLineNo">507</span>  protected void bulkLoadPhase(final 
Table table, final Connection conn,<a name="line.507"></a>
-<span class="sourceLineNo">508</span>      ExecutorService pool, 
Deque&lt;LoadQueueItem&gt; queue,<a name="line.508"></a>
-<span class="sourceLineNo">509</span>      final Multimap&lt;ByteBuffer, 
LoadQueueItem&gt; regionGroups) throws IOException {<a name="line.509"></a>
-<span class="sourceLineNo">510</span>    // atomically bulk load the groups.<a 
name="line.510"></a>
-<span class="sourceLineNo">511</span>    
Set&lt;Future&lt;List&lt;LoadQueueItem&gt;&gt;&gt; loadingFutures = new 
HashSet&lt;Future&lt;List&lt;LoadQueueItem&gt;&gt;&gt;();<a name="line.511"></a>
-<span class="sourceLineNo">512</span>    for (Entry&lt;ByteBuffer, ? extends 
Collection&lt;LoadQueueItem&gt;&gt; e: regionGroups.asMap().entrySet()){<a 
name="line.512"></a>
-<span class="sourceLineNo">513</span>      final byte[] first = 
e.getKey().array();<a name="line.513"></a>
-<span class="sourceLineNo">514</span>      final 
Collection&lt;LoadQueueItem&gt; lqis =  e.getValue();<a name="line.514"></a>
-<span class="sourceLineNo">515</span><a name="line.515"></a>
-<span class="sourceLineNo">516</span>      final 
Callable&lt;List&lt;LoadQueueItem&gt;&gt; call = new 
Callable&lt;List&lt;LoadQueueItem&gt;&gt;() {<a name="line.516"></a>
-<span class="sourceLineNo">517</span>        @Override<a name="line.517"></a>
-<span class="sourceLineNo">518</span>        public List&lt;LoadQueueItem&gt; 
call() throws Exception {<a name="line.518"></a>
-<span class="sourceLineNo">519</span>          List&lt;LoadQueueItem&gt; 
toRetry =<a name="line.519"></a>
-<span class="sourceLineNo">520</span>              tryAtomicRegionLoad(conn, 
table.getName(), first, lqis);<a name="line.520"></a>
-<span class="sourceLineNo">521</span>          return toRetry;<a 
name="line.521"></a>
-<span class="sourceLineNo">522</span>        }<a name="line.522"></a>
-<span class="sourceLineNo">523</span>      };<a name="line.523"></a>
-<span class="sourceLineNo">524</span>      
loadingFutures.add(pool.submit(call));<a name="line.524"></a>
-<span class="sourceLineNo">525</span>    }<a name="line.525"></a>
-<span class="sourceLineNo">526</span><a name="line.526"></a>
-<span class="sourceLineNo">527</span>    // get all the results.<a 
name="line.527"></a>
-<span class="sourceLineNo">528</span>    for 
(Future&lt;List&lt;LoadQueueItem&gt;&gt; future : loadingFutures) {<a 
name="line.528"></a>
-<span class="sourceLineNo">529</span>      try {<a name="line.529"></a>
-<span class="sourceLineNo">530</span>        List&lt;LoadQueueItem&gt; toRetry 
= future.get();<a name="line.530"></a>
-<span class="sourceLineNo">531</span><a name="line.531"></a>
-<span class="sourceLineNo">532</span>        // LQIs that are requeued to be 
regrouped.<a name="line.532"></a>
-<span class="sourceLineNo">533</span>        queue.addAll(toRetry);<a 
name="line.533"></a>
-<span class="sourceLineNo">534</span><a name="line.534"></a>
-<span class="sourceLineNo">535</span>      } catch (ExecutionException e1) {<a 
name="line.535"></a>
-<span class="sourceLineNo">536</span>        Throwable t = e1.getCause();<a 
name="line.536"></a>
-<span class="sourceLineNo">537</span>        if (t instanceof IOException) {<a 
name="line.537"></a>
-<span class="sourceLineNo">538</span>          // At this point something 
unrecoverable has happened.<a name="line.538"></a>
-<span class="sourceLineNo">539</span>          // TODO Implement bulk load 
recovery<a name="line.539"></a>
-<span class="sourceLineNo">540</span>          throw new IOException("BulkLoad 
encountered an unrecoverable problem", t);<a name="line.540"></a>
-<span class="sourceLineNo">541</span>        }<a name="line.541"></a>
-<span class="sourceLineNo">542</span>        LOG.error("Unexpected execution 
exception during bulk load", e1);<a name="line.542"></a>
-<span class="sourceLineNo">543</span>        throw new 
IllegalStateException(t);<a name="line.543"></a>
-<span class="sourceLineNo">544</span>      } catch (InterruptedException e1) 
{<a name="line.544"></a>
-<span class="sourceLineNo">545</span>        LOG.error("Unexpected interrupted 
exception during bulk load", e1);<a name="line.545"></a>
-<span class="sourceLineNo">546</span>        throw (InterruptedIOException)new 
InterruptedIOException().initCause(e1);<a name="line.546"></a>
-<span class="sourceLineNo">547</span>      }<a name="line.547"></a>
-<span class="sourceLineNo">548</span>    }<a name="line.548"></a>
-<span class="sourceLineNo">549</span>  }<a name="line.549"></a>
-<span class="sourceLineNo">550</span><a name="line.550"></a>
-<span class="sourceLineNo">551</span>  private boolean 
checkHFilesCountPerRegionPerFamily(<a name="line.551"></a>
-<span class="sourceLineNo">552</span>      final Multimap&lt;ByteBuffer, 
LoadQueueItem&gt; regionGroups) {<a name="line.552"></a>
-<span class="sourceLineNo">553</span>    for (Entry&lt;ByteBuffer,<a 
name="line.553"></a>
-<span class="sourceLineNo">554</span>        ? extends 
Collection&lt;LoadQueueItem&gt;&gt; e: regionGroups.asMap().entrySet()) {<a 
name="line.554"></a>
-<span class="sourceLineNo">555</span>      final 
Collection&lt;LoadQueueItem&gt; lqis =  e.getValue();<a name="line.555"></a>
-<span class="sourceLineNo">556</span>      HashMap&lt;byte[], MutableInt&gt; 
filesMap = new HashMap&lt;byte[], MutableInt&gt;();<a name="line.556"></a>
-<span class="sourceLineNo">557</span>      for (LoadQueueItem lqi: lqis) {<a 
name="line.557"></a>
-<span class="sourceLineNo">558</span>        MutableInt count = 
filesMap.get(lqi.family);<a name="line.558"></a>
-<span class="sourceLineNo">559</span>        if (count == null) {<a 
name="line.559"></a>
-<span class="sourceLineNo">560</span>          count = new MutableInt();<a 
name="line.560"></a>
-<span class="sourceLineNo">561</span>          filesMap.put(lqi.family, 
count);<a name="line.561"></a>
-<span class="sourceLineNo">562</span>        }<a name="line.562"></a>
-<span class="sourceLineNo">563</span>        count.increment();<a 
name="line.563"></a>
-<span class="sourceLineNo">564</span>        if (count.intValue() &gt; 
maxFilesPerRegionPerFamily) {<a name="line.564"></a>
-<span class="sourceLineNo">565</span>          LOG.error("Trying to load more 
than " + maxFilesPerRegionPerFamily<a name="line.565"></a>
-<span class="sourceLineNo">566</span>            + " hfiles to family " + 
Bytes.toStringBinary(lqi.family)<a name="line.566"></a>
-<span class="sourceLineNo">567</span>            + " of region with start key 
"<a name="line.567"></a>
-<span class="sourceLineNo">568</span>            + 
Bytes.toStringBinary(e.getKey()));<a name="line.568"></a>
-<span class="sourceLineNo">569</span>          return false;<a 
name="line.569"></a>
-<span class="sourceLineNo">570</span>        }<a name="line.570"></a>
-<span class="sourceLineNo">571</span>      }<a name="line.571"></a>
-<span class="sourceLineNo">572</span>    }<a name="line.572"></a>
-<span class="sourceLineNo">573</span>    return true;<a name="line.573"></a>
-<span class="sourceLineNo">574</span>  }<a name="line.574"></a>
-<span class="sourceLineNo">575</span><a name="line.575"></a>
-<span class="sourceLineNo">576</span>  /**<a name="line.576"></a>
-<span class="sourceLineNo">577</span>   * @return A map that groups LQI by 
likely bulk load region targets.<a name="line.577"></a>
-<span class="sourceLineNo">578</span>   */<a name="line.578"></a>
-<span class="sourceLineNo">579</span>  private Multimap&lt;ByteBuffer, 
LoadQueueItem&gt; groupOrSplitPhase(final Table table,<a name="line.579"></a>
-<span class="sourceLineNo">580</span>      ExecutorService pool, 
Deque&lt;LoadQueueItem&gt; queue,<a name="line.580"></a>
-<span class="sourceLineNo">581</span>      final Pair&lt;byte[][], 
byte[][]&gt; startEndKeys) throws IOException {<a name="line.581"></a>
-<span class="sourceLineNo">582</span>    // &lt;region start key, LQI&gt; need 
synchronized only within this scope of this<a name="line.582"></a>
-<span class="sourceLineNo">583</span>    // phase because of the puts that 
happen in futures.<a name="line.583"></a>
-<span class="sourceLineNo">584</span>    Multimap&lt;ByteBuffer, 
LoadQueueItem&gt; rgs = HashMultimap.create();<a name="line.584"></a>
-<span class="sourceLineNo">585</span>    final Multimap&lt;ByteBuffer, 
LoadQueueItem&gt; regionGroups = Multimaps.synchronizedMultimap(rgs);<a 
name="line.585"></a>
-<span class="sourceLineNo">586</span><a name="line.586"></a>
-<span class="sourceLineNo">587</span>    // drain LQIs and figure out bulk 
load groups<a name="line.587"></a>
-<span class="sourceLineNo">588</span>    
Set&lt;Future&lt;List&lt;LoadQueueItem&gt;&gt;&gt; splittingFutures = new 
HashSet&lt;Future&lt;List&lt;LoadQueueItem&gt;&gt;&gt;();<a name="line.588"></a>
-<span class="sourceLineNo">589</span>    while (!queue.isEmpty()) {<a 
name="line.589"></a>
-<span class="sourceLineNo">590</span>      final LoadQueueItem item = 
queue.remove();<a name="line.590"></a>
-<span class="sourceLineNo">591</span><a name="line.591"></a>
-<span class="sourceLineNo">592</span>      final 
Callable&lt;List&lt;LoadQueueItem&gt;&gt; call = new 
Callable&lt;List&lt;LoadQueueItem&gt;&gt;() {<a name="line.592"></a>
-<span class="sourceLineNo">593</span>        @Override<a name="line.593"></a>
-<span class="sourceLineNo">594</span>        public List&lt;LoadQueueItem&gt; 
call() throws Exception {<a name="line.594"></a>
-<span class="sourceLineNo">595</span>          List&lt;LoadQueueItem&gt; 
splits = groupOrSplit(regionGroups, item, table, startEndKeys);<a 
name="line.595"></a>
-<span class="sourceLineNo">596</span>          return splits;<a 
name="line.596"></a>
-<span class="sourceLineNo">597</span>        }<a name="line.597"></a>
-<span class="sourceLineNo">598</span>      };<a name="line.598"></a>
-<span class="sourceLineNo">599</span>      
splittingFutures.add(pool.submit(call));<a name="line.599"></a>
-<span class="sourceLineNo">600</span>    }<a name="line.600"></a>
-<span class="sourceLineNo">601</span>    // get all the results.  All grouping 
and splitting must finish before<a name="line.601"></a>
-<span class="sourceLineNo">602</span>    // we can attempt the atomic loads.<a 
name="line.602"></a>
-<span class="sourceLineNo">603</span>    for 
(Future&lt;List&lt;LoadQueueItem&gt;&gt; lqis : splittingFutures) {<a 
name="line.603"></a>
-<span class="sourceLineNo">604</span>      try {<a name="line.604"></a>
-<span class="sourceLineNo">605</span>        List&lt;LoadQueueItem&gt; splits 
= lqis.get();<a name="line.605"></a>
-<span class="sourceLineNo">606</span>        if (splits != null) {<a 
name="line.606"></a>
-<span class="sourceLineNo">607</span>          queue.addAll(splits);<a 
name="line.607"></a>
-<span class="sourceLineNo">608</span>        }<a name="line.608"></a>
-<span class="sourceLineNo">609</span>      } catch (ExecutionException e1) {<a 
name="line.609"></a>
-<span class="sourceLineNo">610</span>        Throwable t = e1.getCause();<a 
name="line.610"></a>
-<span class="sourceLineNo">611</span>        if (t instanceof IOException) {<a 
name="line.611"></a>
-<span class="sourceLineNo">612</span>          LOG.error("IOException during 
splitting", e1);<a name="line.612"></a>
-<span class="sourceLineNo">613</span>          throw (IOException)t; // would 
have been thrown if not parallelized,<a name="line.613"></a>
-<span class="sourceLineNo">614</span>        }<a name="line.614"></a>
-<span class="sourceLineNo">615</span>        LOG.error("Unexpected execution 
exception during splitting", e1);<a name="line.615"></a>
-<span class="sourceLineNo">616</span>        throw new 
IllegalStateException(t);<a name="line.616"></a>
-<span class="sourceLineNo">617</span>      } catch (InterruptedException e1) 
{<a name="line.617"></a>
-<span class="sourceLineNo">618</span>        LOG.error("Unexpected interrupted 
exception during splitting", e1);<a name="line.618"></a>
-<span class="sourceLineNo">619</span>        throw (InterruptedIOException)new 
InterruptedIOException().initCause(e1);<a name="line.619"></a>
-<span class="sourceLineNo">620</span>      }<a name="line.620"></a>
-<span class="sourceLineNo">621</span>    }<a name="line.621"></a>
-<span class="sourceLineNo">622</span>    return regionGroups;<a 
name="line.622"></a>
-<span class="sourceLineNo">623</span>  }<a name="line.623"></a>
-<span class="sourceLineNo">624</span><a name="line.624"></a>
-<span class="sourceLineNo">625</span>  // unique file name for the table<a 
name="line.625"></a>
-<span class="sourceLineNo">626</span>  private String getUniqueName() {<a 
name="line.626"></a>
-<span class="sourceLineNo">627</span>    return 
UUID.randomUUID().toString().replaceAll("-", "");<a name="line.627"></a>
-<span class="sourceLineNo">628</span>  }<a name="line.628"></a>
-<span class="sourceLineNo">629</span><a name="line.629"></a>
-<span class="sourceLineNo">630</span>  protected List&lt;LoadQueueItem&gt; 
splitStoreFile(final LoadQueueItem item,<a name="line.630"></a>
-<span class="sourceLineNo">631</span>      final Table table, byte[] 
startKey,<a name="line.631"></a>
-<span class="sourceLineNo">632</span>      byte[] splitKey) throws IOException 
{<a name="line.632"></a>
-<span class="sourceLineNo">633</span>    final Path hfilePath = 
item.hfilePath;<a name="line.633"></a>
-<span class="sourceLineNo">634</span><a name="line.634"></a>
-<span class="sourceLineNo">635</span>    // We use a '_' prefix which is 
ignored when walking directory trees<a name="line.635"></a>
-<span class="sourceLineNo">636</span>    // above.<a name="line.636"></a>
-<span class="sourceLineNo">637</span>    final String TMP_DIR = "_tmp";<a 
name="line.637"></a>
-<span class="sourceLineNo">638</span>    Path tmpDir = 
item.hfilePath.getParent();<a name="line.638"></a>
-<span class="sourceLineNo">639</span>    if 
(!tmpDir.getName().equals(TMP_DIR)) {<a name="line.639"></a>
-<span class="sourceLineNo">640</span>      tmpDir = new Path(tmpDir, 
TMP_DIR);<a name="line.640"></a>
-<span class="sourceLineNo">641</span>    }<a name="line.641"></a>
-<span class="sourceLineNo">642</span><a name="line.642"></a>
-<span class="sourceLineNo">643</span>    LOG.info("HFile at " + hfilePath + " 
no longer fits inside a single " +<a name="line.643"></a>
-<span class="sourceLineNo">644</span>    "region. Splitting...");<a 
name="line.644"></a>
-<span class="sourceLineNo">645</span><a name="line.645"></a>
-<span class="sourceLineNo">646</span>    String uniqueName = 
getUniqueName();<a name="line.646"></a>
-<span class="sourceLineNo">647</span>    HColumnDescriptor familyDesc = 
table.getTableDescriptor().getFamily(item.family);<a name="line.647"></a>
-<span class="sourceLineNo">648</span><a name="line.648"></a>
-<span class="sourceLineNo">649</span>    Path botOut = new Path(tmpDir, 
uniqueName + ".bottom");<a name="line.649"></a>
-<span class="sourceLineNo">650</span>    Path topOut = new Path(tmpDir, 
uniqueName + ".top");<a name="line.650"></a>
-<span class="sourceLineNo">651</span>    splitStoreFile(getConf(), hfilePath, 
familyDesc, splitKey, botOut, topOut);<a name="line.651"></a>
-<span class="sourceLineNo">652</span><a name="line.652"></a>
-<span class="sourceLineNo">653</span>    FileSystem fs = 
tmpDir.getFileSystem(getConf());<a name="line.653"></a>
-<span class="sourceLineNo">654</span>    fs.setPermission(tmpDir, 
FsPermission.valueOf("-rwxrwxrwx"));<a name="line.654"></a>
-<span class="sourceLineNo">655</span>    fs.setPermission(botOut, 
FsPermission.valueOf("-rwxrwxrwx"));<a name="line.655"></a>
-<span class="sourceLineNo">656</span>    fs.setPermission(topOut, 
FsPermission.valueOf("-rwxrwxrwx"));<a name="line.656"></a>
+<span class="sourceLineNo">393</span>        // Using ByteBuffer for byte[] 
equality semantics<a name="line.393"></a>
+<span class="sourceLineNo">394</span>        Multimap&lt;ByteBuffer, 
LoadQueueItem&gt; regionGroups = groupOrSplitPhase(table,<a name="line.394"></a>
+<span class="sourceLineNo">395</span>            pool, queue, startEndKeys);<a 
name="line.395"></a>
+<span class="sourceLineNo">396</span><a name="line.396"></a>
+<span class="sourceLineNo">397</span>        if 
(!checkHFilesCountPerRegionPerFamily(regionGroups)) {<a name="line.397"></a>
+<span class="sourceLineNo">398</span>          // Error is logged inside 
checkHFilesCountPerRegionPerFamily.<a name="line.398"></a>
+<span class="sourceLineNo">399</span>          throw new IOException("Trying 
to load more than " + maxFilesPerRegionPerFamily<a name="line.399"></a>
+<span class="sourceLineNo">400</span>            + " hfiles to one family of 
one region");<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>        bulkLoadPhase(table, 
admin.getConnection(), pool, queue, regionGroups);<a name="line.403"></a>
+<span class="sourceLineNo">404</span><a name="line.404"></a>
+<span class="sourceLineNo">405</span>        // NOTE: The next iteration's 
split / group could happen in parallel to<a name="line.405"></a>
+<span class="sourceLineNo">406</span>        // atomic bulkloads assuming that 
there are splits and no merges, and<a name="line.406"></a>
+<span class="sourceLineNo">407</span>        // that we can atomically pull 
out the groups we want to retry.<a name="line.407"></a>
+<span class="sourceLineNo">408</span>      }<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span>    } finally {<a name="line.410"></a>
+<span class="sourceLineNo">411</span>      
fsDelegationToken.releaseDelegationToken();<a name="line.411"></a>
+<span class="sourceLineNo">412</span>      if(bulkToken != null) {<a 
name="line.412"></a>
+<span class="sourceLineNo">413</span>        new 
SecureBulkLoadClient(table).cleanupBulkLoad(bulkToken);<a name="line.413"></a>
+<span class="sourceLineNo">414</span>      }<a name="line.414"></a>
+<span class="sourceLineNo">415</span>      pool.shutdown();<a 
name="line.415"></a>
+<span class="sourceLineNo">416</span>      if (queue != null &amp;&amp; 
!queue.isEmpty()) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        StringBuilder err = new 
StringBuilder();<a name="line.417"></a>
+<span class="sourceLineNo">418</span>        
err.append("-------------------------------------------------\n");<a 
name="line.418"></a>
+<span class="sourceLineNo">419</span>        err.append("Bulk load aborted 
with some files not yet loaded:\n");<a name="line.419"></a>
+<span class="sourceLineNo">420</span>        
err.append("-------------------------------------------------\n");<a 
name="line.420"></a>
+<span class="sourceLineNo">421</span>        for (LoadQueueItem q : queue) {<a 
name="line.421"></a>
+<span class="sourceLineNo">422</span>          err.append("  
").append(q.hfilePath).append('\n');<a name="line.422"></a>
+<span class="sourceLineNo">423</span>        }<a name="line.423"></a>
+<span class="sourceLineNo">424</span>        LOG.error(err);<a 
name="line.424"></a>
+<span class="sourceLineNo">425</span>      }<a name="line.425"></a>
+<span class="sourceLineNo">426</span>    }<a name="line.426"></a>
+<span class="sourceLineNo">427</span><a name="line.427"></a>
+<span class="sourceLineNo">428</span>    if (queue != null &amp;&amp; 
!queue.isEmpty()) {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>        throw new RuntimeException("Bulk 
load aborted with some files not yet loaded."<a name="line.429"></a>
+<span class="sourceLineNo">430</span>          + "Please check log for more 
details.");<a name="line.430"></a>
+<span class="sourceLineNo">431</span>    }<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>  /**<a name="line.434"></a>
+<span class="sourceLineNo">435</span>   * Prepare a collection of {@link 
LoadQueueItem} from list of source hfiles contained in the<a 
name="line.435"></a>
+<span class="sourceLineNo">436</span>   * passed directory and validates 
whether the prepared queue has all the valid table column<a name="line.436"></a>
+<span class="sourceLineNo">437</span>   * families in it.<a 
name="line.437"></a>
+<span class="sourceLineNo">438</span>   * @param hfilesDir directory 
containing list of hfiles to be loaded into the table<a name="line.438"></a>
+<span class="sourceLineNo">439</span>   * @param table table to which hfiles 
should be loaded<a name="line.439"></a>
+<span class="sourceLineNo">440</span>   * @param queue queue which needs to be 
loaded into the table<a name="line.440"></a>
+<span class="sourceLineNo">441</span>   * @param validateHFile if true hfiles 
will be validated for its format<a name="line.441"></a>
+<span class="sourceLineNo">442</span>   * @throws IOException If any I/O or 
network error occurred<a name="line.442"></a>
+<span class="sourceLineNo">443</span>   */<a name="line.443"></a>
+<span class="sourceLineNo">444</span>  public void prepareHFileQueue(Path 
hfilesDir, Table table, Deque&lt;LoadQueueItem&gt; queue,<a name="line.444"></a>
+<span class="sourceLineNo">445</span>      boolean validateHFile) throws 
IOException {<a name="line.445"></a>
+<span class="sourceLineNo">446</span>    discoverLoadQueue(queue, hfilesDir, 
validateHFile);<a name="line.446"></a>
+<span class="sourceLineNo">447</span>    validateFamiliesInHFiles(table, 
queue);<a name="line.447"></a>
+<span class="sourceLineNo">448</span>  }<a name="line.448"></a>
+<span class="sourceLineNo">449</span><a name="line.449"></a>
+<span class="sourceLineNo">450</span>  // Initialize a thread pool<a 
name="line.450"></a>
+<span class="sourceLineNo">451</span>  private ExecutorService 
createExecutorService() {<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    ThreadFactoryBuilder builder = new 
ThreadFactoryBuilder();<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    
builder.setNameFormat("LoadIncrementalHFiles-%1$d");<a name="line.453"></a>
+<span class="sourceLineNo">454</span>    ExecutorService pool = new 
ThreadPoolExecutor(nrThreads, nrThreads, 60, TimeUnit.SECONDS,<a 
name="line.454"></a>
+<span class="sourceLineNo">455</span>        new 
LinkedBlockingQueue&lt;Runnable&gt;(), builder.build());<a name="line.455"></a>
+<span class="sourceLineNo">456</span>    ((ThreadPoolExecutor) 
pool).allowCoreThreadTimeOut(true);<a name="line.456"></a>
+<span class="sourceLineNo">457</span>    return pool;<a name="line.457"></a>
+<span class="sourceLineNo">458</span>  }<a name="line.458"></a>
+<span class="sourceLineNo">459</span><a name="line.459"></a>
+<span class="sourceLineNo">460</span>  /**<a name="line.460"></a>
+<span class="sourceLineNo">461</span>   * Checks whether there is any invalid 
family name in HFiles to be bulk loaded.<a name="line.461"></a>
+<span class="sourceLineNo">462</span>   */

<TRUNCATED>

Reply via email to