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 2016/07/26 15:59:21 UTC

[1/5] cassandra git commit: update cassandra.yaml comments post-CASSANDRA-10243

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.9 addf9c2c8 -> 5fe02b313
  refs/heads/trunk 1eede6e38 -> 2c0edce09


update cassandra.yaml comments post-CASSANDRA-10243


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

Branch: refs/heads/cassandra-3.9
Commit: 16086998e1c7a51ff2e15411b348e280d29516ef
Parents: 6105da3
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 26 10:54:31 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jul 26 10:58:44 2016 -0500

----------------------------------------------------------------------
 conf/cassandra.yaml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/16086998/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 09d2094..085b68e 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -762,12 +762,15 @@ cross_node_timeout: false
 #   more than one replica on the same "rack" (which may not actually
 #   be a physical location)
 #
-# IF YOU CHANGE THE SNITCH AFTER DATA IS INSERTED INTO THE CLUSTER,
-# YOU MUST RUN A FULL REPAIR, SINCE THE SNITCH AFFECTS WHERE REPLICAS
-# ARE PLACED.
-#
-# IF THE RACK A REPLICA IS PLACED IN CHANGES AFTER THE REPLICA HAS BEEN
-# ADDED TO A RING, THE NODE MUST BE DECOMMISSIONED AND REBOOTSTRAPPED.
+# CASSANDRA WILL NOT ALLOW YOU TO SWITCH TO AN INCOMPATIBLE SNITCH
+# ONCE DATA IS INSERTED INTO THE CLUSTER.  This would cause data loss.
+# This means that if you start with the default SimpleSnitch, which
+# locates every node on "rack1" in "datacenter1", your only options
+# if you need to add another datacenter are GossipingPropertyFileSnitch
+# (and the older PFS).  From there, if you want to migrate to an
+# incompatible snitch like Ec2Snitch you can do it by adding new nodes
+# under Ec2Snitch (which will locate them in a new "datacenter") and
+# decommissioning the old ones.
 #
 # Out of the box, Cassandra provides
 #  - SimpleSnitch:


[5/5] cassandra git commit: Merge branch 'cassandra-3.9' into trunk

Posted by jb...@apache.org.
Merge branch 'cassandra-3.9' into trunk


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

Branch: refs/heads/trunk
Commit: 2c0edce0941b18cc2be8140f5e28a19bebf6029b
Parents: 1eede6e 5fe02b3
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 26 10:59:15 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jul 26 10:59:15 2016 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------



[2/5] cassandra git commit: update cassandra.yaml comments post-CASSANDRA-10243

Posted by jb...@apache.org.
update cassandra.yaml comments post-CASSANDRA-10243


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

Branch: refs/heads/trunk
Commit: 16086998e1c7a51ff2e15411b348e280d29516ef
Parents: 6105da3
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 26 10:54:31 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jul 26 10:58:44 2016 -0500

----------------------------------------------------------------------
 conf/cassandra.yaml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/16086998/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index 09d2094..085b68e 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -762,12 +762,15 @@ cross_node_timeout: false
 #   more than one replica on the same "rack" (which may not actually
 #   be a physical location)
 #
-# IF YOU CHANGE THE SNITCH AFTER DATA IS INSERTED INTO THE CLUSTER,
-# YOU MUST RUN A FULL REPAIR, SINCE THE SNITCH AFFECTS WHERE REPLICAS
-# ARE PLACED.
-#
-# IF THE RACK A REPLICA IS PLACED IN CHANGES AFTER THE REPLICA HAS BEEN
-# ADDED TO A RING, THE NODE MUST BE DECOMMISSIONED AND REBOOTSTRAPPED.
+# CASSANDRA WILL NOT ALLOW YOU TO SWITCH TO AN INCOMPATIBLE SNITCH
+# ONCE DATA IS INSERTED INTO THE CLUSTER.  This would cause data loss.
+# This means that if you start with the default SimpleSnitch, which
+# locates every node on "rack1" in "datacenter1", your only options
+# if you need to add another datacenter are GossipingPropertyFileSnitch
+# (and the older PFS).  From there, if you want to migrate to an
+# incompatible snitch like Ec2Snitch you can do it by adding new nodes
+# under Ec2Snitch (which will locate them in a new "datacenter") and
+# decommissioning the old ones.
 #
 # Out of the box, Cassandra provides
 #  - SimpleSnitch:


[3/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Posted by jb...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/trunk
Commit: 5fe02b313144b3ccf71454d9aeb6a41384d9d989
Parents: addf9c2 1608699
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 26 10:59:09 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jul 26 10:59:09 2016 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------



[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Posted by jb...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.9


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

Branch: refs/heads/cassandra-3.9
Commit: 5fe02b313144b3ccf71454d9aeb6a41384d9d989
Parents: addf9c2 1608699
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Jul 26 10:59:09 2016 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Jul 26 10:59:09 2016 -0500

----------------------------------------------------------------------

----------------------------------------------------------------------