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

HBASE-9957 [WINDOWS] TestNamespaceUpgrade fails on windows 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1541197 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Enis Soztutar 2013-11-12 19:02:57 +00:00
parent 2d81ab63f1
commit 7f28831af2
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hbase-server/src/main/java/org/apache/hadoop/hbase/migration/NamespaceUpgrade.java
View File

@ -86,7 +86,7 @@ public class NamespaceUpgrade implements Tool {
private static final String DOT_SPLITLOG = "splitlog";
private static final String DOT_ARCHIVE = ".archive";
// The old default directory of hbase.dynamic.jars.dir(0.94.12 release).
// The old default directory of hbase.dynamic.jars.dir(0.94.12 release).
private static final String DOT_LIB_DIR = ".lib";
private static final String OLD_ACL = "_acl_";
@ -233,7 +233,7 @@ public class NamespaceUpgrade implements Tool {
* @throws IOException
*/
public void migrateTables() throws IOException {
List<String> sysTables = Lists.newArrayList("-ROOT-",".META.");
List<String> sysTables = Lists.newArrayList("-ROOT-",".META.", ".META");
// Migrate tables including archive and tmp
for (Path baseDir: baseDirs) {
@ -300,6 +300,16 @@ public class NamespaceUpgrade implements Tool {
throw new IOException("Failed to migrate meta table "
+ oldMetaDir.getName() + " to " + newMetaDir);
}
} else {
// on windows NTFS, meta's name is .META (note the missing dot at the end)
oldMetaDir = new Path(rootDir, ".META");
if (fs.exists(oldMetaDir)) {
LOG.info("Migrating meta table " + oldMetaDir.getName() + " to " + newMetaDir);
if (!fs.rename(oldMetaDir, newMetaDir)) {
throw new IOException("Failed to migrate meta table "
+ oldMetaDir.getName() + " to " + newMetaDir);
}
}
}
// Since meta table name has changed rename meta region dir from it's old encoding to new one