You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/08/12 04:33:31 UTC
[3/6] git commit: enable vnodes by default (CASSANDRA-5869) patch by
jbellis; reviewed by brandonwilliams for CASSANDRA-5869
enable vnodes by default (CASSANDRA-5869)
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-5869
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a28df0d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a28df0d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a28df0d
Branch: refs/heads/trunk
Commit: 9a28df0d0f87244bde2eccdc3fb359b6f3bfa183
Parents: 298e91d
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sun Aug 11 21:32:11 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Sun Aug 11 21:32:49 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
NEWS.txt | 3 +++
conf/cassandra.yaml | 21 +++++++--------------
3 files changed, 12 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a28df0d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ba644d3..5bc2745 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
-2.0.0
+2.0.0-rc2
+ * enable vnodes by default (CASSANDRA-5869)
* fix CAS contention timeout (CASSANDRA-5830)
* fix HsHa to respect max frame size (CASSANDRA-4573)
Merged from 1.2:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a28df0d/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 9b2c172..b807973 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -54,6 +54,9 @@ Upgrading
Operations
----------
+ - VNodes are enabled by default in cassandra.yaml. initial_token
+ for non-vnode deployments has been removed from the example
+ yaml, but is still respected if specified.
- Major compactions, cleanup, scrub, and upgradesstables will interrupt
any in-progress compactions (but not repair validations) when invoked.
- Disabling autocompactions by setting min/max compaction threshold to 0
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a28df0d/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 16d9e25..db7049d 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -21,20 +21,13 @@ cluster_name: 'Test Cluster'
#
# If you already have a cluster with 1 token per node, and wish to migrate to
# multiple tokens per node, see http://wiki.apache.org/cassandra/Operations
-# num_tokens: 256
-
-# If you haven't specified num_tokens, or have set it to the default of 1 then
-# you should always specify InitialToken when setting up a production
-# cluster for the first time, and often when adding capacity later.
-# The principle is that each node should be given an equal slice of
-# the token ring; see http://wiki.apache.org/cassandra/Operations
-# for more details.
-#
-# If blank, Cassandra will request a token bisecting the range of
-# 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:
+num_tokens: 256
+
+# 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
+# comma-separated list -- it's primarily used when adding nodes # to legacy clusters
+# that do not have vnodes enabled.
+# initial_token:
# See http://wiki.apache.org/cassandra/HintedHandoff
hinted_handoff_enabled: true