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:29 UTC
[01/10] git commit: if relocate is a no-op, don't try to op.
Repository: cassandra
Updated Branches:
refs/heads/cassandra-1.2 1b32b4c91 -> 514ce33bc
refs/heads/cassandra-2.0 04fd84c3d -> ab99b8e75
refs/heads/cassandra-2.1 9cd68230b -> d71b59e67
refs/heads/trunk 9eb16ae5b -> 0c727b532
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-1.2
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);
[03/10] git commit: if relocate is a no-op, don't try to op.
Posted by br...@apache.org.
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);
[08/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d71b59e6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d71b59e6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d71b59e6
Branch: refs/heads/cassandra-2.1
Commit: d71b59e67b0a1bc4fb3ed9a106a4b9b84dcb02b7
Parents: 9cd6823 ab99b8e
Author: Brandon Williams <br...@apache.org>
Authored: Thu Apr 3 17:55:38 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Apr 3 17:55:38 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/d71b59e6/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[02/10] git commit: if relocate is a no-op, don't try to op.
Posted by br...@apache.org.
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.0
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);
[10/10] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by br...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0c727b53
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c727b53
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c727b53
Branch: refs/heads/trunk
Commit: 0c727b53281fc491d22b1b2e8bb78fbcc9b3354f
Parents: 9eb16ae d71b59e
Author: Brandon Williams <br...@apache.org>
Authored: Thu Apr 3 17:55:47 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Apr 3 17:55:47 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/0c727b53/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[07/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ab99b8e7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ab99b8e7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ab99b8e7
Branch: refs/heads/trunk
Commit: ab99b8e75d3d0dadbb8d464c712aea1abd563c44
Parents: 04fd84c 514ce33
Author: Brandon Williams <br...@apache.org>
Authored: Thu Apr 3 17:55:29 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Apr 3 17:55:29 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/ab99b8e7/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[06/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ab99b8e7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ab99b8e7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ab99b8e7
Branch: refs/heads/cassandra-2.0
Commit: ab99b8e75d3d0dadbb8d464c712aea1abd563c44
Parents: 04fd84c 514ce33
Author: Brandon Williams <br...@apache.org>
Authored: Thu Apr 3 17:55:29 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Apr 3 17:55:29 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/ab99b8e7/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[09/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by br...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d71b59e6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d71b59e6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d71b59e6
Branch: refs/heads/trunk
Commit: d71b59e67b0a1bc4fb3ed9a106a4b9b84dcb02b7
Parents: 9cd6823 ab99b8e
Author: Brandon Williams <br...@apache.org>
Authored: Thu Apr 3 17:55:38 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Apr 3 17:55:38 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/d71b59e6/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[05/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by br...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ab99b8e7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ab99b8e7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ab99b8e7
Branch: refs/heads/cassandra-2.1
Commit: ab99b8e75d3d0dadbb8d464c712aea1abd563c44
Parents: 04fd84c 514ce33
Author: Brandon Williams <br...@apache.org>
Authored: Thu Apr 3 17:55:29 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Thu Apr 3 17:55:29 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/ab99b8e7/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[04/10] git commit: if relocate is a no-op, don't try to op.
Posted by br...@apache.org.
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/trunk
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);