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=bb676e3757e5038d49dcbfb56a745e8e27d11fa5;hp=3b0e0934d9b67c6a18fde38edeb27ae7e92e52f4;hb=818258c2370c687de93edc887b32019d25c34095;hpb=be2ae0c277e83381bff2cc71cb8244646236aa47 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 3b0e0934d9..bb676e3757 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 @@ -15,32 +15,18 @@ import akka.actor.ReceiveTimeout; import akka.japi.Creator; import com.google.common.base.Optional; import com.google.common.util.concurrent.CheckedFuture; +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.ShardMBeanFactory; +import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats; import org.opendaylight.controller.cluster.datastore.messages.CloseTransaction; import org.opendaylight.controller.cluster.datastore.messages.CloseTransactionReply; import org.opendaylight.controller.cluster.datastore.messages.DataExists; import org.opendaylight.controller.cluster.datastore.messages.DataExistsReply; -import org.opendaylight.controller.cluster.datastore.messages.DeleteData; -import org.opendaylight.controller.cluster.datastore.messages.DeleteDataReply; -import org.opendaylight.controller.cluster.datastore.messages.MergeData; -import org.opendaylight.controller.cluster.datastore.messages.MergeDataReply; import org.opendaylight.controller.cluster.datastore.messages.ReadData; import org.opendaylight.controller.cluster.datastore.messages.ReadDataReply; -import org.opendaylight.controller.cluster.datastore.messages.ReadyTransaction; -import org.opendaylight.controller.cluster.datastore.messages.ReadyTransactionReply; -import org.opendaylight.controller.cluster.datastore.messages.WriteData; -import org.opendaylight.controller.cluster.datastore.messages.WriteDataReply; -import org.opendaylight.controller.cluster.datastore.modification.CompositeModification; -import org.opendaylight.controller.cluster.datastore.modification.DeleteModification; -import org.opendaylight.controller.cluster.datastore.modification.ImmutableCompositeModification; -import org.opendaylight.controller.cluster.datastore.modification.MergeModification; -import org.opendaylight.controller.cluster.datastore.modification.MutableCompositeModification; -import org.opendaylight.controller.cluster.datastore.modification.WriteModification; 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.DOMStoreThreePhaseCommitCohort; 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; @@ -69,40 +55,51 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; *
  • {@link org.opendaylight.controller.cluster.datastore.messages.CloseTransaction} *

    */ -public abstract class ShardTransaction extends AbstractUntypedActor { +public abstract class ShardTransaction extends AbstractUntypedActorWithMetering { private final ActorRef shardActor; - protected final SchemaContext schemaContext; - private final String shardName; - - - private final MutableCompositeModification modification = new MutableCompositeModification(); + private final SchemaContext schemaContext; + private final ShardStats shardStats; + private final String transactionID; protected ShardTransaction(ActorRef shardActor, SchemaContext schemaContext, - String shardName) { + ShardStats shardStats, String transactionID) { + super("shard-tx"); //actor name override used for metering. This does not change the "real" actor name this.shardActor = shardActor; this.schemaContext = schemaContext; - this.shardName = shardName; + this.shardStats = shardStats; + this.transactionID = transactionID; } public static Props props(DOMStoreTransaction transaction, ActorRef shardActor, - SchemaContext schemaContext,DatastoreContext datastoreContext, String shardName) { + SchemaContext schemaContext,DatastoreContext datastoreContext, ShardStats shardStats, + String transactionID) { return Props.create(new ShardTransactionCreator(transaction, shardActor, schemaContext, - datastoreContext, shardName)); + datastoreContext, shardStats, transactionID)); } protected abstract DOMStoreTransaction getDOMStoreTransaction(); + protected ActorRef getShardActor() { + return shardActor; + } + + protected String getTransactionID() { + return transactionID; + } + + protected SchemaContext getSchemaContext() { + return schemaContext; + } + @Override public void handleReceive(Object message) throws Exception { if (message.getClass().equals(CloseTransaction.SERIALIZABLE_CLASS)) { closeTransaction(true); - } else if (message instanceof GetCompositedModification) { - // This is here for testing only - getSender().tell(new GetCompositeModificationReply( - new ImmutableCompositeModification(modification)), getSelf()); } else if (message instanceof ReceiveTimeout) { - LOG.debug("Got ReceiveTimeout for inactivity - closing Tx"); + if(LOG.isDebugEnabled()) { + LOG.debug("Got ReceiveTimeout for inactivity - closing Tx"); + } closeTransaction(false); } else { throw new UnknownMessageException(message); @@ -137,7 +134,7 @@ public abstract class ShardTransaction extends AbstractUntypedActor { sender.tell(new ReadDataReply(schemaContext,null).toSerializable(), self); } } catch (Exception e) { - ShardMBeanFactory.getShardStatsMBean(shardName).incrementFailedReadTransactionsCount(); + shardStats.incrementFailedReadTransactionsCount(); sender.tell(new akka.actor.Status.Failure(e), self); } @@ -157,51 +154,6 @@ public abstract class ShardTransaction extends AbstractUntypedActor { } - protected void writeData(DOMStoreWriteTransaction transaction, WriteData message) { - modification.addModification( - new WriteModification(message.getPath(), message.getData(),schemaContext)); - LOG.debug("writeData at path : " + message.getPath().toString()); - - try { - transaction.write(message.getPath(), message.getData()); - getSender().tell(new WriteDataReply().toSerializable(), getSelf()); - }catch(Exception e){ - getSender().tell(new akka.actor.Status.Failure(e), getSelf()); - } - } - - protected void mergeData(DOMStoreWriteTransaction transaction, MergeData message) { - modification.addModification( - new MergeModification(message.getPath(), message.getData(), schemaContext)); - LOG.debug("mergeData at path : " + message.getPath().toString()); - try { - transaction.merge(message.getPath(), message.getData()); - getSender().tell(new MergeDataReply().toSerializable(), getSelf()); - }catch(Exception e){ - getSender().tell(new akka.actor.Status.Failure(e), getSelf()); - } - } - - protected void deleteData(DOMStoreWriteTransaction transaction, DeleteData message) { - LOG.debug("deleteData at path : " + message.getPath().toString()); - modification.addModification(new DeleteModification(message.getPath())); - try { - transaction.delete(message.getPath()); - getSender().tell(new DeleteDataReply().toSerializable(), getSelf()); - }catch(Exception e){ - getSender().tell(new akka.actor.Status.Failure(e), getSelf()); - } - } - - protected void readyTransaction(DOMStoreWriteTransaction transaction, ReadyTransaction message) { - DOMStoreThreePhaseCommitCohort cohort = transaction.ready(); - ActorRef cohortActor = getContext().actorOf( - ThreePhaseCommitCohort.props(cohort, shardActor, modification, shardName), "cohort"); - getSender() - .tell(new ReadyTransactionReply(cohortActor.path()).toSerializable(), getSelf()); - - } - private static class ShardTransactionCreator implements Creator { private static final long serialVersionUID = 1L; @@ -210,15 +162,18 @@ public abstract class ShardTransaction extends AbstractUntypedActor { final ActorRef shardActor; final SchemaContext schemaContext; final DatastoreContext datastoreContext; - final String shardName; + final ShardStats shardStats; + final String transactionID; ShardTransactionCreator(DOMStoreTransaction transaction, ActorRef shardActor, - SchemaContext schemaContext, DatastoreContext datastoreContext, String shardName) { + SchemaContext schemaContext, DatastoreContext datastoreContext, + ShardStats shardStats, String transactionID) { this.transaction = transaction; this.shardActor = shardActor; - this.shardName = shardName; + this.shardStats = shardStats; this.schemaContext = schemaContext; this.datastoreContext = datastoreContext; + this.transactionID = transactionID; } @Override @@ -226,37 +181,17 @@ public abstract class ShardTransaction extends AbstractUntypedActor { ShardTransaction tx; if(transaction instanceof DOMStoreReadWriteTransaction) { tx = new ShardReadWriteTransaction((DOMStoreReadWriteTransaction)transaction, - shardActor, schemaContext, shardName); + shardActor, schemaContext, shardStats, transactionID); } else if(transaction instanceof DOMStoreReadTransaction) { tx = new ShardReadTransaction((DOMStoreReadTransaction)transaction, shardActor, - schemaContext, shardName); + schemaContext, shardStats, transactionID); } else { tx = new ShardWriteTransaction((DOMStoreWriteTransaction)transaction, - shardActor, schemaContext, shardName); + shardActor, schemaContext, shardStats, transactionID); } tx.getContext().setReceiveTimeout(datastoreContext.getShardTransactionIdleTimeout()); return tx; } } - - // These classes are in here for test purposes only - - static class GetCompositedModification { - } - - - static class GetCompositeModificationReply { - private final CompositeModification modification; - - - GetCompositeModificationReply(CompositeModification modification) { - this.modification = modification; - } - - - public CompositeModification getModification() { - return modification; - } - } }