This is an automated email from the ASF dual-hosted git repository. benedict pushed a commit to branch cep-15-accord in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 5ce708d63f5dfc1d4bb3d0a7f83e2a0d9e891254 Author: David Capwell <[email protected]> AuthorDate: Wed Dec 4 11:02:17 2024 -0800 remove handicaps --- .../simulator/paxos/AccordClusterSimulation.java | 23 ---------------------- .../simulator/paxos/AccordSimulationRunner.java | 3 --- 2 files changed, 26 deletions(-) diff --git a/test/simulator/main/org/apache/cassandra/simulator/paxos/AccordClusterSimulation.java b/test/simulator/main/org/apache/cassandra/simulator/paxos/AccordClusterSimulation.java index ee8fd0ca49..24e038b3b3 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/paxos/AccordClusterSimulation.java +++ b/test/simulator/main/org/apache/cassandra/simulator/paxos/AccordClusterSimulation.java @@ -22,7 +22,6 @@ import java.io.IOException; import org.apache.cassandra.simulator.ClusterSimulation; import org.apache.cassandra.simulator.RandomSource; -import org.apache.cassandra.simulator.utils.IntRange; import org.apache.cassandra.simulator.utils.KindOfSequence; import static java.util.concurrent.TimeUnit.SECONDS; @@ -39,28 +38,6 @@ class AccordClusterSimulation extends ClusterSimulation<PaxosSimulation> impleme random.reset(seed); return new AccordClusterSimulation(random, seed, uniqueNum, this); } - - public void applyHandicaps() - { - /** - * TODO (required): remove - * We currently require coordinators to have a CommandStore to coordinate a query, but not every node - * is a replica under standard simulation - * - * The current homekey implementation isn't compatible with the C* commands per key implementation when - * a non-replica coordinates a query. - * - * This creates a few problems. - * - * First when a non-replica coordinator chooses a home key, it chooses the end of one of it's ranges and - * adds it to the txn. This doesn't work with the C* CFK implementation, because it expects a partition - * key. This will change with the partial replication patch, so we can re-evaluate then. - * - * Second, nodes that haven't joined the ring have no ranges to pull home keys from, so they npe - */ - dcCount = new IntRange(1, 1); - nodeCount = new IntRange(3, 3); - } } AccordClusterSimulation(RandomSource random, long seed, int uniqueNum, Builder builder) throws IOException diff --git a/test/simulator/main/org/apache/cassandra/simulator/paxos/AccordSimulationRunner.java b/test/simulator/main/org/apache/cassandra/simulator/paxos/AccordSimulationRunner.java index f14ae9daa1..b0cd80cf30 100644 --- a/test/simulator/main/org/apache/cassandra/simulator/paxos/AccordSimulationRunner.java +++ b/test/simulator/main/org/apache/cassandra/simulator/paxos/AccordSimulationRunner.java @@ -46,7 +46,6 @@ public class AccordSimulationRunner extends SimulationRunner protected void run(long seed, AccordClusterSimulation.Builder builder) throws IOException { beforeAll(); - builder.applyHandicaps(); super.run(seed, builder); } } @@ -60,7 +59,6 @@ public class AccordSimulationRunner extends SimulationRunner protected void run(long seed, AccordClusterSimulation.Builder builder) throws IOException { beforeAll(); - builder.applyHandicaps(); super.run(seed, builder); } } @@ -74,7 +72,6 @@ public class AccordSimulationRunner extends SimulationRunner protected void run(long seed, AccordClusterSimulation.Builder builder) throws IOException { beforeAll(); - builder.applyHandicaps(); super.run(seed, builder); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
