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-8403: do not throttle purge requests
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
databroker
/
actors
/
dds
/
AbstractProxyTransaction.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransaction.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransaction.java
index b8057c5afe428fd162e0ddf02c6a2c6d11eab108..bf56376fcee3d538d483a063d652ae6d3d5a5654 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransaction.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractProxyTransaction.java
@@
-334,7
+334,7
@@
abstract class AbstractProxyTransaction implements Identifiable<TransactionIdent
sendRequest(abortRequest(), resp -> {
LOG.debug("Transaction {} abort completed with {}", getIdentifier(), resp);
sendRequest(abortRequest(), resp -> {
LOG.debug("Transaction {} abort completed with {}", getIdentifier(), resp);
-
send
Purge();
+
enqueue
Purge();
});
}
});
}
@@
-352,7
+352,7
@@
abstract class AbstractProxyTransaction implements Identifiable<TransactionIdent
// This is a terminal request, hence we do not need to record it
LOG.debug("Transaction {} abort completed", this);
// This is a terminal request, hence we do not need to record it
LOG.debug("Transaction {} abort completed", this);
-
send
Purge();
+
enqueue
Purge();
});
}
});
}
@@
-403,7
+403,7
@@
abstract class AbstractProxyTransaction implements Identifiable<TransactionIdent
// This is a terminal request, hence we do not need to record it
LOG.debug("Transaction {} directCommit completed", this);
// This is a terminal request, hence we do not need to record it
LOG.debug("Transaction {} directCommit completed", this);
-
send
Purge();
+
enqueue
Purge();
});
return ret;
});
return ret;
@@
-497,20
+497,27
@@
abstract class AbstractProxyTransaction implements Identifiable<TransactionIdent
}
LOG.debug("Transaction {} doCommit completed", this);
}
LOG.debug("Transaction {} doCommit completed", this);
-
send
Purge();
+
enqueue
Purge();
});
}
});
}
- private void
send
Purge() {
-
send
Purge(null);
+ private void
enqueue
Purge() {
+
enqueue
Purge(null);
}
}
- final void sendPurge(final Consumer<Response<?, ?>> callback) {
- sendRequest(purgeRequest(), resp -> completePurge(resp, callback));
+ final void enqueuePurge(final Consumer<Response<?, ?>> callback) {
+ // Purge request are dispatched internally, hence should not wait
+ enqueuePurge(callback, parent.currentTime());
}
final void enqueuePurge(final Consumer<Response<?, ?>> callback, final long enqueuedTicks) {
}
final void enqueuePurge(final Consumer<Response<?, ?>> callback, final long enqueuedTicks) {
- enqueueRequest(purgeRequest(), resp -> completePurge(resp, callback), enqueuedTicks);
+ enqueueRequest(purgeRequest(), resp -> {
+ LOG.debug("Transaction {} purge completed", this);
+ parent.completeTransaction(this);
+ if (callback != null) {
+ callback.accept(resp);
+ }
+ }, enqueuedTicks);
}
private TransactionPurgeRequest purgeRequest() {
}
private TransactionPurgeRequest purgeRequest() {
@@
-518,14
+525,6
@@
abstract class AbstractProxyTransaction implements Identifiable<TransactionIdent
return new TransactionPurgeRequest(getIdentifier(), nextSequence(), localActor());
}
return new TransactionPurgeRequest(getIdentifier(), nextSequence(), localActor());
}
- private void completePurge(final Response<?, ?> resp, final Consumer<Response<?, ?>> callback) {
- LOG.debug("Transaction {} purge completed", this);
- parent.completeTransaction(this);
- if (callback != null) {
- callback.accept(resp);
- }
- }
-
// Called with the connection unlocked
final synchronized void startReconnect() {
// At this point canCommit/directCommit are blocked, we assert a new successor state, retrieving the previous
// Called with the connection unlocked
final synchronized void startReconnect() {
// At this point canCommit/directCommit are blocked, we assert a new successor state, retrieving the previous