This is an automated email from the ASF dual-hosted git repository.
bdeggleston pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a32881eef99a407c2933af65c1bb4e27046045ab
Merge: 5ef75dd fee7a10
Author: Blake Eggleston <bdeggles...@gmail.com>
AuthorDate: Fri Oct 30 12:35:46 2020 -0700
Merge branch 'cassandra-3.0' into cassandra-3.11
CHANGES.txt | 1 +
.../apache/cassandra/service/StorageService.java | 16 +++
.../cassandra/distributed/test/GossipTest.java | 114 ++++++++++++++++++++-
3 files changed, 130 insertions(+), 1 deletion(-)
diff --cc CHANGES.txt
index 9bee8ee,bfc0a81..b4caada
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
-3.0.23:
+3.11.9
+ * Synchronize Keyspace instance store/clear (CASSANDRA-16210)
+ * Fix ColumnFilter to avoid querying cells of unselected complex columns
(CASSANDRA-15977)
+ * Fix memory leak in CompressedChunkReader (CASSANDRA-15880)
+ * Don't attempt value skipping with mixed version cluster (CASSANDRA-15833)
+ * Avoid failing compactions with very large partitions (CASSANDRA-15164)
+ * Make sure LCS handles duplicate sstable added/removed notifications
correctly (CASSANDRA-14103)
+Merged from 3.0:
+ * Prevent invoking enable/disable gossip when not in NORMAL (CASSANDRA-16146)
* Fix OOM when terminating repair session (CASSANDRA-15902)
* Avoid marking shutting down nodes as up after receiving gossip shutdown
message (CASSANDRA-16094)
* Check SSTables for latest version before dropping compact storage
(CASSANDRA-16063)
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 3fbeba0,7645091..4481af6
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -327,8 -321,11 +327,11 @@@ public class StorageService extends Not
// should only be called via JMX
public void stopGossiping()
{
- if (initialized)
+ if (gossipActive)
{
+ if (!isNormal())
+ throw new IllegalStateException("Unable to stop gossip
because the node is not in the normal state. Try to stop the node instead.");
+
logger.warn("Stopping gossip by operator request");
if (isNativeTransportRunning())
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
