Merge remote-tracking branch 'refs/remotes/acunu/p/4122/01_bootstrap_decommission' into HEAD
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4f99bf4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4f99bf4f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4f99bf4f Branch: refs/heads/vnodes Commit: 4f99bf4ff6ab8fb8c1b114876e68b74585de0c83 Parents: 457dcd2 c612a2e Author: Eric Evans <[email protected]> Authored: Sat Jul 14 12:37:21 2012 -0600 Committer: Eric Evans <[email protected]> Committed: Sat Jul 14 12:37:21 2012 -0600 ---------------------------------------------------------------------- .topdeps | 2 +- .topmsg | 6 +- NEWS.txt | 3 + conf/cassandra.yaml | 17 +- src/java/org/apache/cassandra/config/Config.java | 1 + .../cassandra/config/DatabaseDescriptor.java | 25 +- src/java/org/apache/cassandra/db/SystemTable.java | 102 +++++-- .../org/apache/cassandra/dht/BootStrapper.java | 60 +++- src/java/org/apache/cassandra/gms/Gossiper.java | 10 +- .../org/apache/cassandra/gms/VersionedValue.java | 38 ++- .../locator/AbstractReplicationStrategy.java | 7 +- .../apache/cassandra/locator/TokenMetadata.java | 24 ++- .../apache/cassandra/service/StorageService.java | 276 +++++++++------ test/unit/org/apache/cassandra/Util.java | 5 +- .../org/apache/cassandra/db/SystemTableTest.java | 32 ++- .../org/apache/cassandra/dht/BootStrapperTest.java | 7 +- .../apache/cassandra/gms/SerializationsTest.java | 5 +- .../service/AntiEntropyServiceTestAbstract.java | 2 +- .../cassandra/service/LeaveAndBootstrapTest.java | 70 +++-- .../org/apache/cassandra/service/MoveTest.java | 20 +- 20 files changed, 496 insertions(+), 216 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f99bf4f/NEWS.txt ---------------------------------------------------------------------- diff --cc NEWS.txt index fd13667,2b470d1..c52bd89 --- a/NEWS.txt +++ b/NEWS.txt @@@ -41,10 -41,11 +41,13 @@@ Upgradin Features -------- + - Cassandra can now handle concurrent CREATE TABLE schema changes + as well as other updates - rpc_timeout has been split up to allow finer-grained control on timeouts for different operation types + - num_tokens can now be specified in cassandra.yaml. This defines the + number of tokens assigned to the host on the ring (default: 1). + Also specifying initial_token will override any num_tokens setting. 1.1.2 http://git-wip-us.apache.org/repos/asf/cassandra/blob/4f99bf4f/src/java/org/apache/cassandra/config/Config.java ----------------------------------------------------------------------
