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
The following commit(s) were added to refs/heads/cep-15-accord by this push:
new 1991353859 Fix infinite loop, and notify progress log of sync point
durability while waiting to apply
1991353859 is described below
commit 1991353859c3a7a0d3e7ee623fd60b2dec42e256
Author: Benedict Elliott Smith <[email protected]>
AuthorDate: Mon Dec 2 17:44:27 2024 +0000
Fix infinite loop, and notify progress log of sync point durability while
waiting to apply
patch by Benedict; reviewed by David Capwell for CASSANDRA-20125
---
modules/accord | 2 +-
.../cassandra/service/accord/repair/RepairSyncPointAdapter.java | 8 +-------
2 files changed, 2 insertions(+), 8 deletions(-)
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<U extends Unseekable>
extends CoordinationAd
public void execute(Node node, Topologies all, FullRoute<?> route,
ExecutePath path, TxnId txnId, Txn txn, Timestamp executeAt, Deps deps,
BiConsumer<? super SyncPoint<U>, Throwable> callback)
{
RequiredResponseTracker tracker = new
RequiredResponseTracker(requiredResponses, all);
- ExecuteSyncPoint.ExecuteBlocking<U> execute = new
ExecuteSyncPoint.ExecuteBlocking<>(node, new SyncPoint<>(txnId, deps,
(FullRoute<U>) route), tracker, executeAt);
+ ExecuteSyncPoint.ExecuteInclusive<U> execute = new
ExecuteSyncPoint.ExecuteInclusive<>(node, new SyncPoint<>(txnId, deps,
(FullRoute<U>) route), tracker, executeAt);
execute.addCallback(callback);
execute.start();
}
- @Override
- protected void addOrExecuteCallback(ExecuteSyncPoint.ExecuteBlocking<U>
execute, BiConsumer<? super SyncPoint<U>, 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<? super SyncPoint<U>, Throwable> callback)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
