natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Follow up to rebuild fix

This commit is contained in:
Sam Tunnicliffe 2026-07-03 17:25:40 +01:00
parent 46c85980fc
commit 9cb5d0cef7
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/java/org/apache/cassandra/service/Rebuild.java
View File

@ -233,10 +233,9 @@ public class Rebuild
private static MovementMap movementMap(ClusterMetadata metadata, String keyspace, String tokens)
{
MovementMap.Builder movementMapBuilder = MovementMap.builder();
DataPlacements placements = metadata.placements();
if (keyspace == null)
{
placements.forEach((params, placement) -> movementMapBuilder.put(params, addMovementsForParams(placement, null)));
metadata.placements().forEach((params, placement) -> movementMapBuilder.put(params, addMovementsForParams(placement, null)));
// Special case to include the system metadata keyspace
ReplicationParams metaParams = Keyspace.open(METADATA_KEYSPACE_NAME).getMetadata().params.replication;
movementMapBuilder.put(metaParams, addMovementsForParams(metadata.placement(metaParams), null));
@ -244,13 +243,13 @@ public class Rebuild
else if (tokens == null)
{
ReplicationParams params = Keyspace.open(keyspace).getMetadata().params.replication;
movementMapBuilder.put(params, addMovementsForParams(placements.get(params), null));
movementMapBuilder.put(params, addMovementsForParams(metadata.placement(params), null));
}
else
{
ReplicationParams params = Keyspace.open(keyspace).getMetadata().params.replication;
RangesAtEndpoint ranges = rangesForRebuildWithTokens(tokens, keyspace);
movementMapBuilder.put(params, addMovementsForParams(placements.get(params), ranges));
movementMapBuilder.put(params, addMovementsForParams(metadata.placement(params), ranges));
}
return movementMapBuilder.build();
}