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%2FShardTransaction.java;h=9e50f17d19b99d4677e0253f2062bf518c51daab;hp=c2a05a6d6130a3d3b28dd9879eebef70dcaf9e65;hb=987e2e706d0b343304142626bc870f3e8c909b51;hpb=5db008370b529e46305931f94e937f8b332ec299
diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java
index c2a05a6d61..9e50f17d19 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardTransaction.java
@@ -5,16 +5,17 @@
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.controller.cluster.datastore;
+import static java.util.Objects.requireNonNull;
+
import akka.actor.ActorRef;
import akka.actor.PoisonPill;
import akka.actor.Props;
import akka.actor.ReceiveTimeout;
import akka.japi.Creator;
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
import org.opendaylight.controller.cluster.common.actor.AbstractUntypedActorWithMetering;
import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats;
import org.opendaylight.controller.cluster.datastore.messages.CloseTransaction;
@@ -23,38 +24,30 @@ import org.opendaylight.controller.cluster.datastore.messages.DataExists;
import org.opendaylight.controller.cluster.datastore.messages.DataExistsReply;
import org.opendaylight.controller.cluster.datastore.messages.ReadData;
import org.opendaylight.controller.cluster.datastore.messages.ReadDataReply;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
+import org.opendaylight.mdsal.common.api.ReadFailedException;
import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
/**
- * The ShardTransaction Actor represents a remote transaction
- *
- * The ShardTransaction Actor delegates all actions to DOMDataReadWriteTransaction
- *
- *
- * Handles Messages
- * ----------------
- *
{@link org.opendaylight.controller.cluster.datastore.messages.ReadData}
- * {@link org.opendaylight.controller.cluster.datastore.messages.CloseTransaction}
- *
+ * The ShardTransaction Actor represents a remote transaction that delegates all actions to DOMDataReadWriteTransaction.
*/
public abstract class ShardTransaction extends AbstractUntypedActorWithMetering {
private final ActorRef shardActor;
private final ShardStats shardStats;
- private final String transactionID;
+ private final TransactionIdentifier transactionId;
- protected ShardTransaction(ActorRef shardActor, ShardStats shardStats, String transactionID) {
- super("shard-tx"); //actor name override used for metering. This does not change the "real" actor name
+ protected ShardTransaction(final ActorRef shardActor, final ShardStats shardStats,
+ final TransactionIdentifier transactionId) {
+ // actor name override used for metering. This does not change the "real" actor name
+ super("shard-tx");
this.shardActor = shardActor;
this.shardStats = shardStats;
- this.transactionID = Preconditions.checkNotNull(transactionID);
+ this.transactionId = requireNonNull(transactionId);
}
- public static Props props(TransactionType type, AbstractShardDataTreeTransaction transaction, ActorRef shardActor,
- DatastoreContext datastoreContext, ShardStats shardStats, String transactionID) {
- return Props.create(new ShardTransactionCreator(type, transaction, shardActor,
- datastoreContext, shardStats, transactionID));
+ public static Props props(final TransactionType type, final AbstractShardDataTreeTransaction transaction,
+ final ActorRef shardActor, final DatastoreContext datastoreContext, final ShardStats shardStats) {
+ return Props.create(ShardTransaction.class,
+ new ShardTransactionCreator(type, transaction, shardActor, datastoreContext, shardStats));
}
protected abstract AbstractShardDataTreeTransaction getDOMStoreTransaction();
@@ -63,16 +56,16 @@ public abstract class ShardTransaction extends AbstractUntypedActorWithMetering
return shardActor;
}
- protected String getTransactionID() {
- return transactionID;
+ protected final TransactionIdentifier getTransactionId() {
+ return transactionId;
}
@Override
- public void handleReceive(Object message) {
+ public void handleReceive(final Object message) {
if (CloseTransaction.isSerializedType(message)) {
closeTransaction(true);
} else if (message instanceof ReceiveTimeout) {
- LOG.debug("Got ReceiveTimeout for inactivity - closing transaction {}", transactionID);
+ LOG.debug("Got ReceiveTimeout for inactivity - closing transaction {}", transactionId);
closeTransaction(false);
} else {
unknownMessage(message);
@@ -83,37 +76,38 @@ public abstract class ShardTransaction extends AbstractUntypedActorWithMetering
return true;
}
- private void closeTransaction(boolean sendReply) {
- getDOMStoreTransaction().abort();
+ private void closeTransaction(final boolean sendReply) {
+ getDOMStoreTransaction().abortFromTransactionActor();
- if(sendReply && returnCloseTransactionReply()) {
+ if (sendReply && returnCloseTransactionReply()) {
getSender().tell(new CloseTransactionReply(), getSelf());
}
getSelf().tell(PoisonPill.getInstance(), getSelf());
}
- private boolean checkClosed(AbstractShardDataTreeTransaction transaction) {
+ private boolean checkClosed(final AbstractShardDataTreeTransaction transaction) {
final boolean ret = transaction.isClosed();
if (ret) {
shardStats.incrementFailedReadTransactionsCount();
- getSender().tell(new akka.actor.Status.Failure(new ReadFailedException("Transaction is closed")), getSelf());
+ getSender().tell(new akka.actor.Status.Failure(new ReadFailedException("Transaction is closed")),
+ getSelf());
}
return ret;
}
- protected void readData(AbstractShardDataTreeTransaction transaction, ReadData message) {
+ protected void readData(final AbstractShardDataTreeTransaction transaction, final ReadData message) {
if (checkClosed(transaction)) {
return;
}
final YangInstanceIdentifier path = message.getPath();
- Optional> optional = transaction.getSnapshot().readNode(path);
- ReadDataReply readDataReply = new ReadDataReply(optional.orNull(), message.getVersion());
+ ReadDataReply readDataReply = new ReadDataReply(transaction.getSnapshot().readNode(path).orElse(null),
+ message.getVersion());
sender().tell(readDataReply.toSerializable(), self());
}
- protected void dataExists(AbstractShardDataTreeTransaction transaction, DataExists message) {
+ protected void dataExists(final AbstractShardDataTreeTransaction transaction, final DataExists message) {
if (checkClosed(transaction)) {
return;
}
@@ -123,6 +117,8 @@ public abstract class ShardTransaction extends AbstractUntypedActorWithMetering
getSender().tell(new DataExistsReply(exists, message.getVersion()).toSerializable(), getSelf());
}
+ @SuppressFBWarnings(value = "SE_BAD_FIELD", justification = "Some fields are not Serializable but we don't "
+ + "create remote instances of this actor and thus don't need it to be Serializable.")
private static class ShardTransactionCreator implements Creator {
private static final long serialVersionUID = 1L;
@@ -131,37 +127,34 @@ public abstract class ShardTransaction extends AbstractUntypedActorWithMetering
final ActorRef shardActor;
final DatastoreContext datastoreContext;
final ShardStats shardStats;
- final String transactionID;
final TransactionType type;
- ShardTransactionCreator(TransactionType type, AbstractShardDataTreeTransaction transaction, ActorRef shardActor,
- DatastoreContext datastoreContext, ShardStats shardStats, String transactionID) {
- this.transaction = Preconditions.checkNotNull(transaction);
+ ShardTransactionCreator(final TransactionType type, final AbstractShardDataTreeTransaction transaction,
+ final ActorRef shardActor, final DatastoreContext datastoreContext, final ShardStats shardStats) {
+ this.transaction = requireNonNull(transaction);
this.shardActor = shardActor;
this.shardStats = shardStats;
this.datastoreContext = datastoreContext;
- this.transactionID = Preconditions.checkNotNull(transactionID);
this.type = type;
}
@Override
- public ShardTransaction create() throws Exception {
+ public ShardTransaction create() {
final ShardTransaction tx;
switch (type) {
- case READ_ONLY:
- tx = new ShardReadTransaction(transaction, shardActor,
- shardStats, transactionID);
- break;
- case READ_WRITE:
- tx = new ShardReadWriteTransaction((ReadWriteShardDataTreeTransaction)transaction,
- shardActor, shardStats, transactionID);
- break;
- case WRITE_ONLY:
- tx = new ShardWriteTransaction((ReadWriteShardDataTreeTransaction)transaction,
- shardActor, shardStats, transactionID);
- break;
- default:
- throw new IllegalArgumentException("Unhandled transaction type " + type);
+ case READ_ONLY:
+ tx = new ShardReadTransaction(transaction, shardActor, shardStats);
+ break;
+ case READ_WRITE:
+ tx = new ShardReadWriteTransaction((ReadWriteShardDataTreeTransaction)transaction, shardActor,
+ shardStats);
+ break;
+ case WRITE_ONLY:
+ tx = new ShardWriteTransaction((ReadWriteShardDataTreeTransaction)transaction, shardActor,
+ shardStats);
+ break;
+ default:
+ throw new IllegalArgumentException("Unhandled transaction type " + type);
}
tx.getContext().setReceiveTimeout(datastoreContext.getShardTransactionIdleTimeout());