Author: brandonwilliams Date: Sat Feb 5 21:27:54 2011 New Revision: 1067528
URL: http://svn.apache.org/viewvc?rev=1067528&view=rev Log: fix merge from 2072 Modified: cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java Modified: cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java?rev=1067528&r1=1067527&r2=1067528&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/gms/Gossiper.java Sat Feb 5 21:27:54 2011 @@ -430,9 +430,11 @@ public class Gossiper implements IFailur epState.setHasToken(true); else { - logger.info("FatClient " + endpoint + " has been silent for " + FatClientTimeout + "ms, removing from gossip"); if (!justRemovedEndpoints.containsKey(endpoint)) // if the node was decommissioned, it will have been removed but still appear as a fat client + { + logger.info("FatClient " + endpoint + " has been silent for " + FatClientTimeout + "ms, removing from gossip"); removeEndpoint(endpoint); // after quarantine justRemoveEndpoints will remove the state + } } }
