Author: brandonwilliams Date: Thu Jan 20 21:36:49 2011 New Revision: 1061534
URL: http://svn.apache.org/viewvc?rev=1061534&view=rev Log: Update token metadata for NORMAL state when endpoint has not changed. Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-1934 Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java?rev=1061534&r1=1061533&r2=1061534&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java (original) +++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java Thu Jan 20 21:36:49 2011 @@ -632,7 +632,9 @@ public class StorageService implements I } else if (endpoint.equals(currentOwner)) { - // nothing to do + // set state back to normal, since the node may have tried to leave, but failed and is now back up + // no need to persist, token/ip did not change + tokenMetadata_.updateNormalToken(token, endpoint); } else if (Gossiper.instance.compareEndpointStartup(endpoint, currentOwner) > 0) {
