mirror of https://github.com/apache/cassandra
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
This commit is contained in:
parent
74817bc83e
commit
a5dc44ad57
|
|
@ -1 +1 @@
|
|||
Subproject commit bd0761c567d153995a3db8da686ffdc940247200
|
||||
Subproject commit 1401e93490de57c65a12020d85830fbba8ef8c26
|
||||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue