http://git-wip-us.apache.org/repos/asf/hbase-site/blob/89e23f78/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.BackupMergeJobWithFailures.html
----------------------------------------------------------------------
diff --git
a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.BackupMergeJobWithFailures.html
b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.BackupMergeJobWithFailures.html
index e82daed..478e1af 100644
---
a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.BackupMergeJobWithFailures.html
+++
b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupMergeWithFailures.BackupMergeJobWithFailures.html
@@ -39,299 +39,323 @@
<span class="sourceLineNo">031</span>import
org.apache.hadoop.hbase.HBaseClassTestRule;<a name="line.31"></a>
<span class="sourceLineNo">032</span>import
org.apache.hadoop.hbase.TableName;<a name="line.32"></a>
<span class="sourceLineNo">033</span>import
org.apache.hadoop.hbase.backup.impl.BackupAdminImpl;<a name="line.33"></a>
-<span class="sourceLineNo">034</span>import
org.apache.hadoop.hbase.backup.impl.BackupSystemTable;<a name="line.34"></a>
-<span class="sourceLineNo">035</span>import
org.apache.hadoop.hbase.backup.mapreduce.MapReduceBackupMergeJob;<a
name="line.35"></a>
-<span class="sourceLineNo">036</span>import
org.apache.hadoop.hbase.backup.mapreduce.MapReduceHFileSplitterJob;<a
name="line.36"></a>
-<span class="sourceLineNo">037</span>import
org.apache.hadoop.hbase.backup.util.BackupUtils;<a name="line.37"></a>
-<span class="sourceLineNo">038</span>import
org.apache.hadoop.hbase.client.Connection;<a name="line.38"></a>
-<span class="sourceLineNo">039</span>import
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.39"></a>
-<span class="sourceLineNo">040</span>import
org.apache.hadoop.hbase.client.HBaseAdmin;<a name="line.40"></a>
-<span class="sourceLineNo">041</span>import
org.apache.hadoop.hbase.client.HTable;<a name="line.41"></a>
-<span class="sourceLineNo">042</span>import
org.apache.hadoop.hbase.client.Table;<a name="line.42"></a>
-<span class="sourceLineNo">043</span>import
org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.43"></a>
-<span class="sourceLineNo">044</span>import
org.apache.hadoop.hbase.util.Pair;<a name="line.44"></a>
-<span class="sourceLineNo">045</span>import org.junit.Assert;<a
name="line.45"></a>
-<span class="sourceLineNo">046</span>import org.junit.ClassRule;<a
name="line.46"></a>
-<span class="sourceLineNo">047</span>import org.junit.Test;<a
name="line.47"></a>
-<span class="sourceLineNo">048</span>import
org.junit.experimental.categories.Category;<a name="line.48"></a>
-<span class="sourceLineNo">049</span>import org.slf4j.Logger;<a
name="line.49"></a>
-<span class="sourceLineNo">050</span>import org.slf4j.LoggerFactory;<a
name="line.50"></a>
-<span class="sourceLineNo">051</span><a name="line.51"></a>
-<span class="sourceLineNo">052</span>import
org.apache.hbase.thirdparty.com.google.common.collect.Lists;<a
name="line.52"></a>
-<span class="sourceLineNo">053</span><a name="line.53"></a>
-<span class="sourceLineNo">054</span>@Category(LargeTests.class)<a
name="line.54"></a>
-<span class="sourceLineNo">055</span>public class
TestIncrementalBackupMergeWithFailures extends TestBackupBase {<a
name="line.55"></a>
-<span class="sourceLineNo">056</span><a name="line.56"></a>
-<span class="sourceLineNo">057</span> @ClassRule<a name="line.57"></a>
-<span class="sourceLineNo">058</span> public static final HBaseClassTestRule
CLASS_RULE =<a name="line.58"></a>
-<span class="sourceLineNo">059</span>
HBaseClassTestRule.forClass(TestIncrementalBackupMergeWithFailures.class);<a
name="line.59"></a>
-<span class="sourceLineNo">060</span><a name="line.60"></a>
-<span class="sourceLineNo">061</span> private static final Logger LOG =<a
name="line.61"></a>
-<span class="sourceLineNo">062</span>
LoggerFactory.getLogger(TestIncrementalBackupMergeWithFailures.class);<a
name="line.62"></a>
-<span class="sourceLineNo">063</span><a name="line.63"></a>
-<span class="sourceLineNo">064</span> enum FailurePhase {<a
name="line.64"></a>
-<span class="sourceLineNo">065</span> PHASE1, PHASE2, PHASE3, PHASE4<a
name="line.65"></a>
-<span class="sourceLineNo">066</span> }<a name="line.66"></a>
-<span class="sourceLineNo">067</span><a name="line.67"></a>
-<span class="sourceLineNo">068</span> public final static String
FAILURE_PHASE_KEY = "failurePhase";<a name="line.68"></a>
-<span class="sourceLineNo">069</span><a name="line.69"></a>
-<span class="sourceLineNo">070</span> static class BackupMergeJobWithFailures
extends MapReduceBackupMergeJob {<a name="line.70"></a>
-<span class="sourceLineNo">071</span> FailurePhase failurePhase;<a
name="line.71"></a>
-<span class="sourceLineNo">072</span><a name="line.72"></a>
-<span class="sourceLineNo">073</span> @Override<a name="line.73"></a>
-<span class="sourceLineNo">074</span> public void setConf(Configuration
conf) {<a name="line.74"></a>
-<span class="sourceLineNo">075</span> super.setConf(conf);<a
name="line.75"></a>
-<span class="sourceLineNo">076</span> String val =
conf.get(FAILURE_PHASE_KEY);<a name="line.76"></a>
-<span class="sourceLineNo">077</span> if (val != null) {<a
name="line.77"></a>
-<span class="sourceLineNo">078</span> failurePhase =
FailurePhase.valueOf(val);<a name="line.78"></a>
-<span class="sourceLineNo">079</span> } else {<a name="line.79"></a>
-<span class="sourceLineNo">080</span> Assert.fail("Failure phase is not
set");<a name="line.80"></a>
-<span class="sourceLineNo">081</span> }<a name="line.81"></a>
-<span class="sourceLineNo">082</span> }<a name="line.82"></a>
-<span class="sourceLineNo">083</span><a name="line.83"></a>
-<span class="sourceLineNo">084</span> /**<a name="line.84"></a>
-<span class="sourceLineNo">085</span> * This is the exact copy of parent's
run() with injections<a name="line.85"></a>
-<span class="sourceLineNo">086</span> * of different types of failures<a
name="line.86"></a>
-<span class="sourceLineNo">087</span> */<a name="line.87"></a>
-<span class="sourceLineNo">088</span> @Override<a name="line.88"></a>
-<span class="sourceLineNo">089</span> public void run(String[] backupIds)
throws IOException {<a name="line.89"></a>
-<span class="sourceLineNo">090</span> String bulkOutputConfKey;<a
name="line.90"></a>
-<span class="sourceLineNo">091</span><a name="line.91"></a>
-<span class="sourceLineNo">092</span> // TODO : run player on remote
cluster<a name="line.92"></a>
-<span class="sourceLineNo">093</span> player = new
MapReduceHFileSplitterJob();<a name="line.93"></a>
-<span class="sourceLineNo">094</span> bulkOutputConfKey =
MapReduceHFileSplitterJob.BULK_OUTPUT_CONF_KEY;<a name="line.94"></a>
-<span class="sourceLineNo">095</span> // Player reads all files in
arbitrary directory structure and creates<a name="line.95"></a>
-<span class="sourceLineNo">096</span> // a Map task for each file<a
name="line.96"></a>
-<span class="sourceLineNo">097</span> String bids =
StringUtils.join(backupIds, ",");<a name="line.97"></a>
-<span class="sourceLineNo">098</span><a name="line.98"></a>
-<span class="sourceLineNo">099</span> if (LOG.isDebugEnabled()) {<a
name="line.99"></a>
-<span class="sourceLineNo">100</span> LOG.debug("Merge backup images "
+ bids);<a name="line.100"></a>
-<span class="sourceLineNo">101</span> }<a name="line.101"></a>
-<span class="sourceLineNo">102</span><a name="line.102"></a>
-<span class="sourceLineNo">103</span> List<Pair<TableName,
Path>> processedTableList = new ArrayList<>();<a
name="line.103"></a>
-<span class="sourceLineNo">104</span> boolean finishedTables = false;<a
name="line.104"></a>
-<span class="sourceLineNo">105</span> Connection conn =
ConnectionFactory.createConnection(getConf());<a name="line.105"></a>
-<span class="sourceLineNo">106</span> BackupSystemTable table = new
BackupSystemTable(conn);<a name="line.106"></a>
-<span class="sourceLineNo">107</span> FileSystem fs =
FileSystem.get(getConf());<a name="line.107"></a>
-<span class="sourceLineNo">108</span><a name="line.108"></a>
-<span class="sourceLineNo">109</span> try {<a name="line.109"></a>
-<span class="sourceLineNo">110</span> // Start backup exclusive
operation<a name="line.110"></a>
-<span class="sourceLineNo">111</span>
table.startBackupExclusiveOperation();<a name="line.111"></a>
-<span class="sourceLineNo">112</span> // Start merge operation<a
name="line.112"></a>
-<span class="sourceLineNo">113</span>
table.startMergeOperation(backupIds);<a name="line.113"></a>
-<span class="sourceLineNo">114</span><a name="line.114"></a>
-<span class="sourceLineNo">115</span> // Select most recent backup id<a
name="line.115"></a>
-<span class="sourceLineNo">116</span> String mergedBackupId =
findMostRecentBackupId(backupIds);<a name="line.116"></a>
-<span class="sourceLineNo">117</span><a name="line.117"></a>
-<span class="sourceLineNo">118</span> TableName[] tableNames =
getTableNamesInBackupImages(backupIds);<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span> BackupInfo bInfo =
table.readBackupInfo(backupIds[0]);<a name="line.120"></a>
-<span class="sourceLineNo">121</span> String backupRoot =
bInfo.getBackupRootDir();<a name="line.121"></a>
-<span class="sourceLineNo">122</span> // PHASE 1<a name="line.122"></a>
-<span class="sourceLineNo">123</span>
checkFailure(FailurePhase.PHASE1);<a name="line.123"></a>
-<span class="sourceLineNo">124</span><a name="line.124"></a>
-<span class="sourceLineNo">125</span> for (int i = 0; i <
tableNames.length; i++) {<a name="line.125"></a>
-<span class="sourceLineNo">126</span> LOG.info("Merge backup images
for " + tableNames[i]);<a name="line.126"></a>
-<span class="sourceLineNo">127</span><a name="line.127"></a>
-<span class="sourceLineNo">128</span> // Find input directories for
table<a name="line.128"></a>
-<span class="sourceLineNo">129</span> Path[] dirPaths =
findInputDirectories(fs, backupRoot, tableNames[i], backupIds);<a
name="line.129"></a>
-<span class="sourceLineNo">130</span> String dirs =
StringUtils.join(dirPaths, ",");<a name="line.130"></a>
-<span class="sourceLineNo">131</span> Path bulkOutputPath =<a
name="line.131"></a>
-<span class="sourceLineNo">132</span>
BackupUtils.getBulkOutputDir(BackupUtils.getFileNameCompatibleString(tableNames[i]),<a
name="line.132"></a>
-<span class="sourceLineNo">133</span> getConf(), false);<a
name="line.133"></a>
-<span class="sourceLineNo">134</span> // Delete content if exists<a
name="line.134"></a>
-<span class="sourceLineNo">135</span> if (fs.exists(bulkOutputPath))
{<a name="line.135"></a>
-<span class="sourceLineNo">136</span> if
(!fs.delete(bulkOutputPath, true)) {<a name="line.136"></a>
-<span class="sourceLineNo">137</span> LOG.warn("Can not delete: "
+ bulkOutputPath);<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> Configuration conf =
getConf();<a name="line.140"></a>
-<span class="sourceLineNo">141</span> conf.set(bulkOutputConfKey,
bulkOutputPath.toString());<a name="line.141"></a>
-<span class="sourceLineNo">142</span> String[] playerArgs = { dirs,
tableNames[i].getNameAsString() };<a name="line.142"></a>
-<span class="sourceLineNo">143</span><a name="line.143"></a>
-<span class="sourceLineNo">144</span> // PHASE 2<a
name="line.144"></a>
-<span class="sourceLineNo">145</span>
checkFailure(FailurePhase.PHASE2);<a name="line.145"></a>
-<span class="sourceLineNo">146</span> player.setConf(getConf());<a
name="line.146"></a>
-<span class="sourceLineNo">147</span> int result =
player.run(playerArgs);<a name="line.147"></a>
-<span class="sourceLineNo">148</span> if (succeeded(result)) {<a
name="line.148"></a>
-<span class="sourceLineNo">149</span> // Add to processed table
list<a name="line.149"></a>
-<span class="sourceLineNo">150</span> processedTableList.add(new
Pair<>(tableNames[i], bulkOutputPath));<a name="line.150"></a>
-<span class="sourceLineNo">151</span> } else {<a name="line.151"></a>
-<span class="sourceLineNo">152</span> throw new IOException("Can
not merge backup images for " + dirs<a name="line.152"></a>
-<span class="sourceLineNo">153</span> + " (check Hadoop/MR and
HBase logs). Player return code =" + result);<a name="line.153"></a>
-<span class="sourceLineNo">154</span> }<a name="line.154"></a>
-<span class="sourceLineNo">155</span> LOG.debug("Merge Job finished:"
+ result);<a name="line.155"></a>
-<span class="sourceLineNo">156</span> }<a name="line.156"></a>
-<span class="sourceLineNo">157</span> List<TableName> tableList =
toTableNameList(processedTableList);<a name="line.157"></a>
-<span class="sourceLineNo">158</span> // PHASE 3<a name="line.158"></a>
-<span class="sourceLineNo">159</span>
checkFailure(FailurePhase.PHASE3);<a name="line.159"></a>
-<span class="sourceLineNo">160</span>
table.updateProcessedTablesForMerge(tableList);<a name="line.160"></a>
-<span class="sourceLineNo">161</span> finishedTables = true;<a
name="line.161"></a>
-<span class="sourceLineNo">162</span><a name="line.162"></a>
-<span class="sourceLineNo">163</span> // Move data<a
name="line.163"></a>
-<span class="sourceLineNo">164</span> for (Pair<TableName, Path>
tn : processedTableList) {<a name="line.164"></a>
-<span class="sourceLineNo">165</span> moveData(fs, backupRoot,
tn.getSecond(), tn.getFirst(), mergedBackupId);<a name="line.165"></a>
-<span class="sourceLineNo">166</span> }<a name="line.166"></a>
-<span class="sourceLineNo">167</span> // PHASE 4<a name="line.167"></a>
-<span class="sourceLineNo">168</span>
checkFailure(FailurePhase.PHASE4);<a name="line.168"></a>
-<span class="sourceLineNo">169</span> // Delete old data and update
manifest<a name="line.169"></a>
-<span class="sourceLineNo">170</span> List<String>
backupsToDelete = getBackupIdsToDelete(backupIds, mergedBackupId);<a
name="line.170"></a>
-<span class="sourceLineNo">171</span>
deleteBackupImages(backupsToDelete, conn, fs, backupRoot);<a
name="line.171"></a>
-<span class="sourceLineNo">172</span> updateBackupManifest(backupRoot,
mergedBackupId, backupsToDelete);<a name="line.172"></a>
-<span class="sourceLineNo">173</span> // Finish merge session<a
name="line.173"></a>
-<span class="sourceLineNo">174</span> table.finishMergeOperation();<a
name="line.174"></a>
-<span class="sourceLineNo">175</span> } catch (RuntimeException e) {<a
name="line.175"></a>
-<span class="sourceLineNo">176</span> throw e;<a name="line.176"></a>
-<span class="sourceLineNo">177</span> } catch (Exception e) {<a
name="line.177"></a>
-<span class="sourceLineNo">178</span> LOG.error(e.toString(), e);<a
name="line.178"></a>
-<span class="sourceLineNo">179</span> if (!finishedTables) {<a
name="line.179"></a>
-<span class="sourceLineNo">180</span> // cleanup bulk directories and
finish merge<a name="line.180"></a>
-<span class="sourceLineNo">181</span> // merge MUST be repeated (no
need for repair)<a name="line.181"></a>
-<span class="sourceLineNo">182</span> cleanupBulkLoadDirs(fs,
toPathList(processedTableList));<a name="line.182"></a>
-<span class="sourceLineNo">183</span> table.finishMergeOperation();<a
name="line.183"></a>
-<span class="sourceLineNo">184</span>
table.finishBackupExclusiveOperation();<a name="line.184"></a>
-<span class="sourceLineNo">185</span> throw new IOException("Backup
merge operation failed, you should try it again", e);<a name="line.185"></a>
-<span class="sourceLineNo">186</span> } else {<a name="line.186"></a>
-<span class="sourceLineNo">187</span> // backup repair must be run<a
name="line.187"></a>
-<span class="sourceLineNo">188</span> throw new IOException(<a
name="line.188"></a>
-<span class="sourceLineNo">189</span> "Backup merge operation
failed, run backup repair tool to restore system's integrity",<a
name="line.189"></a>
-<span class="sourceLineNo">190</span> e);<a name="line.190"></a>
-<span class="sourceLineNo">191</span> }<a name="line.191"></a>
-<span class="sourceLineNo">192</span> } finally {<a name="line.192"></a>
-<span class="sourceLineNo">193</span> table.close();<a
name="line.193"></a>
-<span class="sourceLineNo">194</span> conn.close();<a
name="line.194"></a>
-<span class="sourceLineNo">195</span> }<a name="line.195"></a>
-<span class="sourceLineNo">196</span> }<a name="line.196"></a>
-<span class="sourceLineNo">197</span><a name="line.197"></a>
-<span class="sourceLineNo">198</span> private void
checkFailure(FailurePhase phase) throws IOException {<a name="line.198"></a>
-<span class="sourceLineNo">199</span> if (failurePhase != null &&
failurePhase == phase) {<a name="line.199"></a>
-<span class="sourceLineNo">200</span> throw new
IOException(phase.toString());<a name="line.200"></a>
-<span class="sourceLineNo">201</span> }<a name="line.201"></a>
-<span class="sourceLineNo">202</span> }<a name="line.202"></a>
-<span class="sourceLineNo">203</span> }<a name="line.203"></a>
-<span class="sourceLineNo">204</span><a name="line.204"></a>
-<span class="sourceLineNo">205</span> @Test<a name="line.205"></a>
-<span class="sourceLineNo">206</span> public void TestIncBackupMergeRestore()
throws Exception {<a name="line.206"></a>
-<span class="sourceLineNo">207</span> int ADD_ROWS = 99;<a
name="line.207"></a>
-<span class="sourceLineNo">208</span> // #1 - create full backup for all
tables<a name="line.208"></a>
-<span class="sourceLineNo">209</span> LOG.info("create full backup image
for all tables");<a name="line.209"></a>
-<span class="sourceLineNo">210</span><a name="line.210"></a>
-<span class="sourceLineNo">211</span> List<TableName> tables =
Lists.newArrayList(table1, table2);<a name="line.211"></a>
-<span class="sourceLineNo">212</span> // Set custom Merge Job
implementation<a name="line.212"></a>
-<span class="sourceLineNo">213</span>
conf1.setClass(BackupRestoreFactory.HBASE_BACKUP_MERGE_IMPL_CLASS,<a
name="line.213"></a>
-<span class="sourceLineNo">214</span> BackupMergeJobWithFailures.class,
BackupMergeJob.class);<a name="line.214"></a>
-<span class="sourceLineNo">215</span><a name="line.215"></a>
-<span class="sourceLineNo">216</span> Connection conn =
ConnectionFactory.createConnection(conf1);<a name="line.216"></a>
-<span class="sourceLineNo">217</span><a name="line.217"></a>
-<span class="sourceLineNo">218</span> HBaseAdmin admin = (HBaseAdmin)
conn.getAdmin();<a name="line.218"></a>
-<span class="sourceLineNo">219</span> BackupAdminImpl client = new
BackupAdminImpl(conn);<a name="line.219"></a>
-<span class="sourceLineNo">220</span><a name="line.220"></a>
-<span class="sourceLineNo">221</span> BackupRequest request =
createBackupRequest(BackupType.FULL, tables, BACKUP_ROOT_DIR);<a
name="line.221"></a>
-<span class="sourceLineNo">222</span> String backupIdFull =
client.backupTables(request);<a name="line.222"></a>
-<span class="sourceLineNo">223</span><a name="line.223"></a>
-<span class="sourceLineNo">224</span>
assertTrue(checkSucceeded(backupIdFull));<a name="line.224"></a>
+<span class="sourceLineNo">034</span>import
org.apache.hadoop.hbase.backup.impl.BackupCommands;<a name="line.34"></a>
+<span class="sourceLineNo">035</span>import
org.apache.hadoop.hbase.backup.impl.BackupSystemTable;<a name="line.35"></a>
+<span class="sourceLineNo">036</span>import
org.apache.hadoop.hbase.backup.mapreduce.MapReduceBackupMergeJob;<a
name="line.36"></a>
+<span class="sourceLineNo">037</span>import
org.apache.hadoop.hbase.backup.mapreduce.MapReduceHFileSplitterJob;<a
name="line.37"></a>
+<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.Connection;<a name="line.39"></a>
+<span class="sourceLineNo">040</span>import
org.apache.hadoop.hbase.client.ConnectionFactory;<a name="line.40"></a>
+<span class="sourceLineNo">041</span>import
org.apache.hadoop.hbase.client.HBaseAdmin;<a name="line.41"></a>
+<span class="sourceLineNo">042</span>import
org.apache.hadoop.hbase.client.HTable;<a name="line.42"></a>
+<span class="sourceLineNo">043</span>import
org.apache.hadoop.hbase.client.Table;<a name="line.43"></a>
+<span class="sourceLineNo">044</span>import
org.apache.hadoop.hbase.testclassification.LargeTests;<a name="line.44"></a>
+<span class="sourceLineNo">045</span>import
org.apache.hadoop.hbase.util.Pair;<a name="line.45"></a>
+<span class="sourceLineNo">046</span>import org.junit.Assert;<a
name="line.46"></a>
+<span class="sourceLineNo">047</span>import org.junit.ClassRule;<a
name="line.47"></a>
+<span class="sourceLineNo">048</span>import org.junit.Test;<a
name="line.48"></a>
+<span class="sourceLineNo">049</span>import
org.junit.experimental.categories.Category;<a name="line.49"></a>
+<span class="sourceLineNo">050</span>import org.slf4j.Logger;<a
name="line.50"></a>
+<span class="sourceLineNo">051</span>import org.slf4j.LoggerFactory;<a
name="line.51"></a>
+<span class="sourceLineNo">052</span><a name="line.52"></a>
+<span class="sourceLineNo">053</span>import
org.apache.hbase.thirdparty.com.google.common.collect.Lists;<a
name="line.53"></a>
+<span class="sourceLineNo">054</span><a name="line.54"></a>
+<span class="sourceLineNo">055</span>@Category(LargeTests.class)<a
name="line.55"></a>
+<span class="sourceLineNo">056</span>public class
TestIncrementalBackupMergeWithFailures extends TestBackupBase {<a
name="line.56"></a>
+<span class="sourceLineNo">057</span><a name="line.57"></a>
+<span class="sourceLineNo">058</span> @ClassRule<a name="line.58"></a>
+<span class="sourceLineNo">059</span> public static final HBaseClassTestRule
CLASS_RULE =<a name="line.59"></a>
+<span class="sourceLineNo">060</span>
HBaseClassTestRule.forClass(TestIncrementalBackupMergeWithFailures.class);<a
name="line.60"></a>
+<span class="sourceLineNo">061</span><a name="line.61"></a>
+<span class="sourceLineNo">062</span> private static final Logger LOG =<a
name="line.62"></a>
+<span class="sourceLineNo">063</span>
LoggerFactory.getLogger(TestIncrementalBackupMergeWithFailures.class);<a
name="line.63"></a>
+<span class="sourceLineNo">064</span><a name="line.64"></a>
+<span class="sourceLineNo">065</span> enum FailurePhase {<a
name="line.65"></a>
+<span class="sourceLineNo">066</span> PHASE1, PHASE2, PHASE3, PHASE4<a
name="line.66"></a>
+<span class="sourceLineNo">067</span> }<a name="line.67"></a>
+<span class="sourceLineNo">068</span><a name="line.68"></a>
+<span class="sourceLineNo">069</span> public final static String
FAILURE_PHASE_KEY = "failurePhase";<a name="line.69"></a>
+<span class="sourceLineNo">070</span><a name="line.70"></a>
+<span class="sourceLineNo">071</span> static class BackupMergeJobWithFailures
extends MapReduceBackupMergeJob {<a name="line.71"></a>
+<span class="sourceLineNo">072</span> FailurePhase failurePhase;<a
name="line.72"></a>
+<span class="sourceLineNo">073</span><a name="line.73"></a>
+<span class="sourceLineNo">074</span> @Override<a name="line.74"></a>
+<span class="sourceLineNo">075</span> public void setConf(Configuration
conf) {<a name="line.75"></a>
+<span class="sourceLineNo">076</span> super.setConf(conf);<a
name="line.76"></a>
+<span class="sourceLineNo">077</span> String val =
conf.get(FAILURE_PHASE_KEY);<a name="line.77"></a>
+<span class="sourceLineNo">078</span> if (val != null) {<a
name="line.78"></a>
+<span class="sourceLineNo">079</span> failurePhase =
FailurePhase.valueOf(val);<a name="line.79"></a>
+<span class="sourceLineNo">080</span> } else {<a name="line.80"></a>
+<span class="sourceLineNo">081</span> Assert.fail("Failure phase is not
set");<a name="line.81"></a>
+<span class="sourceLineNo">082</span> }<a name="line.82"></a>
+<span class="sourceLineNo">083</span> }<a name="line.83"></a>
+<span class="sourceLineNo">084</span><a name="line.84"></a>
+<span class="sourceLineNo">085</span> /**<a name="line.85"></a>
+<span class="sourceLineNo">086</span> * This is the exact copy of parent's
run() with injections<a name="line.86"></a>
+<span class="sourceLineNo">087</span> * of different types of failures<a
name="line.87"></a>
+<span class="sourceLineNo">088</span> */<a name="line.88"></a>
+<span class="sourceLineNo">089</span> @Override<a name="line.89"></a>
+<span class="sourceLineNo">090</span> public void run(String[] backupIds)
throws IOException {<a name="line.90"></a>
+<span class="sourceLineNo">091</span> String bulkOutputConfKey;<a
name="line.91"></a>
+<span class="sourceLineNo">092</span><a name="line.92"></a>
+<span class="sourceLineNo">093</span> // TODO : run player on remote
cluster<a name="line.93"></a>
+<span class="sourceLineNo">094</span> player = new
MapReduceHFileSplitterJob();<a name="line.94"></a>
+<span class="sourceLineNo">095</span> bulkOutputConfKey =
MapReduceHFileSplitterJob.BULK_OUTPUT_CONF_KEY;<a name="line.95"></a>
+<span class="sourceLineNo">096</span> // Player reads all files in
arbitrary directory structure and creates<a name="line.96"></a>
+<span class="sourceLineNo">097</span> // a Map task for each file<a
name="line.97"></a>
+<span class="sourceLineNo">098</span> String bids =
StringUtils.join(backupIds, ",");<a name="line.98"></a>
+<span class="sourceLineNo">099</span><a name="line.99"></a>
+<span class="sourceLineNo">100</span> if (LOG.isDebugEnabled()) {<a
name="line.100"></a>
+<span class="sourceLineNo">101</span> LOG.debug("Merge backup images "
+ bids);<a name="line.101"></a>
+<span class="sourceLineNo">102</span> }<a name="line.102"></a>
+<span class="sourceLineNo">103</span><a name="line.103"></a>
+<span class="sourceLineNo">104</span> List<Pair<TableName,
Path>> processedTableList = new ArrayList<>();<a
name="line.104"></a>
+<span class="sourceLineNo">105</span> boolean finishedTables = false;<a
name="line.105"></a>
+<span class="sourceLineNo">106</span> Connection conn =
ConnectionFactory.createConnection(getConf());<a name="line.106"></a>
+<span class="sourceLineNo">107</span> BackupSystemTable table = new
BackupSystemTable(conn);<a name="line.107"></a>
+<span class="sourceLineNo">108</span> FileSystem fs =
FileSystem.get(getConf());<a name="line.108"></a>
+<span class="sourceLineNo">109</span><a name="line.109"></a>
+<span class="sourceLineNo">110</span> try {<a name="line.110"></a>
+<span class="sourceLineNo">111</span> // Start backup exclusive
operation<a name="line.111"></a>
+<span class="sourceLineNo">112</span>
table.startBackupExclusiveOperation();<a name="line.112"></a>
+<span class="sourceLineNo">113</span> // Start merge operation<a
name="line.113"></a>
+<span class="sourceLineNo">114</span>
table.startMergeOperation(backupIds);<a name="line.114"></a>
+<span class="sourceLineNo">115</span><a name="line.115"></a>
+<span class="sourceLineNo">116</span> // Select most recent backup id<a
name="line.116"></a>
+<span class="sourceLineNo">117</span> String mergedBackupId =
BackupUtils.findMostRecentBackupId(backupIds);<a name="line.117"></a>
+<span class="sourceLineNo">118</span><a name="line.118"></a>
+<span class="sourceLineNo">119</span> TableName[] tableNames =
getTableNamesInBackupImages(backupIds);<a name="line.119"></a>
+<span class="sourceLineNo">120</span><a name="line.120"></a>
+<span class="sourceLineNo">121</span> BackupInfo bInfo =
table.readBackupInfo(backupIds[0]);<a name="line.121"></a>
+<span class="sourceLineNo">122</span> String backupRoot =
bInfo.getBackupRootDir();<a name="line.122"></a>
+<span class="sourceLineNo">123</span> // PHASE 1<a name="line.123"></a>
+<span class="sourceLineNo">124</span>
checkFailure(FailurePhase.PHASE1);<a name="line.124"></a>
+<span class="sourceLineNo">125</span><a name="line.125"></a>
+<span class="sourceLineNo">126</span> for (int i = 0; i <
tableNames.length; i++) {<a name="line.126"></a>
+<span class="sourceLineNo">127</span> LOG.info("Merge backup images
for " + tableNames[i]);<a name="line.127"></a>
+<span class="sourceLineNo">128</span><a name="line.128"></a>
+<span class="sourceLineNo">129</span> // Find input directories for
table<a name="line.129"></a>
+<span class="sourceLineNo">130</span> Path[] dirPaths =
findInputDirectories(fs, backupRoot, tableNames[i], backupIds);<a
name="line.130"></a>
+<span class="sourceLineNo">131</span> String dirs =
StringUtils.join(dirPaths, ",");<a name="line.131"></a>
+<span class="sourceLineNo">132</span> Path bulkOutputPath =<a
name="line.132"></a>
+<span class="sourceLineNo">133</span>
BackupUtils.getBulkOutputDir(BackupUtils.getFileNameCompatibleString(tableNames[i]),<a
name="line.133"></a>
+<span class="sourceLineNo">134</span> getConf(), false);<a
name="line.134"></a>
+<span class="sourceLineNo">135</span> // Delete content if exists<a
name="line.135"></a>
+<span class="sourceLineNo">136</span> if (fs.exists(bulkOutputPath))
{<a name="line.136"></a>
+<span class="sourceLineNo">137</span> if
(!fs.delete(bulkOutputPath, true)) {<a name="line.137"></a>
+<span class="sourceLineNo">138</span> LOG.warn("Can not delete: "
+ bulkOutputPath);<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> Configuration conf =
getConf();<a name="line.141"></a>
+<span class="sourceLineNo">142</span> conf.set(bulkOutputConfKey,
bulkOutputPath.toString());<a name="line.142"></a>
+<span class="sourceLineNo">143</span> String[] playerArgs = { dirs,
tableNames[i].getNameAsString() };<a name="line.143"></a>
+<span class="sourceLineNo">144</span><a name="line.144"></a>
+<span class="sourceLineNo">145</span> // PHASE 2<a
name="line.145"></a>
+<span class="sourceLineNo">146</span>
checkFailure(FailurePhase.PHASE2);<a name="line.146"></a>
+<span class="sourceLineNo">147</span> player.setConf(getConf());<a
name="line.147"></a>
+<span class="sourceLineNo">148</span> int result =
player.run(playerArgs);<a name="line.148"></a>
+<span class="sourceLineNo">149</span> if (succeeded(result)) {<a
name="line.149"></a>
+<span class="sourceLineNo">150</span> // Add to processed table
list<a name="line.150"></a>
+<span class="sourceLineNo">151</span> processedTableList.add(new
Pair<>(tableNames[i], bulkOutputPath));<a name="line.151"></a>
+<span class="sourceLineNo">152</span> } else {<a name="line.152"></a>
+<span class="sourceLineNo">153</span> throw new IOException("Can
not merge backup images for " + dirs<a name="line.153"></a>
+<span class="sourceLineNo">154</span> + " (check Hadoop/MR and
HBase logs). Player return code =" + result);<a name="line.154"></a>
+<span class="sourceLineNo">155</span> }<a name="line.155"></a>
+<span class="sourceLineNo">156</span> LOG.debug("Merge Job finished:"
+ result);<a name="line.156"></a>
+<span class="sourceLineNo">157</span> }<a name="line.157"></a>
+<span class="sourceLineNo">158</span> List<TableName> tableList =
toTableNameList(processedTableList);<a name="line.158"></a>
+<span class="sourceLineNo">159</span> // PHASE 3<a name="line.159"></a>
+<span class="sourceLineNo">160</span>
checkFailure(FailurePhase.PHASE3);<a name="line.160"></a>
+<span class="sourceLineNo">161</span>
table.updateProcessedTablesForMerge(tableList);<a name="line.161"></a>
+<span class="sourceLineNo">162</span> finishedTables = true;<a
name="line.162"></a>
+<span class="sourceLineNo">163</span><a name="line.163"></a>
+<span class="sourceLineNo">164</span> // (modification of a backup file
system)<a name="line.164"></a>
+<span class="sourceLineNo">165</span> // Move existing mergedBackupId
data into tmp directory<a name="line.165"></a>
+<span class="sourceLineNo">166</span> // we will need it later in case
of a failure<a name="line.166"></a>
+<span class="sourceLineNo">167</span> Path tmpBackupDir =
HBackupFileSystem.getBackupTmpDirPathForBackupId(backupRoot,<a
name="line.167"></a>
+<span class="sourceLineNo">168</span> mergedBackupId);<a
name="line.168"></a>
+<span class="sourceLineNo">169</span> Path backupDirPath =
HBackupFileSystem.getBackupPath(backupRoot, mergedBackupId);<a
name="line.169"></a>
+<span class="sourceLineNo">170</span> if (!fs.rename(backupDirPath,
tmpBackupDir)) {<a name="line.170"></a>
+<span class="sourceLineNo">171</span> throw new IOException("Failed
to rename "+ backupDirPath +" to "+tmpBackupDir);<a name="line.171"></a>
+<span class="sourceLineNo">172</span> } else {<a name="line.172"></a>
+<span class="sourceLineNo">173</span> LOG.debug("Renamed "+
backupDirPath +" to "+ tmpBackupDir);<a name="line.173"></a>
+<span class="sourceLineNo">174</span> }<a name="line.174"></a>
+<span class="sourceLineNo">175</span> // Move new data into backup
dest<a name="line.175"></a>
+<span class="sourceLineNo">176</span> for (Pair<TableName, Path>
tn : processedTableList) {<a name="line.176"></a>
+<span class="sourceLineNo">177</span> moveData(fs, backupRoot,
tn.getSecond(), tn.getFirst(), mergedBackupId);<a name="line.177"></a>
+<span class="sourceLineNo">178</span> }<a name="line.178"></a>
+<span class="sourceLineNo">179</span>
checkFailure(FailurePhase.PHASE4);<a name="line.179"></a>
+<span class="sourceLineNo">180</span> // Update backup manifest<a
name="line.180"></a>
+<span class="sourceLineNo">181</span> List<String>
backupsToDelete = getBackupIdsToDelete(backupIds, mergedBackupId);<a
name="line.181"></a>
+<span class="sourceLineNo">182</span>
updateBackupManifest(tmpBackupDir.getParent().toString(), mergedBackupId,
backupsToDelete);<a name="line.182"></a>
+<span class="sourceLineNo">183</span> // Copy meta files back from tmp
to backup dir<a name="line.183"></a>
+<span class="sourceLineNo">184</span> copyMetaData(fs, tmpBackupDir,
backupDirPath);<a name="line.184"></a>
+<span class="sourceLineNo">185</span> // Delete tmp dir (Rename back
during repair)<a name="line.185"></a>
+<span class="sourceLineNo">186</span> if (!fs.delete(tmpBackupDir,
true)) {<a name="line.186"></a>
+<span class="sourceLineNo">187</span> // WARN and ignore<a
name="line.187"></a>
+<span class="sourceLineNo">188</span> LOG.warn("Could not delete tmp
dir: "+ tmpBackupDir);<a name="line.188"></a>
+<span class="sourceLineNo">189</span> }<a name="line.189"></a>
+<span class="sourceLineNo">190</span> // Delete old data<a
name="line.190"></a>
+<span class="sourceLineNo">191</span>
deleteBackupImages(backupsToDelete, conn, fs, backupRoot);<a
name="line.191"></a>
+<span class="sourceLineNo">192</span> // Finish merge session<a
name="line.192"></a>
+<span class="sourceLineNo">193</span> table.finishMergeOperation();<a
name="line.193"></a>
+<span class="sourceLineNo">194</span> // Release lock<a
name="line.194"></a>
+<span class="sourceLineNo">195</span>
table.finishBackupExclusiveOperation();<a name="line.195"></a>
+<span class="sourceLineNo">196</span> } catch (RuntimeException e) {<a
name="line.196"></a>
+<span class="sourceLineNo">197</span> throw e;<a name="line.197"></a>
+<span class="sourceLineNo">198</span> } catch (Exception e) {<a
name="line.198"></a>
+<span class="sourceLineNo">199</span> LOG.error(e.toString(), e);<a
name="line.199"></a>
+<span class="sourceLineNo">200</span> if (!finishedTables) {<a
name="line.200"></a>
+<span class="sourceLineNo">201</span> // cleanup bulk directories and
finish merge<a name="line.201"></a>
+<span class="sourceLineNo">202</span> // merge MUST be repeated (no
need for repair)<a name="line.202"></a>
+<span class="sourceLineNo">203</span> cleanupBulkLoadDirs(fs,
toPathList(processedTableList));<a name="line.203"></a>
+<span class="sourceLineNo">204</span> table.finishMergeOperation();<a
name="line.204"></a>
+<span class="sourceLineNo">205</span>
table.finishBackupExclusiveOperation();<a name="line.205"></a>
+<span class="sourceLineNo">206</span> throw new IOException("Backup
merge operation failed, you should try it again", e);<a name="line.206"></a>
+<span class="sourceLineNo">207</span> } else {<a name="line.207"></a>
+<span class="sourceLineNo">208</span> // backup repair must be run<a
name="line.208"></a>
+<span class="sourceLineNo">209</span> throw new IOException(<a
name="line.209"></a>
+<span class="sourceLineNo">210</span> "Backup merge operation
failed, run backup repair tool to restore system's integrity",<a
name="line.210"></a>
+<span class="sourceLineNo">211</span> e);<a name="line.211"></a>
+<span class="sourceLineNo">212</span> }<a name="line.212"></a>
+<span class="sourceLineNo">213</span> } finally {<a name="line.213"></a>
+<span class="sourceLineNo">214</span> table.close();<a
name="line.214"></a>
+<span class="sourceLineNo">215</span> conn.close();<a
name="line.215"></a>
+<span class="sourceLineNo">216</span> }<a name="line.216"></a>
+<span class="sourceLineNo">217</span> }<a name="line.217"></a>
+<span class="sourceLineNo">218</span><a name="line.218"></a>
+<span class="sourceLineNo">219</span> private void
checkFailure(FailurePhase phase) throws IOException {<a name="line.219"></a>
+<span class="sourceLineNo">220</span> if (failurePhase != null &&
failurePhase == phase) {<a name="line.220"></a>
+<span class="sourceLineNo">221</span> throw new
IOException(phase.toString());<a name="line.221"></a>
+<span class="sourceLineNo">222</span> }<a name="line.222"></a>
+<span class="sourceLineNo">223</span> }<a name="line.223"></a>
+<span class="sourceLineNo">224</span> }<a name="line.224"></a>
<span class="sourceLineNo">225</span><a name="line.225"></a>
-<span class="sourceLineNo">226</span> // #2 - insert some data to table1<a
name="line.226"></a>
-<span class="sourceLineNo">227</span> HTable t1 = insertIntoTable(conn,
table1, famName, 1, ADD_ROWS);<a name="line.227"></a>
-<span class="sourceLineNo">228</span> LOG.debug("writing " + ADD_ROWS + "
rows to " + table1);<a name="line.228"></a>
-<span class="sourceLineNo">229</span><a name="line.229"></a>
-<span class="sourceLineNo">230</span>
Assert.assertEquals(TEST_UTIL.countRows(t1), NB_ROWS_IN_BATCH + ADD_ROWS);<a
name="line.230"></a>
-<span class="sourceLineNo">231</span> t1.close();<a name="line.231"></a>
-<span class="sourceLineNo">232</span> LOG.debug("written " + ADD_ROWS + "
rows to " + table1);<a name="line.232"></a>
-<span class="sourceLineNo">233</span><a name="line.233"></a>
-<span class="sourceLineNo">234</span> HTable t2 = insertIntoTable(conn,
table2, famName, 1, ADD_ROWS);<a name="line.234"></a>
-<span class="sourceLineNo">235</span><a name="line.235"></a>
-<span class="sourceLineNo">236</span>
Assert.assertEquals(TEST_UTIL.countRows(t2), NB_ROWS_IN_BATCH + ADD_ROWS);<a
name="line.236"></a>
-<span class="sourceLineNo">237</span> t2.close();<a name="line.237"></a>
-<span class="sourceLineNo">238</span> LOG.debug("written " + ADD_ROWS + "
rows to " + table2);<a name="line.238"></a>
-<span class="sourceLineNo">239</span><a name="line.239"></a>
-<span class="sourceLineNo">240</span> // #3 - incremental backup for
multiple tables<a name="line.240"></a>
-<span class="sourceLineNo">241</span> tables = Lists.newArrayList(table1,
table2);<a name="line.241"></a>
-<span class="sourceLineNo">242</span> request =
createBackupRequest(BackupType.INCREMENTAL, tables, BACKUP_ROOT_DIR);<a
name="line.242"></a>
-<span class="sourceLineNo">243</span> String backupIdIncMultiple =
client.backupTables(request);<a name="line.243"></a>
+<span class="sourceLineNo">226</span> @Test<a name="line.226"></a>
+<span class="sourceLineNo">227</span> public void TestIncBackupMergeRestore()
throws Exception {<a name="line.227"></a>
+<span class="sourceLineNo">228</span> int ADD_ROWS = 99;<a
name="line.228"></a>
+<span class="sourceLineNo">229</span> // #1 - create full backup for all
tables<a name="line.229"></a>
+<span class="sourceLineNo">230</span> LOG.info("create full backup image
for all tables");<a name="line.230"></a>
+<span class="sourceLineNo">231</span><a name="line.231"></a>
+<span class="sourceLineNo">232</span> List<TableName> tables =
Lists.newArrayList(table1, table2);<a name="line.232"></a>
+<span class="sourceLineNo">233</span> // Set custom Merge Job
implementation<a name="line.233"></a>
+<span class="sourceLineNo">234</span>
conf1.setClass(BackupRestoreFactory.HBASE_BACKUP_MERGE_IMPL_CLASS,<a
name="line.234"></a>
+<span class="sourceLineNo">235</span> BackupMergeJobWithFailures.class,
BackupMergeJob.class);<a name="line.235"></a>
+<span class="sourceLineNo">236</span><a name="line.236"></a>
+<span class="sourceLineNo">237</span> Connection conn =
ConnectionFactory.createConnection(conf1);<a name="line.237"></a>
+<span class="sourceLineNo">238</span><a name="line.238"></a>
+<span class="sourceLineNo">239</span> HBaseAdmin admin = (HBaseAdmin)
conn.getAdmin();<a name="line.239"></a>
+<span class="sourceLineNo">240</span> BackupAdminImpl client = new
BackupAdminImpl(conn);<a name="line.240"></a>
+<span class="sourceLineNo">241</span><a name="line.241"></a>
+<span class="sourceLineNo">242</span> BackupRequest request =
createBackupRequest(BackupType.FULL, tables, BACKUP_ROOT_DIR);<a
name="line.242"></a>
+<span class="sourceLineNo">243</span> String backupIdFull =
client.backupTables(request);<a name="line.243"></a>
<span class="sourceLineNo">244</span><a name="line.244"></a>
-<span class="sourceLineNo">245</span>
assertTrue(checkSucceeded(backupIdIncMultiple));<a name="line.245"></a>
+<span class="sourceLineNo">245</span>
assertTrue(checkSucceeded(backupIdFull));<a name="line.245"></a>
<span class="sourceLineNo">246</span><a name="line.246"></a>
-<span class="sourceLineNo">247</span> t1 = insertIntoTable(conn, table1,
famName, 2, ADD_ROWS);<a name="line.247"></a>
-<span class="sourceLineNo">248</span> t1.close();<a name="line.248"></a>
-<span class="sourceLineNo">249</span><a name="line.249"></a>
-<span class="sourceLineNo">250</span> t2 = insertIntoTable(conn, table2,
famName, 2, ADD_ROWS);<a name="line.250"></a>
-<span class="sourceLineNo">251</span> t2.close();<a name="line.251"></a>
-<span class="sourceLineNo">252</span><a name="line.252"></a>
-<span class="sourceLineNo">253</span> // #3 - incremental backup for
multiple tables<a name="line.253"></a>
-<span class="sourceLineNo">254</span> request =
createBackupRequest(BackupType.INCREMENTAL, tables, BACKUP_ROOT_DIR);<a
name="line.254"></a>
-<span class="sourceLineNo">255</span> String backupIdIncMultiple2 =
client.backupTables(request);<a name="line.255"></a>
-<span class="sourceLineNo">256</span>
assertTrue(checkSucceeded(backupIdIncMultiple2));<a name="line.256"></a>
-<span class="sourceLineNo">257</span> // #4 Merge backup images with
failures<a name="line.257"></a>
-<span class="sourceLineNo">258</span><a name="line.258"></a>
-<span class="sourceLineNo">259</span> for (FailurePhase phase :
FailurePhase.values()) {<a name="line.259"></a>
-<span class="sourceLineNo">260</span> Configuration conf =
conn.getConfiguration();<a name="line.260"></a>
-<span class="sourceLineNo">261</span><a name="line.261"></a>
-<span class="sourceLineNo">262</span> conf.set(FAILURE_PHASE_KEY,
phase.toString());<a name="line.262"></a>
-<span class="sourceLineNo">263</span><a name="line.263"></a>
-<span class="sourceLineNo">264</span> try (BackupAdmin bAdmin = new
BackupAdminImpl(conn)) {<a name="line.264"></a>
-<span class="sourceLineNo">265</span> String[] backups = new String[] {
backupIdIncMultiple, backupIdIncMultiple2 };<a name="line.265"></a>
-<span class="sourceLineNo">266</span> bAdmin.mergeBackups(backups);<a
name="line.266"></a>
-<span class="sourceLineNo">267</span> Assert.fail("Expected
IOException");<a name="line.267"></a>
-<span class="sourceLineNo">268</span> } catch (IOException e) {<a
name="line.268"></a>
-<span class="sourceLineNo">269</span> BackupSystemTable table = new
BackupSystemTable(conn);<a name="line.269"></a>
-<span class="sourceLineNo">270</span> if(phase.ordinal() <
FailurePhase.PHASE4.ordinal()) {<a name="line.270"></a>
-<span class="sourceLineNo">271</span> // No need to repair:<a
name="line.271"></a>
-<span class="sourceLineNo">272</span> // Both Merge and backup
exclusive operations are finished<a name="line.272"></a>
-<span class="sourceLineNo">273</span>
assertFalse(table.isMergeInProgress());<a name="line.273"></a>
-<span class="sourceLineNo">274</span> try {<a name="line.274"></a>
-<span class="sourceLineNo">275</span>
table.finishBackupExclusiveOperation();<a name="line.275"></a>
-<span class="sourceLineNo">276</span> Assert.fail("IOException is
expected");<a name="line.276"></a>
-<span class="sourceLineNo">277</span> } catch(IOException ee) {<a
name="line.277"></a>
-<span class="sourceLineNo">278</span> // Expected<a
name="line.278"></a>
-<span class="sourceLineNo">279</span> }<a name="line.279"></a>
-<span class="sourceLineNo">280</span> } else {<a name="line.280"></a>
-<span class="sourceLineNo">281</span> // Repair is required<a
name="line.281"></a>
-<span class="sourceLineNo">282</span>
assertTrue(table.isMergeInProgress());<a name="line.282"></a>
-<span class="sourceLineNo">283</span> try {<a name="line.283"></a>
-<span class="sourceLineNo">284</span>
table.startBackupExclusiveOperation();<a name="line.284"></a>
-<span class="sourceLineNo">285</span> Assert.fail("IOException is
expected");<a name="line.285"></a>
-<span class="sourceLineNo">286</span> } catch(IOException ee) {<a
name="line.286"></a>
-<span class="sourceLineNo">287</span> // Expected - clean up before
proceeding<a name="line.287"></a>
-<span class="sourceLineNo">288</span>
table.finishMergeOperation();<a name="line.288"></a>
-<span class="sourceLineNo">289</span>
table.finishBackupExclusiveOperation();<a name="line.289"></a>
-<span class="sourceLineNo">290</span> }<a name="line.290"></a>
-<span class="sourceLineNo">291</span> }<a name="line.291"></a>
-<span class="sourceLineNo">292</span> table.close();<a
name="line.292"></a>
-<span class="sourceLineNo">293</span> LOG.debug("Expected :"+
e.getMessage());<a name="line.293"></a>
-<span class="sourceLineNo">294</span> }<a name="line.294"></a>
-<span class="sourceLineNo">295</span> }<a name="line.295"></a>
-<span class="sourceLineNo">296</span> // Now merge w/o failures<a
name="line.296"></a>
-<span class="sourceLineNo">297</span> Configuration conf =
conn.getConfiguration();<a name="line.297"></a>
-<span class="sourceLineNo">298</span> conf.unset(FAILURE_PHASE_KEY);<a
name="line.298"></a>
-<span class="sourceLineNo">299</span>
conf.unset(BackupRestoreFactory.HBASE_BACKUP_MERGE_IMPL_CLASS);<a
name="line.299"></a>
-<span class="sourceLineNo">300</span><a name="line.300"></a>
-<span class="sourceLineNo">301</span> try (BackupAdmin bAdmin = new
BackupAdminImpl(conn)) {<a name="line.301"></a>
-<span class="sourceLineNo">302</span> String[] backups = new String[] {
backupIdIncMultiple, backupIdIncMultiple2 };<a name="line.302"></a>
-<span class="sourceLineNo">303</span> bAdmin.mergeBackups(backups);<a
name="line.303"></a>
-<span class="sourceLineNo">304</span> }<a name="line.304"></a>
-<span class="sourceLineNo">305</span><a name="line.305"></a>
-<span class="sourceLineNo">306</span> // #6 - restore incremental backup
for multiple tables, with overwrite<a name="line.306"></a>
-<span class="sourceLineNo">307</span> TableName[] tablesRestoreIncMultiple
= new TableName[] { table1, table2 };<a name="line.307"></a>
-<span class="sourceLineNo">308</span> TableName[] tablesMapIncMultiple =
new TableName[] { table1_restore, table2_restore };<a name="line.308"></a>
-<span class="sourceLineNo">309</span>
client.restore(BackupUtils.createRestoreRequest(BACKUP_ROOT_DIR,
backupIdIncMultiple2, false,<a name="line.309"></a>
-<span class="sourceLineNo">310</span> tablesRestoreIncMultiple,
tablesMapIncMultiple, true));<a name="line.310"></a>
-<span class="sourceLineNo">311</span><a name="line.311"></a>
-<span class="sourceLineNo">312</span> Table hTable =
conn.getTable(table1_restore);<a name="line.312"></a>
-<span class="sourceLineNo">313</span> LOG.debug("After incremental restore:
" + hTable.getTableDescriptor());<a name="line.313"></a>
-<span class="sourceLineNo">314</span> LOG.debug("f1 has " +
TEST_UTIL.countRows(hTable, famName) + " rows");<a name="line.314"></a>
-<span class="sourceLineNo">315</span>
Assert.assertEquals(TEST_UTIL.countRows(hTable, famName), NB_ROWS_IN_BATCH + 2
* ADD_ROWS);<a name="line.315"></a>
-<span class="sourceLineNo">316</span><a name="line.316"></a>
-<span class="sourceLineNo">317</span> hTable.close();<a name="line.317"></a>
-<span class="sourceLineNo">318</span><a name="line.318"></a>
-<span class="sourceLineNo">319</span> hTable =
conn.getTable(table2_restore);<a name="line.319"></a>
-<span class="sourceLineNo">320</span>
Assert.assertEquals(TEST_UTIL.countRows(hTable), NB_ROWS_IN_BATCH + 2 *
ADD_ROWS);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> hTable.close();<a name="line.321"></a>
-<span class="sourceLineNo">322</span><a name="line.322"></a>
-<span class="sourceLineNo">323</span> admin.close();<a name="line.323"></a>
-<span class="sourceLineNo">324</span> conn.close();<a name="line.324"></a>
-<span class="sourceLineNo">325</span> }<a name="line.325"></a>
-<span class="sourceLineNo">326</span>}<a name="line.326"></a>
+<span class="sourceLineNo">247</span> // #2 - insert some data to table1<a
name="line.247"></a>
+<span class="sourceLineNo">248</span> HTable t1 = insertIntoTable(conn,
table1, famName, 1, ADD_ROWS);<a name="line.248"></a>
+<span class="sourceLineNo">249</span> LOG.debug("writing " + ADD_ROWS + "
rows to " + table1);<a name="line.249"></a>
+<span class="sourceLineNo">250</span><a name="line.250"></a>
+<span class="sourceLineNo">251</span>
Assert.assertEquals(TEST_UTIL.countRows(t1), NB_ROWS_IN_BATCH + ADD_ROWS);<a
name="line.251"></a>
+<span class="sourceLineNo">252</span> t1.close();<a name="line.252"></a>
+<span class="sourceLineNo">253</span> LOG.debug("written " + ADD_ROWS + "
rows to " + table1);<a name="line.253"></a>
+<span class="sourceLineNo">254</span><a name="line.254"></a>
+<span class="sourceLineNo">255</span> HTable t2 = insertIntoTable(conn,
table2, famName, 1, ADD_ROWS);<a name="line.255"></a>
+<span class="sourceLineNo">256</span><a name="line.256"></a>
+<span class="sourceLineNo">257</span>
Assert.assertEquals(TEST_UTIL.countRows(t2), NB_ROWS_IN_BATCH + ADD_ROWS);<a
name="line.257"></a>
+<span class="sourceLineNo">258</span> t2.close();<a name="line.258"></a>
+<span class="sourceLineNo">259</span> LOG.debug("written " + ADD_ROWS + "
rows to " + table2);<a name="line.259"></a>
+<span class="sourceLineNo">260</span><a name="line.260"></a>
+<span class="sourceLineNo">261</span> // #3 - incremental backup for
multiple tables<a name="line.261"></a>
+<span class="sourceLineNo">262</span> tables = Lists.newArrayList(table1,
table2);<a name="line.262"></a>
+<span class="sourceLineNo">263</span> request =
createBackupRequest(BackupType.INCREMENTAL, tables, BACKUP_ROOT_DIR);<a
name="line.263"></a>
+<span class="sourceLineNo">264</span> String backupIdIncMultiple =
client.backupTables(request);<a name="line.264"></a>
+<span class="sourceLineNo">265</span><a name="line.265"></a>
+<span class="sourceLineNo">266</span>
assertTrue(checkSucceeded(backupIdIncMultiple));<a name="line.266"></a>
+<span class="sourceLineNo">267</span><a name="line.267"></a>
+<span class="sourceLineNo">268</span> t1 = insertIntoTable(conn, table1,
famName, 2, ADD_ROWS);<a name="line.268"></a>
+<span class="sourceLineNo">269</span> t1.close();<a name="line.269"></a>
+<span class="sourceLineNo">270</span><a name="line.270"></a>
+<span class="sourceLineNo">271</span> t2 = insertIntoTable(conn, table2,
famName, 2, ADD_ROWS);<a name="line.271"></a>
+<span class="sourceLineNo">272</span> t2.close();<a name="line.272"></a>
+<span class="sourceLineNo">273</span><a name="line.273"></a>
+<span class="sourceLineNo">274</span> // #3 - incremental backup for
multiple tables<a name="line.274"></a>
+<span class="sourceLineNo">275</span> request =
createBackupRequest(BackupType.INCREMENTAL, tables, BACKUP_ROOT_DIR);<a
name="line.275"></a>
+<span class="sourceLineNo">276</span> String backupIdIncMultiple2 =
client.backupTables(request);<a name="line.276"></a>
+<span class="sourceLineNo">277</span>
assertTrue(checkSucceeded(backupIdIncMultiple2));<a name="line.277"></a>
+<span class="sourceLineNo">278</span> // #4 Merge backup images with
failures<a name="line.278"></a>
+<span class="sourceLineNo">279</span><a name="line.279"></a>
+<span class="sourceLineNo">280</span> for (FailurePhase phase :
FailurePhase.values()) {<a name="line.280"></a>
+<span class="sourceLineNo">281</span> Configuration conf =
conn.getConfiguration();<a name="line.281"></a>
+<span class="sourceLineNo">282</span><a name="line.282"></a>
+<span class="sourceLineNo">283</span> conf.set(FAILURE_PHASE_KEY,
phase.toString());<a name="line.283"></a>
+<span class="sourceLineNo">284</span><a name="line.284"></a>
+<span class="sourceLineNo">285</span> try (BackupAdmin bAdmin = new
BackupAdminImpl(conn)) {<a name="line.285"></a>
+<span class="sourceLineNo">286</span> String[] backups = new String[] {
backupIdIncMultiple, backupIdIncMultiple2 };<a name="line.286"></a>
+<span class="sourceLineNo">287</span> bAdmin.mergeBackups(backups);<a
name="line.287"></a>
+<span class="sourceLineNo">288</span> Assert.fail("Expected
IOException");<a name="line.288"></a>
+<span class="sourceLineNo">289</span> } catch (IOException e) {<a
name="line.289"></a>
+<span class="sourceLineNo">290</span> BackupSystemTable table = new
BackupSystemTable(conn);<a name="line.290"></a>
+<span class="sourceLineNo">291</span> if(phase.ordinal() <
FailurePhase.PHASE4.ordinal()) {<a name="line.291"></a>
+<span class="sourceLineNo">292</span> // No need to repair:<a
name="line.292"></a>
+<span class="sourceLineNo">293</span> // Both Merge and backup
exclusive operations are finished<a name="line.293"></a>
+<span class="sourceLineNo">294</span>
assertFalse(table.isMergeInProgress());<a name="line.294"></a>
+<span class="sourceLineNo">295</span> try {<a name="line.295"></a>
+<span class="sourceLineNo">296</span>
table.finishBackupExclusiveOperation();<a name="line.296"></a>
+<span class="sourceLineNo">297</span> Assert.fail("IOException is
expected");<a name="line.297"></a>
+<span class="sourceLineNo">298</span> } catch(IOException ee) {<a
name="line.298"></a>
+<span class="sourceLineNo">299</span> // Expected<a
name="line.299"></a>
+<span class="sourceLineNo">300</span> }<a name="line.300"></a>
+<span class="sourceLineNo">301</span> } else {<a name="line.301"></a>
+<span class="sourceLineNo">302</span> // Repair is required<a
name="line.302"></a>
+<span class="sourceLineNo">303</span>
assertTrue(table.isMergeInProgress());<a name="line.303"></a>
+<span class="sourceLineNo">304</span> try {<a name="line.304"></a>
+<span class="sourceLineNo">305</span>
table.startBackupExclusiveOperation();<a name="line.305"></a>
+<span class="sourceLineNo">306</span> Assert.fail("IOException is
expected");<a name="line.306"></a>
+<span class="sourceLineNo">307</span> } catch(IOException ee) {<a
name="line.307"></a>
+<span class="sourceLineNo">308</span> // Expected - clean up before
proceeding<a name="line.308"></a>
+<span class="sourceLineNo">309</span>
//table.finishMergeOperation();<a name="line.309"></a>
+<span class="sourceLineNo">310</span>
//table.finishBackupExclusiveOperation();<a name="line.310"></a>
+<span class="sourceLineNo">311</span> }<a name="line.311"></a>
+<span class="sourceLineNo">312</span> }<a name="line.312"></a>
+<span class="sourceLineNo">313</span> table.close();<a
name="line.313"></a>
+<span class="sourceLineNo">314</span> LOG.debug("Expected :"+
e.getMessage());<a name="line.314"></a>
+<span class="sourceLineNo">315</span> }<a name="line.315"></a>
+<span class="sourceLineNo">316</span> }<a name="line.316"></a>
+<span class="sourceLineNo">317</span> // Now merge w/o failures<a
name="line.317"></a>
+<span class="sourceLineNo">318</span> Configuration conf =
conn.getConfiguration();<a name="line.318"></a>
+<span class="sourceLineNo">319</span> conf.unset(FAILURE_PHASE_KEY);<a
name="line.319"></a>
+<span class="sourceLineNo">320</span>
conf.unset(BackupRestoreFactory.HBASE_BACKUP_MERGE_IMPL_CLASS);<a
name="line.320"></a>
+<span class="sourceLineNo">321</span> // Now run repair<a
name="line.321"></a>
+<span class="sourceLineNo">322</span> BackupSystemTable sysTable = new
BackupSystemTable(conn);<a name="line.322"></a>
+<span class="sourceLineNo">323</span>
BackupCommands.RepairCommand.repairFailedBackupMergeIfAny(conn, sysTable);<a
name="line.323"></a>
+<span class="sourceLineNo">324</span> // Now repeat merge<a
name="line.324"></a>
+<span class="sourceLineNo">325</span> try (BackupAdmin bAdmin = new
BackupAdminImpl(conn)) {<a name="line.325"></a>
+<span class="sourceLineNo">326</span> String[] backups = new String[] {
backupIdIncMultiple, backupIdIncMultiple2 };<a name="line.326"></a>
+<span class="sourceLineNo">327</span> bAdmin.mergeBackups(backups);<a
name="line.327"></a>
+<span class="sourceLineNo">328</span> }<a name="line.328"></a>
+<span class="sourceLineNo">329</span><a name="line.329"></a>
+<span class="sourceLineNo">330</span> // #6 - restore incremental backup
for multiple tables, with overwrite<a name="line.330"></a>
+<span class="sourceLineNo">331</span> TableName[] tablesRestoreIncMultiple
= new TableName[] { table1, table2 };<a name="line.331"></a>
+<span class="sourceLineNo">332</span> TableName[] tablesMapIncMultiple =
new TableName[] { table1_restore, table2_restore };<a name="line.332"></a>
+<span class="sourceLineNo">333</span>
client.restore(BackupUtils.createRestoreRequest(BACKUP_ROOT_DIR,
backupIdIncMultiple2, false,<a name="line.333"></a>
+<span class="sourceLineNo">334</span> tablesRestoreIncMultiple,
tablesMapIncMultiple, true));<a name="line.334"></a>
+<span class="sourceLineNo">335</span><a name="line.335"></a>
+<span class="sourceLineNo">336</span> Table hTable =
conn.getTable(table1_restore);<a name="line.336"></a>
+<span class="sourceLineNo">337</span> LOG.debug("After incremental restore:
" + hTable.getTableDescriptor());<a name="line.337"></a>
+<span class="sourceLineNo">338</span> LOG.debug("f1 has " +
TEST_UTIL.countRows(hTable, famName) + " rows");<a name="line.338"></a>
+<span class="sourceLineNo">339</span>
Assert.assertEquals(TEST_UTIL.countRows(hTable, famName), NB_ROWS_IN_BATCH + 2
* ADD_ROWS);<a name="line.339"></a>
+<span class="sourceLineNo">340</span><a name="line.340"></a>
+<span class="sourceLineNo">341</span> hTable.close();<a name="line.341"></a>
+<span class="sourceLineNo">342</span><a name="line.342"></a>
+<span class="sourceLineNo">343</span> hTable =
conn.getTable(table2_restore);<a name="line.343"></a>
+<span class="sourceLineNo">344</span>
Assert.assertEquals(TEST_UTIL.countRows(hTable), NB_ROWS_IN_BATCH + 2 *
ADD_ROWS);<a name="line.344"></a>
+<span class="sourceLineNo">345</span> hTable.close();<a name="line.345"></a>
+<span class="sourceLineNo">346</span><a name="line.346"></a>
+<span class="sourceLineNo">347</span> admin.close();<a name="line.347"></a>
+<span class="sourceLineNo">348</span> conn.close();<a name="line.348"></a>
+<span class="sourceLineNo">349</span> }<a name="line.349"></a>
+<span class="sourceLineNo">350</span>}<a name="line.350"></a>
