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%2FShard.java;h=43a9faa3e44e5d6fe77db7cce74929f8888dcadb;hp=c329a10c0408072677bb39d9994c5ce158c74cb0;hb=be324821e7ef3dba64375e74b920b7ab513c42e3;hpb=efbeac00372d85440d46e2e5e04b124036ad3721 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 c329a10c04..43a9faa3e4 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 @@ -15,9 +15,13 @@ import akka.event.Logging; import akka.event.LoggingAdapter; import akka.japi.Creator; 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 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; @@ -41,14 +45,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; @@ -87,17 +92,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"); @@ -105,16 +114,20 @@ 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(Map peerAddresses){ - Map map = new HashMap<>(); + private static Map mapPeerAddresses( + Map peerAddresses) { + Map map = new HashMap<>(); - for(Map.Entry entry : peerAddresses.entrySet()){ + for (Map.Entry entry : peerAddresses + .entrySet()) { map.put(entry.getKey().toString(), entry.getValue()); } @@ -123,21 +136,14 @@ public class Shard extends RaftActor { 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(datastoreContext, "shardContext should not be null"); - return Props.create(new Creator() { - - @Override - public Shard create() throws Exception { - return new Shard(name, peerAddresses, dataStoreProperties); - } - - }); + return Props.create(new ShardCreator(name, peerAddresses, datastoreContext)); } - @Override public void onReceiveCommand(Object message) { LOG.debug("Received message {} from {}", message.getClass().toString(), getSender()); @@ -164,23 +170,24 @@ public class Shard extends RaftActor { } } else if (message instanceof PeerAddressResolved) { PeerAddressResolved resolved = (PeerAddressResolved) message; - setPeerAddress(resolved.getPeerId().toString(), resolved.getPeerAddress()); + setPeerAddress(resolved.getPeerId().toString(), + resolved.getPeerAddress()); } else { super.onReceiveCommand(message); } } private ActorRef createTypedTransactionActor( - CreateTransaction createTransaction, ShardTransactionIdentifier transactionId) { + CreateTransaction createTransaction, + ShardTransactionIdentifier transactionId) { if (createTransaction.getTransactionType() == TransactionProxy.TransactionType.READ_ONLY.ordinal()) { 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()) { @@ -188,9 +195,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() @@ -199,28 +205,29 @@ 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 { - // FIXME: This does not seem right throw new IllegalArgumentException( - "CreateTransaction message has unidentified transaction type=" + "Shard="+name + ":CreateTransaction message has unidentified transaction type=" + createTransaction.getTransactionType()); } } private void createTransaction(CreateTransaction createTransaction) { - ShardTransactionIdentifier transactionId = ShardTransactionIdentifier.builder().remoteTransactionId(createTransaction.getTransactionId()).build(); + ShardTransactionIdentifier transactionId = + ShardTransactionIdentifier.builder() + .remoteTransactionId(createTransaction.getTransactionId()) + .build(); LOG.debug("Creating transaction : {} ", transactionId); ActorRef transactionActor = createTypedTransactionActor(createTransaction, transactionId); getSender() .tell(new CreateTransactionReply( - Serialization.serializedActorPath(transactionActor), - createTransaction.getTransactionId()).toSerializable(), + Serialization.serializedActorPath(transactionActor), + createTransaction.getTransactionId()).toSerializable(), getSelf()); } @@ -255,22 +262,23 @@ public class Shard extends RaftActor { final ListenableFuture future = cohort.commit(); final ActorRef self = getSelf(); - future.addListener(new Runnable() { + + Futures.addCallback(future, new FutureCallback() { @Override - public void run() { - try { - future.get(); - sender - .tell(new CommitTransactionReply().toSerializable(), - self); - shardMBean.incrementCommittedTransactionCount(); - shardMBean.setLastCommittedTransactionTime(new Date()); - } catch (InterruptedException | ExecutionException e) { - shardMBean.incrementFailedTransactionsCount(); - sender.tell(new akka.actor.Status.Failure(e),self); - } + public void onSuccess(Void v) { + sender.tell(new CommitTransactionReply().toSerializable(),self); + shardMBean.incrementCommittedTransactionCount(); + shardMBean.setLastCommittedTransactionTime(new Date()); } - }, getContext().dispatcher()); + + @Override + public void onFailure(Throwable t) { + LOG.error(t, "An exception happened during commit"); + shardMBean.incrementFailedTransactionsCount(); + sender.tell(new akka.actor.Status.Failure(t), self); + } + }); + } private void handleForwardedCommit(ForwardedCommitTransaction message) { @@ -316,12 +324,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( @@ -329,7 +335,7 @@ public class Shard extends RaftActor { LOG.debug( "registerDataChangeListener sending reply, listenerRegistrationPath = {} " - , listenerRegistration.path().toString()); + , listenerRegistration.path().toString()); getSender() .tell(new RegisterChangeListenerReply(listenerRegistration.path()), @@ -338,12 +344,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()); } @@ -370,7 +373,7 @@ public class Shard extends RaftActor { // Update stats ReplicatedLogEntry lastLogEntry = getLastLogEntry(); - if(lastLogEntry != null){ + if (lastLogEntry != null) { shardMBean.setLastLogIndex(lastLogEntry.getIndex()); shardMBean.setLastLogTerm(lastLogEntry.getTerm()); } @@ -415,4 +418,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); + } + } }