Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-7625 Remove duplicated logFSTree() from TestRestoreFlushSnapshotFromClient (Matteo Bertozzi) 

git-svn-id: https://svn.apache.org/repos/asf/hbase/branches/hbase-7290@1445856 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Hsieh 2013-02-13 19:01:56 +00:00
parent 6a25400409
commit 9c73385702
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreFlushSnapshotFromClient.java
View File

@ -32,6 +32,7 @@ import org.apache.hadoop.hbase.LargeTests;
import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.master.MasterFileSystem;
import org.apache.hadoop.hbase.master.snapshot.SnapshotManager; import org.apache.hadoop.hbase.master.snapshot.SnapshotManager;
import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;
import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Bytes;
@ -107,24 +108,24 @@ public class TestRestoreFlushSnapshotFromClient {
loadData(table, 500, FAMILY); loadData(table, 500, FAMILY);
snapshot0Rows = TEST_UTIL.countRows(table); snapshot0Rows = TEST_UTIL.countRows(table);
LOG.info("=== before snapshot with 500 rows"); LOG.info("=== before snapshot with 500 rows");
logFSTree(FSUtils.getRootDir(TEST_UTIL.getConfiguration())); logFSTree();
// take a snapshot // take a snapshot
admin.snapshot(Bytes.toString(snapshotName0), Bytes.toString(tableName), SnapshotDescription.Type.FLUSH); admin.snapshot(Bytes.toString(snapshotName0), Bytes.toString(tableName), SnapshotDescription.Type.FLUSH);
LOG.info("=== after snapshot with 500 rows"); LOG.info("=== after snapshot with 500 rows");
logFSTree(FSUtils.getRootDir(TEST_UTIL.getConfiguration())); logFSTree();
// insert more data // insert more data
loadData(table, 500, FAMILY); loadData(table, 500, FAMILY);
snapshot1Rows = TEST_UTIL.countRows(table); snapshot1Rows = TEST_UTIL.countRows(table);
LOG.info("=== before snapshot with 1000 rows"); LOG.info("=== before snapshot with 1000 rows");
logFSTree(FSUtils.getRootDir(TEST_UTIL.getConfiguration())); logFSTree();
// take a snapshot of the updated table // take a snapshot of the updated table
admin.snapshot(Bytes.toString(snapshotName1), Bytes.toString(tableName), SnapshotDescription.Type.FLUSH); admin.snapshot(Bytes.toString(snapshotName1), Bytes.toString(tableName), SnapshotDescription.Type.FLUSH);
LOG.info("=== after snapshot with 1000 rows"); LOG.info("=== after snapshot with 1000 rows");
logFSTree(FSUtils.getRootDir(TEST_UTIL.getConfiguration())); logFSTree();
} }
@After @After
@ -148,12 +149,12 @@ public class TestRestoreFlushSnapshotFromClient {
// Restore from snapshot-0 // Restore from snapshot-0
admin.disableTable(tableName); admin.disableTable(tableName);
admin.restoreSnapshot(snapshotName0); admin.restoreSnapshot(snapshotName0);
logFSTree(FSUtils.getRootDir(TEST_UTIL.getConfiguration())); logFSTree();
admin.enableTable(tableName); admin.enableTable(tableName);
table = new HTable(TEST_UTIL.getConfiguration(), tableName); table = new HTable(TEST_UTIL.getConfiguration(), tableName);
LOG.info("=== after restore with 500 row snapshot"); LOG.info("=== after restore with 500 row snapshot");
logFSTree(FSUtils.getRootDir(TEST_UTIL.getConfiguration())); logFSTree();
assertEquals(snapshot0Rows, TEST_UTIL.countRows(table)); assertEquals(snapshot0Rows, TEST_UTIL.countRows(table));
@ -240,19 +241,8 @@ public class TestRestoreFlushSnapshotFromClient {
table.flushCommits(); table.flushCommits();
} }
private void logFSTree(Path root) throws IOException { private void logFSTree() throws IOException {
LOG.debug("Current file system:"); MasterFileSystem mfs = TEST_UTIL.getMiniHBaseCluster().getMaster().getMasterFileSystem();
logFSTree(root, "|-"); FSUtils.logFileSystemState(mfs.getFileSystem(), mfs.getRootDir(), LOG);
}
private void logFSTree(Path root, String prefix) throws IOException {
for (FileStatus file : TEST_UTIL.getDFSCluster().getFileSystem().listStatus(root)) {
if (file.isDir()) {
LOG.debug(prefix + file.getPath().getName() + "/");
logFSTree(file.getPath(), prefix + "---");
} else {
LOG.debug(prefix + file.getPath().getName() + "\tsz=" + file.getLen());
}
}
} }
} }