Author: jbellis Date: Thu Aug 11 21:21:11 2011 New Revision: 1156837 URL: http://svn.apache.org/viewvc?rev=1156837&view=rev Log: change auto_bootstrap default to true and remove from example config file patch by jbellis as suggested by Peter Schullerfor CASSANDRA-2447
Modified: cassandra/trunk/CHANGES.txt cassandra/trunk/conf/cassandra.yaml cassandra/trunk/src/java/org/apache/cassandra/config/Config.java Modified: cassandra/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1156837&r1=1156836&r2=1156837&view=diff ============================================================================== --- cassandra/trunk/CHANGES.txt (original) +++ cassandra/trunk/CHANGES.txt Thu Aug 11 21:21:11 2011 @@ -32,6 +32,8 @@ * refactoring of the secondary index api (CASSANDRA-2982) * make CL > ONE reads wait for digest reconciliation before returning (CASSANDRA-2494) + * change auto_bootstrap default to true and remove from example config file + (but not config parser) (CASSANDRA-2447) 0.8.5 Modified: cassandra/trunk/conf/cassandra.yaml URL: http://svn.apache.org/viewvc/cassandra/trunk/conf/cassandra.yaml?rev=1156837&r1=1156836&r2=1156837&view=diff ============================================================================== --- cassandra/trunk/conf/cassandra.yaml (original) +++ cassandra/trunk/conf/cassandra.yaml Thu Aug 11 21:21:11 2011 @@ -21,14 +21,6 @@ cluster_name: 'Test Cluster' # a random token, which will lead to hot spots. 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 -# to false because you can only bootstrap N machines at a time from -# 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 - # See http://wiki.apache.org/cassandra/HintedHandoff hinted_handoff_enabled: true # this defines the maximum amount of time a dead host will have hints Modified: cassandra/trunk/src/java/org/apache/cassandra/config/Config.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/config/Config.java?rev=1156837&r1=1156836&r2=1156837&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/config/Config.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/config/Config.java Thu Aug 11 21:21:11 2011 @@ -32,7 +32,7 @@ public class Config /* Hashing strategy Random or OPHF */ public String partitioner; - public Boolean auto_bootstrap = false; + public Boolean auto_bootstrap = true; public Boolean hinted_handoff_enabled = true; public Integer max_hint_window_in_ms = Integer.MAX_VALUE;