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%2FDatastoreContextIntrospectorTest.java;h=aab9322e9a89ea2a14da21298790325799b108a6;hp=745c9b3c8543356916733d03dd13162bc025da8a;hb=7cb260aeb0738104e3bee8a086de9e2e5f77b7e0;hpb=412db94945c5db5d2da918f5e23bd3abcecc4d10 diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospectorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospectorTest.java index 745c9b3c85..aab9322e9a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospectorTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospectorTest.java @@ -8,16 +8,24 @@ package org.opendaylight.controller.cluster.datastore; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.opendaylight.controller.cluster.datastore.DatastoreContext.DEFAULT_HEARTBEAT_INTERVAL_IN_MILLIS; -import static org.opendaylight.controller.cluster.datastore.DatastoreContext.DEFAULT_OPERATION_TIMEOUT_IN_SECONDS; +import static org.opendaylight.controller.cluster.datastore.DatastoreContext.DEFAULT_OPERATION_TIMEOUT_IN_MS; import static org.opendaylight.controller.cluster.datastore.DatastoreContext.DEFAULT_SHARD_INITIALIZATION_TIMEOUT; +import static org.opendaylight.controller.cluster.datastore.DatastoreContext.DEFAULT_SHARD_SNAPSHOT_DATA_THRESHOLD; import static org.opendaylight.controller.cluster.datastore.DatastoreContext.DEFAULT_SHARD_SNAPSHOT_DATA_THRESHOLD_PERCENTAGE; import static org.opendaylight.controller.cluster.datastore.DatastoreContext.DEFAULT_SHARD_TRANSACTION_IDLE_TIMEOUT; import static org.opendaylight.controller.cluster.datastore.DatastoreContext.DEFAULT_SHARD_TX_COMMIT_TIMEOUT_IN_SECONDS; -import java.util.Dictionary; -import java.util.Hashtable; +import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION; +import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.OPERATIONAL; + +import java.util.HashMap; +import java.util.Map; import org.junit.Test; -import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStoreConfigProperties; +import org.opendaylight.binding.runtime.spi.BindingRuntimeHelpers; +import org.opendaylight.mdsal.binding.dom.codec.impl.BindingCodecContext; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.distributed.datastore.provider.rev140612.DataStorePropertiesContainer; /** * Unit tests for DatastoreContextIntrospector. @@ -25,13 +33,26 @@ import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStoreCon * @author Thomas Pantelis */ public class DatastoreContextIntrospectorTest { + static final AbstractDatastoreContextIntrospectorFactory INTROSPECTOR_FACTORY = + new DefaultDatastoreContextIntrospectorFactory(new BindingCodecContext( + BindingRuntimeHelpers.createRuntimeContext(DataStorePropertiesContainer.class))); + + @Test + public void testYangDefaults() { + final DatastoreContextIntrospector introspector = INTROSPECTOR_FACTORY.newInstance( + DatastoreContext.newBuilder().shardBatchedModificationCount(2) + .transactionDebugContextEnabled(true).build()); + DatastoreContext context = introspector.getContext(); + + assertEquals(1000, context.getShardBatchedModificationCount()); + assertFalse(context.isTransactionDebugContextEnabled()); + } @Test public void testUpdate() { - DatastoreContext context = DatastoreContext.newBuilder().dataStoreType("operational").build(); - DatastoreContextIntrospector introspector = new DatastoreContextIntrospector(context ); + final DatastoreContextIntrospector introspector = INTROSPECTOR_FACTORY.newInstance(OPERATIONAL); - Dictionary properties = new Hashtable<>(); + final Map properties = new HashMap<>(); properties.put("shard-transaction-idle-timeout-in-minutes", "31"); properties.put("operation-timeout-in-seconds", "26"); properties.put("shard-transaction-commit-timeout-in-seconds", "100"); @@ -41,8 +62,11 @@ public class DatastoreContextIntrospectorTest { properties.put("shard-transaction-commit-queue-capacity", "567"); properties.put("shard-initialization-timeout-in-seconds", "82"); properties.put("shard-leader-election-timeout-in-seconds", "66"); + properties.put("initial-settle-timeout-multiplier", "5"); + properties.put("recovery-snapshot-interval-seconds", "360"); properties.put("shard-isolated-leader-check-interval-in-millis", "123"); properties.put("shard-snapshot-data-threshold-percentage", "100"); + properties.put("shard-snapshot-data-threshold", "800"); properties.put("shard-election-timeout-factor", "21"); properties.put("shard-batched-modification-count", "901"); properties.put("transactionCreationInitialRateLimit", "200"); @@ -51,13 +75,14 @@ public class DatastoreContextIntrospectorTest { properties.put(" max shard data change listener queue size", "2222"); properties.put("mAx-shaRd-data-STORE-executor-quEUe-size", "3333"); properties.put("persistent", "false"); + properties.put("initial-payload-serialized-buffer-capacity", "600"); boolean updated = introspector.update(properties); - assertEquals("updated", true, updated); - context = introspector.getContext(); + assertTrue("updated", updated); + DatastoreContext context = introspector.getContext(); assertEquals(31, context.getShardTransactionIdleTimeout().toMinutes()); - assertEquals(26, context.getOperationTimeoutInSeconds()); + assertEquals(26000, context.getOperationTimeoutInMillis()); assertEquals(100, context.getShardTransactionCommitTimeoutInSeconds()); assertEquals(199, context.getShardRaftConfig().getJournalRecoveryLogBatchSize()); assertEquals(212, context.getShardRaftConfig().getSnapshotBatchCount()); @@ -65,31 +90,32 @@ public class DatastoreContextIntrospectorTest { assertEquals(567, context.getShardTransactionCommitQueueCapacity()); assertEquals(82, context.getShardInitializationTimeout().duration().toSeconds()); assertEquals(66, context.getShardLeaderElectionTimeout().duration().toSeconds()); + assertEquals(5, context.getInitialSettleTimeoutMultiplier()); + assertEquals(360, context.getShardRaftConfig().getRecoverySnapshotIntervalSeconds()); assertEquals(123, context.getShardRaftConfig().getIsolatedCheckIntervalInMillis()); assertEquals(100, context.getShardRaftConfig().getSnapshotDataThresholdPercentage()); + assertEquals(800, context.getShardRaftConfig().getSnapshotDataThreshold()); assertEquals(21, context.getShardRaftConfig().getElectionTimeoutFactor()); assertEquals(901, context.getShardBatchedModificationCount()); assertEquals(200, context.getTransactionCreationInitialRateLimit()); - assertEquals(41, context.getDataStoreProperties().getMaxDataChangeExecutorPoolSize()); - assertEquals(1111, context.getDataStoreProperties().getMaxDataChangeExecutorQueueSize()); - assertEquals(2222, context.getDataStoreProperties().getMaxDataChangeListenerQueueSize()); - assertEquals(3333, context.getDataStoreProperties().getMaxDataStoreExecutorQueueSize()); - assertEquals(false, context.isPersistent()); + assertEquals(600, context.getInitialPayloadSerializedBufferCapacity()); + assertFalse(context.isPersistent()); properties.put("shard-transaction-idle-timeout-in-minutes", "32"); properties.put("operation-timeout-in-seconds", "27"); properties.put("shard-heartbeat-interval-in-millis", "102"); properties.put("shard-election-timeout-factor", "22"); + properties.put("initial-settle-timeout-multiplier", "6"); properties.put("max-shard-data-change-executor-pool-size", "42"); properties.put("max-shard-data-store-executor-queue-size", "4444"); properties.put("persistent", "true"); updated = introspector.update(properties); - assertEquals("updated", true, updated); + assertTrue("updated", updated); context = introspector.getContext(); assertEquals(32, context.getShardTransactionIdleTimeout().toMinutes()); - assertEquals(27, context.getOperationTimeoutInSeconds()); + assertEquals(27000, context.getOperationTimeoutInMillis()); assertEquals(100, context.getShardTransactionCommitTimeoutInSeconds()); assertEquals(199, context.getShardRaftConfig().getJournalRecoveryLogBatchSize()); assertEquals(212, context.getShardRaftConfig().getSnapshotBatchCount()); @@ -97,30 +123,27 @@ public class DatastoreContextIntrospectorTest { assertEquals(567, context.getShardTransactionCommitQueueCapacity()); assertEquals(82, context.getShardInitializationTimeout().duration().toSeconds()); assertEquals(66, context.getShardLeaderElectionTimeout().duration().toSeconds()); + assertEquals(6, context.getInitialSettleTimeoutMultiplier()); assertEquals(123, context.getShardRaftConfig().getIsolatedCheckIntervalInMillis()); assertEquals(100, context.getShardRaftConfig().getSnapshotDataThresholdPercentage()); + assertEquals(800, context.getShardRaftConfig().getSnapshotDataThreshold()); assertEquals(22, context.getShardRaftConfig().getElectionTimeoutFactor()); assertEquals(200, context.getTransactionCreationInitialRateLimit()); - assertEquals(42, context.getDataStoreProperties().getMaxDataChangeExecutorPoolSize()); - assertEquals(1111, context.getDataStoreProperties().getMaxDataChangeExecutorQueueSize()); - assertEquals(2222, context.getDataStoreProperties().getMaxDataChangeListenerQueueSize()); - assertEquals(4444, context.getDataStoreProperties().getMaxDataStoreExecutorQueueSize()); - assertEquals(true, context.isPersistent()); + assertTrue(context.isPersistent()); updated = introspector.update(null); - assertEquals("updated", false, updated); + assertFalse("updated", updated); - updated = introspector.update(new Hashtable()); - assertEquals("updated", false, updated); + updated = introspector.update(new HashMap<>()); + assertFalse("updated", updated); } @Test public void testUpdateWithInvalidValues() { - DatastoreContext context = DatastoreContext.newBuilder().dataStoreType("operational").build(); - DatastoreContextIntrospector introspector = new DatastoreContextIntrospector(context ); + final DatastoreContextIntrospector introspector = INTROSPECTOR_FACTORY.newInstance(OPERATIONAL); - Dictionary properties = new Hashtable<>(); + final Map properties = new HashMap<>(); properties.put("shard-transaction-idle-timeout-in-minutes", "0"); // bad - must be > 0 properties.put("shard-journal-recovery-log-batch-size", "199"); properties.put("shard-transaction-commit-timeout-in-seconds", "bogus"); // bad - NaN @@ -129,31 +152,32 @@ public class DatastoreContextIntrospectorTest { properties.put("shard-heartbeat-interval-in-millis", "99"); // bad - must be >= 100 properties.put("shard-transaction-commit-queue-capacity", "567"); // good properties.put("shard-snapshot-data-threshold-percentage", "101"); // bad - must be 0-100 + properties.put("shard-snapshot-data-threshold", "-1"); // bad - must be > 0 properties.put("shard-initialization-timeout-in-seconds", "-1"); // bad - must be > 0 properties.put("max-shard-data-change-executor-pool-size", "bogus"); // bad - NaN properties.put("unknownProperty", "1"); // bad - invalid property name - boolean updated = introspector.update(properties); - assertEquals("updated", true, updated); - context = introspector.getContext(); + final boolean updated = introspector.update(properties); + assertTrue("updated", updated); + DatastoreContext context = introspector.getContext(); assertEquals(DEFAULT_SHARD_TRANSACTION_IDLE_TIMEOUT, context.getShardTransactionIdleTimeout()); assertEquals(199, context.getShardRaftConfig().getJournalRecoveryLogBatchSize()); assertEquals(DEFAULT_SHARD_TX_COMMIT_TIMEOUT_IN_SECONDS, context.getShardTransactionCommitTimeoutInSeconds()); assertEquals(212, context.getShardRaftConfig().getSnapshotBatchCount()); - assertEquals(DEFAULT_OPERATION_TIMEOUT_IN_SECONDS, context.getOperationTimeoutInSeconds()); - assertEquals(DEFAULT_HEARTBEAT_INTERVAL_IN_MILLIS, context.getShardRaftConfig().getHeartBeatInterval().length()); + assertEquals(DEFAULT_OPERATION_TIMEOUT_IN_MS, context.getOperationTimeoutInMillis()); + assertEquals(DEFAULT_HEARTBEAT_INTERVAL_IN_MILLIS, + context.getShardRaftConfig().getHeartBeatInterval().length()); assertEquals(567, context.getShardTransactionCommitQueueCapacity()); assertEquals(DEFAULT_SHARD_SNAPSHOT_DATA_THRESHOLD_PERCENTAGE, context.getShardRaftConfig().getSnapshotDataThresholdPercentage()); + assertEquals(DEFAULT_SHARD_SNAPSHOT_DATA_THRESHOLD, context.getShardRaftConfig().getSnapshotDataThreshold()); assertEquals(DEFAULT_SHARD_INITIALIZATION_TIMEOUT, context.getShardInitializationTimeout()); - assertEquals(InMemoryDOMDataStoreConfigProperties.DEFAULT_MAX_DATA_CHANGE_EXECUTOR_POOL_SIZE, - context.getDataStoreProperties().getMaxDataChangeExecutorPoolSize()); } @Test public void testUpdateWithDatastoreTypeSpecificProperties() { - Dictionary properties = new Hashtable<>(); + final Map properties = new HashMap<>(); properties.put("shard-transaction-idle-timeout-in-minutes", "22"); // global setting properties.put("operational.shard-transaction-idle-timeout-in-minutes", "33"); // operational override properties.put("config.shard-transaction-idle-timeout-in-minutes", "44"); // config override @@ -165,24 +189,68 @@ public class DatastoreContextIntrospectorTest { properties.put("persistent", "false"); // global setting properties.put("operational.Persistent", "true"); // operational override - DatastoreContext operContext = DatastoreContext.newBuilder().dataStoreType("operational").build(); - DatastoreContextIntrospector operIntrospector = new DatastoreContextIntrospector(operContext); + final DatastoreContextIntrospector operIntrospector = INTROSPECTOR_FACTORY.newInstance(OPERATIONAL); boolean updated = operIntrospector.update(properties); - assertEquals("updated", true, updated); - operContext = operIntrospector.getContext(); + assertTrue("updated", updated); + DatastoreContext operContext = operIntrospector.getContext(); assertEquals(33, operContext.getShardTransactionIdleTimeout().toMinutes()); - assertEquals(true, operContext.isPersistent()); - assertEquals(333, operContext.getDataStoreProperties().getMaxDataChangeExecutorPoolSize()); + assertTrue(operContext.isPersistent()); - DatastoreContext configContext = DatastoreContext.newBuilder().dataStoreType("config").build(); - DatastoreContextIntrospector configIntrospector = new DatastoreContextIntrospector(configContext); + final DatastoreContextIntrospector configIntrospector = INTROSPECTOR_FACTORY.newInstance(CONFIGURATION); updated = configIntrospector.update(properties); - assertEquals("updated", true, updated); - configContext = configIntrospector.getContext(); + assertTrue("updated", updated); + DatastoreContext configContext = configIntrospector.getContext(); + + assertEquals(44, configContext.getShardTransactionIdleTimeout().toMinutes()); + assertFalse(configContext.isPersistent()); + } + + @Test + public void testGetDatastoreContextForShard() { + final Map properties = new HashMap<>(); + properties.put("shard-transaction-idle-timeout-in-minutes", "22"); // global setting + properties.put("operational.shard-transaction-idle-timeout-in-minutes", "33"); // operational override + properties.put("config.shard-transaction-idle-timeout-in-minutes", "44"); // config override + properties.put("topology.shard-transaction-idle-timeout-in-minutes", "55"); // global shard override + properties.put("config.topology.persistent", "false"); // per-shard config override + + final DatastoreContextIntrospector operIntrospector = INTROSPECTOR_FACTORY.newInstance(OPERATIONAL); + + DatastoreContext shardContext = operIntrospector.newContextFactory().getShardDatastoreContext("topology"); + assertEquals(10, shardContext.getShardTransactionIdleTimeout().toMinutes()); + + operIntrospector.update(properties); + DatastoreContext operContext = operIntrospector.getContext(); + assertEquals(33, operContext.getShardTransactionIdleTimeout().toMinutes()); + shardContext = operIntrospector.newContextFactory().getShardDatastoreContext("topology"); + assertEquals(55, shardContext.getShardTransactionIdleTimeout().toMinutes()); + + final DatastoreContextIntrospector configIntrospector = INTROSPECTOR_FACTORY.newInstance(CONFIGURATION); + configIntrospector.update(properties); + DatastoreContext configContext = configIntrospector.getContext(); assertEquals(44, configContext.getShardTransactionIdleTimeout().toMinutes()); - assertEquals(false, configContext.isPersistent()); - assertEquals(444, configContext.getDataStoreProperties().getMaxDataChangeExecutorPoolSize()); + + shardContext = configIntrospector.newContextFactory().getShardDatastoreContext("topology"); + assertEquals(55, shardContext.getShardTransactionIdleTimeout().toMinutes()); + assertFalse(shardContext.isPersistent()); + + // operational shard override + properties.put("operational.topology.shard-transaction-idle-timeout-in-minutes", "66"); + // config shard override + properties.put("config.topology.shard-transaction-idle-timeout-in-minutes", "77"); + + operIntrospector.update(properties); + shardContext = operIntrospector.newContextFactory().getShardDatastoreContext("topology"); + assertEquals(66, shardContext.getShardTransactionIdleTimeout().toMinutes()); + + configIntrospector.update(properties); + shardContext = configIntrospector.newContextFactory().getShardDatastoreContext("topology"); + assertEquals(77, shardContext.getShardTransactionIdleTimeout().toMinutes()); + + shardContext = configIntrospector.newContextFactory().getShardDatastoreContext("default"); + assertEquals(44, shardContext.getShardTransactionIdleTimeout().toMinutes()); + assertTrue(shardContext.isPersistent()); } }