import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
+import static org.opendaylight.controller.cluster.datastore.DataStoreVersions.CURRENT_VERSION;
import akka.actor.ActorRef;
import akka.actor.PoisonPill;
import akka.actor.Props;
import com.google.common.base.Optional;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.Uninterruptibles;
-import java.util.Collections;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import org.mockito.stubbing.Answer;
import org.opendaylight.controller.cluster.datastore.DatastoreContext.Builder;
import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier;
+import org.opendaylight.controller.cluster.datastore.messages.BatchedModifications;
+import org.opendaylight.controller.cluster.datastore.messages.ForwardedReadyTransaction;
import org.opendaylight.controller.cluster.datastore.modification.MutableCompositeModification;
import org.opendaylight.controller.cluster.datastore.modification.WriteModification;
+import org.opendaylight.controller.cluster.raft.TestActorFactory;
import org.opendaylight.controller.cluster.raft.utils.InMemoryJournal;
import org.opendaylight.controller.cluster.raft.utils.InMemorySnapshotStore;
import org.opendaylight.controller.md.cluster.datastore.model.TestModel;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidateTip;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification;
-import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeSnapshot;
import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException;
import org.opendaylight.yangtools.yang.model.api.SchemaContext;
shardJournalRecoveryLogBatchSize(3).shardSnapshotBatchCount(5000).
shardHeartbeatIntervalInMillis(100);
+ protected final TestActorFactory actorFactory = new TestActorFactory(getSystem());
+
@Before
public void setUp() {
InMemorySnapshotStore.clear();
public void tearDown() {
InMemorySnapshotStore.clear();
InMemoryJournal.clear();
+ actorFactory.close();
}
protected DatastoreContext newDatastoreContext() {
}
protected Props newShardProps() {
- return Shard.props(shardID, Collections.<String,String>emptyMap(),
- newDatastoreContext(), SCHEMA_CONTEXT);
+ return newShardBuilder().props();
+ }
+
+ protected Shard.Builder newShardBuilder() {
+ return Shard.builder().id(shardID).datastoreContext(newDatastoreContext()).schemaContext(SCHEMA_CONTEXT);
}
- protected void testRecovery(Set<Integer> listEntryKeys) throws Exception {
+ protected void testRecovery(final Set<Integer> listEntryKeys) throws Exception {
// Create the actor and wait for recovery complete.
- int nListEntries = listEntryKeys.size();
+ final int nListEntries = listEntryKeys.size();
final CountDownLatch recoveryComplete = new CountDownLatch(1);
@SuppressWarnings("serial")
+ final
Creator<Shard> creator = new Creator<Shard>() {
@Override
public Shard create() throws Exception {
- return new Shard(shardID, Collections.<String,String>emptyMap(),
- newDatastoreContext(), SCHEMA_CONTEXT) {
+ return new Shard(newShardBuilder()) {
@Override
protected void onRecoveryComplete() {
try {
}
};
- TestActorRef<Shard> shard = TestActorRef.create(getSystem(),
+ final TestActorRef<Shard> shard = TestActorRef.create(getSystem(),
Props.create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()), "testRecovery");
assertEquals("Recovery complete", true, recoveryComplete.await(5, TimeUnit.SECONDS));
// Verify data in the data store.
- NormalizedNode<?, ?> outerList = readStore(shard, TestModel.OUTER_LIST_PATH);
+ final NormalizedNode<?, ?> outerList = readStore(shard, TestModel.OUTER_LIST_PATH);
assertNotNull(TestModel.OUTER_LIST_QNAME.getLocalName() + " not found", outerList);
assertTrue(TestModel.OUTER_LIST_QNAME.getLocalName() + " value is not Iterable",
outerList.getValue() instanceof Iterable);
- for(Object entry: (Iterable<?>) outerList.getValue()) {
+ for(final Object entry: (Iterable<?>) outerList.getValue()) {
assertTrue(TestModel.OUTER_LIST_QNAME.getLocalName() + " entry is not MapEntryNode",
entry instanceof MapEntryNode);
- MapEntryNode mapEntry = (MapEntryNode)entry;
- Optional<DataContainerChild<? extends PathArgument, ?>> idLeaf =
+ final MapEntryNode mapEntry = (MapEntryNode)entry;
+ final Optional<DataContainerChild<? extends PathArgument, ?>> idLeaf =
mapEntry.getChild(new YangInstanceIdentifier.NodeIdentifier(TestModel.ID_QNAME));
assertTrue("Missing leaf " + TestModel.ID_QNAME.getLocalName(), idLeaf.isPresent());
- Object value = idLeaf.get().getValue();
+ final Object value = idLeaf.get().getValue();
assertTrue("Unexpected value for leaf "+ TestModel.ID_QNAME.getLocalName() + ": " + value,
listEntryKeys.remove(value));
}
shard.tell(PoisonPill.getInstance(), ActorRef.noSender());
}
- protected void verifyLastApplied(TestActorRef<Shard> shard, long expectedValue) {
+ protected void verifyLastApplied(final TestActorRef<Shard> shard, final long expectedValue) {
long lastApplied = -1;
for(int i = 0; i < 20 * 5; i++) {
lastApplied = shard.underlyingActor().getShardMBean().getLastApplied();
final MutableCompositeModification modification,
final Function<ShardDataTreeCohort, ListenableFuture<Void>> preCommit) {
- ReadWriteShardDataTreeTransaction tx = dataStore.newReadWriteTransaction("setup-mock-" + cohortName, null);
+ final ReadWriteShardDataTreeTransaction tx = dataStore.newReadWriteTransaction("setup-mock-" + cohortName, null);
tx.getSnapshot().write(path, data);
- ShardDataTreeCohort cohort = createDelegatingMockCohort(cohortName, dataStore.finishTransaction(tx), preCommit);
+ final ShardDataTreeCohort cohort = createDelegatingMockCohort(cohortName, dataStore.finishTransaction(tx), preCommit);
modification.addModification(new WriteModification(path, data));
protected ShardDataTreeCohort createDelegatingMockCohort(final String cohortName,
final ShardDataTreeCohort actual,
final Function<ShardDataTreeCohort, ListenableFuture<Void>> preCommit) {
- ShardDataTreeCohort cohort = mock(ShardDataTreeCohort.class, cohortName);
+ final ShardDataTreeCohort cohort = mock(ShardDataTreeCohort.class, cohortName);
doAnswer(new Answer<ListenableFuture<Boolean>>() {
@Override
return cohort;
}
- public static NormalizedNode<?,?> readStore(final TestActorRef<Shard> shard, final YangInstanceIdentifier id)
- throws ExecutionException, InterruptedException {
- return readStore(shard.underlyingActor().getDataStore().getDataTree(), id);
+ protected Object prepareReadyTransactionMessage(boolean remoteReadWriteTransaction, Shard shard, ShardDataTreeCohort cohort,
+ String transactionID,
+ MutableCompositeModification modification,
+ boolean doCommitOnReady) {
+ if(remoteReadWriteTransaction){
+ return prepareForwardedReadyTransaction(cohort, transactionID, CURRENT_VERSION,
+ doCommitOnReady);
+ } else {
+ setupCohortDecorator(shard, cohort);
+ return prepareBatchedModifications(transactionID, modification, doCommitOnReady);
+ }
}
- public static NormalizedNode<?,?> readStore(final DataTree store, final YangInstanceIdentifier id) {
- DataTreeSnapshot transaction = store.takeSnapshot();
+ static ShardDataTreeTransactionParent newShardDataTreeTransactionParent(ShardDataTreeCohort cohort) {
+ ShardDataTreeTransactionParent mockParent = mock(ShardDataTreeTransactionParent.class);
+ doReturn(cohort).when(mockParent).finishTransaction(any(ReadWriteShardDataTreeTransaction.class));
+ doNothing().when(mockParent).abortTransaction(any(AbstractShardDataTreeTransaction.class));
+ return mockParent;
+ }
+
+ protected ForwardedReadyTransaction prepareForwardedReadyTransaction(ShardDataTreeCohort cohort,
+ String transactionID, short version, boolean doCommitOnReady) {
+ return new ForwardedReadyTransaction(transactionID, version,
+ new ReadWriteShardDataTreeTransaction(newShardDataTreeTransactionParent(cohort), transactionID,
+ mock(DataTreeModification.class)), true, doCommitOnReady);
+ }
+
+ protected Object prepareReadyTransactionMessage(boolean remoteReadWriteTransaction, Shard shard, ShardDataTreeCohort cohort,
+ String transactionID,
+ MutableCompositeModification modification) {
+ return prepareReadyTransactionMessage(remoteReadWriteTransaction, shard, cohort, transactionID, modification, false);
+ }
+
+ protected void setupCohortDecorator(Shard shard, final ShardDataTreeCohort cohort) {
+ shard.getCommitCoordinator().setCohortDecorator(new ShardCommitCoordinator.CohortDecorator() {
+ @Override
+ public ShardDataTreeCohort decorate(String transactionID, ShardDataTreeCohort actual) {
+ return cohort;
+ }
+ });
+ }
+
+ protected BatchedModifications prepareBatchedModifications(String transactionID,
+ MutableCompositeModification modification) {
+ return prepareBatchedModifications(transactionID, modification, false);
+ }
+
+ private static BatchedModifications prepareBatchedModifications(String transactionID,
+ MutableCompositeModification modification,
+ boolean doCommitOnReady) {
+ final BatchedModifications batchedModifications = new BatchedModifications(transactionID, CURRENT_VERSION, null);
+ batchedModifications.addModification(modification);
+ batchedModifications.setReady(true);
+ batchedModifications.setDoCommitOnReady(doCommitOnReady);
+ batchedModifications.setTotalMessagesSent(1);
+ return batchedModifications;
+ }
- Optional<NormalizedNode<?, ?>> optional = transaction.readNode(id);
- NormalizedNode<?, ?> node = optional.isPresent()? optional.get() : null;
- return node;
+ public static NormalizedNode<?,?> readStore(final TestActorRef<? extends Shard> shard, final YangInstanceIdentifier id)
+ throws ExecutionException, InterruptedException {
+ return shard.underlyingActor().getDataStore().readNode(id).orNull();
+ }
+
+ public static NormalizedNode<?,?> readStore(final DataTree store, final YangInstanceIdentifier id) {
+ return store.takeSnapshot().readNode(id).orNull();
}
public static void writeToStore(final TestActorRef<Shard> shard, final YangInstanceIdentifier id,
public static void writeToStore(final ShardDataTree store, final YangInstanceIdentifier id,
final NormalizedNode<?,?> node) throws InterruptedException, ExecutionException {
- ReadWriteShardDataTreeTransaction transaction = store.newReadWriteTransaction("writeToStore", null);
+ final ReadWriteShardDataTreeTransaction transaction = store.newReadWriteTransaction("writeToStore", null);
transaction.getSnapshot().write(id, node);
- ShardDataTreeCohort cohort = transaction.ready();
+ final ShardDataTreeCohort cohort = transaction.ready();
+ cohort.canCommit().get();
+ cohort.preCommit().get();
+ cohort.commit();
+ }
+
+ public static void mergeToStore(final ShardDataTree store, final YangInstanceIdentifier id,
+ final NormalizedNode<?,?> node) throws InterruptedException, ExecutionException {
+ final ReadWriteShardDataTreeTransaction transaction = store.newReadWriteTransaction("writeToStore", null);
+
+ transaction.getSnapshot().merge(id, node);
+ final ShardDataTreeCohort cohort = transaction.ready();
cohort.canCommit().get();
cohort.preCommit().get();
cohort.commit();
public static void writeToStore(final DataTree store, final YangInstanceIdentifier id,
final NormalizedNode<?,?> node) throws DataValidationFailedException {
- DataTreeModification transaction = store.takeSnapshot().newModification();
+ final DataTreeModification transaction = store.takeSnapshot().newModification();
transaction.write(id, node);
transaction.ready();
Code Review / controller.git / blobdiff