X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FSimpleShardDataTreeCohort.java;h=3104cb4972de5973f270ceb32593fd809bb58088;hb=f41c5e6e6f6e10b36b1e4b1992877e38e718c8fb;hp=8d947e8c561e175e29472f1d143eca3c13b22bc4;hpb=c4f9bb0e408bfaff5c1730e574e8ef1ebe80ac7b;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohort.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohort.java index 8d947e8c56..3104cb4972 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohort.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/SimpleShardDataTreeCohort.java @@ -7,22 +7,19 @@ */ package org.opendaylight.controller.cluster.datastore; -import akka.dispatch.ExecutionContexts; -import akka.dispatch.OnComplete; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Preconditions; import com.google.common.base.Verify; import com.google.common.primitives.UnsignedLong; import com.google.common.util.concurrent.FutureCallback; import java.util.Optional; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeoutException; +import java.util.concurrent.CompletionStage; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateTip; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import scala.concurrent.Future; final class SimpleShardDataTreeCohort extends ShardDataTreeCohort { private static final Logger LOG = LoggerFactory.getLogger(SimpleShardDataTreeCohort.class); @@ -45,6 +42,15 @@ final class SimpleShardDataTreeCohort extends ShardDataTreeCohort { this.userCohorts = Preconditions.checkNotNull(userCohorts); } + SimpleShardDataTreeCohort(final ShardDataTree dataTree, final DataTreeModification transaction, + final TransactionIdentifier transactionId, final Exception nextFailure) { + this.dataTree = Preconditions.checkNotNull(dataTree); + this.transaction = Preconditions.checkNotNull(transaction); + this.transactionId = Preconditions.checkNotNull(transactionId); + this.userCohorts = null; + this.nextFailure = Preconditions.checkNotNull(nextFailure); + } + @Override public TransactionIdentifier getIdentifier() { return transactionId; @@ -73,7 +79,12 @@ final class SimpleShardDataTreeCohort extends ShardDataTreeCohort { checkState(State.READY); this.callback = Preconditions.checkNotNull(newCallback); state = State.CAN_COMMIT_PENDING; - dataTree.startCanCommit(this); + + if (nextFailure == null) { + dataTree.startCanCommit(this); + } else { + failedCanCommit(nextFailure); + } } @Override @@ -99,28 +110,19 @@ final class SimpleShardDataTreeCohort extends ShardDataTreeCohort { candidate = null; state = State.ABORTED; - final Optional>> maybeAborts = userCohorts.abort(); + final Optional> maybeAborts = userCohorts.abort(); if (!maybeAborts.isPresent()) { abortCallback.onSuccess(null); return; } - final Future> aborts = maybeAborts.get(); - if (aborts.isCompleted()) { - abortCallback.onSuccess(null); - return; - } - - aborts.onComplete(new OnComplete>() { - @Override - public void onComplete(final Throwable failure, final Iterable objs) { - if (failure != null) { - abortCallback.onFailure(failure); - } else { - abortCallback.onSuccess(null); - } + maybeAborts.get().whenComplete((noop, failure) -> { + if (failure != null) { + abortCallback.onFailure(failure); + } else { + abortCallback.onSuccess(null); } - }, ExecutionContexts.global()); + }); } @Override @@ -145,7 +147,7 @@ final class SimpleShardDataTreeCohort extends ShardDataTreeCohort { return ret; } - void setNewCandidate(DataTreeCandidateTip dataTreeCandidate) { + void setNewCandidate(final DataTreeCandidateTip dataTreeCandidate) { checkState(State.PRE_COMMIT_COMPLETE); this.candidate = Verify.verifyNotNull(dataTreeCandidate); } @@ -163,14 +165,40 @@ final class SimpleShardDataTreeCohort extends ShardDataTreeCohort { * any failure to validate is propagated before we record the transaction. * * @param dataTreeCandidate {@link DataTreeCandidate} under consideration - * @throws ExecutionException if the operation fails - * @throws TimeoutException if the operation times out + * @param futureCallback the callback to invoke on completion, which may be immediate or async. */ - // FIXME: this should be asynchronous - void userPreCommit(final DataTreeCandidate dataTreeCandidate) throws ExecutionException, TimeoutException { + void userPreCommit(final DataTreeCandidate dataTreeCandidate, final FutureCallback futureCallback) { userCohorts.reset(); - userCohorts.canCommit(dataTreeCandidate); - userCohorts.preCommit(); + + final Optional> maybeCanCommitFuture = userCohorts.canCommit(dataTreeCandidate); + if (!maybeCanCommitFuture.isPresent()) { + doUserPreCommit(futureCallback); + return; + } + + maybeCanCommitFuture.get().whenComplete((noop, failure) -> { + if (failure != null) { + futureCallback.onFailure(failure); + } else { + doUserPreCommit(futureCallback); + } + }); + } + + private void doUserPreCommit(final FutureCallback futureCallback) { + final Optional> maybePreCommitFuture = userCohorts.preCommit(); + if (!maybePreCommitFuture.isPresent()) { + futureCallback.onSuccess(null); + return; + } + + maybePreCommitFuture.get().whenComplete((noop, failure) -> { + if (failure != null) { + futureCallback.onFailure(failure); + } else { + futureCallback.onSuccess(null); + } + }); } void successfulPreCommit(final DataTreeCandidateTip dataTreeCandidate) { @@ -179,7 +207,7 @@ final class SimpleShardDataTreeCohort extends ShardDataTreeCohort { switchState(State.PRE_COMMIT_COMPLETE).onSuccess(dataTreeCandidate); } - void failedPreCommit(final Exception cause) { + void failedPreCommit(final Throwable cause) { if (LOG.isTraceEnabled()) { LOG.trace("Transaction {} failed to prepare", transaction, cause); } else { @@ -190,15 +218,25 @@ final class SimpleShardDataTreeCohort extends ShardDataTreeCohort { switchState(State.FAILED).onFailure(cause); } - void successfulCommit(final UnsignedLong journalIndex) { - try { - userCohorts.commit(); - } catch (TimeoutException | ExecutionException e) { - // We are probably dead, depending on what the cohorts end up doing - LOG.error("User cohorts failed to commit", e); + void successfulCommit(final UnsignedLong journalIndex, final Runnable onComplete) { + final Optional> maybeCommitFuture = userCohorts.commit(); + if (!maybeCommitFuture.isPresent()) { + finishSuccessfulCommit(journalIndex, onComplete); + return; } + maybeCommitFuture.get().whenComplete((noop, failure) -> { + if (failure != null) { + LOG.error("User cohorts failed to commit", failure); + } + + finishSuccessfulCommit(journalIndex, onComplete); + }); + } + + private void finishSuccessfulCommit(final UnsignedLong journalIndex, final Runnable onComplete) { switchState(State.COMMITTED).onSuccess(journalIndex); + onComplete.run(); } void failedCommit(final Exception cause) { @@ -218,11 +256,20 @@ final class SimpleShardDataTreeCohort extends ShardDataTreeCohort { } void reportFailure(final Exception cause) { - this.nextFailure = Preconditions.checkNotNull(cause); + if (nextFailure == null) { + this.nextFailure = Preconditions.checkNotNull(cause); + } else { + LOG.debug("Transaction {} already has a set failure, not updating it", transactionId, cause); + } } @Override public boolean isFailed() { return state == State.FAILED || nextFailure != null; } + + @Override + ToStringHelper addToStringAttributes(final ToStringHelper toStringHelper) { + return super.addToStringAttributes(toStringHelper).add("nextFailure", nextFailure); + } }