X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FTransactionProxy.java;h=ebed05b6a7126170f2bba39bff4ced72bf9908a2;hb=2e15a7b29e4517e7b1b1ded0acb5a0ccf03d77e0;hp=d93bae22e08d9fddb3f1ac7d9c12aa4a278d0ff6;hpb=b0a6206d131fb9b6a7271d36689cb016b71aa095;p=controller.git 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 d93bae22e0..ebed05b6a7 100644 --- 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); } - LOG.debug("Created txn {} of type {}", identifier, transactionType); + LOG.debug("Created txn {} of type {} on chain {}", identifier, transactionType, transactionChainId); } @VisibleForTesting @@ -423,8 +423,8 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { 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) { @@ -534,6 +534,10 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { return transactionChainId; } + protected ActorContext getActorContext() { + return actorContext; + } + /** * Interface for a transaction operation to be invoked later. */ @@ -706,7 +710,7 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { // TxActor is always created where the leader of the shard is. // Check if TxActor is created in the same node - boolean isTxActorLocal = actorContext.isLocalPath(transactionPath); + boolean isTxActorLocal = actorContext.isPathLocal(transactionPath); return new TransactionContextImpl(transactionPath, transactionActor, identifier, actorContext, schemaContext, isTxActorLocal, reply.getVersion());