This is an automated email from the ASF dual-hosted git repository.
belliottsmith pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-accord.git
The following commit(s) were added to refs/heads/trunk by this push:
new 047da324 Follow-up CASSANDRA-21662: fix tests
047da324 is described below
commit 047da32402368454e18cf9375c043e4a25cf52a5
Author: Benedict Elliott Smith <[email protected]>
AuthorDate: Mon Sep 7 12:49:11 2026 +0100
Follow-up CASSANDRA-21662: fix tests
---
accord-core/src/main/java/accord/api/ProtocolModifiers.java | 7 +++++++
.../src/main/java/accord/coordinate/CoordinateSyncPoint.java | 2 +-
accord-core/src/test/java/accord/burn/BurnTestBase.java | 5 +++++
accord-core/src/test/java/accord/impl/LocalListenersTest.java | 1 +
accord-core/src/test/java/accord/impl/TestAgent.java | 3 ++-
accord-core/src/test/java/accord/local/cfk/CommandsForKeyTest.java | 2 ++
6 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/accord-core/src/main/java/accord/api/ProtocolModifiers.java
b/accord-core/src/main/java/accord/api/ProtocolModifiers.java
index 18b0dc2c..83bac7fa 100644
--- a/accord-core/src/main/java/accord/api/ProtocolModifiers.java
+++ b/accord-core/src/main/java/accord/api/ProtocolModifiers.java
@@ -155,6 +155,9 @@ public class ProtocolModifiers
private static boolean permitLocalDelivery = true;
public static synchronized void setPermitLocalDelivery(boolean
newPermitLocalDelivery) { pre(); permitLocalDelivery = newPermitLocalDelivery; }
+ private static boolean permitAsyncTasks = true;
+ public static synchronized void setPermitAsyncTasks(boolean
newPermitAsyncTasks) { pre(); permitAsyncTasks = newPermitAsyncTasks; }
+
private static boolean permitAtomicIncrementalTasks = true;
public static synchronized void
setPermitAtomicIncrementalTasks(boolean newPermitAtomicIncrementalTasks) {
pre(); permitAtomicIncrementalTasks = newPermitAtomicIncrementalTasks; }
@@ -347,10 +350,14 @@ public class ProtocolModifiers
private static final boolean permitLocalDelivery =
Configure.permitLocalDelivery;
public static boolean permitLocalDelivery() { return permitLocalDelivery; }
+ private static final boolean permitAsyncTasks = Configure.permitAsyncTasks;
private static final boolean permitAtomicIncrementalTasks =
Configure.permitAtomicIncrementalTasks;
public static boolean permitAtomicIncrementalTasks() { return
permitAtomicIncrementalTasks; }
public static LoadKeys loadKeysAsyncIfPermitted(TxnId txnId)
{
+ if (!permitAsyncTasks)
+ return LoadKeys.SYNC;
+
if (permitAtomicIncrementalTasks())
return LoadKeys.ASYNC;
return managesExecution(txnId) ? LoadKeys.SYNC : LoadKeys.ASYNC;
diff --git
a/accord-core/src/main/java/accord/coordinate/CoordinateSyncPoint.java
b/accord-core/src/main/java/accord/coordinate/CoordinateSyncPoint.java
index 3b0f50cc..bbb49168 100644
--- a/accord-core/src/main/java/accord/coordinate/CoordinateSyncPoint.java
+++ b/accord-core/src/main/java/accord/coordinate/CoordinateSyncPoint.java
@@ -169,7 +169,7 @@ public class CoordinateSyncPoint<R> extends
CoordinatePreAccept<R>
if (tracker.hasMediumPathAccepted() && txnId.hasMediumPath())
adapter.propose(node, executor, topologies, scope,
Accept.Kind.MEDIUM, Ballot.ZERO, txnId, txn, withFlags, deps,
finishAndTakeCallback());
else
- adapter.propose(node, executor, topologies, scope,
Accept.Kind.SLOW, Ballot.ZERO, txnId, txn, executeAt, deps,
finishAndTakeCallback());
+ adapter.propose(node, executor, topologies, scope,
Accept.Kind.SLOW, Ballot.ZERO, txnId, txn, txnId, deps,
finishAndTakeCallback());
}
}
diff --git a/accord-core/src/test/java/accord/burn/BurnTestBase.java
b/accord-core/src/test/java/accord/burn/BurnTestBase.java
index 38bcdff6..2635e0e5 100644
--- a/accord-core/src/test/java/accord/burn/BurnTestBase.java
+++ b/accord-core/src/test/java/accord/burn/BurnTestBase.java
@@ -155,6 +155,11 @@ public class BurnTestBase
public static final int HASH_RANGE_END = 1 << 16;
private static final Range[] EMPTY_RANGES = new Range[0];
+ static
+ {
+ Configure.setPermitAsyncTasks(false);
+ }
+
static List<Packet> generate(RandomSource random, MessageListener
listener, Function<? super CommandStore, AsyncExecutor> executor, List<Id>
clients, List<Id> nodes, int[] keys, int operations)
{
List<Packet> packets = new ArrayList<>();
diff --git a/accord-core/src/test/java/accord/impl/LocalListenersTest.java
b/accord-core/src/test/java/accord/impl/LocalListenersTest.java
index feb7631a..bd0c9afb 100644
--- a/accord-core/src/test/java/accord/impl/LocalListenersTest.java
+++ b/accord-core/src/test/java/accord/impl/LocalListenersTest.java
@@ -404,6 +404,7 @@ public class LocalListenersTest
{
super(txnId);
current = new TestCommand(txnId, saveStatus, durability);
+ setSafe();
}
}
diff --git a/accord-core/src/test/java/accord/impl/TestAgent.java
b/accord-core/src/test/java/accord/impl/TestAgent.java
index b1ec6ac7..911c940e 100644
--- a/accord-core/src/test/java/accord/impl/TestAgent.java
+++ b/accord-core/src/test/java/accord/impl/TestAgent.java
@@ -28,6 +28,7 @@ import accord.api.CoordinatorEventListener;
import accord.api.OwnershipEventListener;
import accord.api.ProgressLog;
import accord.api.Result;
+import accord.impl.mock.MockCluster;
import accord.impl.mock.MockStore;
import accord.local.Node;
import accord.local.SafeCommandStore;
@@ -99,7 +100,7 @@ public class TestAgent implements Agent,
OwnershipEventListener
final TimeService clock;
public TestAgent()
{
- this(null);
+ this(new MockCluster.Clock(0));
}
public TestAgent(TimeService clock)
diff --git a/accord-core/src/test/java/accord/local/cfk/CommandsForKeyTest.java
b/accord-core/src/test/java/accord/local/cfk/CommandsForKeyTest.java
index 85281587..a268f446 100644
--- a/accord-core/src/test/java/accord/local/cfk/CommandsForKeyTest.java
+++ b/accord-core/src/test/java/accord/local/cfk/CommandsForKeyTest.java
@@ -706,6 +706,7 @@ public class CommandsForKeyTest
super(txnId);
this.canon = canon;
current = prev = command;
+ setSafe();
}
}
@@ -715,6 +716,7 @@ public class CommandsForKeyTest
{
super(cfk.key());
current = cfk;
+ setSafe();
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
