From 926e70ce9fdb4616cda00ec6f6fc3bbc0124d247 Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Fri, 13 Mar 2015 23:38:32 +0000 Subject: QPID-6450 : [Java Broker] Allow separate model configuration threads for each virtual host node git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1666609 13f79535-47bb-0310-9956-ffa450edef68 --- .../berkeleydb/BDBVirtualHostImplTest.java | 3 +++ .../berkeleydb/BDBHARemoteReplicationNodeTest.java | 5 +++- .../berkeleydb/BDBHAVirtualHostNodeTestHelper.java | 2 ++ .../berkeleydb/BDBVirtualHostNodeTest.java | 5 +++- .../server/configuration/updater/TaskExecutor.java | 8 ++++++ .../configuration/updater/TaskExecutorImpl.java | 31 +++++++++++++++++++++- .../server/model/AbstractConfiguredObject.java | 8 +++++- .../java/org/apache/qpid/server/model/Broker.java | 2 -- .../apache/qpid/server/model/ConfiguredObject.java | 2 ++ .../org/apache/qpid/server/model/VirtualHost.java | 3 --- .../virtualhostnode/AbstractVirtualHostNode.java | 11 ++++++++ .../qpid/server/binding/BindingImplTest.java | 2 ++ .../startup/PreferencesProviderCreationTest.java | 6 ++++- .../startup/VirtualHostCreationTest.java | 3 +++ .../updater/CurrentThreadTaskExecutor.java | 19 +++++++++++++ .../apache/qpid/server/consumer/MockConsumer.java | 5 +++- .../qpid/server/exchange/FanoutExchangeTest.java | 5 +++- .../qpid/server/exchange/HeadersBindingTest.java | 6 +++++ .../qpid/server/exchange/HeadersExchangeTest.java | 6 ++++- .../apache/qpid/server/model/VirtualHostTest.java | 3 +++ .../adapter/FileBasedGroupProviderImplTest.java | 1 + .../adapter/FileSystemPreferencesProviderTest.java | 1 + .../qpid/server/model/adapter/PortFactoryTest.java | 1 + .../qpid/server/model/port/AmqpPortImplTest.java | 1 + .../qpid/server/queue/LastValueQueueListTest.java | 5 +++- .../qpid/server/queue/PriorityQueueListTest.java | 5 +++- .../qpid/server/queue/QueueEntryImplTestBase.java | 5 +++- .../server/queue/SimpleQueueEntryImplTest.java | 5 +++- .../server/queue/SortedQueueEntryListTest.java | 5 +++- .../qpid/server/queue/SortedQueueEntryTest.java | 5 +++- .../server/queue/StandardQueueEntryListTest.java | 9 +++++-- .../qpid/server/security/FileKeyStoreTest.java | 3 ++- .../qpid/server/security/FileTrustStoreTest.java | 4 ++- .../qpid/server/security/NonJavaKeyStoreTest.java | 1 + .../server/security/NonJavaTrustStoreTest.java | 1 + .../ManagedAuthenticationManagerTestBase.java | 1 + .../AbstractDurableConfigurationStoreTestCase.java | 9 +++++-- .../VirtualHostStoreUpgraderAndRecovererTest.java | 1 + .../apache/qpid/server/util/BrokerTestHelper.java | 7 +++++ .../virtualhost/AbstractVirtualHostTest.java | 2 ++ .../virtualhost/VirtualHostQueueCreationTest.java | 2 ++ .../AbstractStandardVirtualHostNodeTest.java | 2 ++ .../ACLFileAccessControlProviderFactoryTest.java | 2 ++ .../ACLFileAccessControlProviderImplTest.java | 1 + .../management/plugin/HttpManagementTest.java | 2 ++ .../server/store/VirtualHostMessageStoreTest.java | 1 + 46 files changed, 192 insertions(+), 25 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java index 92da465dbd..24a2ddb071 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHostImplTest.java @@ -53,6 +53,8 @@ public class BDBVirtualHostImplTest extends QpidTestCase TaskExecutor taskExecutor = CurrentThreadTaskExecutor.newStartedInstance(); when(broker.getTaskExecutor()).thenReturn(taskExecutor); + when(broker.getChildExecutor()).thenReturn(taskExecutor); + _storePath = TestFileUtils.createTestDirectory(); @@ -60,6 +62,7 @@ public class BDBVirtualHostImplTest extends QpidTestCase when(_node.getParent(Broker.class)).thenReturn(broker); when(_node.getModel()).thenReturn(BrokerModel.getInstance()); when(_node.getTaskExecutor()).thenReturn(taskExecutor); + when(_node.getChildExecutor()).thenReturn(taskExecutor); when(_node.getConfigurationStore()).thenReturn(mock(DurableConfigurationStore.class)); when(_node.getId()).thenReturn(UUID.randomUUID()); } diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java index cb9d02c767..4fe2bdc97f 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHARemoteReplicationNodeTest.java @@ -63,6 +63,7 @@ public class BDBHARemoteReplicationNodeTest extends QpidTestCase _taskExecutor = new CurrentThreadTaskExecutor(); _taskExecutor.start(); when(_broker.getTaskExecutor()).thenReturn(_taskExecutor); + when(_broker.getChildExecutor()).thenReturn(_taskExecutor); _virtualHostNode = mock(BDBHAVirtualHostNode.class); _configStore = mock(DurableConfigurationStore.class); @@ -74,6 +75,8 @@ public class BDBHARemoteReplicationNodeTest extends QpidTestCase ConfiguredObjectFactory objectFactory = _broker.getObjectFactory(); when(_virtualHostNode.getModel()).thenReturn(objectFactory.getModel()); when(_virtualHostNode.getTaskExecutor()).thenReturn(_taskExecutor); + when(_virtualHostNode.getChildExecutor()).thenReturn(_taskExecutor); + } public void testUpdateRole() @@ -154,4 +157,4 @@ public class BDBHARemoteReplicationNodeTest extends QpidTestCase } -} \ No newline at end of file +} diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeTestHelper.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeTestHelper.java index 0dc72acdb9..9d0e905fc5 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeTestHelper.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeTestHelper.java @@ -79,6 +79,8 @@ public class BDBHAVirtualHostNodeTestHelper _taskExecutor = new TaskExecutorImpl(); _taskExecutor.start(); when(_broker.getTaskExecutor()).thenReturn(_taskExecutor); + when(_broker.getChildExecutor()).thenReturn(_taskExecutor); + _bdbStorePath = new File(QpidTestCase.TMP_FOLDER, _testName + "." + System.currentTimeMillis()); _bdbStorePath.deleteOnExit(); diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNodeTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNodeTest.java index 6608312088..812d9a3b19 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNodeTest.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNodeTest.java @@ -29,6 +29,7 @@ import java.util.UUID; import org.apache.qpid.server.configuration.IllegalConfigurationException; import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor; +import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.util.BrokerTestHelper; import org.apache.qpid.test.utils.QpidTestCase; @@ -45,7 +46,9 @@ public class BDBVirtualHostNodeTest extends QpidTestCase { super.setUp(); _broker = BrokerTestHelper.createBrokerMock(); - when(_broker.getTaskExecutor()).thenReturn(CurrentThreadTaskExecutor.newStartedInstance()); + TaskExecutor taskExecutor = CurrentThreadTaskExecutor.newStartedInstance(); + when(_broker.getTaskExecutor()).thenReturn(taskExecutor); + when(_broker.getChildExecutor()).thenReturn(taskExecutor); _storePath = TestFileUtils.createTestDirectory(); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java index 8d572189b3..71c8c5c058 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutor.java @@ -26,6 +26,12 @@ import java.util.concurrent.Future; public interface TaskExecutor { + interface Factory + { + TaskExecutor newInstance(); + TaskExecutor newInstance(String name); + } + boolean isRunning(); void start(); @@ -47,4 +53,6 @@ public interface TaskExecutor boolean isTaskExecutorThread(); Executor getExecutor(); + + Factory getFactory(); } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java index 5c10d6f7ac..8d1b846e13 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/configuration/updater/TaskExecutorImpl.java @@ -51,7 +51,17 @@ public class TaskExecutorImpl implements TaskExecutor private final AtomicBoolean _running = new AtomicBoolean(); private volatile ExecutorService _executor; private final ImmediateIfSameThreadExecutor _wrappedExecutor = new ImmediateIfSameThreadExecutor(); + private final String _name; + public TaskExecutorImpl() + { + this(TASK_EXECUTION_THREAD_NAME); + } + + public TaskExecutorImpl(final String name) + { + _name = name; + } @Override public boolean isRunning() @@ -70,7 +80,7 @@ public class TaskExecutorImpl implements TaskExecutor @Override public Thread newThread(Runnable r) { - _taskThread = new TaskThread(r, TASK_EXECUTION_THREAD_NAME, TaskExecutorImpl.this); + _taskThread = new TaskThread(r, _name, TaskExecutorImpl.this); return _taskThread; } }); @@ -419,4 +429,23 @@ public class TaskExecutorImpl implements TaskExecutor return _taskExecutor; } } + + @Override + public Factory getFactory() + { + return new Factory() + { + @Override + public TaskExecutor newInstance() + { + return new TaskExecutorImpl(); + } + + @Override + public TaskExecutor newInstance(final String name) + { + return new TaskExecutorImpl(name); + } + }; + } } diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java index f9d51028f5..abdd79dc82 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java @@ -196,7 +196,7 @@ public abstract class AbstractConfiguredObject> im protected AbstractConfiguredObject(final Map, ConfiguredObject> parents, Map attributes) { - this(parents, attributes, parents.values().iterator().next().getTaskExecutor()); + this(parents, attributes, parents.values().iterator().next().getChildExecutor()); } @@ -1829,6 +1829,12 @@ public abstract class AbstractConfiguredObject> im return _taskExecutor; } + @Override + public TaskExecutor getChildExecutor() + { + return getTaskExecutor(); + } + protected final C runTask(Task task) { return _taskExecutor.run(task); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java index 6435124bd8..2a6c87c140 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java @@ -197,8 +197,6 @@ public interface Broker> extends ConfiguredObject, EventL Collection> getTrustStores(); - TaskExecutor getTaskExecutor(); - boolean isManagementMode(); AuthenticationProvider getAuthenticationProvider(SocketAddress localAddress); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java index d2ab317f0e..b058ec95b8 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java @@ -261,6 +261,8 @@ public interface ConfiguredObject> TaskExecutor getTaskExecutor(); + TaskExecutor getChildExecutor(); + ConfiguredObjectFactory getObjectFactory(); Model getModel(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java index c2338c08d8..24e8900b9e 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java @@ -166,9 +166,6 @@ public interface VirtualHost, Q extends Queue, void executeTransaction(TransactionalOperation op); - // TODO - remove this - TaskExecutor getTaskExecutor(); - E getExchange(UUID id); MessageStore getMessageStore(); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java index ebf09b46c3..104d6389ca 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java @@ -46,6 +46,7 @@ import org.slf4j.LoggerFactory; import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.server.configuration.IllegalConfigurationException; +import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.logging.EventLogger; import org.apache.qpid.server.logging.messages.ConfigStoreMessages; import org.apache.qpid.server.logging.subjects.MessageStoreLogSubject; @@ -91,6 +92,7 @@ public abstract class AbstractVirtualHostNode,ConfiguredObject>singletonMap(Broker.class, parent), attributes); + _virtualHostExecutor = getTaskExecutor().getFactory().newInstance("VirtualHostNode-"+getName()+"-Configuration-Thread"); + _virtualHostExecutor.start(); _broker = parent; SystemConfig systemConfig = _broker.getParent(SystemConfig.class); _eventLogger = systemConfig.getEventLogger(); @@ -111,6 +115,12 @@ public abstract class AbstractVirtualHostNode(); diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaTrustStoreTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaTrustStoreTest.java index 798d9fcbe5..13609ff868 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaTrustStoreTest.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/NonJavaTrustStoreTest.java @@ -51,6 +51,7 @@ public class NonJavaTrustStoreTest extends QpidTestCase super.setUp(); when(_broker.getTaskExecutor()).thenReturn(_taskExecutor); + when(_broker.getChildExecutor()).thenReturn(_taskExecutor); when(_broker.getModel()).thenReturn(_model); when(_broker.getSecurityManager()).thenReturn(_securityManager); } diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ManagedAuthenticationManagerTestBase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ManagedAuthenticationManagerTestBase.java index dd92d3ebca..65cf7ad9d9 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ManagedAuthenticationManagerTestBase.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ManagedAuthenticationManagerTestBase.java @@ -61,6 +61,7 @@ abstract class ManagedAuthenticationManagerTestBase extends QpidTestCase _broker = BrokerTestHelper.createBrokerMock(); _securityManager = mock(SecurityManager.class); when(_broker.getTaskExecutor()).thenReturn(_executor); + when(_broker.getChildExecutor()).thenReturn(_executor); when(_broker.getSecurityManager()).thenReturn(_securityManager); final Map attributesMap = new HashMap(); attributesMap.put(AuthenticationProvider.NAME, getTestName()); diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java index 7aaa437723..dbdf606fa6 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java @@ -42,6 +42,7 @@ import org.mockito.stubbing.Answer; import org.apache.qpid.common.AMQPFilterTypes; import org.apache.qpid.server.binding.BindingImpl; import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor; +import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.exchange.ExchangeImpl; import org.apache.qpid.server.logging.EventLogger; import org.apache.qpid.server.model.Binding; @@ -456,7 +457,9 @@ public abstract class AbstractDurableConfigurationStoreTestCase extends QpidTest when(queue.getAlternateExchange()).thenReturn(alternateExchange); when(queue.getCategoryClass()).thenReturn((Class)Queue.class); when(queue.isDurable()).thenReturn(true); - when(queue.getTaskExecutor()).thenReturn(CurrentThreadTaskExecutor.newStartedInstance()); + TaskExecutor taskExecutor = CurrentThreadTaskExecutor.newStartedInstance(); + when(queue.getTaskExecutor()).thenReturn(taskExecutor); + when(queue.getChildExecutor()).thenReturn(taskExecutor); final VirtualHostImpl vh = mock(VirtualHostImpl.class); when(vh.getSecurityManager()).thenReturn(mock(SecurityManager.class)); @@ -517,7 +520,9 @@ public abstract class AbstractDurableConfigurationStoreTestCase extends QpidTest when(exchange.isDurable()).thenReturn(true); when(exchange.getObjectFactory()).thenReturn(_factory); when(exchange.getModel()).thenReturn(_factory.getModel()); - when(exchange.getTaskExecutor()).thenReturn(CurrentThreadTaskExecutor.newStartedInstance()); + TaskExecutor taskExecutor = CurrentThreadTaskExecutor.newStartedInstance(); + when(exchange.getTaskExecutor()).thenReturn(taskExecutor); + when(exchange.getChildExecutor()).thenReturn(taskExecutor); ConfiguredObjectRecord exchangeRecord = mock(ConfiguredObjectRecord.class); when(exchangeRecord.getId()).thenReturn(_exchangeId); diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecovererTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecovererTest.java index 0e82eb6c73..2b65d30fe4 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecovererTest.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecovererTest.java @@ -88,6 +88,7 @@ public class VirtualHostStoreUpgraderAndRecovererTest extends QpidTestCase Broker broker = mock(Broker.class); when(broker.getParent(SystemConfig.class)).thenReturn(systemConfig); when(broker.getTaskExecutor()).thenReturn(_taskExecutor); + when(broker.getChildExecutor()).thenReturn(_taskExecutor); when(broker.getModel()).thenReturn(BrokerModel.getInstance()); _durableConfigurationStore = mock(DurableConfigurationStore.class); diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java index 0f256d0999..15be5c0282 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java @@ -101,6 +101,9 @@ public class BrokerTestHelper when(broker.getTaskExecutor()).thenReturn(TASK_EXECUTOR); when(systemConfig.getTaskExecutor()).thenReturn(TASK_EXECUTOR); + when(broker.getChildExecutor()).thenReturn(TASK_EXECUTOR); + when(systemConfig.getChildExecutor()).thenReturn(TASK_EXECUTOR); + return broker; } @@ -127,6 +130,7 @@ public class BrokerTestHelper VirtualHostNode virtualHostNode = mock(VirtualHostNode.class); when(virtualHostNode.getName()).thenReturn((String) attributes.get(VirtualHostNode.NAME)); when(virtualHostNode.getTaskExecutor()).thenReturn(TASK_EXECUTOR); + when(virtualHostNode.getChildExecutor()).thenReturn(TASK_EXECUTOR); when(virtualHostNode.getParent(eq(Broker.class))).thenReturn(broker); @@ -142,6 +146,8 @@ public class BrokerTestHelper when(virtualHostNode.getObjectFactory()).thenReturn(objectFactory); when(virtualHostNode.getCategoryClass()).thenReturn(VirtualHostNode.class); when(virtualHostNode.getTaskExecutor()).thenReturn(TASK_EXECUTOR); + when(virtualHostNode.getChildExecutor()).thenReturn(TASK_EXECUTOR); + AbstractVirtualHost host = (AbstractVirtualHost) objectFactory.create(VirtualHost.class, attributes, virtualHostNode ); host.start(); @@ -209,6 +215,7 @@ public class BrokerTestHelper when(virtualHost.getObjectFactory()).thenReturn(objectFactory); when(virtualHost.getModel()).thenReturn(objectFactory.getModel()); when(virtualHost.getTaskExecutor()).thenReturn(TASK_EXECUTOR); + when(virtualHost.getChildExecutor()).thenReturn(TASK_EXECUTOR); final Map attributes = new HashMap(); attributes.put(org.apache.qpid.server.model.Exchange.ID, UUIDGenerator.generateExchangeUUID("amp.direct", virtualHost.getName())); attributes.put(org.apache.qpid.server.model.Exchange.NAME, "amq.direct"); diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java index 5a99538edc..47fd5a7398 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/AbstractVirtualHostTest.java @@ -68,11 +68,13 @@ public class AbstractVirtualHostTest extends QpidTestCase _taskExecutor = new TaskExecutorImpl(); _taskExecutor.start(); when(broker.getTaskExecutor()).thenReturn(_taskExecutor); + when(broker.getChildExecutor()).thenReturn(_taskExecutor); _node = mock(VirtualHostNode.class); when(_node.getParent(Broker.class)).thenReturn(broker); when(_node.getModel()).thenReturn(BrokerModel.getInstance()); when(_node.getTaskExecutor()).thenReturn(_taskExecutor); + when(_node.getChildExecutor()).thenReturn(_taskExecutor); when(_node.getConfigurationStore()).thenReturn(mock(DurableConfigurationStore.class)); when(_node.getCategoryClass()).thenReturn(VirtualHostNode.class); diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java index fd6748f500..ad02208c6b 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java @@ -83,6 +83,7 @@ public class VirtualHostQueueCreationTest extends QpidTestCase when(broker.getSecurityManager()).thenReturn(securityManager); when(broker.getModel()).thenReturn(objectFactory.getModel()); when(broker.getTaskExecutor()).thenReturn(_taskExecutor); + when(broker.getChildExecutor()).thenReturn(_taskExecutor); _virtualHostNode = mock(VirtualHostNode.class); when(_virtualHostNode.getParent(Broker.class)).thenReturn(broker); @@ -90,6 +91,7 @@ public class VirtualHostQueueCreationTest extends QpidTestCase when(_virtualHostNode.getObjectFactory()).thenReturn(objectFactory); when(_virtualHostNode.getModel()).thenReturn(objectFactory.getModel()); when(_virtualHostNode.getTaskExecutor()).thenReturn(_taskExecutor); + when(_virtualHostNode.getChildExecutor()).thenReturn(_taskExecutor); when(((VirtualHostNode)_virtualHostNode).getCategoryClass()).thenReturn(VirtualHostNode.class); _virtualHost = createHost(); } diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java index deb93d6527..c188163904 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java @@ -83,6 +83,8 @@ public class AbstractStandardVirtualHostNodeTest extends QpidTestCase _taskExecutor = new CurrentThreadTaskExecutor(); _taskExecutor.start(); when(_broker.getTaskExecutor()).thenReturn(_taskExecutor); + when(_broker.getChildExecutor()).thenReturn(_taskExecutor); + } @Override diff --git a/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactoryTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactoryTest.java index 2a691b3652..c51ea64d9c 100644 --- a/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactoryTest.java +++ b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactoryTest.java @@ -58,6 +58,8 @@ public class ACLFileAccessControlProviderFactoryTest extends QpidTestCase TaskExecutor taskExecutor = new CurrentThreadTaskExecutor(); taskExecutor.start(); when(_broker.getTaskExecutor()).thenReturn(taskExecutor); + when(_broker.getChildExecutor()).thenReturn(taskExecutor); + } public void testCreateInstanceWhenAclFileIsNotPresent() diff --git a/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImplTest.java b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImplTest.java index 82c209bb6f..abe8c6fd9f 100644 --- a/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImplTest.java +++ b/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImplTest.java @@ -52,6 +52,7 @@ public class ACLFileAccessControlProviderImplTest extends QpidTestCase _broker = mock(Broker.class); when(_broker.getTaskExecutor()).thenReturn(_taskExecutor); + when(_broker.getChildExecutor()).thenReturn(_taskExecutor); when(_broker.getModel()).thenReturn(_model); when(_broker.getId()).thenReturn(UUID.randomUUID()); } diff --git a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java index 4327292336..aa3ebe055d 100644 --- a/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java +++ b/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/HttpManagementTest.java @@ -62,6 +62,8 @@ public class HttpManagementTest extends QpidTestCase TaskExecutor taskExecutor = new TaskExecutorImpl(); taskExecutor.start(); when(_broker.getTaskExecutor()).thenReturn(taskExecutor); + when(_broker.getChildExecutor()).thenReturn(taskExecutor); + Map attributes = new HashMap(); attributes.put(HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, false); diff --git a/qpid/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java b/qpid/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java index b243769b32..ab7d84e7fa 100644 --- a/qpid/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java +++ b/qpid/java/systests/src/test/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java @@ -132,6 +132,7 @@ public class VirtualHostMessageStoreTest extends QpidTestCase _taskExecutor = new TaskExecutorImpl(); _taskExecutor.start(); when(broker.getTaskExecutor()).thenReturn(_taskExecutor); + when(broker.getChildExecutor()).thenReturn(_taskExecutor); ConfiguredObjectFactory factory = broker.getObjectFactory(); Map nodeAttributes = new HashMap<>(); -- cgit v1.2.1