Author: ivol37 at gmail.com
Date: Wed Jan 12 15:26:33 2011
New Revision: 603
Log:
[AMDATU-254] Auto bootstrap mode is now configurable
Modified:
trunk/amdatu-cassandra/cassandra-application/src/main/resources/conf/cassandra.yaml
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.amdatu.core.cassandra.application.cfg
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
Wed Jan 12 15:26:33 2011
@@ -27,7 +27,7 @@
# an existing cluster of N, so if you are bringing up a cluster of
# 10 machines with 3 seeds you would have to do it in stages. Leaving
# this off for the initial start simplifies that.
-auto_bootstrap: false
+auto_bootstrap: ${org.amdatu.core.cassandra.application/autobootstrap}
# See http://wiki.apache.org/cassandra/HintedHandoff
hinted_handoff_enabled: true
Modified:
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.amdatu.core.cassandra.application.cfg
==============================================================================
---
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.amdatu.core.cassandra.application.cfg
(original)
+++
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.amdatu.core.cassandra.application.cfg
Wed Jan 12 15:26:33 2011
@@ -58,6 +58,10 @@
# amount of nodes in the cluster that should have received the write request
operation
# before the call is returned. Note that if the write consistency level is
ALL, all
# nodes in the cluster are effectively down as soon as one node in the cluster
goes
-# down, as cassandra will block each write operation until this (unavailble)
node
+# down, as cassandra will block each write operation until this (unavailable)
node
# answered.
consistency_level_write=${cassandra.consistency_level_write}
+
+# Auto bootstrap should be enabled for nodes that are newly added to an
existing Cassandra
+# cluster. After that, autobootstrap must be set to false
+autobootstrap=${cassandra.autobootstrap}
\ No newline at end of file
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
Wed Jan 12 15:26:33 2011
@@ -71,6 +71,7 @@
properties.put("clustername", "'Amdatu cluster'");
properties.put("seeds", "127.0.0.1");
properties.put("listen_address", "localhost");
+ properties.put("autobootstrap", "false");
properties.put("default_replication_factor", "1");
properties.put("consistency_level_read", "ONE");
properties.put("consistency_level_write", "ONE");
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Wed Jan 12 15:26:33 2011
@@ -60,6 +60,9 @@
<!-- The WRITE consistency level -->
<cassandra.consistency_level_write>ONE</cassandra.consistency_level_write>
+ <!-- Auto bootstrap mode -->
+ <cassandra.autobootstrap>false</cassandra.autobootstrap>
+
<!--
Version numbers of dependent libraries
-->
