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 BC5D61116C for ; Wed, 18 Jun 2014 19:08:12 +0000 (UTC) Received: (qmail 96682 invoked by uid 500); 18 Jun 2014 19:08:12 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 96642 invoked by uid 500); 18 Jun 2014 19:08:12 -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 96609 invoked by uid 99); 18 Jun 2014 19:08:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Jun 2014 19:08:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id EF7B1943407; Wed, 18 Jun 2014 19:08:11 +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: Wed, 18 Jun 2014 19:08:11 -0000 Message-Id: <24eb6bce5a2c466d880fe9d22746abe1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: Clean up gossiper fully after shadow round. Repository: cassandra Updated Branches: refs/heads/cassandra-1.2 febf3854b -> 20fffa999 refs/heads/cassandra-2.0 4b3a17cda -> 5d25a16ef Clean up gossiper fully after shadow round. Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7318 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/20fffa99 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/20fffa99 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/20fffa99 Branch: refs/heads/cassandra-1.2 Commit: 20fffa9993ba79d99109e037582b488963567777 Parents: febf385 Author: Brandon Williams Authored: Wed Jun 18 14:06:59 2014 -0500 Committer: Brandon Williams Committed: Wed Jun 18 14:06:59 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/gms/Gossiper.java | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/20fffa99/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 18929d5..25ea22b 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 1.2.17 + * Fix problem truncating on a node that was previously in a dead state (CASSANDRA-7318) * Don't insert tombstones that hide indexed values into 2i (CASSANDRA-7268) * Track metrics at a keyspace level (CASSANDRA-6539) * Add replace_address_first_boot flag to only replace if not bootstrapped http://git-wip-us.apache.org/repos/asf/cassandra/blob/20fffa99/src/java/org/apache/cassandra/gms/Gossiper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java index a2addd1..fcf1e58 100644 --- a/src/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/java/org/apache/cassandra/gms/Gossiper.java @@ -675,6 +675,8 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean public void resetEndpointStateMap() { endpointStateMap.clear(); + unreachableEndpoints.clear(); + liveEndpoints.clear(); } public Set> getEndpointStates()