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/01/13 15:32:00 UTC
[11/47] hbase-site git commit: Published site at .
http://git-wip-us.apache.org/repos/asf/hbase-site/blob/554d61c6/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupWithBulkLoad.html
----------------------------------------------------------------------
diff --git a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupWithBulkLoad.html b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupWithBulkLoad.html
index b9d20b3..4f3dda3 100644
--- a/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupWithBulkLoad.html
+++ b/testdevapidocs/src-html/org/apache/hadoop/hbase/backup/TestIncrementalBackupWithBulkLoad.html
@@ -121,35 +121,49 @@
<span class="sourceLineNo">113</span> request = createBackupRequest(BackupType.INCREMENTAL, tables, BACKUP_ROOT_DIR);<a name="line.113"></a>
<span class="sourceLineNo">114</span> String backupIdIncMultiple = client.backupTables(request);<a name="line.114"></a>
<span class="sourceLineNo">115</span> assertTrue(checkSucceeded(backupIdIncMultiple));<a name="line.115"></a>
-<span class="sourceLineNo">116</span><a name="line.116"></a>
-<span class="sourceLineNo">117</span> // #5.1 - check tables for full restore */<a name="line.117"></a>
-<span class="sourceLineNo">118</span> HBaseAdmin hAdmin = TEST_UTIL.getHBaseAdmin();<a name="line.118"></a>
-<span class="sourceLineNo">119</span><a name="line.119"></a>
-<span class="sourceLineNo">120</span> // #6 - restore incremental backup for table1<a name="line.120"></a>
-<span class="sourceLineNo">121</span> TableName[] tablesRestoreIncMultiple = new TableName[] { table1 };<a name="line.121"></a>
-<span class="sourceLineNo">122</span> TableName[] tablesMapIncMultiple = new TableName[] { table1_restore };<a name="line.122"></a>
-<span class="sourceLineNo">123</span> client.restore(BackupUtils.createRestoreRequest(BACKUP_ROOT_DIR, backupIdIncMultiple,<a name="line.123"></a>
-<span class="sourceLineNo">124</span> false, tablesRestoreIncMultiple, tablesMapIncMultiple, true));<a name="line.124"></a>
-<span class="sourceLineNo">125</span><a name="line.125"></a>
-<span class="sourceLineNo">126</span> HTable hTable = (HTable) conn.getTable(table1_restore);<a name="line.126"></a>
-<span class="sourceLineNo">127</span> Assert.assertEquals(TEST_UTIL.countRows(hTable), NB_ROWS_IN_BATCH * 2+actual);<a name="line.127"></a>
-<span class="sourceLineNo">128</span> request = createBackupRequest(BackupType.FULL, tables, BACKUP_ROOT_DIR);<a name="line.128"></a>
-<span class="sourceLineNo">129</span><a name="line.129"></a>
-<span class="sourceLineNo">130</span> backupIdFull = client.backupTables(request);<a name="line.130"></a>
-<span class="sourceLineNo">131</span> try (final BackupSystemTable table = new BackupSystemTable(conn)) {<a name="line.131"></a>
-<span class="sourceLineNo">132</span> Pair<Map<TableName, Map<String, Map<String, List<Pair<String, Boolean>>>>>, List<byte[]>> pair<a name="line.132"></a>
-<span class="sourceLineNo">133</span> = table.readBulkloadRows(tables);<a name="line.133"></a>
-<span class="sourceLineNo">134</span> assertTrue("map still has " + pair.getSecond().size() + " entries",<a name="line.134"></a>
-<span class="sourceLineNo">135</span> pair.getSecond().isEmpty());<a name="line.135"></a>
-<span class="sourceLineNo">136</span> }<a name="line.136"></a>
-<span class="sourceLineNo">137</span> assertTrue(checkSucceeded(backupIdFull));<a name="line.137"></a>
-<span class="sourceLineNo">138</span><a name="line.138"></a>
-<span class="sourceLineNo">139</span> hTable.close();<a name="line.139"></a>
-<span class="sourceLineNo">140</span> admin.close();<a name="line.140"></a>
-<span class="sourceLineNo">141</span> conn.close();<a name="line.141"></a>
-<span class="sourceLineNo">142</span> }<a name="line.142"></a>
+<span class="sourceLineNo">116</span> // #4 bulk load again<a name="line.116"></a>
+<span class="sourceLineNo">117</span> LOG.debug("bulk loading into " + testName);<a name="line.117"></a>
+<span class="sourceLineNo">118</span> int actual1 = TestLoadIncrementalHFiles.loadHFiles(testName, table1Desc, TEST_UTIL, famName,<a name="line.118"></a>
+<span class="sourceLineNo">119</span> qualName, false, null,<a name="line.119"></a>
+<span class="sourceLineNo">120</span> new byte[][][] { new byte[][] { Bytes.toBytes("ppp"), Bytes.toBytes("qqq") },<a name="line.120"></a>
+<span class="sourceLineNo">121</span> new byte[][] { Bytes.toBytes("rrr"), Bytes.toBytes("sss") }, },<a name="line.121"></a>
+<span class="sourceLineNo">122</span> true, false, true, NB_ROWS_IN_BATCH * 2 + actual, NB_ROWS2);<a name="line.122"></a>
+<span class="sourceLineNo">123</span><a name="line.123"></a>
+<span class="sourceLineNo">124</span> // #5 - incremental backup for table1<a name="line.124"></a>
+<span class="sourceLineNo">125</span> tables = Lists.newArrayList(table1);<a name="line.125"></a>
+<span class="sourceLineNo">126</span> request = createBackupRequest(BackupType.INCREMENTAL, tables, BACKUP_ROOT_DIR);<a name="line.126"></a>
+<span class="sourceLineNo">127</span> String backupIdIncMultiple1 = client.backupTables(request);<a name="line.127"></a>
+<span class="sourceLineNo">128</span> assertTrue(checkSucceeded(backupIdIncMultiple1));<a name="line.128"></a>
+<span class="sourceLineNo">129</span> // Delete all data in table1<a name="line.129"></a>
+<span class="sourceLineNo">130</span> TEST_UTIL.deleteTableData(table1);<a name="line.130"></a>
+<span class="sourceLineNo">131</span> // #5.1 - check tables for full restore */<a name="line.131"></a>
+<span class="sourceLineNo">132</span> HBaseAdmin hAdmin = TEST_UTIL.getHBaseAdmin();<a name="line.132"></a>
+<span class="sourceLineNo">133</span><a name="line.133"></a>
+<span class="sourceLineNo">134</span> // #6 - restore incremental backup for table1<a name="line.134"></a>
+<span class="sourceLineNo">135</span> TableName[] tablesRestoreIncMultiple = new TableName[] { table1 };<a name="line.135"></a>
+<span class="sourceLineNo">136</span> //TableName[] tablesMapIncMultiple = new TableName[] { table1_restore };<a name="line.136"></a>
+<span class="sourceLineNo">137</span> client.restore(BackupUtils.createRestoreRequest(BACKUP_ROOT_DIR, backupIdIncMultiple1,<a name="line.137"></a>
+<span class="sourceLineNo">138</span> false, tablesRestoreIncMultiple, tablesRestoreIncMultiple, true));<a name="line.138"></a>
+<span class="sourceLineNo">139</span><a name="line.139"></a>
+<span class="sourceLineNo">140</span> HTable hTable = (HTable) conn.getTable(table1);<a name="line.140"></a>
+<span class="sourceLineNo">141</span> Assert.assertEquals(TEST_UTIL.countRows(hTable), NB_ROWS_IN_BATCH * 2 + actual + actual1);<a name="line.141"></a>
+<span class="sourceLineNo">142</span> request = createBackupRequest(BackupType.FULL, tables, BACKUP_ROOT_DIR);<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">144</span> backupIdFull = client.backupTables(request);<a name="line.144"></a>
+<span class="sourceLineNo">145</span> try (final BackupSystemTable table = new BackupSystemTable(conn)) {<a name="line.145"></a>
+<span class="sourceLineNo">146</span> Pair<Map<TableName, Map<String, Map<String, List<Pair<String, Boolean>>>>>, List<byte[]>> pair<a name="line.146"></a>
+<span class="sourceLineNo">147</span> = table.readBulkloadRows(tables);<a name="line.147"></a>
+<span class="sourceLineNo">148</span> assertTrue("map still has " + pair.getSecond().size() + " entries",<a name="line.148"></a>
+<span class="sourceLineNo">149</span> pair.getSecond().isEmpty());<a name="line.149"></a>
+<span class="sourceLineNo">150</span> }<a name="line.150"></a>
+<span class="sourceLineNo">151</span> assertTrue(checkSucceeded(backupIdFull));<a name="line.151"></a>
+<span class="sourceLineNo">152</span><a name="line.152"></a>
+<span class="sourceLineNo">153</span> hTable.close();<a name="line.153"></a>
+<span class="sourceLineNo">154</span> admin.close();<a name="line.154"></a>
+<span class="sourceLineNo">155</span> conn.close();<a name="line.155"></a>
+<span class="sourceLineNo">156</span> }<a name="line.156"></a>
+<span class="sourceLineNo">157</span><a name="line.157"></a>
+<span class="sourceLineNo">158</span>}<a name="line.158"></a>