You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2014/02/24 06:09:32 UTC
svn commit: r1571143 -
/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java
Author: larsh
Date: Mon Feb 24 05:09:32 2014
New Revision: 1571143
URL: http://svn.apache.org/r1571143
Log:
HBASE-10594 Speed up TestRestoreSnapshotFromClient a bit.
Modified:
hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java
Modified: hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java?rev=1571143&r1=1571142&r2=1571143&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java (original)
+++ hbase/branches/0.96/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java Mon Feb 24 05:09:32 2014
@@ -124,13 +124,6 @@ public class TestRestoreSnapshotFromClie
admin.enableTable(tableName);
SnapshotTestingUtils.loadData(TEST_UTIL, table, 500, FAMILY);
snapshot1Rows = TEST_UTIL.countRows(table);
- admin.disableTable(tableName);
-
- // take a snapshot of the updated table
- admin.snapshot(snapshotName1, tableName);
-
- // re-enable table
- admin.enableTable(tableName);
table.close();
}
@@ -144,9 +137,9 @@ public class TestRestoreSnapshotFromClie
@Test
public void testRestoreSnapshot() throws IOException {
SnapshotTestingUtils.verifyRowCount(TEST_UTIL, tableName, snapshot1Rows);
-
- // Restore from snapshot-0
admin.disableTable(tableName);
+ admin.snapshot(snapshotName1, tableName);
+ // Restore from snapshot-0
admin.restoreSnapshot(snapshotName0);
admin.enableTable(tableName);
SnapshotTestingUtils.verifyRowCount(TEST_UTIL, tableName, snapshot0Rows);