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%2Fdatabroker%2FConcurrentDOMDataBroker.java;h=156050485d5465a422cc268df8e48e96be076581;hb=6f80fcdc491f11de11d45447107ad2edce054af5;hp=bdaa6db6c1a1f1d3fc08b10c25f8f83ee27b5a60;hpb=281fa4f5d175c989619098ed4099085ae3aa4da7;p=controller.git 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 bdaa6db6c1..156050485d 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 @@ -15,6 +15,7 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -29,10 +30,6 @@ 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.dom.api.DOMDataTreeCommitCohort; -import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistration; -import org.opendaylight.mdsal.dom.api.DOMDataTreeCommitCohortRegistry; -import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; import org.opendaylight.yangtools.util.DurationStatisticsTracker; import org.opendaylight.yangtools.util.concurrent.MappingCheckedFuture; import org.slf4j.Logger; @@ -46,7 +43,7 @@ import org.slf4j.LoggerFactory; * @author Thomas Pantelis */ @Beta -public class ConcurrentDOMDataBroker extends AbstractDOMBroker implements DOMDataTreeCommitCohortRegistry { +public class ConcurrentDOMDataBroker extends AbstractDOMBroker { private static final Logger LOG = LoggerFactory.getLogger(ConcurrentDOMDataBroker.class); private static final String CAN_COMMIT = "CAN_COMMIT"; private static final String PRE_COMMIT = "PRE_COMMIT"; @@ -59,12 +56,13 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker implements DOMDat */ private final Executor clientFutureCallbackExecutor; - public ConcurrentDOMDataBroker(final Map datastores, Executor listenableFutureExecutor) { + public ConcurrentDOMDataBroker(final Map datastores, + Executor listenableFutureExecutor) { this(datastores, listenableFutureExecutor, DurationStatisticsTracker.createConcurrent()); } - public ConcurrentDOMDataBroker(final Map datastores, Executor listenableFutureExecutor, - DurationStatisticsTracker commitStatsTracker) { + public ConcurrentDOMDataBroker(final Map datastores, + Executor listenableFutureExecutor, DurationStatisticsTracker commitStatsTracker) { super(datastores); this.clientFutureCallbackExecutor = Preconditions.checkNotNull(listenableFutureExecutor); this.commitStatsTracker = Preconditions.checkNotNull(commitStatsTracker); @@ -82,7 +80,7 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker implements DOMDat Preconditions.checkArgument(cohorts != null, "Cohorts must not be null."); LOG.debug("Tx: {} is submitted for execution.", transaction.getIdentifier()); - if(cohorts.isEmpty()){ + if (cohorts.isEmpty()) { return Futures.immediateCheckedFuture(null); } @@ -113,7 +111,7 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker implements DOMDat new TransactionCommitFailedException( "Can Commit failed, no detailed cause available.")); } else { - if(!cohortIterator.hasNext()) { + if (!cohortIterator.hasNext()) { // All cohorts completed successfully - we can move on to the preCommit phase doPreCommit(startTime, clientSubmitFuture, transaction, cohorts); } else { @@ -124,9 +122,9 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker implements DOMDat } @Override - public void onFailure(Throwable t) { + public void onFailure(Throwable failure) { handleException(clientSubmitFuture, transaction, cohorts, CAN_COMMIT, - TransactionCommitFailedExceptionMapper.CAN_COMMIT_ERROR_MAPPER, t); + TransactionCommitFailedExceptionMapper.CAN_COMMIT_ERROR_MAPPER, failure); } }; @@ -144,7 +142,7 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker implements DOMDat FutureCallback futureCallback = new FutureCallback() { @Override public void onSuccess(Void notUsed) { - if(!cohortIterator.hasNext()) { + if (!cohortIterator.hasNext()) { // All cohorts completed successfully - we can move on to the commit phase doCommit(startTime, clientSubmitFuture, transaction, cohorts); } else { @@ -154,9 +152,9 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker implements DOMDat } @Override - public void onFailure(Throwable t) { + public void onFailure(Throwable failure) { handleException(clientSubmitFuture, transaction, cohorts, PRE_COMMIT, - TransactionCommitFailedExceptionMapper.PRE_COMMIT_MAPPER, t); + TransactionCommitFailedExceptionMapper.PRE_COMMIT_MAPPER, failure); } }; @@ -174,7 +172,7 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker implements DOMDat FutureCallback futureCallback = new FutureCallback() { @Override public void onSuccess(Void notUsed) { - if(!cohortIterator.hasNext()) { + if (!cohortIterator.hasNext()) { // All cohorts completed successfully - we're done. commitStatsTracker.addDuration(System.nanoTime() - startTime); @@ -186,9 +184,9 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker implements DOMDat } @Override - public void onFailure(Throwable t) { + public void onFailure(Throwable throwable) { handleException(clientSubmitFuture, transaction, cohorts, COMMIT, - TransactionCommitFailedExceptionMapper.COMMIT_ERROR_MAPPER, t); + TransactionCommitFailedExceptionMapper.COMMIT_ERROR_MAPPER, throwable); } }; @@ -196,25 +194,29 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker implements DOMDat Futures.addCallback(commitFuture, futureCallback, MoreExecutors.directExecutor()); } + @SuppressFBWarnings(value = "BC_UNCONFIRMED_CAST_OF_RETURN_VALUE", + justification = "Pertains to the assignment of the 'clientException' var. FindBugs flags this as an " + + "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 Collection cohorts, final String phase, final TransactionCommitFailedExceptionMapper exMapper, - final Throwable t) { + final Throwable throwable) { if (clientSubmitFuture.isDone()) { // We must have had failures from multiple cohorts. return; } - LOG.warn("Tx: {} Error during phase {}, starting Abort", transaction.getIdentifier(), phase, t); + LOG.warn("Tx: {} Error during phase {}, starting Abort", transaction.getIdentifier(), phase, throwable); final Exception e; - if(t instanceof NoShardLeaderException || t instanceof ShardLeaderNotRespondingException) { - e = new DataStoreUnavailableException(t.getMessage(), t); - } else if (t instanceof Exception) { - e = (Exception)t; + if (throwable instanceof NoShardLeaderException || throwable instanceof ShardLeaderNotRespondingException) { + e = new DataStoreUnavailableException(throwable.getMessage(), throwable); + } else if (throwable instanceof Exception) { + e = (Exception)throwable; } else { - e = new RuntimeException("Unexpected error occurred", t); + e = new RuntimeException("Unexpected error occurred", throwable); } final TransactionCommitFailedException clientException = exMapper.apply(e); @@ -223,9 +225,9 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker implements DOMDat @SuppressWarnings("unchecked") ListenableFuture[] canCommitFutures = new ListenableFuture[cohorts.size()]; - int i = 0; + int index = 0; for (DOMStoreThreePhaseCommitCohort cohort : cohorts) { - canCommitFutures[i++] = cohort.abort(); + canCommitFutures[index++] = cohort.abort(); } ListenableFuture> combinedFuture = Futures.allAsList(canCommitFutures); @@ -237,8 +239,8 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker implements DOMDat } @Override - public void onFailure(Throwable t) { - LOG.error("Tx: {} Error during Abort.", transaction.getIdentifier(), t); + public void onFailure(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. @@ -254,7 +256,6 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker implements DOMDat * the thread that completed this future, as a common use case is to pass an executor that runs * tasks in the same thread as the caller (ie MoreExecutors#sameThreadExecutor) * to {@link #addListener}. - * * FIXME: This class should probably be moved to yangtools common utils for re-usability and * unified with AsyncNotifyingListenableFutureTask. */ @@ -330,27 +331,6 @@ public class ConcurrentDOMDataBroker extends AbstractDOMBroker implements DOMDat } } - @Override - public DOMDataTreeCommitCohortRegistration registerCommitCohort( - DOMDataTreeIdentifier path, T cohort) { - DOMStore store = getTxFactories().get(toLegacy(path.getDatastoreType())); - if (store instanceof DOMDataTreeCommitCohortRegistry) { - return ((DOMDataTreeCommitCohortRegistry) store).registerCommitCohort(path, cohort); - } - throw new UnsupportedOperationException("Commit cohort is not supported for " + path); - } - - private static LogicalDatastoreType toLegacy(org.opendaylight.mdsal.common.api.LogicalDatastoreType datastoreType) { - switch (datastoreType) { - case CONFIGURATION: - return LogicalDatastoreType.CONFIGURATION; - case OPERATIONAL: - return LogicalDatastoreType.OPERATIONAL; - default: - throw new IllegalArgumentException("Unsupported data store type: " + datastoreType); - } - } - @Override public String toString() { return "Clustered ConcurrentDOMDataBroker";