Fix MOVED_NODE client event Patch by Stefania, reviewed by brandonwilliams for CASSANDRA-8516
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b296c55f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b296c55f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b296c55f Branch: refs/heads/trunk Commit: b296c55f956c6ef07c8330dc28ef8c351e5bcfe2 Parents: 7c98030 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Mar 25 10:10:17 2015 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Mar 25 10:10:17 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b296c55f/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index fecc7e3..e17e82f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.14: + * Fix MOVED_NODE client event (CASSANDRA-8516) * Allow overriding MAX_OUTSTANDING_REPLAY_COUNT (CASSANDRA-7533) * Fix malformed JMX ObjectName containing IPv6 addresses (CASSANDRA-9027) * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b296c55f/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 622380e..d997459 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -1618,7 +1618,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE if (!localTokensToRemove.isEmpty()) SystemKeyspace.updateLocalTokens(Collections.<Token>emptyList(), localTokensToRemove); - if (isMoving) + if (isMoving || operationMode == Mode.MOVING) { tokenMetadata.removeFromMoving(endpoint);