import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
import akka.testkit.TestActorRef;
import akka.util.Timeout;
import com.google.common.base.Function;
+import com.google.common.base.Stopwatch;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.Uninterruptibles;
import org.mockito.InOrder;
import org.opendaylight.controller.cluster.DataPersistenceProvider;
import org.opendaylight.controller.cluster.DelegatingPersistentDataProvider;
+import org.opendaylight.controller.cluster.access.concepts.LocalHistoryIdentifier;
+import org.opendaylight.controller.cluster.access.concepts.MemberName;
+import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
import org.opendaylight.controller.cluster.datastore.exceptions.NoShardLeaderException;
import org.opendaylight.controller.cluster.datastore.identifiers.ShardIdentifier;
import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats;
import org.opendaylight.controller.cluster.raft.base.messages.FollowerInitialSyncUpStatus;
import org.opendaylight.controller.cluster.raft.client.messages.FindLeader;
import org.opendaylight.controller.cluster.raft.client.messages.FindLeaderReply;
+import org.opendaylight.controller.cluster.raft.client.messages.GetOnDemandRaftState;
+import org.opendaylight.controller.cluster.raft.client.messages.OnDemandRaftState;
import org.opendaylight.controller.cluster.raft.messages.RequestVote;
import org.opendaylight.controller.cluster.raft.messages.ServerRemoved;
import org.opendaylight.controller.cluster.raft.policy.DisableElectionsRaftPolicy;
shard.tell(new UpdateSchemaContext(TestModel.createTestContext()), getRef());
- shard.tell(new CreateTransaction("txn-1", TransactionType.READ_ONLY.ordinal(), null,
+ shard.tell(new CreateTransaction(nextTransactionId(), TransactionType.READ_ONLY.ordinal(),
DataStoreVersions.CURRENT_VERSION).toSerializable(), getRef());
final CreateTransactionReply reply = expectMsgClass(duration("3 seconds"),
final String path = reply.getTransactionPath().toString();
assertTrue("Unexpected transaction path " + path,
- path.contains("akka://test/user/testCreateTransaction/shard-txn-1"));
+ path.startsWith("akka://test/user/testCreateTransaction/shard-member-1:ShardTransactionTest@0:"));
}};
}
waitUntilLeader(shard);
- shard.tell(new CreateTransaction("txn-1",TransactionType.READ_ONLY.ordinal(), "foobar",
+ shard.tell(new CreateTransaction(nextTransactionId(),TransactionType.READ_ONLY.ordinal(),
DataStoreVersions.CURRENT_VERSION).toSerializable(), getRef());
final CreateTransactionReply reply = expectMsgClass(duration("3 seconds"),
final String path = reply.getTransactionPath().toString();
assertTrue("Unexpected transaction path " + path,
- path.contains("akka://test/user/testCreateTransactionOnChain/shard-txn-1"));
+ path.startsWith("akka://test/user/testCreateTransactionOnChain/shard-member-1:ShardTransactionTest@0:"));
}};
}
- @SuppressWarnings("serial")
@Test
public void testPeerAddressResolved() throws Exception {
new ShardTestKit(getSystem()) {{
- final CountDownLatch recoveryComplete = new CountDownLatch(1);
- class TestShard extends Shard {
- TestShard() {
- super(Shard.builder().id(shardID).datastoreContext(newDatastoreContext()).
- peerAddresses(Collections.<String, String>singletonMap(shardID.toString(), null)).
- schemaContext(SCHEMA_CONTEXT));
- }
-
- String getPeerAddress(String id) {
- return getRaftActorContext().getPeerAddress(id);
- }
-
- @Override
- protected void onRecoveryComplete() {
- try {
- super.onRecoveryComplete();
- } finally {
- recoveryComplete.countDown();
- }
- }
- }
-
- final TestActorRef<Shard> shard = actorFactory.createTestActor(
- Props.create(new DelegatingShardCreator(new Creator<Shard>() {
- @Override
- public TestShard create() throws Exception {
- return new TestShard();
- }
- })), "testPeerAddressResolved");
-
- assertEquals("Recovery complete", true,
- Uninterruptibles.awaitUninterruptibly(recoveryComplete, 5, TimeUnit.SECONDS));
+ ShardIdentifier peerID = ShardIdentifier.create("inventory", MemberName.forName("member-2"), "config");
+ final TestActorRef<Shard> shard = actorFactory.createTestActor(newShardBuilder().
+ peerAddresses(Collections.<String, String>singletonMap(peerID.toString(), null)).props().
+ withDispatcher(Dispatchers.DefaultDispatcherId()), "testPeerAddressResolved");
final String address = "akka://foobar";
- shard.underlyingActor().onReceiveCommand(new PeerAddressResolved(shardID.toString(), address));
+ shard.tell(new PeerAddressResolved(peerID.toString(), address), ActorRef.noSender());
- assertEquals("getPeerAddress", address,
- ((TestShard) shard.underlyingActor()).getPeerAddress(shardID.toString()));
+ shard.tell(GetOnDemandRaftState.INSTANCE, getRef());
+ OnDemandRaftState state = expectMsgClass(OnDemandRaftState.class);
+ assertEquals("getPeerAddress", address, state.getPeerAddresses().get(peerID.toString()));
}};
}
writeToStore(store, TestModel.TEST_PATH, container);
- final YangInstanceIdentifier root = YangInstanceIdentifier.builder().build();
+ final YangInstanceIdentifier root = YangInstanceIdentifier.EMPTY;
final NormalizedNode<?,?> expected = readStore(store, root);
final Snapshot snapshot = Snapshot.create(SerializationUtils.serializeNormalizedNode(expected),
writeMod.write(TestModel.TEST_PATH, node);
writeMod.ready();
- final ApplyState applyState = new ApplyState(null, "test", new ReplicatedLogImplEntry(1, 2,
- payloadForModification(source, writeMod)));
+ final TransactionIdentifier tx = nextTransactionId();
+ final ApplyState applyState = new ApplyState(null, tx,
+ new ReplicatedLogImplEntry(1, 2, payloadForModification(source, writeMod, tx)));
+
+ shard.tell(applyState, shard);
- shard.underlyingActor().onReceiveCommand(applyState);
+ Stopwatch sw = Stopwatch.createStarted();
+ while(sw.elapsed(TimeUnit.SECONDS) <= 5) {
+ Uninterruptibles.sleepUninterruptibly(75, TimeUnit.MILLISECONDS);
+
+ final NormalizedNode<?,?> actual = readStore(shard, TestModel.TEST_PATH);
+ if(actual != null) {
+ assertEquals("Applied state", node, actual);
+ return;
+ }
+ }
- final NormalizedNode<?,?> actual = readStore(shard, TestModel.TEST_PATH);
- assertEquals("Applied state", node, actual);
+ fail("State was not applied");
}
@Test
InMemoryJournal.addEntry(shardID.toString(), 0, DUMMY_DATA);
// Set up the InMemoryJournal.
- InMemoryJournal.addEntry(shardID.toString(), 1, new ReplicatedLogImplEntry(0, 1, payloadForModification(source, writeMod)));
+ InMemoryJournal.addEntry(shardID.toString(), 1, new ReplicatedLogImplEntry(0, 1,
+ payloadForModification(source, writeMod, nextTransactionId())));
final int nListEntries = 16;
final Set<Integer> listEntryKeys = new HashSet<>();
final DataTreeModification mod = source.takeSnapshot().newModification();
mod.merge(path, ImmutableNodes.mapEntry(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, i));
mod.ready();
+
InMemoryJournal.addEntry(shardID.toString(), i+1, new ReplicatedLogImplEntry(i, 1,
- payloadForModification(source, mod)));
+ payloadForModification(source, mod, nextTransactionId())));
}
InMemoryJournal.addEntry(shardID.toString(), nListEntries + 2,
final ShardDataTree dataStore = shard.underlyingActor().getDataStore();
- final String transactionID1 = "tx1";
+ final TransactionIdentifier transactionID1 = nextTransactionId();
final MutableCompositeModification modification1 = new MutableCompositeModification();
final ShardDataTreeCohort cohort1 = setupMockWriteTransaction("cohort1", dataStore,
TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME), modification1);
- final String transactionID2 = "tx2";
+ final TransactionIdentifier transactionID2 = nextTransactionId();
final MutableCompositeModification modification2 = new MutableCompositeModification();
final ShardDataTreeCohort cohort2 = setupMockWriteTransaction("cohort2", dataStore,
TestModel.OUTER_LIST_PATH,
ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(),
modification2);
- final String transactionID3 = "tx3";
+ final TransactionIdentifier transactionID3 = nextTransactionId();
final MutableCompositeModification modification3 = new MutableCompositeModification();
final ShardDataTreeCohort cohort3 = setupMockWriteTransaction("cohort3", dataStore,
YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH)
}
class OnCanCommitFutureComplete extends OnFutureComplete {
- private final String transactionID;
+ private final TransactionIdentifier transactionID;
- OnCanCommitFutureComplete(final String transactionID) {
+ OnCanCommitFutureComplete(final TransactionIdentifier transactionID) {
super(CanCommitTransactionReply.class);
this.transactionID = transactionID;
}
waitUntilLeader(shard);
- final String transactionID = "tx";
+ final TransactionIdentifier transactionID = nextTransactionId();
final FiniteDuration duration = duration("5 seconds");
final AtomicReference<ShardDataTreeCohort> mockCohort = new AtomicReference<>();
- final ShardCommitCoordinator.CohortDecorator cohortDecorator = new ShardCommitCoordinator.CohortDecorator() {
- @Override
- public ShardDataTreeCohort decorate(final String txID, final ShardDataTreeCohort actual) {
- if(mockCohort.get() == null) {
- mockCohort.set(createDelegatingMockCohort("cohort", actual));
- }
-
- return mockCohort.get();
+ final ShardCommitCoordinator.CohortDecorator cohortDecorator = (txID, actual) -> {
+ if(mockCohort.get() == null) {
+ mockCohort.set(createDelegatingMockCohort("cohort", actual));
}
+
+ return mockCohort.get();
};
shard.underlyingActor().getCommitCoordinator().setCohortDecorator(cohortDecorator);
waitUntilLeader(shard);
- final String transactionID = "tx";
+ final TransactionIdentifier transactionID = nextTransactionId();
final FiniteDuration duration = duration("5 seconds");
final AtomicReference<ShardDataTreeCohort> mockCohort = new AtomicReference<>();
- final ShardCommitCoordinator.CohortDecorator cohortDecorator = new ShardCommitCoordinator.CohortDecorator() {
- @Override
- public ShardDataTreeCohort decorate(final String txID, final ShardDataTreeCohort actual) {
- if(mockCohort.get() == null) {
- mockCohort.set(createDelegatingMockCohort("cohort", actual));
- }
-
- return mockCohort.get();
+ final ShardCommitCoordinator.CohortDecorator cohortDecorator = (txID, actual) -> {
+ if(mockCohort.get() == null) {
+ mockCohort.set(createDelegatingMockCohort("cohort", actual));
}
+
+ return mockCohort.get();
};
shard.underlyingActor().getCommitCoordinator().setCohortDecorator(cohortDecorator);
waitUntilLeader(shard);
- final String transactionID = "tx1";
- final BatchedModifications batched = new BatchedModifications(transactionID, DataStoreVersions.CURRENT_VERSION, null);
+ final TransactionIdentifier transactionID = nextTransactionId();
+ final BatchedModifications batched = new BatchedModifications(transactionID, DataStoreVersions.CURRENT_VERSION);
batched.setReady(true);
batched.setTotalMessagesSent(2);
// Test merge with invalid data. An exception should occur when the merge is applied. Note that
// write will not validate the children for performance reasons.
- String transactionID = "tx1";
+ TransactionIdentifier transactionID = nextTransactionId();
ContainerNode invalidData = ImmutableContainerNodeBuilder.create().withNodeIdentifier(
new YangInstanceIdentifier.NodeIdentifier(TestModel.TEST_QNAME)).
withChild(ImmutableNodes.leafNode(TestModel.JUNK_QNAME, "junk")).build();
- BatchedModifications batched = new BatchedModifications(transactionID, CURRENT_VERSION, null);
+ BatchedModifications batched = new BatchedModifications(transactionID, CURRENT_VERSION);
batched.addModification(new MergeModification(TestModel.TEST_PATH, invalidData));
shard.tell(batched, getRef());
Failure failure = expectMsgClass(duration("5 seconds"), akka.actor.Status.Failure.class);
Throwable cause = failure.cause();
- batched = new BatchedModifications(transactionID, DataStoreVersions.CURRENT_VERSION, null);
+ batched = new BatchedModifications(transactionID, DataStoreVersions.CURRENT_VERSION);
batched.setReady(true);
batched.setTotalMessagesSent(2);
waitUntilLeader(shard);
- final String transactionChainID = "txChain";
- final String transactionID1 = "tx1";
- final String transactionID2 = "tx2";
+ final LocalHistoryIdentifier historyId = nextHistoryId();
+ final TransactionIdentifier transactionID1 = new TransactionIdentifier(historyId, 0);
+ final TransactionIdentifier transactionID2 = new TransactionIdentifier(historyId, 1);
final FiniteDuration duration = duration("5 seconds");
final ContainerNode containerNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME);
final YangInstanceIdentifier path = TestModel.TEST_PATH;
- shard.tell(newBatchedModifications(transactionID1, transactionChainID, path,
- containerNode, true, false, 1), getRef());
+ shard.tell(newBatchedModifications(transactionID1, path, containerNode, true, false, 1), getRef());
expectMsgClass(duration, ReadyTransactionReply.class);
// Create a read Tx on the same chain.
shard.tell(new CreateTransaction(transactionID2, TransactionType.READ_ONLY.ordinal(),
- transactionChainID, DataStoreVersions.CURRENT_VERSION).toSerializable(), getRef());
+ DataStoreVersions.CURRENT_VERSION).toSerializable(), getRef());
final CreateTransactionReply createReply = expectMsgClass(duration("3 seconds"), CreateTransactionReply.class);
overrideLeaderCalls.set(true);
- final BatchedModifications batched = new BatchedModifications("tx", DataStoreVersions.CURRENT_VERSION, "");
+ final BatchedModifications batched = new BatchedModifications(nextTransactionId(), DataStoreVersions.CURRENT_VERSION);
shard.tell(batched, ActorRef.noSender());
waitUntilNoLeader(shard);
- shard.tell(new BatchedModifications("tx", DataStoreVersions.CURRENT_VERSION, ""), getRef());
+ final TransactionIdentifier txId = nextTransactionId();
+ shard.tell(new BatchedModifications(txId, DataStoreVersions.CURRENT_VERSION), getRef());
Failure failure = expectMsgClass(Failure.class);
assertEquals("Failure cause type", NoShardLeaderException.class, failure.cause().getClass());
- shard.tell(prepareForwardedReadyTransaction(mock(ShardDataTreeCohort.class), "tx",
+ shard.tell(prepareForwardedReadyTransaction(mock(ShardDataTreeCohort.class), txId,
DataStoreVersions.CURRENT_VERSION, true), getRef());
failure = expectMsgClass(Failure.class);
assertEquals("Failure cause type", NoShardLeaderException.class, failure.cause().getClass());
- shard.tell(new ReadyLocalTransaction("tx", mock(DataTreeModification.class), true), getRef());
+ shard.tell(new ReadyLocalTransaction(txId, mock(DataTreeModification.class), true), getRef());
failure = expectMsgClass(Failure.class);
assertEquals("Failure cause type", NoShardLeaderException.class, failure.cause().getClass());
}};
final ShardDataTree dataStore = shard.underlyingActor().getDataStore();
- final String transactionID = "tx1";
+ final TransactionIdentifier transactionID = nextTransactionId();
final MutableCompositeModification modification = new MutableCompositeModification();
final NormalizedNode<?, ?> containerNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME);
final ShardDataTreeCohort cohort = setupMockWriteTransaction("cohort", dataStore,
final MapNode mergeData = ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build();
new MergeModification(TestModel.OUTER_LIST_PATH, mergeData).apply(modification);
- final String txId = "tx1";
+ final TransactionIdentifier txId = nextTransactionId();
modification.ready();
final ReadyLocalTransaction readyMessage = new ReadyLocalTransaction(txId, modification, true);
final MapNode mergeData = ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build();
new MergeModification(TestModel.OUTER_LIST_PATH, mergeData).apply(modification);
- final String txId = "tx1";
- modification.ready();
+ final TransactionIdentifier txId = nextTransactionId();
+ modification.ready();
final ReadyLocalTransaction readyMessage = new ReadyLocalTransaction(txId, modification, false);
shard.tell(readyMessage, getRef());
// Setup a simulated transactions with a mock cohort.
- final String transactionID = "tx";
+ final TransactionIdentifier transactionID = nextTransactionId();
final MutableCompositeModification modification = new MutableCompositeModification();
final NormalizedNode<?, ?> containerNode = ImmutableNodes.containerNode(TestModel.TEST_QNAME);
final ShardDataTreeCohort cohort = setupMockWriteTransaction("cohort", dataStore,
waitUntilLeader(shard);
- final String transactionID = "tx1";
+ final TransactionIdentifier transactionID = nextTransactionId();
final MutableCompositeModification modification = new MutableCompositeModification();
final ShardDataTreeCohort cohort = mock(ShardDataTreeCohort.class, "cohort1");
doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort).canCommit();
waitUntilLeader(shard);
- final String transactionID = "tx1";
+ final TransactionIdentifier transactionID = nextTransactionId();
final MutableCompositeModification modification = new MutableCompositeModification();
- modification.addModification(new DeleteModification(YangInstanceIdentifier.builder().build()));
+ modification.addModification(new DeleteModification(YangInstanceIdentifier.EMPTY));
final ShardDataTreeCohort cohort = mock(ShardDataTreeCohort.class, "cohort1");
doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort).canCommit();
doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort).preCommit();
// Setup 2 simulated transactions with mock cohorts. The first one fails in the
// commit phase.
- final String transactionID1 = "tx1";
+ final TransactionIdentifier transactionID1 = nextTransactionId();
final MutableCompositeModification modification1 = new MutableCompositeModification();
final ShardDataTreeCohort cohort1 = mock(ShardDataTreeCohort.class, "cohort1");
doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort1).canCommit();
doReturn(Futures.immediateFailedFuture(new RuntimeException("mock"))).when(cohort1).commit();
doReturn(mockCandidate("cohort1-candidate")).when(cohort1).getCandidate();
- final String transactionID2 = "tx2";
+ final TransactionIdentifier transactionID2 = nextTransactionId();
final MutableCompositeModification modification2 = new MutableCompositeModification();
final ShardDataTreeCohort cohort2 = mock(ShardDataTreeCohort.class, "cohort2");
doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort2).canCommit();
waitUntilLeader(shard);
- final String transactionID1 = "tx1";
+ final TransactionIdentifier transactionID1 = nextTransactionId();
final MutableCompositeModification modification1 = new MutableCompositeModification();
final ShardDataTreeCohort cohort1 = mock(ShardDataTreeCohort.class, "cohort1");
doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort1).canCommit();
doReturn(Futures.immediateFailedFuture(new IllegalStateException("mock"))).when(cohort1).preCommit();
- final String transactionID2 = "tx2";
+ final TransactionIdentifier transactionID2 = nextTransactionId();
final MutableCompositeModification modification2 = new MutableCompositeModification();
final ShardDataTreeCohort cohort2 = mock(ShardDataTreeCohort.class, "cohort2");
doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort2).canCommit();
final FiniteDuration duration = duration("5 seconds");
- final String transactionID1 = "tx1";
+ final TransactionIdentifier transactionID1 = nextTransactionId();
final MutableCompositeModification modification = new MutableCompositeModification();
final ShardDataTreeCohort cohort = mock(ShardDataTreeCohort.class, "cohort1");
doReturn(Futures.immediateFailedFuture(new IllegalStateException("mock"))).when(cohort).canCommit();
reset(cohort);
- final String transactionID2 = "tx2";
+ final TransactionIdentifier transactionID2 = nextTransactionId();
doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort).canCommit();
shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort, transactionID2, modification), getRef());
final FiniteDuration duration = duration("5 seconds");
- final String transactionID1 = "tx1";
+ final TransactionIdentifier transactionID1 = nextTransactionId();
final MutableCompositeModification modification = new MutableCompositeModification();
final ShardDataTreeCohort cohort = mock(ShardDataTreeCohort.class, "cohort1");
doReturn(Futures.immediateFuture(Boolean.FALSE)).when(cohort).canCommit();
reset(cohort);
- final String transactionID2 = "tx2";
+ final TransactionIdentifier transactionID2 = nextTransactionId();
doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort).canCommit();
shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort, transactionID2, modification), getRef());
final FiniteDuration duration = duration("5 seconds");
- final String transactionID1 = "tx1";
+ final TransactionIdentifier transactionID1 = nextTransactionId();
final MutableCompositeModification modification = new MutableCompositeModification();
final ShardDataTreeCohort cohort = mock(ShardDataTreeCohort.class, "cohort1");
doReturn(Futures.immediateFailedFuture(new IllegalStateException("mock"))).when(cohort).canCommit();
reset(cohort);
- final String transactionID2 = "tx2";
+ final TransactionIdentifier transactionID2 = nextTransactionId();
doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort).canCommit();
doReturn(Futures.immediateFuture(null)).when(cohort).preCommit();
doReturn(Futures.immediateFuture(null)).when(cohort).commit();
final DataTreeCandidateNode candidateRoot = mock(DataTreeCandidateNode.class);
doReturn(ModificationType.UNMODIFIED).when(candidateRoot).getModificationType();
doReturn(candidateRoot).when(candidate).getRootNode();
+ doReturn(YangInstanceIdentifier.EMPTY).when(candidate).getRootPath();
doReturn(candidate).when(cohort).getCandidate();
shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort, transactionID2, modification, true), getRef());
final FiniteDuration duration = duration("5 seconds");
- final String transactionID = "tx1";
+ final TransactionIdentifier transactionID1 = nextTransactionId();
final MutableCompositeModification modification = new MutableCompositeModification();
final ShardDataTreeCohort cohort = mock(ShardDataTreeCohort.class, "cohort1");
doReturn(Futures.immediateFuture(Boolean.FALSE)).when(cohort).canCommit();
- shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort, transactionID, modification, true), getRef());
+ shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort, transactionID1, modification, true), getRef());
expectMsgClass(duration, akka.actor.Status.Failure.class);
reset(cohort);
- final String transactionID2 = "tx2";
+ final TransactionIdentifier transactionID2 = nextTransactionId();
doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort).canCommit();
doReturn(Futures.immediateFuture(null)).when(cohort).preCommit();
doReturn(Futures.immediateFuture(null)).when(cohort).commit();
final DataTreeCandidateNode candidateRoot = mock(DataTreeCandidateNode.class);
doReturn(ModificationType.UNMODIFIED).when(candidateRoot).getModificationType();
doReturn(candidateRoot).when(candidate).getRootNode();
+ doReturn(YangInstanceIdentifier.EMPTY).when(candidate).getRootPath();
doReturn(candidate).when(cohort).getCandidate();
shard.tell(prepareReadyTransactionMessage(readWrite, shard.underlyingActor(), cohort, transactionID2, modification, true), getRef());
final FiniteDuration duration = duration("5 seconds");
final ShardDataTree dataStore = shard.underlyingActor().getDataStore();
- final String transactionID = "tx1";
+ final TransactionIdentifier transactionID = nextTransactionId();
final Function<ShardDataTreeCohort, ListenableFuture<Void>> preCommit =
- new Function<ShardDataTreeCohort, ListenableFuture<Void>>() {
- @Override
- public ListenableFuture<Void> apply(final ShardDataTreeCohort cohort) {
- final ListenableFuture<Void> preCommitFuture = cohort.preCommit();
-
- // Simulate an AbortTransaction message occurring during replication, after
- // persisting and before finishing the commit to the in-memory store.
- // We have no followers so due to optimizations in the RaftActor, it does not
- // attempt replication and thus we can't send an AbortTransaction message b/c
- // it would be processed too late after CommitTransaction completes. So we'll
- // simulate an AbortTransaction message occurring during replication by calling
- // the shard directly.
- //
- shard.underlyingActor().doAbortTransaction(transactionID, null);
-
- return preCommitFuture;
- }
+ cohort -> {
+ final ListenableFuture<Void> preCommitFuture = cohort.preCommit();
+
+ // Simulate an AbortTransaction message occurring during replication, after
+ // persisting and before finishing the commit to the in-memory store.
+ // We have no followers so due to optimizations in the RaftActor, it does not
+ // attempt replication and thus we can't send an AbortTransaction message b/c
+ // it would be processed too late after CommitTransaction completes. So we'll
+ // simulate an AbortTransaction message occurring during replication by calling
+ // the shard directly.
+ //
+ shard.underlyingActor().doAbortTransaction(transactionID, null);
+
+ return preCommitFuture;
};
final MutableCompositeModification modification = new MutableCompositeModification();
// Create 1st Tx - will timeout
- final String transactionID1 = "tx1";
+ final TransactionIdentifier transactionID1 = nextTransactionId();
final MutableCompositeModification modification1 = new MutableCompositeModification();
final ShardDataTreeCohort cohort1 = setupMockWriteTransaction("cohort1", dataStore,
YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH)
// Create 2nd Tx
- final String transactionID2 = "tx3";
+ final TransactionIdentifier transactionID2 = nextTransactionId();
final MutableCompositeModification modification2 = new MutableCompositeModification();
final YangInstanceIdentifier listNodePath = YangInstanceIdentifier.builder(TestModel.OUTER_LIST_PATH)
.nodeWithKey(TestModel.OUTER_LIST_QNAME, TestModel.ID_QNAME, 2).build();
final ShardDataTree dataStore = shard.underlyingActor().getDataStore();
- final String transactionID1 = "tx1";
+ final TransactionIdentifier transactionID1 = nextTransactionId();
final MutableCompositeModification modification1 = new MutableCompositeModification();
final ShardDataTreeCohort cohort1 = setupMockWriteTransaction("cohort1", dataStore,
TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME), modification1);
- final String transactionID2 = "tx2";
+ final TransactionIdentifier transactionID2 = nextTransactionId();
final MutableCompositeModification modification2 = new MutableCompositeModification();
final ShardDataTreeCohort cohort2 = setupMockWriteTransaction("cohort2", dataStore,
TestModel.OUTER_LIST_PATH,
ImmutableNodes.mapNodeBuilder(TestModel.OUTER_LIST_QNAME).build(),
modification2);
- final String transactionID3 = "tx3";
+ final TransactionIdentifier transactionID3 = nextTransactionId();
final MutableCompositeModification modification3 = new MutableCompositeModification();
final ShardDataTreeCohort cohort3 = setupMockWriteTransaction("cohort3", dataStore,
TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME), modification3);
final ShardDataTree dataStore = shard.underlyingActor().getDataStore();
- final String transactionID1 = "tx1";
+ final TransactionIdentifier transactionID1 = nextTransactionId();
final MutableCompositeModification modification1 = new MutableCompositeModification();
final ShardDataTreeCohort cohort1 = setupMockWriteTransaction("cohort1", dataStore,
TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME), modification1);
shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort1, transactionID1, modification1), getRef());
expectMsgClass(duration, ReadyTransactionReply.class);
- final String transactionID2 = "tx2";
+ final TransactionIdentifier transactionID2 = nextTransactionId();
final MutableCompositeModification modification2 = new MutableCompositeModification();
final ShardDataTreeCohort cohort2 = setupMockWriteTransaction("cohort2", dataStore,
TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME), modification2);
shard.tell(prepareReadyTransactionMessage(false, shard.underlyingActor(), cohort2, transactionID2, modification2), getRef());
expectMsgClass(duration, ReadyTransactionReply.class);
- final String transactionID3 = "tx3";
+ final TransactionIdentifier transactionID3 = nextTransactionId();
final MutableCompositeModification modification3 = new MutableCompositeModification();
final ShardDataTreeCohort cohort3 = setupMockWriteTransaction("cohort3", dataStore,
TestModel.TEST2_PATH, ImmutableNodes.containerNode(TestModel.TEST2_QNAME), modification3);
final ShardDataTree dataStore = shard.underlyingActor().getDataStore();
- final String transactionID1 = "tx1";
+ final TransactionIdentifier transactionID1 = nextTransactionId();
final MutableCompositeModification modification1 = new MutableCompositeModification();
final ShardDataTreeCohort cohort1 = setupMockWriteTransaction("cohort1", dataStore,
TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME), modification1);
// Ready the second Tx.
- final String transactionID2 = "tx2";
+ final TransactionIdentifier transactionID2 = nextTransactionId();
final MutableCompositeModification modification2 = new MutableCompositeModification();
final ShardDataTreeCohort cohort2 = setupMockWriteTransaction("cohort2", dataStore,
TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME), modification2);
// Ready the third Tx.
- final String transactionID3 = "tx3";
+ final TransactionIdentifier transactionID3 = nextTransactionId();
final DataTreeModification modification3 = dataStore.newModification();
new WriteModification(TestModel.TEST2_PATH, ImmutableNodes.containerNode(TestModel.TEST2_QNAME))
.apply(modification3);
newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()),
"testCanCommitBeforeReadyFailure");
- shard.tell(new CanCommitTransaction("tx", CURRENT_VERSION).toSerializable(), getRef());
+ shard.tell(new CanCommitTransaction(nextTransactionId(), CURRENT_VERSION).toSerializable(), getRef());
expectMsgClass(duration("5 seconds"), akka.actor.Status.Failure.class);
}};
}
// Setup 2 simulated transactions with mock cohorts. The first one will be aborted.
- final String transactionID1 = "tx1";
+ final TransactionIdentifier transactionID1 = nextTransactionId();
final MutableCompositeModification modification1 = new MutableCompositeModification();
final ShardDataTreeCohort cohort1 = mock(ShardDataTreeCohort.class, "cohort1");
doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort1).canCommit();
doReturn(Futures.immediateFuture(null)).when(cohort1).abort();
- final String transactionID2 = "tx2";
+ final TransactionIdentifier transactionID2 = nextTransactionId();
final MutableCompositeModification modification2 = new MutableCompositeModification();
final ShardDataTreeCohort cohort2 = mock(ShardDataTreeCohort.class, "cohort2");
doReturn(Futures.immediateFuture(Boolean.TRUE)).when(cohort2).canCommit();
new ShardTestKit(getSystem()) {{
final AtomicReference<CountDownLatch> cleaupCheckLatch = new AtomicReference<>();
@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
- public void handleCommand(final Object message) {
- super.handleCommand(message);
- if(message.equals(TX_COMMIT_TIMEOUT_CHECK_MESSAGE)) {
- if(cleaupCheckLatch.get() != null) {
- cleaupCheckLatch.get().countDown();
- }
- }
+ public void handleCommand(final Object message) {
+ super.handleCommand(message);
+ if(TX_COMMIT_TIMEOUT_CHECK_MESSAGE.equals(message)) {
+ if(cleaupCheckLatch.get() != null) {
+ cleaupCheckLatch.get().countDown();
}
- };
+ }
}
};
waitUntilLeader(shard);
- final String transactionID = "tx1";
-
+ final TransactionIdentifier transactionID = nextTransactionId();
final MutableCompositeModification modification = new MutableCompositeModification();
final ShardDataTreeCohort cohort = mock(ShardDataTreeCohort.class, "cohort");
doReturn(Futures.immediateFuture(null)).when(cohort).abort();
public void handleCommand(final Object message) {
super.handleCommand(message);
- if (message instanceof SaveSnapshotSuccess || message.equals("commit_snapshot")) {
+ // XXX: commit_snapshot equality check references RaftActorSnapshotMessageSupport.COMMIT_SNAPSHOT
+ if (message instanceof SaveSnapshotSuccess || "commit_snapshot".equals(message.toString())) {
latch.get().countDown();
}
}
}
}
- final Creator<Shard> creator = new Creator<Shard>() {
- @Override
- public Shard create() throws Exception {
- return new TestShard(newShardBuilder());
- }
- };
+ final Creator<Shard> creator = () -> new TestShard(newShardBuilder());
final TestActorRef<Shard> shard = actorFactory.createTestActor(
Props.create(new DelegatingShardCreator(creator)), shardActorName);
waitUntilLeader(shard);
writeToStore(shard, TestModel.TEST_PATH, ImmutableNodes.containerNode(TestModel.TEST_QNAME));
- final NormalizedNode<?,?> expectedRoot = readStore(shard, YangInstanceIdentifier.builder().build());
+ final NormalizedNode<?,?> expectedRoot = readStore(shard, YangInstanceIdentifier.EMPTY);
// Trigger creation of a snapshot by ensuring
final RaftActorContext raftActorContext = ((TestShard) shard.underlyingActor()).getRaftActorContext();
commitTransaction(store, putTransaction);
- final NormalizedNode<?, ?> expected = readStore(store, YangInstanceIdentifier.builder().build());
+ final NormalizedNode<?, ?> expected = readStore(store, YangInstanceIdentifier.EMPTY);
final DataTreeModification writeTransaction = store.takeSnapshot().newModification();
- writeTransaction.delete(YangInstanceIdentifier.builder().build());
- writeTransaction.write(YangInstanceIdentifier.builder().build(), expected);
+ writeTransaction.delete(YangInstanceIdentifier.EMPTY);
+ writeTransaction.write(YangInstanceIdentifier.EMPTY, expected);
commitTransaction(store, writeTransaction);
- final NormalizedNode<?, ?> actual = readStore(store, YangInstanceIdentifier.builder().build());
+ final NormalizedNode<?, ?> actual = readStore(store, YangInstanceIdentifier.EMPTY);
assertEquals(expected, actual);
}
newShardProps().withDispatcher(Dispatchers.DefaultDispatcherId()),
"testFollowerInitialSyncStatus");
- shard.underlyingActor().onReceiveCommand(new FollowerInitialSyncUpStatus(false, "member-1-shard-inventory-operational"));
+ shard.underlyingActor().handleNonRaftCommand(new FollowerInitialSyncUpStatus(false, "member-1-shard-inventory-operational"));
assertEquals(false, shard.underlyingActor().getShardMBean().getFollowerInitialSyncStatus());
- shard.underlyingActor().onReceiveCommand(new FollowerInitialSyncUpStatus(true, "member-1-shard-inventory-operational"));
+ shard.underlyingActor().handleNonRaftCommand(new FollowerInitialSyncUpStatus(true, "member-1-shard-inventory-operational"));
assertEquals(true, shard.underlyingActor().getShardMBean().getFollowerInitialSyncStatus());
}
public void testClusteredDataChangeListenerRegistration() throws Exception {
new ShardTestKit(getSystem()) {{
String testName = "testClusteredDataChangeListenerRegistration";
- final ShardIdentifier followerShardID = ShardIdentifier.builder().memberName(
- actorFactory.generateActorId(testName + "-follower")).shardName("inventory").type("config").build();
+ final ShardIdentifier followerShardID = ShardIdentifier.create("inventory",
+ MemberName.forName(actorFactory.generateActorId(testName + "-follower")), "config");
- final ShardIdentifier leaderShardID = ShardIdentifier.builder().memberName(
- actorFactory.generateActorId(testName + "-leader")).shardName("inventory").type("config").build();
+ final ShardIdentifier leaderShardID = ShardIdentifier.create("inventory",
+ MemberName.forName(actorFactory.generateActorId(testName + "-leader")), "config");
final TestActorRef<Shard> followerShard = actorFactory.createTestActor(
Shard.builder().id(followerShardID).
public void testClusteredDataTreeChangeListenerRegistration() throws Exception {
new ShardTestKit(getSystem()) {{
String testName = "testClusteredDataTreeChangeListenerRegistration";
- final ShardIdentifier followerShardID = ShardIdentifier.builder().memberName(
- actorFactory.generateActorId(testName + "-follower")).shardName("inventory").type("config").build();
+ final ShardIdentifier followerShardID = ShardIdentifier.create("inventory",
+ MemberName.forName(actorFactory.generateActorId(testName + "-follower")), "config");
- final ShardIdentifier leaderShardID = ShardIdentifier.builder().memberName(
- actorFactory.generateActorId(testName + "-leader")).shardName("inventory").type("config").build();
+ final ShardIdentifier leaderShardID = ShardIdentifier.create("inventory",
+ MemberName.forName(actorFactory.generateActorId(testName + "-leader")), "config");
final TestActorRef<Shard> followerShard = actorFactory.createTestActor(
Shard.builder().id(followerShardID).
Code Review / controller.git / blobdiff