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;
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;
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;
*
* @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 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(100);
protected final TestActorFactory actorFactory = new TestActorFactory(getSystem());
}
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<Integer> listEntryKeys) throws Exception {
final CountDownLatch recoveryComplete = new CountDownLatch(1);
- @SuppressWarnings("serial")
- final Creator<Shard> creator = new Creator<Shard>() {
+ final Creator<Shard> 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> 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));
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;
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,
protected void verifyLastApplied(final TestActorRef<Shard> 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);
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));
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;
}
protected Map<TransactionIdentifier, CapturingShardDataTreeCohort> setupCohortDecorator(final Shard shard,
final TransactionIdentifier... transactionIDs) {
final Map<TransactionIdentifier, CapturingShardDataTreeCohort> 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;
protected static ForwardedReadyTransaction prepareForwardedReadyTransaction(final TestActorRef<Shard> 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<? extends Shard> shard, final YangInstanceIdentifier id)
- throws ExecutionException, InterruptedException {
+ public static NormalizedNode<?,?> readStore(final TestActorRef<? extends Shard> shard,
+ final YangInstanceIdentifier id) throws ExecutionException, InterruptedException {
return shard.underlyingActor().getDataStore().readNode(id).orNull();
}
public void writeToStore(final TestActorRef<Shard> shard, final YangInstanceIdentifier id,
final NormalizedNode<?,?> node) throws InterruptedException, ExecutionException {
- Future<Object> future = Patterns.ask(shard, newBatchedModifications(nextTransactionId(), id, node, true, true, 1),
- new Timeout(5, TimeUnit.SECONDS));
+ Future<Object> 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 Exception {
+ 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,
store.commit(candidate);
}
+ public void mergeToStore(final ShardDataTree store, final YangInstanceIdentifier id,
+ final NormalizedNode<?,?> node) throws Exception {
+ 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);
final NormalizedNode<?, ?> root = readStore(testStore, YangInstanceIdentifier.EMPTY);
InMemorySnapshotStore.addSnapshot(shardID.toString(), Snapshot.create(
- new PreBoronShardDataTreeSnapshot(root).serialize(),
- Collections.<ReplicatedLogEntry>emptyList(), 0, 1, -1, -1));
+ new ShardSnapshotState(new MetadataShardDataTreeSnapshot(root)),
+ Collections.<ReplicatedLogEntry>emptyList(), 0, 1, -1, -1, 1, null, null));
return testStore;
}
}
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);
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;
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")
private FutureCallback<DataTreeCandidate> preCommit;
private FutureCallback<UnsignedLong> commit;
- public void setDelegate(ShardDataTreeCohort delegate) {
+ public void setDelegate(final ShardDataTreeCohort delegate) {
this.delegate = delegate;
}
}
@Override
- public void canCommit(FutureCallback<Void> callback) {
+ public void canCommit(final FutureCallback<Void> callback) {
canCommit = mockFutureCallback(callback);
delegate.canCommit(canCommit);
}
@Override
- public void preCommit(FutureCallback<DataTreeCandidate> callback) {
+ public void preCommit(final FutureCallback<DataTreeCandidate> callback) {
preCommit = mockFutureCallback(callback);
delegate.preCommit(preCommit);
}
@Override
- public void commit(FutureCallback<UnsignedLong> callback) {
+ public void commit(final FutureCallback<UnsignedLong> callback) {
commit = mockFutureCallback(callback);
delegate.commit(commit);
}
@SuppressWarnings("unchecked")
- private <T> FutureCallback<T> mockFutureCallback(final FutureCallback<T> actual ) {
+ private static <T> FutureCallback<T> mockFutureCallback(final FutureCallback<T> actual) {
FutureCallback<T> mock = mock(FutureCallback.class);
doAnswer(invocation -> {
actual.onFailure(invocation.getArgumentAt(0, Throwable.class));
}
@Override
- public ListenableFuture<Void> abort() {
- return delegate.abort();
+ public void abort(final FutureCallback<Void> callback) {
+ delegate.abort(callback);
}
@Override
Code Review / controller.git / blobdiff