You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/03/11 14:54:07 UTC
[07/25] hbase-site git commit: Published site at
d5aaeee88b331e064830a2774f4fed238631457c.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/89e23f78/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 7e38fdd..18c30f4 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
@@ -27,24 +27,24 @@
<span class="sourceLineNo">019</span><a name="line.19"></a>
<span class="sourceLineNo">020</span>import static org.apache.hadoop.hbase.backup.util.BackupUtils.succeeded;<a name="line.20"></a>
<span class="sourceLineNo">021</span><a name="line.21"></a>
-<span class="sourceLineNo">022</span>import java.io.FileNotFoundException;<a name="line.22"></a>
+<span class="sourceLineNo">022</span>import java.io.File;<a name="line.22"></a>
<span class="sourceLineNo">023</span>import java.io.IOException;<a name="line.23"></a>
<span class="sourceLineNo">024</span>import java.util.ArrayList;<a name="line.24"></a>
<span class="sourceLineNo">025</span>import java.util.HashSet;<a name="line.25"></a>
<span class="sourceLineNo">026</span>import java.util.List;<a name="line.26"></a>
<span class="sourceLineNo">027</span>import java.util.Set;<a name="line.27"></a>
-<span class="sourceLineNo">028</span><a name="line.28"></a>
-<span class="sourceLineNo">029</span>import org.apache.commons.lang3.StringUtils;<a name="line.29"></a>
-<span class="sourceLineNo">030</span>import org.apache.hadoop.conf.Configuration;<a name="line.30"></a>
-<span class="sourceLineNo">031</span>import org.apache.hadoop.fs.FileStatus;<a name="line.31"></a>
-<span class="sourceLineNo">032</span>import org.apache.hadoop.fs.FileSystem;<a name="line.32"></a>
-<span class="sourceLineNo">033</span>import org.apache.hadoop.fs.LocatedFileStatus;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import org.apache.hadoop.fs.Path;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import org.apache.hadoop.fs.RemoteIterator;<a name="line.35"></a>
-<span class="sourceLineNo">036</span>import org.apache.hadoop.hbase.TableName;<a name="line.36"></a>
-<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.backup.BackupInfo;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.backup.BackupMergeJob;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.backup.BackupRestoreConstants;<a name="line.39"></a>
+<span class="sourceLineNo">028</span>import java.util.Stack;<a name="line.28"></a>
+<span class="sourceLineNo">029</span><a name="line.29"></a>
+<span class="sourceLineNo">030</span>import org.apache.commons.lang3.StringUtils;<a name="line.30"></a>
+<span class="sourceLineNo">031</span>import org.apache.hadoop.conf.Configuration;<a name="line.31"></a>
+<span class="sourceLineNo">032</span>import org.apache.hadoop.fs.FileStatus;<a name="line.32"></a>
+<span class="sourceLineNo">033</span>import org.apache.hadoop.fs.FileSystem;<a name="line.33"></a>
+<span class="sourceLineNo">034</span>import org.apache.hadoop.fs.LocatedFileStatus;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import org.apache.hadoop.fs.Path;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import org.apache.hadoop.fs.RemoteIterator;<a name="line.36"></a>
+<span class="sourceLineNo">037</span>import org.apache.hadoop.hbase.TableName;<a name="line.37"></a>
+<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.backup.BackupInfo;<a name="line.38"></a>
+<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.backup.BackupMergeJob;<a name="line.39"></a>
<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.backup.HBackupFileSystem;<a name="line.40"></a>
<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.backup.impl.BackupManifest;<a name="line.41"></a>
<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.backup.impl.BackupSystemTable;<a name="line.42"></a>
@@ -113,7 +113,7 @@
<span class="sourceLineNo">105</span> table.startMergeOperation(backupIds);<a name="line.105"></a>
<span class="sourceLineNo">106</span><a name="line.106"></a>
<span class="sourceLineNo">107</span> // Select most recent backup id<a name="line.107"></a>
-<span class="sourceLineNo">108</span> String mergedBackupId = findMostRecentBackupId(backupIds);<a name="line.108"></a>
+<span class="sourceLineNo">108</span> String mergedBackupId = BackupUtils.findMostRecentBackupId(backupIds);<a name="line.108"></a>
<span class="sourceLineNo">109</span><a name="line.109"></a>
<span class="sourceLineNo">110</span> TableName[] tableNames = getTableNamesInBackupImages(backupIds);<a name="line.110"></a>
<span class="sourceLineNo">111</span><a name="line.111"></a>
@@ -154,210 +154,257 @@
<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<TableName, Path> 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<String> 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<Path> toPathList(List<Pair<TableName, Path>> processedTableList) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span> ArrayList<Path> list = new ArrayList<>();<a name="line.187"></a>
-<span class="sourceLineNo">188</span> for (Pair<TableName, Path> 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<TableName> toTableNameList(List<Pair<TableName, Path>> processedTableList) {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> ArrayList<TableName> list = new ArrayList<>();<a name="line.195"></a>
-<span class="sourceLineNo">196</span> for (Pair<TableName, Path> 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<Path> 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> if (!fs.delete(path, true)) {<a name="line.204"></a>
-<span class="sourceLineNo">205</span> LOG.warn("Can't delete " + path);<a name="line.205"></a>
-<span class="sourceLineNo">206</span> }<a name="line.206"></a>
-<span class="sourceLineNo">207</span> }<a name="line.207"></a>
-<span class="sourceLineNo">208</span> }<a name="line.208"></a>
-<span class="sourceLineNo">209</span><a name="line.209"></a>
-<span class="sourceLineNo">210</span> protected void updateBackupManifest(String backupRoot, String mergedBackupId,<a name="line.210"></a>
-<span class="sourceLineNo">211</span> List<String> backupsToDelete) throws IllegalArgumentException, IOException {<a name="line.211"></a>
-<span class="sourceLineNo">212</span> BackupManifest manifest =<a name="line.212"></a>
-<span class="sourceLineNo">213</span> HBackupFileSystem.getManifest(conf, new Path(backupRoot), mergedBackupId);<a name="line.213"></a>
-<span class="sourceLineNo">214</span> manifest.getBackupImage().removeAncestors(backupsToDelete);<a name="line.214"></a>
-<span class="sourceLineNo">215</span> // save back<a name="line.215"></a>
-<span class="sourceLineNo">216</span> manifest.store(conf);<a name="line.216"></a>
-<span class="sourceLineNo">217</span> }<a name="line.217"></a>
-<span class="sourceLineNo">218</span><a name="line.218"></a>
-<span class="sourceLineNo">219</span> protected void deleteBackupImages(List<String> backupIds, Connection conn, FileSystem fs,<a name="line.219"></a>
-<span class="sourceLineNo">220</span> String backupRoot) throws IOException {<a name="line.220"></a>
-<span class="sourceLineNo">221</span> // Delete from backup system table<a name="line.221"></a>
-<span class="sourceLineNo">222</span> try (BackupSystemTable table = new BackupSystemTable(conn)) {<a name="line.222"></a>
-<span class="sourceLineNo">223</span> for (String backupId : backupIds) {<a name="line.223"></a>
-<span class="sourceLineNo">224</span> table.deleteBackupInfo(backupId);<a name="line.224"></a>
-<span class="sourceLineNo">225</span> }<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> // Delete from file system<a name="line.228"></a>
-<span class="sourceLineNo">229</span> for (String backupId : backupIds) {<a name="line.229"></a>
-<span class="sourceLineNo">230</span> Path backupDirPath = HBackupFileSystem.getBackupPath(backupRoot, backupId);<a name="line.230"></a>
-<span class="sourceLineNo">231</span><a name="line.231"></a>
-<span class="sourceLineNo">232</span> if (!fs.delete(backupDirPath, true)) {<a name="line.232"></a>
-<span class="sourceLineNo">233</span> LOG.warn("Could not delete " + backupDirPath);<a name="line.233"></a>
-<span class="sourceLineNo">234</span> }<a name="line.234"></a>
-<span class="sourceLineNo">235</span> }<a name="line.235"></a>
-<span class="sourceLineNo">236</span> }<a name="line.236"></a>
-<span class="sourceLineNo">237</span><a name="line.237"></a>
-<span class="sourceLineNo">238</span> protected List<String> getBackupIdsToDelete(String[] backupIds, String mergedBackupId) {<a name="line.238"></a>
-<span class="sourceLineNo">239</span> List<String> list = new ArrayList<>();<a name="line.239"></a>
-<span class="sourceLineNo">240</span> for (String id : backupIds) {<a name="line.240"></a>
-<span class="sourceLineNo">241</span> if (id.equals(mergedBackupId)) {<a name="line.241"></a>
-<span class="sourceLineNo">242</span> continue;<a name="line.242"></a>
-<span class="sourceLineNo">243</span> }<a name="line.243"></a>
-<span class="sourceLineNo">244</span> list.add(id);<a name="line.244"></a>
-<span class="sourceLineNo">245</span> }<a name="line.245"></a>
-<span class="sourceLineNo">246</span> return list;<a name="line.246"></a>
-<span class="sourceLineNo">247</span> }<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span> protected void moveData(FileSystem fs, String backupRoot, Path bulkOutputPath,<a name="line.249"></a>
-<span class="sourceLineNo">250</span> TableName tableName, String mergedBackupId) throws IllegalArgumentException, IOException {<a name="line.250"></a>
-<span class="sourceLineNo">251</span> Path dest =<a name="line.251"></a>
-<span class="sourceLineNo">252</span> new Path(HBackupFileSystem.getTableBackupDir(backupRoot, mergedBackupId, tableName));<a name="line.252"></a>
-<span class="sourceLineNo">253</span><a name="line.253"></a>
-<span class="sourceLineNo">254</span> // Delete all *data* files in dest<a name="line.254"></a>
-<span class="sourceLineNo">255</span> if (!deleteData(fs, dest)) {<a name="line.255"></a>
-<span class="sourceLineNo">256</span> throw new IOException("Could not delete " + 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> FileStatus[] fsts = fs.listStatus(bulkOutputPath);<a name="line.259"></a>
-<span class="sourceLineNo">260</span> for (FileStatus fst : fsts) {<a name="line.260"></a>
-<span class="sourceLineNo">261</span> if (fst.isDirectory()) {<a name="line.261"></a>
-<span class="sourceLineNo">262</span> String family = fst.getPath().getName();<a name="line.262"></a>
-<span class="sourceLineNo">263</span> Path newDst = new Path(dest, family);<a name="line.263"></a>
-<span class="sourceLineNo">264</span> if (fs.exists(newDst)) {<a name="line.264"></a>
-<span class="sourceLineNo">265</span> if (!fs.delete(newDst, true)) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span> throw new IOException("failed to delete :"+ newDst);<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> fs.rename(fst.getPath(), dest);<a name="line.269"></a>
+<span class="sourceLineNo">149</span> // PHASE 2 (modification of a backup file system)<a name="line.149"></a>
+<span class="sourceLineNo">150</span> // Move existing mergedBackupId data into tmp directory<a name="line.150"></a>
+<span class="sourceLineNo">151</span> // we will need it later in case of a failure<a name="line.151"></a>
+<span class="sourceLineNo">152</span> Path tmpBackupDir = HBackupFileSystem.getBackupTmpDirPathForBackupId(backupRoot,<a name="line.152"></a>
+<span class="sourceLineNo">153</span> mergedBackupId);<a name="line.153"></a>
+<span class="sourceLineNo">154</span> Path backupDirPath = HBackupFileSystem.getBackupPath(backupRoot, mergedBackupId);<a name="line.154"></a>
+<span class="sourceLineNo">155</span><a name="line.155"></a>
+<span class="sourceLineNo">156</span> if (!fs.rename(backupDirPath, tmpBackupDir)) {<a name="line.156"></a>
+<span class="sourceLineNo">157</span> throw new IOException("Failed to rename "+ backupDirPath +" to "+tmpBackupDir);<a name="line.157"></a>
+<span class="sourceLineNo">158</span> } else {<a name="line.158"></a>
+<span class="sourceLineNo">159</span> LOG.debug("Renamed "+ backupDirPath +" to "+ tmpBackupDir);<a name="line.159"></a>
+<span class="sourceLineNo">160</span> }<a name="line.160"></a>
+<span class="sourceLineNo">161</span> // Move new data into backup dest<a name="line.161"></a>
+<span class="sourceLineNo">162</span> for (Pair<TableName, Path> tn : processedTableList) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span> moveData(fs, backupRoot, tn.getSecond(), tn.getFirst(), mergedBackupId);<a name="line.163"></a>
+<span class="sourceLineNo">164</span> }<a name="line.164"></a>
+<span class="sourceLineNo">165</span> // Update backup manifest<a name="line.165"></a>
+<span class="sourceLineNo">166</span> List<String> backupsToDelete = getBackupIdsToDelete(backupIds, mergedBackupId);<a name="line.166"></a>
+<span class="sourceLineNo">167</span> updateBackupManifest(tmpBackupDir.getParent().toString(), mergedBackupId, backupsToDelete);<a name="line.167"></a>
+<span class="sourceLineNo">168</span> // Copy meta files back from tmp to backup dir<a name="line.168"></a>
+<span class="sourceLineNo">169</span> copyMetaData(fs, tmpBackupDir, backupDirPath);<a name="line.169"></a>
+<span class="sourceLineNo">170</span> // Delete tmp dir (Rename back during repair)<a name="line.170"></a>
+<span class="sourceLineNo">171</span> if (!fs.delete(tmpBackupDir, true)) {<a name="line.171"></a>
+<span class="sourceLineNo">172</span> // WARN and ignore<a name="line.172"></a>
+<span class="sourceLineNo">173</span> LOG.warn("Could not delete tmp dir: "+ tmpBackupDir);<a name="line.173"></a>
+<span class="sourceLineNo">174</span> }<a name="line.174"></a>
+<span class="sourceLineNo">175</span> // Delete old data<a name="line.175"></a>
+<span class="sourceLineNo">176</span> deleteBackupImages(backupsToDelete, conn, fs, backupRoot);<a name="line.176"></a>
+<span class="sourceLineNo">177</span> // Finish merge session<a name="line.177"></a>
+<span class="sourceLineNo">178</span> table.finishMergeOperation();<a name="line.178"></a>
+<span class="sourceLineNo">179</span> // Release lock<a name="line.179"></a>
+<span class="sourceLineNo">180</span> table.finishBackupExclusiveOperation();<a name="line.180"></a>
+<span class="sourceLineNo">181</span> } catch (RuntimeException e) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span><a name="line.182"></a>
+<span class="sourceLineNo">183</span> throw e;<a name="line.183"></a>
+<span class="sourceLineNo">184</span> } catch (Exception e) {<a name="line.184"></a>
+<span class="sourceLineNo">185</span> LOG.error(e.toString(), e);<a name="line.185"></a>
+<span class="sourceLineNo">186</span> if (!finishedTables) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> // cleanup bulk directories and finish merge<a name="line.187"></a>
+<span class="sourceLineNo">188</span> // merge MUST be repeated (no need for repair)<a name="line.188"></a>
+<span class="sourceLineNo">189</span> cleanupBulkLoadDirs(fs, toPathList(processedTableList));<a name="line.189"></a>
+<span class="sourceLineNo">190</span> table.finishMergeOperation();<a name="line.190"></a>
+<span class="sourceLineNo">191</span> table.finishBackupExclusiveOperation();<a name="line.191"></a>
+<span class="sourceLineNo">192</span> throw new IOException("Backup merge operation failed, you should try it again", e);<a name="line.192"></a>
+<span class="sourceLineNo">193</span> } else {<a name="line.193"></a>
+<span class="sourceLineNo">194</span> // backup repair must be run<a name="line.194"></a>
+<span class="sourceLineNo">195</span> throw new IOException(<a name="line.195"></a>
+<span class="sourceLineNo">196</span> "Backup merge operation failed, run backup repair tool to restore system's integrity",<a name="line.196"></a>
+<span class="sourceLineNo">197</span> e);<a name="line.197"></a>
+<span class="sourceLineNo">198</span> }<a name="line.198"></a>
+<span class="sourceLineNo">199</span> } finally {<a name="line.199"></a>
+<span class="sourceLineNo">200</span> table.close();<a name="line.200"></a>
+<span class="sourceLineNo">201</span> conn.close();<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><a name="line.204"></a>
+<span class="sourceLineNo">205</span> /**<a name="line.205"></a>
+<span class="sourceLineNo">206</span> * Copy meta data to of a backup session<a name="line.206"></a>
+<span class="sourceLineNo">207</span> * @param fs file system<a name="line.207"></a>
+<span class="sourceLineNo">208</span> * @param tmpBackupDir temp backup directory, where meta is locaed<a name="line.208"></a>
+<span class="sourceLineNo">209</span> * @param backupDirPath new path for backup<a name="line.209"></a>
+<span class="sourceLineNo">210</span> * @throws IOException exception<a name="line.210"></a>
+<span class="sourceLineNo">211</span> */<a name="line.211"></a>
+<span class="sourceLineNo">212</span> protected void copyMetaData(FileSystem fs, Path tmpBackupDir, Path backupDirPath)<a name="line.212"></a>
+<span class="sourceLineNo">213</span> throws IOException {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> RemoteIterator<LocatedFileStatus> it = fs.listFiles(tmpBackupDir, true);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> List<Path> toKeep = new ArrayList<Path>();<a name="line.215"></a>
+<span class="sourceLineNo">216</span> while (it.hasNext()) {<a name="line.216"></a>
+<span class="sourceLineNo">217</span> Path p = it.next().getPath();<a name="line.217"></a>
+<span class="sourceLineNo">218</span> if (fs.isDirectory(p)) {<a name="line.218"></a>
+<span class="sourceLineNo">219</span> continue;<a name="line.219"></a>
+<span class="sourceLineNo">220</span> }<a name="line.220"></a>
+<span class="sourceLineNo">221</span> // Keep meta<a name="line.221"></a>
+<span class="sourceLineNo">222</span> String fileName = p.toString();<a name="line.222"></a>
+<span class="sourceLineNo">223</span> if (fileName.indexOf(FSTableDescriptors.TABLEINFO_DIR) > 0<a name="line.223"></a>
+<span class="sourceLineNo">224</span> || fileName.indexOf(HRegionFileSystem.REGION_INFO_FILE) > 0) {<a name="line.224"></a>
+<span class="sourceLineNo">225</span> toKeep.add(p);<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> // Copy meta to destination<a name="line.228"></a>
+<span class="sourceLineNo">229</span> for (Path p : toKeep) {<a name="line.229"></a>
+<span class="sourceLineNo">230</span> Path newPath = convertToDest(p, backupDirPath);<a name="line.230"></a>
+<span class="sourceLineNo">231</span> copyFile(fs, p, newPath);<a name="line.231"></a>
+<span class="sourceLineNo">232</span> }<a name="line.232"></a>
+<span class="sourceLineNo">233</span> }<a name="line.233"></a>
+<span class="sourceLineNo">234</span><a name="line.234"></a>
+<span class="sourceLineNo">235</span> /**<a name="line.235"></a>
+<span class="sourceLineNo">236</span> * Copy file in DFS from p to newPath<a name="line.236"></a>
+<span class="sourceLineNo">237</span> * @param fs file system<a name="line.237"></a>
+<span class="sourceLineNo">238</span> * @param p old path<a name="line.238"></a>
+<span class="sourceLineNo">239</span> * @param newPath new path<a name="line.239"></a>
+<span class="sourceLineNo">240</span> * @throws IOException exception<a name="line.240"></a>
+<span class="sourceLineNo">241</span> */<a name="line.241"></a>
+<span class="sourceLineNo">242</span> protected void copyFile(FileSystem fs, Path p, Path newPath) throws IOException {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> File f = File.createTempFile("data", "meta");<a name="line.243"></a>
+<span class="sourceLineNo">244</span> Path localPath = new Path(f.getAbsolutePath());<a name="line.244"></a>
+<span class="sourceLineNo">245</span> fs.copyToLocalFile(p, localPath);<a name="line.245"></a>
+<span class="sourceLineNo">246</span> fs.copyFromLocalFile(localPath, newPath);<a name="line.246"></a>
+<span class="sourceLineNo">247</span> boolean exists = fs.exists(newPath);<a name="line.247"></a>
+<span class="sourceLineNo">248</span> if (!exists) {<a name="line.248"></a>
+<span class="sourceLineNo">249</span> throw new IOException("Failed to copy meta file to: "+ newPath);<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>/**<a name="line.253"></a>
+<span class="sourceLineNo">254</span> * Converts path before copying<a name="line.254"></a>
+<span class="sourceLineNo">255</span> * @param p path<a name="line.255"></a>
+<span class="sourceLineNo">256</span> * @param backupDirPath backup root<a name="line.256"></a>
+<span class="sourceLineNo">257</span> * @return converted path<a name="line.257"></a>
+<span class="sourceLineNo">258</span> */<a name="line.258"></a>
+<span class="sourceLineNo">259</span> protected Path convertToDest(Path p, Path backupDirPath) {<a name="line.259"></a>
+<span class="sourceLineNo">260</span> String backupId = backupDirPath.getName();<a name="line.260"></a>
+<span class="sourceLineNo">261</span> Stack<String> stack = new Stack<String>();<a name="line.261"></a>
+<span class="sourceLineNo">262</span> String name = null;<a name="line.262"></a>
+<span class="sourceLineNo">263</span> while (true) {<a name="line.263"></a>
+<span class="sourceLineNo">264</span> name = p.getName();<a name="line.264"></a>
+<span class="sourceLineNo">265</span> if (!name.equals(backupId)) {<a name="line.265"></a>
+<span class="sourceLineNo">266</span> stack.push(name);<a name="line.266"></a>
+<span class="sourceLineNo">267</span> p = p.getParent();<a name="line.267"></a>
+<span class="sourceLineNo">268</span> } else {<a name="line.268"></a>
+<span class="sourceLineNo">269</span> break;<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><a name="line.273"></a>
-<span class="sourceLineNo">274</span> /**<a name="line.274"></a>
-<span class="sourceLineNo">275</span> * Deletes only data files and keeps all META<a name="line.275"></a>
-<span class="sourceLineNo">276</span> * @param fs file system instance<a name="line.276"></a>
-<span class="sourceLineNo">277</span> * @param dest destination location<a name="line.277"></a>
-<span class="sourceLineNo">278</span> * @return true, if success, false - otherwise<a name="line.278"></a>
-<span class="sourceLineNo">279</span> * @throws FileNotFoundException exception<a name="line.279"></a>
-<span class="sourceLineNo">280</span> * @throws IOException exception<a name="line.280"></a>
-<span class="sourceLineNo">281</span> */<a name="line.281"></a>
-<span class="sourceLineNo">282</span> private boolean deleteData(FileSystem fs, Path dest) throws FileNotFoundException, IOException {<a name="line.282"></a>
-<span class="sourceLineNo">283</span> RemoteIterator<LocatedFileStatus> it = fs.listFiles(dest, true);<a name="line.283"></a>
-<span class="sourceLineNo">284</span> List<Path> toDelete = new ArrayList<Path>();<a name="line.284"></a>
-<span class="sourceLineNo">285</span> while (it.hasNext()) {<a name="line.285"></a>
-<span class="sourceLineNo">286</span> Path p = it.next().getPath();<a name="line.286"></a>
-<span class="sourceLineNo">287</span> if (fs.isDirectory(p)) {<a name="line.287"></a>
-<span class="sourceLineNo">288</span> continue;<a name="line.288"></a>
-<span class="sourceLineNo">289</span> }<a name="line.289"></a>
-<span class="sourceLineNo">290</span> // Keep meta<a name="line.290"></a>
-<span class="sourceLineNo">291</span> String fileName = p.toString();<a name="line.291"></a>
-<span class="sourceLineNo">292</span> if (fileName.indexOf(FSTableDescriptors.TABLEINFO_DIR) > 0 ||<a name="line.292"></a>
-<span class="sourceLineNo">293</span> fileName.indexOf(HRegionFileSystem.REGION_INFO_FILE) > 0) {<a name="line.293"></a>
-<span class="sourceLineNo">294</span> continue;<a name="line.294"></a>
-<span class="sourceLineNo">295</span> }<a name="line.295"></a>
-<span class="sourceLineNo">296</span> toDelete.add(p);<a name="line.296"></a>
-<span class="sourceLineNo">297</span> }<a name="line.297"></a>
-<span class="sourceLineNo">298</span> for (Path p : toDelete) {<a name="line.298"></a>
-<span class="sourceLineNo">299</span> boolean result = fs.delete(p, false);<a name="line.299"></a>
-<span class="sourceLineNo">300</span> if (!result) {<a name="line.300"></a>
-<span class="sourceLineNo">301</span> return false;<a name="line.301"></a>
-<span class="sourceLineNo">302</span> }<a name="line.302"></a>
-<span class="sourceLineNo">303</span> }<a name="line.303"></a>
-<span class="sourceLineNo">304</span> return true;<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> protected String findMostRecentBackupId(String[] backupIds) {<a name="line.307"></a>
-<span class="sourceLineNo">308</span> long recentTimestamp = Long.MIN_VALUE;<a name="line.308"></a>
-<span class="sourceLineNo">309</span> for (String backupId : backupIds) {<a name="line.309"></a>
-<span class="sourceLineNo">310</span> long ts = Long.parseLong(backupId.split("_")[1]);<a name="line.310"></a>
-<span class="sourceLineNo">311</span> if (ts > recentTimestamp) {<a name="line.311"></a>
-<span class="sourceLineNo">312</span> recentTimestamp = ts;<a name="line.312"></a>
-<span class="sourceLineNo">313</span> }<a name="line.313"></a>
-<span class="sourceLineNo">314</span> }<a name="line.314"></a>
-<span class="sourceLineNo">315</span> return BackupRestoreConstants.BACKUPID_PREFIX + recentTimestamp;<a name="line.315"></a>
-<span class="sourceLineNo">316</span> }<a name="line.316"></a>
-<span class="sourceLineNo">317</span><a name="line.317"></a>
-<span class="sourceLineNo">318</span> protected TableName[] getTableNamesInBackupImages(String[] backupIds) throws IOException {<a name="line.318"></a>
-<span class="sourceLineNo">319</span> Set<TableName> allSet = new HashSet<>();<a name="line.319"></a>
+<span class="sourceLineNo">272</span> Path newPath = new Path(backupDirPath.toString());<a name="line.272"></a>
+<span class="sourceLineNo">273</span> while (!stack.isEmpty()) {<a name="line.273"></a>
+<span class="sourceLineNo">274</span> newPath = new Path(newPath, stack.pop());<a name="line.274"></a>
+<span class="sourceLineNo">275</span> }<a name="line.275"></a>
+<span class="sourceLineNo">276</span> return newPath;<a name="line.276"></a>
+<span class="sourceLineNo">277</span> }<a name="line.277"></a>
+<span class="sourceLineNo">278</span><a name="line.278"></a>
+<span class="sourceLineNo">279</span> protected List<Path> toPathList(List<Pair<TableName, Path>> processedTableList) {<a name="line.279"></a>
+<span class="sourceLineNo">280</span> ArrayList<Path> list = new ArrayList<>();<a name="line.280"></a>
+<span class="sourceLineNo">281</span> for (Pair<TableName, Path> p : processedTableList) {<a name="line.281"></a>
+<span class="sourceLineNo">282</span> list.add(p.getSecond());<a name="line.282"></a>
+<span class="sourceLineNo">283</span> }<a name="line.283"></a>
+<span class="sourceLineNo">284</span> return list;<a name="line.284"></a>
+<span class="sourceLineNo">285</span> }<a name="line.285"></a>
+<span class="sourceLineNo">286</span><a name="line.286"></a>
+<span class="sourceLineNo">287</span> protected List<TableName> toTableNameList(List<Pair<TableName, Path>> processedTableList) {<a name="line.287"></a>
+<span class="sourceLineNo">288</span> ArrayList<TableName> list = new ArrayList<>();<a name="line.288"></a>
+<span class="sourceLineNo">289</span> for (Pair<TableName, Path> p : processedTableList) {<a name="line.289"></a>
+<span class="sourceLineNo">290</span> list.add(p.getFirst());<a name="line.290"></a>
+<span class="sourceLineNo">291</span> }<a name="line.291"></a>
+<span class="sourceLineNo">292</span> return list;<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> protected void cleanupBulkLoadDirs(FileSystem fs, List<Path> pathList) throws IOException {<a name="line.295"></a>
+<span class="sourceLineNo">296</span> for (Path path : pathList) {<a name="line.296"></a>
+<span class="sourceLineNo">297</span> if (!fs.delete(path, true)) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span> LOG.warn("Can't delete " + path);<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> }<a name="line.301"></a>
+<span class="sourceLineNo">302</span><a name="line.302"></a>
+<span class="sourceLineNo">303</span> protected void updateBackupManifest(String backupRoot, String mergedBackupId,<a name="line.303"></a>
+<span class="sourceLineNo">304</span> List<String> backupsToDelete) throws IllegalArgumentException, IOException {<a name="line.304"></a>
+<span class="sourceLineNo">305</span> BackupManifest manifest =<a name="line.305"></a>
+<span class="sourceLineNo">306</span> HBackupFileSystem.getManifest(conf, new Path(backupRoot), mergedBackupId);<a name="line.306"></a>
+<span class="sourceLineNo">307</span> manifest.getBackupImage().removeAncestors(backupsToDelete);<a name="line.307"></a>
+<span class="sourceLineNo">308</span> // save back<a name="line.308"></a>
+<span class="sourceLineNo">309</span> manifest.store(conf);<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> protected void deleteBackupImages(List<String> backupIds, Connection conn, FileSystem fs,<a name="line.312"></a>
+<span class="sourceLineNo">313</span> String backupRoot) throws IOException {<a name="line.313"></a>
+<span class="sourceLineNo">314</span> // Delete from backup system table<a name="line.314"></a>
+<span class="sourceLineNo">315</span> try (BackupSystemTable table = new BackupSystemTable(conn)) {<a name="line.315"></a>
+<span class="sourceLineNo">316</span> for (String backupId : backupIds) {<a name="line.316"></a>
+<span class="sourceLineNo">317</span> table.deleteBackupInfo(backupId);<a name="line.317"></a>
+<span class="sourceLineNo">318</span> }<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> try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.321"></a>
-<span class="sourceLineNo">322</span> BackupSystemTable table = new BackupSystemTable(conn)) {<a name="line.322"></a>
-<span class="sourceLineNo">323</span> for (String backupId : backupIds) {<a name="line.323"></a>
-<span class="sourceLineNo">324</span> BackupInfo bInfo = table.readBackupInfo(backupId);<a name="line.324"></a>
-<span class="sourceLineNo">325</span><a name="line.325"></a>
-<span class="sourceLineNo">326</span> allSet.addAll(bInfo.getTableNames());<a name="line.326"></a>
+<span class="sourceLineNo">321</span> // Delete from file system<a name="line.321"></a>
+<span class="sourceLineNo">322</span> for (String backupId : backupIds) {<a name="line.322"></a>
+<span class="sourceLineNo">323</span> Path backupDirPath = HBackupFileSystem.getBackupPath(backupRoot, backupId);<a name="line.323"></a>
+<span class="sourceLineNo">324</span><a name="line.324"></a>
+<span class="sourceLineNo">325</span> if (!fs.delete(backupDirPath, true)) {<a name="line.325"></a>
+<span class="sourceLineNo">326</span> LOG.warn("Could not delete " + backupDirPath);<a name="line.326"></a>
<span class="sourceLineNo">327</span> }<a name="line.327"></a>
<span class="sourceLineNo">328</span> }<a name="line.328"></a>
-<span class="sourceLineNo">329</span><a name="line.329"></a>
-<span class="sourceLineNo">330</span> TableName[] ret = new TableName[allSet.size()];<a name="line.330"></a>
-<span class="sourceLineNo">331</span> return allSet.toArray(ret);<a name="line.331"></a>
-<span class="sourceLineNo">332</span> }<a name="line.332"></a>
-<span class="sourceLineNo">333</span><a name="line.333"></a>
-<span class="sourceLineNo">334</span> protected Path[] findInputDirectories(FileSystem fs, String backupRoot, TableName tableName,<a name="line.334"></a>
-<span class="sourceLineNo">335</span> String[] backupIds) throws IOException {<a name="line.335"></a>
-<span class="sourceLineNo">336</span> List<Path> dirs = new ArrayList<>();<a name="line.336"></a>
-<span class="sourceLineNo">337</span><a name="line.337"></a>
-<span class="sourceLineNo">338</span> for (String backupId : backupIds) {<a name="line.338"></a>
-<span class="sourceLineNo">339</span> Path fileBackupDirPath =<a name="line.339"></a>
-<span class="sourceLineNo">340</span> new Path(HBackupFileSystem.getTableBackupDir(backupRoot, backupId, tableName));<a name="line.340"></a>
-<span class="sourceLineNo">341</span> if (fs.exists(fileBackupDirPath)) {<a name="line.341"></a>
-<span class="sourceLineNo">342</span> dirs.add(fileBackupDirPath);<a name="line.342"></a>
-<span class="sourceLineNo">343</span> } else {<a name="line.343"></a>
-<span class="sourceLineNo">344</span> if (LOG.isDebugEnabled()) {<a name="line.344"></a>
-<span class="sourceLineNo">345</span> LOG.debug("File: " + fileBackupDirPath + " does not exist.");<a name="line.345"></a>
-<span class="sourceLineNo">346</span> }<a name="line.346"></a>
-<span class="sourceLineNo">347</span> }<a name="line.347"></a>
-<span class="sourceLineNo">348</span> }<a name="line.348"></a>
-<span class="sourceLineNo">349</span> Path[] ret = new Path[dirs.size()];<a name="line.349"></a>
-<span class="sourceLineNo">350</span> return dirs.toArray(ret);<a name="line.350"></a>
-<span class="sourceLineNo">351</span> }<a name="line.351"></a>
-<span class="sourceLineNo">352</span>}<a name="line.352"></a>
+<span class="sourceLineNo">329</span> }<a name="line.329"></a>
+<span class="sourceLineNo">330</span><a name="line.330"></a>
+<span class="sourceLineNo">331</span> protected List<String> getBackupIdsToDelete(String[] backupIds, String mergedBackupId) {<a name="line.331"></a>
+<span class="sourceLineNo">332</span> List<String> list = new ArrayList<>();<a name="line.332"></a>
+<span class="sourceLineNo">333</span> for (String id : backupIds) {<a name="line.333"></a>
+<span class="sourceLineNo">334</span> if (id.equals(mergedBackupId)) {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> continue;<a name="line.335"></a>
+<span class="sourceLineNo">336</span> }<a name="line.336"></a>
+<span class="sourceLineNo">337</span> list.add(id);<a name="line.337"></a>
+<span class="sourceLineNo">338</span> }<a name="line.338"></a>
+<span class="sourceLineNo">339</span> return list;<a name="line.339"></a>
+<span class="sourceLineNo">340</span> }<a name="line.340"></a>
+<span class="sourceLineNo">341</span><a name="line.341"></a>
+<span class="sourceLineNo">342</span> protected void moveData(FileSystem fs, String backupRoot, Path bulkOutputPath,<a name="line.342"></a>
+<span class="sourceLineNo">343</span> TableName tableName, String mergedBackupId) throws IllegalArgumentException, IOException {<a name="line.343"></a>
+<span class="sourceLineNo">344</span> Path dest =<a name="line.344"></a>
+<span class="sourceLineNo">345</span> new Path(HBackupFileSystem.getTableBackupDir(backupRoot, mergedBackupId, tableName));<a name="line.345"></a>
+<span class="sourceLineNo">346</span><a name="line.346"></a>
+<span class="sourceLineNo">347</span> FileStatus[] fsts = fs.listStatus(bulkOutputPath);<a name="line.347"></a>
+<span class="sourceLineNo">348</span> for (FileStatus fst : fsts) {<a name="line.348"></a>
+<span class="sourceLineNo">349</span> if (fst.isDirectory()) {<a name="line.349"></a>
+<span class="sourceLineNo">350</span> String family = fst.getPath().getName();<a name="line.350"></a>
+<span class="sourceLineNo">351</span> Path newDst = new Path(dest, family);<a name="line.351"></a>
+<span class="sourceLineNo">352</span> if (fs.exists(newDst)) {<a name="line.352"></a>
+<span class="sourceLineNo">353</span> if (!fs.delete(newDst, true)) {<a name="line.353"></a>
+<span class="sourceLineNo">354</span> throw new IOException("failed to delete :"+ newDst);<a name="line.354"></a>
+<span class="sourceLineNo">355</span> }<a name="line.355"></a>
+<span class="sourceLineNo">356</span> } else {<a name="line.356"></a>
+<span class="sourceLineNo">357</span> fs.mkdirs(dest);<a name="line.357"></a>
+<span class="sourceLineNo">358</span> }<a name="line.358"></a>
+<span class="sourceLineNo">359</span> boolean result = fs.rename(fst.getPath(), dest);<a name="line.359"></a>
+<span class="sourceLineNo">360</span> LOG.debug("MoveData from "+ fst.getPath() +" to "+ dest+" result="+ result);<a name="line.360"></a>
+<span class="sourceLineNo">361</span> }<a name="line.361"></a>
+<span class="sourceLineNo">362</span> }<a name="line.362"></a>
+<span class="sourceLineNo">363</span> }<a name="line.363"></a>
+<span class="sourceLineNo">364</span><a name="line.364"></a>
+<span class="sourceLineNo">365</span> protected TableName[] getTableNamesInBackupImages(String[] backupIds) throws IOException {<a name="line.365"></a>
+<span class="sourceLineNo">366</span> Set<TableName> allSet = new HashSet<>();<a name="line.366"></a>
+<span class="sourceLineNo">367</span><a name="line.367"></a>
+<span class="sourceLineNo">368</span> try (Connection conn = ConnectionFactory.createConnection(conf);<a name="line.368"></a>
+<span class="sourceLineNo">369</span> BackupSystemTable table = new BackupSystemTable(conn)) {<a name="line.369"></a>
+<span class="sourceLineNo">370</span> for (String backupId : backupIds) {<a name="line.370"></a>
+<span class="sourceLineNo">371</span> BackupInfo bInfo = table.readBackupInfo(backupId);<a name="line.371"></a>
+<span class="sourceLineNo">372</span><a name="line.372"></a>
+<span class="sourceLineNo">373</span> allSet.addAll(bInfo.getTableNames());<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><a name="line.376"></a>
+<span class="sourceLineNo">377</span> TableName[] ret = new TableName[allSet.size()];<a name="line.377"></a>
+<span class="sourceLineNo">378</span> return allSet.toArray(ret);<a name="line.378"></a>
+<span class="sourceLineNo">379</span> }<a name="line.379"></a>
+<span class="sourceLineNo">380</span><a name="line.380"></a>
+<span class="sourceLineNo">381</span> protected Path[] findInputDirectories(FileSystem fs, String backupRoot, TableName tableName,<a name="line.381"></a>
+<span class="sourceLineNo">382</span> String[] backupIds) throws IOException {<a name="line.382"></a>
+<span class="sourceLineNo">383</span> List<Path> dirs = new ArrayList<>();<a name="line.383"></a>
+<span class="sourceLineNo">384</span><a name="line.384"></a>
+<span class="sourceLineNo">385</span> for (String backupId : backupIds) {<a name="line.385"></a>
+<span class="sourceLineNo">386</span> Path fileBackupDirPath =<a name="line.386"></a>
+<span class="sourceLineNo">387</span> new Path(HBackupFileSystem.getTableBackupDir(backupRoot, backupId, tableName));<a name="line.387"></a>
+<span class="sourceLineNo">388</span> if (fs.exists(fileBackupDirPath)) {<a name="line.388"></a>
+<span class="sourceLineNo">389</span> dirs.add(fileBackupDirPath);<a name="line.389"></a>
+<span class="sourceLineNo">390</span> } else {<a name="line.390"></a>
+<span class="sourceLineNo">391</span> if (LOG.isDebugEnabled()) {<a name="line.391"></a>
+<span class="sourceLineNo">392</span> LOG.debug("File: " + fileBackupDirPath + " does not exist.");<a name="line.392"></a>
+<span class="sourceLineNo">393</span> }<a name="line.393"></a>
+<span class="sourceLineNo">394</span> }<a name="line.394"></a>
+<span class="sourceLineNo">395</span> }<a name="line.395"></a>
+<span class="sourceLineNo">396</span> Path[] ret = new Path[dirs.size()];<a name="line.396"></a>
+<span class="sourceLineNo">397</span> return dirs.toArray(ret);<a name="line.397"></a>
+<span class="sourceLineNo">398</span> }<a name="line.398"></a>
+<span class="sourceLineNo">399</span>}<a name="line.399"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/89e23f78/devapidocs/src-html/org/apache/hadoop/hbase/backup/util/BackupUtils.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/backup/util/BackupUtils.html b/devapidocs/src-html/org/apache/hadoop/hbase/backup/util/BackupUtils.html
index c2de678..8dc15f2 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/util/BackupUtils.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/util/BackupUtils.html
@@ -748,7 +748,19 @@
<span class="sourceLineNo">740</span> }<a name="line.740"></a>
<span class="sourceLineNo">741</span> return loader;<a name="line.741"></a>
<span class="sourceLineNo">742</span> }<a name="line.742"></a>
-<span class="sourceLineNo">743</span>}<a name="line.743"></a>
+<span class="sourceLineNo">743</span><a name="line.743"></a>
+<span class="sourceLineNo">744</span> public static String findMostRecentBackupId(String[] backupIds) {<a name="line.744"></a>
+<span class="sourceLineNo">745</span> long recentTimestamp = Long.MIN_VALUE;<a name="line.745"></a>
+<span class="sourceLineNo">746</span> for (String backupId : backupIds) {<a name="line.746"></a>
+<span class="sourceLineNo">747</span> long ts = Long.parseLong(backupId.split("_")[1]);<a name="line.747"></a>
+<span class="sourceLineNo">748</span> if (ts > recentTimestamp) {<a name="line.748"></a>
+<span class="sourceLineNo">749</span> recentTimestamp = ts;<a name="line.749"></a>
+<span class="sourceLineNo">750</span> }<a name="line.750"></a>
+<span class="sourceLineNo">751</span> }<a name="line.751"></a>
+<span class="sourceLineNo">752</span> return BackupRestoreConstants.BACKUPID_PREFIX + recentTimestamp;<a name="line.752"></a>
+<span class="sourceLineNo">753</span> }<a name="line.753"></a>
+<span class="sourceLineNo">754</span><a name="line.754"></a>
+<span class="sourceLineNo">755</span>}<a name="line.755"></a>