Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4fd322f5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4fd322f5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4fd322f5 Branch: refs/heads/cassandra-2.0 Commit: 4fd322f53daf37fff9b4a22c41af56f7274ef72c Parents: 8e0523e da5ff08 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Nov 22 13:22:53 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Nov 22 13:22:53 2013 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/dht/BootStrapper.java | 2 +- src/java/org/apache/cassandra/gms/Gossiper.java | 2 +- .../org/apache/cassandra/service/StorageService.java | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fd322f5/src/java/org/apache/cassandra/dht/BootStrapper.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fd322f5/src/java/org/apache/cassandra/gms/Gossiper.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/gms/Gossiper.java index cb4e6ea,cec9a7a..a8e91ea --- a/src/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/java/org/apache/cassandra/gms/Gossiper.java @@@ -401,10 -384,10 +401,10 @@@ public class Gossiper implements IFailu /** * This method will begin removing an existing endpoint from the cluster by spoofing its state - * This should never be called unless this coordinator has had 'removetoken' invoked + * This should never be called unless this coordinator has had 'removenode' invoked * - * @param endpoint - the endpoint being removed - * @param hostId - the ID of the host being removed + * @param endpoint - the endpoint being removed + * @param hostId - the ID of the host being removed * @param localHostId - my own host ID for replication coordination */ public void advertiseRemoving(InetAddress endpoint, UUID hostId, UUID localHostId) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4fd322f5/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index 50419c4,250fa62..e91ac8c --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -3049,13 -3173,13 +3049,13 @@@ public class StorageService extends Not logger.warn("Node " + endpoint + " is already being removed, continuing removal anyway"); if (!replicatingNodes.isEmpty()) - throw new UnsupportedOperationException("This node is already processing a removal. Wait for it to complete, or use 'removetoken force' if this has failed."); + throw new UnsupportedOperationException("This node is already processing a removal. Wait for it to complete, or use 'removenode force' if this has failed."); // Find the endpoints that are going to become responsible for data - for (String table : Schema.instance.getNonSystemTables()) + for (String keyspaceName : Schema.instance.getNonSystemKeyspaces()) { // if the replication factor is 1 the data is lost so we shouldn't wait for confirmation - if (Table.open(table).getReplicationStrategy().getReplicationFactor() == 1) + if (Keyspace.open(keyspaceName).getReplicationStrategy().getReplicationFactor() == 1) continue; // get all ranges that change ownership (that is, a node needs
