This is an automated email from the ASF dual-hosted git repository.
aleksey 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 5b24707c72 Move preaccept expiration logic away from Agent
5b24707c72 is described below
commit 5b24707c729693b0bfdd6e154f70aad7daa2e4ca
Author: Aleksey Yeschenko <[email protected]>
AuthorDate: Mon May 13 15:08:32 2024 +0100
Move preaccept expiration logic away from Agent
patch by Aleksey Yeschenko; reviewed by Alex Petrov and Benedict Elliott
Smith for CASSANDRA-18888
---
modules/accord | 2 +-
.../org/apache/cassandra/service/accord/api/AccordAgent.java | 10 +++-------
.../cassandra/service/accord/SimulatedAccordCommandStore.java | 4 ++--
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/modules/accord b/modules/accord
index 256b35e27d..d63d06aafe 160000
--- a/modules/accord
+++ b/modules/accord
@@ -1 +1 @@
-Subproject commit 256b35e27d170db9fcd8024d5678b4f6e9d3a956
+Subproject commit d63d06aafe2e60e57a9651ff6dd491175bbe6916
diff --git a/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java
b/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java
index 33f8f2b088..9c4b678996 100644
--- a/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java
+++ b/src/java/org/apache/cassandra/service/accord/api/AccordAgent.java
@@ -35,7 +35,6 @@ import accord.primitives.Seekables;
import accord.primitives.Timestamp;
import accord.primitives.Txn;
import accord.primitives.Txn.Kind;
-import accord.primitives.TxnId;
import org.apache.cassandra.service.accord.AccordService;
import org.apache.cassandra.metrics.AccordMetrics;
import org.apache.cassandra.service.accord.txn.TxnQuery;
@@ -114,13 +113,10 @@ public class AccordAgent implements Agent
}
@Override
- public boolean isExpired(TxnId initiated, long now)
+ public long preAcceptTimeout()
{
- // TODO: should distinguish between reads and writes
- if (initiated.kind().isSyncPoint())
- return false;
-
- return now - initiated.hlc() > getReadRpcTimeout(MICROSECONDS);
+ // TODO: should distinguish between reads and writes (Aleksey: why?
and why read rpc timeout is being used?)
+ return getReadRpcTimeout(MICROSECONDS);
}
@Override
diff --git
a/test/unit/org/apache/cassandra/service/accord/SimulatedAccordCommandStore.java
b/test/unit/org/apache/cassandra/service/accord/SimulatedAccordCommandStore.java
index 1a1b7f98d2..a0bb647c41 100644
---
a/test/unit/org/apache/cassandra/service/accord/SimulatedAccordCommandStore.java
+++
b/test/unit/org/apache/cassandra/service/accord/SimulatedAccordCommandStore.java
@@ -149,9 +149,9 @@ public class SimulatedAccordCommandStore implements
AutoCloseable
new TestAgent.RethrowAgent()
{
@Override
- public boolean isExpired(TxnId
initiated, long now)
+ public long preAcceptTimeout()
{
- return false;
+ return Long.MAX_VALUE;
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
