diff --git a/CHANGES.txt b/CHANGES.txt index ff745f3092..097950afb2 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,6 +9,7 @@ Merged from 3.11: * Fix the capital P usage in the CQL parser (CASSANDRA-17919) Merged from 3.0: + * Validate the existence of a datacenter in nodetool rebuild (CASSANDRA-14319) * Suppress CVE-2023-2251 (CASSANDRA-18497) * Do not remove SSTables when cause of FSReadError is OutOfMemoryError while using best_effort disk failure policy (CASSANDRA-18336) * Do not remove truncated_at entry in system.local while dropping an index (CASSANDRA-18105) diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index e7c6fabc75..6a02b405af 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -1327,16 +1327,35 @@ public class StorageService extends NotificationBroadcasterSupport implements IE public void rebuild(String sourceDc, String keyspace, String tokens, String specificSources) { - // check ongoing rebuild - if (!isRebuilding.compareAndSet(false, true)) + try { - throw new IllegalStateException("Node is still rebuilding. Check nodetool netstats."); - } + // check ongoing rebuild + if (!isRebuilding.compareAndSet(false, true)) + { + throw new IllegalStateException("Node is still rebuilding. Check nodetool netstats."); + } - // check the arguments - if (keyspace == null && tokens != null) + if (sourceDc != null) + { + TokenMetadata.Topology topology = getTokenMetadata().cloneOnlyTokenMap().getTopology(); + Set availableDCs = topology.getDatacenterEndpoints().keySet(); + if (!availableDCs.contains(sourceDc)) + { + throw new IllegalArgumentException(String.format("Provided datacenter '%s' is not a valid datacenter, available datacenters are: %s", + sourceDc, String.join(",", availableDCs))); + } + } + + // check the arguments + if (keyspace == null && tokens != null) + { + throw new IllegalArgumentException("Cannot specify tokens without keyspace."); + } + } + catch (Throwable ex) { - throw new IllegalArgumentException("Cannot specify tokens without keyspace."); + isRebuilding.set(false); + throw ex; } logger.info("rebuild from dc: {}, {}, {}", sourceDc == null ? "(any dc)" : sourceDc, diff --git a/test/unit/org/apache/cassandra/service/StorageServiceTest.java b/test/unit/org/apache/cassandra/service/StorageServiceTest.java index f22f89fc52..5f9d32558d 100644 --- a/test/unit/org/apache/cassandra/service/StorageServiceTest.java +++ b/test/unit/org/apache/cassandra/service/StorageServiceTest.java @@ -20,6 +20,8 @@ package org.apache.cassandra.service; import org.apache.cassandra.locator.EndpointsByReplica; import org.apache.cassandra.locator.ReplicaCollection; + +import com.google.common.collect.ImmutableMultimap; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -34,8 +36,10 @@ import org.apache.cassandra.locator.IEndpointSnitch; import org.apache.cassandra.locator.InetAddressAndPort; import org.apache.cassandra.locator.Replica; import org.apache.cassandra.locator.ReplicaMultimap; +import org.apache.cassandra.locator.SimpleSnitch; import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.locator.TokenMetadata; +import org.mockito.Mockito; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -157,4 +161,57 @@ public class StorageServiceTest expectedResult.put(new Replica(aAddress, dRange, false), new Replica(bAddress, dRange, false)); assertMultimapEqualsIgnoreOrder(result, expectedResult.build()); } + + @Test + public void testRebuildFailOnNonExistingDatacenter() + { + String nonExistentDC = "NON_EXISTENT_DC"; + + try + { + getStorageService().rebuild(nonExistentDC, "StorageServiceTest", null, null); + fail(); + } + catch (IllegalArgumentException ex) + { + assertEquals(String.format("Provided datacenter '%s' is not a valid datacenter, available datacenters are: %s", + nonExistentDC, + SimpleSnitch.DATA_CENTER_NAME), + ex.getMessage()); + } + } + + @Test + public void testRebuildingWithTokensWithoutKeyspace() throws Exception + { + try + { + getStorageService().rebuild("datacenter1", null, "123", null); + fail(); + } + catch (IllegalArgumentException ex) + { + assertEquals("Cannot specify tokens without keyspace.", ex.getMessage()); + } + } + + private StorageService getStorageService() + { + ImmutableMultimap.Builder builder = ImmutableMultimap.builder(); + builder.put(SimpleSnitch.DATA_CENTER_NAME, aAddress); + + TokenMetadata.Topology tokenMetadataTopology = Mockito.mock(TokenMetadata.Topology.class); + Mockito.when(tokenMetadataTopology.getDatacenterEndpoints()).thenReturn(builder.build()); + + TokenMetadata metadata = new TokenMetadata(new SimpleSnitch()); + TokenMetadata spiedMetadata = Mockito.spy(metadata); + + Mockito.when(spiedMetadata.getTopology()).thenReturn(tokenMetadataTopology); + + StorageService spiedStorageService = Mockito.spy(StorageService.instance); + Mockito.when(spiedStorageService.getTokenMetadata()).thenReturn(spiedMetadata); + Mockito.when(spiedMetadata.cloneOnlyTokenMap()).thenReturn(spiedMetadata); + + return spiedStorageService; + } }