Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 30C7410351 for ; Sat, 19 Oct 2013 01:55:32 +0000 (UTC) Received: (qmail 39536 invoked by uid 500); 19 Oct 2013 01:55:31 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 39498 invoked by uid 500); 19 Oct 2013 01:55:31 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 39312 invoked by uid 99); 19 Oct 2013 01:55:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Oct 2013 01:55:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 80428440AA; Sat, 19 Oct 2013 01:55:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Date: Sat, 19 Oct 2013 01:55:32 -0000 Message-Id: In-Reply-To: <38dff431b5f948bc86e1486e246dcb75@git.apache.org> References: <38dff431b5f948bc86e1486e246dcb75@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/5] git commit: Remove dead node from system.peers when replacing. Patch by brandonwilliams, reviewed by Jeremiah Jordan for CASSANDRA-6217 Remove dead node from system.peers when replacing. Patch by brandonwilliams, reviewed by Jeremiah Jordan for CASSANDRA-6217 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/558483dd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/558483dd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/558483dd Branch: refs/heads/trunk Commit: 558483dd20439d1bc74dec6ebed0b4632ef5a1ca Parents: 9424449 Author: Brandon Williams Authored: Fri Oct 18 11:11:24 2013 -0500 Committer: Brandon Williams Committed: Fri Oct 18 11:12:31 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/558483dd/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 d2c69d0..11393c6 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -965,6 +965,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE { // Dont set any state for the node which is bootstrapping the existing token... tokenMetadata.updateNormalTokens(tokens, FBUtilities.getBroadcastAddress()); + SystemTable.removeEndpoint(DatabaseDescriptor.getReplaceAddress()); } Tracing.instance(); if (!Gossiper.instance.seenAnySeed())