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%2FLocalReadWriteProxyTransaction.java;h=be3de3a19734774f3473c879ce41a8edc5dab990;hb=77db264152bcfa24eb669532b515c672c1b30b2a;hp=e2e93de98ccf671df3dab6d4bd4a5148d5abcb53;hpb=7b7186bca2b89bd692de06ac2785d5d850c0b973;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalReadWriteProxyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalReadWriteProxyTransaction.java index e2e93de98c..be3de3a197 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalReadWriteProxyTransaction.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/LocalReadWriteProxyTransaction.java @@ -9,12 +9,18 @@ package org.opendaylight.controller.cluster.databroker.actors.dds; import com.google.common.base.Preconditions; import com.google.common.base.Verify; +import java.util.Optional; +import java.util.OptionalLong; +import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Supplier; -import javax.annotation.Nullable; -import javax.annotation.concurrent.NotThreadSafe; +import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.jdt.annotation.Nullable; +import org.opendaylight.controller.cluster.access.commands.AbortLocalTransactionRequest; +import org.opendaylight.controller.cluster.access.commands.AbstractLocalTransactionRequest; import org.opendaylight.controller.cluster.access.commands.CommitLocalTransactionRequest; import org.opendaylight.controller.cluster.access.commands.ModifyTransactionRequest; +import org.opendaylight.controller.cluster.access.commands.ModifyTransactionRequestBuilder; import org.opendaylight.controller.cluster.access.commands.PersistenceProtocol; import org.opendaylight.controller.cluster.access.commands.TransactionAbortRequest; import org.opendaylight.controller.cluster.access.commands.TransactionDelete; @@ -40,7 +46,7 @@ import org.slf4j.LoggerFactory; /** * An {@link AbstractProxyTransaction} for dispatching a transaction towards a shard leader which is co-located with - * the client instance. + * the client instance. This class is NOT thread-safe. * *

* It requires a {@link DataTreeSnapshot}, which is used to instantiated a new {@link DataTreeModification}. Operations @@ -53,7 +59,6 @@ import org.slf4j.LoggerFactory; * * @author Robert Varga */ -@NotThreadSafe final class LocalReadWriteProxyTransaction extends LocalProxyTransaction { private static final Logger LOG = LoggerFactory.getLogger(LocalReadWriteProxyTransaction.class); @@ -80,8 +85,14 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction { LocalReadWriteProxyTransaction(final ProxyHistory parent, final TransactionIdentifier identifier, final DataTreeSnapshot snapshot) { - super(parent, identifier); - this.modification = (CursorAwareDataTreeModification) snapshot.newModification(); + super(parent, identifier, false); + modification = (CursorAwareDataTreeModification) snapshot.newModification(); + } + + LocalReadWriteProxyTransaction(final ProxyHistory parent, final TransactionIdentifier identifier) { + super(parent, identifier, true); + // This is DONE transaction, this should never be touched + modification = null; } @Override @@ -103,7 +114,13 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction { return; } - mod.delete(path); + try { + mod.delete(path); + } catch (Exception e) { + LOG.debug("Transaction {} delete on {} incurred failure, delaying it until commit", getIdentifier(), path, + e); + recordedFailure = e; + } } @Override @@ -115,7 +132,13 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction { return; } - mod.merge(path, data); + try { + mod.merge(path, data); + } catch (Exception e) { + LOG.debug("Transaction {} merge to {} incurred failure, delaying it until commit", getIdentifier(), path, + e); + recordedFailure = e; + } } @Override @@ -127,7 +150,13 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction { return; } - mod.write(path, data); + try { + mod.write(path, data); + } catch (Exception e) { + LOG.debug("Transaction {} write to {} incurred failure, delaying it until commit", getIdentifier(), path, + e); + recordedFailure = e; + } } private RuntimeException abortedException() { @@ -142,37 +171,53 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction { CommitLocalTransactionRequest commitRequest(final boolean coordinated) { final CursorAwareDataTreeModification mod = getModification(); final CommitLocalTransactionRequest ret = new CommitLocalTransactionRequest(getIdentifier(), nextSequence(), - localActor(), mod, coordinated); + localActor(), mod, recordedFailure, coordinated); closedException = this::submittedException; return ret; } - @Override - void doSeal() { - Preconditions.checkState(sealedModification == null, "Transaction %s is already sealed", getIdentifier()); + private void sealModification() { + Preconditions.checkState(sealedModification == null, "Transaction %s is already sealed", this); final CursorAwareDataTreeModification mod = getModification(); mod.ready(); sealedModification = mod; } @Override - void flushState(final AbstractProxyTransaction successor) { + boolean sealOnly() { + sealModification(); + return super.sealOnly(); + } + + @Override + boolean sealAndSend(final OptionalLong enqueuedTicks) { + sealModification(); + return super.sealAndSend(enqueuedTicks); + } + + @Override + Optional flushState() { + final ModifyTransactionRequestBuilder b = new ModifyTransactionRequestBuilder(getIdentifier(), localActor()); + b.setSequence(0); + sealedModification.applyToCursor(new AbstractDataTreeModificationCursor() { @Override public void write(final PathArgument child, final NormalizedNode data) { - successor.write(current().node(child), data); + b.addModification(new TransactionWrite(current().node(child), data)); } @Override public void merge(final PathArgument child, final NormalizedNode data) { - successor.merge(current().node(child), data); + b.addModification(new TransactionMerge(current().node(child), data)); } @Override public void delete(final PathArgument child) { - successor.delete(current().node(child)); + b.addModification(new TransactionDelete(current().node(child))); } }); + + return Optional.of(b.build()); } DataTreeSnapshot getSnapshot() { @@ -181,37 +226,51 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction { } @Override - void applyModifyTransactionRequest(final ModifyTransactionRequest request, - final @Nullable Consumer> callback) { + void applyForwardedModifyTransactionRequest(final ModifyTransactionRequest request, + final Consumer> callback) { + commonModifyTransactionRequest(request, callback, this::sendRequest); + } + + @Override + void replayModifyTransactionRequest(final ModifyTransactionRequest request, + final Consumer> callback, final long enqueuedTicks) { + commonModifyTransactionRequest(request, callback, (req, cb) -> enqueueRequest(req, cb, enqueuedTicks)); + } + + private void commonModifyTransactionRequest(final ModifyTransactionRequest request, + final @Nullable Consumer> callback, + final BiConsumer, Consumer>> sendMethod) { for (final TransactionModification mod : request.getModifications()) { if (mod instanceof TransactionWrite) { - getModification().write(mod.getPath(), ((TransactionWrite)mod).getData()); + write(mod.getPath(), ((TransactionWrite)mod).getData()); } else if (mod instanceof TransactionMerge) { - getModification().merge(mod.getPath(), ((TransactionMerge)mod).getData()); + merge(mod.getPath(), ((TransactionMerge)mod).getData()); } else if (mod instanceof TransactionDelete) { - getModification().delete(mod.getPath()); + delete(mod.getPath()); } else { throw new IllegalArgumentException("Unsupported modification " + mod); } } - final java.util.Optional maybeProtocol = request.getPersistenceProtocol(); + final Optional maybeProtocol = request.getPersistenceProtocol(); if (maybeProtocol.isPresent()) { - Verify.verify(callback != null, "Request {} has null callback", request); - ensureSealed(); + Verify.verify(callback != null, "Request %s has null callback", request); + if (markSealed()) { + sealOnly(); + } switch (maybeProtocol.get()) { case ABORT: - sendAbort(callback); + sendMethod.accept(new AbortLocalTransactionRequest(getIdentifier(), localActor()), callback); break; case READY: - // No-op, as we have already issued a seal() + // No-op, as we have already issued a sealOnly() and we are not transmitting anything break; case SIMPLE: - sendRequest(commitRequest(false), callback); + sendMethod.accept(commitRequest(false), callback); break; case THREE_PHASE: - sendRequest(commitRequest(true), callback); + sendMethod.accept(commitRequest(true), callback); break; default: throw new IllegalArgumentException("Unhandled protocol " + maybeProtocol.get()); @@ -220,8 +279,35 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction { } @Override - void handleForwardedRemoteRequest(final TransactionRequest request, - final @Nullable Consumer> callback) { + void handleReplayedLocalRequest(final AbstractLocalTransactionRequest request, + final Consumer> callback, final long now) { + if (request instanceof CommitLocalTransactionRequest) { + enqueueRequest(rebaseCommit((CommitLocalTransactionRequest)request), callback, now); + } else { + super.handleReplayedLocalRequest(request, callback, now); + } + } + + @Override + void handleReplayedRemoteRequest(final TransactionRequest request, + final Consumer> callback, final long enqueuedTicks) { + LOG.debug("Applying replayed request {}", request); + + if (request instanceof TransactionPreCommitRequest) { + enqueueRequest(new TransactionPreCommitRequest(getIdentifier(), nextSequence(), localActor()), callback, + enqueuedTicks); + } else if (request instanceof TransactionDoCommitRequest) { + enqueueRequest(new TransactionDoCommitRequest(getIdentifier(), nextSequence(), localActor()), callback, + enqueuedTicks); + } else if (request instanceof TransactionAbortRequest) { + enqueueDoAbort(callback, enqueuedTicks); + } else { + super.handleReplayedRemoteRequest(request, callback, enqueuedTicks); + } + } + + @Override + void handleForwardedRemoteRequest(final TransactionRequest request, final Consumer> callback) { LOG.debug("Applying forwarded request {}", request); if (request instanceof TransactionPreCommitRequest) { @@ -229,7 +315,7 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction { } else if (request instanceof TransactionDoCommitRequest) { sendRequest(new TransactionDoCommitRequest(getIdentifier(), nextSequence(), localActor()), callback); } else if (request instanceof TransactionAbortRequest) { - sendAbort(callback); + sendDoAbort(callback); } else { super.handleForwardedRemoteRequest(request, callback); } @@ -239,12 +325,19 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction { void forwardToLocal(final LocalProxyTransaction successor, final TransactionRequest request, final Consumer> callback) { if (request instanceof CommitLocalTransactionRequest) { - Verify.verify(successor instanceof LocalReadWriteProxyTransaction); - ((LocalReadWriteProxyTransaction) successor).sendCommit((CommitLocalTransactionRequest)request, callback); - LOG.debug("Forwarded request {} to successor {}", request, successor); + verifyLocalReadWrite(successor).sendRebased((CommitLocalTransactionRequest)request, callback); + } else if (request instanceof ModifyTransactionRequest) { + verifyLocalReadWrite(successor).handleForwardedRemoteRequest(request, callback); } else { super.forwardToLocal(successor, request, callback); + return; } + LOG.debug("Forwarded request {} to successor {}", request, successor); + } + + private static LocalReadWriteProxyTransaction verifyLocalReadWrite(final LocalProxyTransaction successor) { + Verify.verify(successor instanceof LocalReadWriteProxyTransaction, "Unexpected successor %s", successor); + return (LocalReadWriteProxyTransaction) successor; } @Override @@ -253,23 +346,37 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction { closedException = this::abortedException; } - private CursorAwareDataTreeModification getModification() { + @Override + void enqueueAbort(final TransactionRequest request, final Consumer> callback, + final long enqueuedTicks) { + super.enqueueAbort(request, callback, enqueuedTicks); + closedException = this::abortedException; + } + + private @NonNull CursorAwareDataTreeModification getModification() { if (closedException != null) { throw closedException.get(); } - return modification; + return Preconditions.checkNotNull(modification, "Transaction %s is DONE", getIdentifier()); + } + + private void sendRebased(final CommitLocalTransactionRequest request, final Consumer> callback) { + sendRequest(rebaseCommit(request), callback); } - private void sendCommit(final CommitLocalTransactionRequest request, final Consumer> callback) { + private CommitLocalTransactionRequest rebaseCommit(final CommitLocalTransactionRequest request) { // Rebase old modification on new data tree. final CursorAwareDataTreeModification mod = getModification(); - try (DataTreeModificationCursor cursor = mod.createCursor(YangInstanceIdentifier.EMPTY)) { + try (DataTreeModificationCursor cursor = mod.openCursor()) { request.getModification().applyToCursor(cursor); } - ensureSealed(); - sendRequest(commitRequest(request.isCoordinated()), callback); + if (markSealed()) { + sealOnly(); + } + + return commitRequest(request.isCoordinated()); } }