http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa7ffc92/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/MapReduceBackupMergeJob.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/MapReduceBackupMergeJob.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/MapReduceBackupMergeJob.html
index e96923b..67775bf 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/MapReduceBackupMergeJob.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/MapReduceBackupMergeJob.html
@@ -46,287 +46,272 @@
 <span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.backup.impl.BackupManifest;<a name="line.38"></a>
 <span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.backup.impl.BackupSystemTable;<a name="line.39"></a>
 <span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.backup.util.BackupUtils;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.slf4j.Logger;<a 
name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.slf4j.LoggerFactory;<a 
name="line.43"></a>
-<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<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.apache.hadoop.util.Tool;<a 
name="line.47"></a>
+<span class="sourceLineNo">041</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.util.Pair;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.hadoop.util.Tool;<a 
name="line.44"></a>
+<span class="sourceLineNo">045</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.slf4j.Logger;<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.slf4j.LoggerFactory;<a 
name="line.47"></a>
 <span class="sourceLineNo">048</span><a name="line.48"></a>
 <span class="sourceLineNo">049</span>/**<a name="line.49"></a>
 <span class="sourceLineNo">050</span> * MapReduce implementation of {@link 
BackupMergeJob}<a name="line.50"></a>
 <span class="sourceLineNo">051</span> * Must be initialized with configuration 
of a backup destination cluster<a name="line.51"></a>
 <span class="sourceLineNo">052</span> *<a name="line.52"></a>
 <span class="sourceLineNo">053</span> */<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>@InterfaceAudience.Private<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>public class MapReduceBackupMergeJob 
implements BackupMergeJob {<a name="line.56"></a>
-<span class="sourceLineNo">057</span>  public static final Logger LOG = 
LoggerFactory.getLogger(MapReduceBackupMergeJob.class);<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>  protected Tool player;<a 
name="line.59"></a>
-<span class="sourceLineNo">060</span>  protected Configuration conf;<a 
name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>  public MapReduceBackupMergeJob() {<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span>  }<a name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span>  @Override<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  public Configuration getConf() {<a 
name="line.66"></a>
-<span class="sourceLineNo">067</span>    return conf;<a name="line.67"></a>
-<span class="sourceLineNo">068</span>  }<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span>  @Override<a name="line.70"></a>
-<span class="sourceLineNo">071</span>  public void setConf(Configuration conf) 
{<a name="line.71"></a>
-<span class="sourceLineNo">072</span>    this.conf = conf;<a 
name="line.72"></a>
-<span class="sourceLineNo">073</span>  }<a name="line.73"></a>
-<span class="sourceLineNo">074</span><a name="line.74"></a>
-<span class="sourceLineNo">075</span>  @Override<a name="line.75"></a>
-<span class="sourceLineNo">076</span>  public void run(String[] backupIds) 
throws IOException {<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    String bulkOutputConfKey;<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span>    // TODO : run player on remote 
cluster<a name="line.79"></a>
-<span class="sourceLineNo">080</span>    player = new 
MapReduceHFileSplitterJob();<a name="line.80"></a>
-<span class="sourceLineNo">081</span>    bulkOutputConfKey = 
MapReduceHFileSplitterJob.BULK_OUTPUT_CONF_KEY;<a name="line.81"></a>
-<span class="sourceLineNo">082</span>    // Player reads all files in 
arbitrary directory structure and creates<a name="line.82"></a>
-<span class="sourceLineNo">083</span>    // a Map task for each file<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>    String bids = 
StringUtils.join(backupIds, ",");<a name="line.84"></a>
-<span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span>    if (LOG.isDebugEnabled()) {<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>      LOG.debug("Merge backup images " + 
bids);<a name="line.87"></a>
-<span class="sourceLineNo">088</span>    }<a name="line.88"></a>
-<span class="sourceLineNo">089</span><a name="line.89"></a>
-<span class="sourceLineNo">090</span>    List&lt;Pair&lt;TableName, 
Path&gt;&gt; processedTableList = new ArrayList&lt;Pair&lt;TableName, 
Path&gt;&gt;();<a name="line.90"></a>
-<span class="sourceLineNo">091</span>    boolean finishedTables = false;<a 
name="line.91"></a>
-<span class="sourceLineNo">092</span>    Connection conn = 
ConnectionFactory.createConnection(getConf());<a name="line.92"></a>
-<span class="sourceLineNo">093</span>    BackupSystemTable table = new 
BackupSystemTable(conn);<a name="line.93"></a>
-<span class="sourceLineNo">094</span>    FileSystem fs = 
FileSystem.get(getConf());<a name="line.94"></a>
-<span class="sourceLineNo">095</span><a name="line.95"></a>
-<span class="sourceLineNo">096</span>    try {<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>      // Get exclusive lock on backup 
system<a name="line.98"></a>
-<span class="sourceLineNo">099</span>      
table.startBackupExclusiveOperation();<a name="line.99"></a>
-<span class="sourceLineNo">100</span>      // Start merge operation<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>      
table.startMergeOperation(backupIds);<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span>      // Select most recent backup id<a 
name="line.103"></a>
-<span class="sourceLineNo">104</span>      String mergedBackupId = 
findMostRecentBackupId(backupIds);<a name="line.104"></a>
-<span class="sourceLineNo">105</span><a name="line.105"></a>
-<span class="sourceLineNo">106</span>      TableName[] tableNames = 
getTableNamesInBackupImages(backupIds);<a name="line.106"></a>
-<span class="sourceLineNo">107</span>      String backupRoot = null;<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span>      BackupInfo bInfo = 
table.readBackupInfo(backupIds[0]);<a name="line.109"></a>
-<span class="sourceLineNo">110</span>      backupRoot = 
bInfo.getBackupRootDir();<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span>      for (int i = 0; i &lt; 
tableNames.length; i++) {<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span>        LOG.info("Merge backup images for 
" + tableNames[i]);<a name="line.114"></a>
-<span class="sourceLineNo">115</span><a name="line.115"></a>
-<span class="sourceLineNo">116</span>        // Find input directories for 
table<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span>        Path[] dirPaths = 
findInputDirectories(fs, backupRoot, tableNames[i], backupIds);<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>        String dirs = 
StringUtils.join(dirPaths, ",");<a name="line.119"></a>
-<span class="sourceLineNo">120</span>        Path bulkOutputPath =<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>            
BackupUtils.getBulkOutputDir(BackupUtils.getFileNameCompatibleString(tableNames[i]),<a
 name="line.121"></a>
-<span class="sourceLineNo">122</span>              getConf(), false);<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>        // Delete content if exists<a 
name="line.123"></a>
-<span class="sourceLineNo">124</span>        if (fs.exists(bulkOutputPath)) 
{<a name="line.124"></a>
-<span class="sourceLineNo">125</span>          if (!fs.delete(bulkOutputPath, 
true)) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span>            LOG.warn("Can not delete: " + 
bulkOutputPath);<a name="line.126"></a>
-<span class="sourceLineNo">127</span>          }<a name="line.127"></a>
-<span class="sourceLineNo">128</span>        }<a name="line.128"></a>
-<span class="sourceLineNo">129</span>        Configuration conf = getConf();<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>        conf.set(bulkOutputConfKey, 
bulkOutputPath.toString());<a name="line.130"></a>
-<span class="sourceLineNo">131</span>        String[] playerArgs = { dirs, 
tableNames[i].getNameAsString() };<a name="line.131"></a>
-<span class="sourceLineNo">132</span><a name="line.132"></a>
-<span class="sourceLineNo">133</span>        int result = 0;<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span><a name="line.134"></a>
-<span class="sourceLineNo">135</span>        player.setConf(getConf());<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>        result = 
player.run(playerArgs);<a name="line.136"></a>
-<span class="sourceLineNo">137</span>        if (!succeeded(result)) {<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span>          throw new IOException("Can not 
merge backup images for " + dirs<a name="line.138"></a>
-<span class="sourceLineNo">139</span>              + " (check Hadoop/MR and 
HBase logs). Player return code =" + result);<a name="line.139"></a>
-<span class="sourceLineNo">140</span>        }<a name="line.140"></a>
-<span class="sourceLineNo">141</span>        // Add to processed table list<a 
name="line.141"></a>
-<span class="sourceLineNo">142</span>        processedTableList.add(new 
Pair&lt;TableName, Path&gt;(tableNames[i], bulkOutputPath));<a 
name="line.142"></a>
-<span class="sourceLineNo">143</span>        LOG.debug("Merge Job finished:" + 
result);<a name="line.143"></a>
-<span class="sourceLineNo">144</span>      }<a name="line.144"></a>
-<span class="sourceLineNo">145</span>      List&lt;TableName&gt; tableList = 
toTableNameList(processedTableList);<a name="line.145"></a>
-<span class="sourceLineNo">146</span>      
table.updateProcessedTablesForMerge(tableList);<a name="line.146"></a>
-<span class="sourceLineNo">147</span>      finishedTables = true;<a 
name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span>      // Move data<a name="line.149"></a>
-<span class="sourceLineNo">150</span>      for (Pair&lt;TableName, Path&gt; tn 
: processedTableList) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span>        moveData(fs, backupRoot, 
tn.getSecond(), tn.getFirst(), mergedBackupId);<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>      // Delete old data and update 
manifest<a name="line.154"></a>
-<span class="sourceLineNo">155</span>      List&lt;String&gt; backupsToDelete 
= getBackupIdsToDelete(backupIds, mergedBackupId);<a name="line.155"></a>
-<span class="sourceLineNo">156</span>      deleteBackupImages(backupsToDelete, 
conn, fs, backupRoot);<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      updateBackupManifest(backupRoot, 
mergedBackupId, backupsToDelete);<a name="line.157"></a>
-<span class="sourceLineNo">158</span>      // Finish merge session<a 
name="line.158"></a>
-<span class="sourceLineNo">159</span>      table.finishMergeOperation();<a 
name="line.159"></a>
-<span class="sourceLineNo">160</span>      // Release lock<a 
name="line.160"></a>
-<span class="sourceLineNo">161</span>      
table.finishBackupExclusiveOperation();<a name="line.161"></a>
-<span class="sourceLineNo">162</span>    } catch (RuntimeException e) {<a 
name="line.162"></a>
-<span class="sourceLineNo">163</span><a name="line.163"></a>
-<span class="sourceLineNo">164</span>      throw e;<a name="line.164"></a>
-<span class="sourceLineNo">165</span>    } catch (Exception e) {<a 
name="line.165"></a>
-<span class="sourceLineNo">166</span>      LOG.error(e.toString(), e);<a 
name="line.166"></a>
-<span class="sourceLineNo">167</span>      if (!finishedTables) {<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>        // cleanup bulk directories and 
finish merge<a name="line.168"></a>
-<span class="sourceLineNo">169</span>        // merge MUST be repeated (no 
need for repair)<a name="line.169"></a>
-<span class="sourceLineNo">170</span>        cleanupBulkLoadDirs(fs, 
toPathList(processedTableList));<a name="line.170"></a>
-<span class="sourceLineNo">171</span>        table.finishMergeOperation();<a 
name="line.171"></a>
-<span class="sourceLineNo">172</span>        
table.finishBackupExclusiveOperation();<a name="line.172"></a>
-<span class="sourceLineNo">173</span>        throw new IOException("Backup 
merge operation failed, you should try it again", e);<a name="line.173"></a>
-<span class="sourceLineNo">174</span>      } else {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>        // backup repair must be run<a 
name="line.175"></a>
-<span class="sourceLineNo">176</span>        throw new IOException(<a 
name="line.176"></a>
-<span class="sourceLineNo">177</span>            "Backup merge operation 
failed, run backup repair tool to restore system's integrity",<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span>            e);<a name="line.178"></a>
-<span class="sourceLineNo">179</span>      }<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    } finally {<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      table.close();<a 
name="line.181"></a>
-<span class="sourceLineNo">182</span>      conn.close();<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><a name="line.185"></a>
-<span class="sourceLineNo">186</span>  protected List&lt;Path&gt; 
toPathList(List&lt;Pair&lt;TableName, Path&gt;&gt; processedTableList) {<a 
name="line.186"></a>
-<span class="sourceLineNo">187</span>    ArrayList&lt;Path&gt; list = new 
ArrayList&lt;Path&gt;();<a name="line.187"></a>
-<span class="sourceLineNo">188</span>    for (Pair&lt;TableName, Path&gt; p : 
processedTableList) {<a name="line.188"></a>
-<span class="sourceLineNo">189</span>      list.add(p.getSecond());<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>    }<a name="line.190"></a>
-<span class="sourceLineNo">191</span>    return list;<a name="line.191"></a>
-<span class="sourceLineNo">192</span>  }<a name="line.192"></a>
-<span class="sourceLineNo">193</span><a name="line.193"></a>
-<span class="sourceLineNo">194</span>  protected List&lt;TableName&gt; 
toTableNameList(List&lt;Pair&lt;TableName, Path&gt;&gt; processedTableList) {<a 
name="line.194"></a>
-<span class="sourceLineNo">195</span>    ArrayList&lt;TableName&gt; list = new 
ArrayList&lt;TableName&gt;();<a name="line.195"></a>
-<span class="sourceLineNo">196</span>    for (Pair&lt;TableName, Path&gt; p : 
processedTableList) {<a name="line.196"></a>
-<span class="sourceLineNo">197</span>      list.add(p.getFirst());<a 
name="line.197"></a>
-<span class="sourceLineNo">198</span>    }<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    return list;<a name="line.199"></a>
-<span class="sourceLineNo">200</span>  }<a name="line.200"></a>
-<span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span>  protected void 
cleanupBulkLoadDirs(FileSystem fs, List&lt;Path&gt; pathList) throws 
IOException {<a name="line.202"></a>
-<span class="sourceLineNo">203</span>    for (Path path : pathList) {<a 
name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span>      if (!fs.delete(path, true)) {<a 
name="line.205"></a>
-<span class="sourceLineNo">206</span>        LOG.warn("Can't delete " + 
path);<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      }<a name="line.207"></a>
-<span class="sourceLineNo">208</span>    }<a name="line.208"></a>
-<span class="sourceLineNo">209</span>  }<a name="line.209"></a>
-<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span>  protected void 
updateBackupManifest(String backupRoot, String mergedBackupId,<a 
name="line.211"></a>
-<span class="sourceLineNo">212</span>      List&lt;String&gt; backupsToDelete) 
throws IllegalArgumentException, IOException {<a name="line.212"></a>
-<span class="sourceLineNo">213</span><a name="line.213"></a>
-<span class="sourceLineNo">214</span>    BackupManifest manifest =<a 
name="line.214"></a>
-<span class="sourceLineNo">215</span>        
HBackupFileSystem.getManifest(conf, new Path(backupRoot), mergedBackupId);<a 
name="line.215"></a>
-<span class="sourceLineNo">216</span>    
manifest.getBackupImage().removeAncestors(backupsToDelete);<a 
name="line.216"></a>
-<span class="sourceLineNo">217</span>    // save back<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    manifest.store(conf);<a 
name="line.218"></a>
-<span class="sourceLineNo">219</span><a name="line.219"></a>
-<span class="sourceLineNo">220</span>  }<a name="line.220"></a>
+<span class="sourceLineNo">054</span>@InterfaceAudience.Private<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span>public class MapReduceBackupMergeJob 
implements BackupMergeJob {<a name="line.55"></a>
+<span class="sourceLineNo">056</span>  public static final Logger LOG = 
LoggerFactory.getLogger(MapReduceBackupMergeJob.class);<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>  protected Tool player;<a 
name="line.58"></a>
+<span class="sourceLineNo">059</span>  protected Configuration conf;<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span>  public MapReduceBackupMergeJob() {<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>  @Override<a name="line.64"></a>
+<span class="sourceLineNo">065</span>  public Configuration getConf() {<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span>    return conf;<a name="line.66"></a>
+<span class="sourceLineNo">067</span>  }<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span>  @Override<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  public void setConf(Configuration conf) 
{<a name="line.70"></a>
+<span class="sourceLineNo">071</span>    this.conf = conf;<a 
name="line.71"></a>
+<span class="sourceLineNo">072</span>  }<a name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span>  @Override<a name="line.74"></a>
+<span class="sourceLineNo">075</span>  public void run(String[] backupIds) 
throws IOException {<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    String bulkOutputConfKey;<a 
name="line.76"></a>
+<span class="sourceLineNo">077</span><a name="line.77"></a>
+<span class="sourceLineNo">078</span>    // TODO : run player on remote 
cluster<a name="line.78"></a>
+<span class="sourceLineNo">079</span>    player = new 
MapReduceHFileSplitterJob();<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    bulkOutputConfKey = 
MapReduceHFileSplitterJob.BULK_OUTPUT_CONF_KEY;<a name="line.80"></a>
+<span class="sourceLineNo">081</span>    // Player reads all files in 
arbitrary directory structure and creates<a name="line.81"></a>
+<span class="sourceLineNo">082</span>    // a Map task for each file<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>    String bids = 
StringUtils.join(backupIds, ",");<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span>    if (LOG.isDebugEnabled()) {<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>      LOG.debug("Merge backup images " + 
bids);<a name="line.86"></a>
+<span class="sourceLineNo">087</span>    }<a name="line.87"></a>
+<span class="sourceLineNo">088</span><a name="line.88"></a>
+<span class="sourceLineNo">089</span>    List&lt;Pair&lt;TableName, 
Path&gt;&gt; processedTableList = new ArrayList&lt;&gt;();<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    boolean finishedTables = false;<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>    Connection conn = 
ConnectionFactory.createConnection(getConf());<a name="line.91"></a>
+<span class="sourceLineNo">092</span>    BackupSystemTable table = new 
BackupSystemTable(conn);<a name="line.92"></a>
+<span class="sourceLineNo">093</span>    FileSystem fs = 
FileSystem.get(getConf());<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span>    try {<a name="line.95"></a>
+<span class="sourceLineNo">096</span><a name="line.96"></a>
+<span class="sourceLineNo">097</span>      // Get exclusive lock on backup 
system<a name="line.97"></a>
+<span class="sourceLineNo">098</span>      
table.startBackupExclusiveOperation();<a name="line.98"></a>
+<span class="sourceLineNo">099</span>      // Start merge operation<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span>      
table.startMergeOperation(backupIds);<a name="line.100"></a>
+<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">102</span>      // Select most recent backup id<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>      String mergedBackupId = 
findMostRecentBackupId(backupIds);<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span>      TableName[] tableNames = 
getTableNamesInBackupImages(backupIds);<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span>      BackupInfo bInfo = 
table.readBackupInfo(backupIds[0]);<a name="line.107"></a>
+<span class="sourceLineNo">108</span>      String backupRoot = 
bInfo.getBackupRootDir();<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span>      for (int i = 0; i &lt; 
tableNames.length; i++) {<a name="line.110"></a>
+<span class="sourceLineNo">111</span>        LOG.info("Merge backup images for 
" + tableNames[i]);<a name="line.111"></a>
+<span class="sourceLineNo">112</span><a name="line.112"></a>
+<span class="sourceLineNo">113</span>        // Find input directories for 
table<a name="line.113"></a>
+<span class="sourceLineNo">114</span>        Path[] dirPaths = 
findInputDirectories(fs, backupRoot, tableNames[i], backupIds);<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>        String dirs = 
StringUtils.join(dirPaths, ",");<a name="line.115"></a>
+<span class="sourceLineNo">116</span>        Path bulkOutputPath =<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>            
BackupUtils.getBulkOutputDir(BackupUtils.getFileNameCompatibleString(tableNames[i]),<a
 name="line.117"></a>
+<span class="sourceLineNo">118</span>              getConf(), false);<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>        // Delete content if exists<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>        if (fs.exists(bulkOutputPath)) 
{<a name="line.120"></a>
+<span class="sourceLineNo">121</span>          if (!fs.delete(bulkOutputPath, 
true)) {<a name="line.121"></a>
+<span class="sourceLineNo">122</span>            LOG.warn("Can not delete: " + 
bulkOutputPath);<a name="line.122"></a>
+<span class="sourceLineNo">123</span>          }<a name="line.123"></a>
+<span class="sourceLineNo">124</span>        }<a name="line.124"></a>
+<span class="sourceLineNo">125</span>        Configuration conf = getConf();<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>        conf.set(bulkOutputConfKey, 
bulkOutputPath.toString());<a name="line.126"></a>
+<span class="sourceLineNo">127</span>        String[] playerArgs = { dirs, 
tableNames[i].getNameAsString() };<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span>        player.setConf(getConf());<a 
name="line.129"></a>
+<span class="sourceLineNo">130</span>        int result = 
player.run(playerArgs);<a name="line.130"></a>
+<span class="sourceLineNo">131</span>        if (!succeeded(result)) {<a 
name="line.131"></a>
+<span class="sourceLineNo">132</span>          throw new IOException("Can not 
merge backup images for " + dirs<a name="line.132"></a>
+<span class="sourceLineNo">133</span>              + " (check Hadoop/MR and 
HBase logs). Player return code =" + result);<a name="line.133"></a>
+<span class="sourceLineNo">134</span>        }<a name="line.134"></a>
+<span class="sourceLineNo">135</span>        // Add to processed table list<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>        processedTableList.add(new 
Pair&lt;&gt;(tableNames[i], bulkOutputPath));<a name="line.136"></a>
+<span class="sourceLineNo">137</span>        LOG.debug("Merge Job finished:" + 
result);<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      }<a name="line.138"></a>
+<span class="sourceLineNo">139</span>      List&lt;TableName&gt; tableList = 
toTableNameList(processedTableList);<a name="line.139"></a>
+<span class="sourceLineNo">140</span>      
table.updateProcessedTablesForMerge(tableList);<a name="line.140"></a>
+<span class="sourceLineNo">141</span>      finishedTables = true;<a 
name="line.141"></a>
+<span class="sourceLineNo">142</span><a name="line.142"></a>
+<span class="sourceLineNo">143</span>      // Move data<a name="line.143"></a>
+<span class="sourceLineNo">144</span>      for (Pair&lt;TableName, Path&gt; tn 
: processedTableList) {<a name="line.144"></a>
+<span class="sourceLineNo">145</span>        moveData(fs, backupRoot, 
tn.getSecond(), tn.getFirst(), mergedBackupId);<a name="line.145"></a>
+<span class="sourceLineNo">146</span>      }<a name="line.146"></a>
+<span class="sourceLineNo">147</span><a name="line.147"></a>
+<span class="sourceLineNo">148</span>      // Delete old data and update 
manifest<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      List&lt;String&gt; backupsToDelete 
= getBackupIdsToDelete(backupIds, mergedBackupId);<a name="line.149"></a>
+<span class="sourceLineNo">150</span>      deleteBackupImages(backupsToDelete, 
conn, fs, backupRoot);<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      updateBackupManifest(backupRoot, 
mergedBackupId, backupsToDelete);<a name="line.151"></a>
+<span class="sourceLineNo">152</span>      // Finish merge session<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>      table.finishMergeOperation();<a 
name="line.153"></a>
+<span class="sourceLineNo">154</span>      // Release lock<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>      
table.finishBackupExclusiveOperation();<a name="line.155"></a>
+<span class="sourceLineNo">156</span>    } catch (RuntimeException e) {<a 
name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span>      throw e;<a name="line.158"></a>
+<span class="sourceLineNo">159</span>    } catch (Exception e) {<a 
name="line.159"></a>
+<span class="sourceLineNo">160</span>      LOG.error(e.toString(), e);<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>      if (!finishedTables) {<a 
name="line.161"></a>
+<span class="sourceLineNo">162</span>        // cleanup bulk directories and 
finish merge<a name="line.162"></a>
+<span class="sourceLineNo">163</span>        // merge MUST be repeated (no 
need for repair)<a name="line.163"></a>
+<span class="sourceLineNo">164</span>        cleanupBulkLoadDirs(fs, 
toPathList(processedTableList));<a name="line.164"></a>
+<span class="sourceLineNo">165</span>        table.finishMergeOperation();<a 
name="line.165"></a>
+<span class="sourceLineNo">166</span>        
table.finishBackupExclusiveOperation();<a name="line.166"></a>
+<span class="sourceLineNo">167</span>        throw new IOException("Backup 
merge operation failed, you should try it again", e);<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      } else {<a name="line.168"></a>
+<span class="sourceLineNo">169</span>        // backup repair must be run<a 
name="line.169"></a>
+<span class="sourceLineNo">170</span>        throw new IOException(<a 
name="line.170"></a>
+<span class="sourceLineNo">171</span>            "Backup merge operation 
failed, run backup repair tool to restore system's integrity",<a 
name="line.171"></a>
+<span class="sourceLineNo">172</span>            e);<a name="line.172"></a>
+<span class="sourceLineNo">173</span>      }<a name="line.173"></a>
+<span class="sourceLineNo">174</span>    } finally {<a name="line.174"></a>
+<span class="sourceLineNo">175</span>      table.close();<a 
name="line.175"></a>
+<span class="sourceLineNo">176</span>      conn.close();<a name="line.176"></a>
+<span class="sourceLineNo">177</span>    }<a name="line.177"></a>
+<span class="sourceLineNo">178</span>  }<a name="line.178"></a>
+<span class="sourceLineNo">179</span><a name="line.179"></a>
+<span class="sourceLineNo">180</span>  protected List&lt;Path&gt; 
toPathList(List&lt;Pair&lt;TableName, Path&gt;&gt; processedTableList) {<a 
name="line.180"></a>
+<span class="sourceLineNo">181</span>    ArrayList&lt;Path&gt; list = new 
ArrayList&lt;&gt;();<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    for (Pair&lt;TableName, Path&gt; p : 
processedTableList) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      list.add(p.getSecond());<a 
name="line.183"></a>
+<span class="sourceLineNo">184</span>    }<a name="line.184"></a>
+<span class="sourceLineNo">185</span>    return list;<a name="line.185"></a>
+<span class="sourceLineNo">186</span>  }<a name="line.186"></a>
+<span class="sourceLineNo">187</span><a name="line.187"></a>
+<span class="sourceLineNo">188</span>  protected List&lt;TableName&gt; 
toTableNameList(List&lt;Pair&lt;TableName, Path&gt;&gt; processedTableList) {<a 
name="line.188"></a>
+<span class="sourceLineNo">189</span>    ArrayList&lt;TableName&gt; list = new 
ArrayList&lt;&gt;();<a name="line.189"></a>
+<span class="sourceLineNo">190</span>    for (Pair&lt;TableName, Path&gt; p : 
processedTableList) {<a name="line.190"></a>
+<span class="sourceLineNo">191</span>      list.add(p.getFirst());<a 
name="line.191"></a>
+<span class="sourceLineNo">192</span>    }<a name="line.192"></a>
+<span class="sourceLineNo">193</span>    return list;<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>  protected void 
cleanupBulkLoadDirs(FileSystem fs, List&lt;Path&gt; pathList) throws 
IOException {<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    for (Path path : pathList) {<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>      if (!fs.delete(path, true)) {<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>        LOG.warn("Can't delete " + 
path);<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      }<a name="line.200"></a>
+<span class="sourceLineNo">201</span>    }<a name="line.201"></a>
+<span class="sourceLineNo">202</span>  }<a name="line.202"></a>
+<span class="sourceLineNo">203</span><a name="line.203"></a>
+<span class="sourceLineNo">204</span>  protected void 
updateBackupManifest(String backupRoot, String mergedBackupId,<a 
name="line.204"></a>
+<span class="sourceLineNo">205</span>      List&lt;String&gt; backupsToDelete) 
throws IllegalArgumentException, IOException {<a name="line.205"></a>
+<span class="sourceLineNo">206</span>    BackupManifest manifest =<a 
name="line.206"></a>
+<span class="sourceLineNo">207</span>        
HBackupFileSystem.getManifest(conf, new Path(backupRoot), mergedBackupId);<a 
name="line.207"></a>
+<span class="sourceLineNo">208</span>    
manifest.getBackupImage().removeAncestors(backupsToDelete);<a 
name="line.208"></a>
+<span class="sourceLineNo">209</span>    // save back<a name="line.209"></a>
+<span class="sourceLineNo">210</span>    manifest.store(conf);<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>  protected void 
deleteBackupImages(List&lt;String&gt; backupIds, Connection conn, FileSystem 
fs,<a name="line.213"></a>
+<span class="sourceLineNo">214</span>      String backupRoot) throws 
IOException {<a name="line.214"></a>
+<span class="sourceLineNo">215</span>    // Delete from backup system table<a 
name="line.215"></a>
+<span class="sourceLineNo">216</span>    try (BackupSystemTable table = new 
BackupSystemTable(conn)) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span>      for (String backupId : backupIds) 
{<a name="line.217"></a>
+<span class="sourceLineNo">218</span>        
table.deleteBackupInfo(backupId);<a name="line.218"></a>
+<span class="sourceLineNo">219</span>      }<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    }<a name="line.220"></a>
 <span class="sourceLineNo">221</span><a name="line.221"></a>
-<span class="sourceLineNo">222</span>  protected void 
deleteBackupImages(List&lt;String&gt; backupIds, Connection conn, FileSystem 
fs,<a name="line.222"></a>
-<span class="sourceLineNo">223</span>      String backupRoot) throws 
IOException {<a name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span>    // Delete from backup system table<a 
name="line.225"></a>
-<span class="sourceLineNo">226</span>    try (BackupSystemTable table = new 
BackupSystemTable(conn)) {<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      for (String backupId : backupIds) 
{<a name="line.227"></a>
-<span class="sourceLineNo">228</span>        
table.deleteBackupInfo(backupId);<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      }<a name="line.229"></a>
-<span class="sourceLineNo">230</span>    }<a name="line.230"></a>
+<span class="sourceLineNo">222</span>    // Delete from file system<a 
name="line.222"></a>
+<span class="sourceLineNo">223</span>    for (String backupId : backupIds) {<a 
name="line.223"></a>
+<span class="sourceLineNo">224</span>      Path backupDirPath = 
HBackupFileSystem.getBackupPath(backupRoot, backupId);<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span>      if (!fs.delete(backupDirPath, 
true)) {<a name="line.226"></a>
+<span class="sourceLineNo">227</span>        LOG.warn("Could not delete " + 
backupDirPath);<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      }<a name="line.228"></a>
+<span class="sourceLineNo">229</span>    }<a name="line.229"></a>
+<span class="sourceLineNo">230</span>  }<a name="line.230"></a>
 <span class="sourceLineNo">231</span><a name="line.231"></a>
-<span class="sourceLineNo">232</span>    // Delete from file system<a 
name="line.232"></a>
-<span class="sourceLineNo">233</span>    for (String backupId : backupIds) {<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>      Path backupDirPath = 
HBackupFileSystem.getBackupPath(backupRoot, backupId);<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span>      if (!fs.delete(backupDirPath, 
true)) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>        LOG.warn("Could not delete " + 
backupDirPath);<a name="line.237"></a>
-<span class="sourceLineNo">238</span>      }<a name="line.238"></a>
+<span class="sourceLineNo">232</span>  protected List&lt;String&gt; 
getBackupIdsToDelete(String[] backupIds, String mergedBackupId) {<a 
name="line.232"></a>
+<span class="sourceLineNo">233</span>    List&lt;String&gt; list = new 
ArrayList&lt;&gt;();<a name="line.233"></a>
+<span class="sourceLineNo">234</span>    for (String id : backupIds) {<a 
name="line.234"></a>
+<span class="sourceLineNo">235</span>      if (id.equals(mergedBackupId)) {<a 
name="line.235"></a>
+<span class="sourceLineNo">236</span>        continue;<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      }<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      list.add(id);<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><a name="line.241"></a>
-<span class="sourceLineNo">242</span>  protected List&lt;String&gt; 
getBackupIdsToDelete(String[] backupIds, String mergedBackupId) {<a 
name="line.242"></a>
-<span class="sourceLineNo">243</span>    List&lt;String&gt; list = new 
ArrayList&lt;String&gt;();<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    for (String id : backupIds) {<a 
name="line.244"></a>
-<span class="sourceLineNo">245</span>      if (id.equals(mergedBackupId)) {<a 
name="line.245"></a>
-<span class="sourceLineNo">246</span>        continue;<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      }<a name="line.247"></a>
-<span class="sourceLineNo">248</span>      list.add(id);<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    }<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    return list;<a name="line.250"></a>
-<span class="sourceLineNo">251</span>  }<a name="line.251"></a>
+<span class="sourceLineNo">240</span>    return list;<a name="line.240"></a>
+<span class="sourceLineNo">241</span>  }<a name="line.241"></a>
+<span class="sourceLineNo">242</span><a name="line.242"></a>
+<span class="sourceLineNo">243</span>  protected void moveData(FileSystem fs, 
String backupRoot, Path bulkOutputPath,<a name="line.243"></a>
+<span class="sourceLineNo">244</span>          TableName tableName, String 
mergedBackupId) throws IllegalArgumentException, IOException {<a 
name="line.244"></a>
+<span class="sourceLineNo">245</span>    Path dest =<a name="line.245"></a>
+<span class="sourceLineNo">246</span>        new 
Path(HBackupFileSystem.getTableBackupDataDir(backupRoot, mergedBackupId, 
tableName));<a name="line.246"></a>
+<span class="sourceLineNo">247</span><a name="line.247"></a>
+<span class="sourceLineNo">248</span>    // Delete all in dest<a 
name="line.248"></a>
+<span class="sourceLineNo">249</span>    if (!fs.delete(dest, true)) {<a 
name="line.249"></a>
+<span class="sourceLineNo">250</span>      throw new IOException("Could not 
delete " + dest);<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>  protected void moveData(FileSystem fs, 
String backupRoot, Path bulkOutputPath, TableName tableName,<a 
name="line.253"></a>
-<span class="sourceLineNo">254</span>      String mergedBackupId) throws 
IllegalArgumentException, IOException {<a name="line.254"></a>
-<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span>    Path dest =<a name="line.256"></a>
-<span class="sourceLineNo">257</span>        new 
Path(HBackupFileSystem.getTableBackupDataDir(backupRoot, mergedBackupId, 
tableName));<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span>    // Delete all in dest<a 
name="line.259"></a>
-<span class="sourceLineNo">260</span>    if (!fs.delete(dest, true)) {<a 
name="line.260"></a>
-<span class="sourceLineNo">261</span>      throw new IOException("Could not 
delete " + dest);<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    }<a name="line.262"></a>
-<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span>    FileStatus[] fsts = 
fs.listStatus(bulkOutputPath);<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    for (FileStatus fst : fsts) {<a 
name="line.265"></a>
-<span class="sourceLineNo">266</span>      if (fst.isDirectory()) {<a 
name="line.266"></a>
-<span class="sourceLineNo">267</span>        
fs.rename(fst.getPath().getParent(), dest);<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><a name="line.270"></a>
-<span class="sourceLineNo">271</span>  }<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span>  protected String 
findMostRecentBackupId(String[] backupIds) {<a name="line.273"></a>
-<span class="sourceLineNo">274</span>    long recentTimestamp = 
Long.MIN_VALUE;<a name="line.274"></a>
-<span class="sourceLineNo">275</span>    for (String backupId : backupIds) {<a 
name="line.275"></a>
-<span class="sourceLineNo">276</span>      long ts = 
Long.parseLong(backupId.split("_")[1]);<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      if (ts &gt; recentTimestamp) {<a 
name="line.277"></a>
-<span class="sourceLineNo">278</span>        recentTimestamp = ts;<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>    return 
BackupRestoreConstants.BACKUPID_PREFIX + recentTimestamp;<a name="line.281"></a>
-<span class="sourceLineNo">282</span>  }<a name="line.282"></a>
+<span class="sourceLineNo">253</span>    FileStatus[] fsts = 
fs.listStatus(bulkOutputPath);<a name="line.253"></a>
+<span class="sourceLineNo">254</span>    for (FileStatus fst : fsts) {<a 
name="line.254"></a>
+<span class="sourceLineNo">255</span>      if (fst.isDirectory()) {<a 
name="line.255"></a>
+<span class="sourceLineNo">256</span>        
fs.rename(fst.getPath().getParent(), dest);<a name="line.256"></a>
+<span class="sourceLineNo">257</span>      }<a name="line.257"></a>
+<span class="sourceLineNo">258</span>    }<a name="line.258"></a>
+<span class="sourceLineNo">259</span>  }<a name="line.259"></a>
+<span class="sourceLineNo">260</span><a name="line.260"></a>
+<span class="sourceLineNo">261</span>  protected String 
findMostRecentBackupId(String[] backupIds) {<a name="line.261"></a>
+<span class="sourceLineNo">262</span>    long recentTimestamp = 
Long.MIN_VALUE;<a name="line.262"></a>
+<span class="sourceLineNo">263</span>    for (String backupId : backupIds) {<a 
name="line.263"></a>
+<span class="sourceLineNo">264</span>      long ts = 
Long.parseLong(backupId.split("_")[1]);<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      if (ts &gt; recentTimestamp) {<a 
name="line.265"></a>
+<span class="sourceLineNo">266</span>        recentTimestamp = ts;<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>    return 
BackupRestoreConstants.BACKUPID_PREFIX + recentTimestamp;<a name="line.269"></a>
+<span class="sourceLineNo">270</span>  }<a name="line.270"></a>
+<span class="sourceLineNo">271</span><a name="line.271"></a>
+<span class="sourceLineNo">272</span>  protected TableName[] 
getTableNamesInBackupImages(String[] backupIds) throws IOException {<a 
name="line.272"></a>
+<span class="sourceLineNo">273</span>    Set&lt;TableName&gt; allSet = new 
HashSet&lt;&gt;();<a name="line.273"></a>
+<span class="sourceLineNo">274</span><a name="line.274"></a>
+<span class="sourceLineNo">275</span>    try (Connection conn = 
ConnectionFactory.createConnection(conf);<a name="line.275"></a>
+<span class="sourceLineNo">276</span>        BackupSystemTable table = new 
BackupSystemTable(conn)) {<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      for (String backupId : backupIds) 
{<a name="line.277"></a>
+<span class="sourceLineNo">278</span>        BackupInfo bInfo = 
table.readBackupInfo(backupId);<a name="line.278"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span>        
allSet.addAll(bInfo.getTableNames());<a name="line.280"></a>
+<span class="sourceLineNo">281</span>      }<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    }<a name="line.282"></a>
 <span class="sourceLineNo">283</span><a name="line.283"></a>
-<span class="sourceLineNo">284</span>  protected TableName[] 
getTableNamesInBackupImages(String[] backupIds) throws IOException {<a 
name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span>    Set&lt;TableName&gt; allSet = new 
HashSet&lt;TableName&gt;();<a name="line.286"></a>
+<span class="sourceLineNo">284</span>    TableName[] ret = new 
TableName[allSet.size()];<a name="line.284"></a>
+<span class="sourceLineNo">285</span>    return allSet.toArray(ret);<a 
name="line.285"></a>
+<span class="sourceLineNo">286</span>  }<a name="line.286"></a>
 <span class="sourceLineNo">287</span><a name="line.287"></a>
-<span class="sourceLineNo">288</span>    try (Connection conn = 
ConnectionFactory.createConnection(conf);<a name="line.288"></a>
-<span class="sourceLineNo">289</span>        BackupSystemTable table = new 
BackupSystemTable(conn)) {<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      for (String backupId : backupIds) 
{<a name="line.290"></a>
-<span class="sourceLineNo">291</span>        BackupInfo bInfo = 
table.readBackupInfo(backupId);<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>        
allSet.addAll(bInfo.getTableNames());<a name="line.293"></a>
-<span class="sourceLineNo">294</span>      }<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    }<a name="line.295"></a>
-<span class="sourceLineNo">296</span><a name="line.296"></a>
-<span class="sourceLineNo">297</span>    TableName[] ret = new 
TableName[allSet.size()];<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    return allSet.toArray(ret);<a 
name="line.298"></a>
-<span class="sourceLineNo">299</span>  }<a name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span>  protected Path[] 
findInputDirectories(FileSystem fs, String backupRoot, TableName tableName,<a 
name="line.301"></a>
-<span class="sourceLineNo">302</span>      String[] backupIds) throws 
IOException {<a name="line.302"></a>
-<span class="sourceLineNo">303</span><a name="line.303"></a>
-<span class="sourceLineNo">304</span>    List&lt;Path&gt; dirs = new 
ArrayList&lt;Path&gt;();<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span>    for (String backupId : backupIds) {<a 
name="line.306"></a>
-<span class="sourceLineNo">307</span>      Path fileBackupDirPath =<a 
name="line.307"></a>
-<span class="sourceLineNo">308</span>          new 
Path(HBackupFileSystem.getTableBackupDataDir(backupRoot, backupId, 
tableName));<a name="line.308"></a>
-<span class="sourceLineNo">309</span>      if (fs.exists(fileBackupDirPath)) 
{<a name="line.309"></a>
-<span class="sourceLineNo">310</span>        dirs.add(fileBackupDirPath);<a 
name="line.310"></a>
-<span class="sourceLineNo">311</span>      } else {<a name="line.311"></a>
-<span class="sourceLineNo">312</span>        if (LOG.isTraceEnabled()) {<a 
name="line.312"></a>
-<span class="sourceLineNo">313</span>          LOG.trace("File: " + 
fileBackupDirPath + " does not exist.");<a name="line.313"></a>
-<span class="sourceLineNo">314</span>        }<a name="line.314"></a>
-<span class="sourceLineNo">315</span>      }<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    }<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    Path[] ret = new Path[dirs.size()];<a 
name="line.317"></a>
-<span class="sourceLineNo">318</span>    return dirs.toArray(ret);<a 
name="line.318"></a>
-<span class="sourceLineNo">319</span>  }<a name="line.319"></a>
-<span class="sourceLineNo">320</span><a name="line.320"></a>
-<span class="sourceLineNo">321</span>}<a name="line.321"></a>
+<span class="sourceLineNo">288</span>  protected Path[] 
findInputDirectories(FileSystem fs, String backupRoot, TableName tableName,<a 
name="line.288"></a>
+<span class="sourceLineNo">289</span>      String[] backupIds) throws 
IOException {<a name="line.289"></a>
+<span class="sourceLineNo">290</span>    List&lt;Path&gt; dirs = new 
ArrayList&lt;&gt;();<a name="line.290"></a>
+<span class="sourceLineNo">291</span><a name="line.291"></a>
+<span class="sourceLineNo">292</span>    for (String backupId : backupIds) {<a 
name="line.292"></a>
+<span class="sourceLineNo">293</span>      Path fileBackupDirPath =<a 
name="line.293"></a>
+<span class="sourceLineNo">294</span>          new 
Path(HBackupFileSystem.getTableBackupDataDir(backupRoot, backupId, 
tableName));<a name="line.294"></a>
+<span class="sourceLineNo">295</span>      if (fs.exists(fileBackupDirPath)) 
{<a name="line.295"></a>
+<span class="sourceLineNo">296</span>        dirs.add(fileBackupDirPath);<a 
name="line.296"></a>
+<span class="sourceLineNo">297</span>      } else {<a name="line.297"></a>
+<span class="sourceLineNo">298</span>        if (LOG.isTraceEnabled()) {<a 
name="line.298"></a>
+<span class="sourceLineNo">299</span>          LOG.trace("File: " + 
fileBackupDirPath + " does not exist.");<a name="line.299"></a>
+<span class="sourceLineNo">300</span>        }<a name="line.300"></a>
+<span class="sourceLineNo">301</span>      }<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    }<a name="line.302"></a>
+<span class="sourceLineNo">303</span>    Path[] ret = new Path[dirs.size()];<a 
name="line.303"></a>
+<span class="sourceLineNo">304</span>    return dirs.toArray(ret);<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa7ffc92/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/MapReduceHFileSplitterJob.HFileCellMapper.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/MapReduceHFileSplitterJob.HFileCellMapper.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/MapReduceHFileSplitterJob.HFileCellMapper.html
index 67c7331..09cfa79 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/MapReduceHFileSplitterJob.HFileCellMapper.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/MapReduceHFileSplitterJob.HFileCellMapper.html
@@ -126,7 +126,7 @@
 <span class="sourceLineNo">118</span>      try (Connection conn = 
ConnectionFactory.createConnection(conf);<a name="line.118"></a>
 <span class="sourceLineNo">119</span>          Table table = 
conn.getTable(tableName);<a name="line.119"></a>
 <span class="sourceLineNo">120</span>          RegionLocator regionLocator = 
conn.getRegionLocator(tableName)) {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>          
HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), 
regionLocator);<a name="line.121"></a>
+<span class="sourceLineNo">121</span>        
HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), 
regionLocator);<a name="line.121"></a>
 <span class="sourceLineNo">122</span>      }<a name="line.122"></a>
 <span class="sourceLineNo">123</span>      LOG.debug("success configuring load 
incremental job");<a name="line.123"></a>
 <span class="sourceLineNo">124</span><a name="line.124"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa7ffc92/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/MapReduceHFileSplitterJob.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/MapReduceHFileSplitterJob.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/MapReduceHFileSplitterJob.html
index 67c7331..09cfa79 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/MapReduceHFileSplitterJob.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/MapReduceHFileSplitterJob.html
@@ -126,7 +126,7 @@
 <span class="sourceLineNo">118</span>      try (Connection conn = 
ConnectionFactory.createConnection(conf);<a name="line.118"></a>
 <span class="sourceLineNo">119</span>          Table table = 
conn.getTable(tableName);<a name="line.119"></a>
 <span class="sourceLineNo">120</span>          RegionLocator regionLocator = 
conn.getRegionLocator(tableName)) {<a name="line.120"></a>
-<span class="sourceLineNo">121</span>          
HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), 
regionLocator);<a name="line.121"></a>
+<span class="sourceLineNo">121</span>        
HFileOutputFormat2.configureIncrementalLoad(job, table.getDescriptor(), 
regionLocator);<a name="line.121"></a>
 <span class="sourceLineNo">122</span>      }<a name="line.122"></a>
 <span class="sourceLineNo">123</span>      LOG.debug("success configuring load 
incremental job");<a name="line.123"></a>
 <span class="sourceLineNo">124</span><a name="line.124"></a>

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa7ffc92/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/MapReduceRestoreJob.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/MapReduceRestoreJob.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/MapReduceRestoreJob.html
index 8663624..6148a67 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/MapReduceRestoreJob.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/mapreduce/MapReduceRestoreJob.html
@@ -37,111 +37,106 @@
 <span class="sourceLineNo">029</span>import 
org.apache.hadoop.hbase.backup.BackupRestoreConstants;<a name="line.29"></a>
 <span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.backup.RestoreJob;<a name="line.30"></a>
 <span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.backup.util.BackupUtils;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.slf4j.Logger;<a 
name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.slf4j.LoggerFactory;<a 
name="line.34"></a>
-<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.tool.LoadIncrementalHFiles;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.util.Tool;<a 
name="line.36"></a>
+<span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.tool.LoadIncrementalHFiles;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.util.Tool;<a 
name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.slf4j.Logger;<a 
name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.slf4j.LoggerFactory;<a 
name="line.36"></a>
 <span class="sourceLineNo">037</span><a name="line.37"></a>
-<span class="sourceLineNo">038</span><a name="line.38"></a>
-<span class="sourceLineNo">039</span>/**<a name="line.39"></a>
-<span class="sourceLineNo">040</span> * MapReduce implementation of {@link 
RestoreJob}<a name="line.40"></a>
-<span class="sourceLineNo">041</span> *<a name="line.41"></a>
-<span class="sourceLineNo">042</span> * For backup restore, it runs {@link 
MapReduceHFileSplitterJob} job and creates<a name="line.42"></a>
-<span class="sourceLineNo">043</span> * HFiles which are aligned with a region 
boundaries of a table being<a name="line.43"></a>
-<span class="sourceLineNo">044</span> * restored.<a name="line.44"></a>
-<span class="sourceLineNo">045</span> *<a name="line.45"></a>
-<span class="sourceLineNo">046</span> * The resulting HFiles then are loaded 
using HBase bulk load tool<a name="line.46"></a>
-<span class="sourceLineNo">047</span> * {@link LoadIncrementalHFiles}<a 
name="line.47"></a>
-<span class="sourceLineNo">048</span> */<a name="line.48"></a>
-<span class="sourceLineNo">049</span>@InterfaceAudience.Private<a 
name="line.49"></a>
-<span class="sourceLineNo">050</span>public class MapReduceRestoreJob 
implements RestoreJob {<a name="line.50"></a>
-<span class="sourceLineNo">051</span>  public static final Logger LOG = 
LoggerFactory.getLogger(MapReduceRestoreJob.class);<a name="line.51"></a>
-<span class="sourceLineNo">052</span><a name="line.52"></a>
-<span class="sourceLineNo">053</span>  private Tool player;<a 
name="line.53"></a>
-<span class="sourceLineNo">054</span>  private Configuration conf;<a 
name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span>  public MapReduceRestoreJob() {<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span>  }<a name="line.57"></a>
-<span class="sourceLineNo">058</span><a name="line.58"></a>
-<span class="sourceLineNo">059</span>  @Override<a name="line.59"></a>
-<span class="sourceLineNo">060</span>  public void run(Path[] dirPaths, 
TableName[] tableNames, TableName[] newTableNames,<a name="line.60"></a>
-<span class="sourceLineNo">061</span>      boolean fullBackupRestore) throws 
IOException {<a name="line.61"></a>
+<span class="sourceLineNo">038</span>/**<a name="line.38"></a>
+<span class="sourceLineNo">039</span> * MapReduce implementation of {@link 
RestoreJob}<a name="line.39"></a>
+<span class="sourceLineNo">040</span> *<a name="line.40"></a>
+<span class="sourceLineNo">041</span> * For backup restore, it runs {@link 
MapReduceHFileSplitterJob} job and creates<a name="line.41"></a>
+<span class="sourceLineNo">042</span> * HFiles which are aligned with a region 
boundaries of a table being<a name="line.42"></a>
+<span class="sourceLineNo">043</span> * restored.<a name="line.43"></a>
+<span class="sourceLineNo">044</span> *<a name="line.44"></a>
+<span class="sourceLineNo">045</span> * The resulting HFiles then are loaded 
using HBase bulk load tool<a name="line.45"></a>
+<span class="sourceLineNo">046</span> * {@link LoadIncrementalHFiles}<a 
name="line.46"></a>
+<span class="sourceLineNo">047</span> */<a name="line.47"></a>
+<span class="sourceLineNo">048</span>@InterfaceAudience.Private<a 
name="line.48"></a>
+<span class="sourceLineNo">049</span>public class MapReduceRestoreJob 
implements RestoreJob {<a name="line.49"></a>
+<span class="sourceLineNo">050</span>  public static final Logger LOG = 
LoggerFactory.getLogger(MapReduceRestoreJob.class);<a name="line.50"></a>
+<span class="sourceLineNo">051</span><a name="line.51"></a>
+<span class="sourceLineNo">052</span>  private Tool player;<a 
name="line.52"></a>
+<span class="sourceLineNo">053</span>  private Configuration conf;<a 
name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>  public MapReduceRestoreJob() {<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span>  }<a name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span>  @Override<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  public void run(Path[] dirPaths, 
TableName[] tableNames, TableName[] newTableNames,<a name="line.59"></a>
+<span class="sourceLineNo">060</span>      boolean fullBackupRestore) throws 
IOException {<a name="line.60"></a>
+<span class="sourceLineNo">061</span>    String bulkOutputConfKey;<a 
name="line.61"></a>
 <span class="sourceLineNo">062</span><a name="line.62"></a>
-<span class="sourceLineNo">063</span>    String bulkOutputConfKey;<a 
name="line.63"></a>
-<span class="sourceLineNo">064</span><a name="line.64"></a>
-<span class="sourceLineNo">065</span>    player = new 
MapReduceHFileSplitterJob();<a name="line.65"></a>
-<span class="sourceLineNo">066</span>    bulkOutputConfKey = 
MapReduceHFileSplitterJob.BULK_OUTPUT_CONF_KEY;<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    // Player reads all files in 
arbitrary directory structure and creates<a name="line.67"></a>
-<span class="sourceLineNo">068</span>    // a Map task for each file<a 
name="line.68"></a>
-<span class="sourceLineNo">069</span>    String dirs = 
StringUtils.join(dirPaths, ",");<a name="line.69"></a>
-<span class="sourceLineNo">070</span><a name="line.70"></a>
-<span class="sourceLineNo">071</span>    if (LOG.isDebugEnabled()) {<a 
name="line.71"></a>
-<span class="sourceLineNo">072</span>      LOG.debug("Restore " + 
(fullBackupRestore ? "full" : "incremental")<a name="line.72"></a>
-<span class="sourceLineNo">073</span>          + " backup from directory " + 
dirs + " from hbase tables "<a name="line.73"></a>
-<span class="sourceLineNo">074</span>          + StringUtils.join(tableNames, 
BackupRestoreConstants.TABLENAME_DELIMITER_IN_COMMAND)<a name="line.74"></a>
-<span class="sourceLineNo">075</span>          + " to tables "<a 
name="line.75"></a>
-<span class="sourceLineNo">076</span>          + 
StringUtils.join(newTableNames, 
BackupRestoreConstants.TABLENAME_DELIMITER_IN_COMMAND));<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    }<a name="line.77"></a>
-<span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span>    for (int i = 0; i &lt; 
tableNames.length; i++) {<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span>      LOG.info("Restore " + tableNames[i] 
+ " into " + newTableNames[i]);<a name="line.81"></a>
-<span class="sourceLineNo">082</span><a name="line.82"></a>
-<span class="sourceLineNo">083</span>      Path bulkOutputPath =<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>          
BackupUtils.getBulkOutputDir(BackupUtils.getFileNameCompatibleString(newTableNames[i]),<a
 name="line.84"></a>
-<span class="sourceLineNo">085</span>            getConf());<a 
name="line.85"></a>
-<span class="sourceLineNo">086</span>      Configuration conf = getConf();<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>      conf.set(bulkOutputConfKey, 
bulkOutputPath.toString());<a name="line.87"></a>
-<span class="sourceLineNo">088</span>      String[] playerArgs =<a 
name="line.88"></a>
-<span class="sourceLineNo">089</span>          {<a name="line.89"></a>
-<span class="sourceLineNo">090</span>              dirs,<a name="line.90"></a>
-<span class="sourceLineNo">091</span>              fullBackupRestore ? 
newTableNames[i].getNameAsString() : tableNames[i]<a name="line.91"></a>
-<span class="sourceLineNo">092</span>                  .getNameAsString() };<a 
name="line.92"></a>
+<span class="sourceLineNo">063</span>    player = new 
MapReduceHFileSplitterJob();<a name="line.63"></a>
+<span class="sourceLineNo">064</span>    bulkOutputConfKey = 
MapReduceHFileSplitterJob.BULK_OUTPUT_CONF_KEY;<a name="line.64"></a>
+<span class="sourceLineNo">065</span>    // Player reads all files in 
arbitrary directory structure and creates<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    // a Map task for each file<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span>    String dirs = 
StringUtils.join(dirPaths, ",");<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span>    if (LOG.isDebugEnabled()) {<a 
name="line.69"></a>
+<span class="sourceLineNo">070</span>      LOG.debug("Restore " + 
(fullBackupRestore ? "full" : "incremental")<a name="line.70"></a>
+<span class="sourceLineNo">071</span>          + " backup from directory " + 
dirs + " from hbase tables "<a name="line.71"></a>
+<span class="sourceLineNo">072</span>          + StringUtils.join(tableNames, 
BackupRestoreConstants.TABLENAME_DELIMITER_IN_COMMAND)<a name="line.72"></a>
+<span class="sourceLineNo">073</span>          + " to tables "<a 
name="line.73"></a>
+<span class="sourceLineNo">074</span>          + 
StringUtils.join(newTableNames, 
BackupRestoreConstants.TABLENAME_DELIMITER_IN_COMMAND));<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>    for (int i = 0; i &lt; 
tableNames.length; i++) {<a name="line.77"></a>
+<span class="sourceLineNo">078</span>      LOG.info("Restore " + tableNames[i] 
+ " into " + newTableNames[i]);<a name="line.78"></a>
+<span class="sourceLineNo">079</span><a name="line.79"></a>
+<span class="sourceLineNo">080</span>      Path bulkOutputPath =<a 
name="line.80"></a>
+<span class="sourceLineNo">081</span>          
BackupUtils.getBulkOutputDir(BackupUtils.getFileNameCompatibleString(newTableNames[i]),<a
 name="line.81"></a>
+<span class="sourceLineNo">082</span>            getConf());<a 
name="line.82"></a>
+<span class="sourceLineNo">083</span>      Configuration conf = getConf();<a 
name="line.83"></a>
+<span class="sourceLineNo">084</span>      conf.set(bulkOutputConfKey, 
bulkOutputPath.toString());<a name="line.84"></a>
+<span class="sourceLineNo">085</span>      String[] playerArgs = {<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>        dirs, fullBackupRestore ? 
newTableNames[i].getNameAsString() : tableNames[i]<a name="line.86"></a>
+<span class="sourceLineNo">087</span>              .getNameAsString()<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>      };<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span>      int result;<a name="line.90"></a>
+<span class="sourceLineNo">091</span>      int loaderResult;<a 
name="line.91"></a>
+<span class="sourceLineNo">092</span>      try {<a name="line.92"></a>
 <span class="sourceLineNo">093</span><a name="line.93"></a>
-<span class="sourceLineNo">094</span>      int result = 0;<a 
name="line.94"></a>
-<span class="sourceLineNo">095</span>      int loaderResult = 0;<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span>      try {<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>        player.setConf(getConf());<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span>        result = 
player.run(playerArgs);<a name="line.99"></a>
-<span class="sourceLineNo">100</span>        if (succeeded(result)) {<a 
name="line.100"></a>
-<span class="sourceLineNo">101</span>          // do bulk load<a 
name="line.101"></a>
-<span class="sourceLineNo">102</span>          LoadIncrementalHFiles loader = 
BackupUtils.createLoader(getConf());<a name="line.102"></a>
-<span class="sourceLineNo">103</span>          if (LOG.isDebugEnabled()) {<a 
name="line.103"></a>
-<span class="sourceLineNo">104</span>            LOG.debug("Restoring HFiles 
from directory " + bulkOutputPath);<a name="line.104"></a>
-<span class="sourceLineNo">105</span>          }<a name="line.105"></a>
-<span class="sourceLineNo">106</span>          String[] args = { 
bulkOutputPath.toString(), newTableNames[i].getNameAsString() };<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>          loaderResult = 
loader.run(args);<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span>          if (failed(loaderResult)) {<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>            throw new IOException("Can 
not restore from backup directory " + dirs<a name="line.110"></a>
-<span class="sourceLineNo">111</span>                + " (check Hadoop and 
HBase logs). Bulk loader return code =" + loaderResult);<a name="line.111"></a>
-<span class="sourceLineNo">112</span>          }<a name="line.112"></a>
-<span class="sourceLineNo">113</span>        } else {<a name="line.113"></a>
-<span class="sourceLineNo">114</span>          throw new IOException("Can not 
restore from backup directory " + dirs<a name="line.114"></a>
-<span class="sourceLineNo">115</span>              + " (check Hadoop/MR and 
HBase logs). Player return code =" + result);<a name="line.115"></a>
-<span class="sourceLineNo">116</span>        }<a name="line.116"></a>
-<span class="sourceLineNo">117</span>        LOG.debug("Restore Job finished:" 
+ result);<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      } catch (Exception e) {<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>        LOG.error(e.toString(), e);<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>        throw new IOException("Can not 
restore from backup directory " + dirs<a name="line.120"></a>
-<span class="sourceLineNo">121</span>            + " (check Hadoop and HBase 
logs) ", e);<a name="line.121"></a>
-<span class="sourceLineNo">122</span>      }<a name="line.122"></a>
-<span class="sourceLineNo">123</span>    }<a name="line.123"></a>
-<span class="sourceLineNo">124</span>  }<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>  @Override<a name="line.126"></a>
-<span class="sourceLineNo">127</span>  public Configuration getConf() {<a 
name="line.127"></a>
-<span class="sourceLineNo">128</span>    return conf;<a name="line.128"></a>
-<span class="sourceLineNo">129</span>  }<a name="line.129"></a>
-<span class="sourceLineNo">130</span><a name="line.130"></a>
-<span class="sourceLineNo">131</span>  @Override<a name="line.131"></a>
-<span class="sourceLineNo">132</span>  public void setConf(Configuration conf) 
{<a name="line.132"></a>
-<span class="sourceLineNo">133</span>    this.conf = conf;<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">094</span>        player.setConf(getConf());<a 
name="line.94"></a>
+<span class="sourceLineNo">095</span>        result = 
player.run(playerArgs);<a name="line.95"></a>
+<span class="sourceLineNo">096</span>        if (succeeded(result)) {<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>          // do bulk load<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>          LoadIncrementalHFiles loader = 
BackupUtils.createLoader(getConf());<a name="line.98"></a>
+<span class="sourceLineNo">099</span>          if (LOG.isDebugEnabled()) {<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span>            LOG.debug("Restoring HFiles 
from directory " + bulkOutputPath);<a name="line.100"></a>
+<span class="sourceLineNo">101</span>          }<a name="line.101"></a>
+<span class="sourceLineNo">102</span>          String[] args = { 
bulkOutputPath.toString(), newTableNames[i].getNameAsString() };<a 
name="line.102"></a>
+<span class="sourceLineNo">103</span>          loaderResult = 
loader.run(args);<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span>          if (failed(loaderResult)) {<a 
name="line.105"></a>
+<span class="sourceLineNo">106</span>            throw new IOException("Can 
not restore from backup directory " + dirs<a name="line.106"></a>
+<span class="sourceLineNo">107</span>                + " (check Hadoop and 
HBase logs). Bulk loader return code =" + loaderResult);<a name="line.107"></a>
+<span class="sourceLineNo">108</span>          }<a name="line.108"></a>
+<span class="sourceLineNo">109</span>        } else {<a name="line.109"></a>
+<span class="sourceLineNo">110</span>          throw new IOException("Can not 
restore from backup directory " + dirs<a name="line.110"></a>
+<span class="sourceLineNo">111</span>              + " (check Hadoop/MR and 
HBase logs). Player return code =" + result);<a name="line.111"></a>
+<span class="sourceLineNo">112</span>        }<a name="line.112"></a>
+<span class="sourceLineNo">113</span>        LOG.debug("Restore Job finished:" 
+ result);<a name="line.113"></a>
+<span class="sourceLineNo">114</span>      } catch (Exception e) {<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>        LOG.error(e.toString(), e);<a 
name="line.115"></a>
+<span class="sourceLineNo">116</span>        throw new IOException("Can not 
restore from backup directory " + dirs<a name="line.116"></a>
+<span class="sourceLineNo">117</span>            + " (check Hadoop and HBase 
logs) ", e);<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      }<a name="line.118"></a>
+<span class="sourceLineNo">119</span>    }<a name="line.119"></a>
+<span class="sourceLineNo">120</span>  }<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span>  @Override<a name="line.122"></a>
+<span class="sourceLineNo">123</span>  public Configuration getConf() {<a 
name="line.123"></a>
+<span class="sourceLineNo">124</span>    return conf;<a name="line.124"></a>
+<span class="sourceLineNo">125</span>  }<a name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span>  @Override<a name="line.127"></a>
+<span class="sourceLineNo">128</span>  public void setConf(Configuration conf) 
{<a name="line.128"></a>
+<span class="sourceLineNo">129</span>    this.conf = conf;<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa7ffc92/devapidocs/src-html/org/apache/hadoop/hbase/backup/master/BackupLogCleaner.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/master/BackupLogCleaner.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/master/BackupLogCleaner.html
index fd23e20..d659965 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/master/BackupLogCleaner.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/master/BackupLogCleaner.html
@@ -38,14 +38,14 @@
 <span class="sourceLineNo">030</span>import 
org.apache.hadoop.hbase.backup.BackupRestoreConstants;<a name="line.30"></a>
 <span class="sourceLineNo">031</span>import 
org.apache.hadoop.hbase.backup.impl.BackupManager;<a name="line.31"></a>
 <span class="sourceLineNo">032</span>import 
org.apache.hadoop.hbase.backup.impl.BackupSystemTable;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.slf4j.Logger;<a 
name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.slf4j.LoggerFactory;<a 
name="line.35"></a>
-<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.master.HMaster;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.master.MasterServices;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.master.cleaner.BaseLogCleanerDelegate;<a 
name="line.40"></a>
+<span class="sourceLineNo">033</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import 
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import 
org.apache.hadoop.hbase.master.HMaster;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.master.MasterServices;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.master.cleaner.BaseLogCleanerDelegate;<a 
name="line.37"></a>
+<span class="sourceLineNo">038</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.slf4j.Logger;<a 
name="line.39"></a>
+<span class="sourceLineNo">040</span>import org.slf4j.LoggerFactory;<a 
name="line.40"></a>
 <span class="sourceLineNo">041</span><a name="line.41"></a>
 <span class="sourceLineNo">042</span>/**<a name="line.42"></a>
 <span class="sourceLineNo">043</span> * Implementation of a log cleaner that 
checks if a log is still scheduled for incremental backup<a name="line.43"></a>
@@ -91,7 +91,7 @@
 <span class="sourceLineNo">083</span>      return files;<a name="line.83"></a>
 <span class="sourceLineNo">084</span>    }<a name="line.84"></a>
 <span class="sourceLineNo">085</span><a name="line.85"></a>
-<span class="sourceLineNo">086</span>    List&lt;FileStatus&gt; list = new 
ArrayList&lt;FileStatus&gt;();<a name="line.86"></a>
+<span class="sourceLineNo">086</span>    List&lt;FileStatus&gt; list = new 
ArrayList&lt;&gt;();<a name="line.86"></a>
 <span class="sourceLineNo">087</span>    try (final BackupSystemTable table = 
new BackupSystemTable(conn)) {<a name="line.87"></a>
 <span class="sourceLineNo">088</span>      // If we do not have recorded 
backup sessions<a name="line.88"></a>
 <span class="sourceLineNo">089</span>      try {<a name="line.89"></a>
@@ -124,7 +124,7 @@
 <span class="sourceLineNo">116</span>    } catch (IOException e) {<a 
name="line.116"></a>
 <span class="sourceLineNo">117</span>      LOG.error("Failed to get backup 
system table table, therefore will keep all files", e);<a name="line.117"></a>
 <span class="sourceLineNo">118</span>      // nothing to delete<a 
name="line.118"></a>
-<span class="sourceLineNo">119</span>      return new 
ArrayList&lt;FileStatus&gt;();<a name="line.119"></a>
+<span class="sourceLineNo">119</span>      return new ArrayList&lt;&gt;();<a 
name="line.119"></a>
 <span class="sourceLineNo">120</span>    }<a name="line.120"></a>
 <span class="sourceLineNo">121</span>  }<a name="line.121"></a>
 <span class="sourceLineNo">122</span><a name="line.122"></a>
@@ -151,8 +151,7 @@
 <span class="sourceLineNo">143</span>  public boolean isStopped() {<a 
name="line.143"></a>
 <span class="sourceLineNo">144</span>    return this.stopped;<a 
name="line.144"></a>
 <span class="sourceLineNo">145</span>  }<a name="line.145"></a>
-<span class="sourceLineNo">146</span><a name="line.146"></a>
-<span class="sourceLineNo">147</span>}<a name="line.147"></a>
+<span class="sourceLineNo">146</span>}<a name="line.146"></a>
 
 
 

Reply via email to