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%2Fdatastore%2FShard.java;h=6a6a181b6c03ac744d02a3e8e815011d2cf99c3f;hb=2dc333588d0c15eb7f2df6223dcdcc15e05b077e;hp=75f540ade088e6bb45b10e9b92bc4af8789b0218;hpb=51e91f6bdcc88c5aa96f956e516d31dbb5e5d5e0;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java index 75f540ade0..6a6a181b6c 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/Shard.java @@ -14,12 +14,15 @@ import akka.actor.Props; import akka.event.Logging; import akka.event.LoggingAdapter; import akka.japi.Creator; +import akka.persistence.RecoveryFailure; import akka.serialization.Serialization; + import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; +import com.google.protobuf.ByteString; import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier; import org.opendaylight.controller.cluster.datastore.identifiers.ShardTransactionIdentifier; import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardMBeanFactory; @@ -43,14 +46,15 @@ import org.opendaylight.controller.cluster.raft.RaftActor; import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeListener; import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore; -import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStoreConfigProperties; import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStoreFactory; 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.DOMStoreTransactionChain; +import org.opendaylight.yangtools.concepts.ListenerRegistration; 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; + import scala.concurrent.duration.FiniteDuration; import java.util.ArrayList; @@ -89,17 +93,21 @@ public class Shard extends RaftActor { /// The name of this shard private final ShardIdentifier name; - private volatile SchemaContext schemaContext; - private final ShardStats shardMBean; private final List dataChangeListeners = new ArrayList<>(); + private final DatastoreContext datastoreContext; + + + private SchemaContext schemaContext; + private Shard(ShardIdentifier name, Map peerAddresses, - InMemoryDOMDataStoreConfigProperties dataStoreProperties) { + DatastoreContext datastoreContext) { super(name.toString(), mapPeerAddresses(peerAddresses), Optional.of(configParams)); this.name = name; + this.datastoreContext = datastoreContext; String setting = System.getProperty("shard.persistent"); @@ -107,10 +115,12 @@ public class Shard extends RaftActor { LOG.info("Shard created : {} persistent : {}", name, persistent); - store = InMemoryDOMDataStoreFactory.create(name.toString(), null, dataStoreProperties); + store = InMemoryDOMDataStoreFactory.create(name.toString(), null, + datastoreContext.getDataStoreProperties()); shardMBean = ShardMBeanFactory.getShardStatsMBean(name.toString()); + } private static Map mapPeerAddresses( @@ -125,29 +135,29 @@ public class Shard extends RaftActor { return map; } - - - public static Props props(final ShardIdentifier name, final Map peerAddresses, - final InMemoryDOMDataStoreConfigProperties dataStoreProperties) { + DatastoreContext datastoreContext) { Preconditions.checkNotNull(name, "name should not be null"); - Preconditions - .checkNotNull(peerAddresses, "peerAddresses should not be null"); + Preconditions.checkNotNull(peerAddresses, "peerAddresses should not be null"); + Preconditions.checkNotNull(datastoreContext, "shardContext should not be null"); - return Props.create(new Creator() { + return Props.create(new ShardCreator(name, peerAddresses, datastoreContext)); + } - @Override - public Shard create() throws Exception { - return new Shard(name, peerAddresses, dataStoreProperties); - } + @Override public void onReceiveRecover(Object message) { + LOG.debug("onReceiveRecover: Received message {} from {}", message.getClass().toString(), + getSender()); - }); + if (message instanceof RecoveryFailure){ + LOG.error(((RecoveryFailure) message).cause(), "Recovery failed because of this cause"); + } else { + super.onReceiveRecover(message); + } } - @Override public void onReceiveCommand(Object message) { - LOG.debug("Received message {} from {}", message.getClass().toString(), + LOG.debug("onReceiveCommand: Received message {} from {}", message.getClass().toString(), getSender()); if (message.getClass() @@ -188,9 +198,8 @@ public class Shard extends RaftActor { shardMBean.incrementReadOnlyTransactionCount(); return getContext().actorOf( - ShardTransaction - .props(store.newReadOnlyTransaction(), getSelf(), - schemaContext), transactionId.toString()); + ShardTransaction.props(store.newReadOnlyTransaction(), getSelf(), + schemaContext,datastoreContext, name.toString()), transactionId.toString()); } else if (createTransaction.getTransactionType() == TransactionProxy.TransactionType.READ_WRITE.ordinal()) { @@ -198,9 +207,8 @@ public class Shard extends RaftActor { shardMBean.incrementReadWriteTransactionCount(); return getContext().actorOf( - ShardTransaction - .props(store.newReadWriteTransaction(), getSelf(), - schemaContext), transactionId.toString()); + ShardTransaction.props(store.newReadWriteTransaction(), getSelf(), + schemaContext, datastoreContext,name.toString()), transactionId.toString()); } else if (createTransaction.getTransactionType() @@ -209,9 +217,8 @@ public class Shard extends RaftActor { shardMBean.incrementWriteOnlyTransactionCount(); return getContext().actorOf( - ShardTransaction - .props(store.newWriteOnlyTransaction(), getSelf(), - schemaContext), transactionId.toString()); + ShardTransaction.props(store.newWriteOnlyTransaction(), getSelf(), + schemaContext, datastoreContext, name.toString()), transactionId.toString()); } else { throw new IllegalArgumentException( "Shard="+name + ":CreateTransaction message has unidentified transaction type=" @@ -233,7 +240,8 @@ public class Shard extends RaftActor { .tell(new CreateTransactionReply( Serialization.serializedActorPath(transactionActor), createTransaction.getTransactionId()).toSerializable(), - getSelf()); + getSelf() + ); } private void commit(final ActorRef sender, Object serialized) { @@ -269,12 +277,14 @@ public class Shard extends RaftActor { final ActorRef self = getSelf(); Futures.addCallback(future, new FutureCallback() { + @Override public void onSuccess(Void v) { - sender.tell(new CommitTransactionReply().toSerializable(),self); - shardMBean.incrementCommittedTransactionCount(); - shardMBean.setLastCommittedTransactionTime(new Date()); + sender.tell(new CommitTransactionReply().toSerializable(), self); + shardMBean.incrementCommittedTransactionCount(); + shardMBean.setLastCommittedTransactionTime(new Date()); } + @Override public void onFailure(Throwable t) { LOG.error(t, "An exception happened during commit"); shardMBean.incrementFailedTransactionsCount(); @@ -327,12 +337,10 @@ public class Shard extends RaftActor { dataChangeListeners.add(dataChangeListenerPath); AsyncDataChangeListener> - listener = - new DataChangeListenerProxy(schemaContext, dataChangeListenerPath); + listener = new DataChangeListenerProxy(schemaContext, dataChangeListenerPath); - org.opendaylight.yangtools.concepts.ListenerRegistration>> - registration = - store.registerChangeListener(registerChangeListener.getPath(), + ListenerRegistration>> + registration = store.registerChangeListener(registerChangeListener.getPath(), listener, registerChangeListener.getScope()); ActorRef listenerRegistration = getContext().actorOf( @@ -349,12 +357,9 @@ public class Shard extends RaftActor { private void createTransactionChain() { DOMStoreTransactionChain chain = store.createTransactionChain(); - ActorRef transactionChain = - getContext().actorOf( - ShardTransactionChain.props(chain, schemaContext)); - getSender() - .tell(new CreateTransactionChainReply(transactionChain.path()) - .toSerializable(), + ActorRef transactionChain = getContext().actorOf( + ShardTransactionChain.props(chain, schemaContext, datastoreContext,name.toString() )); + getSender().tell(new CreateTransactionChainReply(transactionChain.path()).toSerializable(), getSelf()); } @@ -373,7 +378,6 @@ public class Shard extends RaftActor { identifier, clientActor.path().toString()); } - } else { LOG.error("Unknown state received {}", data); } @@ -391,11 +395,11 @@ public class Shard extends RaftActor { } - @Override protected Object createSnapshot() { + @Override protected void createSnapshot() { throw new UnsupportedOperationException("createSnapshot"); } - @Override protected void applySnapshot(Object snapshot) { + @Override protected void applySnapshot(ByteString snapshot) { throw new UnsupportedOperationException("applySnapshot"); } @@ -426,4 +430,25 @@ public class Shard extends RaftActor { return HEART_BEAT_INTERVAL; } } + + private static class ShardCreator implements Creator { + + private static final long serialVersionUID = 1L; + + final ShardIdentifier name; + final Map peerAddresses; + final DatastoreContext datastoreContext; + + ShardCreator(ShardIdentifier name, Map peerAddresses, + DatastoreContext datastoreContext) { + this.name = name; + this.peerAddresses = peerAddresses; + this.datastoreContext = datastoreContext; + } + + @Override + public Shard create() throws Exception { + return new Shard(name, peerAddresses, datastoreContext); + } + } }