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

NPE on Directory in ShortPaxosSimulationTest 

Patch by Alex Petrov, reviewed by Caleb Rackliffe and Marcus Eriksson for CASSANDRA-19794
This commit is contained in:
Alex Petrov 2024-07-25 14:47:13 +02:00
parent 5bbdebac9c
commit 018feb36f4
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/apache/cassandra/locator/CMSPlacementStrategy.java
View File

@ -106,13 +106,13 @@ public interface CMSPlacementStrategy
rf.put(e.getKey(), ReplicationFactor.fullOnly(e.getValue()));
}
Directory directory = metadata.directory;
Directory tmpDirectory = metadata.directory;
TokenMap tokenMap = metadata.tokenMap;
for (NodeId peerId : metadata.directory.peerIds())
{
if (!filter.apply(metadata, peerId))
{
directory = directory.without(peerId);
tmpDirectory = tmpDirectory.without(peerId);
tokenMap = tokenMap.unassignTokens(peerId);
}
}
@ -123,7 +123,7 @@ public interface CMSPlacementStrategy
Token minToken = DatabaseDescriptor.getPartitioner().getMinimumToken();
EndpointsForRange endpoints = NetworkTopologyStrategy.calculateNaturalReplicas(minToken,
new Range<>(minToken, minToken),
directory,
tmpDirectory,
tokenMap,
rf);

3
src/java/org/apache/cassandra/tcm/transformations/cms/PrepareCMSReconfiguration.java
View File

@ -215,6 +215,9 @@ public class PrepareCMSReconfiguration
public static Diff diff(Set<NodeId> currentCms, Set<NodeId> newCms)
{
assert !currentCms.contains(null) : "Current CMS contains a null value " + currentCms;
assert !newCms.contains(null) : "New CMS contains a null value " + newCms;
List<NodeId> additions = new ArrayList<>();
for (NodeId node : newCms)
{

7
test/simulator/main/org/apache/cassandra/simulator/cluster/OnClusterLeave.java
View File

@ -30,9 +30,11 @@ import org.apache.cassandra.tcm.ClusterMetadataService;
import org.apache.cassandra.tcm.MultiStepOperation;
import org.apache.cassandra.tcm.Transformation;
import org.apache.cassandra.tcm.sequences.LeaveStreams;
import org.apache.cassandra.tcm.sequences.ReconfigureCMS;
import org.apache.cassandra.tcm.sequences.UnbootstrapAndLeave;
import org.apache.cassandra.tcm.transformations.PrepareLeave;
import static org.apache.cassandra.utils.FBUtilities.getBroadcastAddressAndPort;
import static org.apache.cassandra.utils.LazyToString.lazy;
class OnClusterLeave extends OnClusterChangeTopology
@ -83,6 +85,9 @@ class OnClusterLeave extends OnClusterChangeTopology
{
super("Prepare Leave", actions, on, () -> {
ClusterMetadata metadata = ClusterMetadata.current();
ReconfigureCMS.maybeReconfigureCMS(metadata, getBroadcastAddressAndPort());
metadata = ClusterMetadata.current();
ClusterMetadataService.instance().commit(new PrepareLeave(metadata.myNodeId(),
false,
ClusterMetadataService.instance().placementProvider(),
@ -114,4 +119,4 @@ class OnClusterLeave extends OnClusterChangeTopology
});
}
}
}
}

7
test/simulator/main/org/apache/cassandra/simulator/cluster/OnClusterReplace.java
View File

@ -40,6 +40,7 @@ import org.apache.cassandra.tcm.MultiStepOperation;
import org.apache.cassandra.tcm.Transformation;
import org.apache.cassandra.tcm.membership.NodeId;
import org.apache.cassandra.tcm.sequences.BootstrapAndReplace;
import org.apache.cassandra.tcm.sequences.ReconfigureCMS;
import org.apache.cassandra.tcm.transformations.PrepareReplace;
import static org.apache.cassandra.simulator.Action.Modifiers.NONE;
@ -132,7 +133,11 @@ class OnClusterReplace extends OnClusterChangeTopology
{
super("Prepare Replace", actions, joining, () -> {
ClusterMetadata metadata = ClusterMetadata.current();
ClusterMetadataService.instance().commit(new PrepareReplace(new NodeId(leavingNodeId),
NodeId leaving = new NodeId(leavingNodeId);
ReconfigureCMS.maybeReconfigureCMS(metadata, metadata.directory.endpoint(leaving));
metadata = ClusterMetadata.current();
ClusterMetadataService.instance().commit(new PrepareReplace(leaving,
metadata.myNodeId(),
ClusterMetadataService.instance().placementProvider(),
true,