Author: brandonwilliams Date: Mon Oct 3 18:20:24 2011 New Revision: 1178492
URL: http://svn.apache.org/viewvc?rev=1178492&view=rev Log: Fix bad merge Modified: cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/gms/Gossiper.java Modified: cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/gms/Gossiper.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/gms/Gossiper.java?rev=1178492&r1=1178491&r2=1178492&view=diff ============================================================================== --- cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/gms/Gossiper.java (original) +++ cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/gms/Gossiper.java Mon Oct 3 18:20:24 2011 @@ -321,6 +321,17 @@ public class Gossiper implements IFailur } /** + * Remove the Endpoint and evict immediately, to avoid gossiping about this node. + * This should only be called when a token is taken over by a new IP address. + * @param endpoint The endpoint that has been replaced + */ + public void replacedEndpoint(InetAddress endpoint) + { + removeEndpoint(endpoint); + evictFromMembership(endpoint); + } + + /** * The gossip digest is built based on randomization * rather than just looping through the collection of live endpoints. *
