From 29ff1f2ac2a3da16f75ce87555df8f6014c8303e Mon Sep 17 00:00:00 2001 From: Carl Yeksigian Date: Wed, 21 Oct 2015 12:21:46 -0400 Subject: [PATCH] (phrasing) replace 'wipe' with 'decomission' --- NEWS.txt | 4 ++-- conf/cassandra.yaml | 2 +- src/java/org/apache/cassandra/db/SystemKeyspace.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NEWS.txt b/NEWS.txt index fadd5413e5..67a545b28a 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. diff --git a/conf/cassandra.yaml b/conf/cassandra.yaml index df1aa151fe..e0ef87835d 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: diff --git a/src/java/org/apache/cassandra/db/SystemKeyspace.java b/src/java/org/apache/cassandra/db/SystemKeyspace.java index 72ee2703f2..54fdb47bcc 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."); } } }