http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8e0a5167/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.html
index fbffa2c..4f6f813 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/FullTableBackupClient.html
@@ -61,172 +61,175 @@
 <span class="sourceLineNo">053</span>public class FullTableBackupClient 
extends TableBackupClient {<a name="line.53"></a>
 <span class="sourceLineNo">054</span>  private static final Log LOG = 
LogFactory.getLog(FullTableBackupClient.class);<a name="line.54"></a>
 <span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span>  public FullTableBackupClient(final 
Connection conn, final String backupId, BackupRequest request)<a 
name="line.56"></a>
-<span class="sourceLineNo">057</span>      throws IOException {<a 
name="line.57"></a>
-<span class="sourceLineNo">058</span>    super(conn, backupId, request);<a 
name="line.58"></a>
-<span class="sourceLineNo">059</span>  }<a name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span>  /**<a name="line.61"></a>
-<span class="sourceLineNo">062</span>   * Do snapshot copy.<a 
name="line.62"></a>
-<span class="sourceLineNo">063</span>   * @param backupInfo backup info<a 
name="line.63"></a>
-<span class="sourceLineNo">064</span>   * @throws Exception exception<a 
name="line.64"></a>
-<span class="sourceLineNo">065</span>   */<a name="line.65"></a>
-<span class="sourceLineNo">066</span>  private void snapshotCopy(BackupInfo 
backupInfo) throws Exception {<a name="line.66"></a>
-<span class="sourceLineNo">067</span>    LOG.info("Snapshot copy is 
starting.");<a name="line.67"></a>
-<span class="sourceLineNo">068</span><a name="line.68"></a>
-<span class="sourceLineNo">069</span>    // set overall backup phase: 
snapshot_copy<a name="line.69"></a>
-<span class="sourceLineNo">070</span>    
backupInfo.setPhase(BackupPhase.SNAPSHOTCOPY);<a name="line.70"></a>
+<span class="sourceLineNo">056</span>  public FullTableBackupClient() {<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>  public FullTableBackupClient(final 
Connection conn, final String backupId, BackupRequest request)<a 
name="line.59"></a>
+<span class="sourceLineNo">060</span>      throws IOException {<a 
name="line.60"></a>
+<span class="sourceLineNo">061</span>    super(conn, backupId, request);<a 
name="line.61"></a>
+<span class="sourceLineNo">062</span>  }<a name="line.62"></a>
+<span class="sourceLineNo">063</span><a name="line.63"></a>
+<span class="sourceLineNo">064</span>  /**<a name="line.64"></a>
+<span class="sourceLineNo">065</span>   * Do snapshot copy.<a 
name="line.65"></a>
+<span class="sourceLineNo">066</span>   * @param backupInfo backup info<a 
name="line.66"></a>
+<span class="sourceLineNo">067</span>   * @throws Exception exception<a 
name="line.67"></a>
+<span class="sourceLineNo">068</span>   */<a name="line.68"></a>
+<span class="sourceLineNo">069</span>  protected void snapshotCopy(BackupInfo 
backupInfo) throws Exception {<a name="line.69"></a>
+<span class="sourceLineNo">070</span>    LOG.info("Snapshot copy is 
starting.");<a name="line.70"></a>
 <span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span>    // call ExportSnapshot to copy files 
based on hbase snapshot for backup<a name="line.72"></a>
-<span class="sourceLineNo">073</span>    // ExportSnapshot only support single 
snapshot export, need loop for multiple tables case<a name="line.73"></a>
-<span class="sourceLineNo">074</span>    BackupCopyJob copyService = 
BackupRestoreFactory.getBackupCopyJob(conf);<a name="line.74"></a>
-<span class="sourceLineNo">075</span><a name="line.75"></a>
-<span class="sourceLineNo">076</span>    // number of snapshots matches number 
of tables<a name="line.76"></a>
-<span class="sourceLineNo">077</span>    float numOfSnapshots = 
backupInfo.getSnapshotNames().size();<a name="line.77"></a>
+<span class="sourceLineNo">072</span>    // set overall backup phase: 
snapshot_copy<a name="line.72"></a>
+<span class="sourceLineNo">073</span>    
backupInfo.setPhase(BackupPhase.SNAPSHOTCOPY);<a name="line.73"></a>
+<span class="sourceLineNo">074</span><a name="line.74"></a>
+<span class="sourceLineNo">075</span>    // call ExportSnapshot to copy files 
based on hbase snapshot for backup<a name="line.75"></a>
+<span class="sourceLineNo">076</span>    // ExportSnapshot only support single 
snapshot export, need loop for multiple tables case<a name="line.76"></a>
+<span class="sourceLineNo">077</span>    BackupCopyJob copyService = 
BackupRestoreFactory.getBackupCopyJob(conf);<a name="line.77"></a>
 <span class="sourceLineNo">078</span><a name="line.78"></a>
-<span class="sourceLineNo">079</span>    LOG.debug("There are " + (int) 
numOfSnapshots + " snapshots to be copied.");<a name="line.79"></a>
-<span class="sourceLineNo">080</span><a name="line.80"></a>
-<span class="sourceLineNo">081</span>    for (TableName table : 
backupInfo.getTables()) {<a name="line.81"></a>
-<span class="sourceLineNo">082</span>      // Currently we simply set the sub 
copy tasks by counting the table snapshot number, we can<a name="line.82"></a>
-<span class="sourceLineNo">083</span>      // calculate the real files' size 
for the percentage in the future.<a name="line.83"></a>
-<span class="sourceLineNo">084</span>      // 
backupCopier.setSubTaskPercntgInWholeTask(1f / numOfSnapshots);<a 
name="line.84"></a>
-<span class="sourceLineNo">085</span>      int res = 0;<a name="line.85"></a>
-<span class="sourceLineNo">086</span>      String[] args = new String[4];<a 
name="line.86"></a>
-<span class="sourceLineNo">087</span>      args[0] = "-snapshot";<a 
name="line.87"></a>
-<span class="sourceLineNo">088</span>      args[1] = 
backupInfo.getSnapshotName(table);<a name="line.88"></a>
-<span class="sourceLineNo">089</span>      args[2] = "-copy-to";<a 
name="line.89"></a>
-<span class="sourceLineNo">090</span>      args[3] = 
backupInfo.getTableBackupDir(table);<a name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span>      LOG.debug("Copy snapshot " + 
args[1] + " to " + args[3]);<a name="line.92"></a>
-<span class="sourceLineNo">093</span>      res = copyService.copy(backupInfo, 
backupManager, conf, BackupType.FULL, args);<a name="line.93"></a>
-<span class="sourceLineNo">094</span>      // if one snapshot export failed, 
do not continue for remained snapshots<a name="line.94"></a>
-<span class="sourceLineNo">095</span>      if (res != 0) {<a 
name="line.95"></a>
-<span class="sourceLineNo">096</span>        LOG.error("Exporting Snapshot " + 
args[1] + " failed with return code: " + res + ".");<a name="line.96"></a>
-<span class="sourceLineNo">097</span><a name="line.97"></a>
-<span class="sourceLineNo">098</span>        throw new IOException("Failed of 
exporting snapshot " + args[1] + " to " + args[3]<a name="line.98"></a>
-<span class="sourceLineNo">099</span>            + " with reason code " + 
res);<a name="line.99"></a>
-<span class="sourceLineNo">100</span>      }<a name="line.100"></a>
-<span class="sourceLineNo">101</span>      LOG.info("Snapshot copy " + args[1] 
+ " finished.");<a name="line.101"></a>
-<span class="sourceLineNo">102</span>    }<a name="line.102"></a>
-<span class="sourceLineNo">103</span>  }<a name="line.103"></a>
-<span class="sourceLineNo">104</span><a name="line.104"></a>
-<span class="sourceLineNo">105</span>  /**<a name="line.105"></a>
-<span class="sourceLineNo">106</span>   * Backup request execution<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>   * @throws IOException<a 
name="line.107"></a>
-<span class="sourceLineNo">108</span>   */<a name="line.108"></a>
-<span class="sourceLineNo">109</span>  @Override<a name="line.109"></a>
-<span class="sourceLineNo">110</span>  public void execute() throws 
IOException {<a name="line.110"></a>
-<span class="sourceLineNo">111</span><a name="line.111"></a>
-<span class="sourceLineNo">112</span>    try (Admin admin = conn.getAdmin();) 
{<a name="line.112"></a>
-<span class="sourceLineNo">113</span><a name="line.113"></a>
-<span class="sourceLineNo">114</span>      // Begin BACKUP<a 
name="line.114"></a>
-<span class="sourceLineNo">115</span>      beginBackup(backupManager, 
backupInfo);<a name="line.115"></a>
-<span class="sourceLineNo">116</span>      String savedStartCode = null;<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>      boolean firstBackup = false;<a 
name="line.117"></a>
-<span class="sourceLineNo">118</span>      // do snapshot for full table 
backup<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span>      savedStartCode = 
backupManager.readBackupStartCode();<a name="line.120"></a>
-<span class="sourceLineNo">121</span>      firstBackup = savedStartCode == 
null || Long.parseLong(savedStartCode) == 0L;<a name="line.121"></a>
-<span class="sourceLineNo">122</span>      if (firstBackup) {<a 
name="line.122"></a>
-<span class="sourceLineNo">123</span>        // This is our first backup. 
Let's put some marker to system table so that we can hold the logs<a 
name="line.123"></a>
-<span class="sourceLineNo">124</span>        // while we do the backup.<a 
name="line.124"></a>
-<span class="sourceLineNo">125</span>        
backupManager.writeBackupStartCode(0L);<a name="line.125"></a>
-<span class="sourceLineNo">126</span>      }<a name="line.126"></a>
-<span class="sourceLineNo">127</span>      // We roll log here before we do 
the snapshot. It is possible there is duplicate data<a name="line.127"></a>
-<span class="sourceLineNo">128</span>      // in the log that is already in 
the snapshot. But if we do it after the snapshot, we<a name="line.128"></a>
-<span class="sourceLineNo">129</span>      // could have data loss.<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>      // A better approach is to do the 
roll log on each RS in the same global procedure as<a name="line.130"></a>
-<span class="sourceLineNo">131</span>      // the snapshot.<a 
name="line.131"></a>
-<span class="sourceLineNo">132</span>      LOG.info("Execute roll log 
procedure for full backup ...");<a name="line.132"></a>
-<span class="sourceLineNo">133</span><a name="line.133"></a>
-<span class="sourceLineNo">134</span>      Map&lt;String, String&gt; props = 
new HashMap&lt;String, String&gt;();<a name="line.134"></a>
-<span class="sourceLineNo">135</span>      props.put("backupRoot", 
backupInfo.getBackupRootDir());<a name="line.135"></a>
-<span class="sourceLineNo">136</span>      
admin.execProcedure(LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_SIGNATURE,<a
 name="line.136"></a>
-<span class="sourceLineNo">137</span>        
LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_NAME, props);<a 
name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span>      newTimestamps = 
backupManager.readRegionServerLastLogRollResult();<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      if (firstBackup) {<a 
name="line.140"></a>
-<span class="sourceLineNo">141</span>        // Updates registered log files<a 
name="line.141"></a>
-<span class="sourceLineNo">142</span>        // We record ALL old WAL files as 
registered, because<a name="line.142"></a>
-<span class="sourceLineNo">143</span>        // this is a first full backup in 
the system and these<a name="line.143"></a>
-<span class="sourceLineNo">144</span>        // files are not needed for next 
incremental backup<a name="line.144"></a>
-<span class="sourceLineNo">145</span>        List&lt;String&gt; logFiles = 
BackupUtils.getWALFilesOlderThan(conf, newTimestamps);<a name="line.145"></a>
-<span class="sourceLineNo">146</span>        
backupManager.recordWALFiles(logFiles);<a name="line.146"></a>
-<span class="sourceLineNo">147</span>      }<a name="line.147"></a>
-<span class="sourceLineNo">148</span><a name="line.148"></a>
-<span class="sourceLineNo">149</span>      // SNAPSHOT_TABLES:<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span>      
backupInfo.setPhase(BackupPhase.SNAPSHOT);<a name="line.150"></a>
-<span class="sourceLineNo">151</span>      for (TableName tableName : 
tableList) {<a name="line.151"></a>
-<span class="sourceLineNo">152</span>        String snapshotName =<a 
name="line.152"></a>
-<span class="sourceLineNo">153</span>            "snapshot_" + 
Long.toString(EnvironmentEdgeManager.currentTime()) + "_"<a name="line.153"></a>
-<span class="sourceLineNo">154</span>                + 
tableName.getNamespaceAsString() + "_" + tableName.getQualifierAsString();<a 
name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span>        snapshotTable(admin, tableName, 
snapshotName);<a name="line.156"></a>
-<span class="sourceLineNo">157</span>        
backupInfo.setSnapshotName(tableName, snapshotName);<a name="line.157"></a>
-<span class="sourceLineNo">158</span>      }<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>      // SNAPSHOT_COPY:<a 
name="line.160"></a>
-<span class="sourceLineNo">161</span>      // do snapshot copy<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>      LOG.debug("snapshot copy for " + 
backupId);<a name="line.162"></a>
-<span class="sourceLineNo">163</span>      snapshotCopy(backupInfo);<a 
name="line.163"></a>
-<span class="sourceLineNo">164</span>      // Updates incremental backup table 
set<a name="line.164"></a>
-<span class="sourceLineNo">165</span>      
backupManager.addIncrementalBackupTableSet(backupInfo.getTables());<a 
name="line.165"></a>
-<span class="sourceLineNo">166</span><a name="line.166"></a>
-<span class="sourceLineNo">167</span>      // BACKUP_COMPLETE:<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>      // set overall backup status: 
complete. Here we make sure to complete the backup.<a name="line.168"></a>
-<span class="sourceLineNo">169</span>      // After this checkpoint, even if 
entering cancel process, will let the backup finished<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      
backupInfo.setState(BackupState.COMPLETE);<a name="line.170"></a>
-<span class="sourceLineNo">171</span>      // The table list in backupInfo is 
good for both full backup and incremental backup.<a name="line.171"></a>
-<span class="sourceLineNo">172</span>      // For incremental backup, it 
contains the incremental backup table set.<a name="line.172"></a>
-<span class="sourceLineNo">173</span>      
backupManager.writeRegionServerLogTimestamp(backupInfo.getTables(), 
newTimestamps);<a name="line.173"></a>
-<span class="sourceLineNo">174</span><a name="line.174"></a>
-<span class="sourceLineNo">175</span>      HashMap&lt;TableName, 
HashMap&lt;String, Long&gt;&gt; newTableSetTimestampMap =<a name="line.175"></a>
-<span class="sourceLineNo">176</span>          
backupManager.readLogTimestampMap();<a name="line.176"></a>
-<span class="sourceLineNo">177</span><a name="line.177"></a>
-<span class="sourceLineNo">178</span>      Long newStartCode =<a 
name="line.178"></a>
-<span class="sourceLineNo">179</span>          
BackupUtils.getMinValue(BackupUtils<a name="line.179"></a>
-<span class="sourceLineNo">180</span>              
.getRSLogTimestampMins(newTableSetTimestampMap));<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      
backupManager.writeBackupStartCode(newStartCode);<a name="line.181"></a>
-<span class="sourceLineNo">182</span><a name="line.182"></a>
-<span class="sourceLineNo">183</span>      // backup complete<a 
name="line.183"></a>
-<span class="sourceLineNo">184</span>      completeBackup(conn, backupInfo, 
backupManager, BackupType.FULL, conf);<a name="line.184"></a>
-<span class="sourceLineNo">185</span>    } catch (Exception e) {<a 
name="line.185"></a>
-<span class="sourceLineNo">186</span>      failBackup(conn, backupInfo, 
backupManager, e, "Unexpected BackupException : ",<a name="line.186"></a>
-<span class="sourceLineNo">187</span>        BackupType.FULL, conf);<a 
name="line.187"></a>
-<span class="sourceLineNo">188</span>      throw new IOException(e);<a 
name="line.188"></a>
-<span class="sourceLineNo">189</span>    }<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">079</span>    // number of snapshots matches number 
of tables<a name="line.79"></a>
+<span class="sourceLineNo">080</span>    float numOfSnapshots = 
backupInfo.getSnapshotNames().size();<a name="line.80"></a>
+<span class="sourceLineNo">081</span><a name="line.81"></a>
+<span class="sourceLineNo">082</span>    LOG.debug("There are " + (int) 
numOfSnapshots + " snapshots to be copied.");<a name="line.82"></a>
+<span class="sourceLineNo">083</span><a name="line.83"></a>
+<span class="sourceLineNo">084</span>    for (TableName table : 
backupInfo.getTables()) {<a name="line.84"></a>
+<span class="sourceLineNo">085</span>      // Currently we simply set the sub 
copy tasks by counting the table snapshot number, we can<a name="line.85"></a>
+<span class="sourceLineNo">086</span>      // calculate the real files' size 
for the percentage in the future.<a name="line.86"></a>
+<span class="sourceLineNo">087</span>      // 
backupCopier.setSubTaskPercntgInWholeTask(1f / numOfSnapshots);<a 
name="line.87"></a>
+<span class="sourceLineNo">088</span>      int res = 0;<a name="line.88"></a>
+<span class="sourceLineNo">089</span>      String[] args = new String[4];<a 
name="line.89"></a>
+<span class="sourceLineNo">090</span>      args[0] = "-snapshot";<a 
name="line.90"></a>
+<span class="sourceLineNo">091</span>      args[1] = 
backupInfo.getSnapshotName(table);<a name="line.91"></a>
+<span class="sourceLineNo">092</span>      args[2] = "-copy-to";<a 
name="line.92"></a>
+<span class="sourceLineNo">093</span>      args[3] = 
backupInfo.getTableBackupDir(table);<a name="line.93"></a>
+<span class="sourceLineNo">094</span><a name="line.94"></a>
+<span class="sourceLineNo">095</span>      LOG.debug("Copy snapshot " + 
args[1] + " to " + args[3]);<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      res = copyService.copy(backupInfo, 
backupManager, conf, BackupType.FULL, args);<a name="line.96"></a>
+<span class="sourceLineNo">097</span>      // if one snapshot export failed, 
do not continue for remained snapshots<a name="line.97"></a>
+<span class="sourceLineNo">098</span>      if (res != 0) {<a 
name="line.98"></a>
+<span class="sourceLineNo">099</span>        LOG.error("Exporting Snapshot " + 
args[1] + " failed with return code: " + res + ".");<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span>        throw new IOException("Failed of 
exporting snapshot " + args[1] + " to " + args[3]<a name="line.101"></a>
+<span class="sourceLineNo">102</span>            + " with reason code " + 
res);<a name="line.102"></a>
+<span class="sourceLineNo">103</span>      }<a name="line.103"></a>
+<span class="sourceLineNo">104</span>      LOG.info("Snapshot copy " + args[1] 
+ " finished.");<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><a name="line.107"></a>
+<span class="sourceLineNo">108</span>  /**<a name="line.108"></a>
+<span class="sourceLineNo">109</span>   * Backup request execution<a 
name="line.109"></a>
+<span class="sourceLineNo">110</span>   * @throws IOException<a 
name="line.110"></a>
+<span class="sourceLineNo">111</span>   */<a name="line.111"></a>
+<span class="sourceLineNo">112</span>  @Override<a name="line.112"></a>
+<span class="sourceLineNo">113</span>  public void execute() throws 
IOException {<a name="line.113"></a>
+<span class="sourceLineNo">114</span>    try (Admin admin = conn.getAdmin();) 
{<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span>      // Begin BACKUP<a 
name="line.116"></a>
+<span class="sourceLineNo">117</span>      beginBackup(backupManager, 
backupInfo);<a name="line.117"></a>
+<span class="sourceLineNo">118</span>      String savedStartCode = null;<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>      boolean firstBackup = false;<a 
name="line.119"></a>
+<span class="sourceLineNo">120</span>      // do snapshot for full table 
backup<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span>      savedStartCode = 
backupManager.readBackupStartCode();<a name="line.122"></a>
+<span class="sourceLineNo">123</span>      firstBackup = savedStartCode == 
null || Long.parseLong(savedStartCode) == 0L;<a name="line.123"></a>
+<span class="sourceLineNo">124</span>      if (firstBackup) {<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>        // This is our first backup. 
Let's put some marker to system table so that we can hold the logs<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>        // while we do the backup.<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span>        
backupManager.writeBackupStartCode(0L);<a name="line.127"></a>
+<span class="sourceLineNo">128</span>      }<a name="line.128"></a>
+<span class="sourceLineNo">129</span>      // We roll log here before we do 
the snapshot. It is possible there is duplicate data<a name="line.129"></a>
+<span class="sourceLineNo">130</span>      // in the log that is already in 
the snapshot. But if we do it after the snapshot, we<a name="line.130"></a>
+<span class="sourceLineNo">131</span>      // could have data loss.<a 
name="line.131"></a>
+<span class="sourceLineNo">132</span>      // A better approach is to do the 
roll log on each RS in the same global procedure as<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      // the snapshot.<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>      LOG.info("Execute roll log 
procedure for full backup ...");<a name="line.134"></a>
+<span class="sourceLineNo">135</span><a name="line.135"></a>
+<span class="sourceLineNo">136</span>      Map&lt;String, String&gt; props = 
new HashMap&lt;String, String&gt;();<a name="line.136"></a>
+<span class="sourceLineNo">137</span>      props.put("backupRoot", 
backupInfo.getBackupRootDir());<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      
admin.execProcedure(LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_SIGNATURE,<a
 name="line.138"></a>
+<span class="sourceLineNo">139</span>        
LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_NAME, props);<a 
name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span>      newTimestamps = 
backupManager.readRegionServerLastLogRollResult();<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      if (firstBackup) {<a 
name="line.142"></a>
+<span class="sourceLineNo">143</span>        // Updates registered log files<a 
name="line.143"></a>
+<span class="sourceLineNo">144</span>        // We record ALL old WAL files as 
registered, because<a name="line.144"></a>
+<span class="sourceLineNo">145</span>        // this is a first full backup in 
the system and these<a name="line.145"></a>
+<span class="sourceLineNo">146</span>        // files are not needed for next 
incremental backup<a name="line.146"></a>
+<span class="sourceLineNo">147</span>        List&lt;String&gt; logFiles = 
BackupUtils.getWALFilesOlderThan(conf, newTimestamps);<a name="line.147"></a>
+<span class="sourceLineNo">148</span>        
backupManager.recordWALFiles(logFiles);<a name="line.148"></a>
+<span class="sourceLineNo">149</span>      }<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span>      // SNAPSHOT_TABLES:<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>      
backupInfo.setPhase(BackupPhase.SNAPSHOT);<a name="line.152"></a>
+<span class="sourceLineNo">153</span>      for (TableName tableName : 
tableList) {<a name="line.153"></a>
+<span class="sourceLineNo">154</span>        String snapshotName =<a 
name="line.154"></a>
+<span class="sourceLineNo">155</span>            "snapshot_" + 
Long.toString(EnvironmentEdgeManager.currentTime()) + "_"<a name="line.155"></a>
+<span class="sourceLineNo">156</span>                + 
tableName.getNamespaceAsString() + "_" + tableName.getQualifierAsString();<a 
name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span>        snapshotTable(admin, tableName, 
snapshotName);<a name="line.158"></a>
+<span class="sourceLineNo">159</span>        
backupInfo.setSnapshotName(tableName, snapshotName);<a name="line.159"></a>
+<span class="sourceLineNo">160</span>      }<a name="line.160"></a>
+<span class="sourceLineNo">161</span><a name="line.161"></a>
+<span class="sourceLineNo">162</span>      // SNAPSHOT_COPY:<a 
name="line.162"></a>
+<span class="sourceLineNo">163</span>      // do snapshot copy<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>      LOG.debug("snapshot copy for " + 
backupId);<a name="line.164"></a>
+<span class="sourceLineNo">165</span>      snapshotCopy(backupInfo);<a 
name="line.165"></a>
+<span class="sourceLineNo">166</span>      // Updates incremental backup table 
set<a name="line.166"></a>
+<span class="sourceLineNo">167</span>      
backupManager.addIncrementalBackupTableSet(backupInfo.getTables());<a 
name="line.167"></a>
+<span class="sourceLineNo">168</span><a name="line.168"></a>
+<span class="sourceLineNo">169</span>      // BACKUP_COMPLETE:<a 
name="line.169"></a>
+<span class="sourceLineNo">170</span>      // set overall backup status: 
complete. Here we make sure to complete the backup.<a name="line.170"></a>
+<span class="sourceLineNo">171</span>      // After this checkpoint, even if 
entering cancel process, will let the backup finished<a name="line.171"></a>
+<span class="sourceLineNo">172</span>      
backupInfo.setState(BackupState.COMPLETE);<a name="line.172"></a>
+<span class="sourceLineNo">173</span>      // The table list in backupInfo is 
good for both full backup and incremental backup.<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      // For incremental backup, it 
contains the incremental backup table set.<a name="line.174"></a>
+<span class="sourceLineNo">175</span>      
backupManager.writeRegionServerLogTimestamp(backupInfo.getTables(), 
newTimestamps);<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span>      HashMap&lt;TableName, 
HashMap&lt;String, Long&gt;&gt; newTableSetTimestampMap =<a name="line.177"></a>
+<span class="sourceLineNo">178</span>          
backupManager.readLogTimestampMap();<a name="line.178"></a>
+<span class="sourceLineNo">179</span><a name="line.179"></a>
+<span class="sourceLineNo">180</span>      Long newStartCode =<a 
name="line.180"></a>
+<span class="sourceLineNo">181</span>          
BackupUtils.getMinValue(BackupUtils<a name="line.181"></a>
+<span class="sourceLineNo">182</span>              
.getRSLogTimestampMins(newTableSetTimestampMap));<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      
backupManager.writeBackupStartCode(newStartCode);<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span>      // backup complete<a 
name="line.185"></a>
+<span class="sourceLineNo">186</span>      completeBackup(conn, backupInfo, 
backupManager, BackupType.FULL, conf);<a name="line.186"></a>
+<span class="sourceLineNo">187</span>    } catch (Exception e) {<a 
name="line.187"></a>
+<span class="sourceLineNo">188</span>      failBackup(conn, backupInfo, 
backupManager, e, "Unexpected BackupException : ",<a name="line.188"></a>
+<span class="sourceLineNo">189</span>        BackupType.FULL, conf);<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>      throw new IOException(e);<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>  private void snapshotTable(Admin admin, 
TableName tableName, String snapshotName)<a name="line.193"></a>
-<span class="sourceLineNo">194</span>      throws IOException {<a 
name="line.194"></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><a name="line.195"></a>
-<span class="sourceLineNo">196</span>    int maxAttempts =<a 
name="line.196"></a>
-<span class="sourceLineNo">197</span>        
conf.getInt(BACKUP_MAX_ATTEMPTS_KEY, DEFAULT_BACKUP_MAX_ATTEMPTS);<a 
name="line.197"></a>
-<span class="sourceLineNo">198</span>    int pause =<a name="line.198"></a>
-<span class="sourceLineNo">199</span>        
conf.getInt(BACKUP_ATTEMPTS_PAUSE_MS_KEY, DEFAULT_BACKUP_ATTEMPTS_PAUSE_MS);<a 
name="line.199"></a>
-<span class="sourceLineNo">200</span>    int attempts = 0;<a 
name="line.200"></a>
-<span class="sourceLineNo">201</span><a name="line.201"></a>
-<span class="sourceLineNo">202</span>    while (attempts++ &lt; maxAttempts) 
{<a name="line.202"></a>
-<span class="sourceLineNo">203</span>      try {<a name="line.203"></a>
-<span class="sourceLineNo">204</span>        admin.snapshot(snapshotName, 
tableName);<a name="line.204"></a>
-<span class="sourceLineNo">205</span>        return;<a name="line.205"></a>
-<span class="sourceLineNo">206</span>      } catch (IOException ee) {<a 
name="line.206"></a>
-<span class="sourceLineNo">207</span>        LOG.warn("Snapshot attempt " + 
attempts + " failed for table " + tableName<a name="line.207"></a>
-<span class="sourceLineNo">208</span>            + ", sleeping for " + pause + 
"ms", ee);<a name="line.208"></a>
-<span class="sourceLineNo">209</span>        if (attempts &lt; maxAttempts) 
{<a name="line.209"></a>
-<span class="sourceLineNo">210</span>          try {<a name="line.210"></a>
-<span class="sourceLineNo">211</span>            Thread.sleep(pause);<a 
name="line.211"></a>
-<span class="sourceLineNo">212</span>          } catch (InterruptedException 
e) {<a name="line.212"></a>
-<span class="sourceLineNo">213</span>            
Thread.currentThread().interrupt();<a name="line.213"></a>
-<span class="sourceLineNo">214</span>            break;<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>      }<a name="line.217"></a>
-<span class="sourceLineNo">218</span>    }<a name="line.218"></a>
-<span class="sourceLineNo">219</span>    throw new IOException("Failed to 
snapshot table "+ tableName);<a name="line.219"></a>
-<span class="sourceLineNo">220</span>  }<a name="line.220"></a>
-<span class="sourceLineNo">221</span>}<a name="line.221"></a>
+<span class="sourceLineNo">196</span>  protected void snapshotTable(Admin 
admin, TableName tableName, String snapshotName)<a name="line.196"></a>
+<span class="sourceLineNo">197</span>      throws IOException {<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span><a name="line.198"></a>
+<span class="sourceLineNo">199</span>    int maxAttempts =<a 
name="line.199"></a>
+<span class="sourceLineNo">200</span>        
conf.getInt(BACKUP_MAX_ATTEMPTS_KEY, DEFAULT_BACKUP_MAX_ATTEMPTS);<a 
name="line.200"></a>
+<span class="sourceLineNo">201</span>    int pause =<a name="line.201"></a>
+<span class="sourceLineNo">202</span>        
conf.getInt(BACKUP_ATTEMPTS_PAUSE_MS_KEY, DEFAULT_BACKUP_ATTEMPTS_PAUSE_MS);<a 
name="line.202"></a>
+<span class="sourceLineNo">203</span>    int attempts = 0;<a 
name="line.203"></a>
+<span class="sourceLineNo">204</span><a name="line.204"></a>
+<span class="sourceLineNo">205</span>    while (attempts++ &lt; maxAttempts) 
{<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      try {<a name="line.206"></a>
+<span class="sourceLineNo">207</span>        admin.snapshot(snapshotName, 
tableName);<a name="line.207"></a>
+<span class="sourceLineNo">208</span>        return;<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      } catch (IOException ee) {<a 
name="line.209"></a>
+<span class="sourceLineNo">210</span>        LOG.warn("Snapshot attempt " + 
attempts + " failed for table " + tableName<a name="line.210"></a>
+<span class="sourceLineNo">211</span>            + ", sleeping for " + pause + 
"ms", ee);<a name="line.211"></a>
+<span class="sourceLineNo">212</span>        if (attempts &lt; maxAttempts) 
{<a name="line.212"></a>
+<span class="sourceLineNo">213</span>          try {<a name="line.213"></a>
+<span class="sourceLineNo">214</span>            Thread.sleep(pause);<a 
name="line.214"></a>
+<span class="sourceLineNo">215</span>          } catch (InterruptedException 
e) {<a name="line.215"></a>
+<span class="sourceLineNo">216</span>            
Thread.currentThread().interrupt();<a name="line.216"></a>
+<span class="sourceLineNo">217</span>            break;<a name="line.217"></a>
+<span class="sourceLineNo">218</span>          }<a name="line.218"></a>
+<span class="sourceLineNo">219</span>        }<a name="line.219"></a>
+<span class="sourceLineNo">220</span>      }<a name="line.220"></a>
+<span class="sourceLineNo">221</span>    }<a name="line.221"></a>
+<span class="sourceLineNo">222</span>    throw new IOException("Failed to 
snapshot table "+ tableName);<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>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/8e0a5167/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.html
index 70b6083..6632852 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/IncrementalTableBackupClient.html
@@ -77,7 +77,7 @@
 <span class="sourceLineNo">069</span>    super(conn, backupId, request);<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>  private List&lt;String&gt; 
filterMissingFiles(List&lt;String&gt; incrBackupFileList) throws IOException 
{<a name="line.72"></a>
+<span class="sourceLineNo">072</span>  protected List&lt;String&gt; 
filterMissingFiles(List&lt;String&gt; incrBackupFileList) throws IOException 
{<a name="line.72"></a>
 <span class="sourceLineNo">073</span>    FileSystem fs = 
FileSystem.get(conf);<a name="line.73"></a>
 <span class="sourceLineNo">074</span>    List&lt;String&gt; list = new 
ArrayList&lt;String&gt;();<a name="line.74"></a>
 <span class="sourceLineNo">075</span>    for (String file : 
incrBackupFileList) {<a name="line.75"></a>
@@ -96,11 +96,11 @@
 <span class="sourceLineNo">088</span>   * @param p path<a name="line.88"></a>
 <span class="sourceLineNo">089</span>   * @return true, if yes<a 
name="line.89"></a>
 <span class="sourceLineNo">090</span>   */<a name="line.90"></a>
-<span class="sourceLineNo">091</span>  private boolean isActiveWalPath(Path p) 
{<a name="line.91"></a>
+<span class="sourceLineNo">091</span>  protected boolean isActiveWalPath(Path 
p) {<a name="line.91"></a>
 <span class="sourceLineNo">092</span>    return 
!AbstractFSWALProvider.isArchivedLogFile(p);<a name="line.92"></a>
 <span class="sourceLineNo">093</span>  }<a name="line.93"></a>
 <span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span>  static int getIndex(TableName tbl, 
List&lt;TableName&gt; sTableList) {<a name="line.95"></a>
+<span class="sourceLineNo">095</span>  protected static int getIndex(TableName 
tbl, List&lt;TableName&gt; sTableList) {<a name="line.95"></a>
 <span class="sourceLineNo">096</span>    if (sTableList == null) return 0;<a 
name="line.96"></a>
 <span class="sourceLineNo">097</span>    for (int i = 0; i &lt; 
sTableList.size(); i++) {<a name="line.97"></a>
 <span class="sourceLineNo">098</span>      if (tbl.equals(sTableList.get(i))) 
{<a name="line.98"></a>
@@ -116,7 +116,7 @@
 <span class="sourceLineNo">108</span>   * @param sTableList list of tables to 
be backed up<a name="line.108"></a>
 <span class="sourceLineNo">109</span>   * @return map of table to List of 
files<a name="line.109"></a>
 <span class="sourceLineNo">110</span>   */<a name="line.110"></a>
-<span class="sourceLineNo">111</span>  Map&lt;byte[], List&lt;Path&gt;&gt;[] 
handleBulkLoad(List&lt;TableName&gt; sTableList) throws IOException {<a 
name="line.111"></a>
+<span class="sourceLineNo">111</span>  protected Map&lt;byte[], 
List&lt;Path&gt;&gt;[] handleBulkLoad(List&lt;TableName&gt; sTableList) throws 
IOException {<a name="line.111"></a>
 <span class="sourceLineNo">112</span>    Map&lt;byte[], List&lt;Path&gt;&gt;[] 
mapForSrc = new Map[sTableList.size()];<a name="line.112"></a>
 <span class="sourceLineNo">113</span>    Pair&lt;Map&lt;TableName, 
Map&lt;String, Map&lt;String, List&lt;Pair&lt;String, 
Boolean&gt;&gt;&gt;&gt;&gt;, List&lt;byte[]&gt;&gt; pair =<a 
name="line.113"></a>
 <span class="sourceLineNo">114</span>    
backupManager.readBulkloadRows(sTableList);<a name="line.114"></a>
@@ -215,172 +215,173 @@
 <span class="sourceLineNo">207</span>  @Override<a name="line.207"></a>
 <span class="sourceLineNo">208</span>  public void execute() throws 
IOException {<a name="line.208"></a>
 <span class="sourceLineNo">209</span><a name="line.209"></a>
-<span class="sourceLineNo">210</span>    // case PREPARE_INCREMENTAL:<a 
name="line.210"></a>
-<span class="sourceLineNo">211</span>    beginBackup(backupManager, 
backupInfo);<a name="line.211"></a>
-<span class="sourceLineNo">212</span>    
backupInfo.setPhase(BackupPhase.PREPARE_INCREMENTAL);<a name="line.212"></a>
-<span class="sourceLineNo">213</span>    LOG.debug("For incremental backup, 
current table set is "<a name="line.213"></a>
-<span class="sourceLineNo">214</span>        + 
backupManager.getIncrementalBackupTableSet());<a name="line.214"></a>
-<span class="sourceLineNo">215</span>    try {<a name="line.215"></a>
+<span class="sourceLineNo">210</span>    try {<a name="line.210"></a>
+<span class="sourceLineNo">211</span>      // case PREPARE_INCREMENTAL:<a 
name="line.211"></a>
+<span class="sourceLineNo">212</span>      beginBackup(backupManager, 
backupInfo);<a name="line.212"></a>
+<span class="sourceLineNo">213</span>      
backupInfo.setPhase(BackupPhase.PREPARE_INCREMENTAL);<a name="line.213"></a>
+<span class="sourceLineNo">214</span>      LOG.debug("For incremental backup, 
current table set is "<a name="line.214"></a>
+<span class="sourceLineNo">215</span>          + 
backupManager.getIncrementalBackupTableSet());<a name="line.215"></a>
 <span class="sourceLineNo">216</span>      newTimestamps =<a 
name="line.216"></a>
 <span class="sourceLineNo">217</span>          ((IncrementalBackupManager) 
backupManager).getIncrBackupLogFileMap();<a name="line.217"></a>
 <span class="sourceLineNo">218</span>    } catch (Exception e) {<a 
name="line.218"></a>
 <span class="sourceLineNo">219</span>      // fail the overall backup and 
return<a name="line.219"></a>
 <span class="sourceLineNo">220</span>      failBackup(conn, backupInfo, 
backupManager, e, "Unexpected Exception : ",<a name="line.220"></a>
 <span class="sourceLineNo">221</span>        BackupType.INCREMENTAL, conf);<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>    // case INCREMENTAL_COPY:<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>    try {<a name="line.225"></a>
-<span class="sourceLineNo">226</span>      // copy out the table and region 
info files for each table<a name="line.226"></a>
-<span class="sourceLineNo">227</span>      
BackupUtils.copyTableRegionInfo(conn, backupInfo, conf);<a name="line.227"></a>
-<span class="sourceLineNo">228</span>      // convert WAL to HFiles and copy 
them to .tmp under BACKUP_ROOT<a name="line.228"></a>
-<span class="sourceLineNo">229</span>      convertWALsToHFiles(backupInfo);<a 
name="line.229"></a>
-<span class="sourceLineNo">230</span>      
incrementalCopyHFiles(backupInfo);<a name="line.230"></a>
-<span class="sourceLineNo">231</span>      // Save list of WAL files copied<a 
name="line.231"></a>
-<span class="sourceLineNo">232</span>      
backupManager.recordWALFiles(backupInfo.getIncrBackupFileList());<a 
name="line.232"></a>
-<span class="sourceLineNo">233</span>    } catch (Exception e) {<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>      String msg = "Unexpected exception 
in incremental-backup: incremental copy " + backupId;<a name="line.234"></a>
-<span class="sourceLineNo">235</span>      // fail the overall backup and 
return<a name="line.235"></a>
-<span class="sourceLineNo">236</span>      failBackup(conn, backupInfo, 
backupManager, e, msg, BackupType.INCREMENTAL, conf);<a name="line.236"></a>
-<span class="sourceLineNo">237</span>      return;<a name="line.237"></a>
-<span class="sourceLineNo">238</span>    }<a name="line.238"></a>
-<span class="sourceLineNo">239</span>    // case INCR_BACKUP_COMPLETE:<a 
name="line.239"></a>
-<span class="sourceLineNo">240</span>    // set overall backup status: 
complete. Here we make sure to complete the backup.<a name="line.240"></a>
-<span class="sourceLineNo">241</span>    // After this checkpoint, even if 
entering cancel process, will let the backup finished<a name="line.241"></a>
-<span class="sourceLineNo">242</span>    try {<a name="line.242"></a>
-<span class="sourceLineNo">243</span>      
backupInfo.setState(BackupState.COMPLETE);<a name="line.243"></a>
-<span class="sourceLineNo">244</span>      // Set the previousTimestampMap 
which is before this current log roll to the manifest.<a name="line.244"></a>
-<span class="sourceLineNo">245</span>      HashMap&lt;TableName, 
HashMap&lt;String, Long&gt;&gt; previousTimestampMap =<a name="line.245"></a>
-<span class="sourceLineNo">246</span>          
backupManager.readLogTimestampMap();<a name="line.246"></a>
-<span class="sourceLineNo">247</span>      
backupInfo.setIncrTimestampMap(previousTimestampMap);<a name="line.247"></a>
-<span class="sourceLineNo">248</span><a name="line.248"></a>
-<span class="sourceLineNo">249</span>      // The table list in backupInfo is 
good for both full backup and incremental backup.<a name="line.249"></a>
-<span class="sourceLineNo">250</span>      // For incremental backup, it 
contains the incremental backup table set.<a name="line.250"></a>
-<span class="sourceLineNo">251</span>      
backupManager.writeRegionServerLogTimestamp(backupInfo.getTables(), 
newTimestamps);<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span>      HashMap&lt;TableName, 
HashMap&lt;String, Long&gt;&gt; newTableSetTimestampMap =<a name="line.253"></a>
-<span class="sourceLineNo">254</span>          
backupManager.readLogTimestampMap();<a name="line.254"></a>
-<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span>      Long newStartCode =<a 
name="line.256"></a>
-<span class="sourceLineNo">257</span>          
BackupUtils.getMinValue(BackupUtils.getRSLogTimestampMins(newTableSetTimestampMap));<a
 name="line.257"></a>
-<span class="sourceLineNo">258</span>      
backupManager.writeBackupStartCode(newStartCode);<a name="line.258"></a>
-<span class="sourceLineNo">259</span><a name="line.259"></a>
-<span class="sourceLineNo">260</span>      
handleBulkLoad(backupInfo.getTableNames());<a name="line.260"></a>
-<span class="sourceLineNo">261</span>      // backup complete<a 
name="line.261"></a>
-<span class="sourceLineNo">262</span>      completeBackup(conn, backupInfo, 
backupManager, BackupType.INCREMENTAL, conf);<a name="line.262"></a>
-<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span>    } catch (IOException e) {<a 
name="line.264"></a>
-<span class="sourceLineNo">265</span>      failBackup(conn, backupInfo, 
backupManager, e, "Unexpected Exception : ",<a name="line.265"></a>
-<span class="sourceLineNo">266</span>        BackupType.INCREMENTAL, conf);<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><a name="line.269"></a>
-<span class="sourceLineNo">270</span>  private void 
incrementalCopyHFiles(BackupInfo backupInfo) throws Exception {<a 
name="line.270"></a>
-<span class="sourceLineNo">271</span><a name="line.271"></a>
-<span class="sourceLineNo">272</span>    try {<a name="line.272"></a>
-<span class="sourceLineNo">273</span>      LOG.debug("Incremental copy HFiles 
is starting.");<a name="line.273"></a>
-<span class="sourceLineNo">274</span>      // set overall backup phase: 
incremental_copy<a name="line.274"></a>
-<span class="sourceLineNo">275</span>      
backupInfo.setPhase(BackupPhase.INCREMENTAL_COPY);<a name="line.275"></a>
-<span class="sourceLineNo">276</span>      // get incremental backup file list 
and prepare parms for DistCp<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      List&lt;String&gt; 
incrBackupFileList = new ArrayList&lt;String&gt;();<a name="line.277"></a>
-<span class="sourceLineNo">278</span>      // Add Bulk output<a 
name="line.278"></a>
-<span class="sourceLineNo">279</span>      
incrBackupFileList.add(getBulkOutputDir().toString());<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      String[] strArr = 
incrBackupFileList.toArray(new String[incrBackupFileList.size() + 1]);<a 
name="line.280"></a>
-<span class="sourceLineNo">281</span>      strArr[strArr.length - 1] = 
backupInfo.getBackupRootDir();<a name="line.281"></a>
-<span class="sourceLineNo">282</span>      BackupCopyJob copyService = 
BackupRestoreFactory.getBackupCopyJob(conf);<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      int res = 
copyService.copy(backupInfo, backupManager, conf, BackupType.INCREMENTAL, 
strArr);<a name="line.283"></a>
-<span class="sourceLineNo">284</span>      if (res != 0) {<a 
name="line.284"></a>
-<span class="sourceLineNo">285</span>        LOG.error("Copy incremental HFile 
files failed with return code: " + res + ".");<a name="line.285"></a>
-<span class="sourceLineNo">286</span>        throw new IOException("Failed 
copy from " + StringUtils.join(incrBackupFileList, ',')<a name="line.286"></a>
-<span class="sourceLineNo">287</span>            + " to " + 
backupInfo.getHLogTargetDir());<a name="line.287"></a>
-<span class="sourceLineNo">288</span>      }<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      LOG.debug("Incremental copy HFiles 
from " + StringUtils.join(incrBackupFileList, ',')<a name="line.289"></a>
-<span class="sourceLineNo">290</span>          + " to " + 
backupInfo.getBackupRootDir() + " finished.");<a name="line.290"></a>
-<span class="sourceLineNo">291</span>    } finally {<a name="line.291"></a>
-<span class="sourceLineNo">292</span>      deleteBulkLoadDirectory();<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><a name="line.295"></a>
-<span class="sourceLineNo">296</span>  private void deleteBulkLoadDirectory() 
throws IOException {<a name="line.296"></a>
-<span class="sourceLineNo">297</span>    // delete original bulk load 
directory on method exit<a name="line.297"></a>
-<span class="sourceLineNo">298</span>    Path path = getBulkOutputDir();<a 
name="line.298"></a>
-<span class="sourceLineNo">299</span>    FileSystem fs = 
FileSystem.get(conf);<a name="line.299"></a>
-<span class="sourceLineNo">300</span>    boolean result = fs.delete(path, 
true);<a name="line.300"></a>
-<span class="sourceLineNo">301</span>    if (!result) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span>      LOG.warn("Could not delete " + 
path);<a name="line.302"></a>
-<span class="sourceLineNo">303</span>    }<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>  private void 
convertWALsToHFiles(BackupInfo backupInfo) throws IOException {<a 
name="line.307"></a>
-<span class="sourceLineNo">308</span>    // get incremental backup file list 
and prepare parameters for DistCp<a name="line.308"></a>
-<span class="sourceLineNo">309</span>    List&lt;String&gt; incrBackupFileList 
= backupInfo.getIncrBackupFileList();<a name="line.309"></a>
-<span class="sourceLineNo">310</span>    // Get list of tables in incremental 
backup set<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    Set&lt;TableName&gt; tableSet = 
backupManager.getIncrementalBackupTableSet();<a name="line.311"></a>
-<span class="sourceLineNo">312</span>    // filter missing files out (they 
have been copied by previous backups)<a name="line.312"></a>
-<span class="sourceLineNo">313</span>    incrBackupFileList = 
filterMissingFiles(incrBackupFileList);<a name="line.313"></a>
-<span class="sourceLineNo">314</span>    for (TableName table : tableSet) {<a 
name="line.314"></a>
-<span class="sourceLineNo">315</span>      // Check if table exists<a 
name="line.315"></a>
-<span class="sourceLineNo">316</span>      if (tableExists(table, conn)) {<a 
name="line.316"></a>
-<span class="sourceLineNo">317</span>        walToHFiles(incrBackupFileList, 
table);<a name="line.317"></a>
-<span class="sourceLineNo">318</span>      } else {<a name="line.318"></a>
-<span class="sourceLineNo">319</span>        LOG.warn("Table " + table + " 
does not exists. Skipping in WAL converter");<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>  }<a name="line.322"></a>
-<span class="sourceLineNo">323</span><a name="line.323"></a>
+<span class="sourceLineNo">222</span>      return;<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>    // case INCREMENTAL_COPY:<a 
name="line.225"></a>
+<span class="sourceLineNo">226</span>    try {<a name="line.226"></a>
+<span class="sourceLineNo">227</span>      // copy out the table and region 
info files for each table<a name="line.227"></a>
+<span class="sourceLineNo">228</span>      
BackupUtils.copyTableRegionInfo(conn, backupInfo, conf);<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      // convert WAL to HFiles and copy 
them to .tmp under BACKUP_ROOT<a name="line.229"></a>
+<span class="sourceLineNo">230</span>      convertWALsToHFiles(backupInfo);<a 
name="line.230"></a>
+<span class="sourceLineNo">231</span>      
incrementalCopyHFiles(backupInfo);<a name="line.231"></a>
+<span class="sourceLineNo">232</span>      // Save list of WAL files copied<a 
name="line.232"></a>
+<span class="sourceLineNo">233</span>      
backupManager.recordWALFiles(backupInfo.getIncrBackupFileList());<a 
name="line.233"></a>
+<span class="sourceLineNo">234</span>    } catch (Exception e) {<a 
name="line.234"></a>
+<span class="sourceLineNo">235</span>      String msg = "Unexpected exception 
in incremental-backup: incremental copy " + backupId;<a name="line.235"></a>
+<span class="sourceLineNo">236</span>      // fail the overall backup and 
return<a name="line.236"></a>
+<span class="sourceLineNo">237</span>      failBackup(conn, backupInfo, 
backupManager, e, msg, BackupType.INCREMENTAL, conf);<a name="line.237"></a>
+<span class="sourceLineNo">238</span>      return;<a name="line.238"></a>
+<span class="sourceLineNo">239</span>    }<a name="line.239"></a>
+<span class="sourceLineNo">240</span>    // case INCR_BACKUP_COMPLETE:<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>    // set overall backup status: 
complete. Here we make sure to complete the backup.<a name="line.241"></a>
+<span class="sourceLineNo">242</span>    // After this checkpoint, even if 
entering cancel process, will let the backup finished<a name="line.242"></a>
+<span class="sourceLineNo">243</span>    try {<a name="line.243"></a>
+<span class="sourceLineNo">244</span>      
backupInfo.setState(BackupState.COMPLETE);<a name="line.244"></a>
+<span class="sourceLineNo">245</span>      // Set the previousTimestampMap 
which is before this current log roll to the manifest.<a name="line.245"></a>
+<span class="sourceLineNo">246</span>      HashMap&lt;TableName, 
HashMap&lt;String, Long&gt;&gt; previousTimestampMap =<a name="line.246"></a>
+<span class="sourceLineNo">247</span>          
backupManager.readLogTimestampMap();<a name="line.247"></a>
+<span class="sourceLineNo">248</span>      
backupInfo.setIncrTimestampMap(previousTimestampMap);<a name="line.248"></a>
+<span class="sourceLineNo">249</span><a name="line.249"></a>
+<span class="sourceLineNo">250</span>      // The table list in backupInfo is 
good for both full backup and incremental backup.<a name="line.250"></a>
+<span class="sourceLineNo">251</span>      // For incremental backup, it 
contains the incremental backup table set.<a name="line.251"></a>
+<span class="sourceLineNo">252</span>      
backupManager.writeRegionServerLogTimestamp(backupInfo.getTables(), 
newTimestamps);<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span>      HashMap&lt;TableName, 
HashMap&lt;String, Long&gt;&gt; newTableSetTimestampMap =<a name="line.254"></a>
+<span class="sourceLineNo">255</span>          
backupManager.readLogTimestampMap();<a name="line.255"></a>
+<span class="sourceLineNo">256</span><a name="line.256"></a>
+<span class="sourceLineNo">257</span>      Long newStartCode =<a 
name="line.257"></a>
+<span class="sourceLineNo">258</span>          
BackupUtils.getMinValue(BackupUtils.getRSLogTimestampMins(newTableSetTimestampMap));<a
 name="line.258"></a>
+<span class="sourceLineNo">259</span>      
backupManager.writeBackupStartCode(newStartCode);<a name="line.259"></a>
+<span class="sourceLineNo">260</span><a name="line.260"></a>
+<span class="sourceLineNo">261</span>      
handleBulkLoad(backupInfo.getTableNames());<a name="line.261"></a>
+<span class="sourceLineNo">262</span>      // backup complete<a 
name="line.262"></a>
+<span class="sourceLineNo">263</span>      completeBackup(conn, backupInfo, 
backupManager, BackupType.INCREMENTAL, conf);<a name="line.263"></a>
+<span class="sourceLineNo">264</span><a name="line.264"></a>
+<span class="sourceLineNo">265</span>    } catch (IOException e) {<a 
name="line.265"></a>
+<span class="sourceLineNo">266</span>      failBackup(conn, backupInfo, 
backupManager, e, "Unexpected Exception : ",<a name="line.266"></a>
+<span class="sourceLineNo">267</span>        BackupType.INCREMENTAL, conf);<a 
name="line.267"></a>
+<span class="sourceLineNo">268</span>    }<a name="line.268"></a>
+<span class="sourceLineNo">269</span>  }<a name="line.269"></a>
+<span class="sourceLineNo">270</span><a name="line.270"></a>
+<span class="sourceLineNo">271</span>  protected void 
incrementalCopyHFiles(BackupInfo backupInfo) throws Exception {<a 
name="line.271"></a>
+<span class="sourceLineNo">272</span><a name="line.272"></a>
+<span class="sourceLineNo">273</span>    try {<a name="line.273"></a>
+<span class="sourceLineNo">274</span>      LOG.debug("Incremental copy HFiles 
is starting.");<a name="line.274"></a>
+<span class="sourceLineNo">275</span>      // set overall backup phase: 
incremental_copy<a name="line.275"></a>
+<span class="sourceLineNo">276</span>      
backupInfo.setPhase(BackupPhase.INCREMENTAL_COPY);<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      // get incremental backup file list 
and prepare parms for DistCp<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      List&lt;String&gt; 
incrBackupFileList = new ArrayList&lt;String&gt;();<a name="line.278"></a>
+<span class="sourceLineNo">279</span>      // Add Bulk output<a 
name="line.279"></a>
+<span class="sourceLineNo">280</span>      
incrBackupFileList.add(getBulkOutputDir().toString());<a name="line.280"></a>
+<span class="sourceLineNo">281</span>      String[] strArr = 
incrBackupFileList.toArray(new String[incrBackupFileList.size() + 1]);<a 
name="line.281"></a>
+<span class="sourceLineNo">282</span>      strArr[strArr.length - 1] = 
backupInfo.getBackupRootDir();<a name="line.282"></a>
+<span class="sourceLineNo">283</span>      BackupCopyJob copyService = 
BackupRestoreFactory.getBackupCopyJob(conf);<a name="line.283"></a>
+<span class="sourceLineNo">284</span>      int res = 
copyService.copy(backupInfo, backupManager, conf, BackupType.INCREMENTAL, 
strArr);<a name="line.284"></a>
+<span class="sourceLineNo">285</span>      if (res != 0) {<a 
name="line.285"></a>
+<span class="sourceLineNo">286</span>        LOG.error("Copy incremental HFile 
files failed with return code: " + res + ".");<a name="line.286"></a>
+<span class="sourceLineNo">287</span>        throw new IOException("Failed 
copy from " + StringUtils.join(incrBackupFileList, ',')<a name="line.287"></a>
+<span class="sourceLineNo">288</span>            + " to " + 
backupInfo.getHLogTargetDir());<a name="line.288"></a>
+<span class="sourceLineNo">289</span>      }<a name="line.289"></a>
+<span class="sourceLineNo">290</span>      LOG.debug("Incremental copy HFiles 
from " + StringUtils.join(incrBackupFileList, ',')<a name="line.290"></a>
+<span class="sourceLineNo">291</span>          + " to " + 
backupInfo.getBackupRootDir() + " finished.");<a name="line.291"></a>
+<span class="sourceLineNo">292</span>    } finally {<a name="line.292"></a>
+<span class="sourceLineNo">293</span>      deleteBulkLoadDirectory();<a 
name="line.293"></a>
+<span class="sourceLineNo">294</span>    }<a name="line.294"></a>
+<span class="sourceLineNo">295</span>  }<a name="line.295"></a>
+<span class="sourceLineNo">296</span><a name="line.296"></a>
+<span class="sourceLineNo">297</span>  protected void 
deleteBulkLoadDirectory() throws IOException {<a name="line.297"></a>
+<span class="sourceLineNo">298</span>    // delete original bulk load 
directory on method exit<a name="line.298"></a>
+<span class="sourceLineNo">299</span>    Path path = getBulkOutputDir();<a 
name="line.299"></a>
+<span class="sourceLineNo">300</span>    FileSystem fs = 
FileSystem.get(conf);<a name="line.300"></a>
+<span class="sourceLineNo">301</span>    boolean result = fs.delete(path, 
true);<a name="line.301"></a>
+<span class="sourceLineNo">302</span>    if (!result) {<a name="line.302"></a>
+<span class="sourceLineNo">303</span>      LOG.warn("Could not delete " + 
path);<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>  protected void 
convertWALsToHFiles(BackupInfo backupInfo) throws IOException {<a 
name="line.308"></a>
+<span class="sourceLineNo">309</span>    // get incremental backup file list 
and prepare parameters for DistCp<a name="line.309"></a>
+<span class="sourceLineNo">310</span>    List&lt;String&gt; incrBackupFileList 
= backupInfo.getIncrBackupFileList();<a name="line.310"></a>
+<span class="sourceLineNo">311</span>    // Get list of tables in incremental 
backup set<a name="line.311"></a>
+<span class="sourceLineNo">312</span>    Set&lt;TableName&gt; tableSet = 
backupManager.getIncrementalBackupTableSet();<a name="line.312"></a>
+<span class="sourceLineNo">313</span>    // filter missing files out (they 
have been copied by previous backups)<a name="line.313"></a>
+<span class="sourceLineNo">314</span>    incrBackupFileList = 
filterMissingFiles(incrBackupFileList);<a name="line.314"></a>
+<span class="sourceLineNo">315</span>    for (TableName table : tableSet) {<a 
name="line.315"></a>
+<span class="sourceLineNo">316</span>      // Check if table exists<a 
name="line.316"></a>
+<span class="sourceLineNo">317</span>      if (tableExists(table, conn)) {<a 
name="line.317"></a>
+<span class="sourceLineNo">318</span>        walToHFiles(incrBackupFileList, 
table);<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      } else {<a name="line.319"></a>
+<span class="sourceLineNo">320</span>        LOG.warn("Table " + table + " 
does not exists. Skipping in WAL converter");<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      }<a name="line.321"></a>
+<span class="sourceLineNo">322</span>    }<a name="line.322"></a>
+<span class="sourceLineNo">323</span>  }<a name="line.323"></a>
 <span class="sourceLineNo">324</span><a name="line.324"></a>
-<span class="sourceLineNo">325</span>  private boolean tableExists(TableName 
table, Connection conn) throws IOException {<a name="line.325"></a>
-<span class="sourceLineNo">326</span>    try (Admin admin = conn.getAdmin();) 
{<a name="line.326"></a>
-<span class="sourceLineNo">327</span>      return admin.tableExists(table);<a 
name="line.327"></a>
-<span class="sourceLineNo">328</span>    }<a name="line.328"></a>
-<span class="sourceLineNo">329</span>  }<a name="line.329"></a>
-<span class="sourceLineNo">330</span><a name="line.330"></a>
-<span class="sourceLineNo">331</span>  private void 
walToHFiles(List&lt;String&gt; dirPaths, TableName tableName) throws 
IOException {<a name="line.331"></a>
-<span class="sourceLineNo">332</span><a name="line.332"></a>
-<span class="sourceLineNo">333</span>    Tool player = new WALPlayer();<a 
name="line.333"></a>
-<span class="sourceLineNo">334</span><a name="line.334"></a>
-<span class="sourceLineNo">335</span>    // Player reads all files in 
arbitrary directory structure and creates<a name="line.335"></a>
-<span class="sourceLineNo">336</span>    // a Map task for each file. We use 
';' as separator<a name="line.336"></a>
-<span class="sourceLineNo">337</span>    // because WAL file names contains 
','<a name="line.337"></a>
-<span class="sourceLineNo">338</span>    String dirs = 
StringUtils.join(dirPaths, ';');<a name="line.338"></a>
-<span class="sourceLineNo">339</span><a name="line.339"></a>
-<span class="sourceLineNo">340</span>    Path bulkOutputPath = 
getBulkOutputDirForTable(tableName);<a name="line.340"></a>
-<span class="sourceLineNo">341</span>    
conf.set(WALPlayer.BULK_OUTPUT_CONF_KEY, bulkOutputPath.toString());<a 
name="line.341"></a>
-<span class="sourceLineNo">342</span>    
conf.set(WALPlayer.INPUT_FILES_SEPARATOR_KEY, ";");<a name="line.342"></a>
-<span class="sourceLineNo">343</span>    String[] playerArgs = { dirs, 
tableName.getNameAsString() };<a name="line.343"></a>
-<span class="sourceLineNo">344</span><a name="line.344"></a>
-<span class="sourceLineNo">345</span>    try {<a name="line.345"></a>
-<span class="sourceLineNo">346</span>      player.setConf(conf);<a 
name="line.346"></a>
-<span class="sourceLineNo">347</span>      int result = 
player.run(playerArgs);<a name="line.347"></a>
-<span class="sourceLineNo">348</span>      if(result != 0) {<a 
name="line.348"></a>
-<span class="sourceLineNo">349</span>        throw new IOException("WAL Player 
failed");<a name="line.349"></a>
-<span class="sourceLineNo">350</span>      }<a name="line.350"></a>
-<span class="sourceLineNo">351</span>      
conf.unset(WALPlayer.INPUT_FILES_SEPARATOR_KEY);<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    } catch (IOException e) {<a 
name="line.352"></a>
-<span class="sourceLineNo">353</span>      throw e;<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    } catch (Exception ee) {<a 
name="line.354"></a>
-<span class="sourceLineNo">355</span>      throw new IOException("Can not 
convert from directory " + dirs<a name="line.355"></a>
-<span class="sourceLineNo">356</span>          + " (check Hadoop, HBase and 
WALPlayer M/R job logs) ", ee);<a name="line.356"></a>
-<span class="sourceLineNo">357</span>    }<a name="line.357"></a>
-<span class="sourceLineNo">358</span>  }<a name="line.358"></a>
-<span class="sourceLineNo">359</span><a name="line.359"></a>
-<span class="sourceLineNo">360</span>  private Path 
getBulkOutputDirForTable(TableName table) {<a name="line.360"></a>
-<span class="sourceLineNo">361</span>    Path tablePath = 
getBulkOutputDir();<a name="line.361"></a>
-<span class="sourceLineNo">362</span>    tablePath = new Path(tablePath, 
table.getNamespaceAsString());<a name="line.362"></a>
-<span class="sourceLineNo">363</span>    tablePath = new Path(tablePath, 
table.getQualifierAsString());<a name="line.363"></a>
-<span class="sourceLineNo">364</span>    return new Path(tablePath, "data");<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 Path getBulkOutputDir() {<a 
name="line.367"></a>
-<span class="sourceLineNo">368</span>    String backupId = 
backupInfo.getBackupId();<a name="line.368"></a>
-<span class="sourceLineNo">369</span>    Path path = new 
Path(backupInfo.getBackupRootDir());<a name="line.369"></a>
-<span class="sourceLineNo">370</span>    path = new Path(path, ".tmp");<a 
name="line.370"></a>
-<span class="sourceLineNo">371</span>    path = new Path(path, backupId);<a 
name="line.371"></a>
-<span class="sourceLineNo">372</span>    return path;<a name="line.372"></a>
-<span class="sourceLineNo">373</span>  }<a name="line.373"></a>
-<span class="sourceLineNo">374</span><a name="line.374"></a>
-<span class="sourceLineNo">375</span>}<a name="line.375"></a>
+<span class="sourceLineNo">325</span><a name="line.325"></a>
+<span class="sourceLineNo">326</span>  protected boolean tableExists(TableName 
table, Connection conn) throws IOException {<a name="line.326"></a>
+<span class="sourceLineNo">327</span>    try (Admin admin = conn.getAdmin();) 
{<a name="line.327"></a>
+<span class="sourceLineNo">328</span>      return admin.tableExists(table);<a 
name="line.328"></a>
+<span class="sourceLineNo">329</span>    }<a name="line.329"></a>
+<span class="sourceLineNo">330</span>  }<a name="line.330"></a>
+<span class="sourceLineNo">331</span><a name="line.331"></a>
+<span class="sourceLineNo">332</span>  protected void 
walToHFiles(List&lt;String&gt; dirPaths, TableName tableName) throws 
IOException {<a name="line.332"></a>
+<span class="sourceLineNo">333</span><a name="line.333"></a>
+<span class="sourceLineNo">334</span>    Tool player = new WALPlayer();<a 
name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span>    // Player reads all files in 
arbitrary directory structure and creates<a name="line.336"></a>
+<span class="sourceLineNo">337</span>    // a Map task for each file. We use 
';' as separator<a name="line.337"></a>
+<span class="sourceLineNo">338</span>    // because WAL file names contains 
','<a name="line.338"></a>
+<span class="sourceLineNo">339</span>    String dirs = 
StringUtils.join(dirPaths, ';');<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span>    Path bulkOutputPath = 
getBulkOutputDirForTable(tableName);<a name="line.341"></a>
+<span class="sourceLineNo">342</span>    
conf.set(WALPlayer.BULK_OUTPUT_CONF_KEY, bulkOutputPath.toString());<a 
name="line.342"></a>
+<span class="sourceLineNo">343</span>    
conf.set(WALPlayer.INPUT_FILES_SEPARATOR_KEY, ";");<a name="line.343"></a>
+<span class="sourceLineNo">344</span>    String[] playerArgs = { dirs, 
tableName.getNameAsString() };<a name="line.344"></a>
+<span class="sourceLineNo">345</span><a name="line.345"></a>
+<span class="sourceLineNo">346</span>    try {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>      player.setConf(conf);<a 
name="line.347"></a>
+<span class="sourceLineNo">348</span>      int result = 
player.run(playerArgs);<a name="line.348"></a>
+<span class="sourceLineNo">349</span>      if(result != 0) {<a 
name="line.349"></a>
+<span class="sourceLineNo">350</span>        throw new IOException("WAL Player 
failed");<a name="line.350"></a>
+<span class="sourceLineNo">351</span>      }<a name="line.351"></a>
+<span class="sourceLineNo">352</span>      
conf.unset(WALPlayer.INPUT_FILES_SEPARATOR_KEY);<a name="line.352"></a>
+<span class="sourceLineNo">353</span>    } catch (IOException e) {<a 
name="line.353"></a>
+<span class="sourceLineNo">354</span>      throw e;<a name="line.354"></a>
+<span class="sourceLineNo">355</span>    } catch (Exception ee) {<a 
name="line.355"></a>
+<span class="sourceLineNo">356</span>      throw new IOException("Can not 
convert from directory " + dirs<a name="line.356"></a>
+<span class="sourceLineNo">357</span>          + " (check Hadoop, HBase and 
WALPlayer M/R job logs) ", ee);<a name="line.357"></a>
+<span class="sourceLineNo">358</span>    }<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>  protected Path 
getBulkOutputDirForTable(TableName table) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span>    Path tablePath = 
getBulkOutputDir();<a name="line.362"></a>
+<span class="sourceLineNo">363</span>    tablePath = new Path(tablePath, 
table.getNamespaceAsString());<a name="line.363"></a>
+<span class="sourceLineNo">364</span>    tablePath = new Path(tablePath, 
table.getQualifierAsString());<a name="line.364"></a>
+<span class="sourceLineNo">365</span>    return new Path(tablePath, "data");<a 
name="line.365"></a>
+<span class="sourceLineNo">366</span>  }<a name="line.366"></a>
+<span class="sourceLineNo">367</span><a name="line.367"></a>
+<span class="sourceLineNo">368</span>  protected Path getBulkOutputDir() {<a 
name="line.368"></a>
+<span class="sourceLineNo">369</span>    String backupId = 
backupInfo.getBackupId();<a name="line.369"></a>
+<span class="sourceLineNo">370</span>    Path path = new 
Path(backupInfo.getBackupRootDir());<a name="line.370"></a>
+<span class="sourceLineNo">371</span>    path = new Path(path, ".tmp");<a 
name="line.371"></a>
+<span class="sourceLineNo">372</span>    path = new Path(path, backupId);<a 
name="line.372"></a>
+<span class="sourceLineNo">373</span>    return path;<a name="line.373"></a>
+<span class="sourceLineNo">374</span>  }<a name="line.374"></a>
+<span class="sourceLineNo">375</span><a name="line.375"></a>
+<span class="sourceLineNo">376</span>}<a name="line.376"></a>
 
 
 

Reply via email to