X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2FShardDataTreeTest.java;h=abaefcb23b26f32347eac516a3755bdb6bc3e3be;hp=2b274ad64b7432b24bb8836dc4a94292d3665446;hb=d19cf96d390ffcdba8b1f64a6dd3f3749ecc5872;hpb=a180ad35e1006969a390739ef2f3694fd9fcad48 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java index 2b274ad64b..abaefcb23b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/ShardDataTreeTest.java @@ -35,6 +35,8 @@ import static org.opendaylight.controller.cluster.datastore.ShardDataTreeMocking import com.google.common.base.Ticker; import com.google.common.primitives.UnsignedLong; import com.google.common.util.concurrent.FutureCallback; +import java.io.IOException; +import java.math.BigInteger; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -49,20 +51,32 @@ import org.mockito.InOrder; import org.mockito.Mockito; import org.opendaylight.controller.cluster.datastore.jmx.mbeans.shard.ShardStats; import org.opendaylight.controller.cluster.datastore.persisted.CommitTransactionPayload; +import org.opendaylight.controller.cluster.datastore.persisted.MetadataShardDataTreeSnapshot; +import org.opendaylight.controller.cluster.datastore.persisted.PayloadVersion; +import org.opendaylight.controller.cluster.datastore.persisted.ShardSnapshotState; import org.opendaylight.controller.md.cluster.datastore.model.CarsModel; import org.opendaylight.controller.md.cluster.datastore.model.PeopleModel; import org.opendaylight.controller.md.cluster.datastore.model.SchemaContextHelper; import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener; import org.opendaylight.yangtools.yang.common.Uint64; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; +import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidate; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeCandidates; +import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration; 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.data.api.schema.tree.ModificationType; import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; +import org.opendaylight.yangtools.yang.data.impl.schema.Builders; +import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; +import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory; import org.opendaylight.yangtools.yang.model.api.SchemaContext; public class ShardDataTreeTest extends AbstractTest { @@ -476,6 +490,117 @@ public class ShardDataTreeTest extends AbstractTest { assertEquals("People node", peopleNode, optional.get()); } + @Test + public void testUintCommitPayload() throws IOException { + shardDataTree.applyRecoveryPayload(CommitTransactionPayload.create(nextTransactionId(), + DataTreeCandidates.fromNormalizedNode(YangInstanceIdentifier.empty(), bigIntegerRoot()), + PayloadVersion.SODIUM_SR1)); + + assertCarsUint64(); + } + + @Test + public void testUintSnapshot() throws IOException, DataValidationFailedException { + shardDataTree.applyRecoverySnapshot(new ShardSnapshotState(new MetadataShardDataTreeSnapshot(bigIntegerRoot()), + true)); + + assertCarsUint64(); + } + + @Test + public void testUintReplay() throws DataValidationFailedException, IOException { + // Commit two writes and one merge, saving the data tree candidate for each. + // write(foo=1) + // write(foo=2) + // merge(foo=3) + final DataTree dataTree = new InMemoryDataTreeFactory().create(DataTreeConfiguration.DEFAULT_OPERATIONAL, + fullSchema); + DataTreeModification mod = dataTree.takeSnapshot().newModification(); + mod.write(CarsModel.BASE_PATH, Builders.containerBuilder() + .withNodeIdentifier(new NodeIdentifier(CarsModel.BASE_QNAME)) + .withChild(Builders.mapBuilder() + .withNodeIdentifier(new NodeIdentifier(CarsModel.CAR_QNAME)) + .withChild(createCar("one", BigInteger.ONE)) + .build()) + .build()); + mod.ready(); + dataTree.validate(mod); + final DataTreeCandidate first = dataTree.prepare(mod); + dataTree.commit(first); + + mod = dataTree.takeSnapshot().newModification(); + mod.write(CarsModel.newCarPath("two"), createCar("two", BigInteger.TWO)); + mod.ready(); + dataTree.validate(mod); + final DataTreeCandidate second = dataTree.prepare(mod); + dataTree.commit(second); + + mod = dataTree.takeSnapshot().newModification(); + mod.merge(CarsModel.CAR_LIST_PATH, Builders.mapBuilder() + .withNodeIdentifier(new NodeIdentifier(CarsModel.CAR_QNAME)) + .withChild(createCar("three", BigInteger.TEN)) + .build()); + mod.ready(); + dataTree.validate(mod); + final DataTreeCandidate third = dataTree.prepare(mod); + dataTree.commit(third); + + // Apply first candidate as a snapshot + shardDataTree.applyRecoverySnapshot( + new ShardSnapshotState(new MetadataShardDataTreeSnapshot(first.getRootNode().getDataAfter().get()), true)); + // Apply the other two snapshots as transactions + shardDataTree.applyRecoveryPayload(CommitTransactionPayload.create(nextTransactionId(), second, + PayloadVersion.SODIUM_SR1)); + shardDataTree.applyRecoveryPayload(CommitTransactionPayload.create(nextTransactionId(), third, + PayloadVersion.SODIUM_SR1)); + + // Verify uint translation + final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); + final NormalizedNode cars = snapshot.readNode(CarsModel.CAR_LIST_PATH).get(); + + assertEquals(Builders.mapBuilder() + .withNodeIdentifier(new NodeIdentifier(CarsModel.CAR_QNAME)) + // Note: Uint64 + .withChild(createCar("one", Uint64.ONE)) + .withChild(createCar("two", Uint64.TWO)) + .withChild(createCar("three", Uint64.TEN)) + .build(), cars); + } + + private void assertCarsUint64() { + final DataTreeSnapshot snapshot = shardDataTree.newReadOnlyTransaction(nextTransactionId()).getSnapshot(); + final NormalizedNode cars = snapshot.readNode(CarsModel.CAR_LIST_PATH).get(); + + assertEquals(Builders.mapBuilder() + .withNodeIdentifier(new NodeIdentifier(CarsModel.CAR_QNAME)) + // Note: Uint64 + .withChild(createCar("foo", Uint64.ONE)) + .build(), cars); + } + + private static ContainerNode bigIntegerRoot() { + return Builders.containerBuilder() + .withNodeIdentifier(new NodeIdentifier(SchemaContext.NAME)) + .withChild(Builders.containerBuilder() + .withNodeIdentifier(new NodeIdentifier(CarsModel.CARS_QNAME)) + .withChild(Builders.mapBuilder() + .withNodeIdentifier(new NodeIdentifier(CarsModel.CAR_QNAME)) + // Note: BigInteger + .withChild(createCar("foo", BigInteger.ONE)) + .build()) + .build()) + .build(); + } + + private static MapEntryNode createCar(final String name, final Object value) { + return Builders.mapEntryBuilder() + .withNodeIdentifier(NodeIdentifierWithPredicates.of(CarsModel.CAR_QNAME,CarsModel.CAR_NAME_QNAME, name)) + .withChild(ImmutableNodes.leafNode(CarsModel.CAR_NAME_QNAME, name)) + // Note: old BigInteger + .withChild(ImmutableNodes.leafNode(CarsModel.CAR_PRICE_QNAME, value)) + .build(); + } + private ShardDataTreeCohort newShardDataTreeCohort(final DataTreeOperation operation) { final ReadWriteShardDataTreeTransaction transaction = shardDataTree.newReadWriteTransaction(nextTransactionId());