fix DatabaseDescriptor.hasExistingNoSystemTables to skip system table…

… correctly patch by Jackson Chung; reviewed by jbellis for CASSANDRA-5289
apache · Mar 7, 2013 · 3a6125d · 3a6125d
1 parent ea08e01
commit 3a6125d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,4 +1,6 @@
 1.1.11
+ * 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)

diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -550,7 +550,7 @@ private static boolean hasExistingNoSystemTables()
                 {
                     public boolean accept(File pathname)
                     {
-                        return pathname.isDirectory();
+                        return (pathname.isDirectory() && !Table.SYSTEM_KS.equals(pathname.getName()));
                     }
                 }).length;