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.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.yang.data.api.YangInstanceIdentifier;
import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.model.api.SchemaContext;
import java.util.ArrayList;
import java.util.HashMap;
private final TransactionType transactionType;
private final ActorContext actorContext;
- private final Map<String, ActorSelection> remoteTransactionPaths = new HashMap<>();
+ private final Map<String, TransactionContext> remoteTransactionPaths = new HashMap<>();
private final String identifier;
private final ExecutorService executor;
+ private final SchemaContext schemaContext;
public TransactionProxy(
ActorContext actorContext,
TransactionType transactionType,
- ExecutorService executor
+ ExecutorService executor,
+ SchemaContext schemaContext
) {
- this.identifier = "txn-" + counter.getAndIncrement();
+ this.identifier = actorContext.getCurrentMemberName() + "-txn-" + counter.getAndIncrement();
this.transactionType = transactionType;
this.actorContext = actorContext;
this.executor = executor;
+ this.schemaContext = schemaContext;
+
- Object response = actorContext.executeShardOperation(Shard.DEFAULT_NAME, new CreateTransaction(identifier), ActorContext.ASK_DURATION);
- if(response instanceof CreateTransactionReply){
- CreateTransactionReply reply = (CreateTransactionReply) response;
- remoteTransactionPaths.put(Shard.DEFAULT_NAME, actorContext.actorSelection(reply.getTransactionPath()));
- }
}
@Override
- public ListenableFuture<Optional<NormalizedNode<?, ?>>> read(final InstanceIdentifier path) {
+ public ListenableFuture<Optional<NormalizedNode<?, ?>>> read(final YangInstanceIdentifier path) {
+
+ createTransactionIfMissing(actorContext, path);
+
final ActorSelection remoteTransaction = remoteTransactionFromIdentifier(path);
Callable<Optional<NormalizedNode<?,?>>> call = new Callable() {
@Override public Optional<NormalizedNode<?,?>> call() throws Exception {
Object response = actorContext
- .executeRemoteOperation(remoteTransaction, new ReadData(path),
+ .executeRemoteOperation(remoteTransaction, new ReadData(path).toSerializable(),
ActorContext.ASK_DURATION);
- if(response instanceof ReadDataReply){
- ReadDataReply reply = (ReadDataReply) response;
+ if(response.getClass().equals(ReadDataReply.SERIALIZABLE_CLASS)){
+ ReadDataReply reply = ReadDataReply.fromSerializable(schemaContext,path, response);
if(reply.getNormalizedNode() == null){
return Optional.absent();
}
}
@Override
- public void write(InstanceIdentifier path, NormalizedNode<?, ?> data) {
+ public void write(YangInstanceIdentifier path, NormalizedNode<?, ?> data) {
+
+ createTransactionIfMissing(actorContext, path);
+
final ActorSelection remoteTransaction = remoteTransactionFromIdentifier(path);
- remoteTransaction.tell(new WriteData(path, data), null);
+ remoteTransaction.tell(new WriteData(path, data, schemaContext).toSerializable(), null);
}
@Override
- public void merge(InstanceIdentifier path, NormalizedNode<?, ?> data) {
+ public void merge(YangInstanceIdentifier path, NormalizedNode<?, ?> data) {
+
+ createTransactionIfMissing(actorContext, path);
+
final ActorSelection remoteTransaction = remoteTransactionFromIdentifier(path);
- remoteTransaction.tell(new MergeData(path, data), null);
+ remoteTransaction.tell(new MergeData(path, data, schemaContext).toSerializable(), null);
}
@Override
- public void delete(InstanceIdentifier path) {
+ public void delete(YangInstanceIdentifier path) {
+
+ createTransactionIfMissing(actorContext, path);
+
final ActorSelection remoteTransaction = remoteTransactionFromIdentifier(path);
- remoteTransaction.tell(new DeleteData(path), null);
+ remoteTransaction.tell(new DeleteData(path).toSerializable(), null);
}
@Override
public DOMStoreThreePhaseCommitCohort ready() {
List<ActorPath> cohortPaths = new ArrayList<>();
- for(ActorSelection remoteTransaction : remoteTransactionPaths.values()) {
- Object result = actorContext.executeRemoteOperation(remoteTransaction,
- new ReadyTransaction(),
+ for(TransactionContext transactionContext : remoteTransactionPaths.values()) {
+ Object result = actorContext.executeRemoteOperation(transactionContext.getActor(),
+ new ReadyTransaction().toSerializable(),
ActorContext.ASK_DURATION
);
- if(result instanceof ReadyTransactionReply){
- ReadyTransactionReply reply = (ReadyTransactionReply) result;
- cohortPaths.add(reply.getCohortPath());
+ 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));
}
}
@Override
public void close() {
- for(ActorSelection remoteTransaction : remoteTransactionPaths.values()) {
- remoteTransaction.tell(new CloseTransaction(), null);
+ for(TransactionContext transactionContext : remoteTransactionPaths.values()) {
+ transactionContext.getActor().tell(
+ new CloseTransaction().toSerializable(), null);
}
}
- private ActorSelection remoteTransactionFromIdentifier(InstanceIdentifier path){
+ private ActorSelection remoteTransactionFromIdentifier(YangInstanceIdentifier path){
String shardName = shardNameFromIdentifier(path);
- return remoteTransactionPaths.get(shardName);
+ return remoteTransactionPaths.get(shardName).getActor();
}
- 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;
+ }
+
+ Object response = actorContext.executeShardOperation(shardName, new CreateTransaction(identifier).toSerializable(), ActorContext.ASK_DURATION);
+ if(response.getClass().equals(CreateTransactionReply.SERIALIZABLE_CLASS)){
+ CreateTransactionReply reply = CreateTransactionReply.fromSerializable(response);
+ String transactionPath = actorContext.getRemoteActorPath(shardName, reply.getTransactionPath());
+
+ ActorSelection transactionActor = actorContext.actorSelection(transactionPath);
+ transactionContext = new TransactionContext(shardName, transactionPath, transactionActor);
+
+ remoteTransactionPaths.put(shardName, transactionContext);
+ }
+ }
+
+
+ private class TransactionContext {
+ private final String shardName;
+ private final String actorPath;
+ private final ActorSelection actor;
+
+
+ private TransactionContext(String shardName, String actorPath,
+ ActorSelection actor) {
+ this.shardName = shardName;
+ this.actorPath = actorPath;
+ this.actor = actor;
+ }
+
+
+ public String getShardName() {
+ return shardName;
+ }
+
+ public String getActorPath() {
+ return actorPath;
+ }
+
+ public ActorSelection getActor() {
+ return actor;
+ }
+
+ public String getResolvedCohortPath(String cohortPath){
+ return actorContext.resolvePath(actorPath, cohortPath);
+ }
+ }
+
}
Code Review / controller.git / blobdiff