Author: ivol37 at gmail.com
Date: Thu Jan 13 09:13:08 2011
New Revision: 614
Log:
[AMDATU-254] Initial token is now configurable
Modified:
trunk/amdatu-cassandra/cassandra-application/src/main/resources/conf/cassandra.yaml
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/ConfigProvider.java
trunk/pom.xml
Modified:
trunk/amdatu-cassandra/cassandra-application/src/main/resources/conf/cassandra.yaml
==============================================================================
---
trunk/amdatu-cassandra/cassandra-application/src/main/resources/conf/cassandra.yaml
(original)
+++
trunk/amdatu-cassandra/cassandra-application/src/main/resources/conf/cassandra.yaml
Thu Jan 13 09:13:08 2011
@@ -19,7 +19,7 @@
# the heaviest-loaded existing node. If there is no load information
# available, such as is the case with a new cluster, it will pick
# a random token, which will lead to hot spots.
-initial_token:
+initial_token: ${org.amdatu.core.cassandra.application/initial_token}
# Set to true to make new [non-seed] nodes automatically migrate data
# to themselves from the pre-existing nodes in the cluster. Defaults
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/ConfigProvider.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/ConfigProvider.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/ConfigProvider.java
Thu Jan 13 09:13:08 2011
@@ -75,6 +75,7 @@
properties.put("default_replication_factor", "1");
properties.put("consistency_level_read", "ONE");
properties.put("consistency_level_write", "ONE");
+ properties.put("initial_token", "");
config.update(properties);
}
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Thu Jan 13 09:13:08 2011
@@ -63,6 +63,10 @@
<!-- Auto bootstrap mode -->
<cassandra.autobootstrap>false</cassandra.autobootstrap>
+ <!-- The initial token. If you plan to later build a cluster including
this first instance, it is
+ recommended to set the initial token?s value to zero -->
+ <cassandra.initial_token></cassandra.initial_token>
+
<!--
Version numbers of dependent libraries
-->