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 098BC10BA1 for ; Tue, 4 Mar 2014 23:11:06 +0000 (UTC) Received: (qmail 559 invoked by uid 500); 4 Mar 2014 23:10:59 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 409 invoked by uid 500); 4 Mar 2014 23:10:57 -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 306 invoked by uid 99); 4 Mar 2014 23:10:55 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Mar 2014 23:10:55 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 6CD16936267; Tue, 4 Mar 2014 23:10: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 Date: Tue, 04 Mar 2014 23:10:59 -0000 Message-Id: <847f4d7629f94ccd9b473725e814ded1@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/9] git commit: Avoid race-prone second "scrub" of system keyspace patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-6797 Avoid race-prone second "scrub" of system keyspace patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-6797 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ab2717b6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ab2717b6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ab2717b6 Branch: refs/heads/cassandra-2.1 Commit: ab2717b6f6475a5d925058338549d31bb2776e6e Parents: 1630493 Author: Jonathan Ellis Authored: Tue Mar 4 17:10:16 2014 -0600 Committer: Jonathan Ellis Committed: Tue Mar 4 17:10:16 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab2717b6/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 8eb10cd..19cedd8 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.6 + * Avoid race-prone second "scrub" of system keyspace (CASSANDRA-6797) * Pool CqlRecordWriter clients by inetaddress rather than Range (CASSANDRA-6665) * Fix compaction_history timestamps (CASSANDRA-6784) http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab2717b6/src/java/org/apache/cassandra/service/CassandraDaemon.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java index b3f7ff3..d8c56f1 100644 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@ -264,6 +264,10 @@ public class CassandraDaemon // clean up debris in the rest of the keyspaces for (String keyspaceName : Schema.instance.getKeyspaces()) { + // Skip system as we've already cleaned it + if (keyspaceName.equals(Keyspace.SYSTEM_KS)) + continue; + for (CFMetaData cfm : Schema.instance.getKeyspaceMetaData(keyspaceName).values()) ColumnFamilyStore.scrubDataDirectories(keyspaceName, cfm.cfName); }