http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa7ffc92/devapidocs/src-html/org/apache/hadoop/hbase/backup/util/RestoreTool.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/util/RestoreTool.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/util/RestoreTool.html
index 4277d0a..36dbc3c 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/util/RestoreTool.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/util/RestoreTool.html
@@ -44,36 +44,36 @@
 <span class="sourceLineNo">036</span>import 
org.apache.hadoop.hbase.backup.BackupRestoreFactory;<a name="line.36"></a>
 <span class="sourceLineNo">037</span>import 
org.apache.hadoop.hbase.backup.HBackupFileSystem;<a name="line.37"></a>
 <span class="sourceLineNo">038</span>import 
org.apache.hadoop.hbase.backup.RestoreJob;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import org.slf4j.Logger;<a 
name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.slf4j.LoggerFactory;<a 
name="line.41"></a>
-<span class="sourceLineNo">042</span>import 
org.apache.hadoop.hbase.client.Admin;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;<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.TableDescriptor;<a name="line.45"></a>
-<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.client.TableDescriptorBuilder;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.io.HFileLink;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.io.hfile.HFile;<a name="line.48"></a>
+<span class="sourceLineNo">039</span>import 
org.apache.hadoop.hbase.client.Admin;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import 
org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;<a name="line.40"></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.TableDescriptor;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import 
org.apache.hadoop.hbase.client.TableDescriptorBuilder;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.io.HFileLink;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.io.hfile.HFile;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.regionserver.StoreFileInfo;<a name="line.46"></a>
+<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.snapshot.SnapshotDescriptionUtils;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.snapshot.SnapshotManifest;<a name="line.48"></a>
 <span class="sourceLineNo">049</span>import 
org.apache.hadoop.hbase.tool.LoadIncrementalHFiles;<a name="line.49"></a>
-<span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.regionserver.StoreFileInfo;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescription;<a
 name="line.51"></a>
-<span class="sourceLineNo">052</span>import 
org.apache.hadoop.hbase.snapshot.SnapshotDescriptionUtils;<a name="line.52"></a>
-<span class="sourceLineNo">053</span>import 
org.apache.hadoop.hbase.snapshot.SnapshotManifest;<a name="line.53"></a>
-<span class="sourceLineNo">054</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.54"></a>
-<span class="sourceLineNo">055</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.55"></a>
-<span class="sourceLineNo">056</span>import 
org.apache.hadoop.hbase.util.FSTableDescriptors;<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> * A collection for methods used by 
multiple classes to restore HBase tables.<a name="line.59"></a>
-<span class="sourceLineNo">060</span> */<a name="line.60"></a>
-<span class="sourceLineNo">061</span>@InterfaceAudience.Private<a 
name="line.61"></a>
-<span class="sourceLineNo">062</span>public class RestoreTool {<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.util.Bytes;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.51"></a>
+<span class="sourceLineNo">052</span>import 
org.apache.hadoop.hbase.util.FSTableDescriptors;<a name="line.52"></a>
+<span class="sourceLineNo">053</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.53"></a>
+<span class="sourceLineNo">054</span>import org.slf4j.Logger;<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span>import org.slf4j.LoggerFactory;<a 
name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span>import 
org.apache.hadoop.hbase.shaded.protobuf.generated.SnapshotProtos.SnapshotDescription;<a
 name="line.57"></a>
+<span class="sourceLineNo">058</span><a name="line.58"></a>
+<span class="sourceLineNo">059</span>/**<a name="line.59"></a>
+<span class="sourceLineNo">060</span> * A collection for methods used by 
multiple classes to restore HBase tables.<a name="line.60"></a>
+<span class="sourceLineNo">061</span> */<a name="line.61"></a>
+<span class="sourceLineNo">062</span>@InterfaceAudience.Private<a 
name="line.62"></a>
+<span class="sourceLineNo">063</span>public class RestoreTool {<a 
name="line.63"></a>
 <span class="sourceLineNo">064</span>  public static final Logger LOG = 
LoggerFactory.getLogger(BackupUtils.class);<a name="line.64"></a>
 <span class="sourceLineNo">065</span>  private final static long 
TABLE_AVAILABILITY_WAIT_TIME = 180000;<a name="line.65"></a>
 <span class="sourceLineNo">066</span><a name="line.66"></a>
 <span class="sourceLineNo">067</span>  private final String[] ignoreDirs = { 
HConstants.RECOVERED_EDITS_DIR };<a name="line.67"></a>
-<span class="sourceLineNo">068</span>  protected Configuration conf = null;<a 
name="line.68"></a>
+<span class="sourceLineNo">068</span>  protected Configuration conf;<a 
name="line.68"></a>
 <span class="sourceLineNo">069</span>  protected Path backupRootPath;<a 
name="line.69"></a>
 <span class="sourceLineNo">070</span>  protected String backupId;<a 
name="line.70"></a>
 <span class="sourceLineNo">071</span>  protected FileSystem fs;<a 
name="line.71"></a>
@@ -97,433 +97,426 @@
 <span class="sourceLineNo">089</span>   * @throws IOException exception<a 
name="line.89"></a>
 <span class="sourceLineNo">090</span>   */<a name="line.90"></a>
 <span class="sourceLineNo">091</span>  Path getTableArchivePath(TableName 
tableName) throws IOException {<a name="line.91"></a>
-<span class="sourceLineNo">092</span><a name="line.92"></a>
-<span class="sourceLineNo">093</span>    Path baseDir =<a name="line.93"></a>
-<span class="sourceLineNo">094</span>        new 
Path(HBackupFileSystem.getTableBackupPath(tableName, backupRootPath, 
backupId),<a name="line.94"></a>
-<span class="sourceLineNo">095</span>            
HConstants.HFILE_ARCHIVE_DIRECTORY);<a name="line.95"></a>
-<span class="sourceLineNo">096</span>    Path dataDir = new Path(baseDir, 
HConstants.BASE_NAMESPACE_DIR);<a name="line.96"></a>
-<span class="sourceLineNo">097</span>    Path archivePath = new Path(dataDir, 
tableName.getNamespaceAsString());<a name="line.97"></a>
-<span class="sourceLineNo">098</span>    Path tableArchivePath = new 
Path(archivePath, tableName.getQualifierAsString());<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    if (!fs.exists(tableArchivePath) || 
!fs.getFileStatus(tableArchivePath).isDirectory()) {<a name="line.99"></a>
-<span class="sourceLineNo">100</span>      LOG.debug("Folder tableArchivePath: 
" + tableArchivePath.toString() + " does not exists");<a name="line.100"></a>
-<span class="sourceLineNo">101</span>      tableArchivePath = null; // empty 
table has no archive<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    }<a name="line.102"></a>
-<span class="sourceLineNo">103</span>    return tableArchivePath;<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>   * Gets region list<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>   * @param tableName table name<a 
name="line.108"></a>
-<span class="sourceLineNo">109</span>   * @return RegionList region list<a 
name="line.109"></a>
-<span class="sourceLineNo">110</span>   * @throws FileNotFoundException 
exception<a name="line.110"></a>
-<span class="sourceLineNo">111</span>   * @throws IOException exception<a 
name="line.111"></a>
-<span class="sourceLineNo">112</span>   */<a name="line.112"></a>
-<span class="sourceLineNo">113</span>  ArrayList&lt;Path&gt; 
getRegionList(TableName tableName) throws FileNotFoundException, IOException 
{<a name="line.113"></a>
-<span class="sourceLineNo">114</span>    Path tableArchivePath = 
getTableArchivePath(tableName);<a name="line.114"></a>
-<span class="sourceLineNo">115</span>    ArrayList&lt;Path&gt; regionDirList = 
new ArrayList&lt;Path&gt;();<a name="line.115"></a>
-<span class="sourceLineNo">116</span>    FileStatus[] children = 
fs.listStatus(tableArchivePath);<a name="line.116"></a>
-<span class="sourceLineNo">117</span>    for (FileStatus childStatus : 
children) {<a name="line.117"></a>
-<span class="sourceLineNo">118</span>      // here child refer to each 
region(Name)<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      Path child = 
childStatus.getPath();<a name="line.119"></a>
-<span class="sourceLineNo">120</span>      regionDirList.add(child);<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>    }<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    return regionDirList;<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>  void modifyTableSync(Connection conn, 
TableDescriptor desc) throws IOException {<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span>    try (Admin admin = conn.getAdmin()) 
{<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      admin.modifyTable(desc);<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>      int attempt = 0;<a 
name="line.130"></a>
-<span class="sourceLineNo">131</span>      int maxAttempts = 600;<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>      while 
(!admin.isTableAvailable(desc.getTableName())) {<a name="line.132"></a>
-<span class="sourceLineNo">133</span>        Thread.sleep(100);<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>        attempt++;<a name="line.134"></a>
-<span class="sourceLineNo">135</span>        if (attempt++ &gt; maxAttempts) 
{<a name="line.135"></a>
-<span class="sourceLineNo">136</span>          throw new IOException("Timeout 
expired " + (maxAttempts * 100) + "ms");<a name="line.136"></a>
-<span class="sourceLineNo">137</span>        }<a name="line.137"></a>
-<span class="sourceLineNo">138</span>      }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>    } catch (Exception e) {<a 
name="line.139"></a>
-<span class="sourceLineNo">140</span>      throw new IOException(e);<a 
name="line.140"></a>
-<span class="sourceLineNo">141</span>    }<a name="line.141"></a>
-<span class="sourceLineNo">142</span>  }<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span>  /**<a name="line.144"></a>
-<span class="sourceLineNo">145</span>   * During incremental backup operation. 
Call WalPlayer to replay WAL in backup image Currently<a name="line.145"></a>
-<span class="sourceLineNo">146</span>   * tableNames and newTablesNames only 
contain single table, will be expanded to multiple tables in<a 
name="line.146"></a>
-<span class="sourceLineNo">147</span>   * the future<a name="line.147"></a>
-<span class="sourceLineNo">148</span>   * @param conn HBase connection<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span>   * @param tableBackupPath backup path<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>   * @param logDirs : incremental backup 
folders, which contains WAL<a name="line.150"></a>
-<span class="sourceLineNo">151</span>   * @param tableNames : source 
tableNames(table names were backuped)<a name="line.151"></a>
-<span class="sourceLineNo">152</span>   * @param newTableNames : target 
tableNames(table names to be restored to)<a name="line.152"></a>
-<span class="sourceLineNo">153</span>   * @param incrBackupId incremental 
backup Id<a name="line.153"></a>
-<span class="sourceLineNo">154</span>   * @throws IOException exception<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span>   */<a name="line.155"></a>
-<span class="sourceLineNo">156</span>  public void 
incrementalRestoreTable(Connection conn, Path tableBackupPath, Path[] 
logDirs,<a name="line.156"></a>
-<span class="sourceLineNo">157</span>      TableName[] tableNames, TableName[] 
newTableNames, String incrBackupId) throws IOException {<a name="line.157"></a>
-<span class="sourceLineNo">158</span><a name="line.158"></a>
-<span class="sourceLineNo">159</span>    try (Admin admin = conn.getAdmin()) 
{<a name="line.159"></a>
-<span class="sourceLineNo">160</span>      if (tableNames.length != 
newTableNames.length) {<a name="line.160"></a>
-<span class="sourceLineNo">161</span>        throw new IOException("Number of 
source tables and target tables does not match!");<a name="line.161"></a>
-<span class="sourceLineNo">162</span>      }<a name="line.162"></a>
-<span class="sourceLineNo">163</span>      FileSystem fileSys = 
tableBackupPath.getFileSystem(this.conf);<a name="line.163"></a>
-<span class="sourceLineNo">164</span><a name="line.164"></a>
-<span class="sourceLineNo">165</span>      // for incremental backup image, 
expect the table already created either by user or previous<a 
name="line.165"></a>
-<span class="sourceLineNo">166</span>      // full backup. Here, check that 
all new tables exists<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      for (TableName tableName : 
newTableNames) {<a name="line.167"></a>
-<span class="sourceLineNo">168</span>        if 
(!admin.tableExists(tableName)) {<a name="line.168"></a>
-<span class="sourceLineNo">169</span>          throw new IOException("HBase 
table " + tableName<a name="line.169"></a>
-<span class="sourceLineNo">170</span>              + " does not exist. Create 
the table first, e.g. by restoring a full backup.");<a name="line.170"></a>
-<span class="sourceLineNo">171</span>        }<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      }<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      // adjust table schema<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>      for (int i = 0; i &lt; 
tableNames.length; i++) {<a name="line.174"></a>
-<span class="sourceLineNo">175</span>        TableName tableName = 
tableNames[i];<a name="line.175"></a>
-<span class="sourceLineNo">176</span>        TableDescriptor tableDescriptor = 
getTableDescriptor(fileSys, tableName, incrBackupId);<a name="line.176"></a>
-<span class="sourceLineNo">177</span>        LOG.debug("Found descriptor " + 
tableDescriptor + " through " + incrBackupId);<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span>        TableName newTableName = 
newTableNames[i];<a name="line.179"></a>
-<span class="sourceLineNo">180</span>        TableDescriptor 
newTableDescriptor = admin.getDescriptor(newTableName);<a name="line.180"></a>
-<span class="sourceLineNo">181</span>        
List&lt;ColumnFamilyDescriptor&gt; families = 
Arrays.asList(tableDescriptor.getColumnFamilies());<a name="line.181"></a>
-<span class="sourceLineNo">182</span>        
List&lt;ColumnFamilyDescriptor&gt; existingFamilies =<a name="line.182"></a>
-<span class="sourceLineNo">183</span>            
Arrays.asList(newTableDescriptor.getColumnFamilies());<a name="line.183"></a>
-<span class="sourceLineNo">184</span>        TableDescriptorBuilder builder = 
TableDescriptorBuilder.newBuilder(newTableDescriptor);<a name="line.184"></a>
-<span class="sourceLineNo">185</span>        boolean schemaChangeNeeded = 
false;<a name="line.185"></a>
-<span class="sourceLineNo">186</span>        for (ColumnFamilyDescriptor 
family : families) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>          if 
(!existingFamilies.contains(family)) {<a name="line.187"></a>
-<span class="sourceLineNo">188</span>            
builder.addColumnFamily(family);<a name="line.188"></a>
-<span class="sourceLineNo">189</span>            schemaChangeNeeded = true;<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>          }<a name="line.190"></a>
-<span class="sourceLineNo">191</span>        }<a name="line.191"></a>
-<span class="sourceLineNo">192</span>        for (ColumnFamilyDescriptor 
family : existingFamilies) {<a name="line.192"></a>
-<span class="sourceLineNo">193</span>          if (!families.contains(family)) 
{<a name="line.193"></a>
-<span class="sourceLineNo">194</span>            
builder.removeColumnFamily(family.getName());<a name="line.194"></a>
-<span class="sourceLineNo">195</span>            schemaChangeNeeded = true;<a 
name="line.195"></a>
-<span class="sourceLineNo">196</span>          }<a name="line.196"></a>
-<span class="sourceLineNo">197</span>        }<a name="line.197"></a>
-<span class="sourceLineNo">198</span>        if (schemaChangeNeeded) {<a 
name="line.198"></a>
-<span class="sourceLineNo">199</span>          modifyTableSync(conn, 
builder.build());<a name="line.199"></a>
-<span class="sourceLineNo">200</span>          LOG.info("Changed " + 
newTableDescriptor.getTableName() + " to: " + newTableDescriptor);<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>      RestoreJob restoreService = 
BackupRestoreFactory.getRestoreJob(conf);<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span>      restoreService.run(logDirs, 
tableNames, newTableNames, false);<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>  public void fullRestoreTable(Connection 
conn, Path tableBackupPath, TableName tableName,<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      TableName newTableName, boolean 
truncateIfExists, String lastIncrBackupId)<a name="line.210"></a>
-<span class="sourceLineNo">211</span>          throws IOException {<a 
name="line.211"></a>
-<span class="sourceLineNo">212</span>    createAndRestoreTable(conn, 
tableName, newTableName, tableBackupPath, truncateIfExists,<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span>      lastIncrBackupId);<a 
name="line.213"></a>
-<span class="sourceLineNo">214</span>  }<a name="line.214"></a>
-<span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span>  /**<a name="line.216"></a>
-<span class="sourceLineNo">217</span>   * Returns value represent path for 
path to backup table snapshot directory:<a name="line.217"></a>
-<span class="sourceLineNo">218</span>   * 
"/$USER/SBACKUP_ROOT/backup_id/namespace/table/.hbase-snapshot"<a 
name="line.218"></a>
-<span class="sourceLineNo">219</span>   * @param backupRootPath backup root 
path<a name="line.219"></a>
-<span class="sourceLineNo">220</span>   * @param tableName table name<a 
name="line.220"></a>
-<span class="sourceLineNo">221</span>   * @param backupId backup Id<a 
name="line.221"></a>
-<span class="sourceLineNo">222</span>   * @return path for snapshot<a 
name="line.222"></a>
-<span class="sourceLineNo">223</span>   */<a name="line.223"></a>
-<span class="sourceLineNo">224</span>  Path getTableSnapshotPath(Path 
backupRootPath, TableName tableName, String backupId) {<a name="line.224"></a>
-<span class="sourceLineNo">225</span>    return new 
Path(HBackupFileSystem.getTableBackupPath(tableName, backupRootPath, 
backupId),<a name="line.225"></a>
-<span class="sourceLineNo">226</span>        HConstants.SNAPSHOT_DIR_NAME);<a 
name="line.226"></a>
-<span class="sourceLineNo">227</span>  }<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>   * Returns value represent path for:<a 
name="line.230"></a>
-<span class="sourceLineNo">231</span>   * 
""/$USER/SBACKUP_ROOT/backup_id/namespace/table/.hbase-snapshot/snapshot_1396650097621_namespace_table"<a
 name="line.231"></a>
-<span class="sourceLineNo">232</span>   * this path contains .snapshotinfo, 
.tabledesc (0.96 and 0.98) this path contains .snapshotinfo,<a 
name="line.232"></a>
-<span class="sourceLineNo">233</span>   * .data.manifest (trunk)<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>   * @param tableName table name<a 
name="line.234"></a>
-<span class="sourceLineNo">235</span>   * @return path to table info<a 
name="line.235"></a>
-<span class="sourceLineNo">236</span>   * @throws FileNotFoundException 
exception<a name="line.236"></a>
-<span class="sourceLineNo">237</span>   * @throws IOException exception<a 
name="line.237"></a>
-<span class="sourceLineNo">238</span>   */<a name="line.238"></a>
-<span class="sourceLineNo">239</span>  Path getTableInfoPath(TableName 
tableName) throws FileNotFoundException, IOException {<a name="line.239"></a>
-<span class="sourceLineNo">240</span>    Path tableSnapShotPath = 
getTableSnapshotPath(backupRootPath, tableName, backupId);<a 
name="line.240"></a>
-<span class="sourceLineNo">241</span>    Path tableInfoPath = null;<a 
name="line.241"></a>
-<span class="sourceLineNo">242</span><a name="line.242"></a>
-<span class="sourceLineNo">243</span>    // can't build the path directly as 
the timestamp values are different<a name="line.243"></a>
-<span class="sourceLineNo">244</span>    FileStatus[] snapshots = 
fs.listStatus(tableSnapShotPath);<a name="line.244"></a>
-<span class="sourceLineNo">245</span>    for (FileStatus snapshot : snapshots) 
{<a name="line.245"></a>
-<span class="sourceLineNo">246</span>      tableInfoPath = 
snapshot.getPath();<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      // 
SnapshotManifest.DATA_MANIFEST_NAME = "data.manifest";<a name="line.247"></a>
-<span class="sourceLineNo">248</span>      if 
(tableInfoPath.getName().endsWith("data.manifest")) {<a name="line.248"></a>
-<span class="sourceLineNo">249</span>        break;<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>    return tableInfoPath;<a 
name="line.252"></a>
-<span class="sourceLineNo">253</span>  }<a name="line.253"></a>
-<span class="sourceLineNo">254</span><a name="line.254"></a>
-<span class="sourceLineNo">255</span>  /**<a name="line.255"></a>
-<span class="sourceLineNo">256</span>   * Get table descriptor<a 
name="line.256"></a>
-<span class="sourceLineNo">257</span>   * @param tableName is the table backed 
up<a name="line.257"></a>
-<span class="sourceLineNo">258</span>   * @return {@link TableDescriptor} 
saved in backup image of the table<a name="line.258"></a>
-<span class="sourceLineNo">259</span>   */<a name="line.259"></a>
-<span class="sourceLineNo">260</span>  TableDescriptor getTableDesc(TableName 
tableName) throws FileNotFoundException, IOException {<a name="line.260"></a>
-<span class="sourceLineNo">261</span>    Path tableInfoPath = 
this.getTableInfoPath(tableName);<a name="line.261"></a>
-<span class="sourceLineNo">262</span>    SnapshotDescription desc = 
SnapshotDescriptionUtils.readSnapshotInfo(fs, tableInfoPath);<a 
name="line.262"></a>
-<span class="sourceLineNo">263</span>    SnapshotManifest manifest = 
SnapshotManifest.open(conf, fs, tableInfoPath, desc);<a name="line.263"></a>
-<span class="sourceLineNo">264</span>    TableDescriptor tableDescriptor = 
manifest.getTableDescriptor();<a name="line.264"></a>
-<span class="sourceLineNo">265</span>    if 
(!tableDescriptor.getTableName().equals(tableName)) {<a name="line.265"></a>
-<span class="sourceLineNo">266</span>      LOG.error("couldn't find Table Desc 
for table: " + tableName + " under tableInfoPath: "<a name="line.266"></a>
-<span class="sourceLineNo">267</span>          + tableInfoPath.toString());<a 
name="line.267"></a>
-<span class="sourceLineNo">268</span>      
LOG.error("tableDescriptor.getNameAsString() = " + 
tableDescriptor.getTableName().getNameAsString());<a name="line.268"></a>
-<span class="sourceLineNo">269</span>      throw new 
FileNotFoundException("couldn't find Table Desc for table: " + tableName<a 
name="line.269"></a>
-<span class="sourceLineNo">270</span>          + " under tableInfoPath: " + 
tableInfoPath.toString());<a name="line.270"></a>
-<span class="sourceLineNo">271</span>    }<a name="line.271"></a>
-<span class="sourceLineNo">272</span>    return tableDescriptor;<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>  private TableDescriptor 
getTableDescriptor(FileSystem fileSys, TableName tableName,<a 
name="line.275"></a>
-<span class="sourceLineNo">276</span>      String lastIncrBackupId) throws 
IOException {<a name="line.276"></a>
-<span class="sourceLineNo">277</span>    if (lastIncrBackupId != null) {<a 
name="line.277"></a>
-<span class="sourceLineNo">278</span>      String target =<a 
name="line.278"></a>
-<span class="sourceLineNo">279</span>          
BackupUtils.getTableBackupDir(backupRootPath.toString(),<a name="line.279"></a>
-<span class="sourceLineNo">280</span>            lastIncrBackupId, 
tableName);<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      return 
FSTableDescriptors.getTableDescriptorFromFs(fileSys, new Path(target));<a 
name="line.281"></a>
-<span class="sourceLineNo">282</span>    }<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    return null;<a name="line.283"></a>
-<span class="sourceLineNo">284</span>  }<a name="line.284"></a>
-<span class="sourceLineNo">285</span><a name="line.285"></a>
-<span class="sourceLineNo">286</span>  private void 
createAndRestoreTable(Connection conn, TableName tableName, TableName 
newTableName,<a name="line.286"></a>
-<span class="sourceLineNo">287</span>      Path tableBackupPath, boolean 
truncateIfExists, String lastIncrBackupId) throws IOException {<a 
name="line.287"></a>
-<span class="sourceLineNo">288</span>    if (newTableName == null) {<a 
name="line.288"></a>
-<span class="sourceLineNo">289</span>      newTableName = tableName;<a 
name="line.289"></a>
-<span class="sourceLineNo">290</span>    }<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    FileSystem fileSys = 
tableBackupPath.getFileSystem(this.conf);<a name="line.291"></a>
-<span class="sourceLineNo">292</span><a name="line.292"></a>
-<span class="sourceLineNo">293</span>    // get table descriptor first<a 
name="line.293"></a>
-<span class="sourceLineNo">294</span>    TableDescriptor tableDescriptor = 
getTableDescriptor(fileSys, tableName, lastIncrBackupId);<a name="line.294"></a>
-<span class="sourceLineNo">295</span>    if (tableDescriptor != null) {<a 
name="line.295"></a>
-<span class="sourceLineNo">296</span>      LOG.debug("Retrieved descriptor: " 
+ tableDescriptor + " thru " + lastIncrBackupId);<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    }<a name="line.297"></a>
-<span class="sourceLineNo">298</span><a name="line.298"></a>
-<span class="sourceLineNo">299</span>    if (tableDescriptor == null) {<a 
name="line.299"></a>
-<span class="sourceLineNo">300</span>      Path tableSnapshotPath = 
getTableSnapshotPath(backupRootPath, tableName, backupId);<a 
name="line.300"></a>
-<span class="sourceLineNo">301</span>      if 
(fileSys.exists(tableSnapshotPath)) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>        // snapshot path exist means the 
backup path is in HDFS<a name="line.302"></a>
-<span class="sourceLineNo">303</span>        // check whether snapshot dir 
already recorded for target table<a name="line.303"></a>
-<span class="sourceLineNo">304</span>        if (snapshotMap.get(tableName) != 
null) {<a name="line.304"></a>
-<span class="sourceLineNo">305</span>          SnapshotDescription desc =<a 
name="line.305"></a>
-<span class="sourceLineNo">306</span>              
SnapshotDescriptionUtils.readSnapshotInfo(fileSys, tableSnapshotPath);<a 
name="line.306"></a>
-<span class="sourceLineNo">307</span>          SnapshotManifest manifest = 
SnapshotManifest.open(conf, fileSys, tableSnapshotPath, desc);<a 
name="line.307"></a>
-<span class="sourceLineNo">308</span>          tableDescriptor = 
manifest.getTableDescriptor();<a name="line.308"></a>
-<span class="sourceLineNo">309</span>        } else {<a name="line.309"></a>
-<span class="sourceLineNo">310</span>          tableDescriptor = 
getTableDesc(tableName);<a name="line.310"></a>
-<span class="sourceLineNo">311</span>          snapshotMap.put(tableName, 
getTableInfoPath(tableName));<a name="line.311"></a>
-<span class="sourceLineNo">312</span>        }<a name="line.312"></a>
-<span class="sourceLineNo">313</span>        if (tableDescriptor == null) {<a 
name="line.313"></a>
-<span class="sourceLineNo">314</span>          LOG.debug("Found no table 
descriptor in the snapshot dir, previous schema would be lost");<a 
name="line.314"></a>
-<span class="sourceLineNo">315</span>        }<a name="line.315"></a>
-<span class="sourceLineNo">316</span>      } else {<a name="line.316"></a>
-<span class="sourceLineNo">317</span>        throw new IOException("Table 
snapshot directory: " +<a name="line.317"></a>
-<span class="sourceLineNo">318</span>            tableSnapshotPath + " does 
not exist.");<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">322</span>    Path tableArchivePath = 
getTableArchivePath(tableName);<a name="line.322"></a>
-<span class="sourceLineNo">323</span>    if (tableArchivePath == null) {<a 
name="line.323"></a>
-<span class="sourceLineNo">324</span>      if (tableDescriptor != null) {<a 
name="line.324"></a>
-<span class="sourceLineNo">325</span>        // find table descriptor but no 
archive dir means the table is empty, create table and exit<a 
name="line.325"></a>
-<span class="sourceLineNo">326</span>        if (LOG.isDebugEnabled()) {<a 
name="line.326"></a>
-<span class="sourceLineNo">327</span>          LOG.debug("find table 
descriptor but no archive dir for table " + tableName<a name="line.327"></a>
-<span class="sourceLineNo">328</span>              + ", will only create 
table");<a name="line.328"></a>
-<span class="sourceLineNo">329</span>        }<a name="line.329"></a>
-<span class="sourceLineNo">330</span>        tableDescriptor = 
TableDescriptorBuilder.copy(newTableName, tableDescriptor);<a 
name="line.330"></a>
-<span class="sourceLineNo">331</span>        checkAndCreateTable(conn, 
tableBackupPath, tableName, newTableName, null, tableDescriptor,<a 
name="line.331"></a>
-<span class="sourceLineNo">332</span>          truncateIfExists);<a 
name="line.332"></a>
-<span class="sourceLineNo">333</span>        return;<a name="line.333"></a>
-<span class="sourceLineNo">334</span>      } else {<a name="line.334"></a>
-<span class="sourceLineNo">335</span>        throw new 
IllegalStateException("Cannot restore hbase table because directory '"<a 
name="line.335"></a>
-<span class="sourceLineNo">336</span>            + " tableArchivePath is 
null.");<a name="line.336"></a>
-<span class="sourceLineNo">337</span>      }<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    }<a name="line.338"></a>
-<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span>    if (tableDescriptor == null) {<a 
name="line.340"></a>
-<span class="sourceLineNo">341</span>      tableDescriptor = 
TableDescriptorBuilder.newBuilder(newTableName).build();<a name="line.341"></a>
-<span class="sourceLineNo">342</span>    } else {<a name="line.342"></a>
-<span class="sourceLineNo">343</span>      tableDescriptor = 
TableDescriptorBuilder.copy(newTableName, tableDescriptor);<a 
name="line.343"></a>
-<span class="sourceLineNo">344</span>    }<a name="line.344"></a>
-<span class="sourceLineNo">345</span><a name="line.345"></a>
-<span class="sourceLineNo">346</span>    // record all region dirs:<a 
name="line.346"></a>
-<span class="sourceLineNo">347</span>    // load all files in dir<a 
name="line.347"></a>
-<span class="sourceLineNo">348</span>    try {<a name="line.348"></a>
-<span class="sourceLineNo">349</span>      ArrayList&lt;Path&gt; 
regionPathList = getRegionList(tableName);<a name="line.349"></a>
-<span class="sourceLineNo">350</span><a name="line.350"></a>
-<span class="sourceLineNo">351</span>      // should only try to create the 
table with all region informations, so we could pre-split<a name="line.351"></a>
-<span class="sourceLineNo">352</span>      // the regions in fine grain<a 
name="line.352"></a>
-<span class="sourceLineNo">353</span>      checkAndCreateTable(conn, 
tableBackupPath, tableName, newTableName, regionPathList,<a name="line.353"></a>
-<span class="sourceLineNo">354</span>        tableDescriptor, 
truncateIfExists);<a name="line.354"></a>
-<span class="sourceLineNo">355</span>      RestoreJob restoreService = 
BackupRestoreFactory.getRestoreJob(conf);<a name="line.355"></a>
-<span class="sourceLineNo">356</span>      Path[] paths = new 
Path[regionPathList.size()];<a name="line.356"></a>
-<span class="sourceLineNo">357</span>      regionPathList.toArray(paths);<a 
name="line.357"></a>
-<span class="sourceLineNo">358</span>      restoreService.run(paths, new 
TableName[]{tableName}, new TableName[] {newTableName}, true);<a 
name="line.358"></a>
-<span class="sourceLineNo">359</span><a name="line.359"></a>
-<span class="sourceLineNo">360</span>    } catch (Exception e) {<a 
name="line.360"></a>
-<span class="sourceLineNo">361</span>      LOG.error(e.toString(), e);<a 
name="line.361"></a>
-<span class="sourceLineNo">362</span>      throw new 
IllegalStateException("Cannot restore hbase table", e);<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><a name="line.365"></a>
-<span class="sourceLineNo">366</span>  /**<a name="line.366"></a>
-<span class="sourceLineNo">367</span>   * Gets region list<a 
name="line.367"></a>
-<span class="sourceLineNo">368</span>   * @param tableArchivePath table 
archive path<a name="line.368"></a>
-<span class="sourceLineNo">369</span>   * @return RegionList region list<a 
name="line.369"></a>
-<span class="sourceLineNo">370</span>   * @throws FileNotFoundException 
exception<a name="line.370"></a>
-<span class="sourceLineNo">371</span>   * @throws IOException exception<a 
name="line.371"></a>
-<span class="sourceLineNo">372</span>   */<a name="line.372"></a>
-<span class="sourceLineNo">373</span>  ArrayList&lt;Path&gt; 
getRegionList(Path tableArchivePath) throws FileNotFoundException, IOException 
{<a name="line.373"></a>
-<span class="sourceLineNo">374</span>    ArrayList&lt;Path&gt; regionDirList = 
new ArrayList&lt;Path&gt;();<a name="line.374"></a>
-<span class="sourceLineNo">375</span>    FileStatus[] children = 
fs.listStatus(tableArchivePath);<a name="line.375"></a>
-<span class="sourceLineNo">376</span>    for (FileStatus childStatus : 
children) {<a name="line.376"></a>
-<span class="sourceLineNo">377</span>      // here child refer to each 
region(Name)<a name="line.377"></a>
-<span class="sourceLineNo">378</span>      Path child = 
childStatus.getPath();<a name="line.378"></a>
-<span class="sourceLineNo">379</span>      regionDirList.add(child);<a 
name="line.379"></a>
-<span class="sourceLineNo">380</span>    }<a name="line.380"></a>
-<span class="sourceLineNo">381</span>    return regionDirList;<a 
name="line.381"></a>
-<span class="sourceLineNo">382</span>  }<a name="line.382"></a>
-<span class="sourceLineNo">383</span><a name="line.383"></a>
-<span class="sourceLineNo">384</span>  /**<a name="line.384"></a>
-<span class="sourceLineNo">385</span>   * Calculate region boundaries and add 
all the column families to the table descriptor<a name="line.385"></a>
-<span class="sourceLineNo">386</span>   * @param regionDirList region dir 
list<a name="line.386"></a>
-<span class="sourceLineNo">387</span>   * @return a set of keys to store the 
boundaries<a name="line.387"></a>
-<span class="sourceLineNo">388</span>   */<a name="line.388"></a>
-<span class="sourceLineNo">389</span>  byte[][] 
generateBoundaryKeys(ArrayList&lt;Path&gt; regionDirList) throws 
FileNotFoundException,<a name="line.389"></a>
-<span class="sourceLineNo">390</span>      IOException {<a name="line.390"></a>
-<span class="sourceLineNo">391</span>    TreeMap&lt;byte[], Integer&gt; map = 
new TreeMap&lt;byte[], Integer&gt;(Bytes.BYTES_COMPARATOR);<a 
name="line.391"></a>
-<span class="sourceLineNo">392</span>    // Build a set of keys to store the 
boundaries<a name="line.392"></a>
-<span class="sourceLineNo">393</span>    // calculate region boundaries and 
add all the column families to the table descriptor<a name="line.393"></a>
-<span class="sourceLineNo">394</span>    for (Path regionDir : regionDirList) 
{<a name="line.394"></a>
-<span class="sourceLineNo">395</span>      LOG.debug("Parsing region dir: " + 
regionDir);<a name="line.395"></a>
-<span class="sourceLineNo">396</span>      Path hfofDir = regionDir;<a 
name="line.396"></a>
-<span class="sourceLineNo">397</span><a name="line.397"></a>
-<span class="sourceLineNo">398</span>      if (!fs.exists(hfofDir)) {<a 
name="line.398"></a>
-<span class="sourceLineNo">399</span>        LOG.warn("HFileOutputFormat dir " 
+ hfofDir + " not found");<a name="line.399"></a>
-<span class="sourceLineNo">400</span>      }<a name="line.400"></a>
-<span class="sourceLineNo">401</span><a name="line.401"></a>
-<span class="sourceLineNo">402</span>      FileStatus[] familyDirStatuses = 
fs.listStatus(hfofDir);<a name="line.402"></a>
-<span class="sourceLineNo">403</span>      if (familyDirStatuses == null) {<a 
name="line.403"></a>
-<span class="sourceLineNo">404</span>        throw new IOException("No 
families found in " + hfofDir);<a name="line.404"></a>
-<span class="sourceLineNo">405</span>      }<a name="line.405"></a>
-<span class="sourceLineNo">406</span><a name="line.406"></a>
-<span class="sourceLineNo">407</span>      for (FileStatus stat : 
familyDirStatuses) {<a name="line.407"></a>
-<span class="sourceLineNo">408</span>        if (!stat.isDirectory()) {<a 
name="line.408"></a>
-<span class="sourceLineNo">409</span>          LOG.warn("Skipping 
non-directory " + stat.getPath());<a name="line.409"></a>
-<span class="sourceLineNo">410</span>          continue;<a name="line.410"></a>
-<span class="sourceLineNo">411</span>        }<a name="line.411"></a>
-<span class="sourceLineNo">412</span>        boolean isIgnore = false;<a 
name="line.412"></a>
-<span class="sourceLineNo">413</span>        String pathName = 
stat.getPath().getName();<a name="line.413"></a>
-<span class="sourceLineNo">414</span>        for (String ignore : ignoreDirs) 
{<a name="line.414"></a>
-<span class="sourceLineNo">415</span>          if (pathName.contains(ignore)) 
{<a name="line.415"></a>
-<span class="sourceLineNo">416</span>            LOG.warn("Skipping non-family 
directory" + pathName);<a name="line.416"></a>
-<span class="sourceLineNo">417</span>            isIgnore = true;<a 
name="line.417"></a>
-<span class="sourceLineNo">418</span>            break;<a name="line.418"></a>
-<span class="sourceLineNo">419</span>          }<a name="line.419"></a>
-<span class="sourceLineNo">420</span>        }<a name="line.420"></a>
-<span class="sourceLineNo">421</span>        if (isIgnore) {<a 
name="line.421"></a>
+<span class="sourceLineNo">092</span>    Path baseDir =<a name="line.92"></a>
+<span class="sourceLineNo">093</span>        new 
Path(HBackupFileSystem.getTableBackupPath(tableName, backupRootPath, 
backupId),<a name="line.93"></a>
+<span class="sourceLineNo">094</span>            
HConstants.HFILE_ARCHIVE_DIRECTORY);<a name="line.94"></a>
+<span class="sourceLineNo">095</span>    Path dataDir = new Path(baseDir, 
HConstants.BASE_NAMESPACE_DIR);<a name="line.95"></a>
+<span class="sourceLineNo">096</span>    Path archivePath = new Path(dataDir, 
tableName.getNamespaceAsString());<a name="line.96"></a>
+<span class="sourceLineNo">097</span>    Path tableArchivePath = new 
Path(archivePath, tableName.getQualifierAsString());<a name="line.97"></a>
+<span class="sourceLineNo">098</span>    if (!fs.exists(tableArchivePath) || 
!fs.getFileStatus(tableArchivePath).isDirectory()) {<a name="line.98"></a>
+<span class="sourceLineNo">099</span>      LOG.debug("Folder tableArchivePath: 
" + tableArchivePath.toString() + " does not exists");<a name="line.99"></a>
+<span class="sourceLineNo">100</span>      tableArchivePath = null; // empty 
table has no archive<a name="line.100"></a>
+<span class="sourceLineNo">101</span>    }<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    return tableArchivePath;<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>   * Gets region list<a 
name="line.106"></a>
+<span class="sourceLineNo">107</span>   * @param tableName table name<a 
name="line.107"></a>
+<span class="sourceLineNo">108</span>   * @return RegionList region list<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>   * @throws IOException exception<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>   */<a name="line.110"></a>
+<span class="sourceLineNo">111</span>  ArrayList&lt;Path&gt; 
getRegionList(TableName tableName) throws IOException {<a name="line.111"></a>
+<span class="sourceLineNo">112</span>    Path tableArchivePath = 
getTableArchivePath(tableName);<a name="line.112"></a>
+<span class="sourceLineNo">113</span>    ArrayList&lt;Path&gt; regionDirList = 
new ArrayList&lt;&gt;();<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    FileStatus[] children = 
fs.listStatus(tableArchivePath);<a name="line.114"></a>
+<span class="sourceLineNo">115</span>    for (FileStatus childStatus : 
children) {<a name="line.115"></a>
+<span class="sourceLineNo">116</span>      // here child refer to each 
region(Name)<a name="line.116"></a>
+<span class="sourceLineNo">117</span>      Path child = 
childStatus.getPath();<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      regionDirList.add(child);<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>    }<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    return regionDirList;<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>  void modifyTableSync(Connection conn, 
TableDescriptor desc) throws IOException {<a name="line.123"></a>
+<span class="sourceLineNo">124</span>    try (Admin admin = conn.getAdmin()) 
{<a name="line.124"></a>
+<span class="sourceLineNo">125</span>      admin.modifyTable(desc);<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>      int attempt = 0;<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>      int maxAttempts = 600;<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>      while 
(!admin.isTableAvailable(desc.getTableName())) {<a name="line.128"></a>
+<span class="sourceLineNo">129</span>        Thread.sleep(100);<a 
name="line.129"></a>
+<span class="sourceLineNo">130</span>        attempt++;<a name="line.130"></a>
+<span class="sourceLineNo">131</span>        if (attempt++ &gt; maxAttempts) 
{<a name="line.131"></a>
+<span class="sourceLineNo">132</span>          throw new IOException("Timeout 
expired " + (maxAttempts * 100) + "ms");<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>    } catch (Exception e) {<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>      throw new IOException(e);<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>    }<a name="line.137"></a>
+<span class="sourceLineNo">138</span>  }<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span>  /**<a name="line.140"></a>
+<span class="sourceLineNo">141</span>   * During incremental backup operation. 
Call WalPlayer to replay WAL in backup image Currently<a name="line.141"></a>
+<span class="sourceLineNo">142</span>   * tableNames and newTablesNames only 
contain single table, will be expanded to multiple tables in<a 
name="line.142"></a>
+<span class="sourceLineNo">143</span>   * the future<a name="line.143"></a>
+<span class="sourceLineNo">144</span>   * @param conn HBase connection<a 
name="line.144"></a>
+<span class="sourceLineNo">145</span>   * @param tableBackupPath backup path<a 
name="line.145"></a>
+<span class="sourceLineNo">146</span>   * @param logDirs : incremental backup 
folders, which contains WAL<a name="line.146"></a>
+<span class="sourceLineNo">147</span>   * @param tableNames : source 
tableNames(table names were backuped)<a name="line.147"></a>
+<span class="sourceLineNo">148</span>   * @param newTableNames : target 
tableNames(table names to be restored to)<a name="line.148"></a>
+<span class="sourceLineNo">149</span>   * @param incrBackupId incremental 
backup Id<a name="line.149"></a>
+<span class="sourceLineNo">150</span>   * @throws IOException exception<a 
name="line.150"></a>
+<span class="sourceLineNo">151</span>   */<a name="line.151"></a>
+<span class="sourceLineNo">152</span>  public void 
incrementalRestoreTable(Connection conn, Path tableBackupPath, Path[] 
logDirs,<a name="line.152"></a>
+<span class="sourceLineNo">153</span>      TableName[] tableNames, TableName[] 
newTableNames, String incrBackupId) throws IOException {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>    try (Admin admin = conn.getAdmin()) 
{<a name="line.154"></a>
+<span class="sourceLineNo">155</span>      if (tableNames.length != 
newTableNames.length) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span>        throw new IOException("Number of 
source tables and target tables does not match!");<a name="line.156"></a>
+<span class="sourceLineNo">157</span>      }<a name="line.157"></a>
+<span class="sourceLineNo">158</span>      FileSystem fileSys = 
tableBackupPath.getFileSystem(this.conf);<a name="line.158"></a>
+<span class="sourceLineNo">159</span><a name="line.159"></a>
+<span class="sourceLineNo">160</span>      // for incremental backup image, 
expect the table already created either by user or previous<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>      // full backup. Here, check that 
all new tables exists<a name="line.161"></a>
+<span class="sourceLineNo">162</span>      for (TableName tableName : 
newTableNames) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span>        if 
(!admin.tableExists(tableName)) {<a name="line.163"></a>
+<span class="sourceLineNo">164</span>          throw new IOException("HBase 
table " + tableName<a name="line.164"></a>
+<span class="sourceLineNo">165</span>              + " does not exist. Create 
the table first, e.g. by restoring a full backup.");<a name="line.165"></a>
+<span class="sourceLineNo">166</span>        }<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      }<a name="line.167"></a>
+<span class="sourceLineNo">168</span>      // adjust table schema<a 
name="line.168"></a>
+<span class="sourceLineNo">169</span>      for (int i = 0; i &lt; 
tableNames.length; i++) {<a name="line.169"></a>
+<span class="sourceLineNo">170</span>        TableName tableName = 
tableNames[i];<a name="line.170"></a>
+<span class="sourceLineNo">171</span>        TableDescriptor tableDescriptor = 
getTableDescriptor(fileSys, tableName, incrBackupId);<a name="line.171"></a>
+<span class="sourceLineNo">172</span>        LOG.debug("Found descriptor " + 
tableDescriptor + " through " + incrBackupId);<a name="line.172"></a>
+<span class="sourceLineNo">173</span><a name="line.173"></a>
+<span class="sourceLineNo">174</span>        TableName newTableName = 
newTableNames[i];<a name="line.174"></a>
+<span class="sourceLineNo">175</span>        TableDescriptor 
newTableDescriptor = admin.getDescriptor(newTableName);<a name="line.175"></a>
+<span class="sourceLineNo">176</span>        
List&lt;ColumnFamilyDescriptor&gt; families = 
Arrays.asList(tableDescriptor.getColumnFamilies());<a name="line.176"></a>
+<span class="sourceLineNo">177</span>        
List&lt;ColumnFamilyDescriptor&gt; existingFamilies =<a name="line.177"></a>
+<span class="sourceLineNo">178</span>            
Arrays.asList(newTableDescriptor.getColumnFamilies());<a name="line.178"></a>
+<span class="sourceLineNo">179</span>        TableDescriptorBuilder builder = 
TableDescriptorBuilder.newBuilder(newTableDescriptor);<a name="line.179"></a>
+<span class="sourceLineNo">180</span>        boolean schemaChangeNeeded = 
false;<a name="line.180"></a>
+<span class="sourceLineNo">181</span>        for (ColumnFamilyDescriptor 
family : families) {<a name="line.181"></a>
+<span class="sourceLineNo">182</span>          if 
(!existingFamilies.contains(family)) {<a name="line.182"></a>
+<span class="sourceLineNo">183</span>            
builder.addColumnFamily(family);<a name="line.183"></a>
+<span class="sourceLineNo">184</span>            schemaChangeNeeded = true;<a 
name="line.184"></a>
+<span class="sourceLineNo">185</span>          }<a name="line.185"></a>
+<span class="sourceLineNo">186</span>        }<a name="line.186"></a>
+<span class="sourceLineNo">187</span>        for (ColumnFamilyDescriptor 
family : existingFamilies) {<a name="line.187"></a>
+<span class="sourceLineNo">188</span>          if (!families.contains(family)) 
{<a name="line.188"></a>
+<span class="sourceLineNo">189</span>            
builder.removeColumnFamily(family.getName());<a name="line.189"></a>
+<span class="sourceLineNo">190</span>            schemaChangeNeeded = true;<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>          }<a name="line.191"></a>
+<span class="sourceLineNo">192</span>        }<a name="line.192"></a>
+<span class="sourceLineNo">193</span>        if (schemaChangeNeeded) {<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span>          modifyTableSync(conn, 
builder.build());<a name="line.194"></a>
+<span class="sourceLineNo">195</span>          LOG.info("Changed " + 
newTableDescriptor.getTableName() + " to: " + newTableDescriptor);<a 
name="line.195"></a>
+<span class="sourceLineNo">196</span>        }<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      }<a name="line.197"></a>
+<span class="sourceLineNo">198</span>      RestoreJob restoreService = 
BackupRestoreFactory.getRestoreJob(conf);<a name="line.198"></a>
+<span class="sourceLineNo">199</span><a name="line.199"></a>
+<span class="sourceLineNo">200</span>      restoreService.run(logDirs, 
tableNames, newTableNames, false);<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>  public void fullRestoreTable(Connection 
conn, Path tableBackupPath, TableName tableName,<a name="line.204"></a>
+<span class="sourceLineNo">205</span>      TableName newTableName, boolean 
truncateIfExists, String lastIncrBackupId)<a name="line.205"></a>
+<span class="sourceLineNo">206</span>          throws IOException {<a 
name="line.206"></a>
+<span class="sourceLineNo">207</span>    createAndRestoreTable(conn, 
tableName, newTableName, tableBackupPath, truncateIfExists,<a 
name="line.207"></a>
+<span class="sourceLineNo">208</span>      lastIncrBackupId);<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>  /**<a name="line.211"></a>
+<span class="sourceLineNo">212</span>   * Returns value represent path for 
path to backup table snapshot directory:<a name="line.212"></a>
+<span class="sourceLineNo">213</span>   * 
"/$USER/SBACKUP_ROOT/backup_id/namespace/table/.hbase-snapshot"<a 
name="line.213"></a>
+<span class="sourceLineNo">214</span>   * @param backupRootPath backup root 
path<a name="line.214"></a>
+<span class="sourceLineNo">215</span>   * @param tableName table name<a 
name="line.215"></a>
+<span class="sourceLineNo">216</span>   * @param backupId backup Id<a 
name="line.216"></a>
+<span class="sourceLineNo">217</span>   * @return path for snapshot<a 
name="line.217"></a>
+<span class="sourceLineNo">218</span>   */<a name="line.218"></a>
+<span class="sourceLineNo">219</span>  Path getTableSnapshotPath(Path 
backupRootPath, TableName tableName, String backupId) {<a name="line.219"></a>
+<span class="sourceLineNo">220</span>    return new 
Path(HBackupFileSystem.getTableBackupPath(tableName, backupRootPath, 
backupId),<a name="line.220"></a>
+<span class="sourceLineNo">221</span>        HConstants.SNAPSHOT_DIR_NAME);<a 
name="line.221"></a>
+<span class="sourceLineNo">222</span>  }<a name="line.222"></a>
+<span class="sourceLineNo">223</span><a name="line.223"></a>
+<span class="sourceLineNo">224</span>  /**<a name="line.224"></a>
+<span class="sourceLineNo">225</span>   * Returns value represent path for:<a 
name="line.225"></a>
+<span class="sourceLineNo">226</span>   * 
""/$USER/SBACKUP_ROOT/backup_id/namespace/table/.hbase-snapshot/<a 
name="line.226"></a>
+<span class="sourceLineNo">227</span>   *    
snapshot_1396650097621_namespace_table"<a name="line.227"></a>
+<span class="sourceLineNo">228</span>   * this path contains .snapshotinfo, 
.tabledesc (0.96 and 0.98) this path contains .snapshotinfo,<a 
name="line.228"></a>
+<span class="sourceLineNo">229</span>   * .data.manifest (trunk)<a 
name="line.229"></a>
+<span class="sourceLineNo">230</span>   * @param tableName table name<a 
name="line.230"></a>
+<span class="sourceLineNo">231</span>   * @return path to table info<a 
name="line.231"></a>
+<span class="sourceLineNo">232</span>   * @throws IOException exception<a 
name="line.232"></a>
+<span class="sourceLineNo">233</span>   */<a name="line.233"></a>
+<span class="sourceLineNo">234</span>  Path getTableInfoPath(TableName 
tableName) throws IOException {<a name="line.234"></a>
+<span class="sourceLineNo">235</span>    Path tableSnapShotPath = 
getTableSnapshotPath(backupRootPath, tableName, backupId);<a 
name="line.235"></a>
+<span class="sourceLineNo">236</span>    Path tableInfoPath = null;<a 
name="line.236"></a>
+<span class="sourceLineNo">237</span><a name="line.237"></a>
+<span class="sourceLineNo">238</span>    // can't build the path directly as 
the timestamp values are different<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    FileStatus[] snapshots = 
fs.listStatus(tableSnapShotPath);<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    for (FileStatus snapshot : snapshots) 
{<a name="line.240"></a>
+<span class="sourceLineNo">241</span>      tableInfoPath = 
snapshot.getPath();<a name="line.241"></a>
+<span class="sourceLineNo">242</span>      // 
SnapshotManifest.DATA_MANIFEST_NAME = "data.manifest";<a name="line.242"></a>
+<span class="sourceLineNo">243</span>      if 
(tableInfoPath.getName().endsWith("data.manifest")) {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>        break;<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      }<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    }<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    return tableInfoPath;<a 
name="line.247"></a>
+<span class="sourceLineNo">248</span>  }<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span>  /**<a name="line.250"></a>
+<span class="sourceLineNo">251</span>   * Get table descriptor<a 
name="line.251"></a>
+<span class="sourceLineNo">252</span>   * @param tableName is the table backed 
up<a name="line.252"></a>
+<span class="sourceLineNo">253</span>   * @return {@link TableDescriptor} 
saved in backup image of the table<a name="line.253"></a>
+<span class="sourceLineNo">254</span>   */<a name="line.254"></a>
+<span class="sourceLineNo">255</span>  TableDescriptor getTableDesc(TableName 
tableName) throws IOException {<a name="line.255"></a>
+<span class="sourceLineNo">256</span>    Path tableInfoPath = 
this.getTableInfoPath(tableName);<a name="line.256"></a>
+<span class="sourceLineNo">257</span>    SnapshotDescription desc = 
SnapshotDescriptionUtils.readSnapshotInfo(fs, tableInfoPath);<a 
name="line.257"></a>
+<span class="sourceLineNo">258</span>    SnapshotManifest manifest = 
SnapshotManifest.open(conf, fs, tableInfoPath, desc);<a name="line.258"></a>
+<span class="sourceLineNo">259</span>    TableDescriptor tableDescriptor = 
manifest.getTableDescriptor();<a name="line.259"></a>
+<span class="sourceLineNo">260</span>    if 
(!tableDescriptor.getTableName().equals(tableName)) {<a name="line.260"></a>
+<span class="sourceLineNo">261</span>      LOG.error("couldn't find Table Desc 
for table: " + tableName + " under tableInfoPath: "<a name="line.261"></a>
+<span class="sourceLineNo">262</span>              + 
tableInfoPath.toString());<a name="line.262"></a>
+<span class="sourceLineNo">263</span>      
LOG.error("tableDescriptor.getNameAsString() = "<a name="line.263"></a>
+<span class="sourceLineNo">264</span>              + 
tableDescriptor.getTableName().getNameAsString());<a name="line.264"></a>
+<span class="sourceLineNo">265</span>      throw new 
FileNotFoundException("couldn't find Table Desc for table: " + tableName<a 
name="line.265"></a>
+<span class="sourceLineNo">266</span>          + " under tableInfoPath: " + 
tableInfoPath.toString());<a name="line.266"></a>
+<span class="sourceLineNo">267</span>    }<a name="line.267"></a>
+<span class="sourceLineNo">268</span>    return tableDescriptor;<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>  private TableDescriptor 
getTableDescriptor(FileSystem fileSys, TableName tableName,<a 
name="line.271"></a>
+<span class="sourceLineNo">272</span>      String lastIncrBackupId) throws 
IOException {<a name="line.272"></a>
+<span class="sourceLineNo">273</span>    if (lastIncrBackupId != null) {<a 
name="line.273"></a>
+<span class="sourceLineNo">274</span>      String target =<a 
name="line.274"></a>
+<span class="sourceLineNo">275</span>          
BackupUtils.getTableBackupDir(backupRootPath.toString(),<a name="line.275"></a>
+<span class="sourceLineNo">276</span>            lastIncrBackupId, 
tableName);<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      return 
FSTableDescriptors.getTableDescriptorFromFs(fileSys, new Path(target));<a 
name="line.277"></a>
+<span class="sourceLineNo">278</span>    }<a name="line.278"></a>
+<span class="sourceLineNo">279</span>    return null;<a name="line.279"></a>
+<span class="sourceLineNo">280</span>  }<a name="line.280"></a>
+<span class="sourceLineNo">281</span><a name="line.281"></a>
+<span class="sourceLineNo">282</span>  private void 
createAndRestoreTable(Connection conn, TableName tableName, TableName 
newTableName,<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      Path tableBackupPath, boolean 
truncateIfExists, String lastIncrBackupId) throws IOException {<a 
name="line.283"></a>
+<span class="sourceLineNo">284</span>    if (newTableName == null) {<a 
name="line.284"></a>
+<span class="sourceLineNo">285</span>      newTableName = tableName;<a 
name="line.285"></a>
+<span class="sourceLineNo">286</span>    }<a name="line.286"></a>
+<span class="sourceLineNo">287</span>    FileSystem fileSys = 
tableBackupPath.getFileSystem(this.conf);<a name="line.287"></a>
+<span class="sourceLineNo">288</span><a name="line.288"></a>
+<span class="sourceLineNo">289</span>    // get table descriptor first<a 
name="line.289"></a>
+<span class="sourceLineNo">290</span>    TableDescriptor tableDescriptor = 
getTableDescriptor(fileSys, tableName, lastIncrBackupId);<a name="line.290"></a>
+<span class="sourceLineNo">291</span>    if (tableDescriptor != null) {<a 
name="line.291"></a>
+<span class="sourceLineNo">292</span>      LOG.debug("Retrieved descriptor: " 
+ tableDescriptor + " thru " + lastIncrBackupId);<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>    if (tableDescriptor == null) {<a 
name="line.295"></a>
+<span class="sourceLineNo">296</span>      Path tableSnapshotPath = 
getTableSnapshotPath(backupRootPath, tableName, backupId);<a 
name="line.296"></a>
+<span class="sourceLineNo">297</span>      if 
(fileSys.exists(tableSnapshotPath)) {<a name="line.297"></a>
+<span class="sourceLineNo">298</span>        // snapshot path exist means the 
backup path is in HDFS<a name="line.298"></a>
+<span class="sourceLineNo">299</span>        // check whether snapshot dir 
already recorded for target table<a name="line.299"></a>
+<span class="sourceLineNo">300</span>        if (snapshotMap.get(tableName) != 
null) {<a name="line.300"></a>
+<span class="sourceLineNo">301</span>          SnapshotDescription desc =<a 
name="line.301"></a>
+<span class="sourceLineNo">302</span>              
SnapshotDescriptionUtils.readSnapshotInfo(fileSys, tableSnapshotPath);<a 
name="line.302"></a>
+<span class="sourceLineNo">303</span>          SnapshotManifest manifest = 
SnapshotManifest.open(conf, fileSys, tableSnapshotPath, desc);<a 
name="line.303"></a>
+<span class="sourceLineNo">304</span>          tableDescriptor = 
manifest.getTableDescriptor();<a name="line.304"></a>
+<span class="sourceLineNo">305</span>        } else {<a name="line.305"></a>
+<span class="sourceLineNo">306</span>          tableDescriptor = 
getTableDesc(tableName);<a name="line.306"></a>
+<span class="sourceLineNo">307</span>          snapshotMap.put(tableName, 
getTableInfoPath(tableName));<a name="line.307"></a>
+<span class="sourceLineNo">308</span>        }<a name="line.308"></a>
+<span class="sourceLineNo">309</span>        if (tableDescriptor == null) {<a 
name="line.309"></a>
+<span class="sourceLineNo">310</span>          LOG.debug("Found no table 
descriptor in the snapshot dir, previous schema would be lost");<a 
name="line.310"></a>
+<span class="sourceLineNo">311</span>        }<a name="line.311"></a>
+<span class="sourceLineNo">312</span>      } else {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>        throw new IOException("Table 
snapshot directory: " +<a name="line.313"></a>
+<span class="sourceLineNo">314</span>            tableSnapshotPath + " does 
not exist.");<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><a name="line.317"></a>
+<span class="sourceLineNo">318</span>    Path tableArchivePath = 
getTableArchivePath(tableName);<a name="line.318"></a>
+<span class="sourceLineNo">319</span>    if (tableArchivePath == null) {<a 
name="line.319"></a>
+<span class="sourceLineNo">320</span>      if (tableDescriptor != null) {<a 
name="line.320"></a>
+<span class="sourceLineNo">321</span>        // find table descriptor but no 
archive dir means the table is empty, create table and exit<a 
name="line.321"></a>
+<span class="sourceLineNo">322</span>        if (LOG.isDebugEnabled()) {<a 
name="line.322"></a>
+<span class="sourceLineNo">323</span>          LOG.debug("find table 
descriptor but no archive dir for table " + tableName<a name="line.323"></a>
+<span class="sourceLineNo">324</span>              + ", will only create 
table");<a name="line.324"></a>
+<span class="sourceLineNo">325</span>        }<a name="line.325"></a>
+<span class="sourceLineNo">326</span>        tableDescriptor = 
TableDescriptorBuilder.copy(newTableName, tableDescriptor);<a 
name="line.326"></a>
+<span class="sourceLineNo">327</span>        checkAndCreateTable(conn, 
tableBackupPath, tableName, newTableName, null, tableDescriptor,<a 
name="line.327"></a>
+<span class="sourceLineNo">328</span>          truncateIfExists);<a 
name="line.328"></a>
+<span class="sourceLineNo">329</span>        return;<a name="line.329"></a>
+<span class="sourceLineNo">330</span>      } else {<a name="line.330"></a>
+<span class="sourceLineNo">331</span>        throw new 
IllegalStateException("Cannot restore hbase table because directory '"<a 
name="line.331"></a>
+<span class="sourceLineNo">332</span>            + " tableArchivePath is 
null.");<a name="line.332"></a>
+<span class="sourceLineNo">333</span>      }<a name="line.333"></a>
+<span class="sourceLineNo">334</span>    }<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span>    if (tableDescriptor == null) {<a 
name="line.336"></a>
+<span class="sourceLineNo">337</span>      tableDescriptor = 
TableDescriptorBuilder.newBuilder(newTableName).build();<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    } else {<a name="line.338"></a>
+<span class="sourceLineNo">339</span>      tableDescriptor = 
TableDescriptorBuilder.copy(newTableName, tableDescriptor);<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>    // record all region dirs:<a 
name="line.342"></a>
+<span class="sourceLineNo">343</span>    // load all files in dir<a 
name="line.343"></a>
+<span class="sourceLineNo">344</span>    try {<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      ArrayList&lt;Path&gt; 
regionPathList = getRegionList(tableName);<a name="line.345"></a>
+<span class="sourceLineNo">346</span><a name="line.346"></a>
+<span class="sourceLineNo">347</span>      // should only try to create the 
table with all region informations, so we could pre-split<a name="line.347"></a>
+<span class="sourceLineNo">348</span>      // the regions in fine grain<a 
name="line.348"></a>
+<span class="sourceLineNo">349</span>      checkAndCreateTable(conn, 
tableBackupPath, tableName, newTableName, regionPathList,<a name="line.349"></a>
+<span class="sourceLineNo">350</span>        tableDescriptor, 
truncateIfExists);<a name="line.350"></a>
+<span class="sourceLineNo">351</span>      RestoreJob restoreService = 
BackupRestoreFactory.getRestoreJob(conf);<a name="line.351"></a>
+<span class="sourceLineNo">352</span>      Path[] paths = new 
Path[regionPathList.size()];<a name="line.352"></a>
+<span class="sourceLineNo">353</span>      regionPathList.toArray(paths);<a 
name="line.353"></a>
+<span class="sourceLineNo">354</span>      restoreService.run(paths, new 
TableName[]{tableName}, new TableName[] {newTableName}, true);<a 
name="line.354"></a>
+<span class="sourceLineNo">355</span><a name="line.355"></a>
+<span class="sourceLineNo">356</span>    } catch (Exception e) {<a 
name="line.356"></a>
+<span class="sourceLineNo">357</span>      LOG.error(e.toString(), e);<a 
name="line.357"></a>
+<span class="sourceLineNo">358</span>      throw new 
IllegalStateException("Cannot restore hbase table", e);<a name="line.358"></a>
+<span class="sourceLineNo">359</span>    }<a name="line.359"></a>
+<span class="sourceLineNo">360</span>  }<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>   * Gets region list<a 
name="line.363"></a>
+<span class="sourceLineNo">364</span>   * @param tableArchivePath table 
archive path<a name="line.364"></a>
+<span class="sourceLineNo">365</span>   * @return RegionList region list<a 
name="line.365"></a>
+<span class="sourceLineNo">366</span>   * @throws IOException exception<a 
name="line.366"></a>
+<span class="sourceLineNo">367</span>   */<a name="line.367"></a>
+<span class="sourceLineNo">368</span>  ArrayList&lt;Path&gt; 
getRegionList(Path tableArchivePath) throws IOException {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>    ArrayList&lt;Path&gt; regionDirList = 
new ArrayList&lt;&gt;();<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    FileStatus[] children = 
fs.listStatus(tableArchivePath);<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    for (FileStatus childStatus : 
children) {<a name="line.371"></a>
+<span class="sourceLineNo">372</span>      // here child refer to each 
region(Name)<a name="line.372"></a>
+<span class="sourceLineNo">373</span>      Path child = 
childStatus.getPath();<a name="line.373"></a>
+<span class="sourceLineNo">374</span>      regionDirList.add(child);<a 
name="line.374"></a>
+<span class="sourceLineNo">375</span>    }<a name="line.375"></a>
+<span class="sourceLineNo">376</span>    return regionDirList;<a 
name="line.376"></a>
+<span class="sourceLineNo">377</span>  }<a name="line.377"></a>
+<span class="sourceLineNo">378</span><a name="line.378"></a>
+<span class="sourceLineNo">379</span>  /**<a name="line.379"></a>
+<span class="sourceLineNo">380</span>   * Calculate region boundaries and add 
all the column families to the table descriptor<a name="line.380"></a>
+<span class="sourceLineNo">381</span>   * @param regionDirList region dir 
list<a name="line.381"></a>
+<span class="sourceLineNo">382</span>   * @return a set of keys to store the 
boundaries<a name="line.382"></a>
+<span class="sourceLineNo">383</span>   */<a name="line.383"></a>
+<span class="sourceLineNo">384</span>  byte[][] 
generateBoundaryKeys(ArrayList&lt;Path&gt; regionDirList) throws IOException 
{<a name="line.384"></a>
+<span class="sourceLineNo">385</span>    TreeMap&lt;byte[], Integer&gt; map = 
new TreeMap&lt;&gt;(Bytes.BYTES_COMPARATOR);<a name="line.385"></a>
+<span class="sourceLineNo">386</span>    // Build a set of keys to store the 
boundaries<a name="line.386"></a>
+<span class="sourceLineNo">387</span>    // calculate region boundaries and 
add all the column families to the table descriptor<a name="line.387"></a>
+<span class="sourceLineNo">388</span>    for (Path regionDir : regionDirList) 
{<a name="line.388"></a>
+<span class="sourceLineNo">389</span>      LOG.debug("Parsing region dir: " + 
regionDir);<a name="line.389"></a>
+<span class="sourceLineNo">390</span>      Path hfofDir = regionDir;<a 
name="line.390"></a>
+<span class="sourceLineNo">391</span><a name="line.391"></a>
+<span class="sourceLineNo">392</span>      if (!fs.exists(hfofDir)) {<a 
name="line.392"></a>
+<span class="sourceLineNo">393</span>        LOG.warn("HFileOutputFormat dir " 
+ hfofDir + " not found");<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>      FileStatus[] familyDirStatuses = 
fs.listStatus(hfofDir);<a name="line.396"></a>
+<span class="sourceLineNo">397</span>      if (familyDirStatuses == null) {<a 
name="line.397"></a>
+<span class="sourceLineNo">398</span>        throw new IOException("No 
families found in " + hfofDir);<a name="line.398"></a>
+<span class="sourceLineNo">399</span>      }<a name="line.399"></a>
+<span class="sourceLineNo">400</span><a name="line.400"></a>
+<span class="sourceLineNo">401</span>      for (FileStatus stat : 
familyDirStatuses) {<a name="line.401"></a>
+<span class="sourceLineNo">402</span>        if (!stat.isDirectory()) {<a 
name="line.402"></a>
+<span class="sourceLineNo">403</span>          LOG.warn("Skipping 
non-directory " + stat.getPath());<a name="line.403"></a>
+<span class="sourceLineNo">404</span>          continue;<a name="line.404"></a>
+<span class="sourceLineNo">405</span>        }<a name="line.405"></a>
+<span class="sourceLineNo">406</span>        boolean isIgnore = false;<a 
name="line.406"></a>
+<span class="sourceLineNo">407</span>        String pathName = 
stat.getPath().getName();<a name="line.407"></a>
+<span class="sourceLineNo">408</span>        for (String ignore : ignoreDirs) 
{<a name="line.408"></a>
+<span class="sourceLineNo">409</span>          if (pathName.contains(ignore)) 
{<a name="line.409"></a>
+<span class="sourceLineNo">410</span>            LOG.warn("Skipping non-family 
directory" + pathName);<a name="line.410"></a>
+<span class="sourceLineNo">411</span>            isIgnore = true;<a 
name="line.411"></a>
+<span class="sourceLineNo">412</span>            break;<a name="line.412"></a>
+<span class="sourceLineNo">413</span>          }<a name="line.413"></a>
+<span class="sourceLineNo">414</span>        }<a name="line.414"></a>
+<span class="sourceLineNo">415</span>        if (isIgnore) {<a 
name="line.415"></a>
+<span class="sourceLineNo">416</span>          continue;<a name="line.416"></a>
+<span class="sourceLineNo">417</span>        }<a name="line.417"></a>
+<span class="sourceLineNo">418</span>        Path familyDir = 
stat.getPath();<a name="line.418"></a>
+<span class="sourceLineNo">419</span>        LOG.debug("Parsing family dir [" 
+ familyDir.toString() + " in region [" + regionDir + "]");<a 
name="line.419"></a>
+<span class="sourceLineNo">420</span>        // Skip _logs, etc<a 
name="line.420"></a>
+<span class="sourceLineNo">421</span>        if 
(familyDir.getName().startsWith("_") || familyDir.getName().startsWith(".")) 
{<a name="line.421"></a>
 <span class="sourceLineNo">422</span>          continue;<a name="line.422"></a>
 <span class="sourceLineNo">423</span>        }<a name="line.423"></a>
-<span class="sourceLineNo">424</span>        Path familyDir = 
stat.getPath();<a name="line.424"></a>
-<span class="sourceLineNo">425</span>        LOG.debug("Parsing family dir [" 
+ familyDir.toString() + " in region [" + regionDir + "]");<a 
name="line.425"></a>
-<span class="sourceLineNo">426</span>        // Skip _logs, etc<a 
name="line.426"></a>
-<span class="sourceLineNo">427</span>        if 
(familyDir.getName().startsWith("_") || familyDir.getName().startsWith(".")) 
{<a name="line.427"></a>
-<span class="sourceLineNo">428</span>          continue;<a name="line.428"></a>
-<span class="sourceLineNo">429</span>        }<a name="line.429"></a>
-<span class="sourceLineNo">430</span><a name="line.430"></a>
-<span class="sourceLineNo">431</span>        // start to parse hfile inside 
one family dir<a name="line.431"></a>
-<span class="sourceLineNo">432</span>        Path[] hfiles = 
FileUtil.stat2Paths(fs.listStatus(familyDir));<a name="line.432"></a>
-<span class="sourceLineNo">433</span>        for (Path hfile : hfiles) {<a 
name="line.433"></a>
-<span class="sourceLineNo">434</span>          if 
(hfile.getName().startsWith("_") || hfile.getName().startsWith(".")<a 
name="line.434"></a>
-<span class="sourceLineNo">435</span>              || 
StoreFileInfo.isReference(hfile.getName())<a name="line.435"></a>
-<span class="sourceLineNo">436</span>              || 
HFileLink.isHFileLink(hfile.getName())) {<a name="line.436"></a>
-<span class="sourceLineNo">437</span>            continue;<a 
name="line.437"></a>
-<span class="sourceLineNo">438</span>          }<a name="line.438"></a>
-<span class="sourceLineNo">439</span>          HFile.Reader reader = 
HFile.createReader(fs, hfile, conf);<a name="line.439"></a>
-<span class="sourceLineNo">440</span>          final byte[] first, last;<a 
name="line.440"></a>
-<span class="sourceLineNo">441</span>          try {<a name="line.441"></a>
-<span class="sourceLineNo">442</span>            reader.loadFileInfo();<a 
name="line.442"></a>
-<span class="sourceLineNo">443</span>            first = 
reader.getFirstRowKey().get();<a name="line.443"></a>
-<span class="sourceLineNo">444</span>            last = 
reader.getLastRowKey().get();<a name="line.444"></a>
-<span class="sourceLineNo">445</span>            LOG.debug("Trying to figure 
out region boundaries hfile=" + hfile + " first="<a name="line.445"></a>
-<span class="sourceLineNo">446</span>                + 
Bytes.toStringBinary(first) + " last=" + Bytes.toStringBinary(last));<a 
name="line.446"></a>
-<span class="sourceLineNo">447</span><a name="line.447"></a>
-<span class="sourceLineNo">448</span>            // To eventually infer start 
key-end key boundaries<a name="line.448"></a>
-<span class="sourceLineNo">449</span>            Integer value = 
map.containsKey(first) ? (Integer) map.get(first) : 0;<a name="line.449"></a>
-<span class="sourceLineNo">450</span>            map.put(first, value + 1);<a 
name="line.450"></a>
-<span class="sourceLineNo">451</span>            value = map.containsKey(last) 
? (Integer) map.get(last) : 0;<a name="line.451"></a>
-<span class="sourceLineNo">452</span>            map.put(last, value - 1);<a 
name="line.452"></a>
-<span class="sourceLineNo">453</span>          } finally {<a 
name="line.453"></a>
-<span class="sourceLineNo">454</span>            reader.close();<a 
name="line.454"></a>
-<span class="sourceLineNo">455</span>          }<a name="line.455"></a>
-<span class="sourceLineNo">456</span>        }<a name="line.456"></a>
-<span class="sourceLineNo">457</span>      }<a name="line.457"></a>
-<span class="sourceLineNo">458</span>    }<a name="line.458"></a>
-<span class="sourceLineNo">459</span>    return 
LoadIncrementalHFiles.inferBoundaries(map);<a name="line.459"></a>
-<span class="sourceLineNo">460</span>  }<a name="line.460"></a>
-<span class="sourceLineNo">461</span><a name="line.461"></a>
-<span class="sourceLineNo">462</span>  /**<a name="line.462"></a>
-<span class="sourceLineNo">463</span>   * Prepare the table for bulkload, most 
codes copied from<a name="line.463"></a>
-<span class="sourceLineNo">464</span>   * {@link 
LoadIncrementalHFiles#createTable(TableName, String, Admin)}<a 
name="line.464"></a>
-<span class="sourceLineNo">465</span>   * @param conn connection<a 
name="line.465"></a>
-<span class="sourceLineNo">466</span>   * @param tableBackupPath path<a 
name="line.466"></a>
-<span class="sourceLineNo">467</span>   * @param tableName table name<a 
name="line.467"></a>
-<span class="sourceLineNo">468</span>   * @param targetTableName target table 
name<a name="line.468"></a>
-<span class="sourceLineNo">469</span>   * @param regionDirList region 
directory list<a name="line.469"></a>
-<span class="sourceLineNo">470</span>   * @param htd table descriptor<a 
name="line.470"></a>
-<span class="sourceLineNo">471</span>   * @param truncateIfExists truncates 
table if exists<a name="line.471"></a>
-<span class="sourceLineNo">472</span>   * @throws IOException exception<a 
name="line.472"></a>
-<span class="sourceLineNo">473</span>   */<a name="line.473"></a>
-<span class="sourceLineNo">474</span>  private void 
checkAndCreateTable(Connection conn, Path tableBackupPath, TableName 
tableName,<a name="line.474"></a>
-<span class="sourceLineNo">475</span>      TableName targetTableName, 
ArrayList&lt;Path&gt; regionDirList, TableDescriptor htd,<a name="line.475"></a>
-<span class="sourceLineNo">476</span>      boolean truncateIfExists) throws 
IOException {<a name="line.476"></a>
-<span class="sourceLineNo">477</span>    try (Admin admin = conn.getAdmin()) 
{<a name="line.477"></a>
-<span class="sourceLineNo">478</span>      boolean createNew = false;<a 
name="line.478"></a>
-<span class="sourceLineNo">479</span>      if 
(admin.tableExists(targetTableName)) {<a name="line.479"></a>
-<span class="sourceLineNo">480</span>        if (truncateIfExists) {<a 
name="line.480"></a>
-<span class="sourceLineNo">481</span>          LOG.info("Truncating exising 
target table '" + targetTableName<a name="line.481"></a>
-<span class="sourceLineNo">482</span>              + "', preserving region 
splits");<a name="line.482"></a>
-<span class="sourceLineNo">483</span>          
admin.disableTable(targetTableName);<a name="line.483"></a>
-<span class="sourceLineNo">484</span>          
admin.truncateTable(targetTableName, true);<a name="line.484"></a>
-<span class="sourceLineNo">485</span>        } else {<a name="line.485"></a>
-<span class="sourceLineNo">486</span>          LOG.info("Using exising target 
table '" + targetTableName + "'");<a name="line.486"></a>
-<span class="sourceLineNo">487</span>        }<a name="line.487"></a>
-<span class="sourceLineNo">488</span>      } else {<a name="line.488"></a>
-<span class="sourceLineNo">489</span>        createNew = true;<a 
name="line.489"></a>
-<span class="sourceLineNo">490</span>      }<a name="line.490"></a>
-<span class="sourceLineNo">491</span>      if (createNew) {<a 
name="line.491"></a>
-<span class="sourceLineNo">492</span>        LOG.info("Creating target table 
'" + targetTableName + "'");<a name="line.492"></a>
-<span class="sourceLineNo">493</span>        byte[][] keys = null;<a 
name="line.493"></a>
-<span class="sourceLineNo">494</span>        if (regionDirList == null || 
regionDirList.size() == 0) {<a name="line.494"></a>
-<span class="sourceLineNo">495</span>          admin.createTable(htd, null);<a 
name="line.495"></a>
-<span class="sourceLineNo">496</span>        } else {<a name="line.496"></a>
-<span class="sourceLineNo">497</span>          keys = 
generateBoundaryKeys(regionDirList);<a name="line.497"></a>
-<span class="sourceLineNo">498</span>          // create table using table 
descriptor and region boundaries<a name="line.498"></a>
-<span class="sourceLineNo">499</span>          admin.createTable(htd, keys);<a 
name="line.499"></a>
-<span class="sourceLineNo">500</span>        }<a name="line.500"></a>
-<span class="sourceLineNo">501</span><a name="line.501"></a>
-<span class="sourceLineNo">502</span>      }<a name="line.502"></a>
-<span class="sourceLineNo">503</span>      long startTime = 
EnvironmentEdgeManager.currentTime();<a name="line.503"></a>
-<span class="sourceLineNo">504</span>      while 
(!admin.isTableAvailable(targetTableName)) {<a name="line.504"></a>
-<span class="sourceLineNo">505</span>        try {<a name="line.505"></a>
-<span class="sourceLineNo">506</span>          Thread.sleep(100);<a 
name="line.506"></a>
-<span class="sourceLineNo">507</span>        } catch (InterruptedException ie) 
{<a name="line.507"></a>
-<span class="sourceLineNo">508</span>          
Thread.currentThread().interrupt();<a name="line.508"></a>
-<span class="sourceLineNo">509</span>        }<a name="line.509"></a>
-<span class="sourceLineNo">510</span>        if 
(EnvironmentEdgeManager.currentTime() - startTime &gt; 
TABLE_AVAILABILITY_WAIT_TIME) {<a name="line.510"></a>
-<span class="sourceLineNo">511</span>          throw new IOException("Time out 
" + TABLE_AVAILABILITY_WAIT_TIME + "ms expired, table "<a name="line.511"></a>
-<span class="sourceLineNo">512</span>              + targetTableName + " is 
still not available");<a name="line.512"></a>
-<span class="sourceLineNo">513</span>        }<a name="line.513"></a>
-<span class="sourceLineNo">514</span>      }<a name="line.514"></a>
-<span class="sourceLineNo">515</span>    }<a name="line.515"></a>
-<span class="sourceLineNo">516</span>  }<a name="line.516"></a>
-<span class="sourceLineNo">517</span><a name="line.517"></a>
-<span class="sourceLineNo">518</span>}<a name="line.518"></a>
+<span class="sourceLineNo">424</span><a name="line.424"></a>
+<span class="sourceLineNo">425</span>        // start to parse hfile inside 
one family dir<a name="line.425"></a>
+<span class="sourceLineNo">426</span>        Path[] hfiles = 
FileUtil.stat2Paths(fs.listStatus(familyDir));<a name="line.426"></a>
+<span class="sourceLineNo">427</span>        for (Path hfile : hfiles) {<a 
name="line.427"></a>
+<span class="sourceLineNo">428</span>          if 
(hfile.getName().startsWith("_") || hfile.getName().startsWith(".")<a 
name="line.428"></a>
+<span class="sourceLineNo">429</span>              || 
StoreFileInfo.isReference(hfile.getName())<a name="line.429"></a>
+<span class="sourceLineNo">430</span>              || 
HFileLink.isHFileLink(hfile.getName())) {<a name="line.430"></a>
+<span class="sourceLineNo">431</span>            continue;<a 
name="line.431"></a>
+<span class="sourceLineNo">432</span>          }<a name="line.432"></a>
+<span class="sourceLineNo">433</span>          HFile.Reader reader = 
HFile.createReader(fs, hfile, conf);<a name="line.433"></a>
+<span class="sourceLineNo">434</span>          final byte[] first, last;<a 
name="line.434"></a>
+<span class="sourceLineNo">435</span>          try {<a name="line.435"></a>
+<span class="sourceLineNo">436</span>            reader.loadFileInfo();<a 
name="line.436"></a>
+<span class="sourceLineNo">437</span>            first = 
reader.getFirstRowKey().get();<a name="line.437"></a>
+<span class="sourceLineNo">438</span>            last = 
reader.getLastRowKey().get();<a name="line.438"></a>
+<span class="sourceLineNo">439</span>            LOG.debug("Trying to figure 
out region boundaries hfile=" + hfile + " first="<a name="line.439"></a>
+<span class="sourceLineNo">440</span>                + 
Bytes.toStringBinary(first) + " last=" + Bytes.toStringBinary(last));<a 
name="line.440"></a>
+<span class="sourceLineNo">441</span><a name="line.441"></a>
+<span class="sourceLineNo">442</span>            // To eventually infer start 
key-end key boundaries<a name="line.442"></a>
+<span class="sourceLineNo">443</span>            Integer value = 
map.containsKey(first) ? (Integer) map.get(first) : 0;<a name="line.443"></a>
+<span class="sourceLineNo">444</span>            map.put(first, value + 1);<a 
name="line.444"></a>
+<span class="sourceLineNo">445</span>            value = map.containsKey(last) 
? (Integer) map.get(last) : 0;<a name="line.445"></a>
+<span class="sourceLineNo">446</span>            map.put(last, value - 1);<a 
name="line.446"></a>
+<span class="sourceLineNo">447</span>          } finally {<a 
name="line.447"></a>
+<span class="sourceLineNo">448</span>            reader.close();<a 
name="line.448"></a>
+<span class="sourceLineNo">449</span>          }<a name="line.449"></a>
+<span class="sourceLineNo">450</span>        }<a name="line.450"></a>
+<span class="sourceLineNo">451</span>      }<a name="line.451"></a>
+<span class="sourceLineNo">452</span>    }<a name="line.452"></a>
+<span class="sourceLineNo">453</span>    return 
LoadIncrementalHFiles.inferBoundaries(map);<a name="line.453"></a>
+<span class="sourceLineNo">454</span>  }<a name="line.454"></a>
+<span class="sourceLineNo">455</span><a name="line.455"></a>
+<span class="sourceLineNo">456</span>  /**<a name="line.456"></a>
+<span class="sourceLineNo">457</span>   * Prepare the table for bulkload, most 
codes copied from<a name="line.457"></a>
+<span class="sourceLineNo">458</span>   * {@link 
LoadIncrementalHFiles#createTable(TableName, String, Admin)}<a 
name="line.458"></a>
+<span class="sourceLineNo">459</span>   * @param conn connection<a 
name="line.459"></a>
+<span class="sourceLineNo">460</span>   * @param tableBackupPath path<a 
name="line.460"></a>
+<span class="sourceLineNo">461</span>   * @param tableName table name<a 
name="line.461"></a>
+<span class="sourceLineNo">462</span>   * @param targetTableName target table 
name<a name="line.462"></a>
+<span class="sourceLineNo">463</span>   * @param regionDirList region 
directory list<a name="line.463"></a>
+<span class="sourceLineNo">464</span>   * @param htd table descriptor<a 
name="line.464"></a>
+<span class="sourceLineNo">465</span>   * @param truncat

<TRUNCATED>

Reply via email to