This is an automated email from the ASF dual-hosted git repository.
aweisberg pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new b9395acad6 Fix AccordMigrationTest not marking nodes down correctly
b9395acad6 is described below
commit b9395acad625c876c6b03c0e2cd2ee689af28b54
Author: Ariel Weisberg <aweisb...@apple.com>
AuthorDate: Mon May 5 15:29:27 2025 -0400
Fix AccordMigrationTest not marking nodes down correctly
Patch by Ariel Weisberg; Reviewed by Caleb Rackliffe for CASSANDRA-20621
---
.../apache/cassandra/distributed/test/accord/AccordMigrationTest.java | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationTest.java
b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationTest.java
index fee7e6af63..6dbfdca2aa 100644
---
a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationTest.java
+++
b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordMigrationTest.java
@@ -63,6 +63,7 @@ import org.apache.cassandra.dht.Token;
import org.apache.cassandra.distributed.api.Feature;
import org.apache.cassandra.distributed.api.ICoordinator;
import org.apache.cassandra.distributed.api.IInvokableInstance;
+import org.apache.cassandra.distributed.api.IMessageFilters.Filter;
import org.apache.cassandra.distributed.api.Row;
import org.apache.cassandra.distributed.api.SimpleQueryResult;
import org.apache.cassandra.gms.EndpointState;
@@ -445,6 +446,7 @@ public class AccordMigrationTest extends AccordTestBase
// Forced repair while a node is down shouldn't work, use repair
instead of finish-migration because repair exposes --force
// and regular Cassandra repairs are eligible to drive migration
so it's important they check --force and down nodes
InetAddressAndPort secondNodeBroadcastAddress =
InetAddressAndPort.getByAddress(cluster.get(2).broadcastAddress());
+ Filter blockNode2 = cluster.filters().allVerbs().from(2).drop();
cluster.get(1).runOnInstance(() -> {
EndpointState endpointState =
Gossiper.instance.getEndpointStateForEndpoint(secondNodeBroadcastAddress);
Gossiper.runInGossipStageBlocking(() ->
Gossiper.instance.markDead(secondNodeBroadcastAddress, endpointState));
@@ -454,6 +456,7 @@ public class AccordMigrationTest extends AccordTestBase
NormalizedRanges<Token> alreadyDataRepaired =
normalizedRanges(ImmutableList.of(new Range<>(upperMidToken,
maxAlignedWithLocalRanges)));
NormalizedRanges<Token> remainingPendingDataRepair =
migratingRanges.subtract(alreadyDataRepaired);
assertMigrationState(tableName, ConsensusMigrationTarget.accord,
emptyList(), remainingPendingDataRepair, migratingRanges, 1);
+ blockNode2.off();
cluster.get(1).runOnInstance(() -> {
EndpointState endpointState =
Gossiper.instance.getEndpointStateForEndpoint(secondNodeBroadcastAddress);
Gossiper.runInGossipStageBlocking(() ->
Gossiper.instance.realMarkAlive(secondNodeBroadcastAddress, endpointState));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
