-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
When a node is decommissioned, it triggers data transfer to other nodes. During this transfer process, receiving nodes temporarily hold token ranges in a pending state. However, the current cleanup process doesn't account for these pending ranges when calculating token ownership, leading to inadvertent cleanup of data already stored in SSTables. To address this issue, this patch introduces two changes. Firstly, it backports CASSANDRA-16418, introducing a preventive check in `StorageService#forceKeyspaceCleanup`. This check disallows the initiation of cleanup when a node contains any pending ranges for the requested keyspace. Secondly, it reintroduces a similar condition to test for the existence of pending ranges in `CompactionManager#performCleanup`. This ensures the safety of this API as well. patch by Szymon Miezal; reviewed by TBD for CASSANDRA-18824
- Loading branch information
1 parent
5bf1d2f
commit 7629f8f
Showing
5 changed files
with
204 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
124 changes: 124 additions & 0 deletions
124
test/distributed/org/apache/cassandra/distributed/test/CleanupFailureTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| /* | ||
| * 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; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import org.apache.cassandra.distributed.Cluster; | ||
| import org.apache.cassandra.distributed.api.ConsistencyLevel; | ||
| import org.apache.cassandra.distributed.api.IInstanceConfig; | ||
| import org.apache.cassandra.distributed.api.IInvokableInstance; | ||
| import org.apache.cassandra.distributed.api.NodeToolResult; | ||
| import org.apache.cassandra.distributed.shared.NetworkTopology; | ||
|
|
||
| import static org.apache.cassandra.distributed.action.GossipHelper.statusToBootstrap; | ||
| import static org.apache.cassandra.distributed.action.GossipHelper.statusToDecommission; | ||
| import static org.apache.cassandra.distributed.action.GossipHelper.withProperty; | ||
| import static org.apache.cassandra.distributed.api.Feature.GOSSIP; | ||
| import static org.apache.cassandra.distributed.api.Feature.NETWORK; | ||
| import static org.apache.cassandra.distributed.api.TokenSupplier.evenlyDistributedTokens; | ||
| import static org.junit.Assert.assertEquals; | ||
|
|
||
| public class CleanupFailureTest extends TestBaseImpl | ||
| { | ||
| @Test | ||
| public void cleanupDuringDecommissionTest() throws Throwable | ||
| { | ||
| try (Cluster cluster = builder().withNodes(2) | ||
| .withTokenSupplier(evenlyDistributedTokens(2)) | ||
| .withNodeIdTopology(NetworkTopology.singleDcNetworkTopology(2, "dc0", "rack0")) | ||
| .withConfig(config -> config.with(NETWORK, GOSSIP)) | ||
| .start()) | ||
| { | ||
| IInvokableInstance nodeToDecommission = cluster.get(1); | ||
| IInvokableInstance nodeToRemainInCluster = cluster.get(2); | ||
|
|
||
| // Start decomission on nodeToDecommission | ||
| cluster.forEach(statusToDecommission(nodeToDecommission)); | ||
|
|
||
| // Add data to cluster while node is decomissioning | ||
| int numRows = 100; | ||
| createKeyspaceWithTable(cluster, 1); | ||
| insertData(cluster, 1, numRows, ConsistencyLevel.ONE); | ||
|
|
||
| // Check data before cleanup on nodeToRemainInCluster | ||
| assertEquals(100, nodeToRemainInCluster.executeInternal("SELECT * FROM " + KEYSPACE + ".tbl").length); | ||
|
|
||
| // Run cleanup on nodeToRemainInCluster | ||
| NodeToolResult result = nodeToRemainInCluster.nodetoolResult("cleanup"); | ||
| result.asserts().failure(); | ||
| result.asserts().stderrContains("Node is involved in cluster membership changes. Not safe to run cleanup."); | ||
|
|
||
| // Check data after cleanup on nodeToRemainInCluster | ||
| assertEquals(100, nodeToRemainInCluster.executeInternal("SELECT * FROM " + KEYSPACE + ".tbl").length); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void cleanupDuringBootstrapTest() throws Throwable | ||
| { | ||
| int originalNodeCount = 1; | ||
| int expandedNodeCount = originalNodeCount + 1; | ||
|
|
||
| try (Cluster cluster = builder().withNodes(originalNodeCount) | ||
| .withTokenSupplier(evenlyDistributedTokens(expandedNodeCount)) | ||
| .withNodeIdTopology(NetworkTopology.singleDcNetworkTopology(expandedNodeCount, "dc0", "rack0")) | ||
| .withConfig(config -> config.with(NETWORK, GOSSIP)) | ||
| .start()) | ||
| { | ||
| IInstanceConfig config = cluster.newInstanceConfig(); | ||
| IInvokableInstance bootstrappingNode = cluster.bootstrap(config); | ||
| withProperty("cassandra.join_ring", "false", | ||
| () -> bootstrappingNode.startup(cluster)); | ||
|
|
||
| // Start decomission on bootstrappingNode | ||
| cluster.forEach(statusToBootstrap(bootstrappingNode)); | ||
|
|
||
| // Add data to cluster while node is bootstrapping | ||
| int numRows = 100; | ||
| createKeyspaceWithTable(cluster, 2); | ||
| insertData(cluster, 1, numRows, ConsistencyLevel.ONE); | ||
|
|
||
| // Check data before cleanup on bootstrappingNode | ||
| assertEquals(numRows, bootstrappingNode.executeInternal("SELECT * FROM " + KEYSPACE + ".tbl").length); | ||
|
|
||
| // Run cleanup on bootstrappingNode | ||
| NodeToolResult result = bootstrappingNode.nodetoolResult("cleanup"); | ||
| result.asserts().stderrContains("Node is involved in cluster membership changes. Not safe to run cleanup."); | ||
|
|
||
| // Check data after cleanup on bootstrappingNode | ||
| assertEquals(numRows, bootstrappingNode.executeInternal("SELECT * FROM " + KEYSPACE + ".tbl").length); | ||
| } | ||
| } | ||
|
|
||
| private void createKeyspaceWithTable(Cluster cluster, int rf) | ||
| { | ||
| cluster.schemaChange("CREATE KEYSPACE IF NOT EXISTS " + KEYSPACE + " WITH replication = {'class': 'SimpleStrategy', 'replication_factor': " + rf + "};"); | ||
| cluster.schemaChange("CREATE TABLE IF NOT EXISTS " + KEYSPACE + ".tbl (pk int, ck int, v int, PRIMARY KEY (pk, ck))"); | ||
| } | ||
|
|
||
| private void insertData(Cluster cluster, int node, int numberOfRows, ConsistencyLevel cl) | ||
| { | ||
| for (int i = 0; i < numberOfRows; i++) | ||
| { | ||
| cluster.coordinator(node).execute("INSERT INTO " + KEYSPACE + ".tbl (pk, ck, v) VALUES (?, ?, ?)", cl, i, i, i); | ||
| } | ||
| cluster.forEach(c -> c.flush(KEYSPACE)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters