Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Convert OperationCompleter to OperationLimiter
[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..dd7d899e0cb10f809cc6a1b67fddc605896f1875 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
@@
-30,12
+30,12
@@
import scala.concurrent.Future;
abstract class LocalTransactionContext extends AbstractTransactionContext {
private final DOMStoreTransaction txDelegate;
abstract class LocalTransactionContext extends AbstractTransactionContext {
private final DOMStoreTransaction txDelegate;
- private final Operation
Completer comple
ter;
+ private final Operation
Limiter limi
ter;
- LocalTransactionContext(TransactionIdentifier identifier, DOMStoreTransaction txDelegate, Operation
Completer comple
ter) {
+ LocalTransactionContext(TransactionIdentifier identifier, DOMStoreTransaction txDelegate, Operation
Limiter limi
ter) {
super(identifier);
this.txDelegate = Preconditions.checkNotNull(txDelegate);
super(identifier);
this.txDelegate = Preconditions.checkNotNull(txDelegate);
- this.
completer = Preconditions.checkNotNull(comple
ter);
+ this.
limiter = Preconditions.checkNotNull(limi
ter);
}
protected abstract DOMStoreWriteTransaction getWriteDelegate();
}
protected abstract DOMStoreWriteTransaction getWriteDelegate();
@@
-44,20
+44,23
@@
abstract class LocalTransactionContext extends AbstractTransactionContext {
@Override
public void writeData(YangInstanceIdentifier path, NormalizedNode<?, ?> data) {
@Override
public void writeData(YangInstanceIdentifier path, NormalizedNode<?, ?> data) {
+ incrementModificationCount();
getWriteDelegate().write(path, data);
getWriteDelegate().write(path, data);
-
completer.onComplete(null, null
);
+
limiter.release(
);
}
@Override
public void mergeData(YangInstanceIdentifier path, NormalizedNode<?, ?> data) {
}
@Override
public void mergeData(YangInstanceIdentifier path, NormalizedNode<?, ?> data) {
+ incrementModificationCount();
getWriteDelegate().merge(path, data);
getWriteDelegate().merge(path, data);
-
completer.onComplete(null, null
);
+
limiter.release(
);
}
@Override
public void deleteData(YangInstanceIdentifier path) {
}
@Override
public void deleteData(YangInstanceIdentifier path) {
+ incrementModificationCount();
getWriteDelegate().delete(path);
getWriteDelegate().delete(path);
-
completer.onComplete(null, null
);
+
limiter.release(
);
}
@Override
}
@Override
@@
-66,13
+69,13
@@
abstract class LocalTransactionContext extends AbstractTransactionContext {
@Override
public void onSuccess(Optional<NormalizedNode<?, ?>> result) {
proxyFuture.set(result);
@Override
public void onSuccess(Optional<NormalizedNode<?, ?>> result) {
proxyFuture.set(result);
-
completer.onComplete(null, null
);
+
limiter.release(
);
}
@Override
public void onFailure(Throwable t) {
proxyFuture.setException(t);
}
@Override
public void onFailure(Throwable t) {
proxyFuture.setException(t);
-
completer.onComplete(null, null
);
+
limiter.release(
);
}
});
}
}
});
}
@@
-83,20
+86,21
@@
abstract class LocalTransactionContext extends AbstractTransactionContext {
@Override
public void onSuccess(Boolean result) {
proxyFuture.set(result);
@Override
public void onSuccess(Boolean result) {
proxyFuture.set(result);
-
completer.onComplete(null, null
);
+
limiter.release(
);
}
@Override
public void onFailure(Throwable t) {
proxyFuture.setException(t);
}
@Override
public void onFailure(Throwable t) {
proxyFuture.setException(t);
-
completer.onComplete(null, null
);
+
limiter.release(
);
}
});
}
private LocalThreePhaseCommitCohort ready() {
}
});
}
private LocalThreePhaseCommitCohort ready() {
+ logModificationCount();
LocalThreePhaseCommitCohort ready = (LocalThreePhaseCommitCohort) getWriteDelegate().ready();
LocalThreePhaseCommitCohort ready = (LocalThreePhaseCommitCohort) getWriteDelegate().ready();
-
completer.onComplete(null, null
);
+
limiter.release(
);
return ready;
}
return ready;
}