You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2015/08/03 14:04:38 UTC

cassandra git commit: Cannot replace token does not exist - DN node removed as Fat Client

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 0a4728f62 -> 8f9ca07e9


Cannot replace token does not exist - DN node removed as Fat Client

patch by Stefania, reviewed by jasobrown for CASSANDRA-9871


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8f9ca07e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f9ca07e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f9ca07e

Branch: refs/heads/cassandra-2.1
Commit: 8f9ca07e9a0140d93224bf941fa4f6315e5093cf
Parents: 0a4728f
Author: Jason Brown <ja...@gmail.com>
Authored: Mon Aug 3 05:03:42 2015 -0700
Committer: Jason Brown <ja...@gmail.com>
Committed: Mon Aug 3 05:03:42 2015 -0700

----------------------------------------------------------------------
 CHANGES.txt                                               | 1 +
 src/java/org/apache/cassandra/service/StorageService.java | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f9ca07e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 5cfc347..f4e1832 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.9
+ * Cannot replace token does not exist - DN node removed as Fat Client (CASSANDRA-9871)
  * Fix handling of enable/disable autocompaction (CASSANDRA-9899)
  * Commit log segment recycling is disabled by default (CASSANDRA-9896)
  * Add consistency level to tracing ouput (CASSANDRA-9827)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f9ca07e/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 5ffcc53..56ddd63 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1488,6 +1488,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
                     handleStateBootstrap(endpoint);
                     break;
                 case VersionedValue.STATUS_NORMAL:
+                case VersionedValue.SHUTDOWN:
                     handleStateNormal(endpoint);
                     break;
                 case VersionedValue.REMOVING_TOKEN: