Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge changes I52c2aaab,I2509ed5e,Ic1d8a4e5,I73730f79,Ica1959e5,I0ce61b07
[controller.git]
/
opendaylight
/
md-sal
/
sal-distributed-datastore
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
cluster
/
datastore
/
TransactionProxy.java
diff --git
a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java
b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java
index d93bae22e08d9fddb3f1ac7d9c12aa4a278d0ff6..443e0af9e031392fe1ebb08d03d956b883b91dab 100644
(file)
--- a/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java
+++ b/
opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java
@@
-220,7
+220,7
@@
public class TransactionProxy implements DOMStoreReadWriteTransaction {
phantomReferenceCache.put(cleanup, cleanup);
}
phantomReferenceCache.put(cleanup, cleanup);
}
- LOG.debug("Created txn {} of type {}
", identifier, transactionType
);
+ LOG.debug("Created txn {} of type {}
on chain {}", identifier, transactionType, transactionChainId
);
}
@VisibleForTesting
}
@VisibleForTesting
@@
-423,8
+423,8
@@
public class TransactionProxy implements DOMStoreReadWriteTransaction {
for(TransactionFutureCallback txFutureCallback : txFutureCallbackMap.values()) {
for(TransactionFutureCallback txFutureCallback : txFutureCallbackMap.values()) {
- LOG.debug("Tx {} Readying transaction for shard {}", identifier,
- txFutureCallback.getShardName());
+ LOG.debug("Tx {} Readying transaction for shard {}
chain {}
", identifier,
+ txFutureCallback.getShardName()
, transactionChainId
);
TransactionContext transactionContext = txFutureCallback.getTransactionContext();
if(transactionContext != null) {
TransactionContext transactionContext = txFutureCallback.getTransactionContext();
if(transactionContext != null) {
@@
-534,6
+534,10
@@
public class TransactionProxy implements DOMStoreReadWriteTransaction {
return transactionChainId;
}
return transactionChainId;
}
+ protected ActorContext getActorContext() {
+ return actorContext;
+ }
+
/**
* Interface for a transaction operation to be invoked later.
*/
/**
* Interface for a transaction operation to be invoked later.
*/