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 e72c8a30f943a8c28209d0f9453862dfa551e47d..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 {
* @author Thomas Pantelis
*/
abstract class LocalTransactionContext extends AbstractTransactionContext {
-
private final DOMStoreTransaction txDelegate;
private final DOMStoreTransaction txDelegate;
- private final OperationCompleter completer;
+ private final LocalTransactionReadySupport readySupport;
+ private Exception operationError;
- LocalTransactionContext(TransactionIdentifier identifier, DOMStoreTransaction txDelegate, OperationCompleter completer) {
+ LocalTransactionContext(DOMStoreTransaction txDelegate, TransactionIdentifier identifier,
+ LocalTransactionReadySupport readySupport) {
super(identifier);
this.txDelegate = Preconditions.checkNotNull(txDelegate);
super(identifier);
this.txDelegate = Preconditions.checkNotNull(txDelegate);
- this.
completer = Preconditions.checkNotNull(completer)
;
+ this.
readySupport = readySupport
;
}
protected abstract DOMStoreWriteTransaction getWriteDelegate();
}
protected abstract DOMStoreWriteTransaction getWriteDelegate();
@@
-44,35
+45,52
@@
abstract class LocalTransactionContext extends AbstractTransactionContext {
@Override
public void writeData(YangInstanceIdentifier path, NormalizedNode<?, ?> data) {
@Override
public void writeData(YangInstanceIdentifier path, NormalizedNode<?, ?> data) {
- getWriteDelegate().write(path, data);
- completer.onComplete(null, null);
+ incrementModificationCount();
+ if(operationError == null) {
+ try {
+ getWriteDelegate().write(path, data);
+ } catch (Exception e) {
+ operationError = e;
+ }
+ }
+
}
@Override
public void mergeData(YangInstanceIdentifier path, NormalizedNode<?, ?> data) {
}
@Override
public void mergeData(YangInstanceIdentifier path, NormalizedNode<?, ?> data) {
- getWriteDelegate().merge(path, data);
- completer.onComplete(null, null);
+ incrementModificationCount();
+ if(operationError == null) {
+ try {
+ getWriteDelegate().merge(path, data);
+ } catch (Exception e) {
+ operationError = e;
+ }
+ }
}
@Override
public void deleteData(YangInstanceIdentifier path) {
}
@Override
public void deleteData(YangInstanceIdentifier path) {
- getWriteDelegate().delete(path);
- completer.onComplete(null, null);
+ incrementModificationCount();
+ 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
}
@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);
proxyFuture.set(result);
- completer.onComplete(null, null);
}
@Override
}
@Override
- public void onFailure(Throwable t) {
+ public void onFailure(
final
Throwable t) {
proxyFuture.setException(t);
proxyFuture.setException(t);
- completer.onComplete(null, null);
}
});
}
}
});
}
@@
-81,33
+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 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);
proxyFuture.set(result);
- completer.onComplete(null, null);
}
@Override
}
@Override
- public void onFailure(Throwable t) {
+ public void onFailure(
final
Throwable t) {
proxyFuture.setException(t);
proxyFuture.setException(t);
- completer.onComplete(null, null);
}
});
}
private LocalThreePhaseCommitCohort ready() {
}
});
}
private LocalThreePhaseCommitCohort ready() {
- LocalThreePhaseCommitCohort ready = (LocalThreePhaseCommitCohort) getWriteDelegate().ready();
- completer.onComplete(null, null);
- return ready;
+ logModificationCount();
+ LocalThreePhaseCommitCohort cohort = readySupport.onTransactionReady(getWriteDelegate());
+ cohort.setOperationError(operationError);
+ return cohort;
}
@Override
public Future<ActorSelection> readyTransaction() {
}
@Override
public Future<ActorSelection> readyTransaction() {
- return ready().initiateCoordinatedCommit();
+ final LocalThreePhaseCommitCohort cohort = ready();
+ return cohort.initiateCoordinatedCommit();
}
@Override
public Future<Object> directCommit() {
}
@Override
public Future<Object> directCommit() {
- return ready().initiateDirectCommit();
+ final LocalThreePhaseCommitCohort cohort = ready();
+ return cohort.initiateDirectCommit();
}
@Override
}
@Override