svn commit: r1513734 - /hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/migration/TestNamespaceUpgrade.java

[st...@apache.org]

Author: stack
Date: Wed Aug 14 06:10:45 2013
New Revision: 1513734

URL: http://svn.apache.org/r1513734
Log:
HBASE-9160 TestNamespaceUpgrade fails on hadoop 2.1 due to existence of .snapshot directory in tar ball

Modified:
    hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/migration/TestNamespaceUpgrade.java

Modified: hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/migration/TestNamespaceUpgrade.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/migration/TestNamespaceUpgrade.java?rev=1513734&r1=1513733&r2=1513734&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/migration/TestNamespaceUpgrade.java (original)
+++ hbase/branches/0.95/hbase-server/src/test/java/org/apache/hadoop/hbase/migration/TestNamespaceUpgrade.java Wed Aug 14 06:10:45 2013
@@ -103,10 +103,18 @@ public class TestNamespaceUpgrade {
       // mkdir at first
       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,
       new String [] {"-put", untar.toURI().toString(), hbaseRootDir.toString()});
-    // See whats in minihdfs.
     doFsCommand(shell, new String [] {"-lsr", "/"});
+    // See whats in minihdfs.
     Configuration toolConf = TEST_UTIL.getConfiguration();
     conf.set(HConstants.HBASE_DIR, TEST_UTIL.getDefaultRootDirPath().toString());
     ToolRunner.run(toolConf, new NamespaceUpgrade(), new String[]{"--upgrade"});