Don't open system ks before scrubbing the data directory Patch by marcuse; reviewed by Sam Tunnicliffe for CASSANDRA-9405
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aa133b70 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa133b70 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa133b70 Branch: refs/heads/trunk Commit: aa133b70fa08039b458c3b5fc295ce3624b8d43d Parents: 6a4489d Author: Marcus Eriksson <[email protected]> Authored: Mon May 18 08:47:31 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Mon May 18 15:14:12 2015 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StartupChecks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa133b70/src/java/org/apache/cassandra/service/StartupChecks.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StartupChecks.java b/src/java/org/apache/cassandra/service/StartupChecks.java index 9c8d071..b6f233f 100644 --- a/src/java/org/apache/cassandra/service/StartupChecks.java +++ b/src/java/org/apache/cassandra/service/StartupChecks.java @@ -278,7 +278,7 @@ public class StartupChecks // check the system keyspace to keep user from shooting self in foot by changing partitioner, cluster name, etc. // we do a one-off scrub of the system keyspace first; we can't load the list of the rest of the keyspaces, // until system keyspace is opened. - Keyspace systemKs = Keyspace.open(SystemKeyspace.NAME); + for (CFMetaData cfm : Schema.instance.getKeyspaceMetaData(SystemKeyspace.NAME).values()) ColumnFamilyStore.scrubDataDirectories(cfm);
