*/
package org.opendaylight.controller.cluster.datastore;
+import static com.google.common.base.Preconditions.checkState;
+import static java.util.Objects.requireNonNull;
+
import akka.actor.ActorSelection;
import akka.dispatch.Futures;
import akka.dispatch.OnComplete;
-import com.google.common.base.Preconditions;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.util.concurrent.SettableFuture;
import java.util.Optional;
import java.util.SortedSet;
import org.opendaylight.controller.cluster.datastore.messages.BatchedModifications;
import org.opendaylight.controller.cluster.datastore.messages.CloseTransaction;
import org.opendaylight.controller.cluster.datastore.modification.AbstractModification;
+import org.opendaylight.controller.cluster.datastore.modification.DeleteModification;
+import org.opendaylight.controller.cluster.datastore.modification.MergeModification;
import org.opendaylight.controller.cluster.datastore.modification.Modification;
-import org.opendaylight.controller.cluster.datastore.utils.ActorContext;
+import org.opendaylight.controller.cluster.datastore.modification.WriteModification;
+import org.opendaylight.controller.cluster.datastore.utils.ActorUtils;
import org.opendaylight.mdsal.common.api.ReadFailedException;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import scala.concurrent.Future;
*
* @author Thomas Pantelis
*/
-public class RemoteTransactionContext extends AbstractTransactionContext {
+final class RemoteTransactionContext extends TransactionContext {
private static final Logger LOG = LoggerFactory.getLogger(RemoteTransactionContext.class);
- private final ActorContext actorContext;
+ private final ActorUtils actorUtils;
private final ActorSelection actor;
private final OperationLimiter limiter;
*/
private volatile Throwable failedModification;
- protected RemoteTransactionContext(final TransactionIdentifier identifier, final ActorSelection actor,
- final ActorContext actorContext, final short remoteTransactionVersion, final OperationLimiter limiter) {
+ RemoteTransactionContext(final TransactionIdentifier identifier, final ActorSelection actor,
+ final ActorUtils actorUtils, final short remoteTransactionVersion, final OperationLimiter limiter) {
super(identifier, remoteTransactionVersion);
- this.limiter = Preconditions.checkNotNull(limiter);
+ this.limiter = requireNonNull(limiter);
this.actor = actor;
- this.actorContext = actorContext;
+ this.actorUtils = actorUtils;
}
private ActorSelection getActor() {
return actor;
}
- protected ActorContext getActorContext() {
- return actorContext;
+ protected ActorUtils getActorUtils() {
+ return actorUtils;
}
@Override
- public void closeTransaction() {
+ void closeTransaction() {
LOG.debug("Tx {} closeTransaction called", getIdentifier());
TransactionContextCleanup.untrack(this);
- actorContext.sendOperationAsync(getActor(), new CloseTransaction(getTransactionVersion()).toSerializable());
+ actorUtils.sendOperationAsync(getActor(), new CloseTransaction(getTransactionVersion()).toSerializable());
}
@Override
- public Future<Object> directCommit(final Boolean havePermit) {
+ Future<Object> directCommit(final Boolean havePermit) {
LOG.debug("Tx {} directCommit called", getIdentifier());
// Send the remaining batched modifications, if any, with the ready flag set.
}
@Override
-
public Future<ActorSelection> readyTransaction(final Boolean havePermit,
+ Future<ActorSelection> readyTransaction(final Boolean havePermit,
final Optional<SortedSet<String>> participatingShardNames) {
logModificationCount();
bumpPermits(havePermit);
Future<Object> lastModificationsFuture = sendBatchedModifications(true, false, participatingShardNames);
- return transformReadyReply(lastModificationsFuture);
+ // Transform the last reply Future into a Future that returns the cohort actor path from
+ // the last reply message. That's the end result of the ready operation.
+ return TransactionReadyReplyMapper.transform(lastModificationsFuture, actorUtils, getIdentifier());
}
private void bumpPermits(final Boolean havePermit) {
}
}
- protected Future<ActorSelection> transformReadyReply(final Future<Object> readyReplyFuture) {
- // Transform the last reply Future into a Future that returns the cohort actor path from
- // the last reply message. That's the end result of the ready operation.
-
- return TransactionReadyReplyMapper.transform(readyReplyFuture, actorContext, getIdentifier());
- }
-
private BatchedModifications newBatchedModifications() {
return new BatchedModifications(getIdentifier(), getTransactionVersion());
}
batchedModifications.addModification(modification);
if (batchedModifications.getModifications().size()
- >= actorContext.getDatastoreContext().getShardBatchedModificationCount()) {
+ >= actorUtils.getDatastoreContext().getShardBatchedModificationCount()) {
sendBatchedModifications();
}
}
- protected Future<Object> sendBatchedModifications() {
+ @VisibleForTesting
+ Future<Object> sendBatchedModifications() {
return sendBatchedModifications(false, false, Optional.empty());
}
- protected Future<Object> sendBatchedModifications(final boolean ready, final boolean doCommitOnReady,
+ private Future<Object> sendBatchedModifications(final boolean ready, final boolean doCommitOnReady,
final Optional<SortedSet<String>> participatingShardNames) {
Future<Object> sent = null;
if (ready || batchedModifications != null && !batchedModifications.getModifications().isEmpty()) {
}
}
- sent = actorContext.executeOperationAsync(getActor(), toSend.toSerializable(),
- actorContext.getTransactionCommitOperationTimeout());
- sent.onComplete(new OnComplete<Object>() {
+ sent = actorUtils.executeOperationAsync(getActor(), toSend.toSerializable(),
+ actorUtils.getTransactionCommitOperationTimeout());
+ sent.onComplete(new OnComplete<>() {
@Override
public void onComplete(final Throwable failure, final Object success) {
if (failure != null) {
}
limiter.release(permitsToRelease);
}
- }, actorContext.getClientDispatcher());
+ }, actorUtils.getClientDispatcher());
}
return sent;
}
@Override
- public void executeModification(final AbstractModification modification, final Boolean havePermit) {
- LOG.debug("Tx {} executeModification {} called path = {}", getIdentifier(),
- modification.getClass().getSimpleName(), modification.getPath());
+ void executeDelete(final YangInstanceIdentifier path, final Boolean havePermit) {
+ LOG.debug("Tx {} executeDelete called path = {}", getIdentifier(), path);
+ executeModification(new DeleteModification(path), havePermit);
+ }
+
+ @Override
+ void executeMerge(final YangInstanceIdentifier path, final NormalizedNode data, final Boolean havePermit) {
+ LOG.debug("Tx {} executeMerge called path = {}", getIdentifier(), path);
+ executeModification(new MergeModification(path, data), havePermit);
+ }
+
+ @Override
+ void executeWrite(final YangInstanceIdentifier path, final NormalizedNode data, final Boolean havePermit) {
+ LOG.debug("Tx {} executeWrite called path = {}", getIdentifier(), path);
+ executeModification(new WriteModification(path, data), havePermit);
+ }
+ private void executeModification(final AbstractModification modification, final Boolean havePermit) {
final boolean permitToRelease;
if (havePermit == null) {
permitToRelease = failedModification == null && acquireOperation();
} else {
- permitToRelease = havePermit.booleanValue();
+ permitToRelease = havePermit;
}
batchModification(modification, permitToRelease);
}
@Override
- public <T> void executeRead(final AbstractRead<T> readCmd, final SettableFuture<T> returnFuture,
+ <T> void executeRead(final AbstractRead<T> readCmd, final SettableFuture<T> returnFuture,
final Boolean havePermit) {
LOG.debug("Tx {} executeRead {} called path = {}", getIdentifier(), readCmd.getClass().getSimpleName(),
readCmd.getPath());
// Send any batched modifications. This is necessary to honor the read uncommitted semantics of the
// public API contract.
- final boolean permitToRelease = havePermit == null ? acquireOperation() : havePermit.booleanValue();
+ final boolean permitToRelease = havePermit == null ? acquireOperation() : havePermit;
sendBatchedModifications();
- OnComplete<Object> onComplete = new OnComplete<Object>() {
+ OnComplete<Object> onComplete = new OnComplete<>() {
@Override
public void onComplete(final Throwable failure, final Object response) {
// We have previously acquired an operation, now release it, no matter what happened
}
};
- final Future<Object> future = actorContext.executeOperationAsync(getActor(),
- readCmd.asVersion(getTransactionVersion()).toSerializable(), actorContext.getOperationTimeout());
- future.onComplete(onComplete, actorContext.getClientDispatcher());
+ final Future<Object> future = actorUtils.executeOperationAsync(getActor(),
+ readCmd.asVersion(getTransactionVersion()).toSerializable(), actorUtils.getOperationTimeout());
+ future.onComplete(onComplete, actorUtils.getClientDispatcher());
}
/**
* @return True if a permit was successfully acquired, false otherwise
*/
private boolean acquireOperation() {
- Preconditions.checkState(isOperationHandOffComplete(),
+ checkState(isOperationHandOffComplete(),
"Attempted to acquire execute operation permit for transaction %s on actor %s during handoff",
getIdentifier(), actor);
}
@Override
- public boolean usesOperationLimiting() {
+ boolean usesOperationLimiting() {
return true;
}
}
Code Review / controller.git / blobdiff