X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FTransactionProxy.java;h=6183c489c4cdbc56a1ba9ac0c3c3939963277edb;hb=refs%2Fchanges%2F44%2F9944%2F5;hp=32bb7d0951964975b850c8a1a685ce7d95c03f47;hpb=0d78fea60c4818145e7bd8479427dfc04f0f8145;p=controller.git
diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java
index 32bb7d0951..6183c489c4 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/TransactionProxy.java
@@ -9,13 +9,23 @@
package org.opendaylight.controller.cluster.datastore;
import akka.actor.ActorPath;
+import akka.actor.ActorRef;
import akka.actor.ActorSelection;
+import akka.actor.Props;
+import akka.dispatch.OnComplete;
+
import com.google.common.base.Optional;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListenableFutureTask;
+import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.CheckedFuture;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.SettableFuture;
+
+import org.opendaylight.controller.cluster.datastore.identifiers.TransactionIdentifier;
import org.opendaylight.controller.cluster.datastore.messages.CloseTransaction;
import org.opendaylight.controller.cluster.datastore.messages.CreateTransaction;
import org.opendaylight.controller.cluster.datastore.messages.CreateTransactionReply;
+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.MergeData;
import org.opendaylight.controller.cluster.datastore.messages.ReadData;
@@ -23,18 +33,24 @@ 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.shardstrategy.ShardStrategyFactory;
import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
+import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction;
import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier;
+import org.opendaylight.yangtools.util.concurrent.MappingCheckedFuture;
+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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import scala.concurrent.Future;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicLong;
/**
@@ -50,7 +66,6 @@ import java.util.concurrent.atomic.AtomicLong;
*
*/
public class TransactionProxy implements DOMStoreReadWriteTransaction {
-
public enum TransactionType {
READ_ONLY,
WRITE_ONLY,
@@ -59,90 +74,137 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction {
private static final AtomicLong counter = new AtomicLong();
- private final TransactionType readOnly;
- private final ActorContext actorContext;
- private final Map remoteTransactionPaths = new HashMap<>();
- private final String identifier;
+ private static final Logger
+ LOG = LoggerFactory.getLogger(TransactionProxy.class);
+
- public TransactionProxy(
- ActorContext actorContext,
- TransactionType readOnly) {
+ private final TransactionType transactionType;
+ private final ActorContext actorContext;
+ private final Map remoteTransactionPaths = new HashMap<>();
+ private final TransactionIdentifier identifier;
+ private final SchemaContext schemaContext;
+ private boolean inReadyState;
- this.identifier = "transaction-" + counter.getAndIncrement();
- this.readOnly = readOnly;
- this.actorContext = actorContext;
+ public TransactionProxy(ActorContext actorContext, TransactionType transactionType,
+ SchemaContext schemaContext) {
+ this.actorContext = Preconditions.checkNotNull(actorContext, "actorContext should not be null");
+ this.transactionType = Preconditions.checkNotNull(transactionType, "transactionType should not be null");
+ this.schemaContext = Preconditions.checkNotNull(schemaContext, "schemaContext should not be null");
- Object response = actorContext.executeShardOperation(Shard.DEFAULT_NAME, new CreateTransaction(), ActorContext.ASK_DURATION);
- if(response instanceof CreateTransactionReply){
- CreateTransactionReply reply = (CreateTransactionReply) response;
- remoteTransactionPaths.put(Shard.DEFAULT_NAME, actorContext.actorSelection(reply.getTransactionPath()));
+ String memberName = actorContext.getCurrentMemberName();
+ if(memberName == null){
+ memberName = "UNKNOWN-MEMBER";
}
+
+ this.identifier = TransactionIdentifier.builder().memberName(memberName).counter(
+ counter.getAndIncrement()).build();
+
+ LOG.debug("Created txn {} of type {}", identifier, transactionType);
+
}
@Override
- public ListenableFuture>> read(final InstanceIdentifier path) {
- final ActorSelection remoteTransaction = remoteTransactionFromIdentifier(path);
-
- Callable>> call = new Callable() {
-
- @Override public Optional> call() throws Exception {
- Object response = actorContext
- .executeRemoteOperation(remoteTransaction, new ReadData(path),
- ActorContext.ASK_DURATION);
- if(response instanceof ReadDataReply){
- ReadDataReply reply = (ReadDataReply) response;
- //FIXME : A cast should not be required here ???
- return (Optional>) Optional.of(reply.getNormalizedNode());
- }
+ public CheckedFuture>, ReadFailedException> read(
+ final YangInstanceIdentifier path) {
- return Optional.absent();
- }
- };
+ Preconditions.checkState(transactionType != TransactionType.WRITE_ONLY,
+ "Read operation on write-only transaction is not allowed");
- ListenableFutureTask>>
- future = ListenableFutureTask.create(call);
+ LOG.debug("txn {} read {}", identifier, path);
- //FIXME : Use a thread pool here
- Executors.newSingleThreadExecutor().submit(future);
+ createTransactionIfMissing(actorContext, path);
- return future;
+ return transactionContext(path).readData(path);
}
@Override
- public void write(InstanceIdentifier path, NormalizedNode, ?> data) {
- final ActorSelection remoteTransaction = remoteTransactionFromIdentifier(path);
- remoteTransaction.tell(new WriteData(path, data), null);
+ public CheckedFuture exists(YangInstanceIdentifier path) {
+
+ Preconditions.checkState(transactionType != TransactionType.WRITE_ONLY,
+ "Exists operation on write-only transaction is not allowed");
+
+ LOG.debug("txn {} exists {}", identifier, path);
+
+ createTransactionIfMissing(actorContext, path);
+
+ return transactionContext(path).dataExists(path);
+ }
+
+ private void checkModificationState() {
+ Preconditions.checkState(transactionType != TransactionType.READ_ONLY,
+ "Modification operation on read-only transaction is not allowed");
+ Preconditions.checkState(!inReadyState,
+ "Transaction is sealed - further modifications are allowed");
}
@Override
- public void merge(InstanceIdentifier path, NormalizedNode, ?> data) {
- final ActorSelection remoteTransaction = remoteTransactionFromIdentifier(path);
- remoteTransaction.tell(new MergeData(path, data), null);
+ public void write(YangInstanceIdentifier path, NormalizedNode, ?> data) {
+
+ checkModificationState();
+
+ LOG.debug("txn {} write {}", identifier, path);
+
+ createTransactionIfMissing(actorContext, path);
+
+ transactionContext(path).writeData(path, data);
}
@Override
- public void delete(InstanceIdentifier path) {
- final ActorSelection remoteTransaction = remoteTransactionFromIdentifier(path);
- remoteTransaction.tell(new DeleteData(path), null);
+ public void merge(YangInstanceIdentifier path, NormalizedNode, ?> data) {
+
+ checkModificationState();
+
+ LOG.debug("txn {} merge {}", identifier, path);
+
+ createTransactionIfMissing(actorContext, path);
+
+ transactionContext(path).mergeData(path, data);
+ }
+
+ @Override
+ public void delete(YangInstanceIdentifier path) {
+
+ checkModificationState();
+
+ LOG.debug("txn {} delete {}", identifier, path);
+
+ createTransactionIfMissing(actorContext, path);
+
+ transactionContext(path).deleteData(path);
}
@Override
public DOMStoreThreePhaseCommitCohort ready() {
+
+ checkModificationState();
+
+ inReadyState = true;
+
List cohortPaths = new ArrayList<>();
- for(ActorSelection remoteTransaction : remoteTransactionPaths.values()) {
- Object result = actorContext.executeRemoteOperation(remoteTransaction,
- new ReadyTransaction(),
- ActorContext.ASK_DURATION
- );
+ LOG.debug("txn {} Trying to get {} transactions ready for commit", identifier,
+ remoteTransactionPaths.size());
- if(result instanceof ReadyTransactionReply){
- ReadyTransactionReply reply = (ReadyTransactionReply) result;
- cohortPaths.add(reply.getCohortPath());
+ for(TransactionContext transactionContext : remoteTransactionPaths.values()) {
+
+ LOG.debug("txn {} Readying transaction for shard {}", identifier,
+ transactionContext.getShardName());
+
+ Object result = transactionContext.readyTransaction();
+
+ if(result.getClass().equals(ReadyTransactionReply.SERIALIZABLE_CLASS)){
+ ReadyTransactionReply reply = ReadyTransactionReply.fromSerializable(
+ actorContext.getActorSystem(),result);
+ String resolvedCohortPath = transactionContext.getResolvedCohortPath(
+ reply.getCohortPath().toString());
+ cohortPaths.add(actorContext.actorFor(resolvedCohortPath));
+ } else {
+ LOG.error("Was expecting {} but got {}", ReadyTransactionReply.SERIALIZABLE_CLASS,
+ result.getClass());
}
}
- return new ThreePhaseCommitCohortProxy(cohortPaths);
+ return new ThreePhaseCommitCohortProxy(actorContext, cohortPaths, identifier.toString());
}
@Override
@@ -152,17 +214,275 @@ public class TransactionProxy implements DOMStoreReadWriteTransaction {
@Override
public void close() {
- for(ActorSelection remoteTransaction : remoteTransactionPaths.values()) {
- remoteTransaction.tell(new CloseTransaction(), null);
+ for(TransactionContext transactionContext : remoteTransactionPaths.values()) {
+ transactionContext.closeTransaction();
}
}
- private ActorSelection remoteTransactionFromIdentifier(InstanceIdentifier path){
+ private TransactionContext transactionContext(YangInstanceIdentifier path){
String shardName = shardNameFromIdentifier(path);
return remoteTransactionPaths.get(shardName);
}
- private String shardNameFromIdentifier(InstanceIdentifier path){
- return Shard.DEFAULT_NAME;
+ private String shardNameFromIdentifier(YangInstanceIdentifier path){
+ return ShardStrategyFactory.getStrategy(path).findShard(path);
+ }
+
+ private void createTransactionIfMissing(ActorContext actorContext, YangInstanceIdentifier path) {
+ String shardName = ShardStrategyFactory.getStrategy(path).findShard(path);
+
+ TransactionContext transactionContext =
+ remoteTransactionPaths.get(shardName);
+
+ if(transactionContext != null){
+ // A transaction already exists with that shard
+ return;
+ }
+
+ try {
+ Object response = actorContext.executeShardOperation(shardName,
+ new CreateTransaction(identifier.toString(),this.transactionType.ordinal() ).toSerializable(),
+ ActorContext.ASK_DURATION);
+ if (response.getClass().equals(CreateTransactionReply.SERIALIZABLE_CLASS)) {
+ CreateTransactionReply reply =
+ CreateTransactionReply.fromSerializable(response);
+
+ String transactionPath = reply.getTransactionPath();
+
+ LOG.debug("txn {} Received transaction path = {}", identifier, transactionPath);
+
+ ActorSelection transactionActor =
+ actorContext.actorSelection(transactionPath);
+ transactionContext =
+ new TransactionContextImpl(shardName, transactionPath,
+ transactionActor);
+
+ remoteTransactionPaths.put(shardName, transactionContext);
+ } else {
+ LOG.error("Was expecting {} but got {}", CreateTransactionReply.SERIALIZABLE_CLASS,
+ response.getClass());
+ }
+ } catch(Exception e){
+ LOG.error("txn {} Creating NoOpTransaction because of : {}", identifier, e.getMessage());
+ remoteTransactionPaths.put(shardName, new NoOpTransactionContext(shardName, e));
+ }
+ }
+
+ private interface TransactionContext {
+ String getShardName();
+
+ String getResolvedCohortPath(String cohortPath);
+
+ public void closeTransaction();
+
+ public Object readyTransaction();
+
+ void deleteData(YangInstanceIdentifier path);
+
+ void mergeData(YangInstanceIdentifier path, NormalizedNode, ?> data);
+
+ CheckedFuture>, ReadFailedException> readData(
+ final YangInstanceIdentifier path);
+
+ void writeData(YangInstanceIdentifier path, NormalizedNode, ?> data);
+
+ CheckedFuture dataExists(YangInstanceIdentifier path);
+ }
+
+
+ private class TransactionContextImpl implements TransactionContext {
+ private final String shardName;
+ private final String actorPath;
+ private final ActorSelection actor;
+
+
+ private TransactionContextImpl(String shardName, String actorPath,
+ ActorSelection actor) {
+ this.shardName = shardName;
+ this.actorPath = actorPath;
+ this.actor = actor;
+ }
+
+ @Override
+ public String getShardName() {
+ return shardName;
+ }
+
+ private ActorSelection getActor() {
+ return actor;
+ }
+
+ @Override
+ public String getResolvedCohortPath(String cohortPath) {
+ return actorContext.resolvePath(actorPath, cohortPath);
+ }
+
+ @Override
+ public void closeTransaction() {
+ actorContext.sendRemoteOperationAsync(getActor(), new CloseTransaction().toSerializable());
+ }
+
+ @Override
+ public Object readyTransaction() {
+ return actorContext.executeRemoteOperation(getActor(),
+ new ReadyTransaction().toSerializable(), ActorContext.ASK_DURATION);
+ }
+
+ @Override
+ public void deleteData(YangInstanceIdentifier path) {
+ actorContext.sendRemoteOperationAsync(getActor(), new DeleteData(path).toSerializable() );
+ }
+
+ @Override
+ public void mergeData(YangInstanceIdentifier path, NormalizedNode, ?> data) {
+ actorContext.sendRemoteOperationAsync(getActor(),
+ new MergeData(path, data, schemaContext).toSerializable());
+ }
+
+ @Override
+ public CheckedFuture>, ReadFailedException> readData(
+ final YangInstanceIdentifier path) {
+
+ final SettableFuture>> returnFuture = SettableFuture.create();
+
+ OnComplete