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=4f59f9feb52a5da87310d8d5e442bd2ca4dcf6b8;hp=af25df13d2865ba867d6a529d3ad947101b1510a;hb=daaef05cbf70e6cbec9af181258faead6d9620a6;hpb=bfd413d87f82ee3ffed67a141a980805950a0f06 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 af25df13d2..4f59f9feb5 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 @@ -14,7 +14,7 @@ import akka.actor.Props; import akka.actor.ReceiveTimeout; import akka.japi.Creator; import com.google.common.base.Optional; -import com.google.common.util.concurrent.CheckedFuture; +import com.google.common.base.Preconditions; import org.opendaylight.controller.cluster.common.actor.AbstractUntypedActorWithMetering; import org.opendaylight.controller.cluster.datastore.exceptions.UnknownMessageException; import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats; @@ -25,13 +25,8 @@ 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.controller.sal.core.spi.data.DOMStoreReadTransaction; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreTransaction; -import org.opendaylight.controller.sal.core.spi.data.DOMStoreWriteTransaction; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; /** * The ShardTransaction Actor represents a remote transaction @@ -54,29 +49,26 @@ public abstract class ShardTransaction extends AbstractUntypedActorWithMetering protected static final boolean SERIALIZED_REPLY = true; private final ActorRef shardActor; - private final SchemaContext schemaContext; private final ShardStats shardStats; private final String transactionID; private final short clientTxVersion; - protected ShardTransaction(ActorRef shardActor, SchemaContext schemaContext, - ShardStats shardStats, String transactionID, short clientTxVersion) { + protected ShardTransaction(ActorRef shardActor, ShardStats shardStats, String transactionID, + short clientTxVersion) { super("shard-tx"); //actor name override used for metering. This does not change the "real" actor name this.shardActor = shardActor; - this.schemaContext = schemaContext; this.shardStats = shardStats; this.transactionID = transactionID; this.clientTxVersion = clientTxVersion; } - public static Props props(DOMStoreTransaction transaction, ActorRef shardActor, - SchemaContext schemaContext,DatastoreContext datastoreContext, ShardStats shardStats, - String transactionID, short txnClientVersion) { - return Props.create(new ShardTransactionCreator(transaction, shardActor, schemaContext, + public static Props props(TransactionType type, AbstractShardDataTreeTransaction transaction, ActorRef shardActor, + DatastoreContext datastoreContext, ShardStats shardStats, String transactionID, short txnClientVersion) { + return Props.create(new ShardTransactionCreator(type, transaction, shardActor, datastoreContext, shardStats, transactionID, txnClientVersion)); } - protected abstract DOMStoreTransaction getDOMStoreTransaction(); + protected abstract AbstractShardDataTreeTransaction getDOMStoreTransaction(); protected ActorRef getShardActor() { return shardActor; @@ -86,10 +78,6 @@ public abstract class ShardTransaction extends AbstractUntypedActorWithMetering return transactionID; } - protected SchemaContext getSchemaContext() { - return schemaContext; - } - protected short getClientTxVersion() { return clientTxVersion; } @@ -113,7 +101,7 @@ public abstract class ShardTransaction extends AbstractUntypedActorWithMetering } private void closeTransaction(boolean sendReply) { - getDOMStoreTransaction().close(); + getDOMStoreTransaction().abort(); if(sendReply && returnCloseTransactionReply()) { getSender().tell(CloseTransactionReply.INSTANCE.toSerializable(), getSelf()); @@ -122,75 +110,83 @@ public abstract class ShardTransaction extends AbstractUntypedActorWithMetering getSelf().tell(PoisonPill.getInstance(), getSelf()); } - protected void readData(DOMStoreReadTransaction transaction, ReadData message, - final boolean returnSerialized) { - - final YangInstanceIdentifier path = message.getPath(); - try { - final CheckedFuture>, ReadFailedException> future = transaction.read(path); - Optional> optional = future.checkedGet(); - ReadDataReply readDataReply = new ReadDataReply(optional.orNull()); + private boolean checkClosed(AbstractShardDataTreeTransaction transaction) { + final boolean ret = transaction.isClosed(); + if (ret) { + shardStats.incrementFailedReadTransactionsCount(); + getSender().tell(new akka.actor.Status.Failure(new ReadFailedException("Transaction is closed")), getSelf()); + } + return ret; + } - sender().tell((returnSerialized ? readDataReply.toSerializable(clientTxVersion): readDataReply), self()); + protected void readData(AbstractShardDataTreeTransaction transaction, ReadData message, + final boolean returnSerialized) { - } catch (Exception e) { - LOG.debug(String.format("Unexpected error reading path %s", path), e); - shardStats.incrementFailedReadTransactionsCount(); - sender().tell(new akka.actor.Status.Failure(e), self()); + if (checkClosed(transaction)) { + return; } + + final YangInstanceIdentifier path = message.getPath(); + Optional> optional = transaction.getSnapshot().readNode(path); + ReadDataReply readDataReply = new ReadDataReply(optional.orNull(), clientTxVersion); + sender().tell((returnSerialized ? readDataReply.toSerializable(): readDataReply), self()); } - protected void dataExists(DOMStoreReadTransaction transaction, DataExists message, + protected void dataExists(AbstractShardDataTreeTransaction transaction, DataExists message, final boolean returnSerialized) { - final YangInstanceIdentifier path = message.getPath(); - try { - Boolean exists = transaction.exists(path).checkedGet(); - DataExistsReply dataExistsReply = new DataExistsReply(exists); - getSender().tell(returnSerialized ? dataExistsReply.toSerializable() : - dataExistsReply, getSelf()); - } catch (ReadFailedException e) { - getSender().tell(new akka.actor.Status.Failure(e),getSelf()); + if (checkClosed(transaction)) { + return; } + final YangInstanceIdentifier path = message.getPath(); + boolean exists = transaction.getSnapshot().readNode(path).isPresent(); + DataExistsReply dataExistsReply = DataExistsReply.create(exists); + getSender().tell(returnSerialized ? dataExistsReply.toSerializable() : + dataExistsReply, getSelf()); } private static class ShardTransactionCreator implements Creator { private static final long serialVersionUID = 1L; - final DOMStoreTransaction transaction; + final AbstractShardDataTreeTransaction transaction; final ActorRef shardActor; - final SchemaContext schemaContext; final DatastoreContext datastoreContext; final ShardStats shardStats; final String transactionID; final short txnClientVersion; + final TransactionType type; - ShardTransactionCreator(DOMStoreTransaction transaction, ActorRef shardActor, - SchemaContext schemaContext, DatastoreContext datastoreContext, - ShardStats shardStats, String transactionID, short txnClientVersion) { - this.transaction = transaction; + ShardTransactionCreator(TransactionType type, AbstractShardDataTreeTransaction transaction, ActorRef shardActor, + DatastoreContext datastoreContext, ShardStats shardStats, String transactionID, short txnClientVersion) { + this.transaction = Preconditions.checkNotNull(transaction); this.shardActor = shardActor; this.shardStats = shardStats; - this.schemaContext = schemaContext; this.datastoreContext = datastoreContext; this.transactionID = transactionID; this.txnClientVersion = txnClientVersion; + this.type = type; } @Override public ShardTransaction create() throws Exception { - ShardTransaction tx; - if(transaction instanceof DOMStoreReadWriteTransaction) { - tx = new ShardReadWriteTransaction((DOMStoreReadWriteTransaction)transaction, - shardActor, schemaContext, shardStats, transactionID, txnClientVersion); - } else if(transaction instanceof DOMStoreReadTransaction) { - tx = new ShardReadTransaction((DOMStoreReadTransaction)transaction, shardActor, - schemaContext, shardStats, transactionID, txnClientVersion); - } else { - tx = new ShardWriteTransaction((DOMStoreWriteTransaction)transaction, - shardActor, schemaContext, shardStats, transactionID, txnClientVersion); + final ShardTransaction tx; + switch (type) { + case READ_ONLY: + tx = new ShardReadTransaction(transaction, shardActor, + shardStats, transactionID, txnClientVersion); + break; + case READ_WRITE: + tx = new ShardReadWriteTransaction((ReadWriteShardDataTreeTransaction)transaction, + shardActor, shardStats, transactionID, txnClientVersion); + break; + case WRITE_ONLY: + tx = new ShardWriteTransaction((ReadWriteShardDataTreeTransaction)transaction, + shardActor, shardStats, transactionID, txnClientVersion); + break; + default: + throw new IllegalArgumentException("Unhandled transaction type " + type); } tx.getContext().setReceiveTimeout(datastoreContext.getShardTransactionIdleTimeout());