Author: jbellis
Date: Tue Jun 15 15:44:17 2010
New Revision: 954937
URL: http://svn.apache.org/viewvc?rev=954937&view=rev
Log:
specify that sleep times during node movement are in ms. patch by Robert Coli;
reviewed by jbellis for CASSANDRA-1184
Modified:
cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java
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=954937&r1=954936&r2=954937&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
Tue Jun 15 15:44:17 2010
@@ -393,7 +393,7 @@ public class StorageService implements I
isBootstrapMode = true;
SystemTable.updateToken(token); // DON'T use setToken, that makes us
part of the ring locally which is incorrect until we are done bootstrapping
Gossiper.instance.addLocalApplicationState(MOVE_STATE, new
ApplicationState(STATE_BOOTSTRAPPING + Delimiter +
partitioner_.getTokenFactory().toString(token)));
- setMode("Joining: sleeping " + RING_DELAY + " for pending range
setup", true);
+ setMode("Joining: sleeping " + RING_DELAY + " ms for pending range
setup", true);
try
{
Thread.sleep(RING_DELAY);
@@ -1324,7 +1324,7 @@ public class StorageService implements I
if (logger_.isDebugEnabled())
logger_.debug("DECOMMISSIONING");
startLeaving();
- setMode("Leaving: sleeping " + RING_DELAY + " for pending range
setup", true);
+ setMode("Leaving: sleeping " + RING_DELAY + " ms for pending range
setup", true);
Thread.sleep(RING_DELAY);
Runnable finishLeaving = new Runnable()
@@ -1441,7 +1441,7 @@ public class StorageService implements I
if (logger_.isDebugEnabled())
logger_.debug("Leaving: old token was " + getLocalToken());
startLeaving();
- setMode("Leaving: sleeping " + RING_DELAY + " for pending range
setup", true);
+ setMode("Leaving: sleeping " + RING_DELAY + " ms for pending range
setup", true);
Thread.sleep(RING_DELAY);
Runnable finishMoving = new WrappedRunnable()
