Author: jbellis
Date: Thu Sep 30 20:36:05 2010
New Revision: 1003242
URL: http://svn.apache.org/viewvc?rev=1003242&view=rev
Log:
allow nodes to change IPs between restarts.
patch by brandonwilliams; reviewed by jbellis for CASSANDRA-1518
Modified:
cassandra/branches/cassandra-0.6/CHANGES.txt
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java
Modified: cassandra/branches/cassandra-0.6/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=1003242&r1=1003241&r2=1003242&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.6/CHANGES.txt Thu Sep 30 20:36:05 2010
@@ -36,6 +36,7 @@
saved property, instead of vice versa (CASSANDRA-1447)
* add memtable, cache information to GCInspector logs (CASSANDRA-1558)
* enable/disable HintedHandoff via JMX (CASSANDRA-1550)
+ * allow nodes to change IPs between restarts (CASSANDRA-1518)
0.6.5
Modified:
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java?rev=1003242&r1=1003241&r2=1003242&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java
(original)
+++
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java
Thu Sep 30 20:36:05 2010
@@ -566,7 +566,7 @@ public class StorageService implements I
// we don't want to update if this node is responsible for the token
and it has a later startup time than endpoint.
InetAddress currentNode = tokenMetadata_.getEndPoint(token);
- if (currentNode == null ||
(FBUtilities.getLocalAddress().equals(currentNode) &&
Gossiper.instance.compareEndpointStartup(endPoint, currentNode) > 0))
+ if (currentNode == null ||
Gossiper.instance.compareEndpointStartup(endPoint, currentNode) > 0)
tokenMetadata_.updateNormalToken(token, endPoint);
else
logger_.info("Will not change my token ownership to " + endPoint);
