You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2015/12/04 20:32:01 UTC
[01/22] cassandra git commit: Disable reloading of
GossipingPropertyFileSnitch
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 acdbba795 -> f6deca3db
refs/heads/cassandra-2.2 c8136b98f -> 879c49bb7
refs/heads/cassandra-3.0 69bf1c6e4 -> a4da379bb
refs/heads/cassandra-3.1 eb0f56dd2 -> 2b8cdc234
refs/heads/trunk 34be4d61c -> 646da9aa8
Disable reloading of GossipingPropertyFileSnitch
Patch by molsson; reviewed by pmotta for CASSANDRA-9474
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6deca3d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6deca3d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6deca3d
Branch: refs/heads/cassandra-2.1
Commit: f6deca3db2ec173c8d0b2cd33ef2660012ae3f69
Parents: acdbba7
Author: Marcus Olsson <ma...@ericsson.com>
Authored: Fri Dec 4 14:21:15 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:21:15 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 16 +++++++--------
.../org/apache/cassandra/db/SystemKeyspace.java | 21 +++++++++++++++++---
3 files changed, 26 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6deca3d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1a2887a..46cda65 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.13
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
* Fix Stress profile parsing on Windows (CASSANDRA-10808)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6deca3d/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index cae8dfb..7a15d02 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -24,20 +24,18 @@ New features
- DTCS option max_sstable_age_days is now deprecated and defaults to 1000 days.
- Native protocol server now allows both SSL and non-SSL connections on
the same port.
- - Switching racks is no longer an allowed operation on a node which has
- 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.
- a new validate(key, cf) method is added to PerRowSecondaryIndex. A default
implementation is provided, so no changes are required to custom implementations.
Operations
------------
- - Changing rack or dc of live nodes is no longer possible for PropertyFileSnitch
- and YamlFileNetworkTopologySnitch. Reloading the configuration file of
- GossipingPropertyFileSnitch has been disabled, CASSANDRA-10243.
-
+ - Switching data center or racks is no longer an allowed operation on a node
+ which has data. Instead, the node will need to be decommissioned and
+ rebootstrapped. If moving from the SimpleSnitch, make sure that the data
+ center and rack containing all current nodes is named "datacenter1" and
+ "rack1". To override this behaviour use -Dcassandra.ignore_rack=true and/or
+ -Dcassandra.ignore_dc=true.
+ - Reloading the configuration file of GossipingPropertyFileSnitch has been disabled.
2.1.11
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6deca3d/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 c600652..1f66b1b 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -614,11 +614,26 @@ public class SystemKeyspace
}
}
- if (!Boolean.getBoolean("cassandra.ignore_rack"))
+ String req = "SELECT rack, data_center FROM system.%s WHERE key='%s'";
+ UntypedResultSet result = executeInternal(String.format(req, LOCAL_CF, LOCAL_KEY));
+
+ if (!Boolean.getBoolean("cassandra.ignore_dc"))
{
- String req = "SELECT rack FROM system.%s WHERE key='%s'";
- UntypedResultSet result = executeInternal(String.format(req, LOCAL_CF, LOCAL_KEY));
+ // Look up the dc (return it if found)
+ if (!result.isEmpty() && result.one().has("data_center"))
+ {
+ String storedDc = result.one().getString("data_center");
+ String currentDc = DatabaseDescriptor.getEndpointSnitch().getDatacenter(FBUtilities.getBroadcastAddress());
+ if (!storedDc.equals(currentDc))
+ {
+ throw new ConfigurationException("Cannot start node if snitch's data center (" + currentDc + ") differs from previous data center (" + storedDc + "). " +
+ "Please fix the snitch configuration, decommission and rebootstrap this node or use the flag -Dcassandra.ignore_dc=true.");
+ }
+ }
+ }
+ if (!Boolean.getBoolean("cassandra.ignore_rack"))
+ {
// Look up the Rack (return it if found)
if (!result.isEmpty() && result.one().has("rack"))
{
[07/22] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by jm...@apache.org.
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/1a00f001
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a00f001
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a00f001
Branch: refs/heads/cassandra-3.1
Commit: 1a00f001fad5636b846062b340237c1a331d77ac
Parents: c8136b9 f6deca3
Author: Joshua McKenzie <jm...@apache.org>
Authored: Fri Dec 4 14:22:02 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:22:02 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[08/22] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by jm...@apache.org.
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/1a00f001
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a00f001
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a00f001
Branch: refs/heads/trunk
Commit: 1a00f001fad5636b846062b340237c1a331d77ac
Parents: c8136b9 f6deca3
Author: Joshua McKenzie <jm...@apache.org>
Authored: Fri Dec 4 14:22:02 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:22:02 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[02/22] cassandra git commit: Disable reloading of
GossipingPropertyFileSnitch
Posted by jm...@apache.org.
Disable reloading of GossipingPropertyFileSnitch
Patch by molsson; reviewed by pmotta for CASSANDRA-9474
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6deca3d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6deca3d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6deca3d
Branch: refs/heads/cassandra-3.1
Commit: f6deca3db2ec173c8d0b2cd33ef2660012ae3f69
Parents: acdbba7
Author: Marcus Olsson <ma...@ericsson.com>
Authored: Fri Dec 4 14:21:15 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:21:15 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 16 +++++++--------
.../org/apache/cassandra/db/SystemKeyspace.java | 21 +++++++++++++++++---
3 files changed, 26 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6deca3d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1a2887a..46cda65 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.13
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
* Fix Stress profile parsing on Windows (CASSANDRA-10808)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6deca3d/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index cae8dfb..7a15d02 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -24,20 +24,18 @@ New features
- DTCS option max_sstable_age_days is now deprecated and defaults to 1000 days.
- Native protocol server now allows both SSL and non-SSL connections on
the same port.
- - Switching racks is no longer an allowed operation on a node which has
- 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.
- a new validate(key, cf) method is added to PerRowSecondaryIndex. A default
implementation is provided, so no changes are required to custom implementations.
Operations
------------
- - Changing rack or dc of live nodes is no longer possible for PropertyFileSnitch
- and YamlFileNetworkTopologySnitch. Reloading the configuration file of
- GossipingPropertyFileSnitch has been disabled, CASSANDRA-10243.
-
+ - Switching data center or racks is no longer an allowed operation on a node
+ which has data. Instead, the node will need to be decommissioned and
+ rebootstrapped. If moving from the SimpleSnitch, make sure that the data
+ center and rack containing all current nodes is named "datacenter1" and
+ "rack1". To override this behaviour use -Dcassandra.ignore_rack=true and/or
+ -Dcassandra.ignore_dc=true.
+ - Reloading the configuration file of GossipingPropertyFileSnitch has been disabled.
2.1.11
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6deca3d/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 c600652..1f66b1b 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -614,11 +614,26 @@ public class SystemKeyspace
}
}
- if (!Boolean.getBoolean("cassandra.ignore_rack"))
+ String req = "SELECT rack, data_center FROM system.%s WHERE key='%s'";
+ UntypedResultSet result = executeInternal(String.format(req, LOCAL_CF, LOCAL_KEY));
+
+ if (!Boolean.getBoolean("cassandra.ignore_dc"))
{
- String req = "SELECT rack FROM system.%s WHERE key='%s'";
- UntypedResultSet result = executeInternal(String.format(req, LOCAL_CF, LOCAL_KEY));
+ // Look up the dc (return it if found)
+ if (!result.isEmpty() && result.one().has("data_center"))
+ {
+ String storedDc = result.one().getString("data_center");
+ String currentDc = DatabaseDescriptor.getEndpointSnitch().getDatacenter(FBUtilities.getBroadcastAddress());
+ if (!storedDc.equals(currentDc))
+ {
+ throw new ConfigurationException("Cannot start node if snitch's data center (" + currentDc + ") differs from previous data center (" + storedDc + "). " +
+ "Please fix the snitch configuration, decommission and rebootstrap this node or use the flag -Dcassandra.ignore_dc=true.");
+ }
+ }
+ }
+ if (!Boolean.getBoolean("cassandra.ignore_rack"))
+ {
// Look up the Rack (return it if found)
if (!result.isEmpty() && result.one().has("rack"))
{
[20/22] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.1
Posted by jm...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2b8cdc23
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2b8cdc23
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2b8cdc23
Branch: refs/heads/cassandra-3.1
Commit: 2b8cdc2343a2169f764511a54f32e0cd41078f40
Parents: eb0f56d a4da379
Author: Joshua McKenzie <jm...@apache.org>
Authored: Fri Dec 4 14:30:37 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:30:37 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 18 +++-----
.../org/apache/cassandra/db/SystemKeyspace.java | 15 ++++++
.../cassandra/service/CassandraDaemon.java | 15 ------
.../apache/cassandra/service/StartupChecks.java | 48 +++++++++++++++++++-
5 files changed, 70 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b8cdc23/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7c7e301,8f3f182..e06653f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
-3.0.1
+3.1
+Merged from 3.0:
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
* Handle single-column deletions correction in materialized views
when the column is part of the view primary key (CASSANDRA-10796)
* Fix issue with datadir migration on upgrade (CASSANDRA-10788)
[05/22] cassandra git commit: Disable reloading of
GossipingPropertyFileSnitch
Posted by jm...@apache.org.
Disable reloading of GossipingPropertyFileSnitch
Patch by molsson; reviewed by pmotta for CASSANDRA-9474
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6deca3d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6deca3d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6deca3d
Branch: refs/heads/cassandra-3.0
Commit: f6deca3db2ec173c8d0b2cd33ef2660012ae3f69
Parents: acdbba7
Author: Marcus Olsson <ma...@ericsson.com>
Authored: Fri Dec 4 14:21:15 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:21:15 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 16 +++++++--------
.../org/apache/cassandra/db/SystemKeyspace.java | 21 +++++++++++++++++---
3 files changed, 26 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6deca3d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1a2887a..46cda65 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.13
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
* Fix Stress profile parsing on Windows (CASSANDRA-10808)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6deca3d/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index cae8dfb..7a15d02 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -24,20 +24,18 @@ New features
- DTCS option max_sstable_age_days is now deprecated and defaults to 1000 days.
- Native protocol server now allows both SSL and non-SSL connections on
the same port.
- - Switching racks is no longer an allowed operation on a node which has
- 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.
- a new validate(key, cf) method is added to PerRowSecondaryIndex. A default
implementation is provided, so no changes are required to custom implementations.
Operations
------------
- - Changing rack or dc of live nodes is no longer possible for PropertyFileSnitch
- and YamlFileNetworkTopologySnitch. Reloading the configuration file of
- GossipingPropertyFileSnitch has been disabled, CASSANDRA-10243.
-
+ - Switching data center or racks is no longer an allowed operation on a node
+ which has data. Instead, the node will need to be decommissioned and
+ rebootstrapped. If moving from the SimpleSnitch, make sure that the data
+ center and rack containing all current nodes is named "datacenter1" and
+ "rack1". To override this behaviour use -Dcassandra.ignore_rack=true and/or
+ -Dcassandra.ignore_dc=true.
+ - Reloading the configuration file of GossipingPropertyFileSnitch has been disabled.
2.1.11
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6deca3d/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 c600652..1f66b1b 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -614,11 +614,26 @@ public class SystemKeyspace
}
}
- if (!Boolean.getBoolean("cassandra.ignore_rack"))
+ String req = "SELECT rack, data_center FROM system.%s WHERE key='%s'";
+ UntypedResultSet result = executeInternal(String.format(req, LOCAL_CF, LOCAL_KEY));
+
+ if (!Boolean.getBoolean("cassandra.ignore_dc"))
{
- String req = "SELECT rack FROM system.%s WHERE key='%s'";
- UntypedResultSet result = executeInternal(String.format(req, LOCAL_CF, LOCAL_KEY));
+ // Look up the dc (return it if found)
+ if (!result.isEmpty() && result.one().has("data_center"))
+ {
+ String storedDc = result.one().getString("data_center");
+ String currentDc = DatabaseDescriptor.getEndpointSnitch().getDatacenter(FBUtilities.getBroadcastAddress());
+ if (!storedDc.equals(currentDc))
+ {
+ throw new ConfigurationException("Cannot start node if snitch's data center (" + currentDc + ") differs from previous data center (" + storedDc + "). " +
+ "Please fix the snitch configuration, decommission and rebootstrap this node or use the flag -Dcassandra.ignore_dc=true.");
+ }
+ }
+ }
+ if (!Boolean.getBoolean("cassandra.ignore_rack"))
+ {
// Look up the Rack (return it if found)
if (!result.isEmpty() && result.one().has("rack"))
{
[03/22] cassandra git commit: Disable reloading of
GossipingPropertyFileSnitch
Posted by jm...@apache.org.
Disable reloading of GossipingPropertyFileSnitch
Patch by molsson; reviewed by pmotta for CASSANDRA-9474
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6deca3d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6deca3d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6deca3d
Branch: refs/heads/cassandra-2.2
Commit: f6deca3db2ec173c8d0b2cd33ef2660012ae3f69
Parents: acdbba7
Author: Marcus Olsson <ma...@ericsson.com>
Authored: Fri Dec 4 14:21:15 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:21:15 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 16 +++++++--------
.../org/apache/cassandra/db/SystemKeyspace.java | 21 +++++++++++++++++---
3 files changed, 26 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6deca3d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1a2887a..46cda65 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.13
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
* Fix Stress profile parsing on Windows (CASSANDRA-10808)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6deca3d/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index cae8dfb..7a15d02 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -24,20 +24,18 @@ New features
- DTCS option max_sstable_age_days is now deprecated and defaults to 1000 days.
- Native protocol server now allows both SSL and non-SSL connections on
the same port.
- - Switching racks is no longer an allowed operation on a node which has
- 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.
- a new validate(key, cf) method is added to PerRowSecondaryIndex. A default
implementation is provided, so no changes are required to custom implementations.
Operations
------------
- - Changing rack or dc of live nodes is no longer possible for PropertyFileSnitch
- and YamlFileNetworkTopologySnitch. Reloading the configuration file of
- GossipingPropertyFileSnitch has been disabled, CASSANDRA-10243.
-
+ - Switching data center or racks is no longer an allowed operation on a node
+ which has data. Instead, the node will need to be decommissioned and
+ rebootstrapped. If moving from the SimpleSnitch, make sure that the data
+ center and rack containing all current nodes is named "datacenter1" and
+ "rack1". To override this behaviour use -Dcassandra.ignore_rack=true and/or
+ -Dcassandra.ignore_dc=true.
+ - Reloading the configuration file of GossipingPropertyFileSnitch has been disabled.
2.1.11
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6deca3d/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 c600652..1f66b1b 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -614,11 +614,26 @@ public class SystemKeyspace
}
}
- if (!Boolean.getBoolean("cassandra.ignore_rack"))
+ String req = "SELECT rack, data_center FROM system.%s WHERE key='%s'";
+ UntypedResultSet result = executeInternal(String.format(req, LOCAL_CF, LOCAL_KEY));
+
+ if (!Boolean.getBoolean("cassandra.ignore_dc"))
{
- String req = "SELECT rack FROM system.%s WHERE key='%s'";
- UntypedResultSet result = executeInternal(String.format(req, LOCAL_CF, LOCAL_KEY));
+ // Look up the dc (return it if found)
+ if (!result.isEmpty() && result.one().has("data_center"))
+ {
+ String storedDc = result.one().getString("data_center");
+ String currentDc = DatabaseDescriptor.getEndpointSnitch().getDatacenter(FBUtilities.getBroadcastAddress());
+ if (!storedDc.equals(currentDc))
+ {
+ throw new ConfigurationException("Cannot start node if snitch's data center (" + currentDc + ") differs from previous data center (" + storedDc + "). " +
+ "Please fix the snitch configuration, decommission and rebootstrap this node or use the flag -Dcassandra.ignore_dc=true.");
+ }
+ }
+ }
+ if (!Boolean.getBoolean("cassandra.ignore_rack"))
+ {
// Look up the Rack (return it if found)
if (!result.isEmpty() && result.one().has("rack"))
{
[04/22] cassandra git commit: Disable reloading of
GossipingPropertyFileSnitch
Posted by jm...@apache.org.
Disable reloading of GossipingPropertyFileSnitch
Patch by molsson; reviewed by pmotta for CASSANDRA-9474
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6deca3d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6deca3d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6deca3d
Branch: refs/heads/trunk
Commit: f6deca3db2ec173c8d0b2cd33ef2660012ae3f69
Parents: acdbba7
Author: Marcus Olsson <ma...@ericsson.com>
Authored: Fri Dec 4 14:21:15 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:21:15 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 16 +++++++--------
.../org/apache/cassandra/db/SystemKeyspace.java | 21 +++++++++++++++++---
3 files changed, 26 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6deca3d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1a2887a..46cda65 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.13
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
* Fix Stress profile parsing on Windows (CASSANDRA-10808)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6deca3d/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index cae8dfb..7a15d02 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -24,20 +24,18 @@ New features
- DTCS option max_sstable_age_days is now deprecated and defaults to 1000 days.
- Native protocol server now allows both SSL and non-SSL connections on
the same port.
- - Switching racks is no longer an allowed operation on a node which has
- 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.
- a new validate(key, cf) method is added to PerRowSecondaryIndex. A default
implementation is provided, so no changes are required to custom implementations.
Operations
------------
- - Changing rack or dc of live nodes is no longer possible for PropertyFileSnitch
- and YamlFileNetworkTopologySnitch. Reloading the configuration file of
- GossipingPropertyFileSnitch has been disabled, CASSANDRA-10243.
-
+ - Switching data center or racks is no longer an allowed operation on a node
+ which has data. Instead, the node will need to be decommissioned and
+ rebootstrapped. If moving from the SimpleSnitch, make sure that the data
+ center and rack containing all current nodes is named "datacenter1" and
+ "rack1". To override this behaviour use -Dcassandra.ignore_rack=true and/or
+ -Dcassandra.ignore_dc=true.
+ - Reloading the configuration file of GossipingPropertyFileSnitch has been disabled.
2.1.11
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6deca3d/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 c600652..1f66b1b 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -614,11 +614,26 @@ public class SystemKeyspace
}
}
- if (!Boolean.getBoolean("cassandra.ignore_rack"))
+ String req = "SELECT rack, data_center FROM system.%s WHERE key='%s'";
+ UntypedResultSet result = executeInternal(String.format(req, LOCAL_CF, LOCAL_KEY));
+
+ if (!Boolean.getBoolean("cassandra.ignore_dc"))
{
- String req = "SELECT rack FROM system.%s WHERE key='%s'";
- UntypedResultSet result = executeInternal(String.format(req, LOCAL_CF, LOCAL_KEY));
+ // Look up the dc (return it if found)
+ if (!result.isEmpty() && result.one().has("data_center"))
+ {
+ String storedDc = result.one().getString("data_center");
+ String currentDc = DatabaseDescriptor.getEndpointSnitch().getDatacenter(FBUtilities.getBroadcastAddress());
+ if (!storedDc.equals(currentDc))
+ {
+ throw new ConfigurationException("Cannot start node if snitch's data center (" + currentDc + ") differs from previous data center (" + storedDc + "). " +
+ "Please fix the snitch configuration, decommission and rebootstrap this node or use the flag -Dcassandra.ignore_dc=true.");
+ }
+ }
+ }
+ if (!Boolean.getBoolean("cassandra.ignore_rack"))
+ {
// Look up the Rack (return it if found)
if (!result.isEmpty() && result.one().has("rack"))
{
[16/22] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by jm...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8fd810c9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8fd810c9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8fd810c9
Branch: refs/heads/trunk
Commit: 8fd810c94575e0e0d16696e7c1027c86f7ddf1f1
Parents: 69bf1c6 879c49b
Author: Joshua McKenzie <jm...@apache.org>
Authored: Fri Dec 4 14:22:59 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:22:59 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[19/22] cassandra git commit: 9474 3.0
Posted by jm...@apache.org.
9474 3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a4da379b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4da379b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a4da379b
Branch: refs/heads/trunk
Commit: a4da379bb042fcf171a560af5edd9e785d6f8e4e
Parents: 8fd810c
Author: Marcus Olsson <ma...@ericsson.com>
Authored: Fri Dec 4 14:30:00 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:30:00 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 18 +++-----
.../org/apache/cassandra/db/SystemKeyspace.java | 15 ++++++
.../cassandra/service/CassandraDaemon.java | 15 ------
.../apache/cassandra/service/StartupChecks.java | 48 +++++++++++++++++++-
5 files changed, 70 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4da379b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c22d138..8f3f182 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.1
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
* Handle single-column deletions correction in materialized views
when the column is part of the view primary key (CASSANDRA-10796)
* Fix issue with datadir migration on upgrade (CASSANDRA-10788)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4da379b/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index b3c304a..d41384b 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -146,10 +146,13 @@ Deprecation
Operations
----------
- - Switching racks is no longer an allowed operation on a node which has
- 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".
+ - Switching data center or racks is no longer an allowed operation on a node
+ which has data. Instead, the node will need to be decommissioned and
+ rebootstrapped. If moving from the SimpleSnitch, make sure that the data
+ center and rack containing all current nodes is named "datacenter1" and
+ "rack1". To override this behaviour use -Dcassandra.ignore_rack=true and/or
+ -Dcassandra.ignore_dc=true.
+ - Reloading the configuration file of GossipingPropertyFileSnitch has been disabled.
New features
------------
@@ -160,13 +163,6 @@ New features
- Native protocol server now allows both SSL and non-SSL connections on
the same port.
-Operations
-------------
- - Changing rack or dc of live nodes is no longer possible for PropertyFileSnitch
- and YamlFileNetworkTopologySnitch. Reloading the configuration file of
- GossipingPropertyFileSnitch has been disabled, CASSANDRA-10243.
-
-
2.2.3
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4da379b/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 8a27c9d..205df8b 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -1068,6 +1068,21 @@ public final class SystemKeyspace
return null;
}
+ /**
+ * Gets the stored data center for the local node, or null if none have been set yet.
+ */
+ public static String getDatacenter()
+ {
+ String req = "SELECT data_center FROM system.%s WHERE key='%s'";
+ UntypedResultSet result = executeInternal(String.format(req, LOCAL, LOCAL));
+
+ // Look up the Data center (return it if found)
+ if (!result.isEmpty() && result.one().has("data_center"))
+ return result.one().getString("data_center");
+
+ return null;
+ }
+
public static PaxosState loadPaxosState(DecoratedKey key, CFMetaData metadata)
{
String req = "SELECT * FROM system.%s WHERE row_key = ? AND cf_id = ?";
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4da379b/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index f83152b..4af926a 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -241,21 +241,6 @@ public class CassandraDaemon
Keyspace.setInitialized();
- if (!Boolean.getBoolean("cassandra.ignore_rack"))
- {
- 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 decommission and rebootstrap this node.");
- System.exit(100);
- }
- }
- }
-
// initialize keyspaces
for (String keyspaceName : Schema.instance.getKeyspaces())
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4da379b/src/java/org/apache/cassandra/service/StartupChecks.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StartupChecks.java b/src/java/org/apache/cassandra/service/StartupChecks.java
index ebe4b26..c2c5acc 100644
--- a/src/java/org/apache/cassandra/service/StartupChecks.java
+++ b/src/java/org/apache/cassandra/service/StartupChecks.java
@@ -75,7 +75,9 @@ public class StartupChecks
initSigarLibrary,
checkDataDirs,
checkSSTablesFormat,
- checkSystemKeyspaceState);
+ checkSystemKeyspaceState,
+ checkDatacenter,
+ checkRack);
public StartupChecks withDefaultTests()
{
@@ -300,4 +302,48 @@ public class StartupChecks
}
}
};
+
+ public static final StartupCheck checkDatacenter = new StartupCheck()
+ {
+ public void execute() throws StartupException
+ {
+ if (!Boolean.getBoolean("cassandra.ignore_dc"))
+ {
+ String storedDc = SystemKeyspace.getDatacenter();
+ if (storedDc != null)
+ {
+ String currentDc = DatabaseDescriptor.getEndpointSnitch().getDatacenter(FBUtilities.getBroadcastAddress());
+ if (!storedDc.equals(currentDc))
+ {
+ String formatMessage = "Cannot start node if snitch's data center (%s) differs from previous data center (%s). " +
+ "Please fix the snitch configuration, decommission and rebootstrap this node or use the flag -Dcassandra.ignore_dc=true.";
+
+ throw new StartupException(100, String.format(formatMessage, currentDc, storedDc));
+ }
+ }
+ }
+ }
+ };
+
+ public static final StartupCheck checkRack = new StartupCheck()
+ {
+ public void execute() throws StartupException
+ {
+ if (!Boolean.getBoolean("cassandra.ignore_rack"))
+ {
+ String storedRack = SystemKeyspace.getRack();
+ if (storedRack != null)
+ {
+ String currentRack = DatabaseDescriptor.getEndpointSnitch().getRack(FBUtilities.getBroadcastAddress());
+ if (!storedRack.equals(currentRack))
+ {
+ String formatMessage = "Cannot start node if snitch's rack (%s) differs from previous rack (%s). " +
+ "Please fix the snitch configuration, decommission and rebootstrap this node or use the flag -Dcassandra.ignore_rack=true.";
+
+ throw new StartupException(100, String.format(formatMessage, currentRack, storedRack));
+ }
+ }
+ }
+ }
+ };
}
[13/22] cassandra git commit: 9474 2.2
Posted by jm...@apache.org.
9474 2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/879c49bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/879c49bb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/879c49bb
Branch: refs/heads/cassandra-2.2
Commit: 879c49bb7d28946187a04e5cd76236d652825579
Parents: 1a00f00
Author: Marcus Olsson <ma...@ericsson.com>
Authored: Fri Dec 4 14:22:36 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:22:36 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 18 +++-----
.../org/apache/cassandra/db/SystemKeyspace.java | 15 ++++++
.../cassandra/service/CassandraDaemon.java | 15 ------
.../apache/cassandra/service/StartupChecks.java | 48 +++++++++++++++++++-
5 files changed, 70 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/879c49bb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7932f51..34866fa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.5
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
* Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
Merged from 2.1:
* Fix Stress profile parsing on Windows (CASSANDRA-10808)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/879c49bb/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 87e77f4..e220357 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -26,10 +26,13 @@ Deprecation
Operations
----------
- - Switching racks is no longer an allowed operation on a node which has
- 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".
+ - Switching data center or racks is no longer an allowed operation on a node
+ which has data. Instead, the node will need to be decommissioned and
+ rebootstrapped. If moving from the SimpleSnitch, make sure that the data
+ center and rack containing all current nodes is named "datacenter1" and
+ "rack1". To override this behaviour use -Dcassandra.ignore_rack=true and/or
+ -Dcassandra.ignore_dc=true.
+ - Reloading the configuration file of GossipingPropertyFileSnitch has been disabled.
New features
------------
@@ -40,13 +43,6 @@ New features
- Native protocol server now allows both SSL and non-SSL connections on
the same port.
-Operations
-------------
- - Changing rack or dc of live nodes is no longer possible for PropertyFileSnitch
- and YamlFileNetworkTopologySnitch. Reloading the configuration file of
- GossipingPropertyFileSnitch has been disabled, CASSANDRA-10243.
-
-
2.2.3
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/879c49bb/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 1807101..46de0db 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -880,6 +880,21 @@ public final class SystemKeyspace
return null;
}
+ /**
+ * Gets the stored data center for the local node, or null if none have been set yet.
+ */
+ public static String getDatacenter()
+ {
+ String req = "SELECT data_center FROM system.%s WHERE key='%s'";
+ UntypedResultSet result = executeInternal(String.format(req, LOCAL, LOCAL));
+
+ // Look up the Data center (return it if found)
+ if (!result.isEmpty() && result.one().has("data_center"))
+ return result.one().getString("data_center");
+
+ return null;
+ }
+
public static PaxosState loadPaxosState(ByteBuffer key, CFMetaData metadata)
{
String req = "SELECT * FROM system.%s WHERE row_key = ? AND cf_id = ?";
http://git-wip-us.apache.org/repos/asf/cassandra/blob/879c49bb/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 59609a3..eb05324 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -232,21 +232,6 @@ public class CassandraDaemon
Keyspace.setInitialized();
- if (!Boolean.getBoolean("cassandra.ignore_rack"))
- {
- 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 decommission and rebootstrap this node.");
- System.exit(100);
- }
- }
- }
-
// initialize keyspaces
for (String keyspaceName : Schema.instance.getKeyspaces())
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/879c49bb/src/java/org/apache/cassandra/service/StartupChecks.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StartupChecks.java b/src/java/org/apache/cassandra/service/StartupChecks.java
index 8b8810c..c13b401 100644
--- a/src/java/org/apache/cassandra/service/StartupChecks.java
+++ b/src/java/org/apache/cassandra/service/StartupChecks.java
@@ -75,7 +75,9 @@ public class StartupChecks
initSigarLibrary,
checkDataDirs,
checkSSTablesFormat,
- checkSystemKeyspaceState);
+ checkSystemKeyspaceState,
+ checkDatacenter,
+ checkRack);
public StartupChecks withDefaultTests()
{
@@ -302,4 +304,48 @@ public class StartupChecks
}
}
};
+
+ public static final StartupCheck checkDatacenter = new StartupCheck()
+ {
+ public void execute() throws StartupException
+ {
+ if (!Boolean.getBoolean("cassandra.ignore_dc"))
+ {
+ String storedDc = SystemKeyspace.getDatacenter();
+ if (storedDc != null)
+ {
+ String currentDc = DatabaseDescriptor.getEndpointSnitch().getDatacenter(FBUtilities.getBroadcastAddress());
+ if (!storedDc.equals(currentDc))
+ {
+ String formatMessage = "Cannot start node if snitch's data center (%s) differs from previous data center (%s). " +
+ "Please fix the snitch configuration, decommission and rebootstrap this node or use the flag -Dcassandra.ignore_dc=true.";
+
+ throw new StartupException(100, String.format(formatMessage, currentDc, storedDc));
+ }
+ }
+ }
+ }
+ };
+
+ public static final StartupCheck checkRack = new StartupCheck()
+ {
+ public void execute() throws StartupException
+ {
+ if (!Boolean.getBoolean("cassandra.ignore_rack"))
+ {
+ String storedRack = SystemKeyspace.getRack();
+ if (storedRack != null)
+ {
+ String currentRack = DatabaseDescriptor.getEndpointSnitch().getRack(FBUtilities.getBroadcastAddress());
+ if (!storedRack.equals(currentRack))
+ {
+ String formatMessage = "Cannot start node if snitch's rack (%s) differs from previous rack (%s). " +
+ "Please fix the snitch configuration, decommission and rebootstrap this node or use the flag -Dcassandra.ignore_rack=true.";
+
+ throw new StartupException(100, String.format(formatMessage, currentRack, storedRack));
+ }
+ }
+ }
+ }
+ };
}
[11/22] cassandra git commit: 9474 2.2
Posted by jm...@apache.org.
9474 2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/879c49bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/879c49bb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/879c49bb
Branch: refs/heads/cassandra-3.1
Commit: 879c49bb7d28946187a04e5cd76236d652825579
Parents: 1a00f00
Author: Marcus Olsson <ma...@ericsson.com>
Authored: Fri Dec 4 14:22:36 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:22:36 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 18 +++-----
.../org/apache/cassandra/db/SystemKeyspace.java | 15 ++++++
.../cassandra/service/CassandraDaemon.java | 15 ------
.../apache/cassandra/service/StartupChecks.java | 48 +++++++++++++++++++-
5 files changed, 70 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/879c49bb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7932f51..34866fa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.5
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
* Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
Merged from 2.1:
* Fix Stress profile parsing on Windows (CASSANDRA-10808)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/879c49bb/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 87e77f4..e220357 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -26,10 +26,13 @@ Deprecation
Operations
----------
- - Switching racks is no longer an allowed operation on a node which has
- 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".
+ - Switching data center or racks is no longer an allowed operation on a node
+ which has data. Instead, the node will need to be decommissioned and
+ rebootstrapped. If moving from the SimpleSnitch, make sure that the data
+ center and rack containing all current nodes is named "datacenter1" and
+ "rack1". To override this behaviour use -Dcassandra.ignore_rack=true and/or
+ -Dcassandra.ignore_dc=true.
+ - Reloading the configuration file of GossipingPropertyFileSnitch has been disabled.
New features
------------
@@ -40,13 +43,6 @@ New features
- Native protocol server now allows both SSL and non-SSL connections on
the same port.
-Operations
-------------
- - Changing rack or dc of live nodes is no longer possible for PropertyFileSnitch
- and YamlFileNetworkTopologySnitch. Reloading the configuration file of
- GossipingPropertyFileSnitch has been disabled, CASSANDRA-10243.
-
-
2.2.3
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/879c49bb/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 1807101..46de0db 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -880,6 +880,21 @@ public final class SystemKeyspace
return null;
}
+ /**
+ * Gets the stored data center for the local node, or null if none have been set yet.
+ */
+ public static String getDatacenter()
+ {
+ String req = "SELECT data_center FROM system.%s WHERE key='%s'";
+ UntypedResultSet result = executeInternal(String.format(req, LOCAL, LOCAL));
+
+ // Look up the Data center (return it if found)
+ if (!result.isEmpty() && result.one().has("data_center"))
+ return result.one().getString("data_center");
+
+ return null;
+ }
+
public static PaxosState loadPaxosState(ByteBuffer key, CFMetaData metadata)
{
String req = "SELECT * FROM system.%s WHERE row_key = ? AND cf_id = ?";
http://git-wip-us.apache.org/repos/asf/cassandra/blob/879c49bb/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 59609a3..eb05324 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -232,21 +232,6 @@ public class CassandraDaemon
Keyspace.setInitialized();
- if (!Boolean.getBoolean("cassandra.ignore_rack"))
- {
- 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 decommission and rebootstrap this node.");
- System.exit(100);
- }
- }
- }
-
// initialize keyspaces
for (String keyspaceName : Schema.instance.getKeyspaces())
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/879c49bb/src/java/org/apache/cassandra/service/StartupChecks.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StartupChecks.java b/src/java/org/apache/cassandra/service/StartupChecks.java
index 8b8810c..c13b401 100644
--- a/src/java/org/apache/cassandra/service/StartupChecks.java
+++ b/src/java/org/apache/cassandra/service/StartupChecks.java
@@ -75,7 +75,9 @@ public class StartupChecks
initSigarLibrary,
checkDataDirs,
checkSSTablesFormat,
- checkSystemKeyspaceState);
+ checkSystemKeyspaceState,
+ checkDatacenter,
+ checkRack);
public StartupChecks withDefaultTests()
{
@@ -302,4 +304,48 @@ public class StartupChecks
}
}
};
+
+ public static final StartupCheck checkDatacenter = new StartupCheck()
+ {
+ public void execute() throws StartupException
+ {
+ if (!Boolean.getBoolean("cassandra.ignore_dc"))
+ {
+ String storedDc = SystemKeyspace.getDatacenter();
+ if (storedDc != null)
+ {
+ String currentDc = DatabaseDescriptor.getEndpointSnitch().getDatacenter(FBUtilities.getBroadcastAddress());
+ if (!storedDc.equals(currentDc))
+ {
+ String formatMessage = "Cannot start node if snitch's data center (%s) differs from previous data center (%s). " +
+ "Please fix the snitch configuration, decommission and rebootstrap this node or use the flag -Dcassandra.ignore_dc=true.";
+
+ throw new StartupException(100, String.format(formatMessage, currentDc, storedDc));
+ }
+ }
+ }
+ }
+ };
+
+ public static final StartupCheck checkRack = new StartupCheck()
+ {
+ public void execute() throws StartupException
+ {
+ if (!Boolean.getBoolean("cassandra.ignore_rack"))
+ {
+ String storedRack = SystemKeyspace.getRack();
+ if (storedRack != null)
+ {
+ String currentRack = DatabaseDescriptor.getEndpointSnitch().getRack(FBUtilities.getBroadcastAddress());
+ if (!storedRack.equals(currentRack))
+ {
+ String formatMessage = "Cannot start node if snitch's rack (%s) differs from previous rack (%s). " +
+ "Please fix the snitch configuration, decommission and rebootstrap this node or use the flag -Dcassandra.ignore_rack=true.";
+
+ throw new StartupException(100, String.format(formatMessage, currentRack, storedRack));
+ }
+ }
+ }
+ }
+ };
}
[14/22] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by jm...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8fd810c9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8fd810c9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8fd810c9
Branch: refs/heads/cassandra-3.0
Commit: 8fd810c94575e0e0d16696e7c1027c86f7ddf1f1
Parents: 69bf1c6 879c49b
Author: Joshua McKenzie <jm...@apache.org>
Authored: Fri Dec 4 14:22:59 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:22:59 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[15/22] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by jm...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8fd810c9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8fd810c9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8fd810c9
Branch: refs/heads/cassandra-3.1
Commit: 8fd810c94575e0e0d16696e7c1027c86f7ddf1f1
Parents: 69bf1c6 879c49b
Author: Joshua McKenzie <jm...@apache.org>
Authored: Fri Dec 4 14:22:59 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:22:59 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[18/22] cassandra git commit: 9474 3.0
Posted by jm...@apache.org.
9474 3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a4da379b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4da379b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a4da379b
Branch: refs/heads/cassandra-3.0
Commit: a4da379bb042fcf171a560af5edd9e785d6f8e4e
Parents: 8fd810c
Author: Marcus Olsson <ma...@ericsson.com>
Authored: Fri Dec 4 14:30:00 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:30:00 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 18 +++-----
.../org/apache/cassandra/db/SystemKeyspace.java | 15 ++++++
.../cassandra/service/CassandraDaemon.java | 15 ------
.../apache/cassandra/service/StartupChecks.java | 48 +++++++++++++++++++-
5 files changed, 70 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4da379b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c22d138..8f3f182 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.1
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
* Handle single-column deletions correction in materialized views
when the column is part of the view primary key (CASSANDRA-10796)
* Fix issue with datadir migration on upgrade (CASSANDRA-10788)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4da379b/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index b3c304a..d41384b 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -146,10 +146,13 @@ Deprecation
Operations
----------
- - Switching racks is no longer an allowed operation on a node which has
- 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".
+ - Switching data center or racks is no longer an allowed operation on a node
+ which has data. Instead, the node will need to be decommissioned and
+ rebootstrapped. If moving from the SimpleSnitch, make sure that the data
+ center and rack containing all current nodes is named "datacenter1" and
+ "rack1". To override this behaviour use -Dcassandra.ignore_rack=true and/or
+ -Dcassandra.ignore_dc=true.
+ - Reloading the configuration file of GossipingPropertyFileSnitch has been disabled.
New features
------------
@@ -160,13 +163,6 @@ New features
- Native protocol server now allows both SSL and non-SSL connections on
the same port.
-Operations
-------------
- - Changing rack or dc of live nodes is no longer possible for PropertyFileSnitch
- and YamlFileNetworkTopologySnitch. Reloading the configuration file of
- GossipingPropertyFileSnitch has been disabled, CASSANDRA-10243.
-
-
2.2.3
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4da379b/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 8a27c9d..205df8b 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -1068,6 +1068,21 @@ public final class SystemKeyspace
return null;
}
+ /**
+ * Gets the stored data center for the local node, or null if none have been set yet.
+ */
+ public static String getDatacenter()
+ {
+ String req = "SELECT data_center FROM system.%s WHERE key='%s'";
+ UntypedResultSet result = executeInternal(String.format(req, LOCAL, LOCAL));
+
+ // Look up the Data center (return it if found)
+ if (!result.isEmpty() && result.one().has("data_center"))
+ return result.one().getString("data_center");
+
+ return null;
+ }
+
public static PaxosState loadPaxosState(DecoratedKey key, CFMetaData metadata)
{
String req = "SELECT * FROM system.%s WHERE row_key = ? AND cf_id = ?";
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4da379b/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index f83152b..4af926a 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -241,21 +241,6 @@ public class CassandraDaemon
Keyspace.setInitialized();
- if (!Boolean.getBoolean("cassandra.ignore_rack"))
- {
- 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 decommission and rebootstrap this node.");
- System.exit(100);
- }
- }
- }
-
// initialize keyspaces
for (String keyspaceName : Schema.instance.getKeyspaces())
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4da379b/src/java/org/apache/cassandra/service/StartupChecks.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StartupChecks.java b/src/java/org/apache/cassandra/service/StartupChecks.java
index ebe4b26..c2c5acc 100644
--- a/src/java/org/apache/cassandra/service/StartupChecks.java
+++ b/src/java/org/apache/cassandra/service/StartupChecks.java
@@ -75,7 +75,9 @@ public class StartupChecks
initSigarLibrary,
checkDataDirs,
checkSSTablesFormat,
- checkSystemKeyspaceState);
+ checkSystemKeyspaceState,
+ checkDatacenter,
+ checkRack);
public StartupChecks withDefaultTests()
{
@@ -300,4 +302,48 @@ public class StartupChecks
}
}
};
+
+ public static final StartupCheck checkDatacenter = new StartupCheck()
+ {
+ public void execute() throws StartupException
+ {
+ if (!Boolean.getBoolean("cassandra.ignore_dc"))
+ {
+ String storedDc = SystemKeyspace.getDatacenter();
+ if (storedDc != null)
+ {
+ String currentDc = DatabaseDescriptor.getEndpointSnitch().getDatacenter(FBUtilities.getBroadcastAddress());
+ if (!storedDc.equals(currentDc))
+ {
+ String formatMessage = "Cannot start node if snitch's data center (%s) differs from previous data center (%s). " +
+ "Please fix the snitch configuration, decommission and rebootstrap this node or use the flag -Dcassandra.ignore_dc=true.";
+
+ throw new StartupException(100, String.format(formatMessage, currentDc, storedDc));
+ }
+ }
+ }
+ }
+ };
+
+ public static final StartupCheck checkRack = new StartupCheck()
+ {
+ public void execute() throws StartupException
+ {
+ if (!Boolean.getBoolean("cassandra.ignore_rack"))
+ {
+ String storedRack = SystemKeyspace.getRack();
+ if (storedRack != null)
+ {
+ String currentRack = DatabaseDescriptor.getEndpointSnitch().getRack(FBUtilities.getBroadcastAddress());
+ if (!storedRack.equals(currentRack))
+ {
+ String formatMessage = "Cannot start node if snitch's rack (%s) differs from previous rack (%s). " +
+ "Please fix the snitch configuration, decommission and rebootstrap this node or use the flag -Dcassandra.ignore_rack=true.";
+
+ throw new StartupException(100, String.format(formatMessage, currentRack, storedRack));
+ }
+ }
+ }
+ }
+ };
}
[12/22] cassandra git commit: 9474 2.2
Posted by jm...@apache.org.
9474 2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/879c49bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/879c49bb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/879c49bb
Branch: refs/heads/trunk
Commit: 879c49bb7d28946187a04e5cd76236d652825579
Parents: 1a00f00
Author: Marcus Olsson <ma...@ericsson.com>
Authored: Fri Dec 4 14:22:36 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:22:36 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 18 +++-----
.../org/apache/cassandra/db/SystemKeyspace.java | 15 ++++++
.../cassandra/service/CassandraDaemon.java | 15 ------
.../apache/cassandra/service/StartupChecks.java | 48 +++++++++++++++++++-
5 files changed, 70 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/879c49bb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7932f51..34866fa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.5
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
* Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
Merged from 2.1:
* Fix Stress profile parsing on Windows (CASSANDRA-10808)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/879c49bb/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 87e77f4..e220357 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -26,10 +26,13 @@ Deprecation
Operations
----------
- - Switching racks is no longer an allowed operation on a node which has
- 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".
+ - Switching data center or racks is no longer an allowed operation on a node
+ which has data. Instead, the node will need to be decommissioned and
+ rebootstrapped. If moving from the SimpleSnitch, make sure that the data
+ center and rack containing all current nodes is named "datacenter1" and
+ "rack1". To override this behaviour use -Dcassandra.ignore_rack=true and/or
+ -Dcassandra.ignore_dc=true.
+ - Reloading the configuration file of GossipingPropertyFileSnitch has been disabled.
New features
------------
@@ -40,13 +43,6 @@ New features
- Native protocol server now allows both SSL and non-SSL connections on
the same port.
-Operations
-------------
- - Changing rack or dc of live nodes is no longer possible for PropertyFileSnitch
- and YamlFileNetworkTopologySnitch. Reloading the configuration file of
- GossipingPropertyFileSnitch has been disabled, CASSANDRA-10243.
-
-
2.2.3
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/879c49bb/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 1807101..46de0db 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -880,6 +880,21 @@ public final class SystemKeyspace
return null;
}
+ /**
+ * Gets the stored data center for the local node, or null if none have been set yet.
+ */
+ public static String getDatacenter()
+ {
+ String req = "SELECT data_center FROM system.%s WHERE key='%s'";
+ UntypedResultSet result = executeInternal(String.format(req, LOCAL, LOCAL));
+
+ // Look up the Data center (return it if found)
+ if (!result.isEmpty() && result.one().has("data_center"))
+ return result.one().getString("data_center");
+
+ return null;
+ }
+
public static PaxosState loadPaxosState(ByteBuffer key, CFMetaData metadata)
{
String req = "SELECT * FROM system.%s WHERE row_key = ? AND cf_id = ?";
http://git-wip-us.apache.org/repos/asf/cassandra/blob/879c49bb/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 59609a3..eb05324 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -232,21 +232,6 @@ public class CassandraDaemon
Keyspace.setInitialized();
- if (!Boolean.getBoolean("cassandra.ignore_rack"))
- {
- 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 decommission and rebootstrap this node.");
- System.exit(100);
- }
- }
- }
-
// initialize keyspaces
for (String keyspaceName : Schema.instance.getKeyspaces())
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/879c49bb/src/java/org/apache/cassandra/service/StartupChecks.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StartupChecks.java b/src/java/org/apache/cassandra/service/StartupChecks.java
index 8b8810c..c13b401 100644
--- a/src/java/org/apache/cassandra/service/StartupChecks.java
+++ b/src/java/org/apache/cassandra/service/StartupChecks.java
@@ -75,7 +75,9 @@ public class StartupChecks
initSigarLibrary,
checkDataDirs,
checkSSTablesFormat,
- checkSystemKeyspaceState);
+ checkSystemKeyspaceState,
+ checkDatacenter,
+ checkRack);
public StartupChecks withDefaultTests()
{
@@ -302,4 +304,48 @@ public class StartupChecks
}
}
};
+
+ public static final StartupCheck checkDatacenter = new StartupCheck()
+ {
+ public void execute() throws StartupException
+ {
+ if (!Boolean.getBoolean("cassandra.ignore_dc"))
+ {
+ String storedDc = SystemKeyspace.getDatacenter();
+ if (storedDc != null)
+ {
+ String currentDc = DatabaseDescriptor.getEndpointSnitch().getDatacenter(FBUtilities.getBroadcastAddress());
+ if (!storedDc.equals(currentDc))
+ {
+ String formatMessage = "Cannot start node if snitch's data center (%s) differs from previous data center (%s). " +
+ "Please fix the snitch configuration, decommission and rebootstrap this node or use the flag -Dcassandra.ignore_dc=true.";
+
+ throw new StartupException(100, String.format(formatMessage, currentDc, storedDc));
+ }
+ }
+ }
+ }
+ };
+
+ public static final StartupCheck checkRack = new StartupCheck()
+ {
+ public void execute() throws StartupException
+ {
+ if (!Boolean.getBoolean("cassandra.ignore_rack"))
+ {
+ String storedRack = SystemKeyspace.getRack();
+ if (storedRack != null)
+ {
+ String currentRack = DatabaseDescriptor.getEndpointSnitch().getRack(FBUtilities.getBroadcastAddress());
+ if (!storedRack.equals(currentRack))
+ {
+ String formatMessage = "Cannot start node if snitch's rack (%s) differs from previous rack (%s). " +
+ "Please fix the snitch configuration, decommission and rebootstrap this node or use the flag -Dcassandra.ignore_rack=true.";
+
+ throw new StartupException(100, String.format(formatMessage, currentRack, storedRack));
+ }
+ }
+ }
+ }
+ };
}
[22/22] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Posted by jm...@apache.org.
Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/646da9aa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/646da9aa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/646da9aa
Branch: refs/heads/trunk
Commit: 646da9aa8f5e0940456d3faaa6aeab6821be311a
Parents: 34be4d6 2b8cdc2
Author: Joshua McKenzie <jm...@apache.org>
Authored: Fri Dec 4 14:30:52 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:30:52 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 18 +++-----
.../org/apache/cassandra/db/SystemKeyspace.java | 15 ++++++
.../cassandra/service/CassandraDaemon.java | 15 ------
.../apache/cassandra/service/StartupChecks.java | 48 +++++++++++++++++++-
5 files changed, 70 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/646da9aa/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 532a77a,e06653f..9a0e5ce
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,6 +1,21 @@@
+3.2
+ * bound maximum in-flight commit log replay mutation bytes to 64 megabytes (CASSANDRA-8639)
+ * Normalize all scripts (CASSANDRA-10679)
+ * Make compression ratio much more accurate (CASSANDRA-10225)
+ * Optimize building of Clustering object when only one is created (CASSANDRA-10409)
+ * Make index building pluggable (CASSANDRA-10681)
+ * Add sstable flush observer (CASSANDRA-10678)
+ * Improve NTS endpoints calculation (CASSANDRA-10200)
+ * Improve performance of the folderSize function (CASSANDRA-10677)
+ * Add support for type casting in selection clause (CASSANDRA-10310)
+ * Added graphing option to cassandra-stress (CASSANDRA-7918)
+ * Abort in-progress queries that time out (CASSANDRA-7392)
+ * Add transparent data encryption core classes (CASSANDRA-9945)
+
+
3.1
Merged from 3.0:
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
* Handle single-column deletions correction in materialized views
when the column is part of the view primary key (CASSANDRA-10796)
* Fix issue with datadir migration on upgrade (CASSANDRA-10788)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/646da9aa/NEWS.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/646da9aa/src/java/org/apache/cassandra/db/SystemKeyspace.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/646da9aa/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
[10/22] cassandra git commit: 9474 2.2
Posted by jm...@apache.org.
9474 2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/879c49bb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/879c49bb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/879c49bb
Branch: refs/heads/cassandra-3.0
Commit: 879c49bb7d28946187a04e5cd76236d652825579
Parents: 1a00f00
Author: Marcus Olsson <ma...@ericsson.com>
Authored: Fri Dec 4 14:22:36 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:22:36 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 18 +++-----
.../org/apache/cassandra/db/SystemKeyspace.java | 15 ++++++
.../cassandra/service/CassandraDaemon.java | 15 ------
.../apache/cassandra/service/StartupChecks.java | 48 +++++++++++++++++++-
5 files changed, 70 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/879c49bb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7932f51..34866fa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.5
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
* Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
Merged from 2.1:
* Fix Stress profile parsing on Windows (CASSANDRA-10808)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/879c49bb/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 87e77f4..e220357 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -26,10 +26,13 @@ Deprecation
Operations
----------
- - Switching racks is no longer an allowed operation on a node which has
- 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".
+ - Switching data center or racks is no longer an allowed operation on a node
+ which has data. Instead, the node will need to be decommissioned and
+ rebootstrapped. If moving from the SimpleSnitch, make sure that the data
+ center and rack containing all current nodes is named "datacenter1" and
+ "rack1". To override this behaviour use -Dcassandra.ignore_rack=true and/or
+ -Dcassandra.ignore_dc=true.
+ - Reloading the configuration file of GossipingPropertyFileSnitch has been disabled.
New features
------------
@@ -40,13 +43,6 @@ New features
- Native protocol server now allows both SSL and non-SSL connections on
the same port.
-Operations
-------------
- - Changing rack or dc of live nodes is no longer possible for PropertyFileSnitch
- and YamlFileNetworkTopologySnitch. Reloading the configuration file of
- GossipingPropertyFileSnitch has been disabled, CASSANDRA-10243.
-
-
2.2.3
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/879c49bb/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 1807101..46de0db 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -880,6 +880,21 @@ public final class SystemKeyspace
return null;
}
+ /**
+ * Gets the stored data center for the local node, or null if none have been set yet.
+ */
+ public static String getDatacenter()
+ {
+ String req = "SELECT data_center FROM system.%s WHERE key='%s'";
+ UntypedResultSet result = executeInternal(String.format(req, LOCAL, LOCAL));
+
+ // Look up the Data center (return it if found)
+ if (!result.isEmpty() && result.one().has("data_center"))
+ return result.one().getString("data_center");
+
+ return null;
+ }
+
public static PaxosState loadPaxosState(ByteBuffer key, CFMetaData metadata)
{
String req = "SELECT * FROM system.%s WHERE row_key = ? AND cf_id = ?";
http://git-wip-us.apache.org/repos/asf/cassandra/blob/879c49bb/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 59609a3..eb05324 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -232,21 +232,6 @@ public class CassandraDaemon
Keyspace.setInitialized();
- if (!Boolean.getBoolean("cassandra.ignore_rack"))
- {
- 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 decommission and rebootstrap this node.");
- System.exit(100);
- }
- }
- }
-
// initialize keyspaces
for (String keyspaceName : Schema.instance.getKeyspaces())
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/879c49bb/src/java/org/apache/cassandra/service/StartupChecks.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StartupChecks.java b/src/java/org/apache/cassandra/service/StartupChecks.java
index 8b8810c..c13b401 100644
--- a/src/java/org/apache/cassandra/service/StartupChecks.java
+++ b/src/java/org/apache/cassandra/service/StartupChecks.java
@@ -75,7 +75,9 @@ public class StartupChecks
initSigarLibrary,
checkDataDirs,
checkSSTablesFormat,
- checkSystemKeyspaceState);
+ checkSystemKeyspaceState,
+ checkDatacenter,
+ checkRack);
public StartupChecks withDefaultTests()
{
@@ -302,4 +304,48 @@ public class StartupChecks
}
}
};
+
+ public static final StartupCheck checkDatacenter = new StartupCheck()
+ {
+ public void execute() throws StartupException
+ {
+ if (!Boolean.getBoolean("cassandra.ignore_dc"))
+ {
+ String storedDc = SystemKeyspace.getDatacenter();
+ if (storedDc != null)
+ {
+ String currentDc = DatabaseDescriptor.getEndpointSnitch().getDatacenter(FBUtilities.getBroadcastAddress());
+ if (!storedDc.equals(currentDc))
+ {
+ String formatMessage = "Cannot start node if snitch's data center (%s) differs from previous data center (%s). " +
+ "Please fix the snitch configuration, decommission and rebootstrap this node or use the flag -Dcassandra.ignore_dc=true.";
+
+ throw new StartupException(100, String.format(formatMessage, currentDc, storedDc));
+ }
+ }
+ }
+ }
+ };
+
+ public static final StartupCheck checkRack = new StartupCheck()
+ {
+ public void execute() throws StartupException
+ {
+ if (!Boolean.getBoolean("cassandra.ignore_rack"))
+ {
+ String storedRack = SystemKeyspace.getRack();
+ if (storedRack != null)
+ {
+ String currentRack = DatabaseDescriptor.getEndpointSnitch().getRack(FBUtilities.getBroadcastAddress());
+ if (!storedRack.equals(currentRack))
+ {
+ String formatMessage = "Cannot start node if snitch's rack (%s) differs from previous rack (%s). " +
+ "Please fix the snitch configuration, decommission and rebootstrap this node or use the flag -Dcassandra.ignore_rack=true.";
+
+ throw new StartupException(100, String.format(formatMessage, currentRack, storedRack));
+ }
+ }
+ }
+ }
+ };
}
[17/22] cassandra git commit: 9474 3.0
Posted by jm...@apache.org.
9474 3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a4da379b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a4da379b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a4da379b
Branch: refs/heads/cassandra-3.1
Commit: a4da379bb042fcf171a560af5edd9e785d6f8e4e
Parents: 8fd810c
Author: Marcus Olsson <ma...@ericsson.com>
Authored: Fri Dec 4 14:30:00 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:30:00 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 18 +++-----
.../org/apache/cassandra/db/SystemKeyspace.java | 15 ++++++
.../cassandra/service/CassandraDaemon.java | 15 ------
.../apache/cassandra/service/StartupChecks.java | 48 +++++++++++++++++++-
5 files changed, 70 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4da379b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c22d138..8f3f182 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.1
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
* Handle single-column deletions correction in materialized views
when the column is part of the view primary key (CASSANDRA-10796)
* Fix issue with datadir migration on upgrade (CASSANDRA-10788)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4da379b/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index b3c304a..d41384b 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -146,10 +146,13 @@ Deprecation
Operations
----------
- - Switching racks is no longer an allowed operation on a node which has
- 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".
+ - Switching data center or racks is no longer an allowed operation on a node
+ which has data. Instead, the node will need to be decommissioned and
+ rebootstrapped. If moving from the SimpleSnitch, make sure that the data
+ center and rack containing all current nodes is named "datacenter1" and
+ "rack1". To override this behaviour use -Dcassandra.ignore_rack=true and/or
+ -Dcassandra.ignore_dc=true.
+ - Reloading the configuration file of GossipingPropertyFileSnitch has been disabled.
New features
------------
@@ -160,13 +163,6 @@ New features
- Native protocol server now allows both SSL and non-SSL connections on
the same port.
-Operations
-------------
- - Changing rack or dc of live nodes is no longer possible for PropertyFileSnitch
- and YamlFileNetworkTopologySnitch. Reloading the configuration file of
- GossipingPropertyFileSnitch has been disabled, CASSANDRA-10243.
-
-
2.2.3
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4da379b/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 8a27c9d..205df8b 100644
--- a/src/java/org/apache/cassandra/db/SystemKeyspace.java
+++ b/src/java/org/apache/cassandra/db/SystemKeyspace.java
@@ -1068,6 +1068,21 @@ public final class SystemKeyspace
return null;
}
+ /**
+ * Gets the stored data center for the local node, or null if none have been set yet.
+ */
+ public static String getDatacenter()
+ {
+ String req = "SELECT data_center FROM system.%s WHERE key='%s'";
+ UntypedResultSet result = executeInternal(String.format(req, LOCAL, LOCAL));
+
+ // Look up the Data center (return it if found)
+ if (!result.isEmpty() && result.one().has("data_center"))
+ return result.one().getString("data_center");
+
+ return null;
+ }
+
public static PaxosState loadPaxosState(DecoratedKey key, CFMetaData metadata)
{
String req = "SELECT * FROM system.%s WHERE row_key = ? AND cf_id = ?";
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4da379b/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index f83152b..4af926a 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -241,21 +241,6 @@ public class CassandraDaemon
Keyspace.setInitialized();
- if (!Boolean.getBoolean("cassandra.ignore_rack"))
- {
- 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 decommission and rebootstrap this node.");
- System.exit(100);
- }
- }
- }
-
// initialize keyspaces
for (String keyspaceName : Schema.instance.getKeyspaces())
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a4da379b/src/java/org/apache/cassandra/service/StartupChecks.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StartupChecks.java b/src/java/org/apache/cassandra/service/StartupChecks.java
index ebe4b26..c2c5acc 100644
--- a/src/java/org/apache/cassandra/service/StartupChecks.java
+++ b/src/java/org/apache/cassandra/service/StartupChecks.java
@@ -75,7 +75,9 @@ public class StartupChecks
initSigarLibrary,
checkDataDirs,
checkSSTablesFormat,
- checkSystemKeyspaceState);
+ checkSystemKeyspaceState,
+ checkDatacenter,
+ checkRack);
public StartupChecks withDefaultTests()
{
@@ -300,4 +302,48 @@ public class StartupChecks
}
}
};
+
+ public static final StartupCheck checkDatacenter = new StartupCheck()
+ {
+ public void execute() throws StartupException
+ {
+ if (!Boolean.getBoolean("cassandra.ignore_dc"))
+ {
+ String storedDc = SystemKeyspace.getDatacenter();
+ if (storedDc != null)
+ {
+ String currentDc = DatabaseDescriptor.getEndpointSnitch().getDatacenter(FBUtilities.getBroadcastAddress());
+ if (!storedDc.equals(currentDc))
+ {
+ String formatMessage = "Cannot start node if snitch's data center (%s) differs from previous data center (%s). " +
+ "Please fix the snitch configuration, decommission and rebootstrap this node or use the flag -Dcassandra.ignore_dc=true.";
+
+ throw new StartupException(100, String.format(formatMessage, currentDc, storedDc));
+ }
+ }
+ }
+ }
+ };
+
+ public static final StartupCheck checkRack = new StartupCheck()
+ {
+ public void execute() throws StartupException
+ {
+ if (!Boolean.getBoolean("cassandra.ignore_rack"))
+ {
+ String storedRack = SystemKeyspace.getRack();
+ if (storedRack != null)
+ {
+ String currentRack = DatabaseDescriptor.getEndpointSnitch().getRack(FBUtilities.getBroadcastAddress());
+ if (!storedRack.equals(currentRack))
+ {
+ String formatMessage = "Cannot start node if snitch's rack (%s) differs from previous rack (%s). " +
+ "Please fix the snitch configuration, decommission and rebootstrap this node or use the flag -Dcassandra.ignore_rack=true.";
+
+ throw new StartupException(100, String.format(formatMessage, currentRack, storedRack));
+ }
+ }
+ }
+ }
+ };
}
[21/22] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.1
Posted by jm...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2b8cdc23
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2b8cdc23
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2b8cdc23
Branch: refs/heads/trunk
Commit: 2b8cdc2343a2169f764511a54f32e0cd41078f40
Parents: eb0f56d a4da379
Author: Joshua McKenzie <jm...@apache.org>
Authored: Fri Dec 4 14:30:37 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:30:37 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 18 +++-----
.../org/apache/cassandra/db/SystemKeyspace.java | 15 ++++++
.../cassandra/service/CassandraDaemon.java | 15 ------
.../apache/cassandra/service/StartupChecks.java | 48 +++++++++++++++++++-
5 files changed, 70 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b8cdc23/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7c7e301,8f3f182..e06653f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
-3.0.1
+3.1
+Merged from 3.0:
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
* Handle single-column deletions correction in materialized views
when the column is part of the view primary key (CASSANDRA-10796)
* Fix issue with datadir migration on upgrade (CASSANDRA-10788)
[09/22] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by jm...@apache.org.
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/1a00f001
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a00f001
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a00f001
Branch: refs/heads/cassandra-3.0
Commit: 1a00f001fad5636b846062b340237c1a331d77ac
Parents: c8136b9 f6deca3
Author: Joshua McKenzie <jm...@apache.org>
Authored: Fri Dec 4 14:22:02 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:22:02 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[06/22] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by jm...@apache.org.
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/1a00f001
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a00f001
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a00f001
Branch: refs/heads/cassandra-2.2
Commit: 1a00f001fad5636b846062b340237c1a331d77ac
Parents: c8136b9 f6deca3
Author: Joshua McKenzie <jm...@apache.org>
Authored: Fri Dec 4 14:22:02 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Dec 4 14:22:02 2015 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------