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%2FDatastoreContextIntrospectorTest.java;h=924f1de1ff4730627fdb4e19717666c3f083279b;hb=e84f63ee098fff5b02cbce1281ca0d1208f966fa;hp=19f4c8e7c3456e9db1ba249d1a6460e709160d23;hpb=4b59df006c79ffb8119152e5a8bc6aadd276c031;p=controller.git 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 19f4c8e7c3..924f1de1ff 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 @@ -13,6 +13,7 @@ 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_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; @@ -22,10 +23,9 @@ import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.OPERATIONAL import java.util.HashMap; import java.util.Map; import org.junit.Test; -import org.opendaylight.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.mdsal.binding.dom.codec.impl.BindingCodecContext; -import org.opendaylight.mdsal.binding.generator.impl.DefaultBindingRuntimeGenerator; -import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStoreConfigProperties; +import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.distributed.datastore.provider.rev140612.DataStoreProperties.ExportOnRecovery; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.config.distributed.datastore.provider.rev140612.DataStorePropertiesContainer; /** @@ -34,9 +34,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll * @author Thomas Pantelis */ public class DatastoreContextIntrospectorTest { - static final DatastoreContextIntrospectorFactory INTROSPECTOR_FACTORY = new DatastoreContextIntrospectorFactory( - new BindingCodecContext(BindingRuntimeHelpers.createRuntimeContext(new DefaultBindingRuntimeGenerator(), - DataStorePropertiesContainer.class))); + static final AbstractDatastoreContextIntrospectorFactory INTROSPECTOR_FACTORY = + new DefaultDatastoreContextIntrospectorFactory(new BindingCodecContext( + BindingRuntimeHelpers.createRuntimeContext(DataStorePropertiesContainer.class))); @Test public void testYangDefaults() { @@ -64,17 +64,17 @@ public class DatastoreContextIntrospectorTest { 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"); - properties.put("MaxShardDataChangeExecutorPoolSize", "41"); - properties.put("Max-Shard-Data-Change Executor-Queue Size", "1111"); - 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"); + properties.put("export-on-recovery", "json"); + properties.put("recovery-json-dump", "persistence-export"); boolean updated = introspector.update(properties); assertTrue("updated", updated); @@ -90,16 +90,16 @@ public class DatastoreContextIntrospectorTest { 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(600, context.getInitialPayloadSerializedBufferCapacity()); + assertEquals("persistence-export", context.getRecoveryExportBaseDir()); + assertEquals(ExportOnRecovery.Json, context.getExportOnRecovery()); assertFalse(context.isPersistent()); properties.put("shard-transaction-idle-timeout-in-minutes", "32"); @@ -127,12 +127,9 @@ public class DatastoreContextIntrospectorTest { 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()); assertTrue(context.isPersistent()); updated = introspector.update(null); @@ -156,8 +153,8 @@ 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 final boolean updated = introspector.update(properties); @@ -174,9 +171,8 @@ public class DatastoreContextIntrospectorTest { 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 @@ -200,7 +196,6 @@ public class DatastoreContextIntrospectorTest { assertEquals(33, operContext.getShardTransactionIdleTimeout().toMinutes()); assertTrue(operContext.isPersistent()); - assertEquals(333, operContext.getDataStoreProperties().getMaxDataChangeExecutorPoolSize()); final DatastoreContextIntrospector configIntrospector = INTROSPECTOR_FACTORY.newInstance(CONFIGURATION); updated = configIntrospector.update(properties); @@ -209,7 +204,6 @@ public class DatastoreContextIntrospectorTest { assertEquals(44, configContext.getShardTransactionIdleTimeout().toMinutes()); assertFalse(configContext.isPersistent()); - assertEquals(444, configContext.getDataStoreProperties().getMaxDataChangeExecutorPoolSize()); } @Test @@ -219,6 +213,7 @@ public class DatastoreContextIntrospectorTest { 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); @@ -239,6 +234,7 @@ public class DatastoreContextIntrospectorTest { 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"); @@ -255,5 +251,6 @@ public class DatastoreContextIntrospectorTest { shardContext = configIntrospector.newContextFactory().getShardDatastoreContext("default"); assertEquals(44, shardContext.getShardTransactionIdleTimeout().toMinutes()); + assertTrue(shardContext.isPersistent()); } }