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%2Fdatabroker%2Factors%2Fdds%2FLocalProxyTransaction.java;h=747fd144ba72f30af9056c3c604b911c68f7481f;hb=047566574ea74d1dfe24fa8075f8ba137faa698c;hp=61f83c2db1e8172c9374665bfe41eba3e2e13d3d;hpb=db9a673c114febc785fbd324947ac2c3e3095d06;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalProxyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalProxyTransaction.java index 61f83c2db1..747fd144ba 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalProxyTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalProxyTransaction.java @@ -9,7 +9,6 @@ package org.opendaylight.controller.cluster.databroker.actors.dds; import com.google.common.base.Optional; import com.google.common.base.Preconditions; -import com.google.common.base.Verify; import com.google.common.util.concurrent.CheckedFuture; import com.google.common.util.concurrent.Futures; import java.util.function.Consumer; @@ -20,18 +19,10 @@ import org.opendaylight.controller.cluster.access.commands.CommitLocalTransactio import org.opendaylight.controller.cluster.access.commands.ExistsTransactionRequest; import org.opendaylight.controller.cluster.access.commands.ExistsTransactionSuccess; import org.opendaylight.controller.cluster.access.commands.ModifyTransactionRequest; -import org.opendaylight.controller.cluster.access.commands.PersistenceProtocol; import org.opendaylight.controller.cluster.access.commands.ReadTransactionRequest; import org.opendaylight.controller.cluster.access.commands.ReadTransactionSuccess; -import org.opendaylight.controller.cluster.access.commands.TransactionAbortRequest; -import org.opendaylight.controller.cluster.access.commands.TransactionDelete; -import org.opendaylight.controller.cluster.access.commands.TransactionDoCommitRequest; -import org.opendaylight.controller.cluster.access.commands.TransactionMerge; -import org.opendaylight.controller.cluster.access.commands.TransactionModification; -import org.opendaylight.controller.cluster.access.commands.TransactionPreCommitRequest; +import org.opendaylight.controller.cluster.access.commands.TransactionPurgeRequest; import org.opendaylight.controller.cluster.access.commands.TransactionRequest; -import org.opendaylight.controller.cluster.access.commands.TransactionWrite; -import org.opendaylight.controller.cluster.access.concepts.RequestException; import org.opendaylight.controller.cluster.access.concepts.Response; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; import org.opendaylight.controller.cluster.datastore.util.AbstractDataTreeModificationCursor; @@ -39,10 +30,7 @@ import org.opendaylight.mdsal.common.api.ReadFailedException; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.api.schema.tree.CursorAwareDataTreeModification; -import org.opendaylight.yangtools.yang.data.api.schema.tree.CursorAwareDataTreeSnapshot; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModificationCursor; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -63,141 +51,58 @@ import org.slf4j.LoggerFactory; * @author Robert Varga */ @NotThreadSafe -final class LocalProxyTransaction extends AbstractProxyTransaction { +abstract class LocalProxyTransaction extends AbstractProxyTransaction { private static final Logger LOG = LoggerFactory.getLogger(LocalProxyTransaction.class); private final TransactionIdentifier identifier; - private CursorAwareDataTreeModification modification; - private CursorAwareDataTreeSnapshot sealedModification; - - LocalProxyTransaction(final ProxyHistory parent, final TransactionIdentifier identifier, - final CursorAwareDataTreeModification modification) { + LocalProxyTransaction(final ProxyHistory parent, final TransactionIdentifier identifier) { super(parent); this.identifier = Preconditions.checkNotNull(identifier); - this.modification = Preconditions.checkNotNull(modification); } @Override - public TransactionIdentifier getIdentifier() { + public final TransactionIdentifier getIdentifier() { return identifier; } - @Override - void doDelete(final YangInstanceIdentifier path) { - modification.delete(path); - } - - @Override - void doMerge(final YangInstanceIdentifier path, final NormalizedNode data) { - modification.merge(path, data); - } + abstract DataTreeSnapshot readOnlyView(); - @Override - void doWrite(final YangInstanceIdentifier path, final NormalizedNode data) { - modification.write(path, data); - } + abstract void applyModifyTransactionRequest(ModifyTransactionRequest request, + @Nullable Consumer> callback); @Override - CheckedFuture doExists(final YangInstanceIdentifier path) { - return Futures.immediateCheckedFuture(modification.readNode(path).isPresent()); + final CheckedFuture doExists(final YangInstanceIdentifier path) { + return Futures.immediateCheckedFuture(readOnlyView().readNode(path).isPresent()); } @Override - CheckedFuture>, ReadFailedException> doRead(final YangInstanceIdentifier path) { - return Futures.immediateCheckedFuture(modification.readNode(path)); - } - - private RuntimeException abortedException() { - return new IllegalStateException("Tracker " + identifier + " has been aborted"); - } - - private RuntimeException submittedException() { - return new IllegalStateException("Tracker " + identifier + " has been submitted"); + final CheckedFuture>, ReadFailedException> doRead(final YangInstanceIdentifier path) { + return Futures.immediateCheckedFuture(readOnlyView().readNode(path)); } @Override - void doAbort() { + final void doAbort() { sendAbort(new AbortLocalTransactionRequest(identifier, localActor()), response -> { LOG.debug("Transaction {} abort completed with {}", identifier, response); }); } - @Override - CommitLocalTransactionRequest commitRequest(final boolean coordinated) { - final CommitLocalTransactionRequest ret = new CommitLocalTransactionRequest(identifier, nextSequence(), - localActor(), modification, coordinated); - modification = new FailedDataTreeModification(this::submittedException); - return ret; - } - - @Override - void doSeal() { - modification.ready(); - sealedModification = modification; - } - - DataTreeSnapshot getSnapshot() { - Preconditions.checkState(sealedModification != null, "Proxy %s is not sealed yet", identifier); - return sealedModification; - } - - private void applyModifyTransactionRequest(final ModifyTransactionRequest request, - final @Nullable Consumer> callback) { - for (TransactionModification mod : request.getModifications()) { - if (mod instanceof TransactionWrite) { - modification.write(mod.getPath(), ((TransactionWrite)mod).getData()); - } else if (mod instanceof TransactionMerge) { - modification.merge(mod.getPath(), ((TransactionMerge)mod).getData()); - } else if (mod instanceof TransactionDelete) { - modification.delete(mod.getPath()); - } else { - throw new IllegalArgumentException("Unsupported modification " + mod); - } - } - - final java.util.Optional maybeProtocol = request.getPersistenceProtocol(); - if (maybeProtocol.isPresent()) { - seal(); - Verify.verify(callback != null, "Request {} has null callback", request); - - switch (maybeProtocol.get()) { - case ABORT: - sendAbort(callback); - break; - case SIMPLE: - sendRequest(commitRequest(false), callback); - break; - case THREE_PHASE: - sendRequest(commitRequest(true), callback); - break; - default: - throw new IllegalArgumentException("Unhandled protocol " + maybeProtocol.get()); - } - } - } - @Override void handleForwardedRemoteRequest(final TransactionRequest request, final @Nullable Consumer> callback) { - LOG.debug("Applying forwarded request {}", request); - if (request instanceof ModifyTransactionRequest) { applyModifyTransactionRequest((ModifyTransactionRequest) request, callback); } else if (request instanceof ReadTransactionRequest) { final YangInstanceIdentifier path = ((ReadTransactionRequest) request).getPath(); - final Optional> result = modification.readNode(path); + final Optional> result = readOnlyView().readNode(path); callback.accept(new ReadTransactionSuccess(request.getTarget(), request.getSequence(), result)); } else if (request instanceof ExistsTransactionRequest) { final YangInstanceIdentifier path = ((ExistsTransactionRequest) request).getPath(); - final boolean result = modification.readNode(path).isPresent(); + final boolean result = readOnlyView().readNode(path).isPresent(); callback.accept(new ExistsTransactionSuccess(request.getTarget(), request.getSequence(), result)); - } else if (request instanceof TransactionPreCommitRequest) { - sendRequest(new TransactionPreCommitRequest(getIdentifier(), nextSequence(), localActor()), callback); - } else if (request instanceof TransactionDoCommitRequest) { - sendRequest(new TransactionDoCommitRequest(getIdentifier(), nextSequence(), localActor()), callback); - } else if (request instanceof TransactionAbortRequest) { - sendAbort(callback); + } else if (request instanceof TransactionPurgeRequest) { + purge(); } else { throw new IllegalArgumentException("Unhandled request " + request); } @@ -205,7 +110,7 @@ final class LocalProxyTransaction extends AbstractProxyTransaction { @Override void forwardToRemote(final RemoteProxyTransaction successor, final TransactionRequest request, - final Consumer> callback) throws RequestException { + final Consumer> callback) { if (request instanceof CommitLocalTransactionRequest) { final CommitLocalTransactionRequest req = (CommitLocalTransactionRequest) request; final DataTreeModification mod = req.getModification(); @@ -228,13 +133,16 @@ final class LocalProxyTransaction extends AbstractProxyTransaction { } }); - successor.seal(); + successor.ensureSealed(); final ModifyTransactionRequest successorReq = successor.commitRequest(req.isCoordinated()); successor.sendRequest(successorReq, callback); } else if (request instanceof AbortLocalTransactionRequest) { LOG.debug("Forwarding abort {} to successor {}", request, successor); successor.abort(); + } else if (request instanceof TransactionPurgeRequest) { + LOG.debug("Forwarding purge {} to successor {}", request, successor); + successor.purge(); } else { throw new IllegalArgumentException("Unhandled request" + request); } @@ -242,11 +150,11 @@ final class LocalProxyTransaction extends AbstractProxyTransaction { @Override void forwardToLocal(final LocalProxyTransaction successor, final TransactionRequest request, - final Consumer> callback) throws RequestException { + final Consumer> callback) { if (request instanceof AbortLocalTransactionRequest) { successor.sendAbort(request, callback); - } else if (request instanceof CommitLocalTransactionRequest) { - successor.sendCommit((CommitLocalTransactionRequest)request, callback); + } else if (request instanceof TransactionPurgeRequest) { + successor.purge(); } else { throw new IllegalArgumentException("Unhandled request" + request); } @@ -254,18 +162,7 @@ final class LocalProxyTransaction extends AbstractProxyTransaction { LOG.debug("Forwarded request {} to successor {}", request, successor); } - private void sendAbort(final TransactionRequest request, final Consumer> callback) { + void sendAbort(final TransactionRequest request, final Consumer> callback) { sendRequest(request, callback); - modification = new FailedDataTreeModification(this::abortedException); - } - - private void sendCommit(final CommitLocalTransactionRequest request, final Consumer> callback) { - // Rebase old modification on new data tree. - try (DataTreeModificationCursor cursor = modification.createCursor(YangInstanceIdentifier.EMPTY)) { - request.getModification().applyToCursor(cursor); - } - - seal(); - sendRequest(commitRequest(request.isCoordinated()), callback); } }