http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/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 e354b98..d875570 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
@@ -129,117 +129,116 @@
 <span class="sourceLineNo">121</span>   */<a name="line.121"></a>
 <span class="sourceLineNo">122</span>  @Override<a name="line.122"></a>
 <span class="sourceLineNo">123</span>  public void execute() throws 
IOException {<a name="line.123"></a>
-<span class="sourceLineNo">124</span>    try (Admin admin = conn.getAdmin();) 
{<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>      // Begin BACKUP<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>      beginBackup(backupManager, 
backupInfo);<a name="line.127"></a>
-<span class="sourceLineNo">128</span>      String savedStartCode = null;<a 
name="line.128"></a>
-<span class="sourceLineNo">129</span>      boolean firstBackup = false;<a 
name="line.129"></a>
-<span class="sourceLineNo">130</span>      // do snapshot for full table 
backup<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span>      savedStartCode = 
backupManager.readBackupStartCode();<a name="line.132"></a>
-<span class="sourceLineNo">133</span>      firstBackup = savedStartCode == 
null || Long.parseLong(savedStartCode) == 0L;<a name="line.133"></a>
-<span class="sourceLineNo">134</span>      if (firstBackup) {<a 
name="line.134"></a>
-<span class="sourceLineNo">135</span>        // This is our first backup. 
Let's put some marker to system table so that we can hold the logs<a 
name="line.135"></a>
-<span class="sourceLineNo">136</span>        // while we do the backup.<a 
name="line.136"></a>
-<span class="sourceLineNo">137</span>        
backupManager.writeBackupStartCode(0L);<a name="line.137"></a>
-<span class="sourceLineNo">138</span>      }<a name="line.138"></a>
-<span class="sourceLineNo">139</span>      // We roll log here before we do 
the snapshot. It is possible there is duplicate data<a name="line.139"></a>
-<span class="sourceLineNo">140</span>      // in the log that is already in 
the snapshot. But if we do it after the snapshot, we<a name="line.140"></a>
-<span class="sourceLineNo">141</span>      // could have data loss.<a 
name="line.141"></a>
-<span class="sourceLineNo">142</span>      // A better approach is to do the 
roll log on each RS in the same global procedure as<a name="line.142"></a>
-<span class="sourceLineNo">143</span>      // the snapshot.<a 
name="line.143"></a>
-<span class="sourceLineNo">144</span>      LOG.info("Execute roll log 
procedure for full backup ...");<a name="line.144"></a>
-<span class="sourceLineNo">145</span><a name="line.145"></a>
-<span class="sourceLineNo">146</span>      Map&lt;String, String&gt; props = 
new HashMap&lt;String, String&gt;();<a name="line.146"></a>
-<span class="sourceLineNo">147</span>      props.put("backupRoot", 
backupInfo.getBackupRootDir());<a name="line.147"></a>
-<span class="sourceLineNo">148</span>      
admin.execProcedure(LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_SIGNATURE,<a
 name="line.148"></a>
-<span class="sourceLineNo">149</span>        
LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_NAME, props);<a 
name="line.149"></a>
-<span class="sourceLineNo">150</span><a name="line.150"></a>
-<span class="sourceLineNo">151</span>      newTimestamps = 
backupManager.readRegionServerLastLogRollResult();<a name="line.151"></a>
-<span class="sourceLineNo">152</span>      if (firstBackup) {<a 
name="line.152"></a>
-<span class="sourceLineNo">153</span>        // Updates registered log files<a 
name="line.153"></a>
-<span class="sourceLineNo">154</span>        // We record ALL old WAL files as 
registered, because<a name="line.154"></a>
-<span class="sourceLineNo">155</span>        // this is a first full backup in 
the system and these<a name="line.155"></a>
-<span class="sourceLineNo">156</span>        // files are not needed for next 
incremental backup<a name="line.156"></a>
-<span class="sourceLineNo">157</span>        List&lt;String&gt; logFiles = 
BackupUtils.getWALFilesOlderThan(conf, newTimestamps);<a name="line.157"></a>
-<span class="sourceLineNo">158</span>        
backupManager.recordWALFiles(logFiles);<a name="line.158"></a>
-<span class="sourceLineNo">159</span>      }<a name="line.159"></a>
-<span class="sourceLineNo">160</span><a name="line.160"></a>
-<span class="sourceLineNo">161</span>      // SNAPSHOT_TABLES:<a 
name="line.161"></a>
-<span class="sourceLineNo">162</span>      
backupInfo.setPhase(BackupPhase.SNAPSHOT);<a name="line.162"></a>
-<span class="sourceLineNo">163</span>      for (TableName tableName : 
tableList) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span>        String snapshotName =<a 
name="line.164"></a>
-<span class="sourceLineNo">165</span>            "snapshot_" + 
Long.toString(EnvironmentEdgeManager.currentTime()) + "_"<a name="line.165"></a>
-<span class="sourceLineNo">166</span>                + 
tableName.getNamespaceAsString() + "_" + tableName.getQualifierAsString();<a 
name="line.166"></a>
-<span class="sourceLineNo">167</span><a name="line.167"></a>
-<span class="sourceLineNo">168</span>        snapshotTable(admin, tableName, 
snapshotName);<a name="line.168"></a>
-<span class="sourceLineNo">169</span>        
backupInfo.setSnapshotName(tableName, snapshotName);<a name="line.169"></a>
-<span class="sourceLineNo">170</span>      }<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span>      // SNAPSHOT_COPY:<a 
name="line.172"></a>
-<span class="sourceLineNo">173</span>      // do snapshot copy<a 
name="line.173"></a>
-<span class="sourceLineNo">174</span>      LOG.debug("snapshot copy for " + 
backupId);<a name="line.174"></a>
-<span class="sourceLineNo">175</span>      snapshotCopy(backupInfo);<a 
name="line.175"></a>
-<span class="sourceLineNo">176</span>      // Updates incremental backup table 
set<a name="line.176"></a>
-<span class="sourceLineNo">177</span>      
backupManager.addIncrementalBackupTableSet(backupInfo.getTables());<a 
name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span>      // BACKUP_COMPLETE:<a 
name="line.179"></a>
-<span class="sourceLineNo">180</span>      // set overall backup status: 
complete. Here we make sure to complete the backup.<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      // After this checkpoint, even if 
entering cancel process, will let the backup finished<a name="line.181"></a>
-<span class="sourceLineNo">182</span>      
backupInfo.setState(BackupState.COMPLETE);<a name="line.182"></a>
-<span class="sourceLineNo">183</span>      // The table list in backupInfo is 
good for both full backup and incremental backup.<a name="line.183"></a>
-<span class="sourceLineNo">184</span>      // For incremental backup, it 
contains the incremental backup table set.<a name="line.184"></a>
-<span class="sourceLineNo">185</span>      
backupManager.writeRegionServerLogTimestamp(backupInfo.getTables(), 
newTimestamps);<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span>      HashMap&lt;TableName, 
HashMap&lt;String, Long&gt;&gt; newTableSetTimestampMap =<a name="line.187"></a>
-<span class="sourceLineNo">188</span>          
backupManager.readLogTimestampMap();<a name="line.188"></a>
-<span class="sourceLineNo">189</span><a name="line.189"></a>
-<span class="sourceLineNo">190</span>      Long newStartCode =<a 
name="line.190"></a>
-<span class="sourceLineNo">191</span>          
BackupUtils.getMinValue(BackupUtils<a name="line.191"></a>
-<span class="sourceLineNo">192</span>              
.getRSLogTimestampMins(newTableSetTimestampMap));<a name="line.192"></a>
-<span class="sourceLineNo">193</span>      
backupManager.writeBackupStartCode(newStartCode);<a name="line.193"></a>
-<span class="sourceLineNo">194</span><a name="line.194"></a>
-<span class="sourceLineNo">195</span>      // backup complete<a 
name="line.195"></a>
-<span class="sourceLineNo">196</span>      completeBackup(conn, backupInfo, 
backupManager, BackupType.FULL, conf);<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    } catch (Exception e) {<a 
name="line.197"></a>
-<span class="sourceLineNo">198</span>      failBackup(conn, backupInfo, 
backupManager, e, "Unexpected BackupException : ",<a name="line.198"></a>
-<span class="sourceLineNo">199</span>        BackupType.FULL, conf);<a 
name="line.199"></a>
-<span class="sourceLineNo">200</span>      throw new IOException(e);<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">124</span>    try (Admin admin = conn.getAdmin()) 
{<a name="line.124"></a>
+<span class="sourceLineNo">125</span>      // Begin BACKUP<a 
name="line.125"></a>
+<span class="sourceLineNo">126</span>      beginBackup(backupManager, 
backupInfo);<a name="line.126"></a>
+<span class="sourceLineNo">127</span>      String savedStartCode = null;<a 
name="line.127"></a>
+<span class="sourceLineNo">128</span>      boolean firstBackup = false;<a 
name="line.128"></a>
+<span class="sourceLineNo">129</span>      // do snapshot for full table 
backup<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span>      savedStartCode = 
backupManager.readBackupStartCode();<a name="line.131"></a>
+<span class="sourceLineNo">132</span>      firstBackup = savedStartCode == 
null || Long.parseLong(savedStartCode) == 0L;<a name="line.132"></a>
+<span class="sourceLineNo">133</span>      if (firstBackup) {<a 
name="line.133"></a>
+<span class="sourceLineNo">134</span>        // This is our first backup. 
Let's put some marker to system table so that we can hold the logs<a 
name="line.134"></a>
+<span class="sourceLineNo">135</span>        // while we do the backup.<a 
name="line.135"></a>
+<span class="sourceLineNo">136</span>        
backupManager.writeBackupStartCode(0L);<a name="line.136"></a>
+<span class="sourceLineNo">137</span>      }<a name="line.137"></a>
+<span class="sourceLineNo">138</span>      // We roll log here before we do 
the snapshot. It is possible there is duplicate data<a name="line.138"></a>
+<span class="sourceLineNo">139</span>      // in the log that is already in 
the snapshot. But if we do it after the snapshot, we<a name="line.139"></a>
+<span class="sourceLineNo">140</span>      // could have data loss.<a 
name="line.140"></a>
+<span class="sourceLineNo">141</span>      // A better approach is to do the 
roll log on each RS in the same global procedure as<a name="line.141"></a>
+<span class="sourceLineNo">142</span>      // the snapshot.<a 
name="line.142"></a>
+<span class="sourceLineNo">143</span>      LOG.info("Execute roll log 
procedure for full backup ...");<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span>      Map&lt;String, String&gt; props = 
new HashMap&lt;String, String&gt;();<a name="line.145"></a>
+<span class="sourceLineNo">146</span>      props.put("backupRoot", 
backupInfo.getBackupRootDir());<a name="line.146"></a>
+<span class="sourceLineNo">147</span>      
admin.execProcedure(LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_SIGNATURE,<a
 name="line.147"></a>
+<span class="sourceLineNo">148</span>        
LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_NAME, props);<a 
name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span>      newTimestamps = 
backupManager.readRegionServerLastLogRollResult();<a name="line.150"></a>
+<span class="sourceLineNo">151</span>      if (firstBackup) {<a 
name="line.151"></a>
+<span class="sourceLineNo">152</span>        // Updates registered log files<a 
name="line.152"></a>
+<span class="sourceLineNo">153</span>        // We record ALL old WAL files as 
registered, because<a name="line.153"></a>
+<span class="sourceLineNo">154</span>        // this is a first full backup in 
the system and these<a name="line.154"></a>
+<span class="sourceLineNo">155</span>        // files are not needed for next 
incremental backup<a name="line.155"></a>
+<span class="sourceLineNo">156</span>        List&lt;String&gt; logFiles = 
BackupUtils.getWALFilesOlderThan(conf, newTimestamps);<a name="line.156"></a>
+<span class="sourceLineNo">157</span>        
backupManager.recordWALFiles(logFiles);<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_TABLES:<a 
name="line.160"></a>
+<span class="sourceLineNo">161</span>      
backupInfo.setPhase(BackupPhase.SNAPSHOT);<a name="line.161"></a>
+<span class="sourceLineNo">162</span>      for (TableName tableName : 
tableList) {<a name="line.162"></a>
+<span class="sourceLineNo">163</span>        String snapshotName =<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>            "snapshot_" + 
Long.toString(EnvironmentEdgeManager.currentTime()) + "_"<a name="line.164"></a>
+<span class="sourceLineNo">165</span>                + 
tableName.getNamespaceAsString() + "_" + tableName.getQualifierAsString();<a 
name="line.165"></a>
+<span class="sourceLineNo">166</span><a name="line.166"></a>
+<span class="sourceLineNo">167</span>        snapshotTable(admin, tableName, 
snapshotName);<a name="line.167"></a>
+<span class="sourceLineNo">168</span>        
backupInfo.setSnapshotName(tableName, snapshotName);<a name="line.168"></a>
+<span class="sourceLineNo">169</span>      }<a name="line.169"></a>
+<span class="sourceLineNo">170</span><a name="line.170"></a>
+<span class="sourceLineNo">171</span>      // SNAPSHOT_COPY:<a 
name="line.171"></a>
+<span class="sourceLineNo">172</span>      // do snapshot copy<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span>      LOG.debug("snapshot copy for " + 
backupId);<a name="line.173"></a>
+<span class="sourceLineNo">174</span>      snapshotCopy(backupInfo);<a 
name="line.174"></a>
+<span class="sourceLineNo">175</span>      // Updates incremental backup table 
set<a name="line.175"></a>
+<span class="sourceLineNo">176</span>      
backupManager.addIncrementalBackupTableSet(backupInfo.getTables());<a 
name="line.176"></a>
+<span class="sourceLineNo">177</span><a name="line.177"></a>
+<span class="sourceLineNo">178</span>      // BACKUP_COMPLETE:<a 
name="line.178"></a>
+<span class="sourceLineNo">179</span>      // set overall backup status: 
complete. Here we make sure to complete the backup.<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      // After this checkpoint, even if 
entering cancel process, will let the backup finished<a name="line.180"></a>
+<span class="sourceLineNo">181</span>      
backupInfo.setState(BackupState.COMPLETE);<a name="line.181"></a>
+<span class="sourceLineNo">182</span>      // The table list in backupInfo is 
good for both full backup and incremental backup.<a name="line.182"></a>
+<span class="sourceLineNo">183</span>      // For incremental backup, it 
contains the incremental backup table set.<a name="line.183"></a>
+<span class="sourceLineNo">184</span>      
backupManager.writeRegionServerLogTimestamp(backupInfo.getTables(), 
newTimestamps);<a name="line.184"></a>
+<span class="sourceLineNo">185</span><a name="line.185"></a>
+<span class="sourceLineNo">186</span>      HashMap&lt;TableName, 
HashMap&lt;String, Long&gt;&gt; newTableSetTimestampMap =<a name="line.186"></a>
+<span class="sourceLineNo">187</span>          
backupManager.readLogTimestampMap();<a name="line.187"></a>
+<span class="sourceLineNo">188</span><a name="line.188"></a>
+<span class="sourceLineNo">189</span>      Long newStartCode =<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>          
BackupUtils.getMinValue(BackupUtils<a name="line.190"></a>
+<span class="sourceLineNo">191</span>              
.getRSLogTimestampMins(newTableSetTimestampMap));<a name="line.191"></a>
+<span class="sourceLineNo">192</span>      
backupManager.writeBackupStartCode(newStartCode);<a name="line.192"></a>
+<span class="sourceLineNo">193</span><a name="line.193"></a>
+<span class="sourceLineNo">194</span>      // backup complete<a 
name="line.194"></a>
+<span class="sourceLineNo">195</span>      completeBackup(conn, backupInfo, 
backupManager, BackupType.FULL, conf);<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    } catch (Exception e) {<a 
name="line.196"></a>
+<span class="sourceLineNo">197</span>      failBackup(conn, backupInfo, 
backupManager, e, "Unexpected BackupException : ",<a name="line.197"></a>
+<span class="sourceLineNo">198</span>        BackupType.FULL, conf);<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>      throw new IOException(e);<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><a name="line.205"></a>
-<span class="sourceLineNo">206</span>  protected void snapshotTable(Admin 
admin, TableName tableName, String snapshotName)<a name="line.206"></a>
-<span class="sourceLineNo">207</span>      throws IOException {<a 
name="line.207"></a>
-<span class="sourceLineNo">208</span><a name="line.208"></a>
-<span class="sourceLineNo">209</span>    int maxAttempts =<a 
name="line.209"></a>
-<span class="sourceLineNo">210</span>        
conf.getInt(BACKUP_MAX_ATTEMPTS_KEY, DEFAULT_BACKUP_MAX_ATTEMPTS);<a 
name="line.210"></a>
-<span class="sourceLineNo">211</span>    int pause =<a name="line.211"></a>
-<span class="sourceLineNo">212</span>        
conf.getInt(BACKUP_ATTEMPTS_PAUSE_MS_KEY, DEFAULT_BACKUP_ATTEMPTS_PAUSE_MS);<a 
name="line.212"></a>
-<span class="sourceLineNo">213</span>    int attempts = 0;<a 
name="line.213"></a>
-<span class="sourceLineNo">214</span><a name="line.214"></a>
-<span class="sourceLineNo">215</span>    while (attempts++ &lt; maxAttempts) 
{<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      try {<a name="line.216"></a>
-<span class="sourceLineNo">217</span>        admin.snapshot(snapshotName, 
tableName);<a name="line.217"></a>
-<span class="sourceLineNo">218</span>        return;<a name="line.218"></a>
-<span class="sourceLineNo">219</span>      } catch (IOException ee) {<a 
name="line.219"></a>
-<span class="sourceLineNo">220</span>        LOG.warn("Snapshot attempt " + 
attempts + " failed for table " + tableName<a name="line.220"></a>
-<span class="sourceLineNo">221</span>            + ", sleeping for " + pause + 
"ms", ee);<a name="line.221"></a>
-<span class="sourceLineNo">222</span>        if (attempts &lt; maxAttempts) 
{<a name="line.222"></a>
-<span class="sourceLineNo">223</span>          try {<a name="line.223"></a>
-<span class="sourceLineNo">224</span>            Thread.sleep(pause);<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>          } catch (InterruptedException 
e) {<a name="line.225"></a>
-<span class="sourceLineNo">226</span>            
Thread.currentThread().interrupt();<a name="line.226"></a>
-<span class="sourceLineNo">227</span>            break;<a name="line.227"></a>
-<span class="sourceLineNo">228</span>          }<a name="line.228"></a>
-<span class="sourceLineNo">229</span>        }<a name="line.229"></a>
-<span class="sourceLineNo">230</span>      }<a name="line.230"></a>
-<span class="sourceLineNo">231</span>    }<a name="line.231"></a>
-<span class="sourceLineNo">232</span>    throw new IOException("Failed to 
snapshot table "+ tableName);<a name="line.232"></a>
-<span class="sourceLineNo">233</span>  }<a name="line.233"></a>
-<span class="sourceLineNo">234</span>}<a name="line.234"></a>
+<span class="sourceLineNo">205</span>  protected void snapshotTable(Admin 
admin, TableName tableName, String snapshotName)<a name="line.205"></a>
+<span class="sourceLineNo">206</span>      throws IOException {<a 
name="line.206"></a>
+<span class="sourceLineNo">207</span><a name="line.207"></a>
+<span class="sourceLineNo">208</span>    int maxAttempts =<a 
name="line.208"></a>
+<span class="sourceLineNo">209</span>        
conf.getInt(BACKUP_MAX_ATTEMPTS_KEY, DEFAULT_BACKUP_MAX_ATTEMPTS);<a 
name="line.209"></a>
+<span class="sourceLineNo">210</span>    int pause =<a name="line.210"></a>
+<span class="sourceLineNo">211</span>        
conf.getInt(BACKUP_ATTEMPTS_PAUSE_MS_KEY, DEFAULT_BACKUP_ATTEMPTS_PAUSE_MS);<a 
name="line.211"></a>
+<span class="sourceLineNo">212</span>    int attempts = 0;<a 
name="line.212"></a>
+<span class="sourceLineNo">213</span><a name="line.213"></a>
+<span class="sourceLineNo">214</span>    while (attempts++ &lt; maxAttempts) 
{<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      try {<a name="line.215"></a>
+<span class="sourceLineNo">216</span>        admin.snapshot(snapshotName, 
tableName);<a name="line.216"></a>
+<span class="sourceLineNo">217</span>        return;<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      } catch (IOException ee) {<a 
name="line.218"></a>
+<span class="sourceLineNo">219</span>        LOG.warn("Snapshot attempt " + 
attempts + " failed for table " + tableName<a name="line.219"></a>
+<span class="sourceLineNo">220</span>            + ", sleeping for " + pause + 
"ms", ee);<a name="line.220"></a>
+<span class="sourceLineNo">221</span>        if (attempts &lt; maxAttempts) 
{<a name="line.221"></a>
+<span class="sourceLineNo">222</span>          try {<a name="line.222"></a>
+<span class="sourceLineNo">223</span>            Thread.sleep(pause);<a 
name="line.223"></a>
+<span class="sourceLineNo">224</span>          } catch (InterruptedException 
e) {<a name="line.224"></a>
+<span class="sourceLineNo">225</span>            
Thread.currentThread().interrupt();<a name="line.225"></a>
+<span class="sourceLineNo">226</span>            break;<a name="line.226"></a>
+<span class="sourceLineNo">227</span>          }<a name="line.227"></a>
+<span class="sourceLineNo">228</span>        }<a name="line.228"></a>
+<span class="sourceLineNo">229</span>      }<a name="line.229"></a>
+<span class="sourceLineNo">230</span>    }<a name="line.230"></a>
+<span class="sourceLineNo">231</span>    throw new IOException("Failed to 
snapshot table "+ tableName);<a name="line.231"></a>
+<span class="sourceLineNo">232</span>  }<a name="line.232"></a>
+<span class="sourceLineNo">233</span>}<a name="line.233"></a>
 
 
 

http://git-wip-us.apache.org/repos/asf/hbase-site/blob/d0f1a9f6/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.NewestLogFilter.html
----------------------------------------------------------------------
diff --git 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.NewestLogFilter.html
 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.NewestLogFilter.html
index a6494b1..58f74d7 100644
--- 
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.NewestLogFilter.html
+++ 
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.NewestLogFilter.html
@@ -100,299 +100,297 @@
 <span class="sourceLineNo">092</span>    HashMap&lt;String, String&gt; props = 
new HashMap&lt;String, String&gt;();<a name="line.92"></a>
 <span class="sourceLineNo">093</span>    props.put("backupRoot", 
backupInfo.getBackupRootDir());<a name="line.93"></a>
 <span class="sourceLineNo">094</span><a name="line.94"></a>
-<span class="sourceLineNo">095</span>    try (Admin admin = conn.getAdmin();) 
{<a name="line.95"></a>
-<span class="sourceLineNo">096</span><a name="line.96"></a>
-<span class="sourceLineNo">097</span>      
admin.execProcedure(LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_SIGNATURE,<a
 name="line.97"></a>
-<span class="sourceLineNo">098</span>        
LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_NAME, props);<a 
name="line.98"></a>
-<span class="sourceLineNo">099</span><a name="line.99"></a>
-<span class="sourceLineNo">100</span>    }<a name="line.100"></a>
-<span class="sourceLineNo">101</span>    newTimestamps = 
readRegionServerLastLogRollResult();<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span>    logList = 
getLogFilesForNewBackup(previousTimestampMins, newTimestamps, conf, 
savedStartCode);<a name="line.103"></a>
-<span class="sourceLineNo">104</span>    List&lt;WALItem&gt; 
logFromSystemTable =<a name="line.104"></a>
-<span class="sourceLineNo">105</span>        
getLogFilesFromBackupSystem(previousTimestampMins, newTimestamps, 
getBackupInfo()<a name="line.105"></a>
-<span class="sourceLineNo">106</span>            .getBackupRootDir());<a 
name="line.106"></a>
-<span class="sourceLineNo">107</span>    logList = 
excludeAlreadyBackedUpWALs(logList, logFromSystemTable);<a name="line.107"></a>
-<span class="sourceLineNo">108</span>    
backupInfo.setIncrBackupFileList(logList);<a name="line.108"></a>
-<span class="sourceLineNo">109</span><a name="line.109"></a>
-<span class="sourceLineNo">110</span>    return newTimestamps;<a 
name="line.110"></a>
-<span class="sourceLineNo">111</span>  }<a name="line.111"></a>
-<span class="sourceLineNo">112</span><a name="line.112"></a>
-<span class="sourceLineNo">113</span>  /**<a name="line.113"></a>
-<span class="sourceLineNo">114</span>   * Get list of WAL files eligible for 
incremental backup<a name="line.114"></a>
-<span class="sourceLineNo">115</span>   * @return list of WAL files<a 
name="line.115"></a>
-<span class="sourceLineNo">116</span>   * @throws IOException<a 
name="line.116"></a>
-<span class="sourceLineNo">117</span>   */<a name="line.117"></a>
-<span class="sourceLineNo">118</span>  public List&lt;String&gt; 
getIncrBackupLogFileList()<a name="line.118"></a>
-<span class="sourceLineNo">119</span>      throws IOException {<a 
name="line.119"></a>
-<span class="sourceLineNo">120</span>    List&lt;String&gt; logList;<a 
name="line.120"></a>
-<span class="sourceLineNo">121</span>    HashMap&lt;String, Long&gt; 
newTimestamps;<a name="line.121"></a>
-<span class="sourceLineNo">122</span>    HashMap&lt;String, Long&gt; 
previousTimestampMins;<a name="line.122"></a>
+<span class="sourceLineNo">095</span>    try (Admin admin = conn.getAdmin()) 
{<a name="line.95"></a>
+<span class="sourceLineNo">096</span>      
admin.execProcedure(LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_SIGNATURE,<a
 name="line.96"></a>
+<span class="sourceLineNo">097</span>        
LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_NAME, props);<a 
name="line.97"></a>
+<span class="sourceLineNo">098</span>    }<a name="line.98"></a>
+<span class="sourceLineNo">099</span>    newTimestamps = 
readRegionServerLastLogRollResult();<a name="line.99"></a>
+<span class="sourceLineNo">100</span><a name="line.100"></a>
+<span class="sourceLineNo">101</span>    logList = 
getLogFilesForNewBackup(previousTimestampMins, newTimestamps, conf, 
savedStartCode);<a name="line.101"></a>
+<span class="sourceLineNo">102</span>    List&lt;WALItem&gt; 
logFromSystemTable =<a name="line.102"></a>
+<span class="sourceLineNo">103</span>        
getLogFilesFromBackupSystem(previousTimestampMins, newTimestamps, 
getBackupInfo()<a name="line.103"></a>
+<span class="sourceLineNo">104</span>            .getBackupRootDir());<a 
name="line.104"></a>
+<span class="sourceLineNo">105</span>    logList = 
excludeAlreadyBackedUpWALs(logList, logFromSystemTable);<a name="line.105"></a>
+<span class="sourceLineNo">106</span>    
backupInfo.setIncrBackupFileList(logList);<a name="line.106"></a>
+<span class="sourceLineNo">107</span><a name="line.107"></a>
+<span class="sourceLineNo">108</span>    return newTimestamps;<a 
name="line.108"></a>
+<span class="sourceLineNo">109</span>  }<a name="line.109"></a>
+<span class="sourceLineNo">110</span><a name="line.110"></a>
+<span class="sourceLineNo">111</span>  /**<a name="line.111"></a>
+<span class="sourceLineNo">112</span>   * Get list of WAL files eligible for 
incremental backup<a name="line.112"></a>
+<span class="sourceLineNo">113</span>   * @return list of WAL files<a 
name="line.113"></a>
+<span class="sourceLineNo">114</span>   * @throws IOException<a 
name="line.114"></a>
+<span class="sourceLineNo">115</span>   */<a name="line.115"></a>
+<span class="sourceLineNo">116</span>  public List&lt;String&gt; 
getIncrBackupLogFileList()<a name="line.116"></a>
+<span class="sourceLineNo">117</span>      throws IOException {<a 
name="line.117"></a>
+<span class="sourceLineNo">118</span>    List&lt;String&gt; logList;<a 
name="line.118"></a>
+<span class="sourceLineNo">119</span>    HashMap&lt;String, Long&gt; 
newTimestamps;<a name="line.119"></a>
+<span class="sourceLineNo">120</span>    HashMap&lt;String, Long&gt; 
previousTimestampMins;<a name="line.120"></a>
+<span class="sourceLineNo">121</span><a name="line.121"></a>
+<span class="sourceLineNo">122</span>    String savedStartCode = 
readBackupStartCode();<a name="line.122"></a>
 <span class="sourceLineNo">123</span><a name="line.123"></a>
-<span class="sourceLineNo">124</span>    String savedStartCode = 
readBackupStartCode();<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span>    // key: tableName<a 
name="line.126"></a>
-<span class="sourceLineNo">127</span>    // value: 
&lt;RegionServer,PreviousTimeStamp&gt;<a name="line.127"></a>
-<span class="sourceLineNo">128</span>    HashMap&lt;TableName, 
HashMap&lt;String, Long&gt;&gt; previousTimestampMap = readLogTimestampMap();<a 
name="line.128"></a>
+<span class="sourceLineNo">124</span>    // key: tableName<a 
name="line.124"></a>
+<span class="sourceLineNo">125</span>    // value: 
&lt;RegionServer,PreviousTimeStamp&gt;<a name="line.125"></a>
+<span class="sourceLineNo">126</span>    HashMap&lt;TableName, 
HashMap&lt;String, Long&gt;&gt; previousTimestampMap = readLogTimestampMap();<a 
name="line.126"></a>
+<span class="sourceLineNo">127</span><a name="line.127"></a>
+<span class="sourceLineNo">128</span>    previousTimestampMins = 
BackupUtils.getRSLogTimestampMins(previousTimestampMap);<a name="line.128"></a>
 <span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span>    previousTimestampMins = 
BackupUtils.getRSLogTimestampMins(previousTimestampMap);<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span>    if (LOG.isDebugEnabled()) {<a 
name="line.132"></a>
-<span class="sourceLineNo">133</span>      LOG.debug("StartCode " + 
savedStartCode + "for backupID " + backupInfo.getBackupId());<a 
name="line.133"></a>
-<span class="sourceLineNo">134</span>    }<a name="line.134"></a>
-<span class="sourceLineNo">135</span>    // get all new log files from .logs 
and .oldlogs after last TS and before new timestamp<a name="line.135"></a>
-<span class="sourceLineNo">136</span>    if (savedStartCode == null || 
previousTimestampMins == null<a name="line.136"></a>
-<span class="sourceLineNo">137</span>        || 
previousTimestampMins.isEmpty()) {<a name="line.137"></a>
-<span class="sourceLineNo">138</span>      throw new IOException(<a 
name="line.138"></a>
-<span class="sourceLineNo">139</span>          "Cannot read any previous back 
up timestamps from backup system table. "<a name="line.139"></a>
-<span class="sourceLineNo">140</span>              + "In order to create an 
incremental backup, at least one full backup is needed.");<a 
name="line.140"></a>
-<span class="sourceLineNo">141</span>    }<a name="line.141"></a>
+<span class="sourceLineNo">130</span>    if (LOG.isDebugEnabled()) {<a 
name="line.130"></a>
+<span class="sourceLineNo">131</span>      LOG.debug("StartCode " + 
savedStartCode + "for backupID " + backupInfo.getBackupId());<a 
name="line.131"></a>
+<span class="sourceLineNo">132</span>    }<a name="line.132"></a>
+<span class="sourceLineNo">133</span>    // get all new log files from .logs 
and .oldlogs after last TS and before new timestamp<a name="line.133"></a>
+<span class="sourceLineNo">134</span>    if (savedStartCode == null || 
previousTimestampMins == null<a name="line.134"></a>
+<span class="sourceLineNo">135</span>        || 
previousTimestampMins.isEmpty()) {<a name="line.135"></a>
+<span class="sourceLineNo">136</span>      throw new IOException(<a 
name="line.136"></a>
+<span class="sourceLineNo">137</span>          "Cannot read any previous back 
up timestamps from backup system table. "<a name="line.137"></a>
+<span class="sourceLineNo">138</span>              + "In order to create an 
incremental backup, at least one full backup is needed.");<a 
name="line.138"></a>
+<span class="sourceLineNo">139</span>    }<a name="line.139"></a>
+<span class="sourceLineNo">140</span><a name="line.140"></a>
+<span class="sourceLineNo">141</span>    newTimestamps = 
readRegionServerLastLogRollResult();<a name="line.141"></a>
 <span class="sourceLineNo">142</span><a name="line.142"></a>
-<span class="sourceLineNo">143</span>    newTimestamps = 
readRegionServerLastLogRollResult();<a name="line.143"></a>
-<span class="sourceLineNo">144</span><a name="line.144"></a>
-<span class="sourceLineNo">145</span>    logList = 
getLogFilesForNewBackup(previousTimestampMins, newTimestamps, conf, 
savedStartCode);<a name="line.145"></a>
-<span class="sourceLineNo">146</span>    List&lt;WALItem&gt; 
logFromSystemTable =<a name="line.146"></a>
-<span class="sourceLineNo">147</span>        
getLogFilesFromBackupSystem(previousTimestampMins, newTimestamps, 
getBackupInfo()<a name="line.147"></a>
-<span class="sourceLineNo">148</span>            .getBackupRootDir());<a 
name="line.148"></a>
-<span class="sourceLineNo">149</span><a name="line.149"></a>
-<span class="sourceLineNo">150</span>    logList = 
excludeAlreadyBackedUpWALs(logList, logFromSystemTable);<a name="line.150"></a>
-<span class="sourceLineNo">151</span>    
backupInfo.setIncrBackupFileList(logList);<a name="line.151"></a>
-<span class="sourceLineNo">152</span><a name="line.152"></a>
-<span class="sourceLineNo">153</span>    return logList;<a name="line.153"></a>
-<span class="sourceLineNo">154</span>  }<a name="line.154"></a>
-<span class="sourceLineNo">155</span><a name="line.155"></a>
-<span class="sourceLineNo">156</span><a name="line.156"></a>
-<span class="sourceLineNo">157</span>  private List&lt;String&gt; 
excludeAlreadyBackedUpWALs(List&lt;String&gt; logList,<a name="line.157"></a>
-<span class="sourceLineNo">158</span>      List&lt;WALItem&gt; 
logFromSystemTable) {<a name="line.158"></a>
+<span class="sourceLineNo">143</span>    logList = 
getLogFilesForNewBackup(previousTimestampMins, newTimestamps, conf, 
savedStartCode);<a name="line.143"></a>
+<span class="sourceLineNo">144</span>    List&lt;WALItem&gt; 
logFromSystemTable =<a name="line.144"></a>
+<span class="sourceLineNo">145</span>        
getLogFilesFromBackupSystem(previousTimestampMins, newTimestamps, 
getBackupInfo()<a name="line.145"></a>
+<span class="sourceLineNo">146</span>            .getBackupRootDir());<a 
name="line.146"></a>
+<span class="sourceLineNo">147</span><a name="line.147"></a>
+<span class="sourceLineNo">148</span>    logList = 
excludeAlreadyBackedUpWALs(logList, logFromSystemTable);<a name="line.148"></a>
+<span class="sourceLineNo">149</span>    
backupInfo.setIncrBackupFileList(logList);<a name="line.149"></a>
+<span class="sourceLineNo">150</span><a name="line.150"></a>
+<span class="sourceLineNo">151</span>    return logList;<a name="line.151"></a>
+<span class="sourceLineNo">152</span>  }<a name="line.152"></a>
+<span class="sourceLineNo">153</span><a name="line.153"></a>
+<span class="sourceLineNo">154</span><a name="line.154"></a>
+<span class="sourceLineNo">155</span>  private List&lt;String&gt; 
excludeAlreadyBackedUpWALs(List&lt;String&gt; logList,<a name="line.155"></a>
+<span class="sourceLineNo">156</span>      List&lt;WALItem&gt; 
logFromSystemTable) {<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span>    Set&lt;String&gt; walFileNameSet = 
convertToSet(logFromSystemTable);<a name="line.158"></a>
 <span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span>    Set&lt;String&gt; walFileNameSet = 
convertToSet(logFromSystemTable);<a name="line.160"></a>
-<span class="sourceLineNo">161</span><a name="line.161"></a>
-<span class="sourceLineNo">162</span>    List&lt;String&gt; list = new 
ArrayList&lt;String&gt;();<a name="line.162"></a>
-<span class="sourceLineNo">163</span>    for (int i=0; i &lt; logList.size(); 
i++) {<a name="line.163"></a>
-<span class="sourceLineNo">164</span>      Path p = new 
Path(logList.get(i));<a name="line.164"></a>
-<span class="sourceLineNo">165</span>      String name  = p.getName();<a 
name="line.165"></a>
-<span class="sourceLineNo">166</span>      if (walFileNameSet.contains(name)) 
continue;<a name="line.166"></a>
-<span class="sourceLineNo">167</span>      list.add(logList.get(i));<a 
name="line.167"></a>
-<span class="sourceLineNo">168</span>    }<a name="line.168"></a>
-<span class="sourceLineNo">169</span>    return list;<a name="line.169"></a>
-<span class="sourceLineNo">170</span>  }<a name="line.170"></a>
-<span class="sourceLineNo">171</span><a name="line.171"></a>
-<span class="sourceLineNo">172</span>  /**<a name="line.172"></a>
-<span class="sourceLineNo">173</span>   * Create Set of WAL file names (not 
full path names)<a name="line.173"></a>
-<span class="sourceLineNo">174</span>   * @param logFromSystemTable<a 
name="line.174"></a>
-<span class="sourceLineNo">175</span>   * @return set of WAL file names<a 
name="line.175"></a>
-<span class="sourceLineNo">176</span>   */<a name="line.176"></a>
-<span class="sourceLineNo">177</span>  private Set&lt;String&gt; 
convertToSet(List&lt;WALItem&gt; logFromSystemTable) {<a name="line.177"></a>
-<span class="sourceLineNo">178</span><a name="line.178"></a>
-<span class="sourceLineNo">179</span>    Set&lt;String&gt; set = new 
HashSet&lt;String&gt;();<a name="line.179"></a>
-<span class="sourceLineNo">180</span>    for (int i=0; i &lt; 
logFromSystemTable.size(); i++) {<a name="line.180"></a>
-<span class="sourceLineNo">181</span>      WALItem item = 
logFromSystemTable.get(i);<a name="line.181"></a>
-<span class="sourceLineNo">182</span>      set.add(item.walFile);<a 
name="line.182"></a>
-<span class="sourceLineNo">183</span>    }<a name="line.183"></a>
-<span class="sourceLineNo">184</span>    return set;<a name="line.184"></a>
-<span class="sourceLineNo">185</span>  }<a name="line.185"></a>
-<span class="sourceLineNo">186</span><a name="line.186"></a>
-<span class="sourceLineNo">187</span>  /**<a name="line.187"></a>
-<span class="sourceLineNo">188</span>   * For each region server: get all log 
files newer than the last timestamps, but not newer than<a name="line.188"></a>
-<span class="sourceLineNo">189</span>   * the newest timestamps.<a 
name="line.189"></a>
-<span class="sourceLineNo">190</span>   * @param olderTimestamps timestamp map 
for each region server of the last backup.<a name="line.190"></a>
-<span class="sourceLineNo">191</span>   * @param newestTimestamps timestamp 
map for each region server that the backup should lead to.<a 
name="line.191"></a>
-<span class="sourceLineNo">192</span>   * @return list of log files which 
needs to be added to this backup<a name="line.192"></a>
-<span class="sourceLineNo">193</span>   * @throws IOException<a 
name="line.193"></a>
-<span class="sourceLineNo">194</span>   */<a name="line.194"></a>
-<span class="sourceLineNo">195</span>  private List&lt;WALItem&gt; 
getLogFilesFromBackupSystem(HashMap&lt;String, Long&gt; olderTimestamps,<a 
name="line.195"></a>
-<span class="sourceLineNo">196</span>      HashMap&lt;String, Long&gt; 
newestTimestamps, String backupRoot) throws IOException {<a name="line.196"></a>
-<span class="sourceLineNo">197</span>    List&lt;WALItem&gt; logFiles = new 
ArrayList&lt;WALItem&gt;();<a name="line.197"></a>
-<span class="sourceLineNo">198</span>    Iterator&lt;WALItem&gt; it = 
getWALFilesFromBackupSystem();<a name="line.198"></a>
-<span class="sourceLineNo">199</span>    while (it.hasNext()) {<a 
name="line.199"></a>
-<span class="sourceLineNo">200</span>      WALItem item = it.next();<a 
name="line.200"></a>
-<span class="sourceLineNo">201</span>      String rootDir = 
item.getBackupRoot();<a name="line.201"></a>
-<span class="sourceLineNo">202</span>      if (!rootDir.equals(backupRoot)) 
{<a name="line.202"></a>
-<span class="sourceLineNo">203</span>        continue;<a name="line.203"></a>
-<span class="sourceLineNo">204</span>      }<a name="line.204"></a>
-<span class="sourceLineNo">205</span>      String walFileName = 
item.getWalFile();<a name="line.205"></a>
-<span class="sourceLineNo">206</span>      String server = 
BackupUtils.parseHostNameFromLogFile(new Path(walFileName));<a 
name="line.206"></a>
-<span class="sourceLineNo">207</span>      if (server == null) {<a 
name="line.207"></a>
-<span class="sourceLineNo">208</span>        continue;<a name="line.208"></a>
-<span class="sourceLineNo">209</span>      }<a name="line.209"></a>
-<span class="sourceLineNo">210</span>      Long tss = 
getTimestamp(walFileName);<a name="line.210"></a>
-<span class="sourceLineNo">211</span>      Long oldTss = 
olderTimestamps.get(server);<a name="line.211"></a>
-<span class="sourceLineNo">212</span>      Long newTss = 
newestTimestamps.get(server);<a name="line.212"></a>
-<span class="sourceLineNo">213</span>      if (oldTss == null) {<a 
name="line.213"></a>
-<span class="sourceLineNo">214</span>        logFiles.add(item);<a 
name="line.214"></a>
-<span class="sourceLineNo">215</span>        continue;<a name="line.215"></a>
-<span class="sourceLineNo">216</span>      }<a name="line.216"></a>
-<span class="sourceLineNo">217</span>      if (newTss == null) {<a 
name="line.217"></a>
-<span class="sourceLineNo">218</span>        newTss = Long.MAX_VALUE;<a 
name="line.218"></a>
-<span class="sourceLineNo">219</span>      }<a name="line.219"></a>
-<span class="sourceLineNo">220</span>      if (tss &gt; oldTss &amp;&amp; tss 
&lt; newTss) {<a name="line.220"></a>
-<span class="sourceLineNo">221</span>        logFiles.add(item);<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>    return logFiles;<a 
name="line.224"></a>
-<span class="sourceLineNo">225</span>  }<a name="line.225"></a>
-<span class="sourceLineNo">226</span><a name="line.226"></a>
-<span class="sourceLineNo">227</span>  private Long getTimestamp(String 
walFileName) {<a name="line.227"></a>
-<span class="sourceLineNo">228</span>    int index = 
walFileName.lastIndexOf(BackupUtils.LOGNAME_SEPARATOR);<a name="line.228"></a>
-<span class="sourceLineNo">229</span>    return 
Long.parseLong(walFileName.substring(index + 1));<a name="line.229"></a>
-<span class="sourceLineNo">230</span>  }<a name="line.230"></a>
-<span class="sourceLineNo">231</span><a name="line.231"></a>
-<span class="sourceLineNo">232</span>  /**<a name="line.232"></a>
-<span class="sourceLineNo">233</span>   * For each region server: get all log 
files newer than the last timestamps but not newer than the<a 
name="line.233"></a>
-<span class="sourceLineNo">234</span>   * newest timestamps.<a 
name="line.234"></a>
-<span class="sourceLineNo">235</span>   * @param olderTimestamps the timestamp 
for each region server of the last backup.<a name="line.235"></a>
-<span class="sourceLineNo">236</span>   * @param newestTimestamps the 
timestamp for each region server that the backup should lead to.<a 
name="line.236"></a>
-<span class="sourceLineNo">237</span>   * @param conf the Hadoop and Hbase 
configuration<a name="line.237"></a>
-<span class="sourceLineNo">238</span>   * @param savedStartCode the startcode 
(timestamp) of last successful backup.<a name="line.238"></a>
-<span class="sourceLineNo">239</span>   * @return a list of log files to be 
backed up<a name="line.239"></a>
-<span class="sourceLineNo">240</span>   * @throws IOException exception<a 
name="line.240"></a>
-<span class="sourceLineNo">241</span>   */<a name="line.241"></a>
-<span class="sourceLineNo">242</span>  private List&lt;String&gt; 
getLogFilesForNewBackup(HashMap&lt;String, Long&gt; olderTimestamps,<a 
name="line.242"></a>
-<span class="sourceLineNo">243</span>      HashMap&lt;String, Long&gt; 
newestTimestamps, Configuration conf, String savedStartCode)<a 
name="line.243"></a>
-<span class="sourceLineNo">244</span>      throws IOException {<a 
name="line.244"></a>
-<span class="sourceLineNo">245</span>    LOG.debug("In 
getLogFilesForNewBackup()\n" + "olderTimestamps: " + olderTimestamps<a 
name="line.245"></a>
-<span class="sourceLineNo">246</span>        + "\n newestTimestamps: " + 
newestTimestamps);<a name="line.246"></a>
-<span class="sourceLineNo">247</span>    Path rootdir = 
FSUtils.getRootDir(conf);<a name="line.247"></a>
-<span class="sourceLineNo">248</span>    Path logDir = new Path(rootdir, 
HConstants.HREGION_LOGDIR_NAME);<a name="line.248"></a>
-<span class="sourceLineNo">249</span>    Path oldLogDir = new Path(rootdir, 
HConstants.HREGION_OLDLOGDIR_NAME);<a name="line.249"></a>
-<span class="sourceLineNo">250</span>    FileSystem fs = 
rootdir.getFileSystem(conf);<a name="line.250"></a>
-<span class="sourceLineNo">251</span>    NewestLogFilter pathFilter = new 
NewestLogFilter();<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span>    List&lt;String&gt; resultLogFiles = 
new ArrayList&lt;String&gt;();<a name="line.253"></a>
-<span class="sourceLineNo">254</span>    List&lt;String&gt; newestLogs = new 
ArrayList&lt;String&gt;();<a name="line.254"></a>
-<span class="sourceLineNo">255</span><a name="line.255"></a>
-<span class="sourceLineNo">256</span>    /*<a name="line.256"></a>
-<span class="sourceLineNo">257</span>     * The old region servers and 
timestamps info we kept in backup system table may be out of sync<a 
name="line.257"></a>
-<span class="sourceLineNo">258</span>     * if new region server is added or 
existing one lost. We'll deal with it here when processing<a 
name="line.258"></a>
-<span class="sourceLineNo">259</span>     * the logs. If data in backup system 
table has more hosts, just ignore it. If the .logs<a name="line.259"></a>
-<span class="sourceLineNo">260</span>     * directory includes more hosts, the 
additional hosts will not have old timestamps to compare<a name="line.260"></a>
-<span class="sourceLineNo">261</span>     * with. We'll just use all the logs 
in that directory. We always write up-to-date region server<a 
name="line.261"></a>
-<span class="sourceLineNo">262</span>     * and timestamp info to backup 
system table at the end of successful backup.<a name="line.262"></a>
-<span class="sourceLineNo">263</span>     */<a name="line.263"></a>
-<span class="sourceLineNo">264</span><a name="line.264"></a>
-<span class="sourceLineNo">265</span>    FileStatus[] rss;<a 
name="line.265"></a>
-<span class="sourceLineNo">266</span>    Path p;<a name="line.266"></a>
-<span class="sourceLineNo">267</span>    String host;<a name="line.267"></a>
-<span class="sourceLineNo">268</span>    Long oldTimeStamp;<a 
name="line.268"></a>
-<span class="sourceLineNo">269</span>    String currentLogFile;<a 
name="line.269"></a>
-<span class="sourceLineNo">270</span>    long currentLogTS;<a 
name="line.270"></a>
-<span class="sourceLineNo">271</span><a name="line.271"></a>
-<span class="sourceLineNo">272</span>    // Get the files in .logs.<a 
name="line.272"></a>
-<span class="sourceLineNo">273</span>    rss = fs.listStatus(logDir);<a 
name="line.273"></a>
-<span class="sourceLineNo">274</span>    for (FileStatus rs : rss) {<a 
name="line.274"></a>
-<span class="sourceLineNo">275</span>      p = rs.getPath();<a 
name="line.275"></a>
-<span class="sourceLineNo">276</span>      host = 
BackupUtils.parseHostNameFromLogFile(p);<a name="line.276"></a>
-<span class="sourceLineNo">277</span>      if (host == null) {<a 
name="line.277"></a>
-<span class="sourceLineNo">278</span>        continue;<a name="line.278"></a>
-<span class="sourceLineNo">279</span>      }<a name="line.279"></a>
-<span class="sourceLineNo">280</span>      FileStatus[] logs;<a 
name="line.280"></a>
-<span class="sourceLineNo">281</span>      oldTimeStamp = 
olderTimestamps.get(host);<a name="line.281"></a>
-<span class="sourceLineNo">282</span>      // It is possible that there is no 
old timestamp in backup system table for this host if<a name="line.282"></a>
-<span class="sourceLineNo">283</span>      // this region server is newly 
added after our last backup.<a name="line.283"></a>
-<span class="sourceLineNo">284</span>      if (oldTimeStamp == null) {<a 
name="line.284"></a>
-<span class="sourceLineNo">285</span>        logs = fs.listStatus(p);<a 
name="line.285"></a>
-<span class="sourceLineNo">286</span>      } else {<a name="line.286"></a>
-<span class="sourceLineNo">287</span>        
pathFilter.setLastBackupTS(oldTimeStamp);<a name="line.287"></a>
-<span class="sourceLineNo">288</span>        logs = fs.listStatus(p, 
pathFilter);<a name="line.288"></a>
-<span class="sourceLineNo">289</span>      }<a name="line.289"></a>
-<span class="sourceLineNo">290</span>      for (FileStatus log : logs) {<a 
name="line.290"></a>
-<span class="sourceLineNo">291</span>        LOG.debug("currentLogFile: " + 
log.getPath().toString());<a name="line.291"></a>
-<span class="sourceLineNo">292</span>        if 
(AbstractFSWALProvider.isMetaFile(log.getPath())) {<a name="line.292"></a>
-<span class="sourceLineNo">293</span>          if (LOG.isDebugEnabled()) {<a 
name="line.293"></a>
-<span class="sourceLineNo">294</span>            LOG.debug("Skip hbase:meta 
log file: " + log.getPath().getName());<a name="line.294"></a>
-<span class="sourceLineNo">295</span>          }<a name="line.295"></a>
-<span class="sourceLineNo">296</span>          continue;<a name="line.296"></a>
-<span class="sourceLineNo">297</span>        }<a name="line.297"></a>
-<span class="sourceLineNo">298</span>        currentLogFile = 
log.getPath().toString();<a name="line.298"></a>
-<span class="sourceLineNo">299</span>        
resultLogFiles.add(currentLogFile);<a name="line.299"></a>
-<span class="sourceLineNo">300</span>        currentLogTS = 
BackupUtils.getCreationTime(log.getPath());<a name="line.300"></a>
-<span class="sourceLineNo">301</span>        // newestTimestamps is up-to-date 
with the current list of hosts<a name="line.301"></a>
-<span class="sourceLineNo">302</span>        // so newestTimestamps.get(host) 
will not be null.<a name="line.302"></a>
-<span class="sourceLineNo">303</span>        if (currentLogTS &gt; 
newestTimestamps.get(host)) {<a name="line.303"></a>
-<span class="sourceLineNo">304</span>          
newestLogs.add(currentLogFile);<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><a name="line.308"></a>
-<span class="sourceLineNo">309</span>    // Include the .oldlogs files too.<a 
name="line.309"></a>
-<span class="sourceLineNo">310</span>    FileStatus[] oldlogs = 
fs.listStatus(oldLogDir);<a name="line.310"></a>
-<span class="sourceLineNo">311</span>    for (FileStatus oldlog : oldlogs) {<a 
name="line.311"></a>
-<span class="sourceLineNo">312</span>      p = oldlog.getPath();<a 
name="line.312"></a>
-<span class="sourceLineNo">313</span>      currentLogFile = p.toString();<a 
name="line.313"></a>
-<span class="sourceLineNo">314</span>      if 
(AbstractFSWALProvider.isMetaFile(p)) {<a name="line.314"></a>
-<span class="sourceLineNo">315</span>        if (LOG.isDebugEnabled()) {<a 
name="line.315"></a>
-<span class="sourceLineNo">316</span>          LOG.debug("Skip .meta log file: 
" + currentLogFile);<a name="line.316"></a>
-<span class="sourceLineNo">317</span>        }<a name="line.317"></a>
-<span class="sourceLineNo">318</span>        continue;<a name="line.318"></a>
-<span class="sourceLineNo">319</span>      }<a name="line.319"></a>
-<span class="sourceLineNo">320</span>      host = 
BackupUtils.parseHostFromOldLog(p);<a name="line.320"></a>
-<span class="sourceLineNo">321</span>      if (host == null) {<a 
name="line.321"></a>
-<span class="sourceLineNo">322</span>        continue;<a name="line.322"></a>
-<span class="sourceLineNo">323</span>      }<a name="line.323"></a>
-<span class="sourceLineNo">324</span>      currentLogTS = 
BackupUtils.getCreationTime(p);<a name="line.324"></a>
-<span class="sourceLineNo">325</span>      oldTimeStamp = 
olderTimestamps.get(host);<a name="line.325"></a>
-<span class="sourceLineNo">326</span>      /*<a name="line.326"></a>
-<span class="sourceLineNo">327</span>       * It is possible that there is no 
old timestamp in backup system table for this host. At the<a 
name="line.327"></a>
-<span class="sourceLineNo">328</span>       * time of our last backup 
operation, this rs did not exist. The reason can be one of the two:<a 
name="line.328"></a>
-<span class="sourceLineNo">329</span>       * 1. The rs already left/crashed. 
Its logs were moved to .oldlogs. 2. The rs was added after<a 
name="line.329"></a>
-<span class="sourceLineNo">330</span>       * our last backup.<a 
name="line.330"></a>
-<span class="sourceLineNo">331</span>       */<a name="line.331"></a>
-<span class="sourceLineNo">332</span>      if (oldTimeStamp == null) {<a 
name="line.332"></a>
-<span class="sourceLineNo">333</span>        if (currentLogTS &lt; 
Long.parseLong(savedStartCode)) {<a name="line.333"></a>
-<span class="sourceLineNo">334</span>          // This log file is really old, 
its region server was before our last backup.<a name="line.334"></a>
-<span class="sourceLineNo">335</span>          continue;<a name="line.335"></a>
-<span class="sourceLineNo">336</span>        } else {<a name="line.336"></a>
-<span class="sourceLineNo">337</span>          
resultLogFiles.add(currentLogFile);<a name="line.337"></a>
-<span class="sourceLineNo">338</span>        }<a name="line.338"></a>
-<span class="sourceLineNo">339</span>      } else if (currentLogTS &gt; 
oldTimeStamp) {<a name="line.339"></a>
-<span class="sourceLineNo">340</span>        
resultLogFiles.add(currentLogFile);<a name="line.340"></a>
-<span class="sourceLineNo">341</span>      }<a name="line.341"></a>
-<span class="sourceLineNo">342</span><a name="line.342"></a>
-<span class="sourceLineNo">343</span>      // It is possible that a host in 
.oldlogs is an obsolete region server<a name="line.343"></a>
-<span class="sourceLineNo">344</span>      // so newestTimestamps.get(host) 
here can be null.<a name="line.344"></a>
-<span class="sourceLineNo">345</span>      // Even if these logs belong to a 
obsolete region server, we still need<a name="line.345"></a>
-<span class="sourceLineNo">346</span>      // to include they to avoid loss of 
edits for backup.<a name="line.346"></a>
-<span class="sourceLineNo">347</span>      Long newTimestamp = 
newestTimestamps.get(host);<a name="line.347"></a>
-<span class="sourceLineNo">348</span>      if (newTimestamp != null &amp;&amp; 
currentLogTS &gt; newTimestamp) {<a name="line.348"></a>
-<span class="sourceLineNo">349</span>        newestLogs.add(currentLogFile);<a 
name="line.349"></a>
-<span class="sourceLineNo">350</span>      }<a name="line.350"></a>
-<span class="sourceLineNo">351</span>    }<a name="line.351"></a>
-<span class="sourceLineNo">352</span>    // remove newest log per host because 
they are still in use<a name="line.352"></a>
-<span class="sourceLineNo">353</span>    
resultLogFiles.removeAll(newestLogs);<a name="line.353"></a>
-<span class="sourceLineNo">354</span>    return resultLogFiles;<a 
name="line.354"></a>
-<span class="sourceLineNo">355</span>  }<a name="line.355"></a>
-<span class="sourceLineNo">356</span><a name="line.356"></a>
-<span class="sourceLineNo">357</span>  static class NewestLogFilter implements 
PathFilter {<a name="line.357"></a>
-<span class="sourceLineNo">358</span>    private Long lastBackupTS = 0L;<a 
name="line.358"></a>
-<span class="sourceLineNo">359</span><a name="line.359"></a>
-<span class="sourceLineNo">360</span>    public NewestLogFilter() {<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>    protected void setLastBackupTS(Long 
ts) {<a name="line.363"></a>
-<span class="sourceLineNo">364</span>      this.lastBackupTS = ts;<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>    @Override<a name="line.367"></a>
-<span class="sourceLineNo">368</span>    public boolean accept(Path path) {<a 
name="line.368"></a>
-<span class="sourceLineNo">369</span>      // skip meta table log -- ts.meta 
file<a name="line.369"></a>
-<span class="sourceLineNo">370</span>      if 
(AbstractFSWALProvider.isMetaFile(path)) {<a name="line.370"></a>
-<span class="sourceLineNo">371</span>        if (LOG.isDebugEnabled()) {<a 
name="line.371"></a>
-<span class="sourceLineNo">372</span>          LOG.debug("Skip .meta log file: 
" + path.getName());<a name="line.372"></a>
-<span class="sourceLineNo">373</span>        }<a name="line.373"></a>
-<span class="sourceLineNo">374</span>        return false;<a 
name="line.374"></a>
-<span class="sourceLineNo">375</span>      }<a name="line.375"></a>
-<span class="sourceLineNo">376</span>      long timestamp;<a 
name="line.376"></a>
-<span class="sourceLineNo">377</span>      try {<a name="line.377"></a>
-<span class="sourceLineNo">378</span>        timestamp = 
BackupUtils.getCreationTime(path);<a name="line.378"></a>
-<span class="sourceLineNo">379</span>        return timestamp &gt; 
lastBackupTS;<a name="line.379"></a>
-<span class="sourceLineNo">380</span>      } catch (Exception e) {<a 
name="line.380"></a>
-<span class="sourceLineNo">381</span>        LOG.warn("Cannot read timestamp 
of log file " + path);<a name="line.381"></a>
-<span class="sourceLineNo">382</span>        return false;<a 
name="line.382"></a>
-<span class="sourceLineNo">383</span>      }<a name="line.383"></a>
-<span class="sourceLineNo">384</span>    }<a name="line.384"></a>
-<span class="sourceLineNo">385</span>  }<a name="line.385"></a>
-<span class="sourceLineNo">386</span><a name="line.386"></a>
-<span class="sourceLineNo">387</span>}<a name="line.387"></a>
+<span class="sourceLineNo">160</span>    List&lt;String&gt; list = new 
ArrayList&lt;String&gt;();<a name="line.160"></a>
+<span class="sourceLineNo">161</span>    for (int i=0; i &lt; logList.size(); 
i++) {<a name="line.161"></a>
+<span class="sourceLineNo">162</span>      Path p = new 
Path(logList.get(i));<a name="line.162"></a>
+<span class="sourceLineNo">163</span>      String name  = p.getName();<a 
name="line.163"></a>
+<span class="sourceLineNo">164</span>      if (walFileNameSet.contains(name)) 
continue;<a name="line.164"></a>
+<span class="sourceLineNo">165</span>      list.add(logList.get(i));<a 
name="line.165"></a>
+<span class="sourceLineNo">166</span>    }<a name="line.166"></a>
+<span class="sourceLineNo">167</span>    return list;<a name="line.167"></a>
+<span class="sourceLineNo">168</span>  }<a name="line.168"></a>
+<span class="sourceLineNo">169</span><a name="line.169"></a>
+<span class="sourceLineNo">170</span>  /**<a name="line.170"></a>
+<span class="sourceLineNo">171</span>   * Create Set of WAL file names (not 
full path names)<a name="line.171"></a>
+<span class="sourceLineNo">172</span>   * @param logFromSystemTable<a 
name="line.172"></a>
+<span class="sourceLineNo">173</span>   * @return set of WAL file names<a 
name="line.173"></a>
+<span class="sourceLineNo">174</span>   */<a name="line.174"></a>
+<span class="sourceLineNo">175</span>  private Set&lt;String&gt; 
convertToSet(List&lt;WALItem&gt; logFromSystemTable) {<a name="line.175"></a>
+<span class="sourceLineNo">176</span><a name="line.176"></a>
+<span class="sourceLineNo">177</span>    Set&lt;String&gt; set = new 
HashSet&lt;String&gt;();<a name="line.177"></a>
+<span class="sourceLineNo">178</span>    for (int i=0; i &lt; 
logFromSystemTable.size(); i++) {<a name="line.178"></a>
+<span class="sourceLineNo">179</span>      WALItem item = 
logFromSystemTable.get(i);<a name="line.179"></a>
+<span class="sourceLineNo">180</span>      set.add(item.walFile);<a 
name="line.180"></a>
+<span class="sourceLineNo">181</span>    }<a name="line.181"></a>
+<span class="sourceLineNo">182</span>    return set;<a name="line.182"></a>
+<span class="sourceLineNo">183</span>  }<a name="line.183"></a>
+<span class="sourceLineNo">184</span><a name="line.184"></a>
+<span class="sourceLineNo">185</span>  /**<a name="line.185"></a>
+<span class="sourceLineNo">186</span>   * For each region server: get all log 
files newer than the last timestamps, but not newer than<a name="line.186"></a>
+<span class="sourceLineNo">187</span>   * the newest timestamps.<a 
name="line.187"></a>
+<span class="sourceLineNo">188</span>   * @param olderTimestamps timestamp map 
for each region server of the last backup.<a name="line.188"></a>
+<span class="sourceLineNo">189</span>   * @param newestTimestamps timestamp 
map for each region server that the backup should lead to.<a 
name="line.189"></a>
+<span class="sourceLineNo">190</span>   * @return list of log files which 
needs to be added to this backup<a name="line.190"></a>
+<span class="sourceLineNo">191</span>   * @throws IOException<a 
name="line.191"></a>
+<span class="sourceLineNo">192</span>   */<a name="line.192"></a>
+<span class="sourceLineNo">193</span>  private List&lt;WALItem&gt; 
getLogFilesFromBackupSystem(HashMap&lt;String, Long&gt; olderTimestamps,<a 
name="line.193"></a>
+<span class="sourceLineNo">194</span>      HashMap&lt;String, Long&gt; 
newestTimestamps, String backupRoot) throws IOException {<a name="line.194"></a>
+<span class="sourceLineNo">195</span>    List&lt;WALItem&gt; logFiles = new 
ArrayList&lt;WALItem&gt;();<a name="line.195"></a>
+<span class="sourceLineNo">196</span>    Iterator&lt;WALItem&gt; it = 
getWALFilesFromBackupSystem();<a name="line.196"></a>
+<span class="sourceLineNo">197</span>    while (it.hasNext()) {<a 
name="line.197"></a>
+<span class="sourceLineNo">198</span>      WALItem item = it.next();<a 
name="line.198"></a>
+<span class="sourceLineNo">199</span>      String rootDir = 
item.getBackupRoot();<a name="line.199"></a>
+<span class="sourceLineNo">200</span>      if (!rootDir.equals(backupRoot)) 
{<a name="line.200"></a>
+<span class="sourceLineNo">201</span>        continue;<a name="line.201"></a>
+<span class="sourceLineNo">202</span>      }<a name="line.202"></a>
+<span class="sourceLineNo">203</span>      String walFileName = 
item.getWalFile();<a name="line.203"></a>
+<span class="sourceLineNo">204</span>      String server = 
BackupUtils.parseHostNameFromLogFile(new Path(walFileName));<a 
name="line.204"></a>
+<span class="sourceLineNo">205</span>      if (server == null) {<a 
name="line.205"></a>
+<span class="sourceLineNo">206</span>        continue;<a name="line.206"></a>
+<span class="sourceLineNo">207</span>      }<a name="line.207"></a>
+<span class="sourceLineNo">208</span>      Long tss = 
getTimestamp(walFileName);<a name="line.208"></a>
+<span class="sourceLineNo">209</span>      Long oldTss = 
olderTimestamps.get(server);<a name="line.209"></a>
+<span class="sourceLineNo">210</span>      Long newTss = 
newestTimestamps.get(server);<a name="line.210"></a>
+<span class="sourceLineNo">211</span>      if (oldTss == null) {<a 
name="line.211"></a>
+<span class="sourceLineNo">212</span>        logFiles.add(item);<a 
name="line.212"></a>
+<span class="sourceLineNo">213</span>        continue;<a name="line.213"></a>
+<span class="sourceLineNo">214</span>      }<a name="line.214"></a>
+<span class="sourceLineNo">215</span>      if (newTss == null) {<a 
name="line.215"></a>
+<span class="sourceLineNo">216</span>        newTss = Long.MAX_VALUE;<a 
name="line.216"></a>
+<span class="sourceLineNo">217</span>      }<a name="line.217"></a>
+<span class="sourceLineNo">218</span>      if (tss &gt; oldTss &amp;&amp; tss 
&lt; newTss) {<a name="line.218"></a>
+<span class="sourceLineNo">219</span>        logFiles.add(item);<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>    return logFiles;<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>  private Long getTimestamp(String 
walFileName) {<a name="line.225"></a>
+<span class="sourceLineNo">226</span>    int index = 
walFileName.lastIndexOf(BackupUtils.LOGNAME_SEPARATOR);<a name="line.226"></a>
+<span class="sourceLineNo">227</span>    return 
Long.parseLong(walFileName.substring(index + 1));<a name="line.227"></a>
+<span class="sourceLineNo">228</span>  }<a name="line.228"></a>
+<span class="sourceLineNo">229</span><a name="line.229"></a>
+<span class="sourceLineNo">230</span>  /**<a name="line.230"></a>
+<span class="sourceLineNo">231</span>   * For each region server: get all log 
files newer than the last timestamps but not newer than the<a 
name="line.231"></a>
+<span class="sourceLineNo">232</span>   * newest timestamps.<a 
name="line.232"></a>
+<span class="sourceLineNo">233</span>   * @param olderTimestamps the timestamp 
for each region server of the last backup.<a name="line.233"></a>
+<span class="sourceLineNo">234</span>   * @param newestTimestamps the 
timestamp for each region server that the backup should lead to.<a 
name="line.234"></a>
+<span class="sourceLineNo">235</span>   * @param conf the Hadoop and Hbase 
configuration<a name="line.235"></a>
+<span class="sourceLineNo">236</span>   * @param savedStartCode the startcode 
(timestamp) of last successful backup.<a name="line.236"></a>
+<span class="sourceLineNo">237</span>   * @return a list of log files to be 
backed up<a name="line.237"></a>
+<span class="sourceLineNo">238</span>   * @throws IOException exception<a 
name="line.238"></a>
+<span class="sourceLineNo">239</span>   */<a name="line.239"></a>
+<span class="sourceLineNo">240</span>  private List&lt;String&gt; 
getLogFilesForNewBackup(HashMap&lt;String, Long&gt; olderTimestamps,<a 
name="line.240"></a>
+<span class="sourceLineNo">241</span>      HashMap&lt;String, Long&gt; 
newestTimestamps, Configuration conf, String savedStartCode)<a 
name="line.241"></a>
+<span class="sourceLineNo">242</span>      throws IOException {<a 
name="line.242"></a>
+<span class="sourceLineNo">243</span>    LOG.debug("In 
getLogFilesForNewBackup()\n" + "olderTimestamps: " + olderTimestamps<a 
name="line.243"></a>
+<span class="sourceLineNo">244</span>        + "\n newestTimestamps: " + 
newestTimestamps);<a name="line.244"></a>
+<span class="sourceLineNo">245</span>    Path rootdir = 
FSUtils.getRootDir(conf);<a name="line.245"></a>
+<span class="sourceLineNo">246</span>    Path logDir = new Path(rootdir, 
HConstants.HREGION_LOGDIR_NAME);<a name="line.246"></a>
+<span class="sourceLineNo">247</span>    Path oldLogDir = new Path(rootdir, 
HConstants.HREGION_OLDLOGDIR_NAME);<a name="line.247"></a>
+<span class="sourceLineNo">248</span>    FileSystem fs = 
rootdir.getFileSystem(conf);<a name="line.248"></a>
+<span class="sourceLineNo">249</span>    NewestLogFilter pathFilter = new 
NewestLogFilter();<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span>    List&lt;String&gt; resultLogFiles = 
new ArrayList&lt;String&gt;();<a name="line.251"></a>
+<span class="sourceLineNo">252</span>    List&lt;String&gt; newestLogs = new 
ArrayList&lt;String&gt;();<a name="line.252"></a>
+<span class="sourceLineNo">253</span><a name="line.253"></a>
+<span class="sourceLineNo">254</span>    /*<a name="line.254"></a>
+<span class="sourceLineNo">255</span>     * The old region servers and 
timestamps info we kept in backup system table may be out of sync<a 
name="line.255"></a>
+<span class="sourceLineNo">256</span>     * if new region server is added or 
existing one lost. We'll deal with it here when processing<a 
name="line.256"></a>
+<span class="sourceLineNo">257</span>     * the logs. If data in backup system 
table has more hosts, just ignore it. If the .logs<a name="line.257"></a>
+<span class="sourceLineNo">258</span>     * directory includes more hosts, the 
additional hosts will not have old timestamps to compare<a name="line.258"></a>
+<span class="sourceLineNo">259</span>     * with. We'll just use all the logs 
in that directory. We always write up-to-date region server<a 
name="line.259"></a>
+<span class="sourceLineNo">260</span>     * and timestamp info to backup 
system table at the end of successful backup.<a name="line.260"></a>
+<span class="sourceLineNo">261</span>     */<a name="line.261"></a>
+<span class="sourceLineNo">262</span><a name="line.262"></a>
+<span class="sourceLineNo">263</span>    FileStatus[] rss;<a 
name="line.263"></a>
+<span class="sourceLineNo">264</span>    Path p;<a name="line.264"></a>
+<span class="sourceLineNo">265</span>    String host;<a name="line.265"></a>
+<span class="sourceLineNo">266</span>    Long oldTimeStamp;<a 
name="line.266"></a>
+<span class="sourceLineNo">267</span>    String currentLogFile;<a 
name="line.267"></a>
+<span class="sourceLineNo">268</span>    long currentLogTS;<a 
name="line.268"></a>
+<span class="sourceLineNo">269</span><a name="line.269"></a>
+<span class="sourceLineNo">270</span>    // Get the files in .logs.<a 
name="line.270"></a>
+<span class="sourceLineNo">271</span>    rss = fs.listStatus(logDir);<a 
name="line.271"></a>
+<span class="sourceLineNo">272</span>    for (FileStatus rs : rss) {<a 
name="line.272"></a>
+<span class="sourceLineNo">273</span>      p = rs.getPath();<a 
name="line.273"></a>
+<span class="sourceLineNo">274</span>      host = 
BackupUtils.parseHostNameFromLogFile(p);<a name="line.274"></a>
+<span class="sourceLineNo">275</span>      if (host == null) {<a 
name="line.275"></a>
+<span class="sourceLineNo">276</span>        continue;<a name="line.276"></a>
+<span class="sourceLineNo">277</span>      }<a name="line.277"></a>
+<span class="sourceLineNo">278</span>      FileStatus[] logs;<a 
name="line.278"></a>
+<span class="sourceLineNo">279</span>      oldTimeStamp = 
olderTimestamps.get(host);<a name="line.279"></a>
+<span class="sourceLineNo">280</span>      // It is possible that there is no 
old timestamp in backup system table for this host if<a name="line.280"></a>
+<span class="sourceLineNo">281</span>      // this region server is newly 
added after our last backup.<a name="line.281"></a>
+<span class="sourceLineNo">282</span>      if (oldTimeStamp == null) {<a 
name="line.282"></a>
+<span class="sourceLineNo">283</span>        logs = fs.listStatus(p);<a 
name="line.283"></a>
+<span class="sourceLineNo">284</span>      } else {<a name="line.284"></a>
+<span class="sourceLineNo">285</span>        
pathFilter.setLastBackupTS(oldTimeStamp);<a name="line.285"></a>
+<span class="sourceLineNo">286</span>        logs = fs.listStatus(p, 
pathFilter);<a name="line.286"></a>
+<span class="sourceLineNo">287</span>      }<a name="line.287"></a>
+<span class="sourceLineNo">288</span>      for (FileStatus log : logs) {<a 
name="line.288"></a>
+<span class="sourceLineNo">289</span>        LOG.debug("currentLogFile: " + 
log.getPath().toString());<a name="line.289"></a>
+<span class="sourceLineNo">290</span>        if 
(AbstractFSWALProvider.isMetaFile(log.getPath())) {<a name="line.290"></a>
+<span class="sourceLineNo">291</span>          if (LOG.isDebugEnabled()) {<a 
name="line.291"></a>
+<span class="sourceLineNo">292</span>            LOG.debug("Skip hbase:meta 
log file: " + log.getPath().getName());<a name="line.292"></a>
+<span class="sourceLineNo">293</span>          }<a name="line.293"></a>
+<span class="sourceLineNo">294</span>          continue;<a name="line.294"></a>
+<span class="sourceLineNo">295</span>        }<a name="line.295"></a>
+<span class="sourceLineNo">296</span>        currentLogFile = 
log.getPath().toString();<a name="line.296"></a>
+<span class="sourceLineNo">297</span>        
resultLogFiles.add(currentLogFile);<a name="line.297"></a>
+<span class="sourceLineNo">298</span>        currentLogTS = 
BackupUtils.getCreationTime(log.getPath());<a name="line.298"></a>
+<span class="sourceLineNo">299</span>        // newestTimestamps is up-to-date 
with the current list of hosts<a name="line.299"></a>
+<span class="sourceLineNo">300</span>        // so newestTimestamps.get(host) 
will not be null.<a name="line.300"></a>
+<span class="sourceLineNo">301</span>        if (currentLogTS &gt; 
newestTimestamps.get(host)) {<a name="line.301"></a>
+<span class="sourceLineNo">302</span>          
newestLogs.add(currentLogFile);<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>    // Include the .oldlogs files too.<a 
name="line.307"></a>
+<span class="sourceLineNo">308</span>    FileStatus[] oldlogs = 
fs.listStatus(oldLogDir);<a name="line.308"></a>
+<span class="sourceLineNo">309</span>    for (FileStatus oldlog : oldlogs) {<a 
name="line.309"></a>
+<span class="sourceLineNo">310</span>      p = oldlog.getPath();<a 
name="line.310"></a>
+<span class="sourceLineNo">311</span>      currentLogFile = p.toString();<a 
name="line.311"></a>
+<span class="sourceLineNo">312</span>      if 
(AbstractFSWALProvider.isMetaFile(p)) {<a name="line.312"></a>
+<span class="sourceLineNo">313</span>        if (LOG.isDebugEnabled()) {<a 
name="line.313"></a>
+<span class="sourceLineNo">314</span>          LOG.debug("Skip .meta log file: 
" + currentLogFile);<a name="line.314"></a>
+<span class="sourceLineNo">315</span>        }<a name="line.315"></a>
+<span class="sourceLineNo">316</span>        continue;<a name="line.316"></a>
+<span class="sourceLineNo">317</span>      }<a name="line.317"></a>
+<span class="sourceLineNo">318</span>      host = 
BackupUtils.parseHostFromOldLog(p);<a name="line.318"></a>
+<span class="sourceLineNo">319</span>      if (host == null) {<a 
name="line.319"></a>
+<span class="sourceLineNo">320</span>        continue;<a name="line.320"></a>
+<span class="sourceLineNo">321</span>      }<a name="line.321"></a>
+<span class="sourceLineNo">322</span>      currentLogTS = 
BackupUtils.getCreationTime(p);<a name="line.322"></a>
+<span class="sourceLineNo">323</span>      oldTimeStamp = 
olderTimestamps.get(host);<a name="line.323"></a>
+<span class="sourceLineNo">324</span>      /*<a name="line.324"></a>
+<span class="sourceLineNo">325</span>       * It is possible that there is no 
old timestamp in backup system table for this host. At the<a 
name="line.325"></a>
+<span class="sourceLineNo">326</span>       * time of our last backup 
operation, this rs did not exist. The reason can be one of the two:<a 
name="line.326"></a>
+<span class="sourceLineNo">327</span>       * 1. The rs already left/crashed. 
Its logs were moved to .oldlogs. 2. The rs was added after<a 
name="line.327"></a>
+<span class="sourceLineNo">328</span>       * our last backup.<a 
name="line.328"></a>
+<span class="sourceLineNo">329</span>       */<a name="line.329"></a>
+<span class="sourceLineNo">330</span>      if (oldTimeStamp == null) {<a 
name="line.330"></a>
+<span class="sourceLineNo">331</span>        if (currentLogTS &lt; 
Long.parseLong(savedStartCode)) {<a name="line.331"></a>
+<span class="sourceLineNo">332</span>          // This log file is really old, 
its region server was before our last backup.<a name="line.332"></a>
+<span class="sourceLineNo">333</span>          continue;<a name="line.333"></a>
+<span class="sourceLineNo">334</span>        } else {<a name="line.334"></a>
+<span class="sourceLineNo">335</span>          
resultLogFiles.add(currentLogFile);<a name="line.335"></a>
+<span class="sourceLineNo">336</span>        }<a name="line.336"></a>
+<span class="sourceLineNo">337</span>      } else if (currentLogTS &gt; 
oldTimeStamp) {<a name="line.337"></a>
+<span class="sourceLineNo">338</span>        
resultLogFiles.add(currentLogFile);<a name="line.338"></a>
+<span class="sourceLineNo">339</span>      }<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span>      // It is possible that a host in 
.oldlogs is an obsolete region server<a name="line.341"></a>
+<span class="sourceLineNo">342</span>      // so newestTimestamps.get(host) 
here can be null.<a name="line.342"></a>
+<span class="sourceLineNo">343</span>      // Even if these logs belong to a 
obsolete region server, we still need<a name="line.343"></a>
+<span class="sourceLineNo">344</span>      // to include they to avoid loss of 
edits for backup.<a name="line.344"></a>
+<span class="sourceLineNo">345</span>      Long newTimestamp = 
newestTimestamps.get(host);<a name="line.345"></a>
+<span class="sourceLineNo">346</span>      if (newTimestamp != null &amp;&amp; 
currentLogTS &gt; newTimestamp) {<a name="line.346"></a>
+<span class="sourceLineNo">347</span>        newestLogs.add(currentLogFile);<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>    // remove newest log per host because 
they are still in use<a name="line.350"></a>
+<span class="sourceLineNo">351</span>    
resultLogFiles.removeAll(newestLogs);<a name="line.351"></a>
+<span class="sourceLineNo">352</span>    return resultLogFiles;<a 
name="line.352"></a>
+<span class="sourceLineNo">353</span>  }<a name="line.353"></a>
+<span class="sourceLineNo">354</span><a name="line.354"></a>
+<span class="sourceLineNo">355</span>  static class NewestLogFilter implements 
PathFilter {<a name="line.355"></a>
+<span class="sourceLineNo">356</span>    private Long lastBackupTS = 0L;<a 
name="line.356"></a>
+<span class="sourceLineNo">357</span><a name="line.357"></a>
+<span class="sourceLineNo">358</span>    public NewestLogFilter() {<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 void setLastBackupTS(Long 
ts) {<a name="line.361"></a>
+<span class="sourceLineNo">362</span>      this.lastBackupTS = ts;<a 
name="line.362"></a>
+<span class="sourceLineNo">363</span>    }<a name="line.363"></a>
+<span class="sourceLineNo">364</span><a name="line.364"></a>
+<span class="sourceLineNo">365</span>    @Override<a name="line.365"></a>
+<span class="sourceLineNo">366</span>    public boolean accept(Path path) {<a 
name="line.366"></a>
+<span class="sourceLineNo">367</span>      // skip meta table log -- ts.meta 
file<a name="line.367"></a>
+<span class="sourceLineNo">368</span>      if 
(AbstractFSWALProvider.isMetaFile(path)) {<a name="line.368"></a>
+<span class="sourceLineNo">369</span>        if (LOG.isDebugEnabled()) {<a 
name="line.369"></a>
+<span class="sourceLineNo">370</span>          LOG.debug("Skip .meta log file: 
" + path.getName());<a name="line.370"></a>
+<span class="sourceLineNo">371</span>        }<a name="line.371"></a>
+<span class="sourceLineNo">372</span>        return false;<a 
name="line.372"></a>
+<span class="sourceLineNo">373</span>      }<a name="line.373"></a>
+<span class="sourceLineNo">374</span>      long timestamp;<a 
name="line.374"></a>
+<span class="sourceLineNo">375</span>      try {<a name="line.375"></a>
+<span class="sourceLineNo">376</span>        timestamp = 
BackupUtils.getCreationTime(path);<a name="line.376"></a>
+<span class="sourceLineNo">377</span>        return timestamp &gt; 
lastBackupTS;<a name="line.377"></a>
+<span class="sourceLineNo">378</span>      } catch (Exception e) {<a 
name="line.378"></a>
+<span class="sourceLineNo">379</span>        LOG.warn("Cannot read timestamp 
of log file " + path);<a name="line.379"></a>
+<span class="sourceLineNo">380</span>        return false;<a 
name="line.380"></a>
+<span class="sourceLineNo">381</span>      }<a name="line.381"></a>
+<span class="sourceLineNo">382</span>    }<a name="line.382"></a>
+<span class="sourceLineNo">383</span>  }<a name="line.383"></a>
+<span class="sourceLineNo">384</span><a name="line.384"></a>
+<span class="sourceLineNo">385</span>}<a name="line.385"></a>
 
 
 

Reply via email to