http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa7ffc92/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.html
----------------------------------------------------------------------
diff --git
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.html
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.html
index 9baf566..460989c 100644
---
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.html
+++
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/RestoreTablesClient.html
@@ -71,7 +71,7 @@
<span class="sourceLineNo">063</span> private String targetRootDir;<a
name="line.63"></a>
<span class="sourceLineNo">064</span> private boolean isOverwrite;<a
name="line.64"></a>
<span class="sourceLineNo">065</span><a name="line.65"></a>
-<span class="sourceLineNo">066</span> public RestoreTablesClient(Connection
conn, RestoreRequest request) throws IOException {<a name="line.66"></a>
+<span class="sourceLineNo">066</span> public RestoreTablesClient(Connection
conn, RestoreRequest request) {<a name="line.66"></a>
<span class="sourceLineNo">067</span> this.targetRootDir =
request.getBackupRootDir();<a name="line.67"></a>
<span class="sourceLineNo">068</span> this.backupId =
request.getBackupId();<a name="line.68"></a>
<span class="sourceLineNo">069</span> this.sTableArray =
request.getFromTables();<a name="line.69"></a>
@@ -82,206 +82,197 @@
<span class="sourceLineNo">074</span> this.isOverwrite =
request.isOverwrite();<a name="line.74"></a>
<span class="sourceLineNo">075</span> this.conn = conn;<a
name="line.75"></a>
<span class="sourceLineNo">076</span> this.conf =
conn.getConfiguration();<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><a name="line.79"></a>
-<span class="sourceLineNo">080</span> /**<a name="line.80"></a>
-<span class="sourceLineNo">081</span> * Validate target tables<a
name="line.81"></a>
-<span class="sourceLineNo">082</span> * @param conn connection<a
name="line.82"></a>
-<span class="sourceLineNo">083</span> * @param mgr table state manager<a
name="line.83"></a>
-<span class="sourceLineNo">084</span> * @param tTableArray: target tables<a
name="line.84"></a>
-<span class="sourceLineNo">085</span> * @param isOverwrite overwrite
existing table<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * @throws IOException exception<a
name="line.86"></a>
-<span class="sourceLineNo">087</span> */<a name="line.87"></a>
-<span class="sourceLineNo">088</span> private void
checkTargetTables(TableName[] tTableArray, boolean isOverwrite) throws
IOException {<a name="line.88"></a>
-<span class="sourceLineNo">089</span> ArrayList<TableName>
existTableList = new ArrayList<>();<a name="line.89"></a>
-<span class="sourceLineNo">090</span> ArrayList<TableName>
disabledTableList = new ArrayList<>();<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span> // check if the tables already
exist<a name="line.92"></a>
-<span class="sourceLineNo">093</span> try (Admin admin = conn.getAdmin())
{<a name="line.93"></a>
-<span class="sourceLineNo">094</span> for (TableName tableName :
tTableArray) {<a name="line.94"></a>
-<span class="sourceLineNo">095</span> if (admin.tableExists(tableName))
{<a name="line.95"></a>
-<span class="sourceLineNo">096</span>
existTableList.add(tableName);<a name="line.96"></a>
-<span class="sourceLineNo">097</span> if
(admin.isTableDisabled(tableName)) {<a name="line.97"></a>
-<span class="sourceLineNo">098</span>
disabledTableList.add(tableName);<a name="line.98"></a>
-<span class="sourceLineNo">099</span> }<a name="line.99"></a>
-<span class="sourceLineNo">100</span> } else {<a name="line.100"></a>
-<span class="sourceLineNo">101</span> LOG.info("HBase table " +
tableName<a name="line.101"></a>
-<span class="sourceLineNo">102</span> + " does not exist. It will
be created during restore process");<a name="line.102"></a>
-<span class="sourceLineNo">103</span> }<a name="line.103"></a>
-<span class="sourceLineNo">104</span> }<a name="line.104"></a>
-<span class="sourceLineNo">105</span> }<a name="line.105"></a>
-<span class="sourceLineNo">106</span><a name="line.106"></a>
-<span class="sourceLineNo">107</span> if (existTableList.size() > 0) {<a
name="line.107"></a>
-<span class="sourceLineNo">108</span> if (!isOverwrite) {<a
name="line.108"></a>
-<span class="sourceLineNo">109</span> LOG.error("Existing table (" +
existTableList<a name="line.109"></a>
-<span class="sourceLineNo">110</span> + ") found in the restore
target, please add "<a name="line.110"></a>
-<span class="sourceLineNo">111</span> + "\"-o\" as overwrite option
in the command if you mean"<a name="line.111"></a>
-<span class="sourceLineNo">112</span> + " to restore to these
existing tables");<a name="line.112"></a>
-<span class="sourceLineNo">113</span> throw new IOException("Existing
table found in target while no \"-o\" "<a name="line.113"></a>
-<span class="sourceLineNo">114</span> + "as overwrite option
found");<a name="line.114"></a>
-<span class="sourceLineNo">115</span> } else {<a name="line.115"></a>
-<span class="sourceLineNo">116</span> if (disabledTableList.size() >
0) {<a name="line.116"></a>
-<span class="sourceLineNo">117</span> LOG.error("Found offline table
in the restore target, "<a name="line.117"></a>
-<span class="sourceLineNo">118</span> + "please enable them
before restore with \"-overwrite\" option");<a name="line.118"></a>
-<span class="sourceLineNo">119</span> LOG.info("Offline table list in
restore target: " + disabledTableList);<a name="line.119"></a>
-<span class="sourceLineNo">120</span> throw new IOException(<a
name="line.120"></a>
-<span class="sourceLineNo">121</span> "Found offline table in the
target when restore with \"-overwrite\" option");<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><a name="line.126"></a>
-<span class="sourceLineNo">127</span> /**<a name="line.127"></a>
-<span class="sourceLineNo">128</span> * Restore operation handle each
backupImage in array<a name="line.128"></a>
-<span class="sourceLineNo">129</span> * @param svc: master services<a
name="line.129"></a>
-<span class="sourceLineNo">130</span> * @param images: array BackupImage<a
name="line.130"></a>
-<span class="sourceLineNo">131</span> * @param sTable: table to be
restored<a name="line.131"></a>
-<span class="sourceLineNo">132</span> * @param tTable: table to be restored
to<a name="line.132"></a>
-<span class="sourceLineNo">133</span> * @param truncateIfExists: truncate
table<a name="line.133"></a>
-<span class="sourceLineNo">134</span> * @throws IOException exception<a
name="line.134"></a>
-<span class="sourceLineNo">135</span> */<a name="line.135"></a>
-<span class="sourceLineNo">136</span><a name="line.136"></a>
-<span class="sourceLineNo">137</span> private void
restoreImages(BackupImage[] images, TableName sTable, TableName tTable,<a
name="line.137"></a>
-<span class="sourceLineNo">138</span> boolean truncateIfExists) throws
IOException {<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> // First image MUST be image of a
FULL backup<a name="line.140"></a>
-<span class="sourceLineNo">141</span> BackupImage image = images[0];<a
name="line.141"></a>
-<span class="sourceLineNo">142</span> String rootDir =
image.getRootDir();<a name="line.142"></a>
-<span class="sourceLineNo">143</span> String backupId =
image.getBackupId();<a name="line.143"></a>
-<span class="sourceLineNo">144</span> Path backupRoot = new
Path(rootDir);<a name="line.144"></a>
-<span class="sourceLineNo">145</span> RestoreTool restoreTool = new
RestoreTool(conf, backupRoot, backupId);<a name="line.145"></a>
-<span class="sourceLineNo">146</span> Path tableBackupPath =
HBackupFileSystem.getTableBackupPath(sTable, backupRoot, backupId);<a
name="line.146"></a>
-<span class="sourceLineNo">147</span> String lastIncrBackupId =
images.length == 1 ? null : images[images.length - 1].getBackupId();<a
name="line.147"></a>
-<span class="sourceLineNo">148</span> // We need hFS only for full restore
(see the code)<a name="line.148"></a>
-<span class="sourceLineNo">149</span> BackupManifest manifest =
HBackupFileSystem.getManifest(conf, backupRoot, backupId);<a
name="line.149"></a>
-<span class="sourceLineNo">150</span> if (manifest.getType() ==
BackupType.FULL) {<a name="line.150"></a>
-<span class="sourceLineNo">151</span> LOG.info("Restoring '" + sTable +
"' to '" + tTable + "' from full" + " backup image "<a name="line.151"></a>
-<span class="sourceLineNo">152</span> +
tableBackupPath.toString());<a name="line.152"></a>
-<span class="sourceLineNo">153</span> conf.set(JOB_NAME_CONF_KEY,
"Full_Restore-" + backupId + "-" + tTable);<a name="line.153"></a>
-<span class="sourceLineNo">154</span> restoreTool.fullRestoreTable(conn,
tableBackupPath, sTable, tTable, truncateIfExists,<a name="line.154"></a>
-<span class="sourceLineNo">155</span> lastIncrBackupId);<a
name="line.155"></a>
-<span class="sourceLineNo">156</span> conf.unset(JOB_NAME_CONF_KEY);<a
name="line.156"></a>
-<span class="sourceLineNo">157</span> } else { // incremental Backup<a
name="line.157"></a>
-<span class="sourceLineNo">158</span> throw new IOException("Unexpected
backup type " + image.getType());<a name="line.158"></a>
-<span class="sourceLineNo">159</span> }<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span> if (images.length == 1) {<a
name="line.161"></a>
-<span class="sourceLineNo">162</span> // full backup restore done<a
name="line.162"></a>
-<span class="sourceLineNo">163</span> return;<a name="line.163"></a>
-<span class="sourceLineNo">164</span> }<a name="line.164"></a>
-<span class="sourceLineNo">165</span><a name="line.165"></a>
-<span class="sourceLineNo">166</span> List<Path> dirList = new
ArrayList<Path>();<a name="line.166"></a>
-<span class="sourceLineNo">167</span> // add full backup path<a
name="line.167"></a>
-<span class="sourceLineNo">168</span> // full backup path comes first<a
name="line.168"></a>
-<span class="sourceLineNo">169</span> for (int i = 1; i < images.length;
i++) {<a name="line.169"></a>
-<span class="sourceLineNo">170</span> BackupImage im = images[i];<a
name="line.170"></a>
-<span class="sourceLineNo">171</span> String fileBackupDir =<a
name="line.171"></a>
-<span class="sourceLineNo">172</span>
HBackupFileSystem.getTableBackupDir(im.getRootDir(), im.getBackupId(),
sTable);<a name="line.172"></a>
-<span class="sourceLineNo">173</span> List<Path> list =
getFilesRecursively(fileBackupDir);<a name="line.173"></a>
-<span class="sourceLineNo">174</span> dirList.addAll(list);<a
name="line.174"></a>
-<span class="sourceLineNo">175</span><a name="line.175"></a>
-<span class="sourceLineNo">176</span> }<a name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
-<span class="sourceLineNo">178</span> String dirs =
StringUtils.join(dirList, ",");<a name="line.178"></a>
-<span class="sourceLineNo">179</span> LOG.info("Restoring '" + sTable + "'
to '" + tTable + "' from log dirs: " + dirs);<a name="line.179"></a>
-<span class="sourceLineNo">180</span> Path[] paths = new
Path[dirList.size()];<a name="line.180"></a>
-<span class="sourceLineNo">181</span> dirList.toArray(paths);<a
name="line.181"></a>
-<span class="sourceLineNo">182</span> conf.set(JOB_NAME_CONF_KEY,
"Incremental_Restore-" + backupId + "-" + tTable);<a name="line.182"></a>
-<span class="sourceLineNo">183</span>
restoreTool.incrementalRestoreTable(conn, tableBackupPath, paths, new
TableName[] { sTable },<a name="line.183"></a>
-<span class="sourceLineNo">184</span> new TableName[] { tTable },
lastIncrBackupId);<a name="line.184"></a>
-<span class="sourceLineNo">185</span> LOG.info(sTable + " has been
successfully restored to " + tTable);<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> private List<Path>
getFilesRecursively(String fileBackupDir)<a name="line.188"></a>
-<span class="sourceLineNo">189</span> throws IllegalArgumentException,
IOException {<a name="line.189"></a>
-<span class="sourceLineNo">190</span> FileSystem fs = FileSystem.get((new
Path(fileBackupDir)).toUri(), new Configuration());<a name="line.190"></a>
-<span class="sourceLineNo">191</span> List<Path> list = new
ArrayList<Path>();<a name="line.191"></a>
-<span class="sourceLineNo">192</span>
RemoteIterator<LocatedFileStatus> it = fs.listFiles(new
Path(fileBackupDir), true);<a name="line.192"></a>
-<span class="sourceLineNo">193</span> while (it.hasNext()) {<a
name="line.193"></a>
-<span class="sourceLineNo">194</span> Path p = it.next().getPath();<a
name="line.194"></a>
-<span class="sourceLineNo">195</span> if (HFile.isHFileFormat(fs, p)) {<a
name="line.195"></a>
-<span class="sourceLineNo">196</span> list.add(p);<a
name="line.196"></a>
-<span class="sourceLineNo">197</span> }<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> /**<a name="line.202"></a>
-<span class="sourceLineNo">203</span> * Restore operation. Stage 2: resolved
Backup Image dependency<a name="line.203"></a>
-<span class="sourceLineNo">204</span> * @param backupManifestMap :
tableName, Manifest<a name="line.204"></a>
-<span class="sourceLineNo">205</span> * @param sTableArray The array of
tables to be restored<a name="line.205"></a>
-<span class="sourceLineNo">206</span> * @param tTableArray The array of
mapping tables to restore to<a name="line.206"></a>
-<span class="sourceLineNo">207</span> * @return set of BackupImages
restored<a name="line.207"></a>
-<span class="sourceLineNo">208</span> * @throws IOException exception<a
name="line.208"></a>
-<span class="sourceLineNo">209</span> */<a name="line.209"></a>
-<span class="sourceLineNo">210</span> private void
restore(HashMap<TableName, BackupManifest> backupManifestMap,<a
name="line.210"></a>
-<span class="sourceLineNo">211</span> TableName[] sTableArray,
TableName[] tTableArray, boolean isOverwrite) throws IOException {<a
name="line.211"></a>
-<span class="sourceLineNo">212</span> TreeSet<BackupImage>
restoreImageSet = new TreeSet<BackupImage>();<a name="line.212"></a>
-<span class="sourceLineNo">213</span> boolean truncateIfExists =
isOverwrite;<a name="line.213"></a>
-<span class="sourceLineNo">214</span> Set<String> backupIdSet = new
HashSet<>();<a name="line.214"></a>
-<span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span> for (int i = 0; i <
sTableArray.length; i++) {<a name="line.216"></a>
-<span class="sourceLineNo">217</span> TableName table = sTableArray[i];<a
name="line.217"></a>
-<span class="sourceLineNo">218</span><a name="line.218"></a>
-<span class="sourceLineNo">219</span> BackupManifest manifest =
backupManifestMap.get(table);<a name="line.219"></a>
-<span class="sourceLineNo">220</span> // Get the image list of this
backup for restore in time order from old<a name="line.220"></a>
-<span class="sourceLineNo">221</span> // to new.<a name="line.221"></a>
-<span class="sourceLineNo">222</span> List<BackupImage> list = new
ArrayList<BackupImage>();<a name="line.222"></a>
-<span class="sourceLineNo">223</span>
list.add(manifest.getBackupImage());<a name="line.223"></a>
-<span class="sourceLineNo">224</span> TreeSet<BackupImage> set =
new TreeSet<BackupImage>(list);<a name="line.224"></a>
-<span class="sourceLineNo">225</span> List<BackupImage> depList =
manifest.getDependentListByTable(table);<a name="line.225"></a>
-<span class="sourceLineNo">226</span> set.addAll(depList);<a
name="line.226"></a>
-<span class="sourceLineNo">227</span> BackupImage[] arr = new
BackupImage[set.size()];<a name="line.227"></a>
-<span class="sourceLineNo">228</span> set.toArray(arr);<a
name="line.228"></a>
-<span class="sourceLineNo">229</span> restoreImages(arr, table,
tTableArray[i], truncateIfExists);<a name="line.229"></a>
-<span class="sourceLineNo">230</span> restoreImageSet.addAll(list);<a
name="line.230"></a>
-<span class="sourceLineNo">231</span> if (restoreImageSet != null
&& !restoreImageSet.isEmpty()) {<a name="line.231"></a>
-<span class="sourceLineNo">232</span> LOG.info("Restore includes the
following image(s):");<a name="line.232"></a>
-<span class="sourceLineNo">233</span> for (BackupImage image :
restoreImageSet) {<a name="line.233"></a>
-<span class="sourceLineNo">234</span> LOG.info("Backup: " +
image.getBackupId() + " "<a name="line.234"></a>
-<span class="sourceLineNo">235</span> +
HBackupFileSystem.getTableBackupDir(image.getRootDir(), image.getBackupId(),
table));<a name="line.235"></a>
-<span class="sourceLineNo">236</span> if (image.getType() ==
BackupType.INCREMENTAL) {<a name="line.236"></a>
-<span class="sourceLineNo">237</span>
backupIdSet.add(image.getBackupId());<a name="line.237"></a>
-<span class="sourceLineNo">238</span> LOG.debug("adding " +
image.getBackupId() + " for bulk load");<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> }<a name="line.242"></a>
-<span class="sourceLineNo">243</span> LOG.debug("restoreStage finished");<a
name="line.243"></a>
-<span class="sourceLineNo">244</span> }<a name="line.244"></a>
-<span class="sourceLineNo">245</span><a name="line.245"></a>
-<span class="sourceLineNo">246</span> static long getTsFromBackupId(String
backupId) {<a name="line.246"></a>
-<span class="sourceLineNo">247</span> if (backupId == null) {<a
name="line.247"></a>
-<span class="sourceLineNo">248</span> return 0;<a name="line.248"></a>
-<span class="sourceLineNo">249</span> }<a name="line.249"></a>
-<span class="sourceLineNo">250</span> return
Long.parseLong(backupId.substring(backupId.lastIndexOf("_") + 1));<a
name="line.250"></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> /**<a name="line.79"></a>
+<span class="sourceLineNo">080</span> * Validate target tables.<a
name="line.80"></a>
+<span class="sourceLineNo">081</span> *<a name="line.81"></a>
+<span class="sourceLineNo">082</span> * @param tTableArray: target tables<a
name="line.82"></a>
+<span class="sourceLineNo">083</span> * @param isOverwrite overwrite
existing table<a name="line.83"></a>
+<span class="sourceLineNo">084</span> * @throws IOException exception<a
name="line.84"></a>
+<span class="sourceLineNo">085</span> */<a name="line.85"></a>
+<span class="sourceLineNo">086</span> private void
checkTargetTables(TableName[] tTableArray, boolean isOverwrite) throws
IOException {<a name="line.86"></a>
+<span class="sourceLineNo">087</span> ArrayList<TableName>
existTableList = new ArrayList<>();<a name="line.87"></a>
+<span class="sourceLineNo">088</span> ArrayList<TableName>
disabledTableList = new ArrayList<>();<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span> // check if the tables already
exist<a name="line.90"></a>
+<span class="sourceLineNo">091</span> try (Admin admin = conn.getAdmin())
{<a name="line.91"></a>
+<span class="sourceLineNo">092</span> for (TableName tableName :
tTableArray) {<a name="line.92"></a>
+<span class="sourceLineNo">093</span> if (admin.tableExists(tableName))
{<a name="line.93"></a>
+<span class="sourceLineNo">094</span>
existTableList.add(tableName);<a name="line.94"></a>
+<span class="sourceLineNo">095</span> if
(admin.isTableDisabled(tableName)) {<a name="line.95"></a>
+<span class="sourceLineNo">096</span>
disabledTableList.add(tableName);<a name="line.96"></a>
+<span class="sourceLineNo">097</span> }<a name="line.97"></a>
+<span class="sourceLineNo">098</span> } else {<a name="line.98"></a>
+<span class="sourceLineNo">099</span> LOG.info("HBase table " +
tableName<a name="line.99"></a>
+<span class="sourceLineNo">100</span> + " does not exist. It will
be created during restore process");<a name="line.100"></a>
+<span class="sourceLineNo">101</span> }<a name="line.101"></a>
+<span class="sourceLineNo">102</span> }<a name="line.102"></a>
+<span class="sourceLineNo">103</span> }<a name="line.103"></a>
+<span class="sourceLineNo">104</span><a name="line.104"></a>
+<span class="sourceLineNo">105</span> if (existTableList.size() > 0) {<a
name="line.105"></a>
+<span class="sourceLineNo">106</span> if (!isOverwrite) {<a
name="line.106"></a>
+<span class="sourceLineNo">107</span> LOG.error("Existing table (" +
existTableList<a name="line.107"></a>
+<span class="sourceLineNo">108</span> + ") found in the restore
target, please add "<a name="line.108"></a>
+<span class="sourceLineNo">109</span> + "\"-o\" as overwrite option
in the command if you mean"<a name="line.109"></a>
+<span class="sourceLineNo">110</span> + " to restore to these
existing tables");<a name="line.110"></a>
+<span class="sourceLineNo">111</span> throw new IOException("Existing
table found in target while no \"-o\" "<a name="line.111"></a>
+<span class="sourceLineNo">112</span> + "as overwrite option
found");<a name="line.112"></a>
+<span class="sourceLineNo">113</span> } else {<a name="line.113"></a>
+<span class="sourceLineNo">114</span> if (disabledTableList.size() >
0) {<a name="line.114"></a>
+<span class="sourceLineNo">115</span> LOG.error("Found offline table
in the restore target, "<a name="line.115"></a>
+<span class="sourceLineNo">116</span> + "please enable them
before restore with \"-overwrite\" option");<a name="line.116"></a>
+<span class="sourceLineNo">117</span> LOG.info("Offline table list in
restore target: " + disabledTableList);<a name="line.117"></a>
+<span class="sourceLineNo">118</span> throw new IOException(<a
name="line.118"></a>
+<span class="sourceLineNo">119</span> "Found offline table in the
target when restore with \"-overwrite\" option");<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>
+<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> * Restore operation handle each
backupImage in array.<a name="line.126"></a>
+<span class="sourceLineNo">127</span> *<a name="line.127"></a>
+<span class="sourceLineNo">128</span> * @param images: array BackupImage<a
name="line.128"></a>
+<span class="sourceLineNo">129</span> * @param sTable: table to be
restored<a name="line.129"></a>
+<span class="sourceLineNo">130</span> * @param tTable: table to be restored
to<a name="line.130"></a>
+<span class="sourceLineNo">131</span> * @param truncateIfExists: truncate
table<a name="line.131"></a>
+<span class="sourceLineNo">132</span> * @throws IOException exception<a
name="line.132"></a>
+<span class="sourceLineNo">133</span> */<a name="line.133"></a>
+<span class="sourceLineNo">134</span><a name="line.134"></a>
+<span class="sourceLineNo">135</span> private void
restoreImages(BackupImage[] images, TableName sTable, TableName tTable,<a
name="line.135"></a>
+<span class="sourceLineNo">136</span> boolean truncateIfExists) throws
IOException {<a name="line.136"></a>
+<span class="sourceLineNo">137</span> // First image MUST be image of a
FULL backup<a name="line.137"></a>
+<span class="sourceLineNo">138</span> BackupImage image = images[0];<a
name="line.138"></a>
+<span class="sourceLineNo">139</span> String rootDir =
image.getRootDir();<a name="line.139"></a>
+<span class="sourceLineNo">140</span> String backupId =
image.getBackupId();<a name="line.140"></a>
+<span class="sourceLineNo">141</span> Path backupRoot = new
Path(rootDir);<a name="line.141"></a>
+<span class="sourceLineNo">142</span> RestoreTool restoreTool = new
RestoreTool(conf, backupRoot, backupId);<a name="line.142"></a>
+<span class="sourceLineNo">143</span> Path tableBackupPath =
HBackupFileSystem.getTableBackupPath(sTable, backupRoot, backupId);<a
name="line.143"></a>
+<span class="sourceLineNo">144</span> String lastIncrBackupId =
images.length == 1 ? null : images[images.length - 1].getBackupId();<a
name="line.144"></a>
+<span class="sourceLineNo">145</span> // We need hFS only for full restore
(see the code)<a name="line.145"></a>
+<span class="sourceLineNo">146</span> BackupManifest manifest =
HBackupFileSystem.getManifest(conf, backupRoot, backupId);<a
name="line.146"></a>
+<span class="sourceLineNo">147</span> if (manifest.getType() ==
BackupType.FULL) {<a name="line.147"></a>
+<span class="sourceLineNo">148</span> LOG.info("Restoring '" + sTable +
"' to '" + tTable + "' from full" + " backup image "<a name="line.148"></a>
+<span class="sourceLineNo">149</span> +
tableBackupPath.toString());<a name="line.149"></a>
+<span class="sourceLineNo">150</span> conf.set(JOB_NAME_CONF_KEY,
"Full_Restore-" + backupId + "-" + tTable);<a name="line.150"></a>
+<span class="sourceLineNo">151</span> restoreTool.fullRestoreTable(conn,
tableBackupPath, sTable, tTable, truncateIfExists,<a name="line.151"></a>
+<span class="sourceLineNo">152</span> lastIncrBackupId);<a
name="line.152"></a>
+<span class="sourceLineNo">153</span> conf.unset(JOB_NAME_CONF_KEY);<a
name="line.153"></a>
+<span class="sourceLineNo">154</span> } else { // incremental Backup<a
name="line.154"></a>
+<span class="sourceLineNo">155</span> throw new IOException("Unexpected
backup type " + image.getType());<a name="line.155"></a>
+<span class="sourceLineNo">156</span> }<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span> if (images.length == 1) {<a
name="line.158"></a>
+<span class="sourceLineNo">159</span> // full backup restore done<a
name="line.159"></a>
+<span class="sourceLineNo">160</span> return;<a name="line.160"></a>
+<span class="sourceLineNo">161</span> }<a name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span> List<Path> dirList = new
ArrayList<>();<a name="line.163"></a>
+<span class="sourceLineNo">164</span> // add full backup path<a
name="line.164"></a>
+<span class="sourceLineNo">165</span> // full backup path comes first<a
name="line.165"></a>
+<span class="sourceLineNo">166</span> for (int i = 1; i < images.length;
i++) {<a name="line.166"></a>
+<span class="sourceLineNo">167</span> BackupImage im = images[i];<a
name="line.167"></a>
+<span class="sourceLineNo">168</span> String fileBackupDir =<a
name="line.168"></a>
+<span class="sourceLineNo">169</span>
HBackupFileSystem.getTableBackupDir(im.getRootDir(), im.getBackupId(),
sTable);<a name="line.169"></a>
+<span class="sourceLineNo">170</span> List<Path> list =
getFilesRecursively(fileBackupDir);<a name="line.170"></a>
+<span class="sourceLineNo">171</span> dirList.addAll(list);<a
name="line.171"></a>
+<span class="sourceLineNo">172</span><a name="line.172"></a>
+<span class="sourceLineNo">173</span> }<a name="line.173"></a>
+<span class="sourceLineNo">174</span><a name="line.174"></a>
+<span class="sourceLineNo">175</span> String dirs =
StringUtils.join(dirList, ",");<a name="line.175"></a>
+<span class="sourceLineNo">176</span> LOG.info("Restoring '" + sTable + "'
to '" + tTable + "' from log dirs: " + dirs);<a name="line.176"></a>
+<span class="sourceLineNo">177</span> Path[] paths = new
Path[dirList.size()];<a name="line.177"></a>
+<span class="sourceLineNo">178</span> dirList.toArray(paths);<a
name="line.178"></a>
+<span class="sourceLineNo">179</span> conf.set(JOB_NAME_CONF_KEY,
"Incremental_Restore-" + backupId + "-" + tTable);<a name="line.179"></a>
+<span class="sourceLineNo">180</span>
restoreTool.incrementalRestoreTable(conn, tableBackupPath, paths, new
TableName[] { sTable },<a name="line.180"></a>
+<span class="sourceLineNo">181</span> new TableName[] { tTable },
lastIncrBackupId);<a name="line.181"></a>
+<span class="sourceLineNo">182</span> LOG.info(sTable + " has been
successfully restored to " + tTable);<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> private List<Path>
getFilesRecursively(String fileBackupDir)<a name="line.185"></a>
+<span class="sourceLineNo">186</span> throws IllegalArgumentException,
IOException {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> FileSystem fs = FileSystem.get((new
Path(fileBackupDir)).toUri(), new Configuration());<a name="line.187"></a>
+<span class="sourceLineNo">188</span> List<Path> list = new
ArrayList<>();<a name="line.188"></a>
+<span class="sourceLineNo">189</span>
RemoteIterator<LocatedFileStatus> it = fs.listFiles(new
Path(fileBackupDir), true);<a name="line.189"></a>
+<span class="sourceLineNo">190</span> while (it.hasNext()) {<a
name="line.190"></a>
+<span class="sourceLineNo">191</span> Path p = it.next().getPath();<a
name="line.191"></a>
+<span class="sourceLineNo">192</span> if (HFile.isHFileFormat(fs, p)) {<a
name="line.192"></a>
+<span class="sourceLineNo">193</span> list.add(p);<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> return list;<a name="line.196"></a>
+<span class="sourceLineNo">197</span> }<a name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span> /**<a name="line.199"></a>
+<span class="sourceLineNo">200</span> * Restore operation. Stage 2: resolved
Backup Image dependency<a name="line.200"></a>
+<span class="sourceLineNo">201</span> * @param backupManifestMap :
tableName, Manifest<a name="line.201"></a>
+<span class="sourceLineNo">202</span> * @param sTableArray The array of
tables to be restored<a name="line.202"></a>
+<span class="sourceLineNo">203</span> * @param tTableArray The array of
mapping tables to restore to<a name="line.203"></a>
+<span class="sourceLineNo">204</span> * @throws IOException exception<a
name="line.204"></a>
+<span class="sourceLineNo">205</span> */<a name="line.205"></a>
+<span class="sourceLineNo">206</span> private void
restore(HashMap<TableName, BackupManifest> backupManifestMap,<a
name="line.206"></a>
+<span class="sourceLineNo">207</span> TableName[] sTableArray,
TableName[] tTableArray, boolean isOverwrite) throws IOException {<a
name="line.207"></a>
+<span class="sourceLineNo">208</span> TreeSet<BackupImage>
restoreImageSet = new TreeSet<>();<a name="line.208"></a>
+<span class="sourceLineNo">209</span> Set<String> backupIdSet = new
HashSet<>();<a name="line.209"></a>
+<span class="sourceLineNo">210</span><a name="line.210"></a>
+<span class="sourceLineNo">211</span> for (int i = 0; i <
sTableArray.length; i++) {<a name="line.211"></a>
+<span class="sourceLineNo">212</span> TableName table = sTableArray[i];<a
name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span> BackupManifest manifest =
backupManifestMap.get(table);<a name="line.214"></a>
+<span class="sourceLineNo">215</span> // Get the image list of this
backup for restore in time order from old<a name="line.215"></a>
+<span class="sourceLineNo">216</span> // to new.<a name="line.216"></a>
+<span class="sourceLineNo">217</span> List<BackupImage> list = new
ArrayList<>();<a name="line.217"></a>
+<span class="sourceLineNo">218</span>
list.add(manifest.getBackupImage());<a name="line.218"></a>
+<span class="sourceLineNo">219</span> TreeSet<BackupImage> set =
new TreeSet<>(list);<a name="line.219"></a>
+<span class="sourceLineNo">220</span> List<BackupImage> depList =
manifest.getDependentListByTable(table);<a name="line.220"></a>
+<span class="sourceLineNo">221</span> set.addAll(depList);<a
name="line.221"></a>
+<span class="sourceLineNo">222</span> BackupImage[] arr = new
BackupImage[set.size()];<a name="line.222"></a>
+<span class="sourceLineNo">223</span> set.toArray(arr);<a
name="line.223"></a>
+<span class="sourceLineNo">224</span> restoreImages(arr, table,
tTableArray[i], isOverwrite);<a name="line.224"></a>
+<span class="sourceLineNo">225</span> restoreImageSet.addAll(list);<a
name="line.225"></a>
+<span class="sourceLineNo">226</span> if (restoreImageSet != null
&& !restoreImageSet.isEmpty()) {<a name="line.226"></a>
+<span class="sourceLineNo">227</span> LOG.info("Restore includes the
following image(s):");<a name="line.227"></a>
+<span class="sourceLineNo">228</span> for (BackupImage image :
restoreImageSet) {<a name="line.228"></a>
+<span class="sourceLineNo">229</span> LOG.info("Backup: " +
image.getBackupId() + " "<a name="line.229"></a>
+<span class="sourceLineNo">230</span> +
HBackupFileSystem.getTableBackupDir(image.getRootDir(), image.getBackupId(),<a
name="line.230"></a>
+<span class="sourceLineNo">231</span> table));<a
name="line.231"></a>
+<span class="sourceLineNo">232</span> if (image.getType() ==
BackupType.INCREMENTAL) {<a name="line.232"></a>
+<span class="sourceLineNo">233</span>
backupIdSet.add(image.getBackupId());<a name="line.233"></a>
+<span class="sourceLineNo">234</span> LOG.debug("adding " +
image.getBackupId() + " for bulk load");<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> }<a name="line.238"></a>
+<span class="sourceLineNo">239</span> LOG.debug("restoreStage finished");<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> static long getTsFromBackupId(String
backupId) {<a name="line.242"></a>
+<span class="sourceLineNo">243</span> if (backupId == null) {<a
name="line.243"></a>
+<span class="sourceLineNo">244</span> return 0;<a name="line.244"></a>
+<span class="sourceLineNo">245</span> }<a name="line.245"></a>
+<span class="sourceLineNo">246</span> return
Long.parseLong(backupId.substring(backupId.lastIndexOf("_") + 1));<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> static boolean withinRange(long a, long
lower, long upper) {<a name="line.249"></a>
+<span class="sourceLineNo">250</span> return a >= lower && a
<= upper;<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> static boolean withinRange(long a, long
lower, long upper) {<a name="line.253"></a>
-<span class="sourceLineNo">254</span> if (a < lower || a > upper) {<a
name="line.254"></a>
-<span class="sourceLineNo">255</span> return false;<a name="line.255"></a>
-<span class="sourceLineNo">256</span> }<a name="line.256"></a>
-<span class="sourceLineNo">257</span> return true;<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> public void execute() throws
IOException {<a name="line.260"></a>
-<span class="sourceLineNo">261</span><a name="line.261"></a>
-<span class="sourceLineNo">262</span> // case VALIDATION:<a
name="line.262"></a>
-<span class="sourceLineNo">263</span> // check the target tables<a
name="line.263"></a>
-<span class="sourceLineNo">264</span> checkTargetTables(tTableArray,
isOverwrite);<a name="line.264"></a>
-<span class="sourceLineNo">265</span><a name="line.265"></a>
-<span class="sourceLineNo">266</span> // case RESTORE_IMAGES:<a
name="line.266"></a>
-<span class="sourceLineNo">267</span> HashMap<TableName,
BackupManifest> backupManifestMap = new HashMap<>();<a
name="line.267"></a>
-<span class="sourceLineNo">268</span> // check and load backup image
manifest for the tables<a name="line.268"></a>
-<span class="sourceLineNo">269</span> Path rootPath = new
Path(targetRootDir);<a name="line.269"></a>
-<span class="sourceLineNo">270</span>
HBackupFileSystem.checkImageManifestExist(backupManifestMap, sTableArray, conf,
rootPath,<a name="line.270"></a>
-<span class="sourceLineNo">271</span> backupId);<a name="line.271"></a>
-<span class="sourceLineNo">272</span><a name="line.272"></a>
-<span class="sourceLineNo">273</span> restore(backupManifestMap,
sTableArray, tTableArray, isOverwrite);<a name="line.273"></a>
-<span class="sourceLineNo">274</span> }<a name="line.274"></a>
-<span class="sourceLineNo">275</span><a name="line.275"></a>
-<span class="sourceLineNo">276</span>}<a name="line.276"></a>
+<span class="sourceLineNo">253</span> public void execute() throws
IOException {<a name="line.253"></a>
+<span class="sourceLineNo">254</span> // case VALIDATION:<a
name="line.254"></a>
+<span class="sourceLineNo">255</span> // check the target tables<a
name="line.255"></a>
+<span class="sourceLineNo">256</span> checkTargetTables(tTableArray,
isOverwrite);<a name="line.256"></a>
+<span class="sourceLineNo">257</span><a name="line.257"></a>
+<span class="sourceLineNo">258</span> // case RESTORE_IMAGES:<a
name="line.258"></a>
+<span class="sourceLineNo">259</span> HashMap<TableName,
BackupManifest> backupManifestMap = new HashMap<>();<a
name="line.259"></a>
+<span class="sourceLineNo">260</span> // check and load backup image
manifest for the tables<a name="line.260"></a>
+<span class="sourceLineNo">261</span> Path rootPath = new
Path(targetRootDir);<a name="line.261"></a>
+<span class="sourceLineNo">262</span>
HBackupFileSystem.checkImageManifestExist(backupManifestMap, sTableArray, conf,
rootPath,<a name="line.262"></a>
+<span class="sourceLineNo">263</span> backupId);<a name="line.263"></a>
+<span class="sourceLineNo">264</span><a name="line.264"></a>
+<span class="sourceLineNo">265</span> restore(backupManifestMap,
sTableArray, tTableArray, isOverwrite);<a name="line.265"></a>
+<span class="sourceLineNo">266</span> }<a name="line.266"></a>
+<span class="sourceLineNo">267</span>}<a name="line.267"></a>
