merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0851fd74 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0851fd74 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0851fd74 Branch: refs/heads/trunk Commit: 0851fd74b8a9aefb84e64b565bdd500a02a21dda Parents: e2a719a ab2717b Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Mar 4 17:10:41 2014 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Mar 4 17:10:41 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 ++++ src/java/org/apache/cassandra/tools/StandaloneScrubber.java | 3 +-- 3 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0851fd74/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7d998fc,19cedd8..f420fb1 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,5 +1,14 @@@ -2.0.6 +2.1.0-beta2 + * Fix overflow of memtable_total_space_in_mb (CASSANDRA-6573) + * Fix ABTC NPE (CASSANDRA-6692) + * Allow nodetool to use a file or prompt for password (CASSANDRA-6660) + * Fix AIOOBE when concurrently accessing ABSC (CASSANDRA-6742) + * Fix assertion error in ALTER TYPE RENAME (CASSANDRA-6705) + * Scrub should not always clear out repaired status (CASSANDRA-5351) + * Improve handling of range tombstone for wide partitions (CASSANDRA-6446) + * Fix ClassCastException for compact table with composites (CASSANDRA-6738) +Merged from 2.0: + * 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/0851fd74/src/java/org/apache/cassandra/service/CassandraDaemon.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java index 732f962,d8c56f1..50bbe02 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@@ -241,8 -264,12 +241,12 @@@ public class CassandraDaemo // 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); + ColumnFamilyStore.scrubDataDirectories(cfm); } // initialize keyspaces http://git-wip-us.apache.org/repos/asf/cassandra/blob/0851fd74/src/java/org/apache/cassandra/tools/StandaloneScrubber.java ----------------------------------------------------------------------
