You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/06/18 21:08:12 UTC

[2/3] git commit: Clean up gossiper fully after shadow round.

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-2.0
Commit: 20fffa9993ba79d99109e037582b488963567777
Parents: febf385
Author: Brandon Williams <br...@apache.org>
Authored: Wed Jun 18 14:06:59 2014 -0500
Committer: Brandon Williams <br...@apache.org>
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<Entry<InetAddress, EndpointState>> getEndpointStates()