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

HBASE-9160 TestNamespaceUpgrade fails on hadoop 2.1 due to existence of .snapshot directory in tar ball 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1513733 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2013-08-14 06:10:20 +00:00
parent ebd989116c
commit 1f30fd6f46
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hbase-server/src/test/java/org/apache/hadoop/hbase/migration/TestNamespaceUpgrade.java
View File

@ -103,10 +103,18 @@ public class TestNamespaceUpgrade {
// mkdir at first // mkdir at first
fs.mkdirs(hbaseRootDir.getParent()); fs.mkdirs(hbaseRootDir.getParent());
} }
if(org.apache.hadoop.util.VersionInfo.getVersion().startsWith("2.")) {
LOG.info("Hadoop version is 2.x, pre-migrating snapshot dir");
FileSystem localFS = FileSystem.getLocal(conf);
if(!localFS.rename(new Path(untar.toString(), HConstants.OLD_SNAPSHOT_DIR_NAME),
new Path(untar.toString(), HConstants.SNAPSHOT_DIR_NAME))) {
throw new IllegalStateException("Failed to move snapshot dir to 2.x expectation");
}
}
doFsCommand(shell, doFsCommand(shell,
new String [] {"-put", untar.toURI().toString(), hbaseRootDir.toString()}); new String [] {"-put", untar.toURI().toString(), hbaseRootDir.toString()});
// See whats in minihdfs.
doFsCommand(shell, new String [] {"-lsr", "/"}); doFsCommand(shell, new String [] {"-lsr", "/"});
// See whats in minihdfs.
Configuration toolConf = TEST_UTIL.getConfiguration(); Configuration toolConf = TEST_UTIL.getConfiguration();
conf.set(HConstants.HBASE_DIR, TEST_UTIL.getDefaultRootDirPath().toString()); conf.set(HConstants.HBASE_DIR, TEST_UTIL.getDefaultRootDirPath().toString());
ToolRunner.run(toolConf, new NamespaceUpgrade(), new String[]{"--upgrade"}); ToolRunner.run(toolConf, new NamespaceUpgrade(), new String[]{"--upgrade"});