You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/04/04 00:59:31 UTC
[03/10] git commit: if relocate is a no-op, don't try to op.
if relocate is a no-op, don't try to op.
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/514ce33b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/514ce33b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/514ce33b
Branch: refs/heads/cassandra-2.1
Commit: 514ce33bc99c665b9a82ffb0635e07be42fa1fe7
Parents: 1b32b4c
Author: Brandon Williams <br...@apache.org>
Authored: Thu Apr 3 17:55:10 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Apr 3 17:55:10 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/StorageService.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/514ce33b/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 6929100..d5b7bb5 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -3204,7 +3204,10 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
}
if (tokens.size() < 1)
+ {
logger.warn("no valid token arguments specified; nothing to relocate");
+ return;
+ }
Gossiper.instance.addLocalApplicationState(ApplicationState.STATUS, valueFactory.relocating(tokens));
setMode(Mode.RELOCATING, String.format("relocating %s to %s", tokens, localAddress.getHostAddress()), true);