Repository: cassandra Updated Branches: refs/heads/cassandra-3.5 2dab42bce -> e6168672b refs/heads/trunk 2750b18f9 -> 2e3b12fbe
recommit CASSANDRA-10902 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e6168672 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6168672 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6168672 Branch: refs/heads/cassandra-3.5 Commit: e6168672bc421f0d0f90dd45bf3a991be578b3dc Parents: 2dab42b Author: Sam Tunnicliffe <[email protected]> Authored: Fri Apr 8 12:05:49 2016 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Fri Apr 8 12:21:11 2016 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StartupChecks.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6168672/src/java/org/apache/cassandra/service/StartupChecks.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StartupChecks.java b/src/java/org/apache/cassandra/service/StartupChecks.java index e903721..ad6a104 100644 --- a/src/java/org/apache/cassandra/service/StartupChecks.java +++ b/src/java/org/apache/cassandra/service/StartupChecks.java @@ -36,6 +36,7 @@ import org.apache.cassandra.db.*; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.StartupException; import org.apache.cassandra.io.sstable.Descriptor; +import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.*; /** @@ -230,6 +231,11 @@ public class StartupChecks public void execute() throws StartupException { final Set<String> invalid = new HashSet<>(); + final Set<String> nonSSTablePaths = new HashSet<>(); + nonSSTablePaths.add(FileUtils.getCanonicalPath(DatabaseDescriptor.getCommitLogLocation())); + nonSSTablePaths.add(FileUtils.getCanonicalPath(DatabaseDescriptor.getSavedCachesLocation())); + nonSSTablePaths.add(FileUtils.getCanonicalPath(DatabaseDescriptor.getHintsDirectory())); + FileVisitor<Path> sstableVisitor = new SimpleFileVisitor<Path>() { public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException @@ -253,7 +259,8 @@ public class StartupChecks { String name = dir.getFileName().toString(); return (name.equals(Directories.SNAPSHOT_SUBDIR) - || name.equals(Directories.BACKUPS_SUBDIR)) + || name.equals(Directories.BACKUPS_SUBDIR) + || nonSSTablePaths.contains(dir.toFile().getCanonicalPath())) ? FileVisitResult.SKIP_SUBTREE : FileVisitResult.CONTINUE; }
