Updated Branches: refs/heads/cassandra-1.2 7787deab7 -> 00a8b1e6e
Sleep for RING_DELAY before replacing with same IP Patch by brandonwilliams reviewed by Tyler Hobbs for CASSANDRA-6622 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/00a8b1e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00a8b1e6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00a8b1e6 Branch: refs/heads/cassandra-1.2 Commit: 00a8b1e6ece0f89ae038589f36c7b9a9012fb7f7 Parents: 7787dea Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Feb 11 17:12:45 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Feb 11 17:14:18 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/service/StorageService.java | 12 ++++++++++++ 2 files changed, 13 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/00a8b1e6/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 56059a1..0674dde 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 1.2.16 + * Fix broken streams when replacing with same IP (CASSANDRA-6622) * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645) * Fix partition and range deletes not triggering flush (CASSANDRA-6655) * Fix mean cells and mean row size per sstable calculations (CASSANDRA-6667) http://git-wip-us.apache.org/repos/asf/cassandra/blob/00a8b1e6/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 94dd73d..ec8c7c3 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -735,6 +735,18 @@ public class StorageService extends NotificationBroadcasterSupport implements IE } } } + else + { + try + { + Thread.sleep(RING_DELAY); + } + catch (InterruptedException e) + { + throw new AssertionError(e); + } + + } setMode(Mode.JOINING, "Replacing a node with token(s): " + tokens, true); }