fix DatabaseDescriptor.hasExistingNoSystemTables to skip system table correctly patch by Jackson Chung; reviewed by jbellis for CASSANDRA-5289
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aadc5e50 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aadc5e50 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aadc5e50 Branch: refs/heads/trunk Commit: aadc5e500d4b4080e56e706b8df826328fd87088 Parents: 416f80d Author: Jonathan Ellis <[email protected]> Authored: Thu Mar 7 18:23:47 2013 +0000 Committer: Jonathan Ellis <[email protected]> Committed: Thu Mar 7 15:10:09 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../cassandra/config/DatabaseDescriptor.java | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aadc5e50/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 4352965..18b8de9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -16,6 +16,9 @@ backward compatibility (CASSANDRA-4795) * Add binary protocol support to stress (CASSANDRA-4993) Merged from 1.1: + * fix logging of "Found table data in data directories" when only system tables + are present (CASSANDRA-5289) + * cli: Add JMX authentication support (CASSANDRA-5080) * nodetool: ability to repair specific range (CASSANDRA-5280) * Fix possible assertion triggered in SliceFromReadCommand (CASSANDRA-5284) * cqlsh: Add inet type support on Windows (ipv4-only) (CASSANDRA-4801) http://git-wip-us.apache.org/repos/asf/cassandra/blob/aadc5e50/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 827805d..2ad41ab 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -582,7 +582,7 @@ public class DatabaseDescriptor { public boolean accept(File pathname) { - return pathname.isDirectory(); + return (pathname.isDirectory() && !Table.SYSTEM_KS.equals(pathname.getName())); } }).length;
