X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FTransactionProxy.java;h=af1e4e92b60ef80effd9b3d443fd9743cef54900;hp=7703f484c73e687391ff5dd9ffe1739afd201c0f;hb=448bd0847750815fca81f20535014d1b08531e52;hpb=b30a2df0721908317c9b4770972b5647dfafd3c7 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 7703f484c7..af1e4e92b6 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 @@ -25,6 +25,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; @@ -43,6 +44,7 @@ import org.opendaylight.controller.cluster.datastore.messages.ReadDataReply; import org.opendaylight.controller.cluster.datastore.messages.ReadyTransaction; import org.opendaylight.controller.cluster.datastore.messages.ReadyTransactionReply; import org.opendaylight.controller.cluster.datastore.messages.SerializableMessage; +import org.opendaylight.controller.cluster.datastore.messages.VersionedSerializableMessage; import org.opendaylight.controller.cluster.datastore.messages.WriteData; import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategyFactory; import org.opendaylight.controller.cluster.datastore.utils.ActorContext; @@ -157,8 +159,7 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { if(remoteTransactionActorsMB.get()) { for(ActorSelection actor : remoteTransactionActors) { LOG.trace("Sending CloseTransaction to {}", actor); - actorContext.sendOperationAsync(actor, - new CloseTransaction().toSerializable()); + actorContext.sendOperationAsync(actor, CloseTransaction.INSTANCE.toSerializable()); } } } @@ -185,6 +186,8 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { private final String transactionChainId; private final SchemaContext schemaContext; private boolean inReadyState; + private final Semaphore operationLimiter; + private final OperationCompleter operationCompleter; public TransactionProxy(ActorContext actorContext, TransactionType transactionType) { this(actorContext, transactionType, ""); @@ -221,6 +224,10 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { phantomReferenceCache.put(cleanup, cleanup); } + // Note : Currently mailbox-capacity comes from akka.conf and not from the config-subsystem + this.operationLimiter = new Semaphore(actorContext.getTransactionOutstandingOperationLimit()); + this.operationCompleter = new OperationCompleter(operationLimiter); + LOG.debug("Created txn {} of type {} on chain {}", identifier, transactionType, transactionChainId); } @@ -257,6 +264,8 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { LOG.debug("Tx {} read {}", identifier, path); + throttleOperation(); + TransactionFutureCallback txFutureCallback = getOrCreateTxFutureCallback(path); return txFutureCallback.enqueueReadOperation(new ReadOperation>>() { @Override @@ -275,6 +284,8 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { LOG.debug("Tx {} exists {}", identifier, path); + throttleOperation(); + TransactionFutureCallback txFutureCallback = getOrCreateTxFutureCallback(path); return txFutureCallback.enqueueReadOperation(new ReadOperation() { @Override @@ -292,6 +303,25 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { "Transaction is sealed - further modifications are not allowed"); } + private void throttleOperation() { + throttleOperation(1); + } + + private void throttleOperation(int acquirePermits) { + try { + if(!operationLimiter.tryAcquire(acquirePermits, actorContext.getDatastoreContext().getOperationTimeoutInSeconds(), TimeUnit.SECONDS)){ + LOG.warn("Failed to acquire operation permit for transaction {}", getIdentifier()); + } + } catch (InterruptedException e) { + if(LOG.isDebugEnabled()) { + LOG.debug("Interrupted when trying to acquire operation permit for transaction " + getIdentifier().toString(), e); + } else { + LOG.warn("Interrupted when trying to acquire operation permit for transaction {}", getIdentifier()); + } + } + } + + @Override public void write(final YangInstanceIdentifier path, final NormalizedNode data) { @@ -299,6 +329,8 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { LOG.debug("Tx {} write {}", identifier, path); + throttleOperation(); + TransactionFutureCallback txFutureCallback = getOrCreateTxFutureCallback(path); txFutureCallback.enqueueModifyOperation(new TransactionOperation() { @Override @@ -315,6 +347,8 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { LOG.debug("Tx {} merge {}", identifier, path); + throttleOperation(); + TransactionFutureCallback txFutureCallback = getOrCreateTxFutureCallback(path); txFutureCallback.enqueueModifyOperation(new TransactionOperation() { @Override @@ -331,6 +365,8 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { LOG.debug("Tx {} delete {}", identifier, path); + throttleOperation(); + TransactionFutureCallback txFutureCallback = getOrCreateTxFutureCallback(path); txFutureCallback.enqueueModifyOperation(new TransactionOperation() { @Override @@ -345,6 +381,8 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { checkModificationState(); + throttleOperation(txFutureCallbackMap.size()); + inReadyState = true; LOG.debug("Tx {} Readying {} transactions for commit", identifier, @@ -617,10 +655,6 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { } } - - - - /** * Performs a CreateTransaction try async. */ @@ -672,7 +706,7 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { LOG.debug("Tx {} Creating NoOpTransaction because of error: {}", identifier, failure.getMessage()); - localTransactionContext = new NoOpTransactionContext(failure, identifier); + localTransactionContext = new NoOpTransactionContext(failure, identifier, operationLimiter); } else if (response.getClass().equals(CreateTransactionReply.SERIALIZABLE_CLASS)) { localTransactionContext = createValidTransactionContext( CreateTransactionReply.fromSerializable(response)); @@ -680,7 +714,7 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { IllegalArgumentException exception = new IllegalArgumentException(String.format( "Invalid reply type %s for CreateTransaction", response.getClass())); - localTransactionContext = new NoOpTransactionContext(exception, identifier); + localTransactionContext = new NoOpTransactionContext(exception, identifier, operationLimiter); } for(TransactionOperation oper: txOperationsOnComplete) { @@ -717,7 +751,7 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { boolean isTxActorLocal = actorContext.isPathLocal(transactionPath); return new TransactionContextImpl(transactionPath, transactionActor, identifier, - actorContext, schemaContext, isTxActorLocal, reply.getVersion()); + actorContext, schemaContext, isTxActorLocal, reply.getVersion(), operationCompleter); } } @@ -759,37 +793,49 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { private final Logger LOG = LoggerFactory.getLogger(TransactionContextImpl.class); private final ActorContext actorContext; - private final SchemaContext schemaContext; private final String transactionPath; private final ActorSelection actor; private final boolean isTxActorLocal; - private final int remoteTransactionVersion; + private final short remoteTransactionVersion; + private final OperationCompleter operationCompleter; + private TransactionContextImpl(String transactionPath, ActorSelection actor, TransactionIdentifier identifier, ActorContext actorContext, SchemaContext schemaContext, - boolean isTxActorLocal, int remoteTransactionVersion) { + boolean isTxActorLocal, short remoteTransactionVersion, OperationCompleter operationCompleter) { super(identifier); this.transactionPath = transactionPath; this.actor = actor; this.actorContext = actorContext; - this.schemaContext = schemaContext; this.isTxActorLocal = isTxActorLocal; this.remoteTransactionVersion = remoteTransactionVersion; + this.operationCompleter = operationCompleter; + } + + private Future completeOperation(Future operationFuture){ + operationFuture.onComplete(this.operationCompleter, actorContext.getActorSystem().dispatcher()); + return operationFuture; } + private ActorSelection getActor() { return actor; } private Future executeOperationAsync(SerializableMessage msg) { - return actorContext.executeOperationAsync(getActor(), isTxActorLocal ? msg : msg.toSerializable()); + return completeOperation(actorContext.executeOperationAsync(getActor(), isTxActorLocal ? msg : msg.toSerializable())); + } + + private Future executeOperationAsync(VersionedSerializableMessage msg) { + return completeOperation(actorContext.executeOperationAsync(getActor(), isTxActorLocal ? msg : + msg.toSerializable(remoteTransactionVersion))); } @Override public void closeTransaction() { LOG.debug("Tx {} closeTransaction called", identifier); - actorContext.sendOperationAsync(getActor(), new CloseTransaction().toSerializable()); + actorContext.sendOperationAsync(getActor(), CloseTransaction.INSTANCE.toSerializable()); } @Override @@ -799,7 +845,7 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { // Send the ReadyTransaction message to the Tx actor. - final Future replyFuture = executeOperationAsync(new ReadyTransaction()); + final Future replyFuture = executeOperationAsync(ReadyTransaction.INSTANCE); // Combine all the previously recorded put/merge/delete operation reply Futures and the // ReadyTransactionReply Future into one Future. If any one fails then the combined @@ -846,7 +892,8 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { // At some point in the future when upgrades from Helium are not supported // we could remove this code to resolvePath and just use the cohortPath as the // resolved cohortPath - if(TransactionContextImpl.this.remoteTransactionVersion < CreateTransaction.HELIUM_1_VERSION) { + if(TransactionContextImpl.this.remoteTransactionVersion < + DataStoreVersions.HELIUM_1_VERSION) { cohortPath = actorContext.resolvePath(transactionPath, cohortPath); } @@ -854,7 +901,7 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { } else { // Throwing an exception here will fail the Future. - throw new IllegalArgumentException(String.format("Invalid reply type {}", + throw new IllegalArgumentException(String.format("Invalid reply type %s", serializedReadyReply.getClass())); } } @@ -872,14 +919,14 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { public void mergeData(YangInstanceIdentifier path, NormalizedNode data) { LOG.debug("Tx {} mergeData called path = {}", identifier, path); - recordedOperationFutures.add(executeOperationAsync(new MergeData(path, data, schemaContext))); + recordedOperationFutures.add(executeOperationAsync(new MergeData(path, data))); } @Override public void writeData(YangInstanceIdentifier path, NormalizedNode data) { LOG.debug("Tx {} writeData called path = {}", identifier, path); - recordedOperationFutures.add(executeOperationAsync(new WriteData(path, data, schemaContext))); + recordedOperationFutures.add(executeOperationAsync(new WriteData(path, data))); } @Override @@ -950,8 +997,8 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { ReadDataReply reply = (ReadDataReply) readResponse; returnFuture.set(Optional.>fromNullable(reply.getNormalizedNode())); - } else if (readResponse.getClass().equals(ReadDataReply.SERIALIZABLE_CLASS)) { - ReadDataReply reply = ReadDataReply.fromSerializable(schemaContext, path, readResponse); + } else if (ReadDataReply.isSerializedType(readResponse)) { + ReadDataReply reply = ReadDataReply.fromSerializable(readResponse); returnFuture.set(Optional.>fromNullable(reply.getNormalizedNode())); } else { @@ -1055,10 +1102,12 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { private final Logger LOG = LoggerFactory.getLogger(NoOpTransactionContext.class); private final Throwable failure; + private final Semaphore operationLimiter; - public NoOpTransactionContext(Throwable failure, TransactionIdentifier identifier){ + public NoOpTransactionContext(Throwable failure, TransactionIdentifier identifier, Semaphore operationLimiter){ super(identifier); this.failure = failure; + this.operationLimiter = operationLimiter; } @Override @@ -1069,28 +1118,33 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { @Override public Future readyTransaction() { LOG.debug("Tx {} readyTransaction called", identifier); + operationLimiter.release(); return akka.dispatch.Futures.failed(failure); } @Override public void deleteData(YangInstanceIdentifier path) { LOG.debug("Tx {} deleteData called path = {}", identifier, path); + operationLimiter.release(); } @Override public void mergeData(YangInstanceIdentifier path, NormalizedNode data) { LOG.debug("Tx {} mergeData called path = {}", identifier, path); + operationLimiter.release(); } @Override public void writeData(YangInstanceIdentifier path, NormalizedNode data) { LOG.debug("Tx {} writeData called path = {}", identifier, path); + operationLimiter.release(); } @Override public CheckedFuture>, ReadFailedException> readData( YangInstanceIdentifier path) { LOG.debug("Tx {} readData called path = {}", identifier, path); + operationLimiter.release(); return Futures.immediateFailedCheckedFuture(new ReadFailedException( "Error reading data for path " + path, failure)); } @@ -1099,8 +1153,21 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction { public CheckedFuture dataExists( YangInstanceIdentifier path) { LOG.debug("Tx {} dataExists called path = {}", identifier, path); + operationLimiter.release(); return Futures.immediateFailedCheckedFuture(new ReadFailedException( "Error checking exists for path " + path, failure)); } } + + private static class OperationCompleter extends OnComplete { + private final Semaphore operationLimiter; + OperationCompleter(Semaphore operationLimiter){ + this.operationLimiter = operationLimiter; + } + + @Override + public void onComplete(Throwable throwable, Object o){ + this.operationLimiter.release(); + } + } }