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 logging format/argument mismatch
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
CompositeDataTreeCohort.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeDataTreeCohort.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeDataTreeCohort.java
index a84fa4610d5763c9ab84ae73687640f1236024f5..e8c0567e0610968ceba4eaba50e6045e625ef6f5 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeDataTreeCohort.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/CompositeDataTreeCohort.java
@@
-134,7
+134,11
@@
class CompositeDataTreeCohort {
}
void canCommit(final DataTreeCandidate tip) throws ExecutionException, TimeoutException {
}
void canCommit(final DataTreeCandidate tip) throws ExecutionException, TimeoutException {
- LOG.debug("{}: canCommit - candidate: {}", txId, tip);
+ if (LOG.isTraceEnabled()) {
+ LOG.trace("{}: canCommit - candidate: {}", txId, tip);
+ } else {
+ LOG.debug("{}: canCommit - candidate rootPath: {}", txId, tip.getRootPath());
+ }
final List<CanCommit> messages = registry.createCanCommitMessages(txId, tip, schema);
LOG.debug("{}: canCommit - messages: {}", txId, messages);
final List<CanCommit> messages = registry.createCanCommitMessages(txId, tip, schema);
LOG.debug("{}: canCommit - messages: {}", txId, messages);
@@
-220,7
+224,7
@@
class CompositeDataTreeCohort {
final Iterable<Object> results;
try {
final Iterable<Object> results;
try {
- results = Await.result(Futures.sequence(Lists.transform(futures,
e -> e.getValue()
),
+ results = Await.result(Futures.sequence(Lists.transform(futures,
Entry::getValue
),
ExecutionContexts.global()), timeout.duration());
} catch (TimeoutException e) {
successfulFromPrevious = null;
ExecutionContexts.global()), timeout.duration());
} catch (TimeoutException e) {
successfulFromPrevious = null;