Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E16E6E08F for ; Thu, 7 Mar 2013 21:28:57 +0000 (UTC) Received: (qmail 10900 invoked by uid 500); 7 Mar 2013 21:28:56 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 10832 invoked by uid 500); 7 Mar 2013 21:28:56 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 10551 invoked by uid 99); 7 Mar 2013 21:28:56 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Mar 2013 21:28:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B37CA831913; Thu, 7 Mar 2013 21:28:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [2/11] git commit: fix DatabaseDescriptor.hasExistingNoSystemTables to skip system table correctly patch by Jackson Chung; reviewed by jbellis for CASSANDRA-5289 Message-Id: <20130307212855.B37CA831913@tyr.zones.apache.org> Date: Thu, 7 Mar 2013 21:28:55 +0000 (UTC) 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/trunk Commit: 3a6125db8782f09c291ec3625af65c624e16df3a Parents: ea08e01 Author: Jonathan Ellis Authored: Thu Mar 7 18:23:47 2013 +0000 Committer: Jonathan Ellis 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;