X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatabroker%2FConcurrentDOMDataBroker.java;h=28151cc4138d601cb4f9a5fd6c80b77a287163db;hp=156050485d5465a422cc268df8e48e96be076581;hb=4d2bbed60d5e0e1ea23a994e87b306416a3e51eb;hpb=5818886bae1176c6c1a947574c91ae200937661f diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBroker.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBroker.java index 156050485d..28151cc413 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBroker.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/ConcurrentDOMDataBroker.java @@ -7,10 +7,15 @@ */ package org.opendaylight.controller.cluster.databroker; +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; +import static org.opendaylight.mdsal.dom.broker.TransactionCommitFailedExceptionMapper.CAN_COMMIT_ERROR_MAPPER; +import static org.opendaylight.mdsal.dom.broker.TransactionCommitFailedExceptionMapper.COMMIT_ERROR_MAPPER; +import static org.opendaylight.mdsal.dom.broker.TransactionCommitFailedExceptionMapper.PRE_COMMIT_MAPPER; + import com.google.common.annotations.Beta; -import com.google.common.base.Preconditions; import com.google.common.util.concurrent.AbstractFuture; -import com.google.common.util.concurrent.CheckedFuture; +import com.google.common.util.concurrent.FluentFuture; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; @@ -23,15 +28,16 @@ import java.util.Map; import java.util.concurrent.Executor; import org.opendaylight.controller.cluster.datastore.exceptions.NoShardLeaderException; import org.opendaylight.controller.cluster.datastore.exceptions.ShardLeaderNotRespondingException; -import org.opendaylight.controller.md.sal.common.api.data.DataStoreUnavailableException; -import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; -import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; -import org.opendaylight.controller.md.sal.dom.broker.impl.TransactionCommitFailedExceptionMapper; -import org.opendaylight.controller.sal.core.spi.data.DOMStore; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort; +import org.opendaylight.mdsal.common.api.CommitInfo; +import org.opendaylight.mdsal.common.api.DataStoreUnavailableException; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; +import org.opendaylight.mdsal.common.api.TransactionCommitFailedException; +import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction; +import org.opendaylight.mdsal.dom.broker.TransactionCommitFailedExceptionMapper; +import org.opendaylight.mdsal.dom.spi.store.DOMStore; +import org.opendaylight.mdsal.dom.spi.store.DOMStoreThreePhaseCommitCohort; import org.opendaylight.yangtools.util.DurationStatisticsTracker; -import org.opendaylight.yangtools.util.concurrent.MappingCheckedFuture; +import org.opendaylight.yangtools.yang.common.Empty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -57,15 +63,15 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker { private final Executor clientFutureCallbackExecutor; public ConcurrentDOMDataBroker(final Map datastores, - Executor listenableFutureExecutor) { + final Executor listenableFutureExecutor) { this(datastores, listenableFutureExecutor, DurationStatisticsTracker.createConcurrent()); } public ConcurrentDOMDataBroker(final Map datastores, - Executor listenableFutureExecutor, DurationStatisticsTracker commitStatsTracker) { + final Executor listenableFutureExecutor, final DurationStatisticsTracker commitStatsTracker) { super(datastores); - this.clientFutureCallbackExecutor = Preconditions.checkNotNull(listenableFutureExecutor); - this.commitStatsTracker = Preconditions.checkNotNull(commitStatsTracker); + clientFutureCallbackExecutor = requireNonNull(listenableFutureExecutor); + this.commitStatsTracker = requireNonNull(commitStatsTracker); } public DurationStatisticsTracker getCommitStatsTracker() { @@ -73,15 +79,15 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker { } @Override - protected CheckedFuture submit(DOMDataWriteTransaction transaction, - Collection cohorts) { + protected FluentFuture commit(final DOMDataTreeWriteTransaction transaction, + final Collection cohorts) { - Preconditions.checkArgument(transaction != null, "Transaction must not be null."); - Preconditions.checkArgument(cohorts != null, "Cohorts must not be null."); + checkArgument(transaction != null, "Transaction must not be null."); + checkArgument(cohorts != null, "Cohorts must not be null."); LOG.debug("Tx: {} is submitted for execution.", transaction.getIdentifier()); if (cohorts.isEmpty()) { - return Futures.immediateCheckedFuture(null); + return CommitInfo.emptyFluentFuture(); } final AsyncNotifyingSettableFuture clientSubmitFuture = @@ -89,12 +95,11 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker { doCanCommit(clientSubmitFuture, transaction, cohorts); - return MappingCheckedFuture.create(clientSubmitFuture, - TransactionCommitFailedExceptionMapper.COMMIT_ERROR_MAPPER); + return FluentFuture.from(clientSubmitFuture); } private void doCanCommit(final AsyncNotifyingSettableFuture clientSubmitFuture, - final DOMDataWriteTransaction transaction, + final DOMDataTreeWriteTransaction transaction, final Collection cohorts) { final long startTime = System.nanoTime(); @@ -102,96 +107,83 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker { final Iterator cohortIterator = cohorts.iterator(); // Not using Futures.allAsList here to avoid its internal overhead. - FutureCallback futureCallback = new FutureCallback() { + FutureCallback futureCallback = new FutureCallback<>() { @Override - public void onSuccess(Boolean result) { + public void onSuccess(final Boolean result) { if (result == null || !result) { - handleException(clientSubmitFuture, transaction, cohorts, - CAN_COMMIT, TransactionCommitFailedExceptionMapper.CAN_COMMIT_ERROR_MAPPER, - new TransactionCommitFailedException( - "Can Commit failed, no detailed cause available.")); + handleException(clientSubmitFuture, transaction, cohorts, CAN_COMMIT, CAN_COMMIT_ERROR_MAPPER, + new TransactionCommitFailedException("Can Commit failed, no detailed cause available.")); + } else if (!cohortIterator.hasNext()) { + // All cohorts completed successfully - we can move on to the preCommit phase + doPreCommit(startTime, clientSubmitFuture, transaction, cohorts); } else { - if (!cohortIterator.hasNext()) { - // All cohorts completed successfully - we can move on to the preCommit phase - doPreCommit(startTime, clientSubmitFuture, transaction, cohorts); - } else { - ListenableFuture canCommitFuture = cohortIterator.next().canCommit(); - Futures.addCallback(canCommitFuture, this, MoreExecutors.directExecutor()); - } + Futures.addCallback(cohortIterator.next().canCommit(), this, MoreExecutors.directExecutor()); } } @Override - public void onFailure(Throwable failure) { - handleException(clientSubmitFuture, transaction, cohorts, CAN_COMMIT, - TransactionCommitFailedExceptionMapper.CAN_COMMIT_ERROR_MAPPER, failure); + public void onFailure(final Throwable failure) { + handleException(clientSubmitFuture, transaction, cohorts, CAN_COMMIT, CAN_COMMIT_ERROR_MAPPER, failure); } }; - ListenableFuture canCommitFuture = cohortIterator.next().canCommit(); - Futures.addCallback(canCommitFuture, futureCallback, MoreExecutors.directExecutor()); + Futures.addCallback(cohortIterator.next().canCommit(), futureCallback, MoreExecutors.directExecutor()); } private void doPreCommit(final long startTime, final AsyncNotifyingSettableFuture clientSubmitFuture, - final DOMDataWriteTransaction transaction, + final DOMDataTreeWriteTransaction transaction, final Collection cohorts) { final Iterator cohortIterator = cohorts.iterator(); // Not using Futures.allAsList here to avoid its internal overhead. - FutureCallback futureCallback = new FutureCallback() { + FutureCallback futureCallback = new FutureCallback<>() { @Override - public void onSuccess(Void notUsed) { + public void onSuccess(final Empty result) { if (!cohortIterator.hasNext()) { // All cohorts completed successfully - we can move on to the commit phase doCommit(startTime, clientSubmitFuture, transaction, cohorts); } else { - ListenableFuture preCommitFuture = cohortIterator.next().preCommit(); - Futures.addCallback(preCommitFuture, this, MoreExecutors.directExecutor()); + Futures.addCallback(cohortIterator.next().preCommit(), this, MoreExecutors.directExecutor()); } } @Override - public void onFailure(Throwable failure) { - handleException(clientSubmitFuture, transaction, cohorts, PRE_COMMIT, - TransactionCommitFailedExceptionMapper.PRE_COMMIT_MAPPER, failure); + public void onFailure(final Throwable failure) { + handleException(clientSubmitFuture, transaction, cohorts, PRE_COMMIT, PRE_COMMIT_MAPPER, failure); } }; - ListenableFuture preCommitFuture = cohortIterator.next().preCommit(); - Futures.addCallback(preCommitFuture, futureCallback, MoreExecutors.directExecutor()); + Futures.addCallback(cohortIterator.next().preCommit(), futureCallback, MoreExecutors.directExecutor()); } private void doCommit(final long startTime, final AsyncNotifyingSettableFuture clientSubmitFuture, - final DOMDataWriteTransaction transaction, + final DOMDataTreeWriteTransaction transaction, final Collection cohorts) { final Iterator cohortIterator = cohorts.iterator(); // Not using Futures.allAsList here to avoid its internal overhead. - FutureCallback futureCallback = new FutureCallback() { + final FutureCallback futureCallback = new FutureCallback<>() { @Override - public void onSuccess(Void notUsed) { + public void onSuccess(final CommitInfo result) { if (!cohortIterator.hasNext()) { // All cohorts completed successfully - we're done. commitStatsTracker.addDuration(System.nanoTime() - startTime); clientSubmitFuture.set(); } else { - ListenableFuture commitFuture = cohortIterator.next().commit(); - Futures.addCallback(commitFuture, this, MoreExecutors.directExecutor()); + Futures.addCallback(cohortIterator.next().commit(), this, MoreExecutors.directExecutor()); } } @Override - public void onFailure(Throwable throwable) { - handleException(clientSubmitFuture, transaction, cohorts, COMMIT, - TransactionCommitFailedExceptionMapper.COMMIT_ERROR_MAPPER, throwable); + public void onFailure(final Throwable throwable) { + handleException(clientSubmitFuture, transaction, cohorts, COMMIT, COMMIT_ERROR_MAPPER, throwable); } }; - ListenableFuture commitFuture = cohortIterator.next().commit(); - Futures.addCallback(commitFuture, futureCallback, MoreExecutors.directExecutor()); + Futures.addCallback(cohortIterator.next().commit(), futureCallback, MoreExecutors.directExecutor()); } @SuppressFBWarnings(value = "BC_UNCONFIRMED_CAST_OF_RETURN_VALUE", @@ -199,7 +191,7 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker { + "uncomfirmed cast but the generic type in TransactionCommitFailedExceptionMapper is " + "TransactionCommitFailedException and thus should be deemed as confirmed.") private static void handleException(final AsyncNotifyingSettableFuture clientSubmitFuture, - final DOMDataWriteTransaction transaction, + final DOMDataTreeWriteTransaction transaction, final Collection cohorts, final String phase, final TransactionCommitFailedExceptionMapper exMapper, final Throwable throwable) { @@ -209,7 +201,18 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker { return; } - LOG.warn("Tx: {} Error during phase {}, starting Abort", transaction.getIdentifier(), phase, throwable); + // Use debug instead of warn level here because this exception gets propagate back to the caller via the Future + LOG.debug("Tx: {} Error during phase {}, starting Abort", transaction.getIdentifier(), phase, throwable); + + // Transaction failed - tell all cohorts to abort. + @SuppressWarnings("unchecked") + ListenableFuture[] canCommitFutures = new ListenableFuture[cohorts.size()]; + int index = 0; + for (DOMStoreThreePhaseCommitCohort cohort : cohorts) { + canCommitFutures[index++] = cohort.abort(); + } + + // Propagate the original exception final Exception e; if (throwable instanceof NoShardLeaderException || throwable instanceof ShardLeaderNotRespondingException) { e = new DataStoreUnavailableException(throwable.getMessage(), throwable); @@ -218,33 +221,19 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker { } else { e = new RuntimeException("Unexpected error occurred", throwable); } + clientSubmitFuture.setException(exMapper.apply(e)); - final TransactionCommitFailedException clientException = exMapper.apply(e); - - // Transaction failed - tell all cohorts to abort. - - @SuppressWarnings("unchecked") - ListenableFuture[] canCommitFutures = new ListenableFuture[cohorts.size()]; - int index = 0; - for (DOMStoreThreePhaseCommitCohort cohort : cohorts) { - canCommitFutures[index++] = cohort.abort(); - } - - ListenableFuture> combinedFuture = Futures.allAsList(canCommitFutures); - Futures.addCallback(combinedFuture, new FutureCallback>() { + ListenableFuture> combinedFuture = Futures.allAsList(canCommitFutures); + Futures.addCallback(combinedFuture, new FutureCallback>() { @Override - public void onSuccess(List notUsed) { + public void onSuccess(final List result) { // Propagate the original exception to the client. - clientSubmitFuture.setException(clientException); + LOG.debug("Tx: {} aborted successfully", transaction.getIdentifier()); } @Override - public void onFailure(Throwable failure) { + public void onFailure(final Throwable failure) { LOG.error("Tx: {} Error during Abort.", transaction.getIdentifier(), failure); - - // Propagate the original exception as that is what caused the Tx to fail and is - // what's interesting to the client. - clientSubmitFuture.setException(clientException); } }, MoreExecutors.directExecutor()); } @@ -259,8 +248,7 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker { * FIXME: This class should probably be moved to yangtools common utils for re-usability and * unified with AsyncNotifyingListenableFutureTask. */ - private static class AsyncNotifyingSettableFuture extends AbstractFuture { - + private static class AsyncNotifyingSettableFuture extends AbstractFuture { /** * ThreadLocal used to detect if the task completion thread is running the future listener Runnables. */ @@ -268,8 +256,8 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker { private final Executor listenerExecutor; - AsyncNotifyingSettableFuture(Executor listenerExecutor) { - this.listenerExecutor = Preconditions.checkNotNull(listenerExecutor); + AsyncNotifyingSettableFuture(final Executor listenerExecutor) { + this.listenerExecutor = requireNonNull(listenerExecutor); } @Override @@ -289,14 +277,14 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker { boolean set() { ON_TASK_COMPLETION_THREAD_TL.set(Boolean.TRUE); try { - return super.set(null); + return super.set(CommitInfo.empty()); } finally { ON_TASK_COMPLETION_THREAD_TL.set(null); } } @Override - protected boolean setException(Throwable throwable) { + protected boolean setException(final Throwable throwable) { ON_TASK_COMPLETION_THREAD_TL.set(Boolean.TRUE); try { return super.setException(throwable); @@ -310,8 +298,8 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker { private final Executor executor; DelegatingRunnable(final Runnable delegate, final Executor executor) { - this.delegate = Preconditions.checkNotNull(delegate); - this.executor = Preconditions.checkNotNull(executor); + this.delegate = requireNonNull(delegate); + this.executor = requireNonNull(executor); } @Override