This is an automated email from the ASF dual-hosted git repository.
samt pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new ce541b6ddf LegacyStateListener should call onRemove for gossip state
listeners
ce541b6ddf is described below
commit ce541b6ddf79b734925c0453ac9075b438b5d65a
Author: ireath <[email protected]>
AuthorDate: Tue Nov 18 10:41:16 2025 -0500
LegacyStateListener should call onRemove for gossip state listeners
Patch by Isaac Reath; reviewed by Sam Tunnicliffe and Paulo Motta for
CASSANDRA-21033
---
CHANGES.txt | 1 +
.../tcm/listeners/LegacyStateListener.java | 1 +
.../GuardrailDiskUsageNodeReplaceTest.java | 82 ++++++++++++++++++++++
.../test/guardrails/GuardrailDiskUsageTest.java | 2 +-
4 files changed, 85 insertions(+), 1 deletion(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index f0d05ba26e..5ca122ebc1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
5.1
+ * DiskUsageBroadcaster does not update usageInfo on node replacement
(CASSANDRA-21033)
* Reject PrepareJoin if tokens are already assigned (CASSANDRA-21006)
* Don't update registration status if node state for decommissioned peer is
found with the same address (CASSANDRA-21005)
* Avoid NPE when meta keyspace placements are empty before CMS is initialized
(CASSANDRA-21004)
diff --git
a/src/java/org/apache/cassandra/tcm/listeners/LegacyStateListener.java
b/src/java/org/apache/cassandra/tcm/listeners/LegacyStateListener.java
index 798583a533..fa1fe9d25b 100644
--- a/src/java/org/apache/cassandra/tcm/listeners/LegacyStateListener.java
+++ b/src/java/org/apache/cassandra/tcm/listeners/LegacyStateListener.java
@@ -77,6 +77,7 @@ public class LegacyStateListener implements
ChangeListener.Async
for (InetAddressAndPort remove : removedAddr)
{
+ GossipHelper.removeFromGossip(remove);
GossipHelper.evictFromMembership(remove);
PeersTable.removeFromSystemPeersTables(remove);
}
diff --git
a/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailDiskUsageNodeReplaceTest.java
b/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailDiskUsageNodeReplaceTest.java
new file mode 100644
index 0000000000..20b2dd3180
--- /dev/null
+++
b/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailDiskUsageNodeReplaceTest.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.distributed.test.guardrails;
+
+import java.io.IOException;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.apache.cassandra.config.CassandraRelevantProperties;
+import org.apache.cassandra.distributed.Cluster;
+import org.apache.cassandra.distributed.api.Feature;
+import org.apache.cassandra.distributed.api.IInvokableInstance;
+import org.apache.cassandra.distributed.api.TokenSupplier;
+import org.apache.cassandra.distributed.shared.ClusterUtils;
+import org.apache.cassandra.distributed.test.TestBaseImpl;
+import org.apache.cassandra.service.disk.usage.DiskUsageBroadcaster;
+import org.apache.cassandra.service.disk.usage.DiskUsageState;
+
+public class GuardrailDiskUsageNodeReplaceTest extends TestBaseImpl
+{
+ private Cluster cluster;
+
+ @Before
+ public void setupCluster() throws IOException
+ {
+ CassandraRelevantProperties.DISK_USAGE_MONITOR_INTERVAL_MS.setInt(100);
+ TokenSupplier even = TokenSupplier.evenlyDistributedTokens(2);
+ cluster = init(Cluster.build(2)
+
.withInstanceInitializer(GuardrailDiskUsageTest.DiskStateInjection::install)
+ .withConfig(c -> c.with(Feature.GOSSIP,
Feature.NETWORK, Feature.NATIVE_PROTOCOL)
+
.set("data_disk_usage_max_disk_size", "10GiB")
+
.set("data_disk_usage_percentage_warn_threshold", 98)
+
.set("data_disk_usage_percentage_fail_threshold", 98)
+ .set("authenticator",
"PasswordAuthenticator")
+
.set("initial_location_provider", "SimpleLocationProvider")
+ )
+ .withTokenSupplier(node -> even.token(node == 3
? 2 : node))
+ .start()
+ );
+ }
+
+ @After
+ public void tearDown() throws IOException
+ {
+ if (cluster != null)
+ cluster.close();
+ }
+
+ @Test
+ public void
testDiskUsageBroadcasterWhenNodeReplacedShouldRemoveUsageInfo() throws
IOException
+ {
+ GuardrailDiskUsageTest.DiskStateInjection.setState(cluster, 2,
DiskUsageState.FULL);
+ IInvokableInstance nodeToRemove = cluster.get(2);
+ ClusterUtils.stopUnchecked(nodeToRemove);
+ IInvokableInstance replacingNode =
ClusterUtils.replaceHostAndStart(cluster, nodeToRemove, props -> {
+ props.set(CassandraRelevantProperties.BOOTSTRAP_SKIP_SCHEMA_CHECK,
true);
+ });
+ ClusterUtils.awaitRingJoin(cluster.get(1), replacingNode);
+ ClusterUtils.awaitRingJoin(replacingNode, cluster.get(1));
+ boolean hasStuffedOrFullNode = cluster.get(1).callOnInstance(() ->
DiskUsageBroadcaster.instance.hasStuffedOrFullNode());
+ Assert.assertFalse(hasStuffedOrFullNode);
+ }
+}
diff --git
a/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailDiskUsageTest.java
b/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailDiskUsageTest.java
index 5622ecc207..dafe00298c 100644
---
a/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailDiskUsageTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/test/guardrails/GuardrailDiskUsageTest.java
@@ -209,7 +209,7 @@ public class GuardrailDiskUsageTest extends GuardrailTester
{
public static volatile DiskUsageState state = DiskUsageState.SPACIOUS;
- private static void install(ClassLoader cl, int node)
+ static void install(ClassLoader cl, int node)
{
new ByteBuddy().rebase(DiskUsageMonitor.class)
.method(named("getState"))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
