Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 e8651b662 -> 1dbfa4b54 refs/heads/cassandra-3.5 587773fa4 -> ef86d9192 refs/heads/trunk 68e6a8333 -> 700dd0e59
Add -Dcassandra.start_gossip option to skip starting gossip patch by slebresne; reviewed by brandon.williams for CASSANDRA-10809 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/01d86361 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/01d86361 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/01d86361 Branch: refs/heads/cassandra-3.0 Commit: 01d863619c8b301770751b7c4feda23f18bef697 Parents: 5e2d3d2 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Mar 17 17:21:06 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Mar 18 10:51:05 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/01d86361/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index fdb5807..ee58fed 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.2.6 + * Add -Dcassandra.start_gossip startup option (CASSANDRA-10809) * Clarify that now() function is calculated on the coordinator node in CQL documentation (CASSANDRA-10900) * Fix bloom filter sizing with LCS (CASSANDRA-11344) * (cqlsh) Fix error when result is 0 rows with EXPAND ON (CASSANDRA-11092) http://git-wip-us.apache.org/repos/asf/cassandra/blob/01d86361/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 0e716e8..9a0ba5d 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -690,6 +690,12 @@ public class StorageService extends NotificationBroadcasterSupport implements IE replacing = DatabaseDescriptor.isReplacing(); + if (!Boolean.parseBoolean(System.getProperty("cassandra.start_gossip", "true"))) + { + logger.info("Not starting gossip as requested."); + return; + } + prepareToJoin(); // Has to be called after the host id has potentially changed in prepareToJoin(). @@ -703,7 +709,6 @@ public class StorageService extends NotificationBroadcasterSupport implements IE logger.warn("Error loading counter cache", t); } - if (Boolean.parseBoolean(System.getProperty("cassandra.join_ring", "true"))) { joinTokenRing(delay);
