diff --git a/src/java/org/apache/cassandra/service/accord/AccordService.java b/src/java/org/apache/cassandra/service/accord/AccordService.java index 3f7e3009f5..019311c8d3 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordService.java +++ b/src/java/org/apache/cassandra/service/accord/AccordService.java @@ -1449,7 +1449,7 @@ public class AccordService implements IAccordService, Shutdownable Preconditions.checkArgument(!nodeStreamingContext.isEmpty()); - CoordinatedTransfer transfer = new CoordinatedTransfer(node().nextCoordinationId(), keyspace, metadata, nodeStreamingContext, topology.epoch(), getTokenRangeSpanningSSTables(sstables, metadata)); + CoordinatedTransfer transfer = new CoordinatedTransfer(node().nextCoordinatedTransferId(), keyspace, metadata, nodeStreamingContext, topology.epoch(), getTokenRangeSpanningSSTables(sstables, metadata)); transfer.execute(); } diff --git a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordImportSSTableTest.java b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordImportSSTableTest.java index 84bcf060a5..975fbf3f2c 100644 --- a/test/distributed/org/apache/cassandra/distributed/test/accord/AccordImportSSTableTest.java +++ b/test/distributed/org/apache/cassandra/distributed/test/accord/AccordImportSSTableTest.java @@ -346,6 +346,8 @@ public class AccordImportSSTableTest extends TestBaseImpl try (Cluster cluster = init(builder().withNodes(3).withoutVNodes() .withDataDirCount(1).withConfig((config) -> config + .set("accord.recover_txn", "100ms") + .set("accord.permit_local_delivery", false) .with(Feature.NETWORK, Feature.GOSSIP)).start())) { cluster.schemaChange("DROP KEYSPACE IF EXISTS " + KEYSPACE);