cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject cassandra git commit: Update cassandra.yaml allocate_tokens_for_keyspace to match the actual config variable
Date Wed, 07 Oct 2015 11:59:00 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 566799f56 -> 36d0f55d4


Update cassandra.yaml allocate_tokens_for_keyspace to match the actual config variable


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36d0f55d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36d0f55d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36d0f55d

Branch: refs/heads/cassandra-3.0
Commit: 36d0f55d46ac0edb5a4f140c7993c6d207605fe7
Parents: 566799f
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Wed Oct 7 13:57:13 2015 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Wed Oct 7 13:57:13 2015 +0200

----------------------------------------------------------------------
 conf/cassandra.yaml                                          | 2 +-
 src/java/org/apache/cassandra/config/DatabaseDescriptor.java | 4 ++--
 src/java/org/apache/cassandra/dht/BootStrapper.java          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/36d0f55d/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 33ca4a8..19ebf8a 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -33,7 +33,7 @@ num_tokens: 256
 # vnodes.
 #
 # Only supported with the Murmur3Partitioner.
-# allocate_tokens_keyspace: KEYSPACE
+# allocate_tokens_for_keyspace: KEYSPACE
 
 # initial_token allows you to specify tokens manually.  While you can use # it with
 # vnodes (num_tokens > 1, above) -- in which case you should provide a 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/36d0f55d/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index ccc3dd1..a43fe4e 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -912,9 +912,9 @@ public class DatabaseDescriptor
         return tokensFromString(System.getProperty("cassandra.initial_token", conf.initial_token));
     }
 
-    public static String getAllocateTokensKeyspace()
+    public static String getAllocateTokensForKeyspace()
     {
-        return System.getProperty("cassandra.allocate_tokens_keyspace", conf.allocate_tokens_for_keyspace);
+        return System.getProperty("cassandra.allocate_tokens_for_keyspace", conf.allocate_tokens_for_keyspace);
     }
 
     public static Collection<String> tokensFromString(String tokenString)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/36d0f55d/src/java/org/apache/cassandra/dht/BootStrapper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/BootStrapper.java b/src/java/org/apache/cassandra/dht/BootStrapper.java
index c0f0402..8d8f5c7 100644
--- a/src/java/org/apache/cassandra/dht/BootStrapper.java
+++ b/src/java/org/apache/cassandra/dht/BootStrapper.java
@@ -156,7 +156,7 @@ public class BootStrapper extends ProgressEventNotifierSupport
      */
     public static Collection<Token> getBootstrapTokens(final TokenMetadata metadata,
InetAddress address) throws ConfigurationException
     {
-        String allocationKeyspace = DatabaseDescriptor.getAllocateTokensKeyspace();
+        String allocationKeyspace = DatabaseDescriptor.getAllocateTokensForKeyspace();
         Collection<String> initialTokens = DatabaseDescriptor.getInitialTokens();
         if (initialTokens.size() > 0 && allocationKeyspace != null)
             logger.warn("manually specified tokens override automatic allocation");


Mime
View raw message