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=3407da7eab4aa5c11a758f5c0ae039abd154e855;hpb=e5d320150e9cb40c338bf27f31a636fa5207d3eb;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 3407da7eab..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 javax.annotation.Nullable;
-import javax.annotation.concurrent.NotThreadSafe;
+import java.util.function.Supplier;
+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;
@@ -22,7 +28,6 @@ import org.opendaylight.controller.cluster.access.commands.TransactionDoCommitRe
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.Response;
@@ -41,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
@@ -54,17 +59,40 @@ import org.slf4j.LoggerFactory;
*
* @author Robert Varga
*/
-@NotThreadSafe
final class LocalReadWriteProxyTransaction extends LocalProxyTransaction {
private static final Logger LOG = LoggerFactory.getLogger(LocalReadWriteProxyTransaction.class);
- private CursorAwareDataTreeModification modification;
+ /**
+ * This field needs to be accessed via {@link #getModification()}, which performs state checking to ensure
+ * the modification can actually be accessed.
+ */
+ private final CursorAwareDataTreeModification modification;
+
+ private Supplier extends RuntimeException> closedException;
+
private CursorAwareDataTreeModification sealedModification;
+ /**
+ * Recorded failure from previous operations. Normally we would want to propagate the error directly to the
+ * offending call site, but that exposes inconsistency in behavior during initial connection, when we go through
+ * {@link RemoteProxyTransaction}, which detects this sort of issues at canCommit/directCommit time on the backend.
+ *
+ *
+ * We therefore do not report incurred exceptions directly, but report them once the user attempts to commit
+ * this transaction.
+ */
+ private Exception recordedFailure;
+
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
@@ -74,22 +102,61 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction {
@Override
CursorAwareDataTreeSnapshot readOnlyView() {
- return modification;
+ return getModification();
}
@Override
+ @SuppressWarnings("checkstyle:IllegalCatch")
void doDelete(final YangInstanceIdentifier path) {
- modification.delete(path);
+ final CursorAwareDataTreeModification mod = getModification();
+ if (recordedFailure != null) {
+ LOG.debug("Transaction {} recorded failure, ignoring delete of {}", getIdentifier(), path);
+ return;
+ }
+
+ try {
+ mod.delete(path);
+ } catch (Exception e) {
+ LOG.debug("Transaction {} delete on {} incurred failure, delaying it until commit", getIdentifier(), path,
+ e);
+ recordedFailure = e;
+ }
}
@Override
+ @SuppressWarnings("checkstyle:IllegalCatch")
void doMerge(final YangInstanceIdentifier path, final NormalizedNode, ?> data) {
- modification.merge(path, data);
+ final CursorAwareDataTreeModification mod = getModification();
+ if (recordedFailure != null) {
+ LOG.debug("Transaction {} recorded failure, ignoring merge to {}", getIdentifier(), path);
+ return;
+ }
+
+ 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
+ @SuppressWarnings("checkstyle:IllegalCatch")
void doWrite(final YangInstanceIdentifier path, final NormalizedNode, ?> data) {
- modification.write(path, data);
+ final CursorAwareDataTreeModification mod = getModification();
+ if (recordedFailure != null) {
+ LOG.debug("Transaction {} recorded failure, ignoring write to {}", getIdentifier(), path);
+ return;
+ }
+
+ 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() {
@@ -102,36 +169,55 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction {
@Override
CommitLocalTransactionRequest commitRequest(final boolean coordinated) {
+ final CursorAwareDataTreeModification mod = getModification();
final CommitLocalTransactionRequest ret = new CommitLocalTransactionRequest(getIdentifier(), nextSequence(),
- localActor(), modification, coordinated);
- modification = new FailedDataTreeModification(this::submittedException);
+ localActor(), mod, recordedFailure, coordinated);
+ closedException = this::submittedException;
return ret;
}
+ private void sealModification() {
+ Preconditions.checkState(sealedModification == null, "Transaction %s is already sealed", this);
+ final CursorAwareDataTreeModification mod = getModification();
+ mod.ready();
+ sealedModification = mod;
+ }
+
@Override
- void doSeal() {
- modification.ready();
- sealedModification = modification;
+ boolean sealOnly() {
+ sealModification();
+ return super.sealOnly();
}
@Override
- void flushState(final AbstractProxyTransaction successor) {
+ 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() {
@@ -140,37 +226,51 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction {
}
@Override
- void applyModifyTransactionRequest(final ModifyTransactionRequest request,
- final @Nullable Consumer> callback) {
- for (TransactionModification mod : request.getModifications()) {
+ 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) {
- modification.write(mod.getPath(), ((TransactionWrite)mod).getData());
+ write(mod.getPath(), ((TransactionWrite)mod).getData());
} else if (mod instanceof TransactionMerge) {
- modification.merge(mod.getPath(), ((TransactionMerge)mod).getData());
+ merge(mod.getPath(), ((TransactionMerge)mod).getData());
} else if (mod instanceof TransactionDelete) {
- modification.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());
@@ -179,58 +279,45 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction {
}
@Override
- void handleForwardedRemoteRequest(final TransactionRequest> request,
- final @Nullable Consumer> callback) {
- LOG.debug("Applying forwarded request {}", request);
+ 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) {
- sendRequest(new TransactionPreCommitRequest(getIdentifier(), nextSequence(), localActor()), callback);
+ enqueueRequest(new TransactionPreCommitRequest(getIdentifier(), nextSequence(), localActor()), callback,
+ enqueuedTicks);
} else if (request instanceof TransactionDoCommitRequest) {
- sendRequest(new TransactionDoCommitRequest(getIdentifier(), nextSequence(), localActor()), callback);
+ enqueueRequest(new TransactionDoCommitRequest(getIdentifier(), nextSequence(), localActor()), callback,
+ enqueuedTicks);
} else if (request instanceof TransactionAbortRequest) {
- sendAbort(callback);
+ enqueueDoAbort(callback, enqueuedTicks);
} else {
- super.handleForwardedRemoteRequest(request, callback);
+ super.handleReplayedRemoteRequest(request, callback, enqueuedTicks);
}
}
@Override
- void forwardToRemote(final RemoteProxyTransaction successor, final TransactionRequest> request,
- final Consumer> callback) {
- if (request instanceof CommitLocalTransactionRequest) {
- final CommitLocalTransactionRequest req = (CommitLocalTransactionRequest) request;
- final DataTreeModification mod = req.getModification();
-
- LOG.debug("Applying modification {} to successor {}", mod, successor);
- mod.applyToCursor(new AbstractDataTreeModificationCursor() {
- @Override
- public void write(final PathArgument child, final NormalizedNode, ?> data) {
- successor.write(current().node(child), data);
- }
-
- @Override
- public void merge(final PathArgument child, final NormalizedNode, ?> data) {
- successor.merge(current().node(child), data);
- }
-
- @Override
- public void delete(final PathArgument child) {
- successor.delete(current().node(child));
- }
- });
-
- 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();
+ void handleForwardedRemoteRequest(final TransactionRequest> request, final Consumer> callback) {
+ LOG.debug("Applying forwarded request {}", request);
+
+ 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) {
+ sendDoAbort(callback);
} else {
- throw new IllegalArgumentException("Unhandled request" + request);
+ super.handleForwardedRemoteRequest(request, callback);
}
}
@@ -238,27 +325,58 @@ 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
void sendAbort(final TransactionRequest> request, final Consumer> callback) {
super.sendAbort(request, callback);
- modification = new FailedDataTreeModification(this::abortedException);
+ closedException = this::abortedException;
+ }
+
+ @Override
+ void enqueueAbort(final TransactionRequest> request, final Consumer> callback,
+ final long enqueuedTicks) {
+ super.enqueueAbort(request, callback, enqueuedTicks);
+ closedException = this::abortedException;
}
- private void sendCommit(final CommitLocalTransactionRequest request, final Consumer> callback) {
+ private @NonNull CursorAwareDataTreeModification getModification() {
+ if (closedException != null) {
+ throw closedException.get();
+ }
+
+ return Preconditions.checkNotNull(modification, "Transaction %s is DONE", getIdentifier());
+ }
+
+ private void sendRebased(final CommitLocalTransactionRequest request, final Consumer> callback) {
+ sendRequest(rebaseCommit(request), callback);
+ }
+
+ private CommitLocalTransactionRequest rebaseCommit(final CommitLocalTransactionRequest request) {
// Rebase old modification on new data tree.
- try (DataTreeModificationCursor cursor = modification.createCursor(YangInstanceIdentifier.EMPTY)) {
+ final CursorAwareDataTreeModification mod = getModification();
+
+ try (DataTreeModificationCursor cursor = mod.openCursor()) {
request.getModification().applyToCursor(cursor);
}
- ensureSealed();
- sendRequest(commitRequest(request.isCoordinated()), callback);
+ if (markSealed()) {
+ sealOnly();
+ }
+
+ return commitRequest(request.isCoordinated());
}
}