This is an automated email from the ASF dual-hosted git repository. marcuse pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 63cdfc9bf43ad89301e3fc590539d526d225d348 Merge: 0076217 acbaeb1 Author: Marcus Eriksson <[email protected]> AuthorDate: Mon Aug 24 09:24:12 2020 +0200 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 1 + .../org/apache/cassandra/service/StorageService.java | 16 +++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --cc CHANGES.txt index eef996d,5b23245..714b104 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,5 +1,8 @@@ -3.0.22: +3.11.8 + * Fix short read protection for GROUP BY queries (CASSANDRA-15459) + * Frozen RawTuple is not annotated with frozen in the toString method (CASSANDRA-15857) +Merged from 3.0: + * Fix gossip shutdown order (CASSANDRA-15816) * Remove broken 'defrag-on-read' optimization (CASSANDRA-15432) * Check for endpoint collision with hibernating nodes (CASSANDRA-14599) * Operational improvements and hardening for replica filtering protection (CASSANDRA-15907) diff --cc src/java/org/apache/cassandra/service/StorageService.java index 240a15e,0aba23c..ab30bfc --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -318,11 -312,17 +318,17 @@@ public class StorageService extends Not // should only be called via JMX public void stopGossiping() { - if (initialized) + if (gossipActive) { logger.warn("Stopping gossip by operator request"); + + if (isNativeTransportRunning()) + { + logger.warn("Disabling gossip while native transport is still active is unsafe"); + } + Gossiper.instance.stop(); - initialized = false; + gossipActive = false; } } @@@ -476,6 -477,11 +477,11 @@@ logger.error("Stopping native transport"); stopNativeTransport(); } - if (isInitialized()) ++ if (isGossipActive()) + { + logger.error("Stopping gossiper"); + stopGossiping(); + } } /** --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
