Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix TransactionContextWrapper limiter accounting
[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 9fad1f1016bd3e3e33af2566cc0defef2121cee9..8c4dddc565d27aab4943e3ef61d99ce7d166e0f7 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
@@
-45,7
+45,7
@@
abstract class LocalTransactionContext extends AbstractTransactionContext {
@Override
@SuppressWarnings("checkstyle:IllegalCatch")
@Override
@SuppressWarnings("checkstyle:IllegalCatch")
- public void executeModification(final AbstractModification modification) {
+ public void executeModification(final AbstractModification modification
, final Boolean havePermit
) {
incrementModificationCount();
if (operationError == null) {
try {
incrementModificationCount();
if (operationError == null) {
try {
@@
-57,7
+57,8
@@
abstract class LocalTransactionContext extends AbstractTransactionContext {
}
@Override
}
@Override
- public <T> void executeRead(final AbstractRead<T> readCmd, final SettableFuture<T> proxyFuture) {
+ public <T> void executeRead(final AbstractRead<T> readCmd, final SettableFuture<T> proxyFuture,
+ final Boolean havePermit) {
Futures.addCallback(readCmd.apply(getReadDelegate()), new FutureCallback<T>() {
@Override
public void onSuccess(final T result) {
Futures.addCallback(readCmd.apply(getReadDelegate()), new FutureCallback<T>() {
@Override
public void onSuccess(final T result) {
@@
-77,13
+78,13
@@
abstract class LocalTransactionContext extends AbstractTransactionContext {
}
@Override
}
@Override
- public Future<ActorSelection> readyTransaction() {
+ public Future<ActorSelection> readyTransaction(
final Boolean havePermit
) {
final LocalThreePhaseCommitCohort cohort = ready();
return cohort.initiateCoordinatedCommit();
}
@Override
final LocalThreePhaseCommitCohort cohort = ready();
return cohort.initiateCoordinatedCommit();
}
@Override
- public Future<Object> directCommit() {
+ public Future<Object> directCommit(
final Boolean havePermit
) {
final LocalThreePhaseCommitCohort cohort = ready();
return cohort.initiateDirectCommit();
}
final LocalThreePhaseCommitCohort cohort = ready();
return cohort.initiateDirectCommit();
}