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 1512305) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/migration/NamespaceUpgrade.java (working copy) @@ -19,7 +19,10 @@ */ package org.apache.hadoop.hbase.migration; -import com.google.common.collect.Lists; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.util.List; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; @@ -36,8 +39,7 @@ import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.util.Tool; -import java.io.IOException; -import java.util.List; +import com.google.common.collect.Lists; /** * Upgrades old 0.94 filesystem layout to namespace layout @@ -111,7 +113,13 @@ //migrate tables including archive and tmp for(Path baseDir: baseDirs) { - List oldTableDirs = FSUtils.getLocalTableDirs(fs, baseDir); + List oldTableDirs; + try { + oldTableDirs = FSUtils.getLocalTableDirs(fs, baseDir); + } catch (FileNotFoundException fnfe) { + LOG.debug("There is no " + baseDir); + continue; + } for(Path oldTableDir: oldTableDirs) { if (!sysTables.contains(oldTableDir.getName())) { Path nsDir = FSUtils.getTableDir(baseDir,