cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [1/2] cassandra git commit: (phrasing) replace 'wipe' with 'decomission'
Date Wed, 21 Oct 2015 20:10:03 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 20d550861 -> 12e38f7f8


(phrasing) replace 'wipe' with 'decomission'


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

Branch: refs/heads/cassandra-2.2
Commit: 29ff1f2ac2a3da16f75ce87555df8f6014c8303e
Parents: a2c4d4e
Author: Carl Yeksigian <carl@apache.org>
Authored: Wed Oct 21 12:21:46 2015 -0400
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Oct 21 20:59:33 2015 +0100

----------------------------------------------------------------------
 NEWS.txt                                             | 4 ++--
 conf/cassandra.yaml                                  | 2 +-
 src/java/org/apache/cassandra/db/SystemKeyspace.java | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ff1f2a/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index fadd541..67a545b 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -19,8 +19,8 @@ using the provided 'sstableupgrade' tool.
 New features
 ------------
     - Switching racks is no longer an allowed operation on a node which has
-      data. Instead, the node will need to be wiped and bootstrapped. If
-      moving from the SimpleSnitch, make sure the rack containing all current
+      data. Instead, the node will need to be decommissioned and rebootstrapped.
+      If moving from the SimpleSnitch, make sure the rack containing all current
       nodes is named "rack1". To override this behavior when manually wiping
       the node and bootstrapping, use -Dcassandra.ignore_rack=true.
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ff1f2a/conf/cassandra.yaml
----------------------------------------------------------------------
diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml
index df1aa15..e0ef878 100644
--- a/conf/cassandra.yaml
+++ b/conf/cassandra.yaml
@@ -655,7 +655,7 @@ cross_node_timeout: false
 # ARE PLACED.
 #
 # IF THE RACK A REPLICA IS PLACED IN CHANGES AFTER THE REPLICA HAS BEEN
-# ADDED TO A RING, THE NODE MUST BE WIPED AND REBOOTSTRAPPED.
+# ADDED TO A RING, THE NODE MUST BE DECOMMISSIONED AND REBOOTSTRAPPED.
 #
 # Out of the box, Cassandra provides
 #  - SimpleSnitch:

http://git-wip-us.apache.org/repos/asf/cassandra/blob/29ff1f2a/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SystemKeyspace.java b/src/java/org/apache/cassandra/db/SystemKeyspace.java
index 72ee270..54fdb47 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -643,7 +643,7 @@ public class SystemKeyspace
                 if (!storedRack.equals(currentRack))
                 {
                     throw new ConfigurationException("Cannot start node if snitch's rack
(" + currentRack + ") differs from previous rack (" + storedRack + "). " +
-                                                     "Please fix the snitch or wipe and rebootstrap
this node.");
+                                                     "Please fix the snitch or decommission
and rebootstrap this node.");
                 }
             }
         }


Mime
View raw message