Author: jbellis
Date: Mon May 24 17:51:19 2010
New Revision: 947731
URL: http://svn.apache.org/viewvc?rev=947731&view=rev
Log:
convert byte tokens to strings correctly. patch by Erick Tryzelaar; reviewed
by Stu Hood for CASSANDRA-1008
Modified:
cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
Modified:
cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=947731&r1=947730&r2=947731&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
Mon May 24 17:51:19 2010
@@ -1334,7 +1334,7 @@ public class StorageService implements I
*/
private void startLeaving()
{
- Gossiper.instance.addLocalApplicationState(MOVE_STATE, new
ApplicationState(STATE_LEAVING + Delimiter + getLocalToken().toString()));
+ Gossiper.instance.addLocalApplicationState(MOVE_STATE, new
ApplicationState(STATE_LEAVING + Delimiter +
partitioner_.getTokenFactory().toString(getLocalToken())));
tokenMetadata_.addLeavingEndpoint(FBUtilities.getLocalAddress());
calculatePendingRanges();
}
@@ -1377,7 +1377,7 @@ public class StorageService implements I
tokenMetadata_.removeEndpoint(FBUtilities.getLocalAddress());
calculatePendingRanges();
- Gossiper.instance.addLocalApplicationState(MOVE_STATE, new
ApplicationState(STATE_LEFT + Delimiter + LEFT_NORMALLY + Delimiter +
getLocalToken().toString()));
+ Gossiper.instance.addLocalApplicationState(MOVE_STATE, new
ApplicationState(STATE_LEFT + Delimiter + LEFT_NORMALLY + Delimiter +
partitioner_.getTokenFactory().toString(getLocalToken())));
try
{
Thread.sleep(2 * Gossiper.intervalInMillis_);
@@ -1521,7 +1521,7 @@ public class StorageService implements I
// not good. REMOVE_TOKEN|LEFT_NORMALLY is used to distinguish
// between ``removetoken command and normal state left, so it is
// not so bad.
- Gossiper.instance.addLocalApplicationState(MOVE_STATE, new
ApplicationState(STATE_LEFT + Delimiter + REMOVE_TOKEN + Delimiter +
token.toString()));
+ Gossiper.instance.addLocalApplicationState(MOVE_STATE, new
ApplicationState(STATE_LEFT + Delimiter + REMOVE_TOKEN + Delimiter +
partitioner_.getTokenFactory().toString(token)));
}
public boolean isClientMode()
