Index: src/main/java/org/apache/hadoop/hbase/HConstants.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/HConstants.java (revision 1143201) +++ src/main/java/org/apache/hadoop/hbase/HConstants.java (working copy) @@ -168,6 +168,11 @@ /** Used to construct the name of the log directory for a region server * Use '.' as a special character to seperate the log files from table data */ public static final String HREGION_LOGDIR_NAME = ".logs"; + + /** Used to construct the name of the splitlog directory for a region server */ + public static final String SPLIT_LOGDIR_NAME = "splitlog"; + + public static final String CORRUPT_DIR_NAME = ".corrupt"; /** Like the previous, but for old logs that are about to be deleted */ public static final String HREGION_OLDLOGDIR_NAME = ".oldlogs"; @@ -487,8 +492,9 @@ public static final float HBASE_CLUSTER_MINIMUM_MEMORY_THRESHOLD = 0.2f; public static final List HBASE_NON_USER_TABLE_DIRS = new ArrayList( - Arrays.asList(new String[]{".logs", ".oldlogs", - ".corrupt", ".META.", "-ROOT-"})); + Arrays.asList(new String[]{ HREGION_LOGDIR_NAME, HREGION_OLDLOGDIR_NAME, + CORRUPT_DIR_NAME, Bytes.toString(META_TABLE_NAME), + Bytes.toString(ROOT_TABLE_NAME), SPLIT_LOGDIR_NAME })); private HConstants() { // Can't be instantiated with this ctor. Index: src/main/java/org/apache/hadoop/hbase/zookeeper/ZKSplitLog.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/zookeeper/ZKSplitLog.java (revision 1143201) +++ src/main/java/org/apache/hadoop/hbase/zookeeper/ZKSplitLog.java (working copy) @@ -33,6 +33,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.master.SplitLogManager; import org.apache.hadoop.hbase.regionserver.SplitLogWorker; import org.apache.hadoop.hbase.util.Bytes; @@ -151,7 +152,7 @@ } public static Path getSplitLogDir(Path rootdir, String tmpname) { - return new Path(new Path(rootdir, "splitlog"), tmpname); + return new Path(new Path(rootdir, HConstants.SPLIT_LOGDIR_NAME), tmpname); } public static Path stripSplitLogTempDir(Path rootdir, Path file) { Index: src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java (revision 1143201) +++ src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperWatcher.java (working copy) @@ -211,7 +211,7 @@ clusterIdZNode = ZKUtil.joinZNode(baseZNode, conf.get("zookeeper.znode.clusterId", "hbaseid")); splitLogZNode = ZKUtil.joinZNode(baseZNode, - conf.get("zookeeper.znode.splitlog", "splitlog")); + conf.get("zookeeper.znode.splitlog", HConstants.SPLIT_LOGDIR_NAME)); } /** Index: src/main/java/org/apache/hadoop/hbase/util/FSUtils.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/util/FSUtils.java (revision 1143201) +++ src/main/java/org/apache/hadoop/hbase/util/FSUtils.java (working copy) @@ -712,7 +712,9 @@ public boolean accept(Path p) { boolean isdir = false; try { - isdir = this.fs.getFileStatus(p).isDir(); + if (HConstants.HBASE_NON_USER_TABLE_DIRS.contains(p)) { + isdir = false; + } else isdir = this.fs.getFileStatus(p).isDir(); } catch (IOException e) { e.printStackTrace(); }