Index: hbase-server/src/main/java/org/apache/hadoop/hbase/migration/NamespaceUpgrade.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/migration/NamespaceUpgrade.java (revision 1511585) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/migration/NamespaceUpgrade.java (working copy) @@ -111,20 +111,22 @@ //migrate tables including archive and tmp for(Path baseDir: baseDirs) { - List oldTableDirs = FSUtils.getLocalTableDirs(fs, baseDir); - for(Path oldTableDir: oldTableDirs) { - if (!sysTables.contains(oldTableDir.getName())) { - Path nsDir = FSUtils.getTableDir(baseDir, - TableName.valueOf(oldTableDir.getName())); - if(!fs.exists(nsDir.getParent())) { - if(!fs.mkdirs(nsDir.getParent())) { - throw new IOException("Failed to create namespace dir "+nsDir.getParent()); + if (fs.exists(baseDir)) { + List oldTableDirs = FSUtils.getLocalTableDirs(fs, baseDir); + for (Path oldTableDir : oldTableDirs) { + if (!sysTables.contains(oldTableDir.getName())) { + Path nsDir = FSUtils.getTableDir(baseDir, TableName.valueOf(oldTableDir.getName())); + if (!fs.exists(nsDir.getParent())) { + if (!fs.mkdirs(nsDir.getParent())) { + throw new IOException("Failed to create namespace dir " + nsDir.getParent()); + } } - } - if (sysTables.indexOf(oldTableDir.getName()) < 0) { - LOG.info("Migrating table " + oldTableDir.getName() + " to " + nsDir); - if (!fs.rename(oldTableDir, nsDir)) { - throw new IOException("Failed to move "+oldTableDir+" to namespace dir "+nsDir); + if (sysTables.indexOf(oldTableDir.getName()) < 0) { + LOG.info("Migrating table " + oldTableDir.getName() + " to " + nsDir); + if (!fs.rename(oldTableDir, nsDir)) { + throw new IOException("Failed to move " + oldTableDir + " to namespace dir " + + nsDir); + } } } }