This is an automated email from the ASF dual-hosted git repository.

aweisberg 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 3ca9e55  Add missing awaitEpoch to Barrier
3ca9e55 is described below

commit 3ca9e55024192e9b7c38ad5330229830343b74f2
Author: Ariel Weisberg <aweisb...@apple.com>
AuthorDate: Wed Nov 29 17:14:50 2023 -0500

    Add missing awaitEpoch to Barrier
    
    Patch by Ariel Weisberg; Reviewed by David Capwell for CASSANDRA-19023
---
 accord-core/src/main/java/accord/coordinate/Barrier.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/accord-core/src/main/java/accord/coordinate/Barrier.java 
b/accord-core/src/main/java/accord/coordinate/Barrier.java
index a1327f5..2e76480 100644
--- a/accord-core/src/main/java/accord/coordinate/Barrier.java
+++ b/accord-core/src/main/java/accord/coordinate/Barrier.java
@@ -83,7 +83,14 @@ public class Barrier<S extends Seekables<?, ?>> extends 
AsyncResults.AbstractRes
     public static <S extends Seekables<?, ?>> Barrier<S> barrier(Node node, S 
keysOrRanges, long minEpoch, BarrierType barrierType)
     {
         Barrier<S> barrier = new Barrier(node, keysOrRanges, minEpoch, 
barrierType);
-        barrier.start();
+        node.topology().awaitEpoch(minEpoch).begin((ignored, failure) -> {
+            if (failure != null)
+            {
+                barrier.tryFailure(failure);
+                return;
+            }
+            barrier.start();
+        });
         return barrier;
     }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to