Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug 4105: Add CreateShard message in ShardManager
[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 e62d15b7ffc2bb05dca59e0fdae16739e0e778e3..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
@@
-29,10
+29,14
@@
import scala.concurrent.Future;
*/
abstract class LocalTransactionContext extends AbstractTransactionContext {
private final DOMStoreTransaction txDelegate;
*/
abstract class LocalTransactionContext extends AbstractTransactionContext {
private final DOMStoreTransaction txDelegate;
+ private final LocalTransactionReadySupport readySupport;
+ private Exception operationError;
- LocalTransactionContext(DOMStoreTransaction txDelegate, TransactionIdentifier identifier) {
+ LocalTransactionContext(DOMStoreTransaction txDelegate, TransactionIdentifier identifier,
+ LocalTransactionReadySupport readySupport) {
super(identifier);
this.txDelegate = Preconditions.checkNotNull(txDelegate);
super(identifier);
this.txDelegate = Preconditions.checkNotNull(txDelegate);
+ this.readySupport = readySupport;
}
protected abstract DOMStoreWriteTransaction getWriteDelegate();
}
protected abstract DOMStoreWriteTransaction getWriteDelegate();
@@
-42,19
+46,38
@@
abstract class LocalTransactionContext extends AbstractTransactionContext {
@Override
public void writeData(YangInstanceIdentifier path, NormalizedNode<?, ?> data) {
incrementModificationCount();
@Override
public void writeData(YangInstanceIdentifier path, NormalizedNode<?, ?> data) {
incrementModificationCount();
- getWriteDelegate().write(path, data);
+ if(operationError == null) {
+ try {
+ getWriteDelegate().write(path, data);
+ } catch (Exception e) {
+ operationError = e;
+ }
+ }
+
}
@Override
public void mergeData(YangInstanceIdentifier path, NormalizedNode<?, ?> data) {
incrementModificationCount();
}
@Override
public void mergeData(YangInstanceIdentifier path, NormalizedNode<?, ?> data) {
incrementModificationCount();
- getWriteDelegate().merge(path, data);
+ if(operationError == null) {
+ try {
+ getWriteDelegate().merge(path, data);
+ } catch (Exception e) {
+ operationError = e;
+ }
+ }
}
@Override
public void deleteData(YangInstanceIdentifier path) {
incrementModificationCount();
}
@Override
public void deleteData(YangInstanceIdentifier path) {
incrementModificationCount();
- getWriteDelegate().delete(path);
+ if(operationError == null) {
+ try {
+ getWriteDelegate().delete(path);
+ } catch (Exception e) {
+ operationError = e;
+ }
+ }
}
@Override
}
@Override
@@
-89,7
+112,9
@@
abstract class LocalTransactionContext extends AbstractTransactionContext {
private LocalThreePhaseCommitCohort ready() {
logModificationCount();
private LocalThreePhaseCommitCohort ready() {
logModificationCount();
- return (LocalThreePhaseCommitCohort) getWriteDelegate().ready();
+ LocalThreePhaseCommitCohort cohort = readySupport.onTransactionReady(getWriteDelegate());
+ cohort.setOperationError(operationError);
+ return cohort;
}
@Override
}
@Override