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%2FLocalTransactionContext.java;h=da6d6d14fe9a2c5a574914df0e36d463b0345a09;hp=3648b97eb68c11ff97e0a5c3897ed649430fd2db;hb=7e62b4a59f9e43bcd0585845f1aeb55c44199f27;hpb=0791cdd2ca719270a1b0c114bf863ba29d571ac0

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java
index 3648b97eb6..da6d6d14fe 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/LocalTransactionContext.java
@@ -8,17 +8,20 @@
 package org.opendaylight.controller.cluster.datastore;
 
 import akka.actor.ActorSelection;
-import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.SettableFuture;
-import org.opendaylight.controller.cluster.datastore.identifiers.TransactionIdentifier;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreTransaction;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import java.util.Optional;
+import java.util.SortedSet;
+import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
+import org.opendaylight.controller.cluster.datastore.messages.AbstractRead;
+import org.opendaylight.controller.cluster.datastore.modification.AbstractModification;
+import org.opendaylight.mdsal.common.api.ReadFailedException;
+import org.opendaylight.mdsal.dom.spi.store.DOMStoreReadTransaction;
+import org.opendaylight.mdsal.dom.spi.store.DOMStoreTransaction;
+import org.opendaylight.mdsal.dom.spi.store.DOMStoreWriteTransaction;
 import scala.concurrent.Future;
 
 /**
@@ -28,14 +31,15 @@ import scala.concurrent.Future;
  * @author Thomas Pantelis
  */
 abstract class LocalTransactionContext extends AbstractTransactionContext {
-
     private final DOMStoreTransaction txDelegate;
-    private final OperationCompleter completer;
+    private final LocalTransactionReadySupport readySupport;
+    private Exception operationError;
 
-    LocalTransactionContext(TransactionIdentifier identifier, DOMStoreTransaction txDelegate, OperationCompleter completer) {
+    LocalTransactionContext(final DOMStoreTransaction txDelegate, final TransactionIdentifier identifier,
+            final LocalTransactionReadySupport readySupport) {
         super(identifier);
         this.txDelegate = Preconditions.checkNotNull(txDelegate);
-        this.completer = Preconditions.checkNotNull(completer);
+        this.readySupport = readySupport;
     }
 
     protected abstract DOMStoreWriteTransaction getWriteDelegate();
@@ -43,80 +47,51 @@ abstract class LocalTransactionContext extends AbstractTransactionContext {
     protected abstract DOMStoreReadTransaction getReadDelegate();
 
     @Override
-    public void writeData(YangInstanceIdentifier path, NormalizedNode<?, ?> data) {
-        incrementModificationCount();
-        getWriteDelegate().write(path, data);
-        completer.onComplete(null, null);
-    }
-
-    @Override
-    public void mergeData(YangInstanceIdentifier path, NormalizedNode<?, ?> data) {
+    @SuppressWarnings("checkstyle:IllegalCatch")
+    public void executeModification(final AbstractModification modification, final Boolean havePermit) {
         incrementModificationCount();
-        getWriteDelegate().merge(path, data);
-        completer.onComplete(null, null);
-    }
-
-    @Override
-    public void deleteData(YangInstanceIdentifier path) {
-        incrementModificationCount();
-        getWriteDelegate().delete(path);
-        completer.onComplete(null, null);
-    }
-
-    @Override
-    public void readData(YangInstanceIdentifier path, final SettableFuture<Optional<NormalizedNode<?, ?>>> proxyFuture) {
-        Futures.addCallback(getReadDelegate().read(path), new FutureCallback<Optional<NormalizedNode<?, ?>>>() {
-            @Override
-            public void onSuccess(Optional<NormalizedNode<?, ?>> result) {
-                proxyFuture.set(result);
-                completer.onComplete(null, null);
-            }
-
-            @Override
-            public void onFailure(Throwable t) {
-                proxyFuture.setException(t);
-                completer.onComplete(null, null);
+        if (operationError == null) {
+            try {
+                modification.apply(getWriteDelegate());
+            } catch (Exception e) {
+                operationError = e;
             }
-        });
+        }
     }
 
     @Override
-    public void dataExists(YangInstanceIdentifier path, final SettableFuture<Boolean> proxyFuture) {
-        Futures.addCallback(getReadDelegate().exists(path), new FutureCallback<Boolean>() {
+    public <T> void executeRead(final AbstractRead<T> readCmd, final SettableFuture<T> proxyFuture,
+            final Boolean havePermit) {
+        Futures.addCallback(readCmd.apply(getReadDelegate()), new FutureCallback<T>() {
             @Override
-            public void onSuccess(Boolean result) {
+            public void onSuccess(final T result) {
                 proxyFuture.set(result);
-                completer.onComplete(null, null);
             }
 
             @Override
-            public void onFailure(Throwable t) {
-                proxyFuture.setException(t);
-                completer.onComplete(null, null);
+            public void onFailure(final Throwable failure) {
+                proxyFuture.setException(failure instanceof Exception
+                        ? ReadFailedException.MAPPER.apply((Exception) failure) : failure);
             }
-        });
+        }, MoreExecutors.directExecutor());
     }
 
     private LocalThreePhaseCommitCohort ready() {
         logModificationCount();
-        LocalThreePhaseCommitCohort ready = (LocalThreePhaseCommitCohort) getWriteDelegate().ready();
-        completer.onComplete(null, null);
-        return ready;
-    }
-
-    @Override
-    public Future<ActorSelection> readyTransaction() {
-        return ready().initiateCoordinatedCommit();
+        return readySupport.onTransactionReady(getWriteDelegate(), operationError);
     }
 
     @Override
-    public Future<Object> directCommit() {
-        return ready().initiateDirectCommit();
+    public Future<ActorSelection> readyTransaction(final Boolean havePermit,
+            final Optional<SortedSet<String>> participatingShardNames) {
+        final LocalThreePhaseCommitCohort cohort = ready();
+        return cohort.initiateCoordinatedCommit(participatingShardNames);
     }
 
     @Override
-    public boolean supportsDirectCommit() {
-        return true;
+    public Future<Object> directCommit(final Boolean havePermit) {
+        final LocalThreePhaseCommitCohort cohort = ready();
+        return cohort.initiateDirectCommit();
     }
 
     @Override