http://git-wip-us.apache.org/repos/asf/hbase-site/blob/aa7ffc92/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.html
----------------------------------------------------------------------
diff --git
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.html
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.html
index 4febd01..ef680de 100644
---
a/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.html
+++
b/devapidocs/src-html/org/apache/hadoop/hbase/backup/impl/IncrementalBackupManager.html
@@ -71,203 +71,203 @@
<span class="sourceLineNo">063</span> * @return The new HashMap of RS log
time stamps after the log roll for this incremental backup.<a
name="line.63"></a>
<span class="sourceLineNo">064</span> * @throws IOException exception<a
name="line.64"></a>
<span class="sourceLineNo">065</span> */<a name="line.65"></a>
-<span class="sourceLineNo">066</span> public HashMap<String, Long>
getIncrBackupLogFileMap()<a name="line.66"></a>
-<span class="sourceLineNo">067</span> throws IOException {<a
name="line.67"></a>
-<span class="sourceLineNo">068</span> List<String> logList;<a
name="line.68"></a>
-<span class="sourceLineNo">069</span> HashMap<String, Long>
newTimestamps;<a name="line.69"></a>
-<span class="sourceLineNo">070</span> HashMap<String, Long>
previousTimestampMins;<a name="line.70"></a>
-<span class="sourceLineNo">071</span><a name="line.71"></a>
-<span class="sourceLineNo">072</span> String savedStartCode =
readBackupStartCode();<a name="line.72"></a>
-<span class="sourceLineNo">073</span><a name="line.73"></a>
-<span class="sourceLineNo">074</span> // key: tableName<a
name="line.74"></a>
-<span class="sourceLineNo">075</span> // value:
<RegionServer,PreviousTimeStamp><a name="line.75"></a>
-<span class="sourceLineNo">076</span> HashMap<TableName,
HashMap<String, Long>> previousTimestampMap = readLogTimestampMap();<a
name="line.76"></a>
-<span class="sourceLineNo">077</span><a name="line.77"></a>
-<span class="sourceLineNo">078</span> previousTimestampMins =
BackupUtils.getRSLogTimestampMins(previousTimestampMap);<a name="line.78"></a>
-<span class="sourceLineNo">079</span><a name="line.79"></a>
-<span class="sourceLineNo">080</span> if (LOG.isDebugEnabled()) {<a
name="line.80"></a>
-<span class="sourceLineNo">081</span> LOG.debug("StartCode " +
savedStartCode + "for backupID " + backupInfo.getBackupId());<a
name="line.81"></a>
-<span class="sourceLineNo">082</span> }<a name="line.82"></a>
-<span class="sourceLineNo">083</span> // get all new log files from .logs
and .oldlogs after last TS and before new timestamp<a name="line.83"></a>
-<span class="sourceLineNo">084</span> if (savedStartCode == null ||
previousTimestampMins == null<a name="line.84"></a>
-<span class="sourceLineNo">085</span> ||
previousTimestampMins.isEmpty()) {<a name="line.85"></a>
-<span class="sourceLineNo">086</span> throw new IOException(<a
name="line.86"></a>
-<span class="sourceLineNo">087</span> "Cannot read any previous back
up timestamps from backup system table. "<a name="line.87"></a>
-<span class="sourceLineNo">088</span> + "In order to create an
incremental backup, at least one full backup is needed.");<a name="line.88"></a>
-<span class="sourceLineNo">089</span> }<a name="line.89"></a>
-<span class="sourceLineNo">090</span><a name="line.90"></a>
-<span class="sourceLineNo">091</span> LOG.info("Execute roll log procedure
for incremental backup ...");<a name="line.91"></a>
-<span class="sourceLineNo">092</span> HashMap<String, String> props =
new HashMap<String, String>();<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>
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<WALItem>
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">066</span> public HashMap<String, Long>
getIncrBackupLogFileMap() throws IOException {<a name="line.66"></a>
+<span class="sourceLineNo">067</span> List<String> logList;<a
name="line.67"></a>
+<span class="sourceLineNo">068</span> HashMap<String, Long>
newTimestamps;<a name="line.68"></a>
+<span class="sourceLineNo">069</span> HashMap<String, Long>
previousTimestampMins;<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span> String savedStartCode =
readBackupStartCode();<a name="line.71"></a>
+<span class="sourceLineNo">072</span><a name="line.72"></a>
+<span class="sourceLineNo">073</span> // key: tableName<a
name="line.73"></a>
+<span class="sourceLineNo">074</span> // value:
<RegionServer,PreviousTimeStamp><a name="line.74"></a>
+<span class="sourceLineNo">075</span> HashMap<TableName,
HashMap<String, Long>> previousTimestampMap = readLogTimestampMap();<a
name="line.75"></a>
+<span class="sourceLineNo">076</span><a name="line.76"></a>
+<span class="sourceLineNo">077</span> previousTimestampMins =
BackupUtils.getRSLogTimestampMins(previousTimestampMap);<a name="line.77"></a>
+<span class="sourceLineNo">078</span><a name="line.78"></a>
+<span class="sourceLineNo">079</span> if (LOG.isDebugEnabled()) {<a
name="line.79"></a>
+<span class="sourceLineNo">080</span> LOG.debug("StartCode " +
savedStartCode + "for backupID " + backupInfo.getBackupId());<a
name="line.80"></a>
+<span class="sourceLineNo">081</span> }<a name="line.81"></a>
+<span class="sourceLineNo">082</span> // get all new log files from .logs
and .oldlogs after last TS and before new timestamp<a name="line.82"></a>
+<span class="sourceLineNo">083</span> if (savedStartCode == null ||
previousTimestampMins == null<a name="line.83"></a>
+<span class="sourceLineNo">084</span> ||
previousTimestampMins.isEmpty()) {<a name="line.84"></a>
+<span class="sourceLineNo">085</span> throw new IOException(<a
name="line.85"></a>
+<span class="sourceLineNo">086</span> "Cannot read any previous back
up timestamps from backup system table. "<a name="line.86"></a>
+<span class="sourceLineNo">087</span> + "In order to create an
incremental backup, at least one full backup is needed.");<a name="line.87"></a>
+<span class="sourceLineNo">088</span> }<a name="line.88"></a>
+<span class="sourceLineNo">089</span><a name="line.89"></a>
+<span class="sourceLineNo">090</span> LOG.info("Execute roll log procedure
for incremental backup ...");<a name="line.90"></a>
+<span class="sourceLineNo">091</span> HashMap<String, String> props =
new HashMap<>();<a name="line.91"></a>
+<span class="sourceLineNo">092</span> props.put("backupRoot",
backupInfo.getBackupRootDir());<a name="line.92"></a>
+<span class="sourceLineNo">093</span><a name="line.93"></a>
+<span class="sourceLineNo">094</span> try (Admin admin = conn.getAdmin())
{<a name="line.94"></a>
+<span class="sourceLineNo">095</span>
admin.execProcedure(LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_SIGNATURE,<a
name="line.95"></a>
+<span class="sourceLineNo">096</span>
LogRollMasterProcedureManager.ROLLLOG_PROCEDURE_NAME, props);<a
name="line.96"></a>
+<span class="sourceLineNo">097</span> }<a name="line.97"></a>
+<span class="sourceLineNo">098</span> newTimestamps =
readRegionServerLastLogRollResult();<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span> logList =
getLogFilesForNewBackup(previousTimestampMins, newTimestamps, conf,
savedStartCode);<a name="line.100"></a>
+<span class="sourceLineNo">101</span> List<WALItem>
logFromSystemTable =<a name="line.101"></a>
+<span class="sourceLineNo">102</span>
getLogFilesFromBackupSystem(previousTimestampMins, newTimestamps,
getBackupInfo()<a name="line.102"></a>
+<span class="sourceLineNo">103</span> .getBackupRootDir());<a
name="line.103"></a>
+<span class="sourceLineNo">104</span> logList =
excludeAlreadyBackedUpWALs(logList, logFromSystemTable);<a name="line.104"></a>
+<span class="sourceLineNo">105</span>
backupInfo.setIncrBackupFileList(logList);<a name="line.105"></a>
+<span class="sourceLineNo">106</span><a name="line.106"></a>
+<span class="sourceLineNo">107</span> return newTimestamps;<a
name="line.107"></a>
+<span class="sourceLineNo">108</span> }<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> * Get list of WAL files eligible for
incremental backup.<a name="line.111"></a>
+<span class="sourceLineNo">112</span> *<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">114</span> * @throws IOException if getting the
list of WAL files fails<a name="line.114"></a>
<span class="sourceLineNo">115</span> */<a name="line.115"></a>
-<span class="sourceLineNo">116</span> public List<String>
getIncrBackupLogFileList()<a name="line.116"></a>
-<span class="sourceLineNo">117</span> throws IOException {<a
name="line.117"></a>
-<span class="sourceLineNo">118</span> List<String> logList;<a
name="line.118"></a>
-<span class="sourceLineNo">119</span> HashMap<String, Long>
newTimestamps;<a name="line.119"></a>
-<span class="sourceLineNo">120</span> HashMap<String, Long>
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> // key: tableName<a
name="line.124"></a>
-<span class="sourceLineNo">125</span> // value:
<RegionServer,PreviousTimeStamp><a name="line.125"></a>
-<span class="sourceLineNo">126</span> HashMap<TableName,
HashMap<String, Long>> 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> 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> logList =
getLogFilesForNewBackup(previousTimestampMins, newTimestamps, conf,
savedStartCode);<a name="line.143"></a>
-<span class="sourceLineNo">144</span> List<WALItem>
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">116</span> public List<String>
getIncrBackupLogFileList() throws IOException {<a name="line.116"></a>
+<span class="sourceLineNo">117</span> List<String> logList;<a
name="line.117"></a>
+<span class="sourceLineNo">118</span> HashMap<String, Long>
newTimestamps;<a name="line.118"></a>
+<span class="sourceLineNo">119</span> HashMap<String, Long>
previousTimestampMins;<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span> String savedStartCode =
readBackupStartCode();<a name="line.121"></a>
+<span class="sourceLineNo">122</span><a name="line.122"></a>
+<span class="sourceLineNo">123</span> // key: tableName<a
name="line.123"></a>
+<span class="sourceLineNo">124</span> // value:
<RegionServer,PreviousTimeStamp><a name="line.124"></a>
+<span class="sourceLineNo">125</span> HashMap<TableName,
HashMap<String, Long>> previousTimestampMap = readLogTimestampMap();<a
name="line.125"></a>
+<span class="sourceLineNo">126</span><a name="line.126"></a>
+<span class="sourceLineNo">127</span> previousTimestampMins =
BackupUtils.getRSLogTimestampMins(previousTimestampMap);<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> if (LOG.isDebugEnabled()) {<a
name="line.129"></a>
+<span class="sourceLineNo">130</span> LOG.debug("StartCode " +
savedStartCode + "for backupID " + backupInfo.getBackupId());<a
name="line.130"></a>
+<span class="sourceLineNo">131</span> }<a name="line.131"></a>
+<span class="sourceLineNo">132</span> // get all new log files from .logs
and .oldlogs after last TS and before new timestamp<a name="line.132"></a>
+<span class="sourceLineNo">133</span> if (savedStartCode == null ||
previousTimestampMins == null<a name="line.133"></a>
+<span class="sourceLineNo">134</span> ||
previousTimestampMins.isEmpty()) {<a name="line.134"></a>
+<span class="sourceLineNo">135</span> throw new IOException(<a
name="line.135"></a>
+<span class="sourceLineNo">136</span> "Cannot read any previous back
up timestamps from backup system table. "<a name="line.136"></a>
+<span class="sourceLineNo">137</span> + "In order to create an
incremental backup, at least one full backup is needed.");<a
name="line.137"></a>
+<span class="sourceLineNo">138</span> }<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span> newTimestamps =
readRegionServerLastLogRollResult();<a name="line.140"></a>
+<span class="sourceLineNo">141</span><a name="line.141"></a>
+<span class="sourceLineNo">142</span> logList =
getLogFilesForNewBackup(previousTimestampMins, newTimestamps, conf,
savedStartCode);<a name="line.142"></a>
+<span class="sourceLineNo">143</span> List<WALItem>
logFromSystemTable =<a name="line.143"></a>
+<span class="sourceLineNo">144</span>
getLogFilesFromBackupSystem(previousTimestampMins, newTimestamps,
getBackupInfo()<a name="line.144"></a>
+<span class="sourceLineNo">145</span> .getBackupRootDir());<a
name="line.145"></a>
+<span class="sourceLineNo">146</span><a name="line.146"></a>
+<span class="sourceLineNo">147</span> logList =
excludeAlreadyBackedUpWALs(logList, logFromSystemTable);<a name="line.147"></a>
+<span class="sourceLineNo">148</span>
backupInfo.setIncrBackupFileList(logList);<a name="line.148"></a>
+<span class="sourceLineNo">149</span><a name="line.149"></a>
+<span class="sourceLineNo">150</span> return logList;<a name="line.150"></a>
+<span class="sourceLineNo">151</span> }<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<String>
excludeAlreadyBackedUpWALs(List<String> logList,<a name="line.155"></a>
-<span class="sourceLineNo">156</span> List<WALItem>
logFromSystemTable) {<a name="line.156"></a>
+<span class="sourceLineNo">154</span> private List<String>
excludeAlreadyBackedUpWALs(List<String> logList,<a name="line.154"></a>
+<span class="sourceLineNo">155</span> List<WALItem>
logFromSystemTable) {<a name="line.155"></a>
+<span class="sourceLineNo">156</span> Set<String> walFileNameSet =
convertToSet(logFromSystemTable);<a name="line.156"></a>
<span class="sourceLineNo">157</span><a name="line.157"></a>
-<span class="sourceLineNo">158</span> Set<String> walFileNameSet =
convertToSet(logFromSystemTable);<a name="line.158"></a>
-<span class="sourceLineNo">159</span><a name="line.159"></a>
-<span class="sourceLineNo">160</span> List<String> list = new
ArrayList<String>();<a name="line.160"></a>
-<span class="sourceLineNo">161</span> for (int i=0; i < 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<String>
convertToSet(List<WALItem> logFromSystemTable) {<a name="line.175"></a>
-<span class="sourceLineNo">176</span><a name="line.176"></a>
-<span class="sourceLineNo">177</span> Set<String> set = new
HashSet<String>();<a name="line.177"></a>
-<span class="sourceLineNo">178</span> for (int i=0; i <
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<WALItem>
getLogFilesFromBackupSystem(HashMap<String, Long> olderTimestamps,<a
name="line.193"></a>
-<span class="sourceLineNo">194</span> HashMap<String, Long>
newestTimestamps, String backupRoot) throws IOException {<a name="line.194"></a>
-<span class="sourceLineNo">195</span> List<WALItem> logFiles = new
ArrayList<WALItem>();<a name="line.195"></a>
-<span class="sourceLineNo">196</span> Iterator<WALItem> 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 > oldTss && tss
< 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<String>
getLogFilesForNewBackup(HashMap<String, Long> olderTimestamps,<a
name="line.240"></a>
-<span class="sourceLineNo">241</span> HashMap<String, Long>
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<String> resultLogFiles =
new ArrayList<String>();<a name="line.251"></a>
-<span class="sourceLineNo">252</span> List<String> newestLogs = new
ArrayList<String>();<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">158</span> List<String> list = new
ArrayList<>();<a name="line.158"></a>
+<span class="sourceLineNo">159</span> for (int i=0; i < logList.size();
i++) {<a name="line.159"></a>
+<span class="sourceLineNo">160</span> Path p = new
Path(logList.get(i));<a name="line.160"></a>
+<span class="sourceLineNo">161</span> String name = p.getName();<a
name="line.161"></a>
+<span class="sourceLineNo">162</span><a name="line.162"></a>
+<span class="sourceLineNo">163</span> if (walFileNameSet.contains(name))
{<a name="line.163"></a>
+<span class="sourceLineNo">164</span> continue;<a name="line.164"></a>
+<span class="sourceLineNo">165</span> }<a name="line.165"></a>
+<span class="sourceLineNo">166</span><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 the logs
from the system table to convert<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<String>
convertToSet(List<WALItem> logFromSystemTable) {<a name="line.177"></a>
+<span class="sourceLineNo">178</span> Set<String> set = new
HashSet<>();<a name="line.178"></a>
+<span class="sourceLineNo">179</span> for (int i=0; i <
logFromSystemTable.size(); i++) {<a name="line.179"></a>
+<span class="sourceLineNo">180</span> WALItem item =
logFromSystemTable.get(i);<a name="line.180"></a>
+<span class="sourceLineNo">181</span> set.add(item.walFile);<a
name="line.181"></a>
+<span class="sourceLineNo">182</span> }<a name="line.182"></a>
+<span class="sourceLineNo">183</span> return set;<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> /**<a name="line.186"></a>
+<span class="sourceLineNo">187</span> * For each region server: get all log
files newer than the last timestamps, but not newer than<a name="line.187"></a>
+<span class="sourceLineNo">188</span> * the newest timestamps.<a
name="line.188"></a>
+<span class="sourceLineNo">189</span> * @param olderTimestamps timestamp map
for each region server of the last backup.<a name="line.189"></a>
+<span class="sourceLineNo">190</span> * @param newestTimestamps timestamp
map for each region server that the backup should lead to.<a
name="line.190"></a>
+<span class="sourceLineNo">191</span> * @return list of log files which
needs to be added to this backup<a name="line.191"></a>
+<span class="sourceLineNo">192</span> * @throws IOException if getting the
WAL files from the backup system fails<a name="line.192"></a>
+<span class="sourceLineNo">193</span> */<a name="line.193"></a>
+<span class="sourceLineNo">194</span> private List<WALItem>
getLogFilesFromBackupSystem(HashMap<String, Long> olderTimestamps,<a
name="line.194"></a>
+<span class="sourceLineNo">195</span> HashMap<String, Long>
newestTimestamps, String backupRoot) throws IOException {<a name="line.195"></a>
+<span class="sourceLineNo">196</span> List<WALItem> logFiles = new
ArrayList<>();<a name="line.196"></a>
+<span class="sourceLineNo">197</span> Iterator<WALItem> it =
getWALFilesFromBackupSystem();<a name="line.197"></a>
+<span class="sourceLineNo">198</span> while (it.hasNext()) {<a
name="line.198"></a>
+<span class="sourceLineNo">199</span> WALItem item = it.next();<a
name="line.199"></a>
+<span class="sourceLineNo">200</span> String rootDir =
item.getBackupRoot();<a name="line.200"></a>
+<span class="sourceLineNo">201</span> if (!rootDir.equals(backupRoot))
{<a name="line.201"></a>
+<span class="sourceLineNo">202</span> continue;<a name="line.202"></a>
+<span class="sourceLineNo">203</span> }<a name="line.203"></a>
+<span class="sourceLineNo">204</span> String walFileName =
item.getWalFile();<a name="line.204"></a>
+<span class="sourceLineNo">205</span> String server =
BackupUtils.parseHostNameFromLogFile(new Path(walFileName));<a
name="line.205"></a>
+<span class="sourceLineNo">206</span> if (server == null) {<a
name="line.206"></a>
+<span class="sourceLineNo">207</span> continue;<a name="line.207"></a>
+<span class="sourceLineNo">208</span> }<a name="line.208"></a>
+<span class="sourceLineNo">209</span> Long tss =
getTimestamp(walFileName);<a name="line.209"></a>
+<span class="sourceLineNo">210</span> Long oldTss =
olderTimestamps.get(server);<a name="line.210"></a>
+<span class="sourceLineNo">211</span> Long newTss =
newestTimestamps.get(server);<a name="line.211"></a>
+<span class="sourceLineNo">212</span> if (oldTss == null) {<a
name="line.212"></a>
+<span class="sourceLineNo">213</span> logFiles.add(item);<a
name="line.213"></a>
+<span class="sourceLineNo">214</span> continue;<a name="line.214"></a>
+<span class="sourceLineNo">215</span> }<a name="line.215"></a>
+<span class="sourceLineNo">216</span> if (newTss == null) {<a
name="line.216"></a>
+<span class="sourceLineNo">217</span> newTss = Long.MAX_VALUE;<a
name="line.217"></a>
+<span class="sourceLineNo">218</span> }<a name="line.218"></a>
+<span class="sourceLineNo">219</span> if (tss > oldTss && tss
< newTss) {<a name="line.219"></a>
+<span class="sourceLineNo">220</span> logFiles.add(item);<a
name="line.220"></a>
+<span class="sourceLineNo">221</span> }<a name="line.221"></a>
+<span class="sourceLineNo">222</span> }<a name="line.222"></a>
+<span class="sourceLineNo">223</span> return logFiles;<a
name="line.223"></a>
+<span class="sourceLineNo">224</span> }<a name="line.224"></a>
+<span class="sourceLineNo">225</span><a name="line.225"></a>
+<span class="sourceLineNo">226</span> private Long getTimestamp(String
walFileName) {<a name="line.226"></a>
+<span class="sourceLineNo">227</span> int index =
walFileName.lastIndexOf(BackupUtils.LOGNAME_SEPARATOR);<a name="line.227"></a>
+<span class="sourceLineNo">228</span> return
Long.parseLong(walFileName.substring(index + 1));<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> * For each region server: get all log
files newer than the last timestamps but not newer than the<a
name="line.232"></a>
+<span class="sourceLineNo">233</span> * newest timestamps.<a
name="line.233"></a>
+<span class="sourceLineNo">234</span> * @param olderTimestamps the timestamp
for each region server of the last backup.<a name="line.234"></a>
+<span class="sourceLineNo">235</span> * @param newestTimestamps the
timestamp for each region server that the backup should lead to.<a
name="line.235"></a>
+<span class="sourceLineNo">236</span> * @param conf the Hadoop and Hbase
configuration<a name="line.236"></a>
+<span class="sourceLineNo">237</span> * @param savedStartCode the startcode
(timestamp) of last successful backup.<a name="line.237"></a>
+<span class="sourceLineNo">238</span> * @return a list of log files to be
backed up<a name="line.238"></a>
+<span class="sourceLineNo">239</span> * @throws IOException exception<a
name="line.239"></a>
+<span class="sourceLineNo">240</span> */<a name="line.240"></a>
+<span class="sourceLineNo">241</span> private List<String>
getLogFilesForNewBackup(HashMap<String, Long> olderTimestamps,<a
name="line.241"></a>
+<span class="sourceLineNo">242</span> HashMap<String, Long>
newestTimestamps, Configuration conf, String savedStartCode)<a
name="line.242"></a>
+<span class="sourceLineNo">243</span> throws IOException {<a
name="line.243"></a>
+<span class="sourceLineNo">244</span> LOG.debug("In
getLogFilesForNewBackup()\n" + "olderTimestamps: " + olderTimestamps<a
name="line.244"></a>
+<span class="sourceLineNo">245</span> + "\n newestTimestamps: " +
newestTimestamps);<a name="line.245"></a>
+<span class="sourceLineNo">246</span> Path rootdir =
FSUtils.getRootDir(conf);<a name="line.246"></a>
+<span class="sourceLineNo">247</span> Path logDir = new Path(rootdir,
HConstants.HREGION_LOGDIR_NAME);<a name="line.247"></a>
+<span class="sourceLineNo">248</span> Path oldLogDir = new Path(rootdir,
HConstants.HREGION_OLDLOGDIR_NAME);<a name="line.248"></a>
+<span class="sourceLineNo">249</span> FileSystem fs =
rootdir.getFileSystem(conf);<a name="line.249"></a>
+<span class="sourceLineNo">250</span> NewestLogFilter pathFilter = new
NewestLogFilter();<a name="line.250"></a>
+<span class="sourceLineNo">251</span><a name="line.251"></a>
+<span class="sourceLineNo">252</span> List<String> resultLogFiles =
new ArrayList<>();<a name="line.252"></a>
+<span class="sourceLineNo">253</span> List<String> newestLogs = new
ArrayList<>();<a name="line.253"></a>
+<span class="sourceLineNo">254</span><a name="line.254"></a>
+<span class="sourceLineNo">255</span> /*<a name="line.255"></a>
+<span class="sourceLineNo">256</span> * The old region servers and
timestamps info we kept in backup system table may be out of sync<a
name="line.256"></a>
+<span class="sourceLineNo">257</span> * if new region server is added or
existing one lost. We'll deal with it here when processing<a
name="line.257"></a>
+<span class="sourceLineNo">258</span> * the logs. If data in backup system
table has more hosts, just ignore it. If the .logs<a name="line.258"></a>
+<span class="sourceLineNo">259</span> * directory includes more hosts, the
additional hosts will not have old timestamps to compare<a name="line.259"></a>
+<span class="sourceLineNo">260</span> * with. We'll just use all the logs
in that directory. We always write up-to-date region server<a
name="line.260"></a>
+<span class="sourceLineNo">261</span> * and timestamp info to backup
system table at the end of successful backup.<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>
@@ -389,8 +389,7 @@
<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>
+<span class="sourceLineNo">384</span>}<a name="line.384"></a>