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=40ceda29ce787a1f331ddc28fd137d1dda53661d;hp=6d661e6aa22839d060974bd924bc6ed6ceff869d;hb=33877f41ffc3f8eb36ad8490315419b90817d26e;hpb=3859df9beca8f13f1ff2b2744ed3470a1715bec3 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 6d661e6aa2..40ceda29ce 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 @@ -10,8 +10,6 @@ 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.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; 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; @@ -21,44 +19,21 @@ import static org.opendaylight.controller.cluster.datastore.DatastoreContext.DEF import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.CONFIGURATION; import static org.opendaylight.mdsal.common.api.LogicalDatastoreType.OPERATIONAL; -import java.util.Arrays; import java.util.HashMap; import java.util.Map; import org.junit.Test; -import org.opendaylight.mdsal.binding.generator.impl.GeneratedClassLoadingStrategy; -import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext; -import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; -import org.opendaylight.mdsal.dom.api.DOMSchemaService; -import org.opendaylight.mdsal.dom.store.inmemory.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; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; /** * Unit tests for DatastoreContextIntrospector. * * @author Thomas Pantelis */ -@SuppressWarnings("checkstyle:IllegalCatch") public class DatastoreContextIntrospectorTest { - - static SchemaContext SCHEMA_CONTEXT; - static DatastoreContextIntrospectorFactory INTROSPECTOR_FACTORY; - - static { - final ModuleInfoBackedContext moduleContext = ModuleInfoBackedContext.create(); - try { - moduleContext.addModuleInfos(Arrays.asList( - BindingReflections.getModuleInfo(DataStorePropertiesContainer.class))); - } catch (Exception e) { - throw new RuntimeException(e); - } - SCHEMA_CONTEXT = moduleContext.tryToCreateSchemaContext().get(); - - DOMSchemaService mockSchemaService = mock(DOMSchemaService.class); - doReturn(SCHEMA_CONTEXT).when(mockSchemaService).getGlobalContext(); - INTROSPECTOR_FACTORY = new DatastoreContextIntrospectorFactory(mockSchemaService, - GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy()); - } + static final DatastoreContextIntrospectorFactory INTROSPECTOR_FACTORY = new DatastoreContextIntrospectorFactory( + new BindingCodecContext(BindingRuntimeHelpers.createRuntimeContext(DataStorePropertiesContainer.class))); @Test public void testYangDefaults() { @@ -85,6 +60,8 @@ 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-election-timeout-factor", "21"); @@ -110,15 +87,13 @@ 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(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()); assertFalse(context.isPersistent()); @@ -126,6 +101,7 @@ public class DatastoreContextIntrospectorTest { 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"); @@ -143,14 +119,11 @@ 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(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); @@ -193,8 +166,6 @@ public class DatastoreContextIntrospectorTest { assertEquals(DEFAULT_SHARD_SNAPSHOT_DATA_THRESHOLD_PERCENTAGE, context.getShardRaftConfig().getSnapshotDataThresholdPercentage()); assertEquals(DEFAULT_SHARD_INITIALIZATION_TIMEOUT, context.getShardInitializationTimeout()); - assertEquals(InMemoryDOMDataStoreConfigProperties.DEFAULT_MAX_DATA_CHANGE_EXECUTOR_POOL_SIZE, - context.getDataStoreProperties().getMaxDataChangeExecutorPoolSize()); } @Test @@ -218,7 +189,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); @@ -227,7 +197,6 @@ public class DatastoreContextIntrospectorTest { assertEquals(44, configContext.getShardTransactionIdleTimeout().toMinutes()); assertFalse(configContext.isPersistent()); - assertEquals(444, configContext.getDataStoreProperties().getMaxDataChangeExecutorPoolSize()); } @Test @@ -237,6 +206,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); @@ -257,6 +227,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"); @@ -273,5 +244,6 @@ public class DatastoreContextIntrospectorTest { shardContext = configIntrospector.newContextFactory().getShardDatastoreContext("default"); assertEquals(44, shardContext.getShardTransactionIdleTimeout().toMinutes()); + assertTrue(shardContext.isPersistent()); } }