handleTransactionDoCommit((TransactionDoCommitRequest) request, envelope, now);
return null;
} else if (request instanceof TransactionAbortRequest) {
- return handleTransactionAbort((TransactionAbortRequest) request, envelope, now);
+ handleTransactionAbort((TransactionAbortRequest) request, envelope, now);
+ return null;
} else {
throw new UnsupportedRequestException(request);
}
});
}
- private TransactionSuccess<?> handleTransactionAbort(final TransactionAbortRequest request,
+ private void handleTransactionAbort(final TransactionAbortRequest request,
final RequestEnvelope envelope, final long now) throws RequestException {
if (readyCohort == null) {
- openTransaction.abort();
- return new TransactionAbortSuccess(getIdentifier(), request.getSequence());
+ openTransaction.abort(() -> recordAndSendSuccess(envelope, now,
+ new TransactionAbortSuccess(getIdentifier(), request.getSequence())));
+ return;
}
readyCohort.abort(new FutureCallback<Void>() {
recordAndSendFailure(envelope, now, new RuntimeRequestException("Abort failed", failure));
}
});
- return null;
}
private void coordinatedCommit(final RequestEnvelope envelope, final long now) {
});
}
- private void successfulDirectCanCommit(final RequestEnvelope envelope, final long startTime) {
+ void successfulDirectCanCommit(final RequestEnvelope envelope, final long startTime) {
readyCohort.preCommit(new FutureCallback<DataTreeCandidate>() {
@Override
public void onSuccess(final DataTreeCandidate result) {
});
}
- private void successfulDirectPreCommit(final RequestEnvelope envelope, final long startTime) {
+ void successfulDirectPreCommit(final RequestEnvelope envelope, final long startTime) {
readyCohort.commit(new FutureCallback<UnsignedLong>() {
-
@Override
public void onSuccess(final UnsignedLong result) {
successfulCommit(envelope, startTime);
});
}
- private void successfulCommit(final RequestEnvelope envelope, final long startTime) {
+ void successfulCommit(final RequestEnvelope envelope, final long startTime) {
recordAndSendSuccess(envelope, startTime, new TransactionCommitSuccess(readyCohort.getIdentifier(),
envelope.getMessage().getSequence()));
readyCohort = null;
private void handleCommitLocalTransaction(final CommitLocalTransactionRequest request,
final RequestEnvelope envelope, final long now) throws RequestException {
- if (sealedModification.equals(request.getModification())) {
+ if (!sealedModification.equals(request.getModification())) {
+ LOG.warn("Expecting modification {}, commit request has {}", sealedModification, request.getModification());
+ throw new UnsupportedRequestException(request);
+ }
+
+ final java.util.Optional<Exception> optFailure = request.getDelayedFailure();
+ if (optFailure.isPresent()) {
+ readyCohort = history().createFailedCohort(getIdentifier(), sealedModification, optFailure.get());
+ } else {
readyCohort = history().createReadyCohort(getIdentifier(), sealedModification);
+ }
- if (request.isCoordinated()) {
- coordinatedCommit(envelope, now);
- } else {
- directCommit(envelope, now);
- }
+ if (request.isCoordinated()) {
+ coordinatedCommit(envelope, now);
} else {
- throw new UnsupportedRequestException(request);
+ directCommit(envelope, now);
}
}
switch (maybeProto.get()) {
case ABORT:
- openTransaction.abort();
+ openTransaction.abort(() -> replyModifySuccess(request.getSequence()));
openTransaction = null;
- return replyModifySuccess(request.getSequence());
+ return null;
case READY:
ensureReady();
return replyModifySuccess(request.getSequence());