Delay snapshot backed transaction ready error

[mdsal.git] / dom / mdsal-dom-spi / src / main / java / org / opendaylight / mdsal / dom / spi / store / SnapshotBackedWriteTransaction.java

diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransaction.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransaction.java
index d6eab3172a8d47806eb81642f40002f4a91f283e..3ac0ae78c9b323829a98c11624644e2a60e99e14 100644 (file)
--- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransaction.java
+++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/SnapshotBackedWriteTransaction.java
@@ -11,10 +11,11 @@ import static com.google.common.base.Preconditions.checkState;
 
 import com.google.common.annotations.Beta;
 import com.google.common.base.MoreObjects.ToStringHelper;
-import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+import javax.annotation.Nullable;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
@@ -73,9 +74,8 @@ public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransacti
             // FIXME: Add checked exception
         } catch (Exception e) {
             LOG.error("Tx: {}, failed to write {}:{} in {}", getIdentifier(), path, data, tree, e);
-            // Rethrow original ones if they are subclasses of RuntimeException
-            // or Error
-            Throwables.propagateIfPossible(e);
+            // Rethrow original ones if they are subclasses of RuntimeException or Error
+            Throwables.throwIfUnchecked(e);
             // FIXME: Introduce proper checked exception
             throw new IllegalArgumentException("Illegal input data.", e);
         }
@@ -94,9 +94,8 @@ public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransacti
             // FIXME: Add checked exception
         } catch (Exception e) {
             LOG.error("Tx: {}, failed to write {}:{} in {}", getIdentifier(), path, data, tree, e);
-            // Rethrow original ones if they are subclasses of RuntimeException
-            // or Error
-            Throwables.propagateIfPossible(e);
+            // Rethrow original ones if they are subclasses of RuntimeException or Error
+            Throwables.throwIfUnchecked(e);
             // FIXME: Introduce proper checked exception
             throw new IllegalArgumentException("Illegal input data.", e);
         }
@@ -115,9 +114,8 @@ public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransacti
             // FIXME: Add checked exception
         } catch (Exception e) {
             LOG.error("Tx: {}, failed to delete {} in {}", getIdentifier(), path, tree, e);
-            // Rethrow original ones if they are subclasses of RuntimeException
-            // or Error
-            Throwables.propagateIfPossible(e);
+            // Rethrow original ones if they are subclasses of RuntimeException or Error
+            Throwables.throwIfUnchecked(e);
             // FIXME: Introduce proper checked exception
             throw new IllegalArgumentException("Illegal path to delete.", e);
         }
@@ -139,6 +137,7 @@ public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransacti
                 "Transaction %s is no longer open. No further modifications allowed.", getIdentifier());
     }
 
+    @SuppressWarnings("checkstyle:IllegalCatch")
     @Override
     public DOMStoreThreePhaseCommitCohort ready() {
         @SuppressWarnings("unchecked")
@@ -149,8 +148,13 @@ public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransacti
 
         final DataTreeModification tree = mutableTree;
         TREE_UPDATER.lazySet(this, null);
-        tree.ready();
-        return wasReady.transactionReady(this, tree);
+        try {
+            tree.ready();
+            return wasReady.transactionReady(this, tree, null);
+        } catch (RuntimeException e) {
+            LOG.debug("Store transaction: {}: unexpected failure when readying", getIdentifier(), e);
+            return wasReady.transactionReady(this, tree, e);
+        }
     }
 
     @Override
@@ -198,9 +202,12 @@ public class SnapshotBackedWriteTransaction<T> extends AbstractDOMStoreTransacti
          *            Transaction on which ready was invoked.
          * @param tree
          *            Modified data tree which has been constructed.
+         * @param readyError
+         *            Any error that has already happened when readying.
          * @return DOMStoreThreePhaseCommitCohort associated with transaction
          */
-        protected abstract DOMStoreThreePhaseCommitCohort transactionReady(
-            SnapshotBackedWriteTransaction<T> tx, DataTreeModification tree);
+        protected abstract DOMStoreThreePhaseCommitCohort transactionReady(SnapshotBackedWriteTransaction<T> tx,
+                                                                           DataTreeModification tree,
+                                                                           @Nullable Exception readyError);
     }
 }