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=1f1e394932832278cbf0f80edc2936647a292cd6;hb=abaef4a5ae37f27542155457fe7306a4662b1eeb;hp=eee4fd0e137f714b86d24c3279d717c9c323a051;hpb=31316f39aecc6bad171de539292ff5d7f4743419;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 eee4fd0e13..1f1e394932 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
@@ -10,16 +10,17 @@ 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.Nonnull;
-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;
@@ -45,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
@@ -58,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);
@@ -125,7 +125,7 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction {
@Override
@SuppressWarnings("checkstyle:IllegalCatch")
- void doMerge(final YangInstanceIdentifier path, final NormalizedNode, ?> data) {
+ void doMerge(final YangInstanceIdentifier path, final NormalizedNode data) {
final CursorAwareDataTreeModification mod = getModification();
if (recordedFailure != null) {
LOG.debug("Transaction {} recorded failure, ignoring merge to {}", getIdentifier(), path);
@@ -143,7 +143,7 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction {
@Override
@SuppressWarnings("checkstyle:IllegalCatch")
- void doWrite(final YangInstanceIdentifier path, final NormalizedNode, ?> data) {
+ void doWrite(final YangInstanceIdentifier path, final NormalizedNode data) {
final CursorAwareDataTreeModification mod = getModification();
if (recordedFailure != null) {
LOG.debug("Transaction {} recorded failure, ignoring write to {}", getIdentifier(), path);
@@ -176,32 +176,48 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction {
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);
+ public void write(final PathArgument child, final NormalizedNode 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);
+ public void merge(final PathArgument child, final NormalizedNode 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() {
@@ -211,13 +227,13 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction {
@Override
void applyForwardedModifyTransactionRequest(final ModifyTransactionRequest request,
- final @Nullable Consumer> callback) {
+ final Consumer> callback) {
commonModifyTransactionRequest(request, callback, this::sendRequest);
}
@Override
void replayModifyTransactionRequest(final ModifyTransactionRequest request,
- final @Nullable Consumer> callback, final long enqueuedTicks) {
+ final Consumer> callback, final long enqueuedTicks) {
commonModifyTransactionRequest(request, callback, (req, cb) -> enqueueRequest(req, cb, enqueuedTicks));
}
@@ -238,15 +254,17 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction {
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:
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:
sendMethod.accept(commitRequest(false), callback);
@@ -264,7 +282,7 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction {
void handleReplayedLocalRequest(final AbstractLocalTransactionRequest> request,
final Consumer> callback, final long now) {
if (request instanceof CommitLocalTransactionRequest) {
- sendCommit((CommitLocalTransactionRequest) request, callback);
+ enqueueRequest(rebaseCommit((CommitLocalTransactionRequest)request), callback, now);
} else {
super.handleReplayedLocalRequest(request, callback, now);
}
@@ -272,7 +290,7 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction {
@Override
void handleReplayedRemoteRequest(final TransactionRequest> request,
- final @Nullable Consumer> callback, final long enqueuedTicks) {
+ final Consumer> callback, final long enqueuedTicks) {
LOG.debug("Applying replayed request {}", request);
if (request instanceof TransactionPreCommitRequest) {
@@ -308,7 +326,7 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction {
final Consumer> callback) {
if (request instanceof CommitLocalTransactionRequest) {
Verify.verify(successor instanceof LocalReadWriteProxyTransaction);
- ((LocalReadWriteProxyTransaction) successor).sendCommit((CommitLocalTransactionRequest)request, callback);
+ ((LocalReadWriteProxyTransaction) successor).sendRebased((CommitLocalTransactionRequest)request, callback);
LOG.debug("Forwarded request {} to successor {}", request, successor);
} else {
super.forwardToLocal(successor, request, callback);
@@ -328,7 +346,7 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction {
closedException = this::abortedException;
}
- private @Nonnull CursorAwareDataTreeModification getModification() {
+ private @NonNull CursorAwareDataTreeModification getModification() {
if (closedException != null) {
throw closedException.get();
}
@@ -336,15 +354,22 @@ final class LocalReadWriteProxyTransaction extends LocalProxyTransaction {
return Preconditions.checkNotNull(modification, "Transaction %s is DONE", getIdentifier());
}
- private void sendCommit(final CommitLocalTransactionRequest request, final Consumer> callback) {
+ 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.
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());
}
}