You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2015/12/11 10:32:28 UTC
[1/3] cassandra git commit: Warn if system_traces not available for
CASSANDRA-9628
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 a7a03887c -> 37ca86b94
Warn if system_traces not available for CASSANDRA-9628
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9135340a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9135340a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9135340a
Branch: refs/heads/cassandra-3.0
Commit: 9135340a13531930f26fb8175b057342791ff044
Parents: f6deca3
Author: Carl Yeksigian <ca...@apache.org>
Authored: Thu Oct 8 12:13:28 2015 -0400
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Dec 11 10:23:14 2015 +0100
----------------------------------------------------------------------
.../cassandra/service/StorageService.java | 40 +++++++++++---------
1 file changed, 22 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9135340a/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 0d9e9ef..0698d11 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -4004,28 +4004,32 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
if (keyspace != null)
{
- Keyspace keyspaceInstance = Schema.instance.getKeyspaceInstance(keyspace);
- if(keyspaceInstance == null)
- throw new IllegalArgumentException("The keyspace " + keyspace + ", does not exist");
+ Keyspace keyspaceInstance = Schema.instance.getKeyspaceInstance(keyspace);
+ if(keyspaceInstance == null)
+ throw new IllegalArgumentException("The keyspace " + keyspace + ", does not exist");
- if(keyspaceInstance.getReplicationStrategy() instanceof LocalStrategy)
- throw new IllegalStateException("Ownership values for keyspaces with LocalStrategy are meaningless");
+ if(keyspaceInstance.getReplicationStrategy() instanceof LocalStrategy)
+ throw new IllegalStateException("Ownership values for keyspaces with LocalStrategy are meaningless");
}
else
{
- List<String> nonSystemKeyspaces = Schema.instance.getNonSystemKeyspaces();
-
- //system_traces is a non-system keyspace however it needs to be counted as one for this process
- int specialTableCount = 0;
- if (nonSystemKeyspaces.contains("system_traces"))
- {
- specialTableCount += 1;
- }
- if (nonSystemKeyspaces.size() > specialTableCount)
- throw new IllegalStateException("Non-system keyspaces don't have the same replication settings, effective ownership information is meaningless");
-
- keyspace = "system_traces";
- }
+ List<String> nonSystemKeyspaces = Schema.instance.getNonSystemKeyspaces();
+
+ //system_traces is a non-system keyspace however it needs to be counted as one for this process
+ int specialTableCount = 0;
+ if (nonSystemKeyspaces.contains("system_traces"))
+ {
+ specialTableCount += 1;
+ }
+ if (nonSystemKeyspaces.size() > specialTableCount)
+ throw new IllegalStateException("Non-system keyspaces don't have the same replication settings, effective ownership information is meaningless");
+
+ keyspace = "system_traces";
+
+ Keyspace keyspaceInstance = Schema.instance.getKeyspaceInstance(keyspace);
+ if(keyspaceInstance == null)
+ throw new IllegalArgumentException("The node does not have " + keyspace + " yet, probably still bootstrapping");
+ }
TokenMetadata metadata = tokenMetadata.cloneOnlyTokenMap();
[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sl...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/37ca86b9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/37ca86b9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/37ca86b9
Branch: refs/heads/cassandra-3.0
Commit: 37ca86b9469c478c87e8c651eb33389d78ea1edf
Parents: a7a0388 b4d3ac4
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Dec 11 10:31:38 2015 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Dec 11 10:31:38 2015 +0100
----------------------------------------------------------------------
.../cassandra/service/StorageService.java | 40 +++++++++++---------
1 file changed, 22 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/37ca86b9/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
[2/3] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sl...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b4d3ac40
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4d3ac40
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b4d3ac40
Branch: refs/heads/cassandra-3.0
Commit: b4d3ac40b3a6221c2b34b765d709bf7408cb39c2
Parents: 4f3e47b 9135340
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Dec 11 10:25:19 2015 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Dec 11 10:25:19 2015 +0100
----------------------------------------------------------------------
.../cassandra/service/StorageService.java | 40 +++++++++++---------
1 file changed, 22 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b4d3ac40/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------