Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Delay snapshot backed transaction ready error
[controller.git]
/
opendaylight
/
md-sal
/
sal-dom-spi
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
core
/
spi
/
data
/
AbstractSnapshotBackedTransactionChain.java
diff --git
a/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractSnapshotBackedTransactionChain.java
b/opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractSnapshotBackedTransactionChain.java
index f8a16b606a341316fde1e2806e07265c5b88c1f9..383a0e5a46d56bdace7094c9135a6d3b62c318d4 100644
(file)
--- a/
opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractSnapshotBackedTransactionChain.java
+++ b/
opendaylight/md-sal/sal-dom-spi/src/main/java/org/opendaylight/controller/sal/core/spi/data/AbstractSnapshotBackedTransactionChain.java
@@
-180,7
+180,11
@@
public abstract class AbstractSnapshotBackedTransactionChain<T> extends Transact
}
@Override
}
@Override
- protected final DOMStoreThreePhaseCommitCohort transactionReady(final SnapshotBackedWriteTransaction<T> tx, final DataTreeModification tree) {
+ protected final DOMStoreThreePhaseCommitCohort transactionReady(
+ final SnapshotBackedWriteTransaction<T> tx,
+ final DataTreeModification tree,
+ final Exception readyError) {
+
final State localState = state;
if (localState instanceof Allocated) {
final State localState = state;
if (localState instanceof Allocated) {
@@
-192,7
+196,7
@@
public abstract class AbstractSnapshotBackedTransactionChain<T> extends Transact
LOG.debug("Ignoring transaction {} readiness due to state {}", tx, localState);
}
LOG.debug("Ignoring transaction {} readiness due to state {}", tx, localState);
}
- return createCohort(tx, tree);
+ return createCohort(tx, tree
, readyError
);
}
@Override
}
@Override
@@
-276,7
+280,10
@@
public abstract class AbstractSnapshotBackedTransactionChain<T> extends Transact
*
* @param transaction Transaction handle
* @param modification {@link DataTreeModification} which needs to be applied to the backend
*
* @param transaction Transaction handle
* @param modification {@link DataTreeModification} which needs to be applied to the backend
+ * @param operationError Any previous error that could be reported through three phase commit
* @return A {@link DOMStoreThreePhaseCommitCohort} cohort.
*/
* @return A {@link DOMStoreThreePhaseCommitCohort} cohort.
*/
- protected abstract DOMStoreThreePhaseCommitCohort createCohort(final SnapshotBackedWriteTransaction<T> transaction, final DataTreeModification modification);
+ protected abstract DOMStoreThreePhaseCommitCohort createCohort(final SnapshotBackedWriteTransaction<T> transaction,
+ final DataTreeModification modification,
+ final Exception operationError);
}
}