diff --git a/modules/accord b/modules/accord index bd0761c567..1401e93490 160000 --- a/modules/accord +++ b/modules/accord @@ -1 +1 @@ -Subproject commit bd0761c567d153995a3db8da686ffdc940247200 +Subproject commit 1401e93490de57c65a12020d85830fbba8ef8c26 diff --git a/src/java/org/apache/cassandra/service/accord/repair/RepairSyncPointAdapter.java b/src/java/org/apache/cassandra/service/accord/repair/RepairSyncPointAdapter.java index 767e57fd9f..c13a3c7f81 100644 --- a/src/java/org/apache/cassandra/service/accord/repair/RepairSyncPointAdapter.java +++ b/src/java/org/apache/cassandra/service/accord/repair/RepairSyncPointAdapter.java @@ -61,17 +61,11 @@ public class RepairSyncPointAdapter extends CoordinationAd public void execute(Node node, Topologies all, FullRoute route, ExecutePath path, TxnId txnId, Txn txn, Timestamp executeAt, Deps deps, BiConsumer, Throwable> callback) { RequiredResponseTracker tracker = new RequiredResponseTracker(requiredResponses, all); - ExecuteSyncPoint.ExecuteBlocking execute = new ExecuteSyncPoint.ExecuteBlocking<>(node, new SyncPoint<>(txnId, deps, (FullRoute) route), tracker, executeAt); + ExecuteSyncPoint.ExecuteInclusive execute = new ExecuteSyncPoint.ExecuteInclusive<>(node, new SyncPoint<>(txnId, deps, (FullRoute) route), tracker, executeAt); execute.addCallback(callback); execute.start(); } - @Override - protected void addOrExecuteCallback(ExecuteSyncPoint.ExecuteBlocking execute, BiConsumer, Throwable> callback) - { - execute.addCallback(callback); - } - @Override public void persist(Node node, Topologies all, FullRoute route, TxnId txnId, Txn txn, Timestamp executeAt, Deps deps, Writes writes, Result result, BiConsumer, Throwable> callback) {