cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [1/7] git commit: fix DatabaseDescriptor.hasExistingNoSystemTables to skip system table correctly patch by Jackson Chung; reviewed by jbellis for CASSANDRA-5289
Date Thu, 07 Mar 2013 21:12:28 GMT
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/3a6125db
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a6125db
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a6125db

Branch: refs/heads/cassandra-1.1
Commit: 3a6125db8782f09c291ec3625af65c624e16df3a
Parents: ea08e01
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Mar 7 18:23:47 2013 +0000
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Mar 7 15:09:41 2013 -0600

----------------------------------------------------------------------
 CHANGES.txt                                        |    2 ++
 .../cassandra/config/DatabaseDescriptor.java       |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a6125db/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6f929ba..72e6288 100644
--- 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)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a6125db/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 0742f34..b9b9feb 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -550,7 +550,7 @@ public class DatabaseDescriptor
                 {
                     public boolean accept(File pathname)
                     {
-                        return pathname.isDirectory();
+                        return (pathname.isDirectory() && !Table.SYSTEM_KS.equals(pathname.getName()));
                     }
                 }).length;
 


Mime
View raw message