You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gi...@apache.org on 2018/08/02 19:52:18 UTC
[32/51] [partial] hbase-site git commit: Published site at
613d831429960348dc42c3bdb6ea5d31be15c81c.
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7cf6034b/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 ef680de..f919922 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
@@ -46,120 +46,120 @@
<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.backup.util.BackupUtils;<a name="line.38"></a>
<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.39"></a>
<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.wal.AbstractFSWALProvider;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.slf4j.Logger;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.slf4j.LoggerFactory;<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span>/**<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * After a full backup was created, the incremental backup will only store the changes made after<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * the last full or incremental backup. Creating the backup copies the logfiles in .logs and<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * .oldlogs since the last backup timestamp.<a name="line.50"></a>
-<span class="sourceLineNo">051</span> */<a name="line.51"></a>
-<span class="sourceLineNo">052</span>@InterfaceAudience.Private<a name="line.52"></a>
-<span class="sourceLineNo">053</span>public class IncrementalBackupManager extends BackupManager {<a name="line.53"></a>
-<span class="sourceLineNo">054</span> public static final Logger LOG = LoggerFactory.getLogger(IncrementalBackupManager.class);<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span> public IncrementalBackupManager(Connection conn, Configuration conf) throws IOException {<a name="line.56"></a>
-<span class="sourceLineNo">057</span> super(conn, conf);<a name="line.57"></a>
-<span class="sourceLineNo">058</span> }<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span> /**<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * Obtain the list of logs that need to be copied out for this incremental backup. The list is set<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * in BackupInfo.<a name="line.62"></a>
-<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() 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 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() 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">041</span>import org.apache.hadoop.hbase.procedure2.store.wal.WALProcedureStore;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.wal.AbstractFSWALProvider;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.slf4j.Logger;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.slf4j.LoggerFactory;<a name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span>/**<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * After a full backup was created, the incremental backup will only store the changes made after<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * the last full or incremental backup. Creating the backup copies the logfiles in .logs and<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * .oldlogs since the last backup timestamp.<a name="line.51"></a>
+<span class="sourceLineNo">052</span> */<a name="line.52"></a>
+<span class="sourceLineNo">053</span>@InterfaceAudience.Private<a name="line.53"></a>
+<span class="sourceLineNo">054</span>public class IncrementalBackupManager extends BackupManager {<a name="line.54"></a>
+<span class="sourceLineNo">055</span> public static final Logger LOG = LoggerFactory.getLogger(IncrementalBackupManager.class);<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span> public IncrementalBackupManager(Connection conn, Configuration conf) throws IOException {<a name="line.57"></a>
+<span class="sourceLineNo">058</span> super(conn, conf);<a name="line.58"></a>
+<span class="sourceLineNo">059</span> }<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span> /**<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * Obtain the list of logs that need to be copied out for this incremental backup. The list is set<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * in BackupInfo.<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * @return The new HashMap of RS log time stamps after the log roll for this incremental backup.<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * @throws IOException exception<a name="line.65"></a>
+<span class="sourceLineNo">066</span> */<a name="line.66"></a>
+<span class="sourceLineNo">067</span> public HashMap<String, Long> getIncrBackupLogFileMap() 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<>();<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 = excludeAlreadyBackedUpAndProcV2WALs(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> *<a name="line.113"></a>
+<span class="sourceLineNo">114</span> * @return list of WAL files<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * @throws IOException if getting the list of WAL files fails<a name="line.115"></a>
+<span class="sourceLineNo">116</span> */<a name="line.116"></a>
+<span class="sourceLineNo">117</span> public List<String> getIncrBackupLogFileList() 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 = excludeAlreadyBackedUpAndProcV2WALs(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> private List<String> excludeAlreadyBackedUpWALs(List<String> logList,<a name="line.154"></a>
+<span class="sourceLineNo">154</span> private List<String> excludeAlreadyBackedUpAndProcV2WALs(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>
@@ -168,7 +168,7 @@
<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">163</span> if (walFileNameSet.contains(name) || name.startsWith(WALProcedureStore.LOG_PREFIX)) {<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7cf6034b/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 ef680de..f919922 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
@@ -46,120 +46,120 @@
<span class="sourceLineNo">038</span>import org.apache.hadoop.hbase.backup.util.BackupUtils;<a name="line.38"></a>
<span class="sourceLineNo">039</span>import org.apache.hadoop.hbase.client.Admin;<a name="line.39"></a>
<span class="sourceLineNo">040</span>import org.apache.hadoop.hbase.client.Connection;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.wal.AbstractFSWALProvider;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import org.slf4j.Logger;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.slf4j.LoggerFactory;<a name="line.45"></a>
-<span class="sourceLineNo">046</span><a name="line.46"></a>
-<span class="sourceLineNo">047</span>/**<a name="line.47"></a>
-<span class="sourceLineNo">048</span> * After a full backup was created, the incremental backup will only store the changes made after<a name="line.48"></a>
-<span class="sourceLineNo">049</span> * the last full or incremental backup. Creating the backup copies the logfiles in .logs and<a name="line.49"></a>
-<span class="sourceLineNo">050</span> * .oldlogs since the last backup timestamp.<a name="line.50"></a>
-<span class="sourceLineNo">051</span> */<a name="line.51"></a>
-<span class="sourceLineNo">052</span>@InterfaceAudience.Private<a name="line.52"></a>
-<span class="sourceLineNo">053</span>public class IncrementalBackupManager extends BackupManager {<a name="line.53"></a>
-<span class="sourceLineNo">054</span> public static final Logger LOG = LoggerFactory.getLogger(IncrementalBackupManager.class);<a name="line.54"></a>
-<span class="sourceLineNo">055</span><a name="line.55"></a>
-<span class="sourceLineNo">056</span> public IncrementalBackupManager(Connection conn, Configuration conf) throws IOException {<a name="line.56"></a>
-<span class="sourceLineNo">057</span> super(conn, conf);<a name="line.57"></a>
-<span class="sourceLineNo">058</span> }<a name="line.58"></a>
-<span class="sourceLineNo">059</span><a name="line.59"></a>
-<span class="sourceLineNo">060</span> /**<a name="line.60"></a>
-<span class="sourceLineNo">061</span> * Obtain the list of logs that need to be copied out for this incremental backup. The list is set<a name="line.61"></a>
-<span class="sourceLineNo">062</span> * in BackupInfo.<a name="line.62"></a>
-<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() 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 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() 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">041</span>import org.apache.hadoop.hbase.procedure2.store.wal.WALProcedureStore;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import org.apache.hadoop.hbase.util.FSUtils;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import org.apache.hadoop.hbase.wal.AbstractFSWALProvider;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import org.apache.yetus.audience.InterfaceAudience;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import org.slf4j.Logger;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.slf4j.LoggerFactory;<a name="line.46"></a>
+<span class="sourceLineNo">047</span><a name="line.47"></a>
+<span class="sourceLineNo">048</span>/**<a name="line.48"></a>
+<span class="sourceLineNo">049</span> * After a full backup was created, the incremental backup will only store the changes made after<a name="line.49"></a>
+<span class="sourceLineNo">050</span> * the last full or incremental backup. Creating the backup copies the logfiles in .logs and<a name="line.50"></a>
+<span class="sourceLineNo">051</span> * .oldlogs since the last backup timestamp.<a name="line.51"></a>
+<span class="sourceLineNo">052</span> */<a name="line.52"></a>
+<span class="sourceLineNo">053</span>@InterfaceAudience.Private<a name="line.53"></a>
+<span class="sourceLineNo">054</span>public class IncrementalBackupManager extends BackupManager {<a name="line.54"></a>
+<span class="sourceLineNo">055</span> public static final Logger LOG = LoggerFactory.getLogger(IncrementalBackupManager.class);<a name="line.55"></a>
+<span class="sourceLineNo">056</span><a name="line.56"></a>
+<span class="sourceLineNo">057</span> public IncrementalBackupManager(Connection conn, Configuration conf) throws IOException {<a name="line.57"></a>
+<span class="sourceLineNo">058</span> super(conn, conf);<a name="line.58"></a>
+<span class="sourceLineNo">059</span> }<a name="line.59"></a>
+<span class="sourceLineNo">060</span><a name="line.60"></a>
+<span class="sourceLineNo">061</span> /**<a name="line.61"></a>
+<span class="sourceLineNo">062</span> * Obtain the list of logs that need to be copied out for this incremental backup. The list is set<a name="line.62"></a>
+<span class="sourceLineNo">063</span> * in BackupInfo.<a name="line.63"></a>
+<span class="sourceLineNo">064</span> * @return The new HashMap of RS log time stamps after the log roll for this incremental backup.<a name="line.64"></a>
+<span class="sourceLineNo">065</span> * @throws IOException exception<a name="line.65"></a>
+<span class="sourceLineNo">066</span> */<a name="line.66"></a>
+<span class="sourceLineNo">067</span> public HashMap<String, Long> getIncrBackupLogFileMap() 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<>();<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 = excludeAlreadyBackedUpAndProcV2WALs(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> *<a name="line.113"></a>
+<span class="sourceLineNo">114</span> * @return list of WAL files<a name="line.114"></a>
+<span class="sourceLineNo">115</span> * @throws IOException if getting the list of WAL files fails<a name="line.115"></a>
+<span class="sourceLineNo">116</span> */<a name="line.116"></a>
+<span class="sourceLineNo">117</span> public List<String> getIncrBackupLogFileList() 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 = excludeAlreadyBackedUpAndProcV2WALs(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> private List<String> excludeAlreadyBackedUpWALs(List<String> logList,<a name="line.154"></a>
+<span class="sourceLineNo">154</span> private List<String> excludeAlreadyBackedUpAndProcV2WALs(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>
@@ -168,7 +168,7 @@
<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">163</span> if (walFileNameSet.contains(name) || name.startsWith(WALProcedureStore.LOG_PREFIX)) {<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>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7cf6034b/devapidocs/src-html/org/apache/hadoop/hbase/backup/master/BackupLogCleaner.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/backup/master/BackupLogCleaner.html b/devapidocs/src-html/org/apache/hadoop/hbase/backup/master/BackupLogCleaner.html
index 1c79f3b..4530d16 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/backup/master/BackupLogCleaner.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/backup/master/BackupLogCleaner.html
@@ -105,51 +105,50 @@
<span class="sourceLineNo">097</span> LOG.warn("Backup system table is not available: {}", tnfe.getMessage());<a name="line.97"></a>
<span class="sourceLineNo">098</span> return files;<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> List<FileStatus> list = new ArrayList<>();<a name="line.101"></a>
-<span class="sourceLineNo">102</span> Map<FileStatus, Boolean> walFilesDeletableMap = table.areWALFilesDeletable(files);<a name="line.102"></a>
-<span class="sourceLineNo">103</span> for (Map.Entry<FileStatus, Boolean> entry: walFilesDeletableMap.entrySet()) {<a name="line.103"></a>
-<span class="sourceLineNo">104</span> FileStatus file = entry.getKey();<a name="line.104"></a>
-<span class="sourceLineNo">105</span> String wal = file.getPath().toString();<a name="line.105"></a>
-<span class="sourceLineNo">106</span> boolean deletable = entry.getValue();<a name="line.106"></a>
-<span class="sourceLineNo">107</span> if (deletable) {<a name="line.107"></a>
-<span class="sourceLineNo">108</span> LOG.debug("Found log file in backup system table, deleting: {}", wal);<a name="line.108"></a>
-<span class="sourceLineNo">109</span> list.add(file);<a name="line.109"></a>
-<span class="sourceLineNo">110</span> } else {<a name="line.110"></a>
-<span class="sourceLineNo">111</span> LOG.debug("Did not find this log in backup system table, keeping: {}", wal);<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> return list;<a name="line.114"></a>
-<span class="sourceLineNo">115</span> } catch (IOException e) {<a name="line.115"></a>
-<span class="sourceLineNo">116</span> LOG.error("Failed to get backup system table table, therefore will keep all files", e);<a name="line.116"></a>
-<span class="sourceLineNo">117</span> // nothing to delete<a name="line.117"></a>
-<span class="sourceLineNo">118</span> return Collections.emptyList();<a name="line.118"></a>
-<span class="sourceLineNo">119</span> }<a name="line.119"></a>
-<span class="sourceLineNo">120</span> }<a name="line.120"></a>
-<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 setConf(Configuration config) {<a name="line.123"></a>
-<span class="sourceLineNo">124</span> // If backup is disabled, keep all members null<a name="line.124"></a>
-<span class="sourceLineNo">125</span> super.setConf(config);<a name="line.125"></a>
-<span class="sourceLineNo">126</span> if (!config.getBoolean(BackupRestoreConstants.BACKUP_ENABLE_KEY,<a name="line.126"></a>
-<span class="sourceLineNo">127</span> BackupRestoreConstants.BACKUP_ENABLE_DEFAULT)) {<a name="line.127"></a>
-<span class="sourceLineNo">128</span> LOG.warn("Backup is disabled - allowing all wals to be deleted");<a name="line.128"></a>
-<span class="sourceLineNo">129</span> }<a name="line.129"></a>
-<span class="sourceLineNo">130</span> }<a name="line.130"></a>
-<span class="sourceLineNo">131</span><a name="line.131"></a>
-<span class="sourceLineNo">132</span> @Override<a name="line.132"></a>
-<span class="sourceLineNo">133</span> public void stop(String why) {<a name="line.133"></a>
-<span class="sourceLineNo">134</span> if (!this.stopped) {<a name="line.134"></a>
-<span class="sourceLineNo">135</span> this.stopped = true;<a name="line.135"></a>
-<span class="sourceLineNo">136</span> LOG.info("Stopping BackupLogCleaner");<a name="line.136"></a>
-<span class="sourceLineNo">137</span> }<a name="line.137"></a>
-<span class="sourceLineNo">138</span> }<a name="line.138"></a>
-<span class="sourceLineNo">139</span><a name="line.139"></a>
-<span class="sourceLineNo">140</span> @Override<a name="line.140"></a>
-<span class="sourceLineNo">141</span> public boolean isStopped() {<a name="line.141"></a>
-<span class="sourceLineNo">142</span> return this.stopped;<a name="line.142"></a>
-<span class="sourceLineNo">143</span> }<a name="line.143"></a>
-<span class="sourceLineNo">144</span>}<a name="line.144"></a>
+<span class="sourceLineNo">100</span> List<FileStatus> list = new ArrayList<>();<a name="line.100"></a>
+<span class="sourceLineNo">101</span> Map<FileStatus, Boolean> walFilesDeletableMap = table.areWALFilesDeletable(files);<a name="line.101"></a>
+<span class="sourceLineNo">102</span> for (Map.Entry<FileStatus, Boolean> entry: walFilesDeletableMap.entrySet()) {<a name="line.102"></a>
+<span class="sourceLineNo">103</span> FileStatus file = entry.getKey();<a name="line.103"></a>
+<span class="sourceLineNo">104</span> String wal = file.getPath().toString();<a name="line.104"></a>
+<span class="sourceLineNo">105</span> boolean deletable = entry.getValue();<a name="line.105"></a>
+<span class="sourceLineNo">106</span> if (deletable) {<a name="line.106"></a>
+<span class="sourceLineNo">107</span> LOG.debug("Found log file in backup system table, deleting: {}", wal);<a name="line.107"></a>
+<span class="sourceLineNo">108</span> list.add(file);<a name="line.108"></a>
+<span class="sourceLineNo">109</span> } else {<a name="line.109"></a>
+<span class="sourceLineNo">110</span> LOG.debug("Did not find this log in backup system table, keeping: {}", wal);<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> return list;<a name="line.113"></a>
+<span class="sourceLineNo">114</span> } catch (IOException e) {<a name="line.114"></a>
+<span class="sourceLineNo">115</span> LOG.error("Failed to get backup system table table, therefore will keep all files", e);<a name="line.115"></a>
+<span class="sourceLineNo">116</span> // nothing to delete<a name="line.116"></a>
+<span class="sourceLineNo">117</span> return Collections.emptyList();<a name="line.117"></a>
+<span class="sourceLineNo">118</span> }<a name="line.118"></a>
+<span class="sourceLineNo">119</span> }<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span> @Override<a name="line.121"></a>
+<span class="sourceLineNo">122</span> public void setConf(Configuration config) {<a name="line.122"></a>
+<span class="sourceLineNo">123</span> // If backup is disabled, keep all members null<a name="line.123"></a>
+<span class="sourceLineNo">124</span> super.setConf(config);<a name="line.124"></a>
+<span class="sourceLineNo">125</span> if (!config.getBoolean(BackupRestoreConstants.BACKUP_ENABLE_KEY,<a name="line.125"></a>
+<span class="sourceLineNo">126</span> BackupRestoreConstants.BACKUP_ENABLE_DEFAULT)) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span> LOG.warn("Backup is disabled - allowing all wals to be deleted");<a name="line.127"></a>
+<span class="sourceLineNo">128</span> }<a name="line.128"></a>
+<span class="sourceLineNo">129</span> }<a name="line.129"></a>
+<span class="sourceLineNo">130</span><a name="line.130"></a>
+<span class="sourceLineNo">131</span> @Override<a name="line.131"></a>
+<span class="sourceLineNo">132</span> public void stop(String why) {<a name="line.132"></a>
+<span class="sourceLineNo">133</span> if (!this.stopped) {<a name="line.133"></a>
+<span class="sourceLineNo">134</span> this.stopped = true;<a name="line.134"></a>
+<span class="sourceLineNo">135</span> LOG.info("Stopping BackupLogCleaner");<a name="line.135"></a>
+<span class="sourceLineNo">136</span> }<a name="line.136"></a>
+<span class="sourceLineNo">137</span> }<a name="line.137"></a>
+<span class="sourceLineNo">138</span><a name="line.138"></a>
+<span class="sourceLineNo">139</span> @Override<a name="line.139"></a>
+<span class="sourceLineNo">140</span> public boolean isStopped() {<a name="line.140"></a>
+<span class="sourceLineNo">141</span> return this.stopped;<a name="line.141"></a>
+<span class="sourceLineNo">142</span> }<a name="line.142"></a>
+<span class="sourceLineNo">143</span>}<a name="line.143"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7cf6034b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.ReplicaCallIssuingRunnable.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.ReplicaCallIssuingRunnable.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.ReplicaCallIssuingRunnable.html
index 4160a88..ad93f10 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.ReplicaCallIssuingRunnable.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.ReplicaCallIssuingRunnable.html
@@ -960,13 +960,13 @@
<span class="sourceLineNo">952</span> Throwable error, long backOffTime, boolean willRetry, String startTime,<a name="line.952"></a>
<span class="sourceLineNo">953</span> int failed, int stopped) {<a name="line.953"></a>
<span class="sourceLineNo">954</span> StringBuilder sb = new StringBuilder();<a name="line.954"></a>
-<span class="sourceLineNo">955</span> sb.append("id=").append(asyncProcess.id).append(", table=").append(tableName).append(", ")<a name="line.955"></a>
-<span class="sourceLineNo">956</span> .append("attempt=").append(numAttempt)<a name="line.956"></a>
-<span class="sourceLineNo">957</span> .append("/").append(asyncProcess.numTries).append(", ");<a name="line.957"></a>
+<span class="sourceLineNo">955</span> sb.append("id=").append(asyncProcess.id).append(", table=").append(tableName).<a name="line.955"></a>
+<span class="sourceLineNo">956</span> append(", attempt=").append(numAttempt).append("/").append(asyncProcess.numTries).<a name="line.956"></a>
+<span class="sourceLineNo">957</span> append(", ");<a name="line.957"></a>
<span class="sourceLineNo">958</span><a name="line.958"></a>
<span class="sourceLineNo">959</span> if (failureCount > 0 || error != null){<a name="line.959"></a>
-<span class="sourceLineNo">960</span> sb.append("failed=").append(failureCount).append("ops").append(", last exception=").<a name="line.960"></a>
-<span class="sourceLineNo">961</span> append(error == null ? "null" : error);<a name="line.961"></a>
+<span class="sourceLineNo">960</span> sb.append("failureCount=").append(failureCount).append("ops").append(", last exception=").<a name="line.960"></a>
+<span class="sourceLineNo">961</span> append(error);<a name="line.961"></a>
<span class="sourceLineNo">962</span> } else {<a name="line.962"></a>
<span class="sourceLineNo">963</span> sb.append("succeeded");<a name="line.963"></a>
<span class="sourceLineNo">964</span> }<a name="line.964"></a>
@@ -975,15 +975,15 @@
<span class="sourceLineNo">967</span><a name="line.967"></a>
<span class="sourceLineNo">968</span> if (willRetry) {<a name="line.968"></a>
<span class="sourceLineNo">969</span> sb.append(", retrying after=").append(backOffTime).append("ms").<a name="line.969"></a>
-<span class="sourceLineNo">970</span> append(", replay=").append(replaySize).append("ops");<a name="line.970"></a>
+<span class="sourceLineNo">970</span> append(", operationsToReplay=").append(replaySize);<a name="line.970"></a>
<span class="sourceLineNo">971</span> } else if (failureCount > 0) {<a name="line.971"></a>
<span class="sourceLineNo">972</span> if (stopped > 0) {<a name="line.972"></a>
-<span class="sourceLineNo">973</span> sb.append("; not retrying ").append(stopped).append(" due to success from other replica");<a name="line.973"></a>
-<span class="sourceLineNo">974</span> }<a name="line.974"></a>
-<span class="sourceLineNo">975</span> if (failed > 0) {<a name="line.975"></a>
-<span class="sourceLineNo">976</span> sb.append("; not retrying ").append(failed).append(" - final failure");<a name="line.976"></a>
-<span class="sourceLineNo">977</span> }<a name="line.977"></a>
-<span class="sourceLineNo">978</span><a name="line.978"></a>
+<span class="sourceLineNo">973</span> sb.append("; NOT retrying, stopped=").append(stopped).<a name="line.973"></a>
+<span class="sourceLineNo">974</span> append(" because successful operation on other replica");<a name="line.974"></a>
+<span class="sourceLineNo">975</span> }<a name="line.975"></a>
+<span class="sourceLineNo">976</span> if (failed > 0) {<a name="line.976"></a>
+<span class="sourceLineNo">977</span> sb.append("; NOT retrying, failed=").append(failed).append(" -- final attempt!");<a name="line.977"></a>
+<span class="sourceLineNo">978</span> }<a name="line.978"></a>
<span class="sourceLineNo">979</span> }<a name="line.979"></a>
<span class="sourceLineNo">980</span><a name="line.980"></a>
<span class="sourceLineNo">981</span> return sb.toString();<a name="line.981"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7cf6034b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.ReplicaResultState.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.ReplicaResultState.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.ReplicaResultState.html
index 4160a88..ad93f10 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.ReplicaResultState.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.ReplicaResultState.html
@@ -960,13 +960,13 @@
<span class="sourceLineNo">952</span> Throwable error, long backOffTime, boolean willRetry, String startTime,<a name="line.952"></a>
<span class="sourceLineNo">953</span> int failed, int stopped) {<a name="line.953"></a>
<span class="sourceLineNo">954</span> StringBuilder sb = new StringBuilder();<a name="line.954"></a>
-<span class="sourceLineNo">955</span> sb.append("id=").append(asyncProcess.id).append(", table=").append(tableName).append(", ")<a name="line.955"></a>
-<span class="sourceLineNo">956</span> .append("attempt=").append(numAttempt)<a name="line.956"></a>
-<span class="sourceLineNo">957</span> .append("/").append(asyncProcess.numTries).append(", ");<a name="line.957"></a>
+<span class="sourceLineNo">955</span> sb.append("id=").append(asyncProcess.id).append(", table=").append(tableName).<a name="line.955"></a>
+<span class="sourceLineNo">956</span> append(", attempt=").append(numAttempt).append("/").append(asyncProcess.numTries).<a name="line.956"></a>
+<span class="sourceLineNo">957</span> append(", ");<a name="line.957"></a>
<span class="sourceLineNo">958</span><a name="line.958"></a>
<span class="sourceLineNo">959</span> if (failureCount > 0 || error != null){<a name="line.959"></a>
-<span class="sourceLineNo">960</span> sb.append("failed=").append(failureCount).append("ops").append(", last exception=").<a name="line.960"></a>
-<span class="sourceLineNo">961</span> append(error == null ? "null" : error);<a name="line.961"></a>
+<span class="sourceLineNo">960</span> sb.append("failureCount=").append(failureCount).append("ops").append(", last exception=").<a name="line.960"></a>
+<span class="sourceLineNo">961</span> append(error);<a name="line.961"></a>
<span class="sourceLineNo">962</span> } else {<a name="line.962"></a>
<span class="sourceLineNo">963</span> sb.append("succeeded");<a name="line.963"></a>
<span class="sourceLineNo">964</span> }<a name="line.964"></a>
@@ -975,15 +975,15 @@
<span class="sourceLineNo">967</span><a name="line.967"></a>
<span class="sourceLineNo">968</span> if (willRetry) {<a name="line.968"></a>
<span class="sourceLineNo">969</span> sb.append(", retrying after=").append(backOffTime).append("ms").<a name="line.969"></a>
-<span class="sourceLineNo">970</span> append(", replay=").append(replaySize).append("ops");<a name="line.970"></a>
+<span class="sourceLineNo">970</span> append(", operationsToReplay=").append(replaySize);<a name="line.970"></a>
<span class="sourceLineNo">971</span> } else if (failureCount > 0) {<a name="line.971"></a>
<span class="sourceLineNo">972</span> if (stopped > 0) {<a name="line.972"></a>
-<span class="sourceLineNo">973</span> sb.append("; not retrying ").append(stopped).append(" due to success from other replica");<a name="line.973"></a>
-<span class="sourceLineNo">974</span> }<a name="line.974"></a>
-<span class="sourceLineNo">975</span> if (failed > 0) {<a name="line.975"></a>
-<span class="sourceLineNo">976</span> sb.append("; not retrying ").append(failed).append(" - final failure");<a name="line.976"></a>
-<span class="sourceLineNo">977</span> }<a name="line.977"></a>
-<span class="sourceLineNo">978</span><a name="line.978"></a>
+<span class="sourceLineNo">973</span> sb.append("; NOT retrying, stopped=").append(stopped).<a name="line.973"></a>
+<span class="sourceLineNo">974</span> append(" because successful operation on other replica");<a name="line.974"></a>
+<span class="sourceLineNo">975</span> }<a name="line.975"></a>
+<span class="sourceLineNo">976</span> if (failed > 0) {<a name="line.976"></a>
+<span class="sourceLineNo">977</span> sb.append("; NOT retrying, failed=").append(failed).append(" -- final attempt!");<a name="line.977"></a>
+<span class="sourceLineNo">978</span> }<a name="line.978"></a>
<span class="sourceLineNo">979</span> }<a name="line.979"></a>
<span class="sourceLineNo">980</span><a name="line.980"></a>
<span class="sourceLineNo">981</span> return sb.toString();<a name="line.981"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7cf6034b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.Retry.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.Retry.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.Retry.html
index 4160a88..ad93f10 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.Retry.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.Retry.html
@@ -960,13 +960,13 @@
<span class="sourceLineNo">952</span> Throwable error, long backOffTime, boolean willRetry, String startTime,<a name="line.952"></a>
<span class="sourceLineNo">953</span> int failed, int stopped) {<a name="line.953"></a>
<span class="sourceLineNo">954</span> StringBuilder sb = new StringBuilder();<a name="line.954"></a>
-<span class="sourceLineNo">955</span> sb.append("id=").append(asyncProcess.id).append(", table=").append(tableName).append(", ")<a name="line.955"></a>
-<span class="sourceLineNo">956</span> .append("attempt=").append(numAttempt)<a name="line.956"></a>
-<span class="sourceLineNo">957</span> .append("/").append(asyncProcess.numTries).append(", ");<a name="line.957"></a>
+<span class="sourceLineNo">955</span> sb.append("id=").append(asyncProcess.id).append(", table=").append(tableName).<a name="line.955"></a>
+<span class="sourceLineNo">956</span> append(", attempt=").append(numAttempt).append("/").append(asyncProcess.numTries).<a name="line.956"></a>
+<span class="sourceLineNo">957</span> append(", ");<a name="line.957"></a>
<span class="sourceLineNo">958</span><a name="line.958"></a>
<span class="sourceLineNo">959</span> if (failureCount > 0 || error != null){<a name="line.959"></a>
-<span class="sourceLineNo">960</span> sb.append("failed=").append(failureCount).append("ops").append(", last exception=").<a name="line.960"></a>
-<span class="sourceLineNo">961</span> append(error == null ? "null" : error);<a name="line.961"></a>
+<span class="sourceLineNo">960</span> sb.append("failureCount=").append(failureCount).append("ops").append(", last exception=").<a name="line.960"></a>
+<span class="sourceLineNo">961</span> append(error);<a name="line.961"></a>
<span class="sourceLineNo">962</span> } else {<a name="line.962"></a>
<span class="sourceLineNo">963</span> sb.append("succeeded");<a name="line.963"></a>
<span class="sourceLineNo">964</span> }<a name="line.964"></a>
@@ -975,15 +975,15 @@
<span class="sourceLineNo">967</span><a name="line.967"></a>
<span class="sourceLineNo">968</span> if (willRetry) {<a name="line.968"></a>
<span class="sourceLineNo">969</span> sb.append(", retrying after=").append(backOffTime).append("ms").<a name="line.969"></a>
-<span class="sourceLineNo">970</span> append(", replay=").append(replaySize).append("ops");<a name="line.970"></a>
+<span class="sourceLineNo">970</span> append(", operationsToReplay=").append(replaySize);<a name="line.970"></a>
<span class="sourceLineNo">971</span> } else if (failureCount > 0) {<a name="line.971"></a>
<span class="sourceLineNo">972</span> if (stopped > 0) {<a name="line.972"></a>
-<span class="sourceLineNo">973</span> sb.append("; not retrying ").append(stopped).append(" due to success from other replica");<a name="line.973"></a>
-<span class="sourceLineNo">974</span> }<a name="line.974"></a>
-<span class="sourceLineNo">975</span> if (failed > 0) {<a name="line.975"></a>
-<span class="sourceLineNo">976</span> sb.append("; not retrying ").append(failed).append(" - final failure");<a name="line.976"></a>
-<span class="sourceLineNo">977</span> }<a name="line.977"></a>
-<span class="sourceLineNo">978</span><a name="line.978"></a>
+<span class="sourceLineNo">973</span> sb.append("; NOT retrying, stopped=").append(stopped).<a name="line.973"></a>
+<span class="sourceLineNo">974</span> append(" because successful operation on other replica");<a name="line.974"></a>
+<span class="sourceLineNo">975</span> }<a name="line.975"></a>
+<span class="sourceLineNo">976</span> if (failed > 0) {<a name="line.976"></a>
+<span class="sourceLineNo">977</span> sb.append("; NOT retrying, failed=").append(failed).append(" -- final attempt!");<a name="line.977"></a>
+<span class="sourceLineNo">978</span> }<a name="line.978"></a>
<span class="sourceLineNo">979</span> }<a name="line.979"></a>
<span class="sourceLineNo">980</span><a name="line.980"></a>
<span class="sourceLineNo">981</span> return sb.toString();<a name="line.981"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7cf6034b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.SingleServerRequestRunnable.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.SingleServerRequestRunnable.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.SingleServerRequestRunnable.html
index 4160a88..ad93f10 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.SingleServerRequestRunnable.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.SingleServerRequestRunnable.html
@@ -960,13 +960,13 @@
<span class="sourceLineNo">952</span> Throwable error, long backOffTime, boolean willRetry, String startTime,<a name="line.952"></a>
<span class="sourceLineNo">953</span> int failed, int stopped) {<a name="line.953"></a>
<span class="sourceLineNo">954</span> StringBuilder sb = new StringBuilder();<a name="line.954"></a>
-<span class="sourceLineNo">955</span> sb.append("id=").append(asyncProcess.id).append(", table=").append(tableName).append(", ")<a name="line.955"></a>
-<span class="sourceLineNo">956</span> .append("attempt=").append(numAttempt)<a name="line.956"></a>
-<span class="sourceLineNo">957</span> .append("/").append(asyncProcess.numTries).append(", ");<a name="line.957"></a>
+<span class="sourceLineNo">955</span> sb.append("id=").append(asyncProcess.id).append(", table=").append(tableName).<a name="line.955"></a>
+<span class="sourceLineNo">956</span> append(", attempt=").append(numAttempt).append("/").append(asyncProcess.numTries).<a name="line.956"></a>
+<span class="sourceLineNo">957</span> append(", ");<a name="line.957"></a>
<span class="sourceLineNo">958</span><a name="line.958"></a>
<span class="sourceLineNo">959</span> if (failureCount > 0 || error != null){<a name="line.959"></a>
-<span class="sourceLineNo">960</span> sb.append("failed=").append(failureCount).append("ops").append(", last exception=").<a name="line.960"></a>
-<span class="sourceLineNo">961</span> append(error == null ? "null" : error);<a name="line.961"></a>
+<span class="sourceLineNo">960</span> sb.append("failureCount=").append(failureCount).append("ops").append(", last exception=").<a name="line.960"></a>
+<span class="sourceLineNo">961</span> append(error);<a name="line.961"></a>
<span class="sourceLineNo">962</span> } else {<a name="line.962"></a>
<span class="sourceLineNo">963</span> sb.append("succeeded");<a name="line.963"></a>
<span class="sourceLineNo">964</span> }<a name="line.964"></a>
@@ -975,15 +975,15 @@
<span class="sourceLineNo">967</span><a name="line.967"></a>
<span class="sourceLineNo">968</span> if (willRetry) {<a name="line.968"></a>
<span class="sourceLineNo">969</span> sb.append(", retrying after=").append(backOffTime).append("ms").<a name="line.969"></a>
-<span class="sourceLineNo">970</span> append(", replay=").append(replaySize).append("ops");<a name="line.970"></a>
+<span class="sourceLineNo">970</span> append(", operationsToReplay=").append(replaySize);<a name="line.970"></a>
<span class="sourceLineNo">971</span> } else if (failureCount > 0) {<a name="line.971"></a>
<span class="sourceLineNo">972</span> if (stopped > 0) {<a name="line.972"></a>
-<span class="sourceLineNo">973</span> sb.append("; not retrying ").append(stopped).append(" due to success from other replica");<a name="line.973"></a>
-<span class="sourceLineNo">974</span> }<a name="line.974"></a>
-<span class="sourceLineNo">975</span> if (failed > 0) {<a name="line.975"></a>
-<span class="sourceLineNo">976</span> sb.append("; not retrying ").append(failed).append(" - final failure");<a name="line.976"></a>
-<span class="sourceLineNo">977</span> }<a name="line.977"></a>
-<span class="sourceLineNo">978</span><a name="line.978"></a>
+<span class="sourceLineNo">973</span> sb.append("; NOT retrying, stopped=").append(stopped).<a name="line.973"></a>
+<span class="sourceLineNo">974</span> append(" because successful operation on other replica");<a name="line.974"></a>
+<span class="sourceLineNo">975</span> }<a name="line.975"></a>
+<span class="sourceLineNo">976</span> if (failed > 0) {<a name="line.976"></a>
+<span class="sourceLineNo">977</span> sb.append("; NOT retrying, failed=").append(failed).append(" -- final attempt!");<a name="line.977"></a>
+<span class="sourceLineNo">978</span> }<a name="line.978"></a>
<span class="sourceLineNo">979</span> }<a name="line.979"></a>
<span class="sourceLineNo">980</span><a name="line.980"></a>
<span class="sourceLineNo">981</span> return sb.toString();<a name="line.981"></a>
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/7cf6034b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.html
----------------------------------------------------------------------
diff --git a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.html b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.html
index 4160a88..ad93f10 100644
--- a/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.html
+++ b/devapidocs/src-html/org/apache/hadoop/hbase/client/AsyncRequestFutureImpl.html
@@ -960,13 +960,13 @@
<span class="sourceLineNo">952</span> Throwable error, long backOffTime, boolean willRetry, String startTime,<a name="line.952"></a>
<span class="sourceLineNo">953</span> int failed, int stopped) {<a name="line.953"></a>
<span class="sourceLineNo">954</span> StringBuilder sb = new StringBuilder();<a name="line.954"></a>
-<span class="sourceLineNo">955</span> sb.append("id=").append(asyncProcess.id).append(", table=").append(tableName).append(", ")<a name="line.955"></a>
-<span class="sourceLineNo">956</span> .append("attempt=").append(numAttempt)<a name="line.956"></a>
-<span class="sourceLineNo">957</span> .append("/").append(asyncProcess.numTries).append(", ");<a name="line.957"></a>
+<span class="sourceLineNo">955</span> sb.append("id=").append(asyncProcess.id).append(", table=").append(tableName).<a name="line.955"></a>
+<span class="sourceLineNo">956</span> append(", attempt=").append(numAttempt).append("/").append(asyncProcess.numTries).<a name="line.956"></a>
+<span class="sourceLineNo">957</span> append(", ");<a name="line.957"></a>
<span class="sourceLineNo">958</span><a name="line.958"></a>
<span class="sourceLineNo">959</span> if (failureCount > 0 || error != null){<a name="line.959"></a>
-<span class="sourceLineNo">960</span> sb.append("failed=").append(failureCount).append("ops").append(", last exception=").<a name="line.960"></a>
-<span class="sourceLineNo">961</span> append(error == null ? "null" : error);<a name="line.961"></a>
+<span class="sourceLineNo">960</span> sb.append("failureCount=").append(failureCount).append("ops").append(", last exception=").<a name="line.960"></a>
+<span class="sourceLineNo">961</span> append(error);<a name="line.961"></a>
<span class="sourceLineNo">962</span> } else {<a name="line.962"></a>
<span class="sourceLineNo">963</span> sb.append("succeeded");<a name="line.963"></a>
<span class="sourceLineNo">964</span> }<a name="line.964"></a>
@@ -975,15 +975,15 @@
<span class="sourceLineNo">967</span><a name="line.967"></a>
<span class="sourceLineNo">968</span> if (willRetry) {<a name="line.968"></a>
<span class="sourceLineNo">969</span> sb.append(", retrying after=").append(backOffTime).append("ms").<a name="line.969"></a>
-<span class="sourceLineNo">970</span> append(", replay=").append(replaySize).append("ops");<a name="line.970"></a>
+<span class="sourceLineNo">970</span> append(", operationsToReplay=").append(replaySize);<a name="line.970"></a>
<span class="sourceLineNo">971</span> } else if (failureCount > 0) {<a name="line.971"></a>
<span class="sourceLineNo">972</span> if (stopped > 0) {<a name="line.972"></a>
-<span class="sourceLineNo">973</span> sb.append("; not retrying ").append(stopped).append(" due to success from other replica");<a name="line.973"></a>
-<span class="sourceLineNo">974</span> }<a name="line.974"></a>
-<span class="sourceLineNo">975</span> if (failed > 0) {<a name="line.975"></a>
-<span class="sourceLineNo">976</span> sb.append("; not retrying ").append(failed).append(" - final failure");<a name="line.976"></a>
-<span class="sourceLineNo">977</span> }<a name="line.977"></a>
-<span class="sourceLineNo">978</span><a name="line.978"></a>
+<span class="sourceLineNo">973</span> sb.append("; NOT retrying, stopped=").append(stopped).<a name="line.973"></a>
+<span class="sourceLineNo">974</span> append(" because successful operation on other replica");<a name="line.974"></a>
+<span class="sourceLineNo">975</span> }<a name="line.975"></a>
+<span class="sourceLineNo">976</span> if (failed > 0) {<a name="line.976"></a>
+<span class="sourceLineNo">977</span> sb.append("; NOT retrying, failed=").append(failed).append(" -- final attempt!");<a name="line.977"></a>
+<span class="sourceLineNo">978</span> }<a name="line.978"></a>
<span class="sourceLineNo">979</span> }<a name="line.979"></a>
<span class="sourceLineNo">980</span><a name="line.980"></a>
<span class="sourceLineNo">981</span> return sb.toString();<a name="line.981"></a>