Skip to content

CASSANDRA-21426:Fix AssertionError in hasReplicaWithOngoingRepair when parallel_repair_count > 1 (5.0) #4859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pauloricardomg wants to merge 2 commits into
base: cassandra-5.0
Choose a base branch
from
+57 −1
Open

CASSANDRA-21426:Fix AssertionError in hasReplicaWithOngoingRepair when parallel_repair_count > 1 (5.0) #4859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6082e56
CASSANDRA-21426:Fix AssertionError in hasReplicaWithOngoingRepair whe…
patrickclee0207 Jun 3, 2026
6bd22e3
Add test for CASSANDRA-21426
pauloricardomg Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/java/org/apache/cassandra/repair/autorepair/AutoRepairUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ private static boolean hasReplicaWithOngoingRepair(AutoRepairHistory eligibleHis
for (Map.Entry<AbstractReplicationStrategy, List<String>> entry : replicationStrategies.entrySet())
{
AbstractReplicationStrategy replicationStrategy = entry.getKey();
EndpointsByRange endpointsByRange = replicationStrategy.getRangeAddresses(StorageService.instance.getTokenMetadata());
EndpointsByRange endpointsByRange = replicationStrategy.getRangeAddresses(StorageService.instance.getTokenMetadata().cachedOnlyTokenMap());

// get ranges of the eligible address for the given replication strategy.
RangesAtEndpoint rangesAtEndpoint = StorageService.instance.getReplicas(replicationStrategy, eligibleBroadcastAddress);
Expand Down
56 changes: 56 additions & 0 deletions test/unit/org/apache/cassandra/repair/autorepair/AutoRepairUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
package org.apache.cassandra.repair.autorepair;

import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
Comment on lines +23 to +24

@tolbertam tolbertam Jun 6, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just noticed that these imports are unused if you don't mind removing em before merging.

import java.util.List;
import java.util.Set;
import java.util.TreeSet;
Expand All @@ -44,8 +47,11 @@
import org.apache.cassandra.db.Keyspace;
import org.apache.cassandra.db.marshal.UTF8Type;
import org.apache.cassandra.db.marshal.UUIDType;
import org.apache.cassandra.dht.Murmur3Partitioner;
import org.apache.cassandra.locator.IEndpointSnitch;
import org.apache.cassandra.locator.InetAddressAndPort;
import org.apache.cassandra.locator.TokenMetadata;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.repair.autorepair.AutoRepairConfig.RepairType;
import org.apache.cassandra.repair.autorepair.AutoRepairUtils.AutoRepairHistory;
import org.apache.cassandra.repair.autorepair.AutoRepairUtils.CurrentRepairStatus;
Expand Down Expand Up @@ -709,4 +715,54 @@ public void testHasNodesBelowMinimumVersionWithNullVersion() throws UnknownHostE
boolean result = AutoRepairUtils.hasNodesBelowMinimumVersion();
assertTrue(result);
}

/**
* Reproduces CASSANDRA-21426: when parallel_repair_count > 1 and another node has an ongoing repair,
* hasReplicaWithOngoingRepair calls getRangeAddresses with the live TokenMetadata singleton, which
* triggers the assertion in getTopology() that prevents calling it on the live instance.
*/
@Test
public void testGetMostEligibleHostToRepairWithOngoingParallelRepair() throws UnknownHostException
{
InetAddressAndPort otherEndpoint = InetAddressAndPort.getByName("127.0.0.2");
UUID otherHostId = UUID.randomUUID();
TokenMetadata tokenMetadata = StorageService.instance.getTokenMetadata();

try
{
// Register a second endpoint in TokenMetadata so it has tokens and can be resolved
tokenMetadata.updateNormalToken(Murmur3Partitioner.instance.getRandomToken(), otherEndpoint);
tokenMetadata.updateHostId(otherHostId, otherEndpoint);

long currentMillis = System.currentTimeMillis();

// Build repair histories: other node has ongoing repair, local node is finished
AutoRepairHistory otherHistory = new AutoRepairHistory(otherHostId, null, currentMillis, currentMillis - 100,
null, 0, false);
AutoRepairHistory myHistory = new AutoRepairHistory(hostId, null, currentMillis - 200, currentMillis - 100,
null, 0, false);

// Construct CurrentRepairStatus directly to avoid CQL reads that fail with the extra endpoint
List<AutoRepairHistory> allHistories = new ArrayList<>();
allHistories.add(otherHistory);
allHistories.add(myHistory);
CurrentRepairStatus currentRepairStatus = new CurrentRepairStatus(allHistories, null, hostId);

// Verify preconditions: otherHostId is repairing, local node is not
assertTrue(currentRepairStatus.hostIdsWithOnGoingRepair.contains(otherHostId));
assertFalse(currentRepairStatus.hostIdsWithOnGoingRepair.contains(hostId));

// This exercises the code path:
// getMostEligibleHostToRepair -> hasReplicaWithOngoingRepair
// -> getRangeAddresses(getTokenMetadata()) -> calculateNaturalReplicas -> getTopology()
// Without the fix, getTopology() asserts because it's called on the live TokenMetadata singleton.
AutoRepairHistory result = AutoRepairUtils.getMostEligibleHostToRepair(repairType, currentRepairStatus, hostId);
assertNotNull(result);
assertEquals(hostId, result.hostId);
}
finally
{
tokenMetadata.removeEndpoint(otherEndpoint);
}
}
}