Author: jbellis
Date: Mon Sep 13 13:40:22 2010
New Revision: 996527
URL: http://svn.apache.org/viewvc?rev=996527&view=rev
Log:
add post-removeEndPoint "break" to avoid scary CME. functionality is
unaffected (remainder of states will still not be processed until next round).
patch by jbellis
Modified:
cassandra/branches/cassandra-0.6/CHANGES.txt
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java
Modified: cassandra/branches/cassandra-0.6/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=996527&r1=996526&r2=996527&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Mon Sep 13 13:40:22 2010
@@ -13,6 +13,9 @@
* make sure to close CommitLog files after replay (CASSANDRA-1348)
* bulletproof sstable deletion process (CASSANDRA-1458)
* Switch system.LocationInfo CF from UTF8Type to BytesType (CASSANDRA-1492)
+ * avoid ConcurrentModificationException in Gossiper after removing
+ a dead StorageProxy client, decommissioned node, or partially
+ bootstrapped one (CASSANDRA-1494)
0.6.5
Modified:
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java?rev=996527&r1=996526&r2=996527&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java
(original)
+++
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java
Mon Sep 13 13:40:22 2010
@@ -405,6 +405,7 @@ public class Gossiper implements IFailur
{
logger_.info("FatClient " + endpoint + " has been
silent for " + FatClientTimeout_ + "ms, removing from gossip");
removeEndPoint(endpoint);
+ break; // avoid CME. this is fixed better in 0.7
}
}
