X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FAbstractShardTest.java;h=6f7d8fb9df716fc474a3759e312be2816d1920ba;hb=c32a09739f0f7a008fe203b7b4ca172755136307;hp=8469d027957005d7522b52d5861a6c72837c90ab;hpb=a47dd7a5d21ca68804a6d0e2e3ca765f223c2ef4;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java index 8469d02795..6f7d8fb9df 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/AbstractShardTest.java @@ -16,12 +16,10 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.opendaylight.controller.cluster.datastore.DataStoreVersions.CURRENT_VERSION; -import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.immediateCanCommit; -import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.immediateCommit; -import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.immediatePreCommit; import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.successfulCanCommit; import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.successfulCommit; import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking.successfulPreCommit; + import akka.actor.ActorRef; import akka.actor.PoisonPill; import akka.actor.Props; @@ -33,7 +31,6 @@ import akka.util.Timeout; import com.google.common.base.Optional; import com.google.common.primitives.UnsignedLong; import com.google.common.util.concurrent.FutureCallback; -import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.Uninterruptibles; import java.io.IOException; import java.util.Collections; @@ -54,18 +51,19 @@ 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.MergeModification; import org.opendaylight.controller.cluster.datastore.modification.MutableCompositeModification; import org.opendaylight.controller.cluster.datastore.modification.WriteModification; import org.opendaylight.controller.cluster.datastore.persisted.CommitTransactionPayload; -import org.opendaylight.controller.cluster.datastore.persisted.PreBoronShardDataTreeSnapshot; +import org.opendaylight.controller.cluster.datastore.persisted.MetadataShardDataTreeSnapshot; +import org.opendaylight.controller.cluster.datastore.persisted.ShardSnapshotState; import org.opendaylight.controller.cluster.raft.ReplicatedLogEntry; -import org.opendaylight.controller.cluster.raft.Snapshot; import org.opendaylight.controller.cluster.raft.TestActorFactory; +import org.opendaylight.controller.cluster.raft.persisted.Snapshot; import org.opendaylight.controller.cluster.raft.utils.InMemoryJournal; import org.opendaylight.controller.cluster.raft.utils.InMemorySnapshotStore; import org.opendaylight.controller.md.cluster.datastore.model.CarsModel; import org.opendaylight.controller.md.cluster.datastore.model.TestModel; -import org.opendaylight.yangtools.concepts.Identifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild; @@ -92,17 +90,19 @@ import scala.concurrent.duration.Duration; * * @author Thomas Pantelis */ -public abstract class AbstractShardTest extends AbstractActorTest{ +public abstract class AbstractShardTest extends AbstractActorTest { protected static final SchemaContext SCHEMA_CONTEXT = TestModel.createTestContext(); private static final AtomicInteger NEXT_SHARD_NUM = new AtomicInteger(); + protected static final int HEARTBEAT_MILLIS = 100; + protected final ShardIdentifier shardID = ShardIdentifier.create("inventory", MemberName.forName("member-1"), "config" + NEXT_SHARD_NUM.getAndIncrement()); - protected final Builder dataStoreContextBuilder = DatastoreContext.newBuilder(). - shardJournalRecoveryLogBatchSize(3).shardSnapshotBatchCount(5000). - shardHeartbeatIntervalInMillis(100); + protected final Builder dataStoreContextBuilder = DatastoreContext.newBuilder() + .shardJournalRecoveryLogBatchSize(3).shardSnapshotBatchCount(5000) + .shardHeartbeatIntervalInMillis(HEARTBEAT_MILLIS); protected final TestActorFactory actorFactory = new TestActorFactory(getSystem()); @@ -128,7 +128,8 @@ public abstract class AbstractShardTest extends AbstractActorTest{ } protected Shard.Builder newShardBuilder() { - return Shard.builder().id(shardID).datastoreContext(newDatastoreContext()).schemaContext(SCHEMA_CONTEXT); + return Shard.builder().id(shardID).datastoreContext(newDatastoreContext()) + .schemaContextProvider(() -> SCHEMA_CONTEXT); } protected void testRecovery(final Set listEntryKeys) throws Exception { @@ -138,25 +139,20 @@ public abstract class AbstractShardTest extends AbstractActorTest{ final CountDownLatch recoveryComplete = new CountDownLatch(1); - @SuppressWarnings("serial") - final Creator creator = new Creator() { + final Creator creator = () -> new Shard(newShardBuilder()) { @Override - public Shard create() throws Exception { - return new Shard(newShardBuilder()) { - @Override - protected void onRecoveryComplete() { - try { - super.onRecoveryComplete(); - } finally { - recoveryComplete.countDown(); - } - } - }; + protected void onRecoveryComplete() { + try { + super.onRecoveryComplete(); + } finally { + recoveryComplete.countDown(); + } } }; final TestActorRef shard = TestActorRef.create(getSystem(), - Props.create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()), "testRecovery"); + Props.create(new DelegatingShardCreator(creator)).withDispatcher(Dispatchers.DefaultDispatcherId()), + "testRecovery"); assertEquals("Recovery complete", true, recoveryComplete.await(5, TimeUnit.SECONDS)); @@ -166,7 +162,7 @@ public abstract class AbstractShardTest extends AbstractActorTest{ assertNotNull(TestModel.OUTER_LIST_QNAME.getLocalName() + " not found", outerList); assertTrue(TestModel.OUTER_LIST_QNAME.getLocalName() + " value is not Iterable", outerList.getValue() instanceof Iterable); - for(final 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); final MapEntryNode mapEntry = (MapEntryNode)entry; @@ -174,13 +170,12 @@ public abstract class AbstractShardTest extends AbstractActorTest{ mapEntry.getChild(new YangInstanceIdentifier.NodeIdentifier(TestModel.ID_QNAME)); assertTrue("Missing leaf " + TestModel.ID_QNAME.getLocalName(), idLeaf.isPresent()); final Object value = idLeaf.get().getValue(); - assertTrue("Unexpected value for leaf "+ TestModel.ID_QNAME.getLocalName() + ": " + value, + assertTrue("Unexpected value for leaf " + TestModel.ID_QNAME.getLocalName() + ": " + value, listEntryKeys.remove(value)); } - if(!listEntryKeys.isEmpty()) { - fail("Missing " + TestModel.OUTER_LIST_QNAME.getLocalName() + " entries with keys: " + - listEntryKeys); + if (!listEntryKeys.isEmpty()) { + fail("Missing " + TestModel.OUTER_LIST_QNAME.getLocalName() + " entries with keys: " + listEntryKeys); } assertEquals("Last log index", nListEntries, @@ -195,9 +190,9 @@ public abstract class AbstractShardTest extends AbstractActorTest{ protected void verifyLastApplied(final TestActorRef shard, final long expectedValue) { long lastApplied = -1; - for(int i = 0; i < 20 * 5; i++) { + for (int i = 0; i < 20 * 5; i++) { lastApplied = shard.underlyingActor().getShardMBean().getLastApplied(); - if(lastApplied == expectedValue) { + if (lastApplied == expectedValue) { return; } Uninterruptibles.sleepUninterruptibly(50, TimeUnit.MILLISECONDS); @@ -215,9 +210,8 @@ public abstract class AbstractShardTest extends AbstractActorTest{ return null; }).when(mock).validate(any(DataTreeModification.class)); - doAnswer(invocation -> { - return actual.prepare(invocation.getArgumentAt(0, DataTreeModification.class)); - }).when(mock).prepare(any(DataTreeModification.class)); + doAnswer(invocation -> actual.prepare(invocation.getArgumentAt(0, DataTreeModification.class))).when( + mock).prepare(any(DataTreeModification.class)); doAnswer(invocation -> { actual.commit(invocation.getArgumentAt(0, DataTreeCandidate.class)); @@ -229,13 +223,9 @@ public abstract class AbstractShardTest extends AbstractActorTest{ return null; }).when(mock).setSchemaContext(any(SchemaContext.class)); - doAnswer(invocation -> { - return actual.takeSnapshot(); - }).when(mock).takeSnapshot(); + doAnswer(invocation -> actual.takeSnapshot()).when(mock).takeSnapshot(); - doAnswer(invocation -> { - return actual.getRootPath(); - }).when(mock).getRootPath(); + doAnswer(invocation -> actual.getRootPath()).when(mock).getRootPath(); return mock; } @@ -253,17 +243,14 @@ public abstract class AbstractShardTest extends AbstractActorTest{ protected Map setupCohortDecorator(final Shard shard, final TransactionIdentifier... transactionIDs) { final Map cohortMap = new HashMap<>(); - for(TransactionIdentifier id: transactionIDs) { + for (TransactionIdentifier id: transactionIDs) { cohortMap.put(id, new CapturingShardDataTreeCohort()); } - shard.getCommitCoordinator().setCohortDecorator(new ShardCommitCoordinator.CohortDecorator() { - @Override - public ShardDataTreeCohort decorate(final Identifier transactionID, final ShardDataTreeCohort actual) { - CapturingShardDataTreeCohort cohort = cohortMap.get(transactionID); - cohort.setDelegate(actual); - return cohort; - } + shard.getCommitCoordinator().setCohortDecorator((transactionID, actual) -> { + CapturingShardDataTreeCohort cohort = cohortMap.get(transactionID); + cohort.setDelegate(actual); + return cohort; }); return cohortMap; @@ -295,14 +282,14 @@ public abstract class AbstractShardTest extends AbstractActorTest{ protected static ForwardedReadyTransaction prepareForwardedReadyTransaction(final TestActorRef shard, final TransactionIdentifier transactionID, final YangInstanceIdentifier path, final NormalizedNode data, final boolean doCommitOnReady) { - ReadWriteShardDataTreeTransaction rwTx = shard.underlyingActor().getDataStore(). - newReadWriteTransaction(transactionID); + ReadWriteShardDataTreeTransaction rwTx = shard.underlyingActor().getDataStore() + .newReadWriteTransaction(transactionID); rwTx.getSnapshot().write(path, data); return new ForwardedReadyTransaction(transactionID, CURRENT_VERSION, rwTx, doCommitOnReady); } - public static NormalizedNode readStore(final TestActorRef shard, final YangInstanceIdentifier id) - throws ExecutionException, InterruptedException { + public static NormalizedNode readStore(final TestActorRef shard, + final YangInstanceIdentifier id) throws ExecutionException, InterruptedException { return shard.underlyingActor().getDataStore().readNode(id).orNull(); } @@ -312,35 +299,21 @@ public abstract class AbstractShardTest extends AbstractActorTest{ public void writeToStore(final TestActorRef shard, final YangInstanceIdentifier id, final NormalizedNode node) throws InterruptedException, ExecutionException { - Future future = Patterns.ask(shard, newBatchedModifications(nextTransactionId(), id, node, true, true, 1), - new Timeout(5, TimeUnit.SECONDS)); + Future future = Patterns.ask(shard, newBatchedModifications(nextTransactionId(), + id, node, true, true, 1), new Timeout(5, TimeUnit.SECONDS)); try { Await.ready(future, Duration.create(5, TimeUnit.SECONDS)); - } catch(TimeoutException e) { + } catch (TimeoutException e) { throw new ExecutionException(e); } } public static void writeToStore(final ShardDataTree store, final YangInstanceIdentifier id, - final NormalizedNode node) throws InterruptedException, ExecutionException { - final ReadWriteShardDataTreeTransaction transaction = store.newReadWriteTransaction(nextTransactionId()); - - transaction.getSnapshot().write(id, node); - final ShardDataTreeCohort cohort = transaction.ready(); - immediateCanCommit(cohort); - immediatePreCommit(cohort); - immediateCommit(cohort); - } - - public void mergeToStore(final ShardDataTree store, final YangInstanceIdentifier id, - final NormalizedNode node) throws InterruptedException, ExecutionException { - final ReadWriteShardDataTreeTransaction transaction = store.newReadWriteTransaction(nextTransactionId()); - - transaction.getSnapshot().merge(id, node); - final ShardDataTreeCohort cohort = transaction.ready(); - immediateCanCommit(cohort); - immediatePreCommit(cohort); - immediateCommit(cohort); + final NormalizedNode node) throws DataValidationFailedException { + BatchedModifications batched = newBatchedModifications(nextTransactionId(), id, node, true, true, 1); + DataTreeModification modification = store.getDataTree().takeSnapshot().newModification(); + batched.apply(modification); + store.notifyListeners(commitTransaction(store.getDataTree(), modification)); } public static void writeToStore(final DataTree store, final YangInstanceIdentifier id, @@ -354,6 +327,19 @@ public abstract class AbstractShardTest extends AbstractActorTest{ store.commit(candidate); } + public void mergeToStore(final ShardDataTree store, final YangInstanceIdentifier id, + final NormalizedNode node) throws DataValidationFailedException { + final BatchedModifications batched = new BatchedModifications(nextTransactionId(), CURRENT_VERSION); + batched.addModification(new MergeModification(id, node)); + batched.setReady(true); + batched.setDoCommitOnReady(true); + batched.setTotalMessagesSent(1); + + DataTreeModification modification = store.getDataTree().takeSnapshot().newModification(); + batched.apply(modification); + store.notifyListeners(commitTransaction(store.getDataTree(), modification)); + } + DataTree setupInMemorySnapshotStore() throws DataValidationFailedException { final DataTree testStore = InMemoryDataTreeFactory.getInstance().create(TreeType.OPERATIONAL); testStore.setSchemaContext(SCHEMA_CONTEXT); @@ -363,8 +349,8 @@ public abstract class AbstractShardTest extends AbstractActorTest{ final NormalizedNode root = readStore(testStore, YangInstanceIdentifier.EMPTY); InMemorySnapshotStore.addSnapshot(shardID.toString(), Snapshot.create( - new PreBoronShardDataTreeSnapshot(root).serialize(), - Collections.emptyList(), 0, 1, -1, -1)); + new ShardSnapshotState(new MetadataShardDataTreeSnapshot(root)), + Collections.emptyList(), 0, 1, -1, -1, 1, null, null)); return testStore; } @@ -377,8 +363,8 @@ public abstract class AbstractShardTest extends AbstractActorTest{ } static BatchedModifications newBatchedModifications(final TransactionIdentifier transactionID, - final YangInstanceIdentifier path, final NormalizedNode data, final boolean ready, final boolean doCommitOnReady, - final int messagesSent) { + final YangInstanceIdentifier path, final NormalizedNode data, final boolean ready, + final boolean doCommitOnReady, final int messagesSent) { final BatchedModifications batched = new BatchedModifications(transactionID, CURRENT_VERSION); batched.addModification(new WriteModification(path, data)); batched.setReady(ready); @@ -407,7 +393,8 @@ public abstract class AbstractShardTest extends AbstractActorTest{ final DataTreeCandidateTip mockCandidate = mock(DataTreeCandidateTip.class, name); final DataTreeCandidateNode mockCandidateNode = mock(DataTreeCandidateNode.class, name + "-node"); doReturn(ModificationType.WRITE).when(mockCandidateNode).getModificationType(); - doReturn(Optional.of(ImmutableNodes.containerNode(CarsModel.CARS_QNAME))).when(mockCandidateNode).getDataAfter(); + doReturn(Optional.of(ImmutableNodes.containerNode(CarsModel.CARS_QNAME))) + .when(mockCandidateNode).getDataAfter(); doReturn(CarsModel.BASE_PATH).when(mockCandidate).getRootPath(); doReturn(mockCandidateNode).when(mockCandidate).getRootNode(); return mockCandidate; @@ -422,10 +409,13 @@ public abstract class AbstractShardTest extends AbstractActorTest{ return mockCandidate; } - static void commitTransaction(final DataTree store, final DataTreeModification modification) throws DataValidationFailedException { + static DataTreeCandidate commitTransaction(final DataTree store, final DataTreeModification modification) + throws DataValidationFailedException { modification.ready(); store.validate(modification); - store.commit(store.prepare(modification)); + final DataTreeCandidate candidate = store.prepare(modification); + store.commit(candidate); + return candidate; } @SuppressWarnings("serial") @@ -448,7 +438,7 @@ public abstract class AbstractShardTest extends AbstractActorTest{ private FutureCallback preCommit; private FutureCallback commit; - public void setDelegate(ShardDataTreeCohort delegate) { + public void setDelegate(final ShardDataTreeCohort delegate) { this.delegate = delegate; } @@ -483,25 +473,25 @@ public abstract class AbstractShardTest extends AbstractActorTest{ } @Override - public void canCommit(FutureCallback callback) { + public void canCommit(final FutureCallback callback) { canCommit = mockFutureCallback(callback); delegate.canCommit(canCommit); } @Override - public void preCommit(FutureCallback callback) { + public void preCommit(final FutureCallback callback) { preCommit = mockFutureCallback(callback); delegate.preCommit(preCommit); } @Override - public void commit(FutureCallback callback) { + public void commit(final FutureCallback callback) { commit = mockFutureCallback(callback); delegate.commit(commit); } @SuppressWarnings("unchecked") - private FutureCallback mockFutureCallback(final FutureCallback actual ) { + private static FutureCallback mockFutureCallback(final FutureCallback actual) { FutureCallback mock = mock(FutureCallback.class); doAnswer(invocation -> { actual.onFailure(invocation.getArgumentAt(0, Throwable.class)); @@ -517,8 +507,8 @@ public abstract class AbstractShardTest extends AbstractActorTest{ } @Override - public ListenableFuture abort() { - return delegate.abort(); + public void abort(final FutureCallback callback) { + delegate.abort(callback); } @Override