cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [01/13] cassandra git commit: Add -Dcassandra.start_gossip option to skip starting gossip
Date Tue, 22 Mar 2016 20:52:48 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 b06bcf73f -> c74df4017
  refs/heads/cassandra-3.0 db10cb25c -> 842e7c3fb
  refs/heads/cassandra-3.5 16d1c8116 -> 1ee550262
  refs/heads/trunk e24da8f7f -> 207d08f86


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/b06bcf73
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b06bcf73
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b06bcf73

Branch: refs/heads/trunk
Commit: b06bcf73fb50c8e887d4469042543a9d78f7848c
Parents: 42cd66a
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu Mar 17 17:21:06 2016 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Mar 18 10:53:33 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/b06bcf73/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fa4a726..bcdf189 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.6
+ * Add -Dcassandra.start_gossip startup option (CASSANDRA-10809)
  * Fix UTF8Validator.validate() for modified UTF-8 (CASSANDRA-10748)
  * Clarify that now() function is calculated on the coordinator node in CQL documentation
(CASSANDRA-10900)
  * Fix bloom filter sizing with LCS (CASSANDRA-11344)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/b06bcf73/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);


Mime
View raw message