Fix TransactionContextWrapper limiter accounting

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / LocalTransactionContext.java

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 dd7d899e0cb10f809cc6a1b67fddc605896f1875..8c4dddc565d27aab4943e3ef61d99ce7d166e0f7 100644 (file)
--- 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,17 @@
 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.cluster.access.concepts.TransactionIdentifier;
+import org.opendaylight.controller.cluster.datastore.messages.AbstractRead;
+import org.opendaylight.controller.cluster.datastore.modification.AbstractModification;
 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 scala.concurrent.Future;
 
 /**
@@ -28,14 +28,15 @@ import scala.concurrent.Future;
  * @author Thomas Pantelis
  */
 abstract class LocalTransactionContext extends AbstractTransactionContext {
-
     private final DOMStoreTransaction txDelegate;
-    private final OperationLimiter limiter;
+    private final LocalTransactionReadySupport readySupport;
+    private Exception operationError;
 
-    LocalTransactionContext(TransactionIdentifier identifier, DOMStoreTransaction txDelegate, OperationLimiter limiter) {
+    LocalTransactionContext(final DOMStoreTransaction txDelegate, final TransactionIdentifier identifier,
+            final LocalTransactionReadySupport readySupport) {
         super(identifier);
         this.txDelegate = Preconditions.checkNotNull(txDelegate);
-        this.limiter = Preconditions.checkNotNull(limiter);
+        this.readySupport = readySupport;
     }
 
     protected abstract DOMStoreWriteTransaction getWriteDelegate();
@@ -43,80 +44,49 @@ abstract class LocalTransactionContext extends AbstractTransactionContext {
     protected abstract DOMStoreReadTransaction getReadDelegate();
 
     @Override
-    public void writeData(YangInstanceIdentifier path, NormalizedNode<?, ?> data) {
-        incrementModificationCount();
-        getWriteDelegate().write(path, data);
-        limiter.release();
-    }
-
-    @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);
-        limiter.release();
-    }
-
-    @Override
-    public void deleteData(YangInstanceIdentifier path) {
-        incrementModificationCount();
-        getWriteDelegate().delete(path);
-        limiter.release();
-    }
-
-    @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);
-                limiter.release();
-            }
-
-            @Override
-            public void onFailure(Throwable t) {
-                proxyFuture.setException(t);
-                limiter.release();
+        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);
-                limiter.release();
             }
 
             @Override
-            public void onFailure(Throwable t) {
-                proxyFuture.setException(t);
-                limiter.release();
+            public void onFailure(final Throwable failure) {
+                proxyFuture.setException(failure);
             }
-        });
+        }, MoreExecutors.directExecutor());
     }
 
     private LocalThreePhaseCommitCohort ready() {
         logModificationCount();
-        LocalThreePhaseCommitCohort ready = (LocalThreePhaseCommitCohort) getWriteDelegate().ready();
-        limiter.release();
-        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 LocalThreePhaseCommitCohort cohort = ready();
+        return cohort.initiateCoordinatedCommit();
     }
 
     @Override
-    public boolean supportsDirectCommit() {
-        return true;
+    public Future<Object> directCommit(final Boolean havePermit) {
+        final LocalThreePhaseCommitCohort cohort = ready();
+        return cohort.initiateDirectCommit();
     }
 
     @Override