http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa7ffc92/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.html 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.html
index 62efc6b..12f4f50 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/BackupAdminImpl.html
@@ -52,61 +52,61 @@
 <span class="sourceLineNo">044</span>import 
org.apache.hadoop.hbase.backup.RestoreRequest;<a name="line.44"></a>
 <span class="sourceLineNo">045</span>import 
org.apache.hadoop.hbase.backup.util.BackupSet;<a name="line.45"></a>
 <span class="sourceLineNo">046</span>import 
org.apache.hadoop.hbase.backup.util.BackupUtils;<a name="line.46"></a>
-<span class="sourceLineNo">047</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.47"></a>
-<span class="sourceLineNo">048</span>import org.slf4j.Logger;<a 
name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.slf4j.LoggerFactory;<a 
name="line.49"></a>
-<span class="sourceLineNo">050</span>import 
org.apache.hadoop.hbase.client.Admin;<a name="line.50"></a>
-<span class="sourceLineNo">051</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.51"></a>
-<span class="sourceLineNo">052</span>import 
org.apache.hbase.thirdparty.com.google.common.collect.Lists;<a 
name="line.52"></a>
-<span class="sourceLineNo">053</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.53"></a>
-<span class="sourceLineNo">054</span><a name="line.54"></a>
-<span class="sourceLineNo">055</span>@InterfaceAudience.Private<a 
name="line.55"></a>
-<span class="sourceLineNo">056</span>public class BackupAdminImpl implements 
BackupAdmin {<a name="line.56"></a>
-<span class="sourceLineNo">057</span>  public final static String CHECK_OK = 
"Checking backup images: OK";<a name="line.57"></a>
-<span class="sourceLineNo">058</span>  public final static String CHECK_FAILED 
=<a name="line.58"></a>
-<span class="sourceLineNo">059</span>      "Checking backup images: Failed. 
Some dependencies are missing for restore";<a name="line.59"></a>
-<span class="sourceLineNo">060</span>  private static final Logger LOG = 
LoggerFactory.getLogger(BackupAdminImpl.class);<a name="line.60"></a>
-<span class="sourceLineNo">061</span><a name="line.61"></a>
-<span class="sourceLineNo">062</span>  private final Connection conn;<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span>  public BackupAdminImpl(Connection conn) 
{<a name="line.64"></a>
-<span class="sourceLineNo">065</span>    this.conn = conn;<a 
name="line.65"></a>
-<span class="sourceLineNo">066</span>  }<a name="line.66"></a>
-<span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span>  @Override<a name="line.68"></a>
-<span class="sourceLineNo">069</span>  public void close() throws IOException 
{<a name="line.69"></a>
-<span class="sourceLineNo">070</span>  }<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span>  @Override<a name="line.72"></a>
-<span class="sourceLineNo">073</span>  public BackupInfo getBackupInfo(String 
backupId) throws IOException {<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    BackupInfo backupInfo = null;<a 
name="line.74"></a>
-<span class="sourceLineNo">075</span>    try (final BackupSystemTable table = 
new BackupSystemTable(conn)) {<a name="line.75"></a>
-<span class="sourceLineNo">076</span>      if (backupId == null) {<a 
name="line.76"></a>
-<span class="sourceLineNo">077</span>        ArrayList&lt;BackupInfo&gt; 
recentSessions = table.getBackupInfos(BackupState.RUNNING);<a 
name="line.77"></a>
-<span class="sourceLineNo">078</span>        if (recentSessions.isEmpty()) {<a 
name="line.78"></a>
-<span class="sourceLineNo">079</span>          LOG.warn("No ongoing sessions 
found.");<a name="line.79"></a>
-<span class="sourceLineNo">080</span>          return null;<a 
name="line.80"></a>
-<span class="sourceLineNo">081</span>        }<a name="line.81"></a>
-<span class="sourceLineNo">082</span>        // else show status for ongoing 
session<a name="line.82"></a>
-<span class="sourceLineNo">083</span>        // must be one maximum<a 
name="line.83"></a>
-<span class="sourceLineNo">084</span>        return recentSessions.get(0);<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>      } else {<a name="line.85"></a>
-<span class="sourceLineNo">086</span>        backupInfo = 
table.readBackupInfo(backupId);<a name="line.86"></a>
-<span class="sourceLineNo">087</span>        return backupInfo;<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>      }<a name="line.88"></a>
-<span class="sourceLineNo">089</span>    }<a name="line.89"></a>
-<span class="sourceLineNo">090</span>  }<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span>  @Override<a name="line.92"></a>
-<span class="sourceLineNo">093</span>  public int deleteBackups(String[] 
backupIds) throws IOException {<a name="line.93"></a>
-<span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span>    int totalDeleted = 0;<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span>    Map&lt;String, 
HashSet&lt;TableName&gt;&gt; allTablesMap = new HashMap&lt;String, 
HashSet&lt;TableName&gt;&gt;();<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>    boolean deleteSessionStarted = 
false;<a name="line.98"></a>
-<span class="sourceLineNo">099</span>    boolean snapshotDone = false;<a 
name="line.99"></a>
-<span class="sourceLineNo">100</span>    try (final BackupSystemTable sysTable 
= new BackupSystemTable(conn)) {<a name="line.100"></a>
-<span class="sourceLineNo">101</span><a name="line.101"></a>
+<span class="sourceLineNo">047</span>import 
org.apache.hadoop.hbase.client.Admin;<a name="line.47"></a>
+<span class="sourceLineNo">048</span>import 
org.apache.hadoop.hbase.client.Connection;<a name="line.48"></a>
+<span class="sourceLineNo">049</span>import 
org.apache.hadoop.hbase.util.EnvironmentEdgeManager;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import 
org.apache.yetus.audience.InterfaceAudience;<a name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.slf4j.Logger;<a 
name="line.51"></a>
+<span class="sourceLineNo">052</span>import org.slf4j.LoggerFactory;<a 
name="line.52"></a>
+<span class="sourceLineNo">053</span><a name="line.53"></a>
+<span class="sourceLineNo">054</span>import 
org.apache.hbase.thirdparty.com.google.common.collect.Lists;<a 
name="line.54"></a>
+<span class="sourceLineNo">055</span><a name="line.55"></a>
+<span class="sourceLineNo">056</span>@InterfaceAudience.Private<a 
name="line.56"></a>
+<span class="sourceLineNo">057</span>public class BackupAdminImpl implements 
BackupAdmin {<a name="line.57"></a>
+<span class="sourceLineNo">058</span>  public final static String CHECK_OK = 
"Checking backup images: OK";<a name="line.58"></a>
+<span class="sourceLineNo">059</span>  public final static String CHECK_FAILED 
=<a name="line.59"></a>
+<span class="sourceLineNo">060</span>      "Checking backup images: Failed. 
Some dependencies are missing for restore";<a name="line.60"></a>
+<span class="sourceLineNo">061</span>  private static final Logger LOG = 
LoggerFactory.getLogger(BackupAdminImpl.class);<a name="line.61"></a>
+<span class="sourceLineNo">062</span><a name="line.62"></a>
+<span class="sourceLineNo">063</span>  private final Connection conn;<a 
name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span>  public BackupAdminImpl(Connection conn) 
{<a name="line.65"></a>
+<span class="sourceLineNo">066</span>    this.conn = conn;<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span>  }<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span>  @Override<a name="line.69"></a>
+<span class="sourceLineNo">070</span>  public void close() {<a 
name="line.70"></a>
+<span class="sourceLineNo">071</span>  }<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span>  @Override<a name="line.73"></a>
+<span class="sourceLineNo">074</span>  public BackupInfo getBackupInfo(String 
backupId) throws IOException {<a name="line.74"></a>
+<span class="sourceLineNo">075</span>    BackupInfo backupInfo;<a 
name="line.75"></a>
+<span class="sourceLineNo">076</span>    try (final BackupSystemTable table = 
new BackupSystemTable(conn)) {<a name="line.76"></a>
+<span class="sourceLineNo">077</span>      if (backupId == null) {<a 
name="line.77"></a>
+<span class="sourceLineNo">078</span>        ArrayList&lt;BackupInfo&gt; 
recentSessions = table.getBackupInfos(BackupState.RUNNING);<a 
name="line.78"></a>
+<span class="sourceLineNo">079</span>        if (recentSessions.isEmpty()) {<a 
name="line.79"></a>
+<span class="sourceLineNo">080</span>          LOG.warn("No ongoing sessions 
found.");<a name="line.80"></a>
+<span class="sourceLineNo">081</span>          return null;<a 
name="line.81"></a>
+<span class="sourceLineNo">082</span>        }<a name="line.82"></a>
+<span class="sourceLineNo">083</span>        // else show status for ongoing 
session<a name="line.83"></a>
+<span class="sourceLineNo">084</span>        // must be one maximum<a 
name="line.84"></a>
+<span class="sourceLineNo">085</span>        return recentSessions.get(0);<a 
name="line.85"></a>
+<span class="sourceLineNo">086</span>      } else {<a name="line.86"></a>
+<span class="sourceLineNo">087</span>        backupInfo = 
table.readBackupInfo(backupId);<a name="line.87"></a>
+<span class="sourceLineNo">088</span>        return backupInfo;<a 
name="line.88"></a>
+<span class="sourceLineNo">089</span>      }<a name="line.89"></a>
+<span class="sourceLineNo">090</span>    }<a name="line.90"></a>
+<span class="sourceLineNo">091</span>  }<a name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span>  @Override<a name="line.93"></a>
+<span class="sourceLineNo">094</span>  public int deleteBackups(String[] 
backupIds) throws IOException {<a name="line.94"></a>
+<span class="sourceLineNo">095</span><a name="line.95"></a>
+<span class="sourceLineNo">096</span>    int totalDeleted = 0;<a 
name="line.96"></a>
+<span class="sourceLineNo">097</span>    Map&lt;String, 
HashSet&lt;TableName&gt;&gt; allTablesMap = new HashMap&lt;&gt;();<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span><a name="line.98"></a>
+<span class="sourceLineNo">099</span>    boolean deleteSessionStarted;<a 
name="line.99"></a>
+<span class="sourceLineNo">100</span>    boolean snapshotDone;<a 
name="line.100"></a>
+<span class="sourceLineNo">101</span>    try (final BackupSystemTable sysTable 
= new BackupSystemTable(conn)) {<a name="line.101"></a>
 <span class="sourceLineNo">102</span>      // Step 1: Make sure there is no 
active session<a name="line.102"></a>
 <span class="sourceLineNo">103</span>      // is running by using 
startBackupSession API<a name="line.103"></a>
 <span class="sourceLineNo">104</span>      // If there is an active session in 
progress, exception will be thrown<a name="line.104"></a>
@@ -115,8 +115,8 @@
 <span class="sourceLineNo">107</span>        deleteSessionStarted = true;<a 
name="line.107"></a>
 <span class="sourceLineNo">108</span>      } catch (IOException e) {<a 
name="line.108"></a>
 <span class="sourceLineNo">109</span>        LOG.warn("You can not run delete 
command while active backup session is in progress. \n"<a name="line.109"></a>
-<span class="sourceLineNo">110</span>            + "If there is no active 
backup session running, run backup repair utility to restore \n"<a 
name="line.110"></a>
-<span class="sourceLineNo">111</span>            + "backup system 
integrity.");<a name="line.111"></a>
+<span class="sourceLineNo">110</span>            + "If there is no active 
backup session running, run backup repair utility to "<a name="line.110"></a>
+<span class="sourceLineNo">111</span>            + "restore \nbackup system 
integrity.");<a name="line.111"></a>
 <span class="sourceLineNo">112</span>        return -1;<a name="line.112"></a>
 <span class="sourceLineNo">113</span>      }<a name="line.113"></a>
 <span class="sourceLineNo">114</span><a name="line.114"></a>
@@ -144,7 +144,7 @@
 <span class="sourceLineNo">136</span>            String rootDir = 
info.getBackupRootDir();<a name="line.136"></a>
 <span class="sourceLineNo">137</span>            HashSet&lt;TableName&gt; 
allTables = allTablesMap.get(rootDir);<a name="line.137"></a>
 <span class="sourceLineNo">138</span>            if (allTables == null) {<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>              allTables = new 
HashSet&lt;TableName&gt;();<a name="line.139"></a>
+<span class="sourceLineNo">139</span>              allTables = new 
HashSet&lt;&gt;();<a name="line.139"></a>
 <span class="sourceLineNo">140</span>              allTablesMap.put(rootDir, 
allTables);<a name="line.140"></a>
 <span class="sourceLineNo">141</span>            }<a name="line.141"></a>
 <span class="sourceLineNo">142</span>            
allTables.addAll(info.getTableNames());<a name="line.142"></a>
@@ -184,572 +184,546 @@
 <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>   * Updates incremental backup set for 
every backupRoot<a name="line.178"></a>
-<span class="sourceLineNo">179</span>   * @param tablesMap map [backupRoot: 
Set&lt;TableName&gt;]<a name="line.179"></a>
+<span class="sourceLineNo">179</span>   * @param tablesMap map [backupRoot: 
{@code Set&lt;TableName&gt;}]<a name="line.179"></a>
 <span class="sourceLineNo">180</span>   * @param table backup system table<a 
name="line.180"></a>
-<span class="sourceLineNo">181</span>   * @throws IOException<a 
name="line.181"></a>
+<span class="sourceLineNo">181</span>   * @throws IOException if a table 
operation fails<a name="line.181"></a>
 <span class="sourceLineNo">182</span>   */<a name="line.182"></a>
-<span class="sourceLineNo">183</span><a name="line.183"></a>
-<span class="sourceLineNo">184</span>  private void 
finalizeDelete(Map&lt;String, HashSet&lt;TableName&gt;&gt; tablesMap, 
BackupSystemTable table)<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      throws IOException {<a 
name="line.185"></a>
-<span class="sourceLineNo">186</span>    for (String backupRoot : 
tablesMap.keySet()) {<a name="line.186"></a>
-<span class="sourceLineNo">187</span>      Set&lt;TableName&gt; incrTableSet = 
table.getIncrementalBackupTableSet(backupRoot);<a name="line.187"></a>
-<span class="sourceLineNo">188</span>      Map&lt;TableName, 
ArrayList&lt;BackupInfo&gt;&gt; tableMap =<a name="line.188"></a>
-<span class="sourceLineNo">189</span>          
table.getBackupHistoryForTableSet(incrTableSet, backupRoot);<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>      for (Map.Entry&lt;TableName, 
ArrayList&lt;BackupInfo&gt;&gt; entry : tableMap.entrySet()) {<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>        if (entry.getValue() == null) {<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>          // No more backups for a 
table<a name="line.192"></a>
-<span class="sourceLineNo">193</span>          
incrTableSet.remove(entry.getKey());<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>      if (!incrTableSet.isEmpty()) {<a 
name="line.196"></a>
-<span class="sourceLineNo">197</span>        
table.addIncrementalBackupTableSet(incrTableSet, backupRoot);<a 
name="line.197"></a>
-<span class="sourceLineNo">198</span>      } else { // empty<a 
name="line.198"></a>
-<span class="sourceLineNo">199</span>        
table.deleteIncrementalBackupTableSet(backupRoot);<a name="line.199"></a>
-<span class="sourceLineNo">200</span>      }<a name="line.200"></a>
-<span class="sourceLineNo">201</span>    }<a name="line.201"></a>
-<span class="sourceLineNo">202</span>  }<a name="line.202"></a>
-<span class="sourceLineNo">203</span><a name="line.203"></a>
-<span class="sourceLineNo">204</span>  /**<a name="line.204"></a>
-<span class="sourceLineNo">205</span>   * Delete single backup and all related 
backups &lt;br&gt;<a name="line.205"></a>
-<span class="sourceLineNo">206</span>   * Algorithm:&lt;br&gt;<a 
name="line.206"></a>
-<span class="sourceLineNo">207</span>   * Backup type: FULL or INCREMENTAL 
&lt;br&gt;<a name="line.207"></a>
-<span class="sourceLineNo">208</span>   * Is this last backup session for 
table T: YES or NO &lt;br&gt;<a name="line.208"></a>
-<span class="sourceLineNo">209</span>   * For every table T from table list 
'tables':&lt;br&gt;<a name="line.209"></a>
-<span class="sourceLineNo">210</span>   * if(FULL, YES) deletes only physical 
data (PD) &lt;br&gt;<a name="line.210"></a>
-<span class="sourceLineNo">211</span>   * if(FULL, NO), deletes PD, scans all 
newer backups and removes T from backupInfo,&lt;br&gt;<a name="line.211"></a>
-<span class="sourceLineNo">212</span>   * until we either reach the most 
recent backup for T in the system or FULL backup&lt;br&gt;<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span>   * which includes T&lt;br&gt;<a 
name="line.213"></a>
-<span class="sourceLineNo">214</span>   * if(INCREMENTAL, YES) deletes only 
physical data (PD) if(INCREMENTAL, NO) deletes physical data<a 
name="line.214"></a>
-<span class="sourceLineNo">215</span>   * and for table T scans all backup 
images between last&lt;br&gt;<a name="line.215"></a>
-<span class="sourceLineNo">216</span>   * FULL backup, which is older than the 
backup being deleted and the next FULL backup (if exists) &lt;br&gt;<a 
name="line.216"></a>
+<span class="sourceLineNo">183</span>  private void 
finalizeDelete(Map&lt;String, HashSet&lt;TableName&gt;&gt; tablesMap, 
BackupSystemTable table)<a name="line.183"></a>
+<span class="sourceLineNo">184</span>      throws IOException {<a 
name="line.184"></a>
+<span class="sourceLineNo">185</span>    for (String backupRoot : 
tablesMap.keySet()) {<a name="line.185"></a>
+<span class="sourceLineNo">186</span>      Set&lt;TableName&gt; incrTableSet = 
table.getIncrementalBackupTableSet(backupRoot);<a name="line.186"></a>
+<span class="sourceLineNo">187</span>      Map&lt;TableName, 
ArrayList&lt;BackupInfo&gt;&gt; tableMap =<a name="line.187"></a>
+<span class="sourceLineNo">188</span>          
table.getBackupHistoryForTableSet(incrTableSet, backupRoot);<a 
name="line.188"></a>
+<span class="sourceLineNo">189</span>      for (Map.Entry&lt;TableName, 
ArrayList&lt;BackupInfo&gt;&gt; entry : tableMap.entrySet()) {<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>        if (entry.getValue() == null) {<a 
name="line.190"></a>
+<span class="sourceLineNo">191</span>          // No more backups for a 
table<a name="line.191"></a>
+<span class="sourceLineNo">192</span>          
incrTableSet.remove(entry.getKey());<a name="line.192"></a>
+<span class="sourceLineNo">193</span>        }<a name="line.193"></a>
+<span class="sourceLineNo">194</span>      }<a name="line.194"></a>
+<span class="sourceLineNo">195</span>      if (!incrTableSet.isEmpty()) {<a 
name="line.195"></a>
+<span class="sourceLineNo">196</span>        
table.addIncrementalBackupTableSet(incrTableSet, backupRoot);<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>      } else { // empty<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>        
table.deleteIncrementalBackupTableSet(backupRoot);<a name="line.198"></a>
+<span class="sourceLineNo">199</span>      }<a name="line.199"></a>
+<span class="sourceLineNo">200</span>    }<a name="line.200"></a>
+<span class="sourceLineNo">201</span>  }<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>   * Delete single backup and all related 
backups &lt;br&gt;<a name="line.204"></a>
+<span class="sourceLineNo">205</span>   * Algorithm:&lt;br&gt;<a 
name="line.205"></a>
+<span class="sourceLineNo">206</span>   * Backup type: FULL or INCREMENTAL 
&lt;br&gt;<a name="line.206"></a>
+<span class="sourceLineNo">207</span>   * Is this last backup session for 
table T: YES or NO &lt;br&gt;<a name="line.207"></a>
+<span class="sourceLineNo">208</span>   * For every table T from table list 
'tables':&lt;br&gt;<a name="line.208"></a>
+<span class="sourceLineNo">209</span>   * if(FULL, YES) deletes only physical 
data (PD) &lt;br&gt;<a name="line.209"></a>
+<span class="sourceLineNo">210</span>   * if(FULL, NO), deletes PD, scans all 
newer backups and removes T from backupInfo,&lt;br&gt;<a name="line.210"></a>
+<span class="sourceLineNo">211</span>   * until we either reach the most 
recent backup for T in the system or FULL backup&lt;br&gt;<a 
name="line.211"></a>
+<span class="sourceLineNo">212</span>   * which includes T&lt;br&gt;<a 
name="line.212"></a>
+<span class="sourceLineNo">213</span>   * if(INCREMENTAL, YES) deletes only 
physical data (PD) if(INCREMENTAL, NO) deletes physical data<a 
name="line.213"></a>
+<span class="sourceLineNo">214</span>   * and for table T scans all backup 
images between last&lt;br&gt;<a name="line.214"></a>
+<span class="sourceLineNo">215</span>   * FULL backup, which is older than the 
backup being deleted and the next FULL backup (if exists)<a name="line.215"></a>
+<span class="sourceLineNo">216</span>   * &lt;br&gt;<a name="line.216"></a>
 <span class="sourceLineNo">217</span>   * or last one for a particular table T 
and removes T from list of backup tables.<a name="line.217"></a>
 <span class="sourceLineNo">218</span>   * @param backupId backup id<a 
name="line.218"></a>
 <span class="sourceLineNo">219</span>   * @param sysTable backup system 
table<a name="line.219"></a>
 <span class="sourceLineNo">220</span>   * @return total number of deleted 
backup images<a name="line.220"></a>
-<span class="sourceLineNo">221</span>   * @throws IOException<a 
name="line.221"></a>
+<span class="sourceLineNo">221</span>   * @throws IOException if deleting the 
backup fails<a name="line.221"></a>
 <span class="sourceLineNo">222</span>   */<a name="line.222"></a>
 <span class="sourceLineNo">223</span>  private int deleteBackup(String 
backupId, BackupSystemTable sysTable) throws IOException {<a 
name="line.223"></a>
-<span class="sourceLineNo">224</span><a name="line.224"></a>
-<span class="sourceLineNo">225</span>    BackupInfo backupInfo = 
sysTable.readBackupInfo(backupId);<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span>    int totalDeleted = 0;<a 
name="line.227"></a>
-<span class="sourceLineNo">228</span>    if (backupInfo != null) {<a 
name="line.228"></a>
-<span class="sourceLineNo">229</span>      LOG.info("Deleting backup " + 
backupInfo.getBackupId() + " ...");<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      // Step 1: clean up data for backup 
session (idempotent)<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      
BackupUtils.cleanupBackupData(backupInfo, conn.getConfiguration());<a 
name="line.231"></a>
-<span class="sourceLineNo">232</span>      // List of tables in this backup;<a 
name="line.232"></a>
-<span class="sourceLineNo">233</span>      List&lt;TableName&gt; tables = 
backupInfo.getTableNames();<a name="line.233"></a>
-<span class="sourceLineNo">234</span>      long startTime = 
backupInfo.getStartTs();<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      for (TableName tn : tables) {<a 
name="line.235"></a>
-<span class="sourceLineNo">236</span>        boolean isLastBackupSession = 
isLastBackupSession(sysTable, tn, startTime);<a name="line.236"></a>
-<span class="sourceLineNo">237</span>        if (isLastBackupSession) {<a 
name="line.237"></a>
-<span class="sourceLineNo">238</span>          continue;<a name="line.238"></a>
-<span class="sourceLineNo">239</span>        }<a name="line.239"></a>
-<span class="sourceLineNo">240</span>        // else<a name="line.240"></a>
-<span class="sourceLineNo">241</span>        List&lt;BackupInfo&gt; 
affectedBackups = getAffectedBackupSessions(backupInfo, tn, sysTable);<a 
name="line.241"></a>
-<span class="sourceLineNo">242</span>        for (BackupInfo info : 
affectedBackups) {<a name="line.242"></a>
-<span class="sourceLineNo">243</span>          if (info.equals(backupInfo)) 
{<a name="line.243"></a>
-<span class="sourceLineNo">244</span>            continue;<a 
name="line.244"></a>
-<span class="sourceLineNo">245</span>          }<a name="line.245"></a>
-<span class="sourceLineNo">246</span>          
removeTableFromBackupImage(info, tn, sysTable);<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>      Map&lt;byte[], String&gt; map = 
sysTable.readBulkLoadedFiles(backupId);<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      FileSystem fs = 
FileSystem.get(conn.getConfiguration());<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      boolean success = true;<a 
name="line.251"></a>
-<span class="sourceLineNo">252</span>      int numDeleted = 0;<a 
name="line.252"></a>
-<span class="sourceLineNo">253</span>      for (String f : map.values()) {<a 
name="line.253"></a>
-<span class="sourceLineNo">254</span>        Path p = new Path(f);<a 
name="line.254"></a>
-<span class="sourceLineNo">255</span>        try {<a name="line.255"></a>
-<span class="sourceLineNo">256</span>          LOG.debug("Delete backup info " 
+ p + " for " + backupInfo.getBackupId());<a name="line.256"></a>
-<span class="sourceLineNo">257</span>          if (!fs.delete(p)) {<a 
name="line.257"></a>
-<span class="sourceLineNo">258</span>            if (fs.exists(p)) {<a 
name="line.258"></a>
-<span class="sourceLineNo">259</span>              LOG.warn(f + " was not 
deleted");<a name="line.259"></a>
-<span class="sourceLineNo">260</span>              success = false;<a 
name="line.260"></a>
-<span class="sourceLineNo">261</span>            }<a name="line.261"></a>
-<span class="sourceLineNo">262</span>          } else {<a name="line.262"></a>
-<span class="sourceLineNo">263</span>            numDeleted++;<a 
name="line.263"></a>
-<span class="sourceLineNo">264</span>          }<a name="line.264"></a>
-<span class="sourceLineNo">265</span>        } catch (IOException ioe) {<a 
name="line.265"></a>
-<span class="sourceLineNo">266</span>          LOG.warn(f + " was not 
deleted", ioe);<a name="line.266"></a>
-<span class="sourceLineNo">267</span>          success = false;<a 
name="line.267"></a>
-<span class="sourceLineNo">268</span>        }<a name="line.268"></a>
-<span class="sourceLineNo">269</span>      }<a name="line.269"></a>
-<span class="sourceLineNo">270</span>      if (LOG.isDebugEnabled()) {<a 
name="line.270"></a>
-<span class="sourceLineNo">271</span>        LOG.debug(numDeleted + " bulk 
loaded files out of " + map.size() + " were deleted");<a name="line.271"></a>
-<span class="sourceLineNo">272</span>      }<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      if (success) {<a 
name="line.273"></a>
-<span class="sourceLineNo">274</span>        sysTable.deleteBulkLoadedRows(new 
ArrayList&lt;byte[]&gt;(map.keySet()));<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">277</span>      
sysTable.deleteBackupInfo(backupInfo.getBackupId());<a name="line.277"></a>
-<span class="sourceLineNo">278</span>      LOG.info("Delete backup " + 
backupInfo.getBackupId() + " completed.");<a name="line.278"></a>
-<span class="sourceLineNo">279</span>      totalDeleted++;<a 
name="line.279"></a>
-<span class="sourceLineNo">280</span>    } else {<a name="line.280"></a>
-<span class="sourceLineNo">281</span>      LOG.warn("Delete backup failed: no 
information found for backupID=" + backupId);<a name="line.281"></a>
-<span class="sourceLineNo">282</span>    }<a name="line.282"></a>
-<span class="sourceLineNo">283</span>    return totalDeleted;<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<a name="line.286"></a>
-<span class="sourceLineNo">287</span>      
removeTableFromBackupImage(BackupInfo info, TableName tn, BackupSystemTable 
sysTable)<a name="line.287"></a>
-<span class="sourceLineNo">288</span>          throws IOException {<a 
name="line.288"></a>
-<span class="sourceLineNo">289</span>    List&lt;TableName&gt; tables = 
info.getTableNames();<a name="line.289"></a>
-<span class="sourceLineNo">290</span>    LOG.debug("Remove " + tn + " from " + 
info.getBackupId() + " tables="<a name="line.290"></a>
-<span class="sourceLineNo">291</span>        + info.getTableListAsString());<a 
name="line.291"></a>
-<span class="sourceLineNo">292</span>    if (tables.contains(tn)) {<a 
name="line.292"></a>
-<span class="sourceLineNo">293</span>      tables.remove(tn);<a 
name="line.293"></a>
-<span class="sourceLineNo">294</span><a name="line.294"></a>
-<span class="sourceLineNo">295</span>      if (tables.isEmpty()) {<a 
name="line.295"></a>
-<span class="sourceLineNo">296</span>        LOG.debug("Delete backup info " + 
info.getBackupId());<a name="line.296"></a>
-<span class="sourceLineNo">297</span><a name="line.297"></a>
-<span class="sourceLineNo">298</span>        
sysTable.deleteBackupInfo(info.getBackupId());<a name="line.298"></a>
-<span class="sourceLineNo">299</span>        // Idempotent operation<a 
name="line.299"></a>
-<span class="sourceLineNo">300</span>        
BackupUtils.cleanupBackupData(info, conn.getConfiguration());<a 
name="line.300"></a>
-<span class="sourceLineNo">301</span>      } else {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>        info.setTables(tables);<a 
name="line.302"></a>
-<span class="sourceLineNo">303</span>        
sysTable.updateBackupInfo(info);<a name="line.303"></a>
-<span class="sourceLineNo">304</span>        // Now, clean up directory for 
table (idempotent)<a name="line.304"></a>
-<span class="sourceLineNo">305</span>        cleanupBackupDir(info, tn, 
conn.getConfiguration());<a name="line.305"></a>
-<span class="sourceLineNo">306</span>      }<a name="line.306"></a>
-<span class="sourceLineNo">307</span>    }<a name="line.307"></a>
-<span class="sourceLineNo">308</span>  }<a name="line.308"></a>
-<span class="sourceLineNo">309</span><a name="line.309"></a>
-<span class="sourceLineNo">310</span>  private List&lt;BackupInfo&gt; 
getAffectedBackupSessions(BackupInfo backupInfo, TableName tn,<a 
name="line.310"></a>
-<span class="sourceLineNo">311</span>      BackupSystemTable table) throws 
IOException {<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    LOG.debug("GetAffectedBackupInfos 
for: " + backupInfo.getBackupId() + " table=" + tn);<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    long ts = backupInfo.getStartTs();<a 
name="line.313"></a>
-<span class="sourceLineNo">314</span>    List&lt;BackupInfo&gt; list = new 
ArrayList&lt;BackupInfo&gt;();<a name="line.314"></a>
-<span class="sourceLineNo">315</span>    List&lt;BackupInfo&gt; history = 
table.getBackupHistory(backupInfo.getBackupRootDir());<a name="line.315"></a>
-<span class="sourceLineNo">316</span>    // Scan from most recent to 
backupInfo<a name="line.316"></a>
-<span class="sourceLineNo">317</span>    // break when backupInfo reached<a 
name="line.317"></a>
-<span class="sourceLineNo">318</span>    for (BackupInfo info : history) {<a 
name="line.318"></a>
-<span class="sourceLineNo">319</span>      if (info.getStartTs() == ts) {<a 
name="line.319"></a>
-<span class="sourceLineNo">320</span>        break;<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      }<a name="line.321"></a>
-<span class="sourceLineNo">322</span>      List&lt;TableName&gt; tables = 
info.getTableNames();<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      if (tables.contains(tn)) {<a 
name="line.323"></a>
-<span class="sourceLineNo">324</span>        BackupType bt = info.getType();<a 
name="line.324"></a>
-<span class="sourceLineNo">325</span>        if (bt == BackupType.FULL) {<a 
name="line.325"></a>
-<span class="sourceLineNo">326</span>          // Clear list if we encounter 
FULL backup<a name="line.326"></a>
-<span class="sourceLineNo">327</span>          list.clear();<a 
name="line.327"></a>
-<span class="sourceLineNo">328</span>        } else {<a name="line.328"></a>
-<span class="sourceLineNo">329</span>          
LOG.debug("GetAffectedBackupInfos for: " + backupInfo.getBackupId() + " table=" 
+ tn<a name="line.329"></a>
-<span class="sourceLineNo">330</span>              + " added " + 
info.getBackupId() + " tables=" + info.getTableListAsString());<a 
name="line.330"></a>
-<span class="sourceLineNo">331</span>          list.add(info);<a 
name="line.331"></a>
-<span class="sourceLineNo">332</span>        }<a name="line.332"></a>
-<span class="sourceLineNo">333</span>      }<a name="line.333"></a>
-<span class="sourceLineNo">334</span>    }<a name="line.334"></a>
-<span class="sourceLineNo">335</span>    return list;<a name="line.335"></a>
-<span class="sourceLineNo">336</span>  }<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>   * Clean up the data at target 
directory<a name="line.339"></a>
-<span class="sourceLineNo">340</span>   * @throws IOException<a 
name="line.340"></a>
-<span class="sourceLineNo">341</span>   */<a name="line.341"></a>
-<span class="sourceLineNo">342</span>  private void 
cleanupBackupDir(BackupInfo backupInfo, TableName table, Configuration conf)<a 
name="line.342"></a>
-<span class="sourceLineNo">343</span>      throws IOException {<a 
name="line.343"></a>
-<span class="sourceLineNo">344</span>    try {<a name="line.344"></a>
-<span class="sourceLineNo">345</span>      // clean up the data at target 
directory<a name="line.345"></a>
-<span class="sourceLineNo">346</span>      String targetDir = 
backupInfo.getBackupRootDir();<a name="line.346"></a>
-<span class="sourceLineNo">347</span>      if (targetDir == null) {<a 
name="line.347"></a>
-<span class="sourceLineNo">348</span>        LOG.warn("No target directory 
specified for " + backupInfo.getBackupId());<a name="line.348"></a>
-<span class="sourceLineNo">349</span>        return;<a name="line.349"></a>
-<span class="sourceLineNo">350</span>      }<a name="line.350"></a>
+<span class="sourceLineNo">224</span>    BackupInfo backupInfo = 
sysTable.readBackupInfo(backupId);<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span>    int totalDeleted = 0;<a 
name="line.226"></a>
+<span class="sourceLineNo">227</span>    if (backupInfo != null) {<a 
name="line.227"></a>
+<span class="sourceLineNo">228</span>      LOG.info("Deleting backup " + 
backupInfo.getBackupId() + " ...");<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      // Step 1: clean up data for backup 
session (idempotent)<a name="line.229"></a>
+<span class="sourceLineNo">230</span>      
BackupUtils.cleanupBackupData(backupInfo, conn.getConfiguration());<a 
name="line.230"></a>
+<span class="sourceLineNo">231</span>      // List of tables in this backup;<a 
name="line.231"></a>
+<span class="sourceLineNo">232</span>      List&lt;TableName&gt; tables = 
backupInfo.getTableNames();<a name="line.232"></a>
+<span class="sourceLineNo">233</span>      long startTime = 
backupInfo.getStartTs();<a name="line.233"></a>
+<span class="sourceLineNo">234</span>      for (TableName tn : tables) {<a 
name="line.234"></a>
+<span class="sourceLineNo">235</span>        boolean isLastBackupSession = 
isLastBackupSession(sysTable, tn, startTime);<a name="line.235"></a>
+<span class="sourceLineNo">236</span>        if (isLastBackupSession) {<a 
name="line.236"></a>
+<span class="sourceLineNo">237</span>          continue;<a name="line.237"></a>
+<span class="sourceLineNo">238</span>        }<a name="line.238"></a>
+<span class="sourceLineNo">239</span>        // else<a name="line.239"></a>
+<span class="sourceLineNo">240</span>        List&lt;BackupInfo&gt; 
affectedBackups = getAffectedBackupSessions(backupInfo, tn, sysTable);<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>        for (BackupInfo info : 
affectedBackups) {<a name="line.241"></a>
+<span class="sourceLineNo">242</span>          if (info.equals(backupInfo)) 
{<a name="line.242"></a>
+<span class="sourceLineNo">243</span>            continue;<a 
name="line.243"></a>
+<span class="sourceLineNo">244</span>          }<a name="line.244"></a>
+<span class="sourceLineNo">245</span>          
removeTableFromBackupImage(info, tn, sysTable);<a name="line.245"></a>
+<span class="sourceLineNo">246</span>        }<a name="line.246"></a>
+<span class="sourceLineNo">247</span>      }<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      Map&lt;byte[], String&gt; map = 
sysTable.readBulkLoadedFiles(backupId);<a name="line.248"></a>
+<span class="sourceLineNo">249</span>      FileSystem fs = 
FileSystem.get(conn.getConfiguration());<a name="line.249"></a>
+<span class="sourceLineNo">250</span>      boolean success = true;<a 
name="line.250"></a>
+<span class="sourceLineNo">251</span>      int numDeleted = 0;<a 
name="line.251"></a>
+<span class="sourceLineNo">252</span>      for (String f : map.values()) {<a 
name="line.252"></a>
+<span class="sourceLineNo">253</span>        Path p = new Path(f);<a 
name="line.253"></a>
+<span class="sourceLineNo">254</span>        try {<a name="line.254"></a>
+<span class="sourceLineNo">255</span>          LOG.debug("Delete backup info " 
+ p + " for " + backupInfo.getBackupId());<a name="line.255"></a>
+<span class="sourceLineNo">256</span>          if (!fs.delete(p)) {<a 
name="line.256"></a>
+<span class="sourceLineNo">257</span>            if (fs.exists(p)) {<a 
name="line.257"></a>
+<span class="sourceLineNo">258</span>              LOG.warn(f + " was not 
deleted");<a name="line.258"></a>
+<span class="sourceLineNo">259</span>              success = false;<a 
name="line.259"></a>
+<span class="sourceLineNo">260</span>            }<a name="line.260"></a>
+<span class="sourceLineNo">261</span>          } else {<a name="line.261"></a>
+<span class="sourceLineNo">262</span>            numDeleted++;<a 
name="line.262"></a>
+<span class="sourceLineNo">263</span>          }<a name="line.263"></a>
+<span class="sourceLineNo">264</span>        } catch (IOException ioe) {<a 
name="line.264"></a>
+<span class="sourceLineNo">265</span>          LOG.warn(f + " was not 
deleted", ioe);<a name="line.265"></a>
+<span class="sourceLineNo">266</span>          success = false;<a 
name="line.266"></a>
+<span class="sourceLineNo">267</span>        }<a name="line.267"></a>
+<span class="sourceLineNo">268</span>      }<a name="line.268"></a>
+<span class="sourceLineNo">269</span>      if (LOG.isDebugEnabled()) {<a 
name="line.269"></a>
+<span class="sourceLineNo">270</span>        LOG.debug(numDeleted + " bulk 
loaded files out of " + map.size() + " were deleted");<a name="line.270"></a>
+<span class="sourceLineNo">271</span>      }<a name="line.271"></a>
+<span class="sourceLineNo">272</span>      if (success) {<a 
name="line.272"></a>
+<span class="sourceLineNo">273</span>        sysTable.deleteBulkLoadedRows(new 
ArrayList&lt;&gt;(map.keySet()));<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>      
sysTable.deleteBackupInfo(backupInfo.getBackupId());<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      LOG.info("Delete backup " + 
backupInfo.getBackupId() + " completed.");<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      totalDeleted++;<a 
name="line.278"></a>
+<span class="sourceLineNo">279</span>    } else {<a name="line.279"></a>
+<span class="sourceLineNo">280</span>      LOG.warn("Delete backup failed: no 
information found for backupID=" + backupId);<a name="line.280"></a>
+<span class="sourceLineNo">281</span>    }<a name="line.281"></a>
+<span class="sourceLineNo">282</span>    return totalDeleted;<a 
name="line.282"></a>
+<span class="sourceLineNo">283</span>  }<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span>  private void 
removeTableFromBackupImage(BackupInfo info, TableName tn, BackupSystemTable 
sysTable)<a name="line.285"></a>
+<span class="sourceLineNo">286</span>          throws IOException {<a 
name="line.286"></a>
+<span class="sourceLineNo">287</span>    List&lt;TableName&gt; tables = 
info.getTableNames();<a name="line.287"></a>
+<span class="sourceLineNo">288</span>    LOG.debug("Remove " + tn + " from " + 
info.getBackupId() + " tables="<a name="line.288"></a>
+<span class="sourceLineNo">289</span>        + info.getTableListAsString());<a 
name="line.289"></a>
+<span class="sourceLineNo">290</span>    if (tables.contains(tn)) {<a 
name="line.290"></a>
+<span class="sourceLineNo">291</span>      tables.remove(tn);<a 
name="line.291"></a>
+<span class="sourceLineNo">292</span><a name="line.292"></a>
+<span class="sourceLineNo">293</span>      if (tables.isEmpty()) {<a 
name="line.293"></a>
+<span class="sourceLineNo">294</span>        LOG.debug("Delete backup info " + 
info.getBackupId());<a name="line.294"></a>
+<span class="sourceLineNo">295</span><a name="line.295"></a>
+<span class="sourceLineNo">296</span>        
sysTable.deleteBackupInfo(info.getBackupId());<a name="line.296"></a>
+<span class="sourceLineNo">297</span>        // Idempotent operation<a 
name="line.297"></a>
+<span class="sourceLineNo">298</span>        
BackupUtils.cleanupBackupData(info, conn.getConfiguration());<a 
name="line.298"></a>
+<span class="sourceLineNo">299</span>      } else {<a name="line.299"></a>
+<span class="sourceLineNo">300</span>        info.setTables(tables);<a 
name="line.300"></a>
+<span class="sourceLineNo">301</span>        
sysTable.updateBackupInfo(info);<a name="line.301"></a>
+<span class="sourceLineNo">302</span>        // Now, clean up directory for 
table (idempotent)<a name="line.302"></a>
+<span class="sourceLineNo">303</span>        cleanupBackupDir(info, tn, 
conn.getConfiguration());<a name="line.303"></a>
+<span class="sourceLineNo">304</span>      }<a name="line.304"></a>
+<span class="sourceLineNo">305</span>    }<a name="line.305"></a>
+<span class="sourceLineNo">306</span>  }<a name="line.306"></a>
+<span class="sourceLineNo">307</span><a name="line.307"></a>
+<span class="sourceLineNo">308</span>  private List&lt;BackupInfo&gt; 
getAffectedBackupSessions(BackupInfo backupInfo, TableName tn,<a 
name="line.308"></a>
+<span class="sourceLineNo">309</span>      BackupSystemTable table) throws 
IOException {<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    LOG.debug("GetAffectedBackupInfos 
for: " + backupInfo.getBackupId() + " table=" + tn);<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    long ts = backupInfo.getStartTs();<a 
name="line.311"></a>
+<span class="sourceLineNo">312</span>    List&lt;BackupInfo&gt; list = new 
ArrayList&lt;&gt;();<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    List&lt;BackupInfo&gt; history = 
table.getBackupHistory(backupInfo.getBackupRootDir());<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    // Scan from most recent to 
backupInfo<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    // break when backupInfo reached<a 
name="line.315"></a>
+<span class="sourceLineNo">316</span>    for (BackupInfo info : history) {<a 
name="line.316"></a>
+<span class="sourceLineNo">317</span>      if (info.getStartTs() == ts) {<a 
name="line.317"></a>
+<span class="sourceLineNo">318</span>        break;<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      }<a name="line.319"></a>
+<span class="sourceLineNo">320</span>      List&lt;TableName&gt; tables = 
info.getTableNames();<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      if (tables.contains(tn)) {<a 
name="line.321"></a>
+<span class="sourceLineNo">322</span>        BackupType bt = info.getType();<a 
name="line.322"></a>
+<span class="sourceLineNo">323</span>        if (bt == BackupType.FULL) {<a 
name="line.323"></a>
+<span class="sourceLineNo">324</span>          // Clear list if we encounter 
FULL backup<a name="line.324"></a>
+<span class="sourceLineNo">325</span>          list.clear();<a 
name="line.325"></a>
+<span class="sourceLineNo">326</span>        } else {<a name="line.326"></a>
+<span class="sourceLineNo">327</span>          
LOG.debug("GetAffectedBackupInfos for: " + backupInfo.getBackupId() + " table=" 
+ tn<a name="line.327"></a>
+<span class="sourceLineNo">328</span>              + " added " + 
info.getBackupId() + " tables=" + info.getTableListAsString());<a 
name="line.328"></a>
+<span class="sourceLineNo">329</span>          list.add(info);<a 
name="line.329"></a>
+<span class="sourceLineNo">330</span>        }<a name="line.330"></a>
+<span class="sourceLineNo">331</span>      }<a name="line.331"></a>
+<span class="sourceLineNo">332</span>    }<a name="line.332"></a>
+<span class="sourceLineNo">333</span>    return list;<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>  /**<a name="line.336"></a>
+<span class="sourceLineNo">337</span>   * Clean up the data at target 
directory<a name="line.337"></a>
+<span class="sourceLineNo">338</span>   * @throws IOException if cleaning up 
the backup directory fails<a name="line.338"></a>
+<span class="sourceLineNo">339</span>   */<a name="line.339"></a>
+<span class="sourceLineNo">340</span>  private void 
cleanupBackupDir(BackupInfo backupInfo, TableName table, Configuration conf)<a 
name="line.340"></a>
+<span class="sourceLineNo">341</span>      throws IOException {<a 
name="line.341"></a>
+<span class="sourceLineNo">342</span>    try {<a name="line.342"></a>
+<span class="sourceLineNo">343</span>      // clean up the data at target 
directory<a name="line.343"></a>
+<span class="sourceLineNo">344</span>      String targetDir = 
backupInfo.getBackupRootDir();<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      if (targetDir == null) {<a 
name="line.345"></a>
+<span class="sourceLineNo">346</span>        LOG.warn("No target directory 
specified for " + backupInfo.getBackupId());<a name="line.346"></a>
+<span class="sourceLineNo">347</span>        return;<a name="line.347"></a>
+<span class="sourceLineNo">348</span>      }<a name="line.348"></a>
+<span class="sourceLineNo">349</span><a name="line.349"></a>
+<span class="sourceLineNo">350</span>      FileSystem outputFs = 
FileSystem.get(new Path(backupInfo.getBackupRootDir()).toUri(), conf);<a 
name="line.350"></a>
 <span class="sourceLineNo">351</span><a name="line.351"></a>
-<span class="sourceLineNo">352</span>      FileSystem outputFs = 
FileSystem.get(new Path(backupInfo.getBackupRootDir()).toUri(), conf);<a 
name="line.352"></a>
-<span class="sourceLineNo">353</span><a name="line.353"></a>
-<span class="sourceLineNo">354</span>      Path targetDirPath =<a 
name="line.354"></a>
-<span class="sourceLineNo">355</span>          new 
Path(BackupUtils.getTableBackupDir(backupInfo.getBackupRootDir(),<a 
name="line.355"></a>
-<span class="sourceLineNo">356</span>            backupInfo.getBackupId(), 
table));<a name="line.356"></a>
-<span class="sourceLineNo">357</span>      if (outputFs.delete(targetDirPath, 
true)) {<a name="line.357"></a>
-<span class="sourceLineNo">358</span>        LOG.info("Cleaning up backup data 
at " + targetDirPath.toString() + " done.");<a name="line.358"></a>
-<span class="sourceLineNo">359</span>      } else {<a name="line.359"></a>
-<span class="sourceLineNo">360</span>        LOG.info("No data has been found 
in " + targetDirPath.toString() + ".");<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>    } catch (IOException e1) {<a 
name="line.363"></a>
-<span class="sourceLineNo">364</span>      LOG.error("Cleaning up backup data 
of " + backupInfo.getBackupId() + " for table " + table<a name="line.364"></a>
-<span class="sourceLineNo">365</span>          + "at " + 
backupInfo.getBackupRootDir() + " failed due to " + e1.getMessage() + ".");<a 
name="line.365"></a>
-<span class="sourceLineNo">366</span>      throw e1;<a name="line.366"></a>
-<span class="sourceLineNo">367</span>    }<a name="line.367"></a>
-<span class="sourceLineNo">368</span>  }<a name="line.368"></a>
-<span class="sourceLineNo">369</span><a name="line.369"></a>
-<span class="sourceLineNo">370</span>  private boolean 
isLastBackupSession(BackupSystemTable table, TableName tn, long startTime)<a 
name="line.370"></a>
-<span class="sourceLineNo">371</span>      throws IOException {<a 
name="line.371"></a>
-<span class="sourceLineNo">372</span>    List&lt;BackupInfo&gt; history = 
table.getBackupHistory();<a name="line.372"></a>
-<span class="sourceLineNo">373</span>    for (BackupInfo info : history) {<a 
name="line.373"></a>
-<span class="sourceLineNo">374</span>      List&lt;TableName&gt; tables = 
info.getTableNames();<a name="line.374"></a>
-<span class="sourceLineNo">375</span>      if (!tables.contains(tn)) {<a 
name="line.375"></a>
-<span class="sourceLineNo">376</span>        continue;<a name="line.376"></a>
-<span class="sourceLineNo">377</span>      }<a name="line.377"></a>
-<span class="sourceLineNo">378</span>      if (info.getStartTs() &lt;= 
startTime) {<a name="line.378"></a>
-<span class="sourceLineNo">379</span>        return true;<a 
name="line.379"></a>
-<span class="sourceLineNo">380</span>      } else {<a name="line.380"></a>
-<span class="sourceLineNo">381</span>        return false;<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>    return false;<a name="line.384"></a>
-<span class="sourceLineNo">385</span>  }<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span>  @Override<a name="line.387"></a>
-<span class="sourceLineNo">388</span>  public List&lt;BackupInfo&gt; 
getHistory(int n) throws IOException {<a name="line.388"></a>
-<span class="sourceLineNo">389</span>    try (final BackupSystemTable table = 
new BackupSystemTable(conn)) {<a name="line.389"></a>
-<span class="sourceLineNo">390</span>      List&lt;BackupInfo&gt; history = 
table.getBackupHistory();<a name="line.390"></a>
-<span class="sourceLineNo">391</span>      if (history.size() &lt;= n) return 
history;<a name="line.391"></a>
-<span class="sourceLineNo">392</span>      List&lt;BackupInfo&gt; list = new 
ArrayList&lt;BackupInfo&gt;();<a name="line.392"></a>
-<span class="sourceLineNo">393</span>      for (int i = 0; i &lt; n; i++) {<a 
name="line.393"></a>
-<span class="sourceLineNo">394</span>        list.add(history.get(i));<a 
name="line.394"></a>
-<span class="sourceLineNo">395</span>      }<a name="line.395"></a>
-<span class="sourceLineNo">396</span>      return list;<a name="line.396"></a>
-<span class="sourceLineNo">397</span>    }<a name="line.397"></a>
-<span class="sourceLineNo">398</span>  }<a name="line.398"></a>
-<span class="sourceLineNo">399</span><a name="line.399"></a>
-<span class="sourceLineNo">400</span>  @Override<a name="line.400"></a>
-<span class="sourceLineNo">401</span>  public List&lt;BackupInfo&gt; 
getHistory(int n, BackupInfo.Filter... filters) throws IOException {<a 
name="line.401"></a>
-<span class="sourceLineNo">402</span>    if (filters.length == 0) return 
getHistory(n);<a name="line.402"></a>
+<span class="sourceLineNo">352</span>      Path targetDirPath =<a 
name="line.352"></a>
+<span class="sourceLineNo">353</span>          new 
Path(BackupUtils.getTableBackupDir(backupInfo.getBackupRootDir(),<a 
name="line.353"></a>
+<span class="sourceLineNo">354</span>            backupInfo.getBackupId(), 
table));<a name="line.354"></a>
+<span class="sourceLineNo">355</span>      if (outputFs.delete(targetDirPath, 
true)) {<a name="line.355"></a>
+<span class="sourceLineNo">356</span>        LOG.info("Cleaning up backup data 
at " + targetDirPath.toString() + " done.");<a name="line.356"></a>
+<span class="sourceLineNo">357</span>      } else {<a name="line.357"></a>
+<span class="sourceLineNo">358</span>        LOG.info("No data has been found 
in " + targetDirPath.toString() + ".");<a name="line.358"></a>
+<span class="sourceLineNo">359</span>      }<a name="line.359"></a>
+<span class="sourceLineNo">360</span>    } catch (IOException e1) {<a 
name="line.360"></a>
+<span class="sourceLineNo">361</span>      LOG.error("Cleaning up backup data 
of " + backupInfo.getBackupId() + " for table " + table<a name="line.361"></a>
+<span class="sourceLineNo">362</span>          + "at " + 
backupInfo.getBackupRootDir() + " failed due to " + e1.getMessage() + ".");<a 
name="line.362"></a>
+<span class="sourceLineNo">363</span>      throw e1;<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>  private boolean 
isLastBackupSession(BackupSystemTable table, TableName tn, long startTime)<a 
name="line.367"></a>
+<span class="sourceLineNo">368</span>      throws IOException {<a 
name="line.368"></a>
+<span class="sourceLineNo">369</span>    List&lt;BackupInfo&gt; history = 
table.getBackupHistory();<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    for (BackupInfo info : history) {<a 
name="line.370"></a>
+<span class="sourceLineNo">371</span>      List&lt;TableName&gt; tables = 
info.getTableNames();<a name="line.371"></a>
+<span class="sourceLineNo">372</span>      if (!tables.contains(tn)) {<a 
name="line.372"></a>
+<span class="sourceLineNo">373</span>        continue;<a name="line.373"></a>
+<span class="sourceLineNo">374</span>      }<a name="line.374"></a>
+<span class="sourceLineNo">375</span>      return info.getStartTs() &lt;= 
startTime;<a name="line.375"></a>
+<span class="sourceLineNo">376</span>    }<a name="line.376"></a>
+<span class="sourceLineNo">377</span>    return false;<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>  @Override<a name="line.380"></a>
+<span class="sourceLineNo">381</span>  public List&lt;BackupInfo&gt; 
getHistory(int n) throws IOException {<a name="line.381"></a>
+<span class="sourceLineNo">382</span>    try (final BackupSystemTable table = 
new BackupSystemTable(conn)) {<a name="line.382"></a>
+<span class="sourceLineNo">383</span>      List&lt;BackupInfo&gt; history = 
table.getBackupHistory();<a name="line.383"></a>
+<span class="sourceLineNo">384</span><a name="line.384"></a>
+<span class="sourceLineNo">385</span>      if (history.size() &lt;= n) {<a 
name="line.385"></a>
+<span class="sourceLineNo">386</span>        return history;<a 
name="line.386"></a>
+<span class="sourceLineNo">387</span>      }<a name="line.387"></a>
+<span class="sourceLineNo">388</span><a name="line.388"></a>
+<span class="sourceLineNo">389</span>      List&lt;BackupInfo&gt; list = new 
ArrayList&lt;&gt;();<a name="line.389"></a>
+<span class="sourceLineNo">390</span>      for (int i = 0; i &lt; n; i++) {<a 
name="line.390"></a>
+<span class="sourceLineNo">391</span>        list.add(history.get(i));<a 
name="line.391"></a>
+<span class="sourceLineNo">392</span>      }<a name="line.392"></a>
+<span class="sourceLineNo">393</span>      return list;<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><a name="line.396"></a>
+<span class="sourceLineNo">397</span>  @Override<a name="line.397"></a>
+<span class="sourceLineNo">398</span>  public List&lt;BackupInfo&gt; 
getHistory(int n, BackupInfo.Filter... filters) throws IOException {<a 
name="line.398"></a>
+<span class="sourceLineNo">399</span>    if (filters.length == 0) {<a 
name="line.399"></a>
+<span class="sourceLineNo">400</span>      return getHistory(n);<a 
name="line.400"></a>
+<span class="sourceLineNo">401</span>    }<a name="line.401"></a>
+<span class="sourceLineNo">402</span><a name="line.402"></a>
 <span class="sourceLineNo">403</span>    try (final BackupSystemTable table = 
new BackupSystemTable(conn)) {<a name="line.403"></a>
 <span class="sourceLineNo">404</span>      List&lt;BackupInfo&gt; history = 
table.getBackupHistory();<a name="line.404"></a>
-<span class="sourceLineNo">405</span>      List&lt;BackupInfo&gt; result = new 
ArrayList&lt;BackupInfo&gt;();<a name="line.405"></a>
+<span class="sourceLineNo">405</span>      List&lt;BackupInfo&gt; result = new 
ArrayList&lt;&gt;();<a name="line.405"></a>
 <span class="sourceLineNo">406</span>      for (BackupInfo bi : history) {<a 
name="line.406"></a>
-<span class="sourceLineNo">407</span>        if (result.size() == n) break;<a 
name="line.407"></a>
-<span class="sourceLineNo">408</span>        boolean passed = true;<a 
name="line.408"></a>
-<span class="sourceLineNo">409</span>        for (int i = 0; i &lt; 
filters.length; i++) {<a name="line.409"></a>
-<span class="sourceLineNo">410</span>          if (!filters[i].apply(bi)) {<a 
name="line.410"></a>
-<span class="sourceLineNo">411</span>            passed = false;<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 (passed) {<a 
name="line.415"></a>
-<span class="sourceLineNo">416</span>          result.add(bi);<a 
name="line.416"></a>
+<span class="sourceLineNo">407</span>        if (result.size() == n) {<a 
name="line.407"></a>
+<span class="sourceLineNo">408</span>          break;<a name="line.408"></a>
+<span class="sourceLineNo">409</span>        }<a name="line.409"></a>
+<span class="sourceLineNo">410</span><a name="line.410"></a>
+<span class="sourceLineNo">411</span>        boolean passed = true;<a 
name="line.411"></a>
+<span class="sourceLineNo">412</span>        for (int i = 0; i &lt; 
filters.length; i++) {<a name="line.412"></a>
+<span class="sourceLineNo">413</span>          if (!filters[i].apply(bi)) {<a 
name="line.413"></a>
+<span class="sourceLineNo">414</span>            passed = false;<a 
name="line.414"></a>
+<span class="sourceLineNo">415</span>            break;<a name="line.415"></a>
+<span class="sourceLineNo">416</span>          }<a name="line.416"></a>
 <span class="sourceLineNo">417</span>        }<a name="line.417"></a>
-<span class="sourceLineNo">418</span>      }<a name="line.418"></a>
-<span class="sourceLineNo">419</span>      return result;<a 
name="line.419"></a>
-<span class="sourceLineNo">420</span>    }<a name="line.420"></a>
-<span class="sourceLineNo">421</span>  }<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span>  @Override<a name="line.423"></a>
-<span class="sourceLineNo">424</span>  public List&lt;BackupSet&gt; 
listBackupSets() throws IOException {<a name="line.424"></a>
-<span class="sourceLineNo">425</span>    try (final BackupSystemTable table = 
new BackupSystemTable(conn)) {<a name="line.425"></a>
-<span class="sourceLineNo">426</span>      List&lt;String&gt; list = 
table.listBackupSets();<a name="line.426"></a>
-<span class="sourceLineNo">427</span>      List&lt;BackupSet&gt; bslist = new 
ArrayList&lt;BackupSet&gt;();<a name="line.427"></a>
-<span class="sourceLineNo">428</span>      for (String s : list) {<a 
name="line.428"></a>
-<span class="sourceLineNo">429</span>        List&lt;TableName&gt; tables = 
table.describeBackupSet(s);<a name="line.429"></a>
-<span class="sourceLineNo">430</span>        if (tables != null) {<a 
name="line.430"></a>
-<span class="sourceLineNo">431</span>          bslist.add(new BackupSet(s, 
tables));<a name="line.431"></a>
-<span class="sourceLineNo">432</span>        }<a name="line.432"></a>
-<span class="sourceLineNo">433</span>      }<a name="line.433"></a>
-<span class="sourceLineNo">434</span>      return bslist;<a 
name="line.434"></a>
-<span class="sourceLineNo">435</span>    }<a name="line.435"></a>
-<span class="sourceLineNo">436</span>  }<a name="line.436"></a>
-<span class="sourceLineNo">437</span><a name="line.437"></a>
-<span class="sourceLineNo">438</span>  @Override<a name="line.438"></a>
-<span class="sourceLineNo">439</span>  public BackupSet getBackupSet(String 
name) throws IOException {<a name="line.439"></a>
-<span class="sourceLineNo">440</span>    try (final BackupSystemTable table = 
new BackupSystemTable(conn)) {<a name="line.440"></a>
-<span class="sourceLineNo">441</span>      List&lt;TableName&gt; list = 
table.describeBackupSet(name);<a name="line.441"></a>
-<span class="sourceLineNo">442</span>      if (list == null) return null;<a 
name="line.442"></a>
-<span class="sourceLineNo">443</span>      return new BackupSet(name, list);<a 
name="line.443"></a>
-<span class="sourceLineNo">444</span>    }<a name="line.444"></a>
-<span class="sourceLineNo">445</span>  }<a name="line.445"></a>
-<span class="sourceLineNo">446</span><a name="line.446"></a>
-<span class="sourceLineNo">447</span>  @Override<a name="line.447"></a>
-<span class="sourceLineNo">448</span>  public boolean deleteBackupSet(String 
name) throws IOException {<a name="line.448"></a>
-<span class="sourceLineNo">449</span>    try (final BackupSystemTable table = 
new BackupSystemTable(conn)) {<a name="line.449"></a>
-<span class="sourceLineNo">450</span>      if (table.describeBackupSet(name) 
== null) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span>        return false;<a 
name="line.451"></a>
-<span class="sourceLineNo">452</span>      }<a name="line.452"></a>
-<span class="sourceLineNo">453</span>      table.deleteBackupSet(name);<a 
name="line.453"></a>
-<span class="sourceLineNo">454</span>      return true;<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>  @Override<a name="line.458"></a>
-<span class="sourceLineNo">459</span>  public void addToBackupSet(String name, 
TableName[] tables) throws IOException {<a name="line.459"></a>
-<span class="sourceLineNo">460</span>    String[] tableNames = new 
String[tables.length];<a name="line.460"></a>
-<span class="sourceLineNo">461</span>    try (final BackupSystemTable table = 
new BackupSystemTable(conn);<a name="line.461"></a>
-<span class="sourceLineNo">462</span>        final Admin admin = 
conn.getAdmin()) {<a name="line.462"></a>
-<span class="sourceLineNo">463</span>      for (int i = 0; i &lt; 
tables.length; i++) {<a name="line.463"></a>
-<span class="sourceLineNo">464</span>        tableNames[i] = 
tables[i].getNameAsString();<a name="line.464"></a>
-<span class="sourceLineNo">465</span>        if 
(!admin.tableExists(TableName.valueOf(tableNames[i]))) {<a name="line.465"></a>
-<span class="sourceLineNo">466</span>          throw new IOException("Cannot 
add " + tableNames[i] + " because it doesn't exist");<a name="line.466"></a>
-<span class="sourceLineNo">467</span>        }<a name="line.467"></a>
-<span class="sourceLineNo">468</span>      }<a name="line.468"></a>
-<span class="sourceLineNo">469</span>      table.addToBackupSet(name, 
tableNames);<a name="line.469"></a>
-<span class="sourceLineNo">470</span>      LOG.info("Added tables [" + 
StringUtils.join(tableNames, " ") + "] to '" + name<a name="line.470"></a>
-<span class="sourceLineNo">471</span>          + "' backup set");<a 
name="line.471"></a>
-<span class="sourceLineNo">472</span>    }<a name="line.472"></a>
-<span class="sourceLineNo">473</span>  }<a name="line.473"></a>
-<span class="sourceLineNo">474</span><a name="line.474"></a>
-<span class="sourceLineNo">475</span>  @Override<a name="line.475"></a>
-<span class="sourceLineNo">476</span>  public void removeFromBackupSet(String 
name, TableName[] tables) throws IOException {<a name="line.476"></a>
-<span class="sourceLineNo">477</span>    LOG.info("Removing tables [" + 
StringUtils.join(tables, " ") + "] from '" + name + "'");<a name="line.477"></a>
-<span class="sourceLineNo">478</span>    try (final BackupSystemTable table = 
new BackupSystemTable(conn)) {<a name="line.478"></a>
-<span class="sourceLineNo">479</span>      table.removeFromBackupSet(name, 
toStringArray(tables));<a name="line.479"></a>
-<span class="sourceLineNo">480</span>      LOG.info("Removing tables [" + 
StringUtils.join(tables, " ") + "] from '" + name<a name="line.480"></a>
-<span class="sourceLineNo">481</span>          + "' completed.");<a 
name="line.481"></a>
-<span class="sourceLineNo">482</span>    }<a name="line.482"></a>
-<span class="sourceLineNo">483</span>  }<a name="line.483"></a>
-<span class="sourceLineNo">484</span><a name="line.484"></a>
-<span class="sourceLineNo">485</span>  private String[] 
toStringArray(TableName[] list) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span>    String[] arr = new 
String[list.length];<a name="line.486"></a>
-<span class="sourceLineNo">487</span>    for (int i = 0; i &lt; list.length; 
i++) {<a name="line.487"></a>
-<span class="sourceLineNo">488</span>      arr[i] = list[i].toString();<a 
name="line.488"></a>
+<span class="sourceLineNo">418</span>        if (passed) {<a 
name="line.418"></a>
+<span class="sourceLineNo">419</span>          result.add(bi);<a 
name="line.419"></a>
+<span class="sourceLineNo">420</span>        }<a name="line.420"></a>
+<span class="sourceLineNo">421</span>      }<a name="line.421"></a>
+<span class="sourceLineNo">422</span>      return result;<a 
name="line.422"></a>
+<span class="sourceLineNo">423</span>    }<a name="line.423"></a>
+<span class="sourceLineNo">424</span>  }<a name="line.424"></a>
+<span class="sourceLineNo">425</span><a name="line.425"></a>
+<span class="sourceLineNo">426</span>  @Override<a name="line.426"></a>
+<span class="sourceLineNo">427</span>  public List&lt;BackupSet&gt; 
listBackupSets() throws IOException {<a name="line.427"></a>
+<span class="sourceLineNo">428</span>    try (final BackupSystemTable table = 
new BackupSystemTable(conn)) {<a name="line.428"></a>
+<span class="sourceLineNo">429</span>      List&lt;String&gt; list = 
table.listBackupSets();<a name="line.429"></a>
+<span class="sourceLineNo">430</span>      List&lt;BackupSet&gt; bslist = new 
ArrayList&lt;&gt;();<a name="line.430"></a>
+<span class="sourceLineNo">431</span>      for (String s : list) {<a 
name="line.431"></a>
+<span class="sourceLineNo">432</span>        List&lt;TableName&gt; tables = 
table.describeBackupSet(s);<a name="line.432"></a>
+<span class="sourceLineNo">433</span>        if (tables != null) {<a 
name="line.433"></a>
+<span class="sourceLineNo">434</span>          bslist.add(new BackupSet(s, 
tables));<a name="line.434"></a>
+<span class="sourceLineNo">435</span>        }<a name="line.435"></a>
+<span class="sourceLineNo">436</span>      }<a name="line.436"></a>
+<span class="sourceLineNo">437</span>      return bslist;<a 
name="line.437"></a>
+<span class="sourceLineNo">438</span>    }<a name="line.438"></a>
+<span class="sourceLineNo">439</span>  }<a name="line.439"></a>
+<span class="sourceLineNo">440</span><a name="line.440"></a>
+<span class="sourceLineNo">441</span>  @Override<a name="line.441"></a>
+<span class="sourceLineNo">442</span>  public BackupSet getBackupSet(String 
name) throws IOException {<a name="line.442"></a>
+<span class="sourceLineNo">443</span>    try (final BackupSystemTable table = 
new BackupSystemTable(conn)) {<a name="line.443"></a>
+<span class="sourceLineNo">444</span>      List&lt;TableName&gt; list = 
table.describeBackupSet(name);<a name="line.444"></a>
+<span class="sourceLineNo">445</span><a name="line.445"></a>
+<span class="sourceLineNo">446</span>      if (list == null) {<a 
name="line.446"></a>
+<span class="sourceLineNo">447</span>        return null;<a 
name="line.447"></a>
+<span class="sourceLineNo">448</span>      }<a name="line.448"></a>
+<span class="sourceLineNo">449</span><a name="line.449"></a>
+<span class="sourceLineNo">450</span>      return new BackupSet(name, list);<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><a name="line.453"></a>
+<span class="sourceLineNo">454</span>  @Override<a name="line.454"></a>
+<span class="sourceLineNo">455</span>  public boolean deleteBackupSet(String 
name) throws IOException {<a name="line.455"></a>
+<span class="sourceLineNo">456</span>    try (final BackupSystemTable table = 
new BackupSystemTable(conn)) {<a name="line.456"></a>
+<span class="sourceLineNo">457</span>      if (table.describeBackupSet(name) 
== null) {<a name="line.457"></a>
+<span class="sourceLineNo">458</span>        return false;<a 
name="line.458"></a>
+<span class="sourceLineNo">459</span>      }<a name="line.459"></a>
+<span class="sourceLineNo">460</span>      table.deleteBackupSet(name);<a 
name="line.460"></a>
+<span class="sourceLineNo">461</span>      return true;<a name="line.461"></a>
+<span class="sourceLineNo">462</span>    }<a name="line.462"></a>
+<span class="sourceLineNo">463</span>  }<a name="line.463"></a>
+<span class="sourceLineNo">464</span><a name="line.464"></a>
+<span class="sourceLineNo">465</span>  @Override<a name="line.465"></a>
+<span class="sourceLineNo">466</span>  public void addToBackupSet(String name, 
TableName[] tables) throws IOException {<a name="line.466"></a>
+<span class="sourceLineNo">467</span>    String[] tableNames = new 
String[tables.length];<a name="line.467"></a>
+<span class="sourceLineNo">468</span>    try (final BackupSystemTable table = 
new BackupSystemTable(conn);<a name="line.468"></a>
+<span class="sourceLineNo">469</span>        final Admin admin = 
conn.getAdmin()) {<a name="line.469"></a>
+<span class="sourceLineNo">470</span>      for (int i = 0; i &lt; 
tables.length; i++) {<a name="line.470"></a>
+<span class="sourceLineNo">471</span>        tableNames[i] = 
tables[i].getNameAsString();<a name="line.471"></a>
+<span class="sourceLineNo">472</span>        if 
(!admin.tableExists(TableName.valueOf(tableNames[i]))) {<a name="line.472"></a>
+<span class="sourceLineNo">473</span>          throw new IOException("Cannot 
add " + tableNames[i] + " because it doesn't exist");<a name="line.473"></a>
+<span class="sourceLineNo">474</span>        }<a name="line.474"></a>
+<span class="sourceLineNo">475</span>      }<a name="line.475"></a>
+<span class="sourceLineNo">476</span>      table.addToBackupSet(name, 
tableNames);<a name="line.476"></a>
+<span class="sourceLineNo">477</span>      LOG.info("Added tables [" + 
StringUtils.join(tableNames, " ") + "] to '" + name<a name="line.477"></a>
+<span class="sourceLineNo">478</span>          + "' backup set");<a 
name="line.478"></a>
+<span class="sourceLineNo">479</span>    }<a name="line.479"></a>
+<span class="sourceLineNo">480</span>  }<a name="line.480"></a>
+<span class="sourceLineNo">481</span><a name="line.481"></a>
+<span class="sourceLineNo">482</span>  @Override<a name="line.482"></a>
+<span class="sourceLineNo">483</span>  public void removeFromBackupSet(String 
name, TableName[] tables) throws IOException {<a name="line.483"></a>
+<span class="sourceLineNo">484</span>    LOG.info("Removing tables [" + 
StringUtils.join(tables, " ") + "] from '" + name + "'");<a name="line.484"></a>
+<span class="sourceLineNo">485</span>    try (final BackupSystemTable table = 
new BackupSystemTable(conn)) {<a name="line.485"></a>
+<span class="sourceLineNo">486</span>      table.removeFromBackupSet(name, 
toStringArray(tables));<a name="line.486"></a>
+<span class="sourceLineNo">487</span>      LOG.info("Removing tables [" + 
StringUtils.join(tables, " ") + "] from '" + name<a name="line.487"></a>
+<span class="sourceLineNo">488</span>          + "' completed.");<a 
name="line.488"></a>
 <span class="sourceLineNo">489</span>    }<a name="line.489"></a>
-<span class="sourceLineNo">490</span>    return arr;<a name="line.490"></a>
-<span class="sourceLineNo">491</span>  }<a name="line.491"></a>
-<span class="sourceLineNo">492</span><a name="line.492"></a>
-<span class="sourceLineNo">493</span>  @Override<a name="line.493"></a>
-<span class="sourceLineNo">494</span>  public void restore(RestoreRequest 
request) throws IOException {<a name="line.494"></a>
-<span class="sourceLineNo">495</span>    if (request.isCheck()) {<a 
name="line.495"></a>
-<span class="sourceLineNo">496</span>      HashMap&lt;TableName, 
BackupManifest&gt; backupManifestMap = new HashMap&lt;&gt;();<a 
name="line.496"></a>
-<span class="sourceLineNo">497</span>      // check and load backup image 
manifest for the tables<a name="line.497"></a>
-<span class="sourceLineNo">498</span>      Path rootPath = new 
Path(request.getBackupRootDir());<a name="line.498"></a>
-<span class="sourceLineNo">499</span>      String backupId = 
request.getBackupId();<a name="line.499"></a>
-<span class="sourceLineNo">500</span>      TableName[] sTableArray = 
request.getFromTables();<a name="line.500"></a>
-<span class="sourceLineNo">501</span>      
HBackupFileSystem.checkImageManifestExist(backupManifestMap, sTableArray,<a 
name="line.501"></a>
-<span class="sourceLineNo">502</span>        conn.getConfiguration(), 
rootPath, backupId);<a name="line.502"></a>
-<span class="sourceLineNo">503</span><a name="line.503"></a>
-<span class="sourceLineNo">504</span>      // Check and validate the backup 
image and its dependencies<a name="line.504"></a>
-<span class="sourceLineNo">505</span><a name="line.505"></a>
-<span class="sourceLineNo">506</span>      if 
(BackupUtils.validate(backupManifestMap, conn.getConfiguration())) {<a 
name="line.506"></a>
-<span class="sourceLineNo">507</span>        LOG.info(CHECK_OK);<a 
name="line.507"></a>
-<span class="sourceLineNo">508</span>      } else {<a name="line.508"></a>
-<span class="sourceLineNo">509</span>        LOG.error(CHECK_FAILED);<a 
name="line.509"></a>
-<span class="sourceLineNo">510</span>      }<a name="line.510"></a>
-<span class="sourceLineNo">511</span>      return;<a name="line.511"></a>
-<span class="sourceLineNo">512</span>    }<a name="line.512"></a>
-<span class="sourceLineNo">513</span>    // Execute restore request<a 
name="line.513"></a>
-<span class="sourceLineNo">514</span>    new RestoreTablesClient(conn, 
request).execute();<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>  @Override<a name="line.517"></a>
-<span class="sourceLineNo">518</span>  public String 
backupTables(BackupRequest request) throws IOException {<a name="line.518"></a>
-<span class="sourceLineNo">519</span>    BackupType type = 
request.getBackupType();<a name="line.519"></a>
-<span class="sourceLineNo">520</span>    String targetRootDir = 
request.getTargetRootDir();<a name="line.520"></a>
-<span class="sourceLineNo">521</span>    List&lt;TableName&gt; tableList = 
request.getTableList();<a name="line.521"></a>
+<span class="sourceLineNo">490</span>  }<a name="line.490"></a>
+<span class="sourceLineNo">491</span><a name="line.491"></a>
+<span class="sourceLineNo">492</span>  private String[] 
toStringArray(TableName[] list) {<a name="line.492"></a>
+<span class="sourceLineNo">493</span>    String[] arr = new 
String[list.length];<a name="line.493"></a>
+<span class="sourceLineNo">494</span>    for (int i = 0; i &lt; list.length; 
i++) {<a name="line.494"></a>
+<span class="sourceLineNo">495</span>      arr[i] = list[i].toString();<a 
name="line.495"></a>
+<span class="sourceLineNo">496</span>    }<a name="line.496"></a>
+<span class="sourceLineNo">497</span>    return arr;<a name="line.497"></a>
+<span class="sourceLineNo">498</span>  }<a name="line.498"></a>
+<span class="sourceLineNo">499</span><a name="line.499"></a>
+<span class="sourceLineNo">500</span>  @Override<a name="line.500"></a>
+<span class="sourceLineNo">501</span>  public void restore(RestoreRequest 
request) throws IOException {<a name="line.501"></a>
+<span class="sourceLineNo">502</span>    if (request.isCheck()) {<a 
name="line.502"></a>
+<span class="sourceLineNo">503</span>      HashMap&lt;TableName, 
BackupManifest&gt; backupManifestMap = new HashMap&lt;&gt;();<a 
name="line.503"></a>
+<span class="sourceLineNo">504</span>      // check and load backup image 
manifest for the tables<a name="line.504"></a>
+<span class="sourceLineNo">505</span>      Path rootPath = new 
Path(request.getBackupRootDir());<a name="line.505"></a>
+<span class="sourceLineNo">506</span>      String backupId = 
request.getBackupId();<a name="line.506"></a>
+<span class="sourceLineNo">507</span>      TableName[] sTableArray = 
request.getFromTables();<a name="line.507"></a>
+<span class="sourceLineNo">508</span>      
HBackupFileSystem.checkImageManifestExist(backupManifestMap, sTableArray,<a 
name="line.508"></a>
+<span class="sourceLineNo">509</span>        conn.getConfiguration(), 
rootPath, backupId);<a name="line.509"></a>
+<span class="sourceLineNo">510</span><a name="line.510"></a>
+<span class="sourceLineNo">511</span>      // Check and validate the backup 
image and its dependencies<a name="line.511"></a>
+<span class="sourceLineNo">512</span>      if 
(BackupUtils.validate(backupManifestMap, conn.getConfiguration())) {<a 
name="line.512"></a>
+<span class="sourceLineNo">513</span>        LOG.info(CHECK_OK);<a 
name="line.513"></a>
+<span class="sourceLineNo">514</span>      } else {<a name="line.514"></a>
+<span class="sourceLineNo">515</span>        LOG.error(CHECK_FAILED);<a 
name="line.515"></a>
+<span class="sourceLineNo">516</span>      }<a name="line.516"></a>
+<span class="sourceLineNo">517</span>      return;<a name="line.517"></a>
+<span class="sourceLineNo">518</span>    }<a name="line.518"></a>
+<span class="sourceLineNo">519</span>    // Execute restore request<a 
name="line.519"></a>
+<span class="sourceLineNo">520</span>    new RestoreTablesClient(conn, 
request).execute();<a name="line.520"></a>
+<span class="sourceLineNo">521</span>  }<a name="line.521"></a>
 <span class="sourceLineNo">522</span><a name="line.522"></a>
-<span class="sourceLineNo">523</span>    String backupId = 
BackupRestoreConstants.BACKUPID_PREFIX + 
EnvironmentEdgeManager.currentTime();<a name="line.523"></a>
-<span class="sourceLineNo">524</span>    if (type == BackupType.INCREMENTAL) 
{<a name="line.524"></a>
-<span class="sourceLineNo">525</span>      Set&lt;TableName&gt; incrTableSet = 
null;<a name="line.525"></a>
-<span class="sourceLineNo">526</span>      try (BackupSystemTable table = new 
BackupSystemTable(conn)) {<a name="line.526"></a>
-<span class="sourceLineNo">527</span>        incrTableSet = 
table.getIncrementalBackupTableSet(targetRootDir);<a name="line.527"></a>
-<span class="sourceLineNo">528</span>      }<a name="line.528"></a>
-<span class="sourceLineNo">529</span><a name="line.529"></a>
-<span class="sourceLineNo">530</span>      if (incrTableSet.isEmpty()) {<a 
name="line.530"></a>
-<span class="sourceLineNo">531</span>        String msg =<a 
name="line.531"></a>
-<span class="sourceLineNo">532</span>            "Incremental backup table set 
contains no tables. "<a name="line.532"></a>
-<span class="sourceLineNo">533</span>                + "You need to run full 
backup first "<a name="line.533"></a>
-<span class="sourceLineNo">534</span>                + (tableList != null ? 
"on " + StringUtils.join(tableList, ",") : "");<a name="line.534"></a>
+<span class="sourceLineNo">523</span>  @Override<a name="line.523"></a>
+<span class="sourceLineNo">524</span>  public String 
backupTables(BackupRequest request) throws IOException {<a name="line.524"></a>
+<span class="sourceLineNo">525</span>    BackupType type = 
request.getBackupType();<a name="line.525"></a>
+<span class="sourceLineNo">526</span>    String targetRootDir = 
request.getTargetRootDir();<a name="line.526"></a>
+<span class="sourceLineNo">527</span>    List&lt;TableName&gt; tableList = 
request.getTableList();<a name="line.527"></a>
+<span class="sourceLineNo">528</span><a name="line.528"></a>
+<span class="sourceLineNo">529</span>    String backupId = 
BackupRestoreConstants.BACKUPID_PREFIX + 
EnvironmentEdgeManager.currentTime();<a name="line.529"></a>
+<span class="sourceLineNo">530</span>    if (type == BackupType.INCREMENTAL) 
{<a name="line.530"></a>
+<span class="sourceLineNo">531</span>      Set&lt;TableName&gt; 
incrTableSet;<a name="line.531"></a>
+<span class="sourceLineNo">532</span>      try (BackupSystemTable table = new 
BackupSystemTable(conn)) {<a name="line.532"></a>
+<span class="sourceLineNo">533</span>        incrTableSet = 
table.getIncrementalBackupTableSet(targetRootDir);<a name="line.533"></a>
+<span class="sourceLineNo">534</span>      }<a name="line.534"></a>
 <span class="sourceLineNo">535</span><a name="line.535"></a>
-<span class="sourceLineNo">536</span>        throw new IOException(msg);<a 
name="line.536"></a>
-<span class="sourceLineNo">537</span>      }<a name="line.537"></a>
-<span class="sourceLineNo">538</span>      if (tableList != null) {<a 
name="line.538"></a>
-<span class="sourceLineNo">539</span>        
tableList.removeAll(incrTableSet);<a name="line.539"></a>
-<span class="sourceLineNo">540</span>        if (!tableList.isEmpty()) {<a 
name="line.540"></a>
-<span class="sourceLineNo">541</span>          String extraTables = 
StringUtils.join(tableList, ",");<a name="line.541"></a>
-<span class="sourceLineNo">542</span>          String msg =<a 
name="line.542"></a>
-<span class="sourceLineNo">543</span>              "Some tables (" + 
extraTables + ") haven't gone through full backup. "<a name="line.543"></a>
-<span class="sourceLineNo">544</span>                  + "Perform full backup 
on " + extraTables + " first, " + "then retry the command";<a 
name="line.544"></a>
-<span class="sourceLineNo">545</span>          throw new IOException(msg);<a 
name="line.545"></a>
-<span class="sourceLineNo">546</span>        }<a name="line.546"></a>
-<span class="sourceLineNo">547</span>      }<a name="line.547"></a>
-<span class="sourceLineNo">548</span>      tableList = 
Lists.newArrayList(incrTableSet);<a name="line.548"></a>
-<span class="sourceLineNo">549</span>    }<a name="line.549"></a>
-<span class="sourceLineNo">550</span>    if (tableList != null &amp;&amp; 
!tableList.isEmpty()) {<a name="line.550"></a>
-<span class="sourceLineNo">551</span>      for (TableName table : tableList) 
{<a name="line.551"></a>
-<span class="sourceLineNo">552</span>        String targetTableBackupDir =<a 
name="line.552"></a>
-<span class="sourceLineNo">553</span>            
HBackupFileSystem.getTableBackupDir(targetRootDir, backupId, table);<a 
name="line.553"></a>
-<span class="sourceLineNo">554</span>        Path targetTableBackupDirPath = 
new Path(targetTableBackupDir);<a name="line.554"></a>
-<span class="sourceLineNo">555</span>        FileSystem outputFs =<a 
name="line.555"></a>
-<span class="sourceLineNo">556</span>            
FileSystem.get(targetTableBackupDirPath.toUri(), conn.getConfiguration());<a 
name="line.556"></a>
-<span class="sourceLineNo">557</span>        if 
(outputFs.exists(targetTableBackupDirPath)) {<a name="line.557"></a>
-<span class="sourceLineNo">558</span>          throw new IOException("Target 
backup directory " + targetTableBackupDir<a name="line.558"></a>
-<span class="sourceLineNo">559</span>              + " exists already.");<a 
name="line.559"></a>
-<span class="sourceLineNo">560</span>        }<a name="line.560"></a>
-<span class="sourceLineNo">561</span>        
outputFs.mkdirs(targetTableBackupDirPath);<a name="line.561"></a>
-<span class="sourceLineNo">562</span>      }<a name="line.562"></a>
-<span class="sourceLineNo">563</span>      ArrayList&lt;TableName&gt; 
nonExistingTableList = null;<a name="line.563"></a>
-<span class="sourceLineNo">564</span>      try (Admin admin = conn.getAdmin()) 
{<a name="line.564"></a>
-<span class="sourceLineNo">565</span>        for (TableName tableName : 
tableList) {<a name="line.565"></a>
-<span class="sourceLineNo">566</span>          if 
(!admin.tableExists(tableName)) {<a name="line.566"></a>
-<span class="sourceLineNo">567</span>            if (nonExistingTableList == 
null) {<a name="line.567"></a>
-<span class="sourceLineNo">568</span>              nonExistingTableList = new 
ArrayList&lt;&gt;();<a name="line.568"></a>
-<span class="sourceLineNo">569</span>            }<a name="line.569"></a>
-<span class="sourceLineNo">570</span>            
nonExistingTableList.add(tableName);<a name="line.570"></a>
-<span class="sourceLineNo">571</span>          }<a name="line.571"></a>
-<span class="sourceLineNo">572</span>        }<a name="line.572"></a>
-<span class="sourceLineNo">573</span>      }<a name="line.573"></a>
-<span class="sourceLineNo">574</span>      if (nonExistingTableList != null) 
{<a name="line.574"></a>
-<span class="sourceLineNo">575</span>        if (type == 
BackupType.INCREMENTAL) {<a name="line.575"></a>
-<span class="sourceLineNo">576</span>          // Update incremental backup 
set<a name="line.576"></a>
-<span class="sourceLineNo">577</span>          tableList = 
excludeNonExistingTables(tableList, nonExistingTableList);<a 
name="line.577"></a>
-<span class="sourceLineNo">578</span>        } else {<a name="line.578"></a>
-<span class="sourceLineNo">579</span>          // Throw exception only in full 
mode - we try to backup non-existing table<a name="line.579"></a>
-<span class="sourceLineNo">580</span>          throw new 
IOException("Non-existing tables found in the table list: "<a 
name="line.580"></a>
-<span class="sourceLineNo">581</span>              + nonExistingTableList);<a 
name="line.581"></a>
-<span class="sourceLineNo">582</span>        }<a name="line.582"></a>
-<span class="sourceLineNo">583</span>      }<a name="line.583"></a>
-<span class="sourceLineNo">584</span>    }<a name="line.584"></a>
-<span class="sourceLineNo">585</span><a name="line.585"></a>
-<span class="sourceLineNo">586</span>    // update table list<a 
name="line.586"></a>
-<span class="sourceLineNo">587</span>    BackupRequest.Builder builder = new 
BackupRequest.Builder();<a name="line.587"></a>
-<span class="sourceLineNo">588</span>    request =<a name="line.588"></a>
-<span class="sourceLineNo">589</span>        
builder.withBackupType(request.getBackupType()).withTableList(tableList)<a 
name="line.589"></a>
-<span class="sourceLineNo">590</span>            
.withTargetRootDir(request.getTargetRootDir())<a name="line.590"></a>
-<span class="sourceLineNo">591</span>            
.withBackupSetName(request.getBackupSetName()).withTotalTasks(request.getTotalTasks())<a
 name="line.591"></a>
-<span class="sourceLineNo">592</span>            .withBandwidthPerTasks((int) 
request.getBandwidth()).build();<a name="line.592"></a>
-<span class="sourceLineNo">593</span><a name="line.593"></a>
-<span class="sourceLineNo">594</span>    TableBackupClient client = null;<a 
name="line.594"></a>
-<span class="sourceLineNo">595</span>    try {<a name="line.595"></a>
-<span class="sourceLineNo">596</span>      client = 
BackupClientFactory.create(conn, backupId, request);<a name="line.596"></a>
-<span class="sourceLineNo">597</span>    } catch (IOException e) {<a 
name="line.597"></a>
-<span class="sourceLineNo">598</span>      LOG.error("There is an active 
session already running");<a name="line.598"></a>
-<span class="sourceLineNo">599</span>      throw e;<a name="line.599"></a>
-<span class="sourceLineNo">600</span>    }<a name="line.600"></a>
-<span class="sourceLineNo">601</span><a name="line.601"><

<TRUNCATED>

Reply via email to