Bug 3195: Cleanup on error paths and error handling

[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..276523e680a6389210edf290fff1a32fff252f23 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
@@ -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(DOMStoreTransaction txDelegate, TransactionIdentifier identifier,
+            LocalTransactionReadySupport readySupport) {
         super(identifier);
         this.txDelegate = Preconditions.checkNotNull(txDelegate);
-        this.limiter = Preconditions.checkNotNull(limiter);
+        this.readySupport = readySupport;
     }
 
     protected abstract DOMStoreWriteTransaction getWriteDelegate();
@@ -45,37 +46,51 @@ abstract class LocalTransactionContext extends AbstractTransactionContext {
     @Override
     public void writeData(YangInstanceIdentifier path, NormalizedNode<?, ?> data) {
         incrementModificationCount();
-        getWriteDelegate().write(path, data);
-        limiter.release();
+        if(operationError == null) {
+            try {
+                getWriteDelegate().write(path, data);
+            } catch (Exception e) {
+                operationError = e;
+            }
+        }
+
     }
 
     @Override
     public void mergeData(YangInstanceIdentifier path, NormalizedNode<?, ?> data) {
         incrementModificationCount();
-        getWriteDelegate().merge(path, data);
-        limiter.release();
+        if(operationError == null) {
+            try {
+                getWriteDelegate().merge(path, data);
+            } catch (Exception e) {
+                operationError = e;
+            }
+        }
     }
 
     @Override
     public void deleteData(YangInstanceIdentifier path) {
         incrementModificationCount();
-        getWriteDelegate().delete(path);
-        limiter.release();
+        if(operationError == null) {
+            try {
+                getWriteDelegate().delete(path);
+            } catch (Exception e) {
+                operationError = e;
+            }
+        }
     }
 
     @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) {
+            public void onSuccess(final Optional<NormalizedNode<?, ?>> result) {
                 proxyFuture.set(result);
-                limiter.release();
             }
 
             @Override
-            public void onFailure(Throwable t) {
+            public void onFailure(final Throwable t) {
                 proxyFuture.setException(t);
-                limiter.release();
             }
         });
     }
@@ -84,34 +99,34 @@ abstract class LocalTransactionContext extends AbstractTransactionContext {
     public void dataExists(YangInstanceIdentifier path, final SettableFuture<Boolean> proxyFuture) {
         Futures.addCallback(getReadDelegate().exists(path), new FutureCallback<Boolean>() {
             @Override
-            public void onSuccess(Boolean result) {
+            public void onSuccess(final Boolean result) {
                 proxyFuture.set(result);
-                limiter.release();
             }
 
             @Override
-            public void onFailure(Throwable t) {
+            public void onFailure(final Throwable t) {
                 proxyFuture.setException(t);
-                limiter.release();
             }
         });
     }
 
     private LocalThreePhaseCommitCohort ready() {
         logModificationCount();
-        LocalThreePhaseCommitCohort ready = (LocalThreePhaseCommitCohort) getWriteDelegate().ready();
-        limiter.release();
-        return ready;
+        LocalThreePhaseCommitCohort cohort = readySupport.onTransactionReady(getWriteDelegate());
+        cohort.setOperationError(operationError);
+        return cohort;
     }
 
     @Override
     public Future<ActorSelection> readyTransaction() {
-        return ready().initiateCoordinatedCommit();
+        final LocalThreePhaseCommitCohort cohort = ready();
+        return cohort.initiateCoordinatedCommit();
     }
 
     @Override
     public Future<Object> directCommit() {
-        return ready().initiateDirectCommit();
+        final LocalThreePhaseCommitCohort cohort = ready();
+        return cohort.initiateDirectCommit();
     }
 
     @Override