X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyang%2Fmd%2Fsal%2Fdom%2Fimpl%2FDomInmemoryDataBrokerModule.java;h=fffee73b9e8576ea6fccdb71e3ab554cd0e8966e;hb=78aa007feef2169a0280bd3d3fbbbea160b63d82;hp=948f3c8d8b637b8dfb72fdd376fa7ee1f49aa3c3;hpb=24c8edfec01c5a61bf40a930aec018502cd37275;p=controller.git diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java index 948f3c8d8b..fffee73b9e 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/config/yang/md/sal/dom/impl/DomInmemoryDataBrokerModule.java @@ -7,18 +7,22 @@ */ package org.opendaylight.controller.config.yang.md.sal.dom.impl; -import java.util.concurrent.Executor; +import com.google.common.collect.Lists; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.ExecutorService; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitDeadlockException; -import org.opendaylight.controller.md.sal.dom.broker.impl.DOMDataBrokerImpl; +import org.opendaylight.controller.md.sal.common.util.jmx.AbstractMXBean; +import org.opendaylight.controller.md.sal.common.util.jmx.ThreadExecutorStatsMXBeanImpl; +import org.opendaylight.controller.md.sal.dom.broker.impl.SerializedDOMDataBroker; +import org.opendaylight.controller.md.sal.dom.broker.impl.jmx.CommitStatsMXBeanImpl; import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStoreFactory; import org.opendaylight.controller.sal.core.spi.data.DOMStore; +import org.opendaylight.yangtools.util.DurationStatisticsTracker; import org.opendaylight.yangtools.util.concurrent.DeadlockDetectingListeningExecutorService; import org.opendaylight.yangtools.util.concurrent.SpecialExecutors; -import org.opendaylight.yangtools.util.PropertyUtils; - -import com.google.common.collect.ImmutableMap; /** * @@ -26,16 +30,7 @@ import com.google.common.collect.ImmutableMap; public final class DomInmemoryDataBrokerModule extends org.opendaylight.controller.config.yang.md.sal.dom.impl.AbstractDomInmemoryDataBrokerModule { - private static final String FUTURE_CALLBACK_EXECUTOR_MAX_QUEUE_SIZE_PROP = - "mdsal.datastore-future-callback-queue.size"; - private static final int DEFAULT_FUTURE_CALLBACK_EXECUTOR_MAX_QUEUE_SIZE = 1000; - - private static final String FUTURE_CALLBACK_EXECUTOR_MAX_POOL_SIZE_PROP = - "mdsal.datastore-future-callback-pool.size"; - private static final int DEFAULT_FUTURE_CALLBACK_EXECUTOR_MAX_POOL_SIZE = 20; - private static final String COMMIT_EXECUTOR_MAX_QUEUE_SIZE_PROP = - "mdsal.datastore-commit-queue.size"; - private static final int DEFAULT_COMMIT_EXECUTOR_MAX_QUEUE_SIZE = 5000; + private static final String JMX_BEAN_TYPE = "DOMDataBroker"; public DomInmemoryDataBrokerModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { @@ -68,9 +63,25 @@ public final class DomInmemoryDataBrokerModule extends //we will default to InMemoryDOMDataStore creation configStore = InMemoryDOMDataStoreFactory.create("DOM-CFG", getSchemaServiceDependency()); } - ImmutableMap datastores = ImmutableMap - . builder().put(LogicalDatastoreType.OPERATIONAL, operStore) - .put(LogicalDatastoreType.CONFIGURATION, configStore).build(); + + final Map datastores = new EnumMap<>(LogicalDatastoreType.class); + datastores.put(LogicalDatastoreType.OPERATIONAL, operStore); + datastores.put(LogicalDatastoreType.CONFIGURATION, configStore); + + /* + * We use an executor for commit ListenableFuture callbacks that favors reusing available + * threads over creating new threads at the expense of execution time. The assumption is + * that most ListenableFuture callbacks won't execute a lot of business logic where we want + * it to run quicker - many callbacks will likely just handle error conditions and do + * nothing on success. The executor queue capacity is bounded and, if the capacity is + * reached, subsequent submitted tasks will block the caller. + */ + ExecutorService listenableFutureExecutor = SpecialExecutors.newBlockingBoundedCachedThreadPool( + getMaxDataBrokerFutureCallbackPoolSize(), getMaxDataBrokerFutureCallbackQueueSize(), + "CommitFutures"); + + final List mBeans = Lists.newArrayList(); + final DurationStatisticsTracker commitStatsTracker; /* * We use a single-threaded executor for commits with a bounded queue capacity. If the @@ -81,31 +92,44 @@ public final class DomInmemoryDataBrokerModule extends * system it's running on. */ ExecutorService commitExecutor = SpecialExecutors.newBoundedSingleThreadExecutor( - PropertyUtils.getIntSystemProperty( - COMMIT_EXECUTOR_MAX_QUEUE_SIZE_PROP, - DEFAULT_COMMIT_EXECUTOR_MAX_QUEUE_SIZE), "WriteTxCommit"); + getMaxDataBrokerCommitQueueSize(), "WriteTxCommit"); - /* - * We use an executor for commit ListenableFuture callbacks that favors reusing available - * threads over creating new threads at the expense of execution time. The assumption is - * that most ListenableFuture callbacks won't execute a lot of business logic where we want - * it to run quicker - many callbacks will likely just handle error conditions and do - * nothing on success. The executor queue capacity is bounded and, if the capacity is - * reached, subsequent submitted tasks will block the caller. - */ - Executor listenableFutureExecutor = SpecialExecutors.newBlockingBoundedCachedThreadPool( - PropertyUtils.getIntSystemProperty( - FUTURE_CALLBACK_EXECUTOR_MAX_POOL_SIZE_PROP, - DEFAULT_FUTURE_CALLBACK_EXECUTOR_MAX_POOL_SIZE), - PropertyUtils.getIntSystemProperty( - FUTURE_CALLBACK_EXECUTOR_MAX_QUEUE_SIZE_PROP, - DEFAULT_FUTURE_CALLBACK_EXECUTOR_MAX_QUEUE_SIZE), "CommitFutures"); - - DOMDataBrokerImpl newDataBroker = new DOMDataBrokerImpl(datastores, - new DeadlockDetectingListeningExecutorService(commitExecutor, - TransactionCommitDeadlockException.DEADLOCK_EXECUTOR_FUNCTION, - listenableFutureExecutor)); - - return newDataBroker; + SerializedDOMDataBroker sdb = new SerializedDOMDataBroker(datastores, + new DeadlockDetectingListeningExecutorService(commitExecutor, + TransactionCommitDeadlockException.DEADLOCK_EXCEPTION_SUPPLIER, + listenableFutureExecutor)); + commitStatsTracker = sdb.getCommitStatsTracker(); + + final AbstractMXBean commitExecutorStatsMXBean = + ThreadExecutorStatsMXBeanImpl.create(commitExecutor, "CommitExecutorStats", + JMX_BEAN_TYPE, null); + if(commitExecutorStatsMXBean != null) { + mBeans.add(commitExecutorStatsMXBean); + } + + if(commitStatsTracker != null) { + final CommitStatsMXBeanImpl commitStatsMXBean = new CommitStatsMXBeanImpl( + commitStatsTracker, JMX_BEAN_TYPE); + commitStatsMXBean.registerMBean(); + mBeans.add(commitStatsMXBean); + } + + final AbstractMXBean commitFutureStatsMXBean = + ThreadExecutorStatsMXBeanImpl.create(listenableFutureExecutor, + "CommitFutureExecutorStats", JMX_BEAN_TYPE, null); + if(commitFutureStatsMXBean != null) { + mBeans.add(commitFutureStatsMXBean); + } + + sdb.setCloseable(new AutoCloseable() { + @Override + public void close() { + for(AbstractMXBean mBean: mBeans) { + mBean.unregisterMBean(); + } + } + }); + + return sdb; } }