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%2Fdatastore%2FThreePhaseCommitCohortProxy.java;h=932c36fe3469f00b5c1d5ed6b38706f48783117f;hp=a7a5b31b174e4e0d03db192aa367a43ebe67ad62;hb=37f0504d391efd8b7d61403759fcc22a6dd3a093;hpb=05a8052a457b2e53f06233f1a0b056d162118566 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxy.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxy.java index a7a5b31b17..932c36fe34 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxy.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ThreePhaseCommitCohortProxy.java @@ -8,35 +8,28 @@ package org.opendaylight.controller.cluster.datastore; -import akka.actor.ActorPath; import akka.actor.ActorSelection; import akka.dispatch.Futures; import akka.dispatch.OnComplete; - import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.SettableFuture; - +import java.util.Collections; +import java.util.List; import org.opendaylight.controller.cluster.datastore.messages.AbortTransaction; import org.opendaylight.controller.cluster.datastore.messages.AbortTransactionReply; import org.opendaylight.controller.cluster.datastore.messages.CanCommitTransaction; import org.opendaylight.controller.cluster.datastore.messages.CanCommitTransactionReply; import org.opendaylight.controller.cluster.datastore.messages.CommitTransaction; import org.opendaylight.controller.cluster.datastore.messages.CommitTransactionReply; -import org.opendaylight.controller.cluster.datastore.messages.PreCommitTransaction; -import org.opendaylight.controller.cluster.datastore.messages.PreCommitTransactionReply; import org.opendaylight.controller.cluster.datastore.utils.ActorContext; import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import scala.concurrent.Future; import scala.runtime.AbstractFunction1; -import java.util.Collections; -import java.util.List; - /** * ThreePhaseCommitCohortProxy represents a set of remote cohort proxies */ @@ -44,30 +37,33 @@ public class ThreePhaseCommitCohortProxy implements DOMStoreThreePhaseCommitCoho private static final Logger LOG = LoggerFactory.getLogger(ThreePhaseCommitCohortProxy.class); + private static final ListenableFuture IMMEDIATE_SUCCESS = + com.google.common.util.concurrent.Futures.immediateFuture(null); + private final ActorContext actorContext; - private final List> cohortPathFutures; - private volatile List cohortPaths; + private final List> cohortFutures; + private volatile List cohorts; private final String transactionId; public ThreePhaseCommitCohortProxy(ActorContext actorContext, - List> cohortPathFutures, String transactionId) { + List> cohortFutures, String transactionId) { this.actorContext = actorContext; - this.cohortPathFutures = cohortPathFutures; + this.cohortFutures = cohortFutures; this.transactionId = transactionId; } - private Future buildCohortPathsList() { + private Future buildCohortList() { - Future> combinedFutures = Futures.sequence(cohortPathFutures, + Future> combinedFutures = Futures.sequence(cohortFutures, actorContext.getActorSystem().dispatcher()); - return combinedFutures.transform(new AbstractFunction1, Void>() { + return combinedFutures.transform(new AbstractFunction1, Void>() { @Override - public Void apply(Iterable paths) { - cohortPaths = Lists.newArrayList(paths); + public Void apply(Iterable actorSelections) { + cohorts = Lists.newArrayList(actorSelections); if(LOG.isDebugEnabled()) { LOG.debug("Tx {} successfully built cohort path list: {}", - transactionId, cohortPaths); + transactionId, cohorts); } return null; } @@ -87,12 +83,12 @@ public class ThreePhaseCommitCohortProxy implements DOMStoreThreePhaseCommitCoho // extracted from ReadyTransactionReply messages by the Futures that were obtained earlier // and passed to us from upstream processing. If any one fails then we'll fail canCommit. - buildCohortPathsList().onComplete(new OnComplete() { + buildCohortList().onComplete(new OnComplete() { @Override public void onComplete(Throwable failure, Void notUsed) throws Throwable { if(failure != null) { if(LOG.isDebugEnabled()) { - LOG.debug("Tx {}: a cohort path Future failed: {}", transactionId, failure); + LOG.debug("Tx {}: a cohort Future failed: {}", transactionId, failure); } returnFuture.setException(failure); } else { @@ -112,7 +108,7 @@ public class ThreePhaseCommitCohortProxy implements DOMStoreThreePhaseCommitCoho // their canCommit processing. If any one fails then we'll fail canCommit. Future> combinedFuture = - invokeCohorts(new CanCommitTransaction().toSerializable()); + invokeCohorts(new CanCommitTransaction(transactionId).toSerializable()); combinedFuture.onComplete(new OnComplete>() { @Override @@ -137,7 +133,7 @@ public class ThreePhaseCommitCohortProxy implements DOMStoreThreePhaseCommitCoho } else { LOG.error("Unexpected response type {}", response.getClass()); returnFuture.setException(new IllegalArgumentException( - String.format("Unexpected response type {}", response.getClass()))); + String.format("Unexpected response type %s", response.getClass()))); return; } } @@ -150,14 +146,13 @@ public class ThreePhaseCommitCohortProxy implements DOMStoreThreePhaseCommitCoho } private Future> invokeCohorts(Object message) { - List> futureList = Lists.newArrayListWithCapacity(cohortPaths.size()); - for(ActorPath actorPath : cohortPaths) { + List> futureList = Lists.newArrayListWithCapacity(cohorts.size()); + for(ActorSelection cohort : cohorts) { if(LOG.isDebugEnabled()) { - LOG.debug("Tx {}: Sending {} to cohort {}", transactionId, message, actorPath); + LOG.debug("Tx {}: Sending {} to cohort {}", transactionId, message, cohort); } - ActorSelection cohort = actorContext.actorSelection(actorPath); - futureList.add(actorContext.executeRemoteOperationAsync(cohort, message)); + futureList.add(actorContext.executeOperationAsync(cohort, message)); } return Futures.sequence(futureList, actorContext.getActorSystem().dispatcher()); @@ -165,8 +160,9 @@ public class ThreePhaseCommitCohortProxy implements DOMStoreThreePhaseCommitCoho @Override public ListenableFuture preCommit() { - return voidOperation("preCommit", new PreCommitTransaction().toSerializable(), - PreCommitTransactionReply.SERIALIZABLE_CLASS, true); + // We don't need to do anything here - preCommit is done atomically with the commit phase + // by the shard. + return IMMEDIATE_SUCCESS; } @Override @@ -177,13 +173,13 @@ public class ThreePhaseCommitCohortProxy implements DOMStoreThreePhaseCommitCoho // exception then that exception will supersede and suppress the original exception. But // it's the original exception that is the root cause and of more interest to the client. - return voidOperation("abort", new AbortTransaction().toSerializable(), + return voidOperation("abort", new AbortTransaction(transactionId).toSerializable(), AbortTransactionReply.SERIALIZABLE_CLASS, false); } @Override public ListenableFuture commit() { - return voidOperation("commit", new CommitTransaction().toSerializable(), + return voidOperation("commit", new CommitTransaction(transactionId).toSerializable(), CommitTransactionReply.SERIALIZABLE_CLASS, true); } @@ -198,11 +194,11 @@ public class ThreePhaseCommitCohortProxy implements DOMStoreThreePhaseCommitCoho // The cohort actor list should already be built at this point by the canCommit phase but, // if not for some reason, we'll try to build it here. - if(cohortPaths != null) { + if(cohorts != null) { finishVoidOperation(operationName, message, expectedResponseClass, propagateException, returnFuture); } else { - buildCohortPathsList().onComplete(new OnComplete() { + buildCohortList().onComplete(new OnComplete() { @Override public void onComplete(Throwable failure, Void notUsed) throws Throwable { if(failure != null) { @@ -243,7 +239,7 @@ public class ThreePhaseCommitCohortProxy implements DOMStoreThreePhaseCommitCoho for(Object response: responses) { if(!response.getClass().equals(expectedResponseClass)) { exceptionToPropagate = new IllegalArgumentException( - String.format("Unexpected response type {}", + String.format("Unexpected response type %s", response.getClass())); break; } @@ -280,7 +276,7 @@ public class ThreePhaseCommitCohortProxy implements DOMStoreThreePhaseCommitCoho } @VisibleForTesting - List> getCohortPathFutures() { - return Collections.unmodifiableList(cohortPathFutures); + List> getCohortFutures() { + return Collections.unmodifiableList(cohortFutures); } }