You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2014/08/01 18:48:42 UTC
git commit: consistent.rangemovement ->
cassandra.consistent.rangemovement
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1.0 2f48723bf -> a48b3c422
consistent.rangemovement -> cassandra.consistent.rangemovement
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a48b3c42
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a48b3c42
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a48b3c42
Branch: refs/heads/cassandra-2.1.0
Commit: a48b3c42255d99eb22b826a3abffea8409f7feea
Parents: 2f48723
Author: Jake Luciani <ja...@apache.org>
Authored: Fri Aug 1 12:48:30 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Fri Aug 1 12:48:30 2014 -0400
----------------------------------------------------------------------
NEWS.txt | 2 +-
src/java/org/apache/cassandra/dht/RangeStreamer.java | 4 ++--
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a48b3c42/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 3cbe3d1..b42db60 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -46,7 +46,7 @@ New features
meaning the data for the new node is taken from the node that is no
longer a responsible for that range of keys.
If you want the old behavior (due to a lost node perhaps)
- you can set the following property (-Dconsistent.rangemovement=false)
+ you can set the following property (-Dcassandra.consistent.rangemovement=false)
Upgrading
---------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a48b3c42/src/java/org/apache/cassandra/dht/RangeStreamer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/RangeStreamer.java b/src/java/org/apache/cassandra/dht/RangeStreamer.java
index 14d24fc..c5d45f9 100644
--- a/src/java/org/apache/cassandra/dht/RangeStreamer.java
+++ b/src/java/org/apache/cassandra/dht/RangeStreamer.java
@@ -47,7 +47,7 @@ import org.apache.cassandra.utils.FBUtilities;
public class RangeStreamer
{
private static final Logger logger = LoggerFactory.getLogger(RangeStreamer.class);
- public static final boolean useStrictConsistency = Boolean.valueOf(System.getProperty("consistent.rangemovement","true"));
+ public static final boolean useStrictConsistency = Boolean.valueOf(System.getProperty("cassandra.consistent.rangemovement","true"));
private final Collection<Token> tokens;
private final TokenMetadata metadata;
private final InetAddress address;
@@ -231,7 +231,7 @@ public class RangeStreamer
InetAddress sourceIp = addressList.iterator().next();
EndpointState sourceState = Gossiper.instance.getEndpointStateForEndpoint(sourceIp);
if (Gossiper.instance.isEnabled() && (sourceState == null || !sourceState.isAlive()))
- throw new RuntimeException("A node required to move the data consistently is down ("+sourceIp+"). If you wish to move the data from a potentially inconsistent replica, restart the node with -Dconsistent.rangemovement=false");
+ throw new RuntimeException("A node required to move the data consistently is down ("+sourceIp+"). If you wish to move the data from a potentially inconsistent replica, restart the node with -Dcassandra.consistent.rangemovement=false");
}
return rangeSources;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a48b3c42/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 18148b7..46e6588 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -3249,7 +3249,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
InetAddress sourceIp = addressList.iterator().next();
if (Gossiper.instance.isEnabled() && !Gossiper.instance.getEndpointStateForEndpoint(sourceIp).isAlive())
- throw new RuntimeException("A node required to move the data consistently is down ("+sourceIp+"). If you wish to move the data from a potentially inconsistent replica, restart the node with -Dconsistent.rangemovement=false");
+ throw new RuntimeException("A node required to move the data consistently is down ("+sourceIp+"). If you wish to move the data from a potentially inconsistent replica, restart the node with -Dcassandra.consistent.rangemovement=false");
}
}