This is an automated email from the ASF dual-hosted git repository.
benedict pushed a commit to branch burn-test-stability
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 02db1057ba995f03ebbe825a81fe679299cd732a
Author: Benedict Elliott Smith <bened...@apache.org>
AuthorDate: Fri Aug 2 14:17:42 2024 +0100
update accord
---
.gitmodules | 2 +-
modules/accord | 2 +-
.../apache/cassandra/service/accord/repair/RepairSyncPointAdapter.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index b8fde5f01d..fc9b7c0807 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
[submodule "modules/accord"]
path = modules/accord
url = https://github.com/belliottsmith/cassandra-accord.git
- branch = cfk-pruning
+ branch = exclusive-sync-point-fix
diff --git a/modules/accord b/modules/accord
index 1a74008be3..1c8b89da1f 160000
--- a/modules/accord
+++ b/modules/accord
@@ -1 +1 @@
-Subproject commit 1a74008be31f818b89aec2ed67490fba5dc12175
+Subproject commit 1c8b89da1fe6afd4f8691b8fe8328091055dedc2
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 76e29adbc5..8cc04f60da 100644
---
a/src/java/org/apache/cassandra/service/accord/repair/RepairSyncPointAdapter.java
+++
b/src/java/org/apache/cassandra/service/accord/repair/RepairSyncPointAdapter.java
@@ -61,7 +61,7 @@ public class RepairSyncPointAdapter<S extends Seekables<?,
?>> extends Coordinat
public void execute(Node node, Topologies all, FullRoute<?> route,
ExecutePath path, TxnId txnId, Txn txn, Timestamp executeAt, Deps deps,
BiConsumer<? super SyncPoint<S>, Throwable> callback)
{
RequiredResponseTracker tracker = new
RequiredResponseTracker(requiredResponses, all);
- ExecuteSyncPoint.ExecuteBlocking<S> execute = new
ExecuteSyncPoint.ExecuteBlocking<>(node, tracker, new SyncPoint<>(txnId, deps,
(S) txn.keys(), route), executeAt);
+ ExecuteSyncPoint.ExecuteBlocking<S> execute = new
ExecuteSyncPoint.ExecuteBlocking<>(node, new SyncPoint<>(txnId, deps, (S)
txn.keys(), route), tracker, executeAt);
execute.addCallback(callback);
execute.start();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
