cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/4] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Wed, 21 Oct 2015 20:11:01 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2


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

Branch: refs/heads/trunk
Commit: 12e38f7f8e9eacf80cd060baeb6b0ca750b1c861
Parents: 20d5508 29ff1f2
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Oct 21 21:09:46 2015 +0100
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Oct 21 21:09:46 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/12e38f7f/NEWS.txt
----------------------------------------------------------------------
diff --cc NEWS.txt
index 4fa61c0,67a545b..028d26d
--- a/NEWS.txt
+++ b/NEWS.txt
@@@ -13,23 -13,19 +13,23 @@@ restore snapshots created with the prev
  'sstableloader' tool. You can upgrade the file format of your snapshots
  using the provided 'sstableupgrade' tool.
  
 -2.1.12
 -======
 +2.2.4
 +=====
  
 -New features
 -------------
 +Deprecation
 +-----------
 +    - Pig support has been deprecated, and will be removed in 3.0.
 +      Please see CASSANDRA-10542 for more details.
 +
 +Operations
 +----------
      - 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.
 +      nodes is named "rack1".
  
  
 -2.1.11
 +2.2.3
  =====
  
  Upgrading

http://git-wip-us.apache.org/repos/asf/cassandra/blob/12e38f7f/conf/cassandra.yaml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/12e38f7f/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/CassandraDaemon.java
index 9e38e06,17553f3..45e1812
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@@ -231,19 -319,6 +231,19 @@@ public class CassandraDaemo
          }
  
          Keyspace.setInitialized();
 +
 +        String storedRack = SystemKeyspace.getRack();
 +        if (storedRack != null)
 +        {
 +            String currentRack = DatabaseDescriptor.getEndpointSnitch().getRack(FBUtilities.getBroadcastAddress());
 +            if (!storedRack.equals(currentRack))
 +            {
 +                logger.error("Cannot start node if snitch's rack differs from previous rack.
" +
-                              "Please fix the snitch or wipe and rebootstrap this node.");
++                             "Please fix the snitch or decommission and rebootstrap this
node.");
 +                System.exit(100);
 +            }
 +        }
 +
          // initialize keyspaces
          for (String keyspaceName : Schema.instance.getKeyspaces())
          {


Mime
View raw message