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 8403B17F91 for ; Mon, 29 Sep 2014 14:52:57 +0000 (UTC) Received: (qmail 39670 invoked by uid 500); 29 Sep 2014 14:52:56 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 39544 invoked by uid 500); 29 Sep 2014 14:52:56 -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 39366 invoked by uid 99); 29 Sep 2014 14:52:56 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 29 Sep 2014 14:52:56 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 81CEF9C2264; Mon, 29 Sep 2014 14:52:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Mon, 29 Sep 2014 14:52:57 -0000 Message-Id: <07e849bb38be41129283160a5abf163a@git.apache.org> In-Reply-To: <201b64193dcb45d69405845b1e51f8ef@git.apache.org> References: <201b64193dcb45d69405845b1e51f8ef@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/8] git commit: Ignore fat clients when checking for endpoint collision Ignore fat clients when checking for endpoint collision Patch by brandonwilliams, reviewed by tjake for CASSANDRA-7939 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6b8b8e0f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b8b8e0f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6b8b8e0f Branch: refs/heads/cassandra-2.1 Commit: 6b8b8e0f924b53b9f99854f88ff9ba84073cb295 Parents: 3db38d7 Author: Brandon Williams Authored: Mon Sep 29 09:46:02 2014 -0500 Committer: Brandon Williams Committed: Mon Sep 29 09:46:02 2014 -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/6b8b8e0f/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 40e2f2c..dd5f7dd 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.11: + * Ignore fat clients when checking for endpoint collision (CASSANDRA-7939) * CrcCheckChance should adjust based on live CFMetadata not sstable metadata (CASSANDRA-7978) * token() should only accept columns in the partitioning http://git-wip-us.apache.org/repos/asf/cassandra/blob/6b8b8e0f/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 f693a0b..11eb91d 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -444,7 +444,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE MessagingService.instance().listen(FBUtilities.getLocalAddress()); Gossiper.instance.doShadowRound(); EndpointState epState = Gossiper.instance.getEndpointStateForEndpoint(FBUtilities.getBroadcastAddress()); - if (epState != null && !Gossiper.instance.isDeadState(epState)) + if (epState != null && !Gossiper.instance.isDeadState(epState) && !Gossiper.instance.isFatClient(FBUtilities.getBroadcastAddress())) { throw new RuntimeException(String.format("A node with address %s already exists, cancelling join. " + "Use cassandra.replace_address if you want to replace this node.",