From db73050a678de6e50fec5fc413591ea1bac53cf1 Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Mon, 24 Nov 2014 10:27:43 -0800 Subject: [PATCH] HBASE-12550 ADDENDUM Check all storefiles are referenced before splitting --- hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java index 916d567..81c7679 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSUtils.java @@ -1445,7 +1445,7 @@ public abstract class FSUtils { public boolean accept(Path rd) { try { // only files - return !fs.getFileStatus(rd).isDirectory() && StoreFileInfo.isHFile(rd); + return !fs.getFileStatus(rd).isDir() && StoreFileInfo.isHFile(rd); } catch (IOException ioe) { // Maybe the file was moved or the fs was disconnected. LOG.warn("Skipping file " + rd +" due to IOException", ioe); @@ -1466,7 +1466,7 @@ public abstract class FSUtils { public boolean accept(Path rd) { try { // only files can be references. - return !fs.getFileStatus(rd).isDirectory() && StoreFileInfo.isReference(rd); + return !fs.getFileStatus(rd).isDir() && StoreFileInfo.isReference(rd); } catch (IOException ioe) { // Maybe the file was moved or the fs was disconnected. LOG.warn("Skipping file " + rd +" due to IOException", ioe); -- 2.1.1