You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2016/11/01 10:21:30 UTC
[01/34] activemq-artemis git commit: ARTEMIS-817 and ARTEMIS-818
openwire fixes [Forced Update!]
Repository: activemq-artemis
Updated Branches:
refs/heads/ARTEMIS-780 14f930411 -> ec1762b1c (forced update)
ARTEMIS-817 and ARTEMIS-818 openwire fixes
https://issues.apache.org/jira/browse/ARTEMIS-817
https://issues.apache.org/jira/browse/ARTEMIS-818
issues around Openwire protocol, sending a null stream maessage via openwire causes a null pointer and if a topic is auto created with openwire then it cant be destroyed as it checks for the management queue.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/1a4a148b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/1a4a148b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/1a4a148b
Branch: refs/heads/ARTEMIS-780
Commit: 1a4a148ba96996ddfa94a99de9990ff7bfb83a00
Parents: ad8919d
Author: Andy Taylor <an...@gmail.com>
Authored: Mon Oct 24 14:41:19 2016 +0100
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Oct 25 12:00:37 2016 -0400
----------------------------------------------------------------------
.../protocol/openwire/OpenWireConnection.java | 9 ++++++-
.../openwire/OpenWireMessageConverter.java | 25 +++++++++++---------
.../openwire/SimpleOpenWireTest.java | 23 ++++++++++++++++++
3 files changed, 45 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1a4a148b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
index c6582bd..33418e6 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
@@ -815,7 +815,14 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
public void removeDestination(ActiveMQDestination dest) throws Exception {
if (dest.isQueue()) {
- server.destroyQueue(OpenWireUtil.toCoreAddress(dest));
+ try {
+ server.destroyQueue(OpenWireUtil.toCoreAddress(dest));
+ } catch (ActiveMQNonExistentQueueException neq) {
+ //this is ok, ActiveMQ 5 allows this and will actually do it quite often
+ ActiveMQServerLogger.LOGGER.debug("queue never existed");
+ }
+
+
} else {
Bindings bindings = server.getPostOffice().getBindingsForAddress(OpenWireUtil.toCoreAddress(dest));
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1a4a148b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
index 131cfd1..f49c972 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
@@ -499,18 +499,21 @@ public class OpenWireMessageConverter implements MessageConverter {
}
} else if (coreType == org.apache.activemq.artemis.api.core.Message.MAP_TYPE) {
TypedProperties mapData = new TypedProperties();
- mapData.decode(buffer);
-
- Map<String, Object> map = mapData.getMap();
- ByteArrayOutputStream out = new ByteArrayOutputStream(mapData.getEncodeSize());
- OutputStream os = out;
- if (isCompressed) {
- os = new DeflaterOutputStream(os);
- }
- try (DataOutputStream dataOut = new DataOutputStream(os)) {
- MarshallingSupport.marshalPrimitiveMap(map, dataOut);
+ //it could be a null map
+ if (buffer.readableBytes() > 0) {
+ mapData.decode(buffer);
+ Map<String, Object> map = mapData.getMap();
+ ByteArrayOutputStream out = new ByteArrayOutputStream(mapData.getEncodeSize());
+ OutputStream os = out;
+ if (isCompressed) {
+ os = new DeflaterOutputStream(os);
+ }
+ try (DataOutputStream dataOut = new DataOutputStream(os)) {
+ MarshallingSupport.marshalPrimitiveMap(map, dataOut);
+ }
+ bytes = out.toByteArray();
}
- bytes = out.toByteArray();
+
} else if (coreType == org.apache.activemq.artemis.api.core.Message.OBJECT_TYPE) {
int len = buffer.readInt();
bytes = new byte[len];
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1a4a148b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
index 9a2b8be..81f0f1b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
@@ -19,6 +19,7 @@ package org.apache.activemq.artemis.tests.integration.openwire;
import javax.jms.Connection;
import javax.jms.Destination;
import javax.jms.JMSException;
+import javax.jms.MapMessage;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.MessageListener;
@@ -128,6 +129,28 @@ public class SimpleOpenWireTest extends BasicOpenWireTest {
}
@Test
+ public void testSendNullMapMessage() throws Exception {
+ try (Connection connection = factory.createConnection()) {
+
+ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Queue queue = session.createQueue(queueName);
+ System.out.println("Queue:" + queue);
+ MessageProducer producer = session.createProducer(queue);
+ MessageConsumer consumer = session.createConsumer(queue);
+ producer.send(session.createMapMessage());
+
+ Assert.assertNull(consumer.receive(100));
+ connection.start();
+
+ MapMessage message = (MapMessage) consumer.receive(5000);
+
+ Assert.assertNotNull(message);
+
+ message.acknowledge();
+ }
+ }
+
+ @Test
public void testXASimple() throws Exception {
XAConnection connection = xaFactory.createXAConnection();
[05/34] activemq-artemis git commit: ARTEMIS-824: Add management
routines for connector services
Posted by ma...@apache.org.
ARTEMIS-824: Add management routines for connector services
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/1b7033a2
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/1b7033a2
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/1b7033a2
Branch: refs/heads/ARTEMIS-780
Commit: 1b7033a20e3e529595ce1ae28b4b389bfd220e43
Parents: 2dfd144
Author: Ulf Lilleengen <lu...@redhat.com>
Authored: Tue Oct 25 15:40:37 2016 +0200
Committer: Ulf Lilleengen <lu...@redhat.com>
Committed: Wed Oct 26 10:11:11 2016 +0200
----------------------------------------------------------------------
.../core/management/ActiveMQServerControl.java | 12 +++++
.../impl/ActiveMQServerControlImpl.java | 43 +++++++++++++++
.../artemis/core/server/ServiceRegistry.java | 8 +++
.../core/server/impl/ConnectorsService.java | 57 ++++++++++++--------
.../core/server/impl/ServiceRegistryImpl.java | 44 +++++++--------
.../management/ActiveMQServerControlTest.java | 16 ++++++
.../ActiveMQServerControlUsingCoreTest.java | 17 ++++++
.../core/config/impl/ConnectorsServiceTest.java | 48 ++++++++++++++++-
8 files changed, 196 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1b7033a2/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
index 01a8d74..075a5ef 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ActiveMQServerControl.java
@@ -17,6 +17,7 @@
package org.apache.activemq.artemis.api.core.management;
import javax.management.MBeanOperationInfo;
+import java.util.Map;
/**
* An ActiveMQServerControl is used to manage ActiveMQ Artemis servers.
@@ -850,6 +851,17 @@ public interface ActiveMQServerControl {
@Operation(desc = "Destroy a bridge", impact = MBeanOperationInfo.ACTION)
void destroyBridge(@Parameter(name = "name", desc = "Name of the bridge") String name) throws Exception;
+ @Operation(desc = "Create a connector service", impact = MBeanOperationInfo.ACTION)
+ void createConnectorService(@Parameter(name = "name", desc = "Name of the connector service") String name,
+ @Parameter(name = "factoryClass", desc = "Class name of the connector service factory") String factoryClass,
+ @Parameter(name = "parameters", desc = "Parameter specific to the connector service") Map<String, Object> parameters) throws Exception;
+
+ @Operation(desc = "Destroy a connector service", impact = MBeanOperationInfo.ACTION)
+ void destroyConnectorService(@Parameter(name = "name", desc = "Name of the connector service") String name) throws Exception;
+
+ @Attribute(desc = "names of the connector services on this server")
+ String[] getConnectorServices();
+
@Operation(desc = "force the server to stop and notify clients to failover", impact = MBeanOperationInfo.UNKNOWN)
void forceFailover() throws Exception;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1b7033a2/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
index 5918ec4..fb7deee 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
@@ -52,6 +52,7 @@ import org.apache.activemq.artemis.api.core.management.DivertControl;
import org.apache.activemq.artemis.api.core.management.QueueControl;
import org.apache.activemq.artemis.core.config.BridgeConfiguration;
import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.ConnectorServiceConfiguration;
import org.apache.activemq.artemis.core.config.DivertConfiguration;
import org.apache.activemq.artemis.core.messagecounter.MessageCounterManager;
import org.apache.activemq.artemis.core.messagecounter.impl.MessageCounterManagerImpl;
@@ -68,6 +69,7 @@ import org.apache.activemq.artemis.core.security.Role;
import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
+import org.apache.activemq.artemis.core.server.ConnectorServiceFactory;
import org.apache.activemq.artemis.core.server.Consumer;
import org.apache.activemq.artemis.core.server.JournalType;
import org.apache.activemq.artemis.core.server.Queue;
@@ -1851,6 +1853,47 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
}
@Override
+ public void createConnectorService(final String name, final String factoryClass, final Map<String, Object> parameters) throws Exception {
+ checkStarted();
+
+ clearIO();
+
+ try {
+ final ConnectorServiceConfiguration config = new ConnectorServiceConfiguration().setName(name).setFactoryClassName(factoryClass).setParams(parameters);
+ ConnectorServiceFactory factory = server.getServiceRegistry().getConnectorService(config);
+ server.getConnectorsService().createService(config, factory);
+ } finally {
+ blockOnIO();
+ }
+ }
+
+ @Override
+ public void destroyConnectorService(final String name) throws Exception {
+ checkStarted();
+
+ clearIO();
+
+ try {
+ server.getConnectorsService().destroyService(name);
+ } finally {
+ blockOnIO();
+ }
+ }
+
+ @Override
+ public String[] getConnectorServices() {
+ checkStarted();
+
+ clearIO();
+
+ try {
+ return server.getConnectorsService().getConnectors().keySet().toArray(new String[0]);
+ } finally {
+ blockOnIO();
+ }
+ }
+
+ @Override
public void forceFailover() throws Exception {
checkStarted();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1b7033a2/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServiceRegistry.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServiceRegistry.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServiceRegistry.java
index 4f2ef9d..b0fa658 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServiceRegistry.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServiceRegistry.java
@@ -54,6 +54,14 @@ public interface ServiceRegistry {
*/
Collection<Pair<ConnectorServiceFactory, ConnectorServiceConfiguration>> getConnectorServices(List<ConnectorServiceConfiguration> configs);
+ /**
+ * Get connector service for a given configuration.
+ *
+ * @param configuration The connector service configuration.
+ * @return an instance of the connector service factory.
+ */
+ ConnectorServiceFactory getConnectorService(ConnectorServiceConfiguration configuration);
+
void addIncomingInterceptor(BaseInterceptor interceptor);
/**
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1b7033a2/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ConnectorsService.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ConnectorsService.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ConnectorsService.java
index 1397070..897d27c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ConnectorsService.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ConnectorsService.java
@@ -17,10 +17,13 @@
package org.apache.activemq.artemis.core.server.impl;
import java.util.Collection;
-import java.util.HashSet;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Set;
import java.util.concurrent.ScheduledExecutorService;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
import org.apache.activemq.artemis.api.core.Pair;
import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.config.ConnectorServiceConfiguration;
@@ -52,7 +55,7 @@ public final class ConnectorsService implements ActiveMQComponent {
private final Configuration configuration;
- private final Set<ConnectorService> connectors = new HashSet<>();
+ private final Map<String, ConnectorService> connectors = new HashMap<>();
private final ServiceRegistry serviceRegistry;
@@ -69,51 +72,61 @@ public final class ConnectorsService implements ActiveMQComponent {
}
@Override
- public void start() throws Exception {
+ public synchronized void start() throws Exception {
Collection<Pair<ConnectorServiceFactory, ConnectorServiceConfiguration>> connectorServiceFactories = serviceRegistry.getConnectorServices(configuration.getConnectorServiceConfigurations());
for (Pair<ConnectorServiceFactory, ConnectorServiceConfiguration> pair : connectorServiceFactories) {
- createService(pair.getB(), pair.getA());
- }
-
- for (ConnectorService connector : connectors) {
try {
- connector.start();
+ createService(pair.getB(), pair.getA());
} catch (Throwable e) {
- ActiveMQServerLogger.LOGGER.errorStartingConnectorService(e, connector.getName());
+ ActiveMQServerLogger.LOGGER.errorStartingConnectorService(e, pair.getB().getConnectorName());
}
}
+
isStarted = true;
}
- public void createService(ConnectorServiceConfiguration info, ConnectorServiceFactory factory) {
+ public synchronized void createService(ConnectorServiceConfiguration info, ConnectorServiceFactory factory) throws Exception {
+ if (connectors.containsKey(info.getConnectorName())) {
+ throw ActiveMQExceptionType.GENERIC_EXCEPTION.createException("Connector service " + info.getConnectorName() + " already created");
+ }
+
if (info.getParams() != null) {
Set<String> invalid = ConfigurationHelper.checkKeys(factory.getAllowableProperties(), info.getParams().keySet());
if (!invalid.isEmpty()) {
- ActiveMQServerLogger.LOGGER.connectorKeysInvalid(ConfigurationHelper.stringSetToCommaListString(invalid));
- return;
+ throw ActiveMQExceptionType.GENERIC_EXCEPTION.createException("Invalid connector keys for connector service " + info.getConnectorName() + ": " + ConfigurationHelper.stringSetToCommaListString(invalid));
}
}
Set<String> invalid = ConfigurationHelper.checkKeysExist(factory.getRequiredProperties(), info.getParams().keySet());
if (!invalid.isEmpty()) {
- ActiveMQServerLogger.LOGGER.connectorKeysMissing(ConfigurationHelper.stringSetToCommaListString(invalid));
- return;
+ throw ActiveMQExceptionType.GENERIC_EXCEPTION.createException("Missing connector keys for connector service " + info.getConnectorName() + ": " + ConfigurationHelper.stringSetToCommaListString(invalid));
}
ConnectorService connectorService = factory.createConnectorService(info.getConnectorName(), info.getParams(), storageManager, postOffice, scheduledPool);
- connectors.add(connectorService);
+ connectorService.start();
+
+ connectors.put(info.getConnectorName(), connectorService);
+ }
+
+ public synchronized void destroyService(String name) throws Exception {
+ if (!connectors.containsKey(name)) {
+ throw ActiveMQExceptionType.GENERIC_EXCEPTION.createException("Connector service " + name + " does not exist");
+ }
+ ConnectorService connectorService = connectors.get(name);
+ connectorService.stop();
+ connectors.remove(name);
}
@Override
- public void stop() throws Exception {
+ public synchronized void stop() throws Exception {
if (!isStarted) {
return;
}
- for (ConnectorService connector : connectors) {
+ for (Map.Entry<String, ConnectorService> connector : connectors.entrySet()) {
try {
- connector.stop();
+ connector.getValue().stop();
} catch (Throwable e) {
- ActiveMQServerLogger.LOGGER.errorStoppingConnectorService(e, connector.getName());
+ ActiveMQServerLogger.LOGGER.errorStoppingConnectorService(e, connector.getKey());
}
}
connectors.clear();
@@ -121,11 +134,11 @@ public final class ConnectorsService implements ActiveMQComponent {
}
@Override
- public boolean isStarted() {
+ public synchronized boolean isStarted() {
return isStarted;
}
- public Set<ConnectorService> getConnectors() {
- return connectors;
+ public synchronized Map<String, ConnectorService> getConnectors() {
+ return Collections.unmodifiableMap(connectors);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1b7033a2/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
index d2d66a4..4add7b5 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
@@ -103,12 +103,7 @@ public class ServiceRegistryImpl implements ServiceRegistry {
if (configs != null) {
for (final ConnectorServiceConfiguration config : configs) {
if (connectorServices.get(config.getConnectorName()) == null) {
- ConnectorServiceFactory factory = AccessController.doPrivileged(new PrivilegedAction<ConnectorServiceFactory>() {
- @Override
- public ConnectorServiceFactory run() {
- return (ConnectorServiceFactory) ClassloadingUtil.newInstanceFromClassLoader(config.getFactoryClassName());
- }
- });
+ ConnectorServiceFactory factory = loadClass(config.getFactoryClassName());
addConnectorService(factory, config);
}
}
@@ -118,6 +113,11 @@ public class ServiceRegistryImpl implements ServiceRegistry {
}
@Override
+ public ConnectorServiceFactory getConnectorService(ConnectorServiceConfiguration configuration) {
+ return loadClass(configuration.getFactoryClassName());
+ }
+
+ @Override
public void addIncomingInterceptor(BaseInterceptor interceptor) {
incomingInterceptors.add(interceptor);
}
@@ -184,13 +184,7 @@ public class ServiceRegistryImpl implements ServiceRegistry {
AcceptorFactory factory = acceptorFactories.get(name);
if (factory == null && className != null) {
- factory = AccessController.doPrivileged(new PrivilegedAction<AcceptorFactory>() {
- @Override
- public AcceptorFactory run() {
- return (AcceptorFactory) ClassloadingUtil.newInstanceFromClassLoader(className);
- }
- });
-
+ factory = loadClass(className);
addAcceptorFactory(name, factory);
}
@@ -202,17 +196,21 @@ public class ServiceRegistryImpl implements ServiceRegistry {
acceptorFactories.put(name, acceptorFactory);
}
+ public <T> T loadClass(final String className) {
+ return AccessController.doPrivileged(new PrivilegedAction<T>() {
+ @Override
+ public T run() {
+ return (T) ClassloadingUtil.newInstanceFromClassLoader(className);
+ }
+ });
+ }
+
private Transformer instantiateTransformer(final String className) {
Transformer transformer = null;
if (className != null) {
try {
- transformer = AccessController.doPrivileged(new PrivilegedAction<Transformer>() {
- @Override
- public Transformer run() {
- return (Transformer) ClassloadingUtil.newInstanceFromClassLoader(className);
- }
- });
+ transformer = loadClass(className);
} catch (Exception e) {
throw ActiveMQMessageBundle.BUNDLE.errorCreatingTransformerClass(e, className);
}
@@ -223,13 +221,7 @@ public class ServiceRegistryImpl implements ServiceRegistry {
private void instantiateInterceptors(List<String> classNames, List<BaseInterceptor> interceptors) {
if (classNames != null) {
for (final String className : classNames) {
- BaseInterceptor interceptor = AccessController.doPrivileged(new PrivilegedAction<BaseInterceptor>() {
- @Override
- public BaseInterceptor run() {
- return (BaseInterceptor) ClassloadingUtil.newInstanceFromClassLoader(className);
- }
- });
-
+ BaseInterceptor interceptor = loadClass(className);
interceptors.add(interceptor);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1b7033a2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
index d040b8a..7dd2d0b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
@@ -58,6 +58,7 @@ import org.apache.activemq.artemis.jlibaio.LibaioContext;
import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager;
import org.apache.activemq.artemis.spi.core.security.jaas.InVMLoginModule;
import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.unit.core.config.impl.fakes.FakeConnectorServiceFactory;
import org.apache.activemq.artemis.utils.RandomUtil;
import org.apache.activemq.artemis.utils.UUIDGenerator;
import org.junit.Assert;
@@ -1327,6 +1328,21 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
Assert.assertEquals(1, second.getJsonNumber("consumerCount").longValue());
}
+ @Test
+ public void testConnectorServiceManagement() throws Exception {
+ ActiveMQServerControl managementControl = createManagementControl();
+ managementControl.createConnectorService("myconn", FakeConnectorServiceFactory.class.getCanonicalName(), new HashMap<String, Object>());
+
+ Assert.assertEquals(1, server.getConnectorsService().getConnectors().size());
+
+ managementControl.createConnectorService("myconn2", FakeConnectorServiceFactory.class.getCanonicalName(), new HashMap<String, Object>());
+ Assert.assertEquals(2, server.getConnectorsService().getConnectors().size());
+
+ managementControl.destroyConnectorService("myconn");
+ Assert.assertEquals(1, server.getConnectorsService().getConnectors().size());
+ Assert.assertEquals("myconn2", managementControl.getConnectorServices()[0]);
+ }
+
protected void scaleDown(ScaleDownHandler handler) throws Exception {
SimpleString address = new SimpleString("testQueue");
HashMap<String, Object> params = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1b7033a2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
index 777ddd2..60187f0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
@@ -20,6 +20,8 @@ import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;
import org.apache.activemq.artemis.api.core.management.Parameter;
import org.apache.activemq.artemis.api.core.management.ResourceNames;
+import java.util.Map;
+
public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTest {
// Constants -----------------------------------------------------
@@ -628,6 +630,21 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes
}
@Override
+ public void createConnectorService(String name, String factoryClass, Map<String, Object> parameters) throws Exception {
+ proxy.invokeOperation("createConnectorService", name, factoryClass, parameters);
+ }
+
+ @Override
+ public void destroyConnectorService(String name) throws Exception {
+ proxy.invokeOperation("destroyConnectorService", name);
+ }
+
+ @Override
+ public String[] getConnectorServices() {
+ return ActiveMQServerControlUsingCoreTest.toStringArray((Object[]) proxy.retrieveAttributeValue("connectorServices"));
+ }
+
+ @Override
public void forceFailover() throws Exception {
proxy.invokeOperation("forceFailover");
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/1b7033a2/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConnectorsServiceTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConnectorsServiceTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConnectorsServiceTest.java
index aee7a71..00f0663 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConnectorsServiceTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/config/impl/ConnectorsServiceTest.java
@@ -17,6 +17,7 @@
package org.apache.activemq.artemis.tests.unit.core.config.impl;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -65,7 +66,7 @@ public class ConnectorsServiceTest extends ActiveMQTestBase {
connectorsService.start();
assertTrue(connectorsService.getConnectors().size() == 1);
- assertTrue(connectorsService.getConnectors().contains(connectorServiceFactory.getConnectorService()));
+ assertTrue(connectorsService.getConnectors().values().contains(connectorServiceFactory.getConnectorService()));
}
/**
@@ -86,4 +87,49 @@ public class ConnectorsServiceTest extends ActiveMQTestBase {
assertTrue(connectorsService.getConnectors().size() == 1);
}
+
+ /**
+ * Test that connectors can be created and destroyed directly.
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testConnectorServiceUsedDirectly() throws Exception {
+ // Initial setup with existing connector service
+ ConnectorServiceConfiguration connectorServiceConfiguration = new ConnectorServiceConfiguration().setFactoryClassName(FakeConnectorServiceFactory.class.getCanonicalName()).setParams(new HashMap<String, Object>()).setName("myfact");
+ configuration.setConnectorServiceConfigurations(Arrays.asList(connectorServiceConfiguration));
+
+ ConnectorsService connectorsService = new ConnectorsService(configuration, null, null, null, serviceRegistry);
+ connectorsService.start();
+ assertEquals(1, connectorsService.getConnectors().size());
+
+
+ // Add with same name
+ FakeConnectorServiceFactory connectorServiceFactory = new FakeConnectorServiceFactory();
+ try {
+ connectorsService.createService(connectorServiceConfiguration, connectorServiceFactory);
+ assertTrue("Expected exception when creating service with same name", false);
+ } catch (Exception e) {
+ }
+
+
+ // Add unique with same factory
+ ConnectorServiceConfiguration additionalServiceConfiguration = new ConnectorServiceConfiguration().setFactoryClassName(FakeConnectorServiceFactory.class.getCanonicalName()).setParams(new HashMap<String, Object>()).setName("myfact2");
+ connectorsService.createService(additionalServiceConfiguration, connectorServiceFactory);
+ assertEquals(2, connectorsService.getConnectors().size());
+
+ // Destroy existing connector services
+ connectorsService.destroyService("myfact");
+ assertEquals(1, connectorsService.getConnectors().size());
+
+ connectorsService.destroyService("myfact2");
+ assertEquals(0, connectorsService.getConnectors().size());
+
+ // Destroy non-existing connector service
+ try {
+ connectorsService.destroyService("myfact");
+ assertTrue("Expected exception when destroying non-existing service", false);
+ } catch (Exception e) {
+ }
+ }
}
[16/34] activemq-artemis git commit: ARTEMIS-829 Removing messages
re-encoding
Posted by ma...@apache.org.
ARTEMIS-829 Removing messages re-encoding
https://issues.apache.org/jira/browse/ARTEMIS-829
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e0021252
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e0021252
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e0021252
Branch: refs/heads/ARTEMIS-780
Commit: e0021252ee94dcafe664520e080d5a6e13e3350f
Parents: 4b5cbb8
Author: Clebert Suconic <cl...@apache.org>
Authored: Mon Oct 24 18:20:20 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Oct 28 16:54:58 2016 -0400
----------------------------------------------------------------------
.../core/client/impl/ClientProducerImpl.java | 2 -
.../core/client/impl/ClientSessionImpl.java | 26 +--
.../core/client/impl/ClientSessionInternal.java | 2 -
.../core/impl/ActiveMQSessionContext.java | 10 +-
.../spi/core/remoting/SessionContext.java | 3 +-
.../client/HornetQClientSessionContext.java | 5 +-
.../tests/extras/byteman/PagingLeakTest.java | 14 +-
.../tests/integration/client/ProducerTest.java | 6 +-
.../cluster/failover/BackupSyncJournalTest.java | 2 +-
.../journal/NIOJournalCompactTest.java | 180 ++++++++++---------
.../journal/ValidateTransactionHealthTest.java | 25 +--
.../tests/integration/paging/PagingTest.java | 12 +-
12 files changed, 140 insertions(+), 147 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e0021252/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
index fddd4de..1dfbe72 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
@@ -284,8 +284,6 @@ public class ClientProducerImpl implements ClientProducerInternal {
theCredits.acquireCredits(creditSize);
- session.checkDefaultAddress(sendingAddress);
-
sessionContext.sendFullMessage(msgI, sendBlocking, handler, address);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e0021252/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
index de45066..fd6355a 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
@@ -135,8 +135,6 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
private volatile boolean mayAttemptToFailover = true;
- private volatile SimpleString defaultAddress;
-
/**
* Current XID. this will be used in case of failover
*/
@@ -957,7 +955,7 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
// want
// to recreate the session, we just want to unblock the blocking call
if (!inClose && mayAttemptToFailover) {
- sessionContext.recreateSession(username, password, minLargeMessageSize, xa, autoCommitSends, autoCommitAcks, preAcknowledge, defaultAddress);
+ sessionContext.recreateSession(username, password, minLargeMessageSize, xa, autoCommitSends, autoCommitAcks, preAcknowledge);
for (Map.Entry<ConsumerContext, ClientConsumerInternal> entryx : consumers.entrySet()) {
@@ -1036,27 +1034,9 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
@Override
public void setAddress(final Message message, final SimpleString address) {
- if (defaultAddress == null) {
- logger.tracef("setAddress() Setting default address as %s", address);
+ logger.tracef("setAddress() Setting default address as %s", address);
- message.setAddress(address);
- } else {
- if (!address.equals(defaultAddress)) {
- logger.tracef("setAddress() setting non default address %s on message", address);
- message.setAddress(address);
- } else {
- logger.trace("setAddress() being set as null");
- message.setAddress(null);
- }
- }
- }
-
- @Override
- public void checkDefaultAddress(SimpleString address) {
- if (defaultAddress == null) {
- logger.tracef("checkDefaultAddress(%s)", address);
- defaultAddress = address;
- }
+ message.setAddress(address);
}
@Override
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e0021252/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java
index ed636bd..4e06068 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionInternal.java
@@ -93,8 +93,6 @@ public interface ClientSessionInternal extends ClientSession {
*/
void setAddress(Message message, SimpleString address);
- void checkDefaultAddress(SimpleString address);
-
void setPacketSize(int packetSize);
void resetIfNeeded() throws ActiveMQException;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e0021252/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
index c72e19b..56c7135 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/ActiveMQSessionContext.java
@@ -629,9 +629,8 @@ public class ActiveMQSessionContext extends SessionContext {
final boolean xa,
final boolean autoCommitSends,
final boolean autoCommitAcks,
- final boolean preAcknowledge,
- final SimpleString defaultAddress) throws ActiveMQException {
- Packet createRequest = newCreateSession(username, password, minLargeMessageSize, xa, autoCommitSends, autoCommitAcks, preAcknowledge, defaultAddress);
+ final boolean preAcknowledge) throws ActiveMQException {
+ Packet createRequest = newCreateSession(username, password, minLargeMessageSize, xa, autoCommitSends, autoCommitAcks, preAcknowledge);
boolean retry;
do {
try {
@@ -662,9 +661,8 @@ public class ActiveMQSessionContext extends SessionContext {
boolean xa,
boolean autoCommitSends,
boolean autoCommitAcks,
- boolean preAcknowledge,
- SimpleString defaultAddress) {
- return new CreateSessionMessage(name, sessionChannel.getID(), VersionLoader.getVersion().getIncrementingVersion(), username, password, minLargeMessageSize, xa, autoCommitSends, autoCommitAcks, preAcknowledge, confirmationWindow, defaultAddress == null ? null : defaultAddress.toString());
+ boolean preAcknowledge) {
+ return new CreateSessionMessage(name, sessionChannel.getID(), VersionLoader.getVersion().getIncrementingVersion(), username, password, minLargeMessageSize, xa, autoCommitSends, autoCommitAcks, preAcknowledge, confirmationWindow, null);
}
@Override
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e0021252/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java
index 175360c..1f15cc6 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/spi/core/remoting/SessionContext.java
@@ -250,8 +250,7 @@ public abstract class SessionContext {
final boolean xa,
final boolean autoCommitSends,
final boolean autoCommitAcks,
- final boolean preAcknowledge,
- final SimpleString defaultAddress) throws ActiveMQException;
+ final boolean preAcknowledge) throws ActiveMQException;
public abstract void recreateConsumerOnServer(ClientConsumerInternal consumerInternal) throws ActiveMQException;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e0021252/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientSessionContext.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientSessionContext.java b/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientSessionContext.java
index d932274..caa94a1 100644
--- a/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientSessionContext.java
+++ b/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientSessionContext.java
@@ -63,9 +63,8 @@ public class HornetQClientSessionContext extends ActiveMQSessionContext {
boolean xa,
boolean autoCommitSends,
boolean autoCommitAcks,
- boolean preAcknowledge,
- SimpleString defaultAddress) {
- return new CreateSessionMessage(getName(), getSessionChannel().getID(), 123, username, password, minLargeMessageSize, xa, autoCommitSends, autoCommitAcks, preAcknowledge, getConfirmationWindow(), defaultAddress == null ? null : defaultAddress.toString());
+ boolean preAcknowledge) {
+ return new CreateSessionMessage(getName(), getSessionChannel().getID(), 123, username, password, minLargeMessageSize, xa, autoCommitSends, autoCommitAcks, preAcknowledge, getConfirmationWindow(), null);
}
@Override
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e0021252/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
index f9744d2..4ffd2bd 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
@@ -34,6 +34,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServers;
import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.apache.activemq.artemis.tests.util.Wait;
import org.jboss.byteman.contrib.bmunit.BMRule;
import org.jboss.byteman.contrib.bmunit.BMRules;
import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
@@ -92,10 +93,13 @@ public class PagingLeakTest extends ActiveMQTestBase {
positions.clear();
- timeout = System.currentTimeMillis() + 5000;
- while (pagePosInstances.get() != 0 && timeout > System.currentTimeMillis()) {
- forceGC();
- }
+ Wait.waitFor(new Wait.Condition() {
+ @Override
+ public boolean isSatisfied() throws Exception {
+ forceGC();
+ return pagePosInstances.get() == 0;
+ }
+ }, 5000, 100);
// This is just to validate the rules are correctly applied on byteman
assertEquals("You have changed something on PagePositionImpl in such way that these byteman rules are no longer working", 0, pagePosInstances.get());
@@ -110,7 +114,7 @@ public class PagingLeakTest extends ActiveMQTestBase {
server.start();
- AddressSettings settings = new AddressSettings().setPageSizeBytes(2 * 1024).setMaxSizeBytes(20 * 1024).setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
+ AddressSettings settings = new AddressSettings().setPageSizeBytes(2 * 1024).setMaxSizeBytes(10 * 1024).setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
server.getAddressSettingsRepository().addMatch("#", settings);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e0021252/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerTest.java
index c409d5f..d7af4b8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerTest.java
@@ -104,12 +104,12 @@ public class ProducerTest extends ActiveMQTestBase {
ClientProducer producer = session.createProducer();
for (int i = 0; i < 62; i++) {
- if (i == 61) {
+ if (i == 30) {
// the point where the send would block
latch.countDown();
}
ClientMessage msg = session.createMessage(false);
- msg.getBodyBuffer().writeBytes(new byte[1024]);
+ msg.getBodyBuffer().writeBytes(new byte[2048]);
producer.send(QUEUE, msg);
}
} catch (Exception e) {
@@ -119,7 +119,7 @@ public class ProducerTest extends ActiveMQTestBase {
};
t.start();
- assertTrue(latch.await(5, TimeUnit.SECONDS));
+ assertTrue(latch.await(10, TimeUnit.SECONDS));
session.close();
t.join(5000);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e0021252/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java
index 20ddae3..b51ff8a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupSyncJournalTest.java
@@ -93,7 +93,7 @@ public class BackupSyncJournalTest extends FailoverTestBase {
@Test
public void testReserveFileIdValuesOnBackup() throws Exception {
- final int totalRounds = 50;
+ final int totalRounds = 5;
createProducerSendSomeMessages();
JournalImpl messageJournal = getMessageJournalFromServer(liveServer);
for (int i = 0; i < totalRounds; i++) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e0021252/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
index ee1ac11..2dd38ae 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
@@ -730,7 +730,6 @@ public class NIOJournalCompactTest extends JournalImplTestBase {
@Test
public void testCompactAddAndUpdateFollowedByADelete() throws Exception {
-
setup(2, 60 * 1024, false);
SimpleIDGenerator idGen = new SimpleIDGenerator(1000);
@@ -779,7 +778,6 @@ public class NIOJournalCompactTest extends JournalImplTestBase {
createJournal();
startJournal();
loadAndCheck();
-
}
@Test
@@ -1610,8 +1608,9 @@ public class NIOJournalCompactTest extends JournalImplTestBase {
}
+
@Test
- public void testStressDeletesNoSync() throws Exception {
+ public void testStressDeletesNoSync() throws Throwable {
Configuration config = createBasicConfig().setJournalFileSize(100 * 1024).setJournalSyncNonTransactional(false).setJournalSyncTransactional(false).setJournalCompactMinFiles(0).setJournalCompactPercentage(0);
final AtomicInteger errors = new AtomicInteger(0);
@@ -1629,114 +1628,129 @@ public class NIOJournalCompactTest extends JournalImplTestBase {
final JournalStorageManager storage = new JournalStorageManager(config, factory);
storage.start();
- storage.loadInternalOnly();
-
- ((JournalImpl) storage.getMessageJournal()).setAutoReclaim(false);
- final LinkedList<Long> survivingMsgs = new LinkedList<>();
- Runnable producerRunnable = new Runnable() {
- @Override
- public void run() {
- try {
- while (running.get()) {
- final long[] values = new long[100];
- long tx = seqGenerator.incrementAndGet();
+ try {
+ storage.loadInternalOnly();
- OperationContextImpl ctx = new OperationContextImpl(executor);
- storage.setContext(ctx);
+ ((JournalImpl) storage.getMessageJournal()).setAutoReclaim(false);
+ final LinkedList<Long> survivingMsgs = new LinkedList<>();
- for (int i = 0; i < 100; i++) {
- long id = seqGenerator.incrementAndGet();
- values[i] = id;
+ Runnable producerRunnable = new Runnable() {
+ @Override
+ public void run() {
+ try {
+ while (running.get()) {
+ final long[] values = new long[100];
+ long tx = seqGenerator.incrementAndGet();
- ServerMessageImpl message = new ServerMessageImpl(id, 100);
+ OperationContextImpl ctx = new OperationContextImpl(executor);
+ storage.setContext(ctx);
- message.getBodyBuffer().writeBytes(new byte[1024]);
+ for (int i = 0; i < 100; i++) {
+ long id = seqGenerator.incrementAndGet();
+ values[i] = id;
- storage.storeMessageTransactional(tx, message);
- }
- ServerMessageImpl message = new ServerMessageImpl(seqGenerator.incrementAndGet(), 100);
+ ServerMessageImpl message = new ServerMessageImpl(id, 100);
- survivingMsgs.add(message.getMessageID());
+ message.getBodyBuffer().writeBytes(new byte[1024]);
- // This one will stay here forever
- storage.storeMessage(message);
-
- storage.commit(tx);
-
- ctx.executeOnCompletion(new IOCallback() {
- @Override
- public void onError(int errorCode, String errorMessage) {
+ storage.storeMessageTransactional(tx, message);
}
-
- @Override
- public void done() {
- deleteExecutor.execute(new Runnable() {
- @Override
- public void run() {
- try {
- for (long messageID : values) {
- storage.deleteMessage(messageID);
+ ServerMessageImpl message = new ServerMessageImpl(seqGenerator.incrementAndGet(), 100);
+
+ survivingMsgs.add(message.getMessageID());
+
+ // This one will stay here forever
+ storage.storeMessage(message);
+
+ storage.commit(tx);
+
+ ctx.executeOnCompletion(new IOCallback() {
+ @Override
+ public void onError(int errorCode, String errorMessage) {
+ }
+
+ @Override
+ public void done() {
+ deleteExecutor.execute(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ for (long messageID : values) {
+ storage.deleteMessage(messageID);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ errors.incrementAndGet();
}
- } catch (Exception e) {
- e.printStackTrace();
- errors.incrementAndGet();
- }
- }
- });
- }
- });
+ }
+ });
+ }
+ });
+ }
+ } catch (Throwable e) {
+ e.printStackTrace();
+ errors.incrementAndGet();
}
- } catch (Throwable e) {
- e.printStackTrace();
- errors.incrementAndGet();
}
- }
- };
-
- Runnable compressRunnable = new Runnable() {
- @Override
- public void run() {
- try {
- while (running.get()) {
- Thread.sleep(500);
- System.out.println("Compacting");
- ((JournalImpl) storage.getMessageJournal()).testCompact();
- ((JournalImpl) storage.getMessageJournal()).checkReclaimStatus();
+ };
+
+ Runnable compressRunnable = new Runnable() {
+ @Override
+ public void run() {
+ try {
+ while (running.get()) {
+ Thread.sleep(500);
+ System.out.println("Compacting");
+ ((JournalImpl) storage.getMessageJournal()).testCompact();
+ ((JournalImpl) storage.getMessageJournal()).checkReclaimStatus();
+ }
+ } catch (Throwable e) {
+ e.printStackTrace();
+ errors.incrementAndGet();
}
- } catch (Throwable e) {
- e.printStackTrace();
- errors.incrementAndGet();
+
}
+ };
- }
- };
+ Thread producerThread = new Thread(producerRunnable);
+ producerThread.start();
- Thread producerThread = new Thread(producerRunnable);
- producerThread.start();
+ Thread compactorThread = new Thread(compressRunnable);
+ compactorThread.start();
- Thread compactorThread = new Thread(compressRunnable);
- compactorThread.start();
+ Thread.sleep(1000);
- Thread.sleep(1000);
+ running.set(false);
- running.set(false);
+ producerThread.join();
- producerThread.join();
+ compactorThread.join();
- compactorThread.join();
+ deleteExecutor.shutdown();
- storage.stop();
+ assertTrue("delete executor terminated", deleteExecutor.awaitTermination(30, TimeUnit.SECONDS));
- executor.shutdown();
+ executor.shutdown();
- assertTrue("executor terminated", executor.awaitTermination(10, TimeUnit.SECONDS));
+ assertTrue("executor terminated", executor.awaitTermination(10, TimeUnit.SECONDS));
- deleteExecutor.shutdown();
+ } catch (Throwable e) {
+ e.printStackTrace();
+ throw e;
+ } finally {
+ try {
+ storage.stop();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ executor.shutdownNow();
+ deleteExecutor.shutdownNow();
+ }
- assertTrue("delete executor terminated", deleteExecutor.awaitTermination(30, TimeUnit.SECONDS));
}
@Override
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e0021252/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java
index 1972863..2d3df3e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java
@@ -144,18 +144,21 @@ public class ValidateTransactionHealthTest extends ActiveMQTestBase {
JournalImpl journal = ValidateTransactionHealthTest.createJournal(type, journalDir);
journal.start();
- Loader loadTest = new Loader(numberOfRecords);
- journal.load(loadTest);
- Assert.assertEquals(numberOfRecords * numberOfThreads, loadTest.numberOfAdds);
- Assert.assertEquals(0, loadTest.numberOfPreparedTransactions);
- Assert.assertEquals(0, loadTest.numberOfUpdates);
- Assert.assertEquals(0, loadTest.numberOfDeletes);
-
- journal.stop();
-
- if (loadTest.ex != null) {
- throw loadTest.ex;
+ try {
+ Loader loadTest = new Loader(numberOfRecords);
+ journal.load(loadTest);
+ Assert.assertEquals(numberOfRecords * numberOfThreads, loadTest.numberOfAdds);
+ Assert.assertEquals(0, loadTest.numberOfPreparedTransactions);
+ Assert.assertEquals(0, loadTest.numberOfUpdates);
+ Assert.assertEquals(0, loadTest.numberOfDeletes);
+
+ if (loadTest.ex != null) {
+ throw loadTest.ex;
+ }
+ } finally {
+ journal.stop();
}
+
}
// Inner classes -------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e0021252/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingTest.java
index 6f0bdc1..00c0bdf 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingTest.java
@@ -3335,7 +3335,7 @@ public class PagingTest extends ActiveMQTestBase {
ClientMessage message = null;
for (int i = 0; i < numberOfMessages; i++) {
- byte[] body = new byte[1024];
+ byte[] body = new byte[2048];
message = session.createMessage(true);
message.getBodyBuffer().writeBytes(body);
@@ -3360,7 +3360,7 @@ public class PagingTest extends ActiveMQTestBase {
Assert.assertEquals(0, server.getPagingManager().getPageStore(PagingTest.ADDRESS).getAddressSize());
for (int i = 0; i < numberOfMessages; i++) {
- byte[] body = new byte[1024];
+ byte[] body = new byte[2048];
message = session.createMessage(true);
message.getBodyBuffer().writeBytes(body);
@@ -3385,7 +3385,7 @@ public class PagingTest extends ActiveMQTestBase {
producer = session.createProducer(PagingTest.ADDRESS);
for (int i = 0; i < numberOfMessages; i++) {
- byte[] body = new byte[1024];
+ byte[] body = new byte[2048];
message = session.createMessage(true);
message.getBodyBuffer().writeBytes(body);
@@ -3841,7 +3841,7 @@ public class PagingTest extends ActiveMQTestBase {
Configuration config = createDefaultInVMConfig().setJournalSyncNonTransactional(false).setJournalFileSize(10 * 1024 * 1024);
- server = createServer(true, config, 512 * 1024, 1024 * 1024);
+ server = createServer(true, config, 100 * 1024, 1024 * 1024 / 2);
server.start();
@@ -4745,7 +4745,7 @@ public class PagingTest extends ActiveMQTestBase {
ClientMessage message = session.createMessage(true);
- int biggerMessageSize = 1024;
+ int biggerMessageSize = 2048;
byte[] body = new byte[biggerMessageSize];
ByteBuffer bb = ByteBuffer.wrap(body);
for (int j = 1; j <= biggerMessageSize; j++) {
@@ -4817,7 +4817,7 @@ public class PagingTest extends ActiveMQTestBase {
ClientMessage message = session.createMessage(true);
- int biggerMessageSize = 1024;
+ int biggerMessageSize = 2048;
byte[] body = new byte[biggerMessageSize];
ByteBuffer bb = ByteBuffer.wrap(body);
for (int j = 1; j <= biggerMessageSize; j++) {
[34/34] activemq-artemis git commit: ARTEMIS-781 add journal record
for address binding
Posted by ma...@apache.org.
ARTEMIS-781 add journal record for address binding
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/40063be9
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/40063be9
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/40063be9
Branch: refs/heads/ARTEMIS-780
Commit: 40063be9d3a509ea7d3dfd527de50240481c22c0
Parents: e1bc0a3
Author: jbertram <jb...@apache.com>
Authored: Mon Oct 10 15:11:50 2016 -0500
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Nov 1 10:20:52 2016 +0000
----------------------------------------------------------------------
.../core/persistence/AddressBindingInfo.java | 34 +++++
.../core/persistence/impl/RoutingType.java | 43 ++++++
.../codec/PersistentAddressBindingEncoding.java | 135 +++++++++++++++++++
3 files changed, 212 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/40063be9/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/AddressBindingInfo.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/AddressBindingInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/AddressBindingInfo.java
new file mode 100644
index 0000000..4256774
--- /dev/null
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/AddressBindingInfo.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.core.persistence;
+
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.persistence.impl.RoutingType;
+
+public interface AddressBindingInfo {
+
+ long getId();
+
+ SimpleString getName();
+
+ boolean isAutoCreated();
+
+ SimpleString getUser();
+
+ RoutingType getRoutingType();
+
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/40063be9/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/RoutingType.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/RoutingType.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/RoutingType.java
new file mode 100644
index 0000000..329d8e9
--- /dev/null
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/RoutingType.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.core.persistence.impl;
+
+public enum RoutingType {
+ Multicast, Anycast;
+
+ public byte getType() {
+ switch (this) {
+ case Multicast:
+ return 0;
+ case Anycast:
+ return 1;
+ default:
+ return -1;
+ }
+ }
+
+ public static RoutingType getType(byte type) {
+ switch (type) {
+ case 0:
+ return Multicast;
+ case 1:
+ return Anycast;
+ default:
+ return null;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/40063be9/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentAddressBindingEncoding.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentAddressBindingEncoding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentAddressBindingEncoding.java
new file mode 100644
index 0000000..8aa54e4
--- /dev/null
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentAddressBindingEncoding.java
@@ -0,0 +1,135 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.core.persistence.impl.journal.codec;
+
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.journal.EncodingSupport;
+import org.apache.activemq.artemis.core.persistence.AddressBindingInfo;
+import org.apache.activemq.artemis.core.persistence.impl.RoutingType;
+import org.apache.activemq.artemis.utils.DataConstants;
+
+public class PersistentAddressBindingEncoding implements EncodingSupport, AddressBindingInfo {
+
+ public long id;
+
+ public SimpleString name;
+
+ public boolean autoCreated;
+
+ public SimpleString user;
+
+ public RoutingType routingType;
+
+ public PersistentAddressBindingEncoding() {
+ }
+
+ @Override
+ public String toString() {
+ return "PersistentAddressBindingEncoding [id=" + id +
+ ", name=" +
+ name +
+ ", user=" +
+ user +
+ ", autoCreated=" +
+ autoCreated +
+ ", routingType=" +
+ routingType +
+ "]";
+ }
+
+ public PersistentAddressBindingEncoding(final SimpleString name,
+ final SimpleString user,
+ final boolean autoCreated,
+ final RoutingType routingType) {
+ this.name = name;
+ this.user = user;
+ this.autoCreated = autoCreated;
+ this.routingType = routingType;
+ }
+
+ @Override
+ public long getId() {
+ return id;
+ }
+
+ public void setId(final long id) {
+ this.id = id;
+ }
+
+ @Override
+ public SimpleString getName() {
+ return name;
+ }
+
+ @Override
+ public SimpleString getUser() {
+ return user;
+ }
+
+ @Override
+ public boolean isAutoCreated() {
+ return autoCreated;
+ }
+
+ @Override
+ public RoutingType getRoutingType() {
+ return routingType;
+ }
+
+ @Override
+ public void decode(final ActiveMQBuffer buffer) {
+ name = buffer.readSimpleString();
+
+ String metadata = buffer.readNullableSimpleString().toString();
+ if (metadata != null) {
+ String[] elements = metadata.split(";");
+ for (String element : elements) {
+ String[] keyValuePair = element.split("=");
+ if (keyValuePair.length == 2) {
+ if (keyValuePair[0].equals("user")) {
+ user = SimpleString.toSimpleString(keyValuePair[1]);
+ }
+ }
+ }
+ }
+
+ autoCreated = buffer.readBoolean();
+ routingType = RoutingType.getType(buffer.readByte());
+ }
+
+ @Override
+ public void encode(final ActiveMQBuffer buffer) {
+ buffer.writeSimpleString(name);
+ buffer.writeNullableSimpleString(createMetadata());
+ buffer.writeBoolean(autoCreated);
+ buffer.writeByte(routingType.getType());
+ }
+
+ @Override
+ public int getEncodeSize() {
+ return SimpleString.sizeofString(name) + DataConstants.SIZE_BOOLEAN +
+ SimpleString.sizeofNullableString(createMetadata()) +
+ DataConstants.SIZE_BYTE;
+ }
+
+ private SimpleString createMetadata() {
+ StringBuilder metadata = new StringBuilder();
+ metadata.append("user=").append(user).append(";");
+ return SimpleString.toSimpleString(metadata.toString());
+ }
+}
[19/34] activemq-artemis git commit: ARTEMIS-822 Injecting IO Pools
into and from ArtemisServerImpl
Posted by ma...@apache.org.
ARTEMIS-822 Injecting IO Pools into and from ArtemisServerImpl
https://issues.apache.org/jira/browse/ARTEMIS-822
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/7eadff76
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/7eadff76
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/7eadff76
Branch: refs/heads/ARTEMIS-780
Commit: 7eadff76818546aa6045be2eeb2e6aef60992394
Parents: 6afde8f
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Oct 28 11:11:59 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Mon Oct 31 11:34:27 2016 -0400
----------------------------------------------------------------------
.../cli/commands/tools/XmlDataExporter.java | 14 +++---
.../journal/JMSJournalStorageManagerImpl.java | 6 ++-
.../jms/server/impl/JMSServerManagerImpl.java | 15 +++---
.../artemis/core/journal/impl/JournalImpl.java | 49 +++++++++++---------
.../journal/AbstractJournalStorageManager.java | 10 +++-
.../impl/journal/JDBCJournalStorageManager.java | 6 ++-
.../impl/journal/JournalStorageManager.java | 20 ++++----
.../artemis/core/server/ActiveMQServer.java | 2 +
.../core/server/impl/ActiveMQServerImpl.java | 12 +++--
.../journal/NIOJournalCompactTest.java | 19 ++++++--
.../DeleteMessagesOnStartupTest.java | 2 +-
.../integration/persistence/RestartSMTest.java | 2 +-
.../persistence/StorageManagerTestBase.java | 6 +--
.../replication/ReplicationTest.java | 2 +-
.../server/SuppliedThreadPoolTest.java | 2 +
.../journal/impl/AlignedJournalImplTest.java | 2 -
.../core/journal/impl/JournalImplTestUnit.java | 6 ---
.../impl/DuplicateDetectionUnitTest.java | 10 ++--
18 files changed, 108 insertions(+), 77 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7eadff76/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataExporter.java
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataExporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataExporter.java
index a0e6c1e..8030ce2 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataExporter.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataExporter.java
@@ -90,6 +90,7 @@ import org.apache.activemq.artemis.jms.persistence.impl.journal.JMSJournalStorag
import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
import org.apache.activemq.artemis.utils.Base64;
import org.apache.activemq.artemis.utils.ExecutorFactory;
+import org.apache.activemq.artemis.utils.OrderedExecutorFactory;
@Command(name = "exp", description = "Export all message-data using an XML that could be interpreted by any system.")
public final class XmlDataExporter extends OptionalLocking {
@@ -142,15 +143,10 @@ public final class XmlDataExporter extends OptionalLocking {
String pagingDir,
String largeMessagesDir) throws Exception {
config = new ConfigurationImpl().setBindingsDirectory(bindingsDir).setJournalDirectory(journalDir).setPagingDirectory(pagingDir).setLargeMessagesDirectory(largeMessagesDir).setJournalType(JournalType.NIO);
- final ExecutorService executor = Executors.newFixedThreadPool(1, ActiveMQThreadFactory.defaultThreadFactory());
- ExecutorFactory executorFactory = new ExecutorFactory() {
- @Override
- public Executor getExecutor() {
- return executor;
- }
- };
+ final ExecutorService executor = Executors.newFixedThreadPool(5, ActiveMQThreadFactory.defaultThreadFactory());
+ ExecutorFactory executorFactory = new OrderedExecutorFactory(executor);
- storageManager = new JournalStorageManager(config, executorFactory);
+ storageManager = new JournalStorageManager(config, executorFactory, executorFactory);
XMLOutputFactory factory = XMLOutputFactory.newInstance();
XMLStreamWriter rawXmlWriter = factory.createXMLStreamWriter(out, "UTF-8");
@@ -158,6 +154,8 @@ public final class XmlDataExporter extends OptionalLocking {
xmlWriter = (XMLStreamWriter) Proxy.newProxyInstance(XMLStreamWriter.class.getClassLoader(), new Class[]{XMLStreamWriter.class}, handler);
writeXMLData();
+
+ executor.shutdown();
}
private void writeXMLData() throws Exception {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7eadff76/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
index 32c438d..0aaa1a6 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
@@ -40,6 +40,7 @@ import org.apache.activemq.artemis.jms.persistence.config.PersistedBindings;
import org.apache.activemq.artemis.jms.persistence.config.PersistedConnectionFactory;
import org.apache.activemq.artemis.jms.persistence.config.PersistedDestination;
import org.apache.activemq.artemis.jms.persistence.config.PersistedType;
+import org.apache.activemq.artemis.utils.ExecutorFactory;
import org.apache.activemq.artemis.utils.IDGenerator;
public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
@@ -73,7 +74,8 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
// Static --------------------------------------------------------
// Constructors --------------------------------------------------
- public JMSJournalStorageManagerImpl(final IDGenerator idGenerator,
+ public JMSJournalStorageManagerImpl(ExecutorFactory ioExecutors,
+ final IDGenerator idGenerator,
final Configuration config,
final ReplicationManager replicator) {
if (config.getJournalType() != JournalType.NIO && config.getJournalType() != JournalType.ASYNCIO) {
@@ -86,7 +88,7 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
SequentialFileFactory bindingsJMS = new NIOSequentialFileFactory(config.getBindingsLocation(), 1);
- Journal localJMS = new JournalImpl(1024 * 1024, 2, config.getJournalPoolFiles(), config.getJournalCompactMinFiles(), config.getJournalCompactPercentage(), bindingsJMS, "activemq-jms", "jms", 1);
+ Journal localJMS = new JournalImpl(ioExecutors, 1024 * 1024, 2, config.getJournalPoolFiles(), config.getJournalCompactMinFiles(), config.getJournalCompactPercentage(), bindingsJMS, "activemq-jms", "jms", 1, 0);
if (replicator != null) {
jmsJournal = new ReplicatedJournal((byte) 2, localJMS, replicator);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7eadff76/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
index dfa9218..456bb58 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
@@ -1544,16 +1544,13 @@ public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback
* @throws Exception
*/
private void createJournal() throws Exception {
- if (storage == null) {
- if (coreConfig.isPersistenceEnabled()) {
- storage = new JMSJournalStorageManagerImpl(new TimeAndCounterIDGenerator(), server.getConfiguration(), server.getReplicationManager());
- } else {
- storage = new NullJMSStorageManagerImpl();
- }
+ if (storage != null) {
+ storage.stop();
+ }
+ if (coreConfig.isPersistenceEnabled()) {
+ storage = new JMSJournalStorageManagerImpl(server.getIOExecutorFactory(), new TimeAndCounterIDGenerator(), server.getConfiguration(), server.getReplicationManager());
} else {
- if (storage.isStarted()) {
- storage.stop();
- }
+ storage = new NullJMSStorageManagerImpl();
}
storage.start();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7eadff76/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
index 983bd7d..b1093ed 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
@@ -35,6 +35,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
+import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
@@ -74,6 +75,7 @@ import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
import org.apache.activemq.artemis.utils.ConcurrentHashSet;
import org.apache.activemq.artemis.utils.DataConstants;
+import org.apache.activemq.artemis.utils.ExecutorFactory;
import org.apache.activemq.artemis.utils.OrderedExecutorFactory;
import org.apache.activemq.artemis.utils.SimpleFuture;
import org.jboss.logging.Logger;
@@ -185,8 +187,8 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
private ConcurrentHashSet<CountDownLatch> latches = new ConcurrentHashSet<>();
- private final OrderedExecutorFactory providedIOThreadPool;
- protected OrderedExecutorFactory ioExecutorFactory;
+ private final ExecutorFactory providedIOThreadPool;
+ protected ExecutorFactory ioExecutorFactory;
private ThreadPoolExecutor threadPool;
/**
@@ -234,7 +236,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
this(null, fileSize, minFiles, poolSize, compactMinFiles, compactPercentage, fileFactory, filePrefix, fileExtension, maxAIO, userVersion);
}
- public JournalImpl(final OrderedExecutorFactory ioExecutors,
+ public JournalImpl(final ExecutorFactory ioExecutors,
final int fileSize,
final int minFiles,
final int poolSize,
@@ -744,7 +746,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
if (result != null) {
result.fail(e);
}
- ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
+ logger.error("appendAddRecord::" + e, e);
} finally {
pendingRecords.remove(id);
journalLock.readLock().unlock();
@@ -801,7 +803,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
if (result != null) {
result.fail(e);
}
- ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
+ logger.error("appendUpdateRecord:" + e, e);
} finally {
journalLock.readLock().unlock();
}
@@ -851,7 +853,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
if (result != null) {
result.fail(e);
}
- ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
+ logger.error("appendDeleteRecord:" + e, e);
} finally {
journalLock.readLock().unlock();
}
@@ -899,7 +901,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
tx.addPositive(usedFile, id, addRecord.getEncodeSize());
} catch (Exception e) {
- ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
+ logger.error("appendAddRecordTransactional:" + e, e);
setErrorCondition(tx, e);
} finally {
journalLock.readLock().unlock();
@@ -979,7 +981,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
tx.addPositive( usedFile, id, updateRecordTX.getEncodeSize() );
} catch ( Exception e ) {
- ActiveMQJournalLogger.LOGGER.error( e.getMessage(), e );
+ logger.error("appendUpdateRecordTransactional:" + e.getMessage(), e );
setErrorCondition( tx, e );
} finally {
journalLock.readLock().unlock();
@@ -1016,7 +1018,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
tx.addNegative(usedFile, id);
} catch (Exception e) {
- ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
+ logger.error("appendDeleteRecordTransactional:" + e, e);
setErrorCondition(tx, e);
} finally {
journalLock.readLock().unlock();
@@ -1069,7 +1071,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
if (result != null) {
result.fail(e);
}
- ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
+ logger.error("appendPrepareRecord:" + e, e);
setErrorCondition(tx, e);
} finally {
journalLock.readLock().unlock();
@@ -1142,7 +1144,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
if (result != null) {
result.fail(e);
}
- ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
+ logger.error("appendCommitRecord:" + e, e);
setErrorCondition(tx, e);
} finally {
journalLock.readLock().unlock();
@@ -1185,7 +1187,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
if (result != null) {
result.fail(e);
}
- ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
+ logger.error("appendRollbackRecord:" + e, e);
setErrorCondition(tx, e);
} finally {
journalLock.readLock().unlock();
@@ -2067,7 +2069,6 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
public void flush() throws Exception {
fileFactory.flush();
-
flushExecutor(appendExecutor);
flushExecutor(filesExecutor);
@@ -2081,16 +2082,21 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
// Send something to the closingExecutor, just to make sure we went until its end
final CountDownLatch latch = new CountDownLatch(1);
- executor.execute(new Runnable() {
+ try {
+ executor.execute(new Runnable() {
- @Override
- public void run() {
- latch.countDown();
- }
+ @Override
+ public void run() {
+ latch.countDown();
+ }
- });
- latch.await(10, TimeUnit.SECONDS);
+ });
+ latch.await(10, TimeUnit.SECONDS);
+ } catch (RejectedExecutionException ignored ) {
+ // this is fine
+ }
}
+
}
@Override
@@ -2243,7 +2249,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
@Override
public synchronized void stop() throws Exception {
if (state == JournalState.STOPPED) {
- throw new IllegalStateException("Journal is already stopped");
+ return;
}
setJournalState(JournalState.STOPPED);
@@ -2905,6 +2911,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
try {
scheduleCompactAndBlock(60);
} catch (Exception e) {
+ e.printStackTrace();
throw new RuntimeException(e);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7eadff76/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
index 768be45..ecaa86e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
@@ -146,6 +146,8 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
protected BatchingIDGenerator idGenerator;
+ protected final ExecutorFactory ioExecutors;
+
protected final ScheduledExecutorService scheduledExecutorService;
protected final ReentrantReadWriteLock storageManagerLock = new ReentrantReadWriteLock(true);
@@ -186,18 +188,22 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
public AbstractJournalStorageManager(final Configuration config,
final ExecutorFactory executorFactory,
- final ScheduledExecutorService scheduledExecutorService) {
- this(config, executorFactory, scheduledExecutorService, null);
+ final ScheduledExecutorService scheduledExecutorService,
+ final ExecutorFactory ioExecutors) {
+ this(config, executorFactory, scheduledExecutorService, ioExecutors, null);
}
public AbstractJournalStorageManager(Configuration config,
ExecutorFactory executorFactory,
ScheduledExecutorService scheduledExecutorService,
+ ExecutorFactory ioExecutors,
IOCriticalErrorListener criticalErrorListener) {
this.executorFactory = executorFactory;
this.ioCriticalErrorListener = criticalErrorListener;
+ this.ioExecutors = ioExecutors;
+
this.scheduledExecutorService = scheduledExecutorService;
this.config = config;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7eadff76/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JDBCJournalStorageManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JDBCJournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JDBCJournalStorageManager.java
index d97f988..e4d401b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JDBCJournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JDBCJournalStorageManager.java
@@ -36,15 +36,17 @@ public class JDBCJournalStorageManager extends JournalStorageManager {
public JDBCJournalStorageManager(Configuration config,
ExecutorFactory executorFactory,
+ ExecutorFactory ioExecutorFactory,
ScheduledExecutorService scheduledExecutorService) {
- super(config, executorFactory, scheduledExecutorService);
+ super(config, executorFactory, scheduledExecutorService, ioExecutorFactory);
}
public JDBCJournalStorageManager(final Configuration config,
final ScheduledExecutorService scheduledExecutorService,
final ExecutorFactory executorFactory,
+ final ExecutorFactory ioExecutorFactory,
final IOCriticalErrorListener criticalErrorListener) {
- super(config, executorFactory, scheduledExecutorService, criticalErrorListener);
+ super(config, executorFactory, scheduledExecutorService, ioExecutorFactory, criticalErrorListener);
}
@Override
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7eadff76/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
index 2d8411a..24650e1 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
@@ -86,25 +86,28 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
public JournalStorageManager(final Configuration config,
final ExecutorFactory executorFactory,
- final ScheduledExecutorService scheduledExecutorService) {
- this(config, executorFactory, scheduledExecutorService, null);
+ final ScheduledExecutorService scheduledExecutorService,
+ final ExecutorFactory ioExecutors) {
+ this(config, executorFactory, scheduledExecutorService, ioExecutors, null);
}
- public JournalStorageManager(final Configuration config, final ExecutorFactory executorFactory) {
- this(config, executorFactory, null, null);
+ public JournalStorageManager(final Configuration config, final ExecutorFactory executorFactory, final ExecutorFactory ioExecutors) {
+ this(config, executorFactory, null, ioExecutors, null);
}
public JournalStorageManager(final Configuration config,
final ExecutorFactory executorFactory,
final ScheduledExecutorService scheduledExecutorService,
+ final ExecutorFactory ioExecutors,
final IOCriticalErrorListener criticalErrorListener) {
- super(config, executorFactory, scheduledExecutorService, criticalErrorListener);
+ super(config, executorFactory, scheduledExecutorService, ioExecutors, criticalErrorListener);
}
public JournalStorageManager(final Configuration config,
final ExecutorFactory executorFactory,
+ final ExecutorFactory ioExecutors,
final IOCriticalErrorListener criticalErrorListener) {
- super(config, executorFactory, null, criticalErrorListener);
+ super(config, executorFactory, null, ioExecutors, criticalErrorListener);
}
@Override
@@ -116,7 +119,7 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
bindingsFF = new NIOSequentialFileFactory(config.getBindingsLocation(), criticalErrorListener, config.getJournalMaxIO_NIO());
- Journal localBindings = new JournalImpl(1024 * 1024, 2, config.getJournalCompactMinFiles(), config.getJournalPoolFiles(), config.getJournalCompactPercentage(), bindingsFF, "activemq-bindings", "bindings", 1);
+ Journal localBindings = new JournalImpl(ioExecutors, 1024 * 1024, 2, config.getJournalCompactMinFiles(), config.getJournalPoolFiles(), config.getJournalCompactPercentage(), bindingsFF, "activemq-bindings", "bindings", 1, 0);
bindingsJournal = localBindings;
originalBindingsJournal = localBindings;
@@ -132,7 +135,8 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
throw ActiveMQMessageBundle.BUNDLE.invalidJournalType2(config.getJournalType());
}
- Journal localMessage = new JournalImpl(config.getJournalFileSize(), config.getJournalMinFiles(), config.getJournalPoolFiles(), config.getJournalCompactMinFiles(), config.getJournalCompactPercentage(), journalFF, "activemq-data", "amq", config.getJournalType() == JournalType.ASYNCIO ? config.getJournalMaxIO_AIO() : config.getJournalMaxIO_NIO());
+ Journal localMessage = new JournalImpl(ioExecutors, config.getJournalFileSize(), config.getJournalMinFiles(), config.getJournalPoolFiles(), config.getJournalCompactMinFiles(), config.getJournalCompactPercentage(), journalFF, "activemq-data", "amq", config.getJournalType() == JournalType.ASYNCIO ? config.getJournalMaxIO_AIO() : config.getJournalMaxIO_NIO(), 0);
+
messageJournal = localMessage;
originalMessageJournal = localMessage;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7eadff76/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
index 477f839..a43fec8 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
@@ -345,6 +345,8 @@ public interface ActiveMQServer extends ActiveMQComponent {
ExecutorFactory getExecutorFactory();
+ ExecutorFactory getIOExecutorFactory();
+
void setGroupingHandler(GroupingHandler groupingHandler);
GroupingHandler getGroupingHandler();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7eadff76/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 6288bdf..d2de964 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -232,8 +232,8 @@ public class ActiveMQServerImpl implements ActiveMQServer {
private volatile ExecutorFactory executorFactory;
-
private volatile ExecutorService ioExecutorPool;
+
/**
* This is a thread pool for io tasks only.
* We can't use the same global executor to avoid starvations.
@@ -1637,6 +1637,11 @@ public class ActiveMQServerImpl implements ActiveMQServer {
}
@Override
+ public ExecutorFactory getIOExecutorFactory() {
+ return ioExecutorFactory;
+ }
+
+ @Override
public void setGroupingHandler(final GroupingHandler groupingHandler) {
if (this.groupingHandler != null && managementService != null) {
// Removing old groupNotification
@@ -1770,10 +1775,10 @@ public class ActiveMQServerImpl implements ActiveMQServer {
private StorageManager createStorageManager() {
if (configuration.isPersistenceEnabled()) {
if (configuration.getStoreConfiguration() != null && configuration.getStoreConfiguration().getStoreType() == StoreConfiguration.StoreType.DATABASE) {
- return new JDBCJournalStorageManager(configuration, getScheduledPool(), executorFactory, shutdownOnCriticalIO);
+ return new JDBCJournalStorageManager(configuration, getScheduledPool(), executorFactory, ioExecutorFactory, shutdownOnCriticalIO);
} else {
// Default to File Based Storage Manager, (Legacy default configuration).
- return new JournalStorageManager(configuration, executorFactory, scheduledPool, shutdownOnCriticalIO);
+ return new JournalStorageManager(configuration, executorFactory, scheduledPool, ioExecutorFactory, shutdownOnCriticalIO);
}
}
return new NullStorageManager();
@@ -1847,6 +1852,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
});
this.ioExecutorPool = new ThreadPoolExecutor(0, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(), tFactory);
+ this.ioExecutorFactory = new OrderedExecutorFactory(ioExecutorPool);
}
/* We check to see if a Scheduled Executor Service is provided in the InjectedObjectRegistry. If so we use this
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7eadff76/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
index 519ffb5..42c48f3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
@@ -1623,11 +1623,15 @@ public class NIOJournalCompactTest extends JournalImplTestBase {
final ExecutorService executor = Executors.newCachedThreadPool(ActiveMQThreadFactory.defaultThreadFactory());
+ final ExecutorService ioexecutor = Executors.newCachedThreadPool(ActiveMQThreadFactory.defaultThreadFactory());
+
OrderedExecutorFactory factory = new OrderedExecutorFactory(executor);
+ OrderedExecutorFactory iofactory = new OrderedExecutorFactory(ioexecutor);
+
final ExecutorService deleteExecutor = Executors.newCachedThreadPool(ActiveMQThreadFactory.defaultThreadFactory());
- final JournalStorageManager storage = new JournalStorageManager(config, factory);
+ final JournalStorageManager storage = new JournalStorageManager(config, factory, iofactory);
storage.start();
@@ -1681,7 +1685,7 @@ public class NIOJournalCompactTest extends JournalImplTestBase {
for (long messageID : values) {
storage.deleteMessage(messageID);
}
- } catch (Exception e) {
+ } catch (Throwable e) {
e.printStackTrace();
errors.incrementAndGet();
}
@@ -1733,11 +1737,17 @@ public class NIOJournalCompactTest extends JournalImplTestBase {
deleteExecutor.shutdown();
- assertTrue("delete executor terminated", deleteExecutor.awaitTermination(30, TimeUnit.SECONDS));
+ assertTrue("delete executor failted to terminate", deleteExecutor.awaitTermination(30, TimeUnit.SECONDS));
+
+ storage.stop();
executor.shutdown();
- assertTrue("executor terminated", executor.awaitTermination(10, TimeUnit.SECONDS));
+ assertTrue("executor failed to terminate", executor.awaitTermination(30, TimeUnit.SECONDS));
+
+ ioexecutor.shutdown();
+
+ assertTrue("ioexecutor failed to terminate", ioexecutor.awaitTermination(30, TimeUnit.SECONDS));
} catch (Throwable e) {
e.printStackTrace();
@@ -1751,6 +1761,7 @@ public class NIOJournalCompactTest extends JournalImplTestBase {
executor.shutdownNow();
deleteExecutor.shutdownNow();
+ ioexecutor.shutdownNow();
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7eadff76/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java
index 9848c39..7d515d8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java
@@ -91,7 +91,7 @@ public class DeleteMessagesOnStartupTest extends StorageManagerTestBase {
@Override
protected JournalStorageManager createJournalStorageManager(Configuration configuration) {
- return new JournalStorageManager(configuration, execFactory) {
+ return new JournalStorageManager(configuration, execFactory, execFactory) {
@Override
public void deleteMessage(final long messageID) throws Exception {
deletedMessage.add(messageID);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7eadff76/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
index 5828baf..49d3a12 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
@@ -65,7 +65,7 @@ public class RestartSMTest extends ActiveMQTestBase {
PostOffice postOffice = new FakePostOffice();
- final JournalStorageManager journal = new JournalStorageManager(createDefaultInVMConfig(), execFactory);
+ final JournalStorageManager journal = new JournalStorageManager(createDefaultInVMConfig(), execFactory, execFactory);
try {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7eadff76/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java
index 814bf0d..a104363 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java
@@ -137,7 +137,7 @@ public abstract class StorageManagerTestBase extends ActiveMQTestBase {
* @param configuration
*/
protected JournalStorageManager createJournalStorageManager(Configuration configuration) {
- JournalStorageManager jsm = new JournalStorageManager(configuration, execFactory);
+ JournalStorageManager jsm = new JournalStorageManager(configuration, execFactory, execFactory);
addActiveMQComponent(jsm);
return jsm;
}
@@ -146,7 +146,7 @@ public abstract class StorageManagerTestBase extends ActiveMQTestBase {
* @param configuration
*/
protected JDBCJournalStorageManager createJDBCJournalStorageManager(Configuration configuration) {
- JDBCJournalStorageManager jsm = new JDBCJournalStorageManager(configuration, execFactory, scheduledExecutorService);
+ JDBCJournalStorageManager jsm = new JDBCJournalStorageManager(configuration, execFactory, execFactory, scheduledExecutorService);
addActiveMQComponent(jsm);
return jsm;
}
@@ -155,7 +155,7 @@ public abstract class StorageManagerTestBase extends ActiveMQTestBase {
* @throws Exception
*/
protected void createJMSStorage() throws Exception {
- jmsJournal = new JMSJournalStorageManagerImpl(new TimeAndCounterIDGenerator(), createDefaultInVMConfig(), null);
+ jmsJournal = new JMSJournalStorageManagerImpl(null, new TimeAndCounterIDGenerator(), createDefaultInVMConfig(), null);
addActiveMQComponent(jmsJournal);
jmsJournal.start();
jmsJournal.load();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7eadff76/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
index 7d2d514..1ae9527 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
@@ -435,7 +435,7 @@ public final class ReplicationTest extends ActiveMQTestBase {
* @throws Exception
*/
private JournalStorageManager getStorage() throws Exception {
- return new JournalStorageManager(createDefaultInVMConfig(), factory);
+ return new JournalStorageManager(createDefaultInVMConfig(), factory, factory);
}
/**
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7eadff76/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SuppliedThreadPoolTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SuppliedThreadPoolTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SuppliedThreadPoolTest.java
index 65cd6b9..1deb1bb 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SuppliedThreadPoolTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/SuppliedThreadPoolTest.java
@@ -44,6 +44,7 @@ public class SuppliedThreadPoolTest extends ActiveMQTestBase {
public void setup() throws Exception {
serviceRegistry = new ServiceRegistryImpl();
serviceRegistry.setExecutorService(Executors.newFixedThreadPool(1, ActiveMQThreadFactory.defaultThreadFactory()));
+ serviceRegistry.setIOExecutorService(Executors.newFixedThreadPool(5, ActiveMQThreadFactory.defaultThreadFactory()));
serviceRegistry.setScheduledExecutorService(Executors.newScheduledThreadPool(1, ActiveMQThreadFactory.defaultThreadFactory()));
server = new ActiveMQServerImpl(null, null, null, null, serviceRegistry);
server.start();
@@ -58,6 +59,7 @@ public class SuppliedThreadPoolTest extends ActiveMQTestBase {
}
serviceRegistry.getExecutorService().shutdown();
serviceRegistry.getScheduledExecutorService().shutdown();
+ serviceRegistry.getIOExecutorService().shutdown();
super.tearDown();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7eadff76/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
index 2b24296..be6e5b3 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
@@ -943,8 +943,6 @@ public class AlignedJournalImplTest extends ActiveMQTestBase {
journalImpl.checkReclaimStatus();
journalImpl.flush();
- Assert.assertEquals(2, factory.listFiles("tt").size());
-
}
@Test
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7eadff76/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java
index eb815ae..3be030d 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java
@@ -62,12 +62,6 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
} catch (IllegalStateException e) {
// OK
}
- try {
- stopJournal();
- Assert.fail("Should throw exception");
- } catch (IllegalStateException e) {
- // OK
- }
startJournal();
try {
startJournal();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/7eadff76/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
index fcd32c5..96fa35c 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
@@ -70,7 +70,7 @@ public class DuplicateDetectionUnitTest extends ActiveMQTestBase {
@Before
public void setUp() throws Exception {
super.setUp();
- executor = Executors.newSingleThreadExecutor(ActiveMQThreadFactory.defaultThreadFactory());
+ executor = Executors.newFixedThreadPool(10, ActiveMQThreadFactory.defaultThreadFactory());
factory = new OrderedExecutorFactory(executor);
}
@@ -92,7 +92,7 @@ public class DuplicateDetectionUnitTest extends ActiveMQTestBase {
ScheduledExecutorService scheduledThreadPool = Executors.newScheduledThreadPool(ActiveMQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize(), ActiveMQThreadFactory.defaultThreadFactory());
- journal = new JournalStorageManager(configuration, factory);
+ journal = new JournalStorageManager(configuration, factory, factory);
journal.start();
journal.loadBindingJournal(new ArrayList<QueueBindingInfo>(), new ArrayList<GroupingInfo>());
@@ -112,7 +112,7 @@ public class DuplicateDetectionUnitTest extends ActiveMQTestBase {
journal.stop();
- journal = new JournalStorageManager(configuration, factory);
+ journal = new JournalStorageManager(configuration, factory, factory);
journal.start();
journal.loadBindingJournal(new ArrayList<QueueBindingInfo>(), new ArrayList<GroupingInfo>());
@@ -135,7 +135,7 @@ public class DuplicateDetectionUnitTest extends ActiveMQTestBase {
mapDups.clear();
- journal = new JournalStorageManager(configuration, factory);
+ journal = new JournalStorageManager(configuration, factory, factory);
journal.start();
journal.loadBindingJournal(new ArrayList<QueueBindingInfo>(), new ArrayList<GroupingInfo>());
@@ -146,6 +146,8 @@ public class DuplicateDetectionUnitTest extends ActiveMQTestBase {
values = mapDups.get(ADDRESS);
Assert.assertEquals(10, values.size());
+
+ scheduledThreadPool.shutdown();
} finally {
if (journal != null) {
try {
[32/34] activemq-artemis git commit: Added cluster tests for new
route type
Posted by ma...@apache.org.
Added cluster tests for new route type
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/74be33f2
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/74be33f2
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/74be33f2
Branch: refs/heads/ARTEMIS-780
Commit: 74be33f2f7050c6b3fdd014c73102a007c6e6b95
Parents: 4de4830
Author: Martyn Taylor <mt...@redhat.com>
Authored: Mon Oct 24 16:56:30 2016 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Nov 1 10:20:52 2016 +0000
----------------------------------------------------------------------
.../integration/addressing/AddressingTest.java | 13 +-
.../AnycastRoutingWithClusterTest.java | 276 +++++++++++++++++++
.../cluster/distribution/ClusterTestBase.java | 14 +
3 files changed, 297 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/74be33f2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
index 2e0fda4..03739e9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
@@ -35,6 +35,7 @@ import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
public class AddressingTest extends ActiveMQTestBase {
@@ -91,8 +92,6 @@ public class AddressingTest extends ActiveMQTestBase {
q1.deleteQueue();
q2.deleteQueue();
-
- System.out.println(consumeAddress);
}
}
@@ -134,8 +133,6 @@ public class AddressingTest extends ActiveMQTestBase {
q1.deleteQueue();
q2.deleteQueue();
-
- System.out.println(consumeAddress);
}
}
@@ -222,36 +219,40 @@ public class AddressingTest extends ActiveMQTestBase {
q1.deleteQueue();
q2.deleteQueue();
-
- System.out.println(consumeAddress);
}
}
+ @Ignore
@Test
public void testDeleteQueueOnNoConsumersTrue() {
fail("Not Implemented");
}
+ @Ignore
@Test
public void testDeleteQueueOnNoConsumersFalse() {
fail("Not Implemented");
}
+ @Ignore
@Test
public void testLimitOnMaxConsumers() {
fail("Not Implemented");
}
+ @Ignore
@Test
public void testUnlimitedMaxConsumers() {
fail("Not Implemented");
}
+ @Ignore
@Test
public void testDefaultMaxConsumersFromAddress() {
fail("Not Implemented");
}
+ @Ignore
@Test
public void testDefaultDeleteOnNoConsumersFromAddress() {
fail("Not Implemented");
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/74be33f2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/AnycastRoutingWithClusterTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/AnycastRoutingWithClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/AnycastRoutingWithClusterTest.java
new file mode 100644
index 0000000..f413113
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/AnycastRoutingWithClusterTest.java
@@ -0,0 +1,276 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.tests.integration.cluster.distribution;
+
+import java.util.List;
+
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType;
+import org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
+import org.apache.activemq.artemis.tests.util.Wait;
+import org.junit.Test;
+
+public class AnycastRoutingWithClusterTest extends ClusterTestBase {
+
+ /**
+ * Test anycast address with single distributed queue in a 3 node cluster environment. Messages should be
+ * "round robin"'d across the each queue
+ * @throws Exception
+ */
+ @Test
+ public void testAnycastAddressOneQueueRoutingMultiNode() throws Exception {
+ String address = "test.address";
+ String queueName = "test.queue";
+ String clusterAddress = "test";
+
+ for (int i = 0; i < 3; i++) {
+ setupServer(i, isFileStorage(), isNetty());
+ }
+
+ setupClusterConnection("cluster0", clusterAddress, MessageLoadBalancingType.STRICT, 1, isNetty(), 0, 1, 2);
+ setupClusterConnection("cluster1", clusterAddress, MessageLoadBalancingType.STRICT, 1, isNetty(), 1, 0, 2);
+ setupClusterConnection("cluster2", clusterAddress, MessageLoadBalancingType.STRICT, 1, isNetty(), 2, 0, 1);
+
+ setUpGroupHandler(GroupingHandlerConfiguration.TYPE.LOCAL, 0);
+ setUpGroupHandler(GroupingHandlerConfiguration.TYPE.REMOTE, 1);
+ setUpGroupHandler(GroupingHandlerConfiguration.TYPE.REMOTE, 2);
+
+ startServers(0, 1, 2);
+
+ List<Queue> queues;
+ for (int i = 0; i < 3; i++) {
+ createAddressInfo(i, address, AddressInfo.RoutingType.ANYCAST, -1, false);
+ setupSessionFactory(i, isNetty());
+ createQueue(i, address, queueName, null, false);
+ addConsumer(i, i, queueName, null);
+ }
+
+ for (int i = 0; i < 3; i++) {
+ waitForBindings(i, address, 1, 1, true);
+ waitForBindings(i, address, 2, 2, false);
+ }
+
+ final int noMessages = 30;
+ send(0, address, noMessages, true, null, null);
+
+ for (int s = 0; s < 3; s++) {
+ final Queue queue = servers[s].locateQueue(new SimpleString(queueName));
+ Wait.waitFor(new Wait.Condition() {
+ @Override
+ public boolean isSatisfied() throws Exception {
+ return queue.getMessageCount() == noMessages / 3;
+ }
+ });
+ }
+
+ // Each consumer should receive noMessages / noServers
+ for (int i = 0; i < noMessages / 3; i++) {
+ for (int c = 0; c < 3; c++) {
+ assertNotNull(consumers[c].consumer.receive(1000));
+ }
+ }
+ }
+
+
+ /**
+ * Test anycast address with N queues in a 3 node cluster environment. Messages should be "round robin"'d across the
+ * each queue.
+ * @throws Exception
+ */
+ @Test
+ public void testAnycastAddressMultiQueuesRoutingMultiNode() throws Exception {
+
+ String address = "test.address";
+ String queueNamePrefix = "test.queue";
+ String clusterAddress = "test";
+
+ for (int i = 0; i < 3; i++) {
+ setupServer(i, isFileStorage(), isNetty());
+ }
+
+ setupClusterConnection("cluster0", clusterAddress, MessageLoadBalancingType.STRICT, 1, isNetty(), 0, 1, 2);
+ setupClusterConnection("cluster1", clusterAddress, MessageLoadBalancingType.STRICT, 1, isNetty(), 1, 0, 2);
+ setupClusterConnection("cluster2", clusterAddress, MessageLoadBalancingType.STRICT, 1, isNetty(), 2, 0, 1);
+
+ setUpGroupHandler(GroupingHandlerConfiguration.TYPE.LOCAL, 0);
+ setUpGroupHandler(GroupingHandlerConfiguration.TYPE.REMOTE, 1);
+ setUpGroupHandler(GroupingHandlerConfiguration.TYPE.REMOTE, 2);
+
+ startServers(0, 1, 2);
+
+ List<Queue> queues;
+ for (int i = 0; i < 3; i++) {
+ createAddressInfo(i, address, AddressInfo.RoutingType.ANYCAST, -1, false);
+ setupSessionFactory(i, isNetty());
+ createQueue(i, address, queueNamePrefix + i, null, false);
+ addConsumer(i, i, queueNamePrefix + i, null);
+ }
+
+ for (int i = 0; i < 3; i++) {
+ waitForBindings(i, address, 1, 1, true);
+ waitForBindings(i, address, 2, 2, false);
+ }
+
+ final int noMessages = 30;
+ send(0, address, noMessages, true, null, null);
+
+ for (int s = 0; s < 3; s++) {
+ final Queue queue = servers[s].locateQueue(new SimpleString(queueNamePrefix + s));
+ Wait.waitFor(new Wait.Condition() {
+ @Override
+ public boolean isSatisfied() throws Exception {
+ return queue.getMessageCount() == noMessages / 3;
+ }
+ });
+ }
+
+ // Each consumer should receive noMessages / noServers
+ for (int i = 0; i < noMessages / 3; i++) {
+ for (int c = 0; c < 3; c++) {
+ assertNotNull(consumers[c].consumer.receive(1000));
+ }
+ }
+ }
+
+ /**
+ * Test anycast address with N queues in a 3 node cluster environment. Messages should be "round robin"'d across the
+ * each queue.
+ * @throws Exception
+ */
+ @Test
+ public void testAnycastAddressMultiQueuesWithFilterRoutingMultiNode() throws Exception {
+
+ String address = "test.address";
+ String queueNamePrefix = "test.queue";
+ String clusterAddress = "test";
+
+ for (int i = 0; i < 3; i++) {
+ setupServer(i, isFileStorage(), isNetty());
+ }
+
+ setupClusterConnection("cluster0", clusterAddress, MessageLoadBalancingType.STRICT, 1, isNetty(), 0, 1, 2);
+ setupClusterConnection("cluster1", clusterAddress, MessageLoadBalancingType.STRICT, 1, isNetty(), 1, 0, 2);
+ setupClusterConnection("cluster2", clusterAddress, MessageLoadBalancingType.STRICT, 1, isNetty(), 2, 0, 1);
+
+ setUpGroupHandler(GroupingHandlerConfiguration.TYPE.LOCAL, 0);
+ setUpGroupHandler(GroupingHandlerConfiguration.TYPE.REMOTE, 1);
+ setUpGroupHandler(GroupingHandlerConfiguration.TYPE.REMOTE, 2);
+
+ startServers(0, 1, 2);
+
+ List<Queue> queues;
+ for (int i = 0; i < 3; i++) {
+ createAddressInfo(i, address, AddressInfo.RoutingType.ANYCAST, -1, false);
+ setupSessionFactory(i, isNetty());
+
+ }
+
+ String filter1 = "giraffe";
+ String filter2 = "platypus";
+
+ createQueue(0, address, queueNamePrefix + 0, filter1, false);
+ createQueue(1, address, queueNamePrefix + 1, filter1, false);
+ createQueue(2, address, queueNamePrefix + 2, filter2, false);
+
+ for (int i = 0; i < 3; i++) {
+ addConsumer(i, i, queueNamePrefix + i, null);
+ }
+
+ for (int i = 0; i < 3; i++) {
+ waitForBindings(i, address, 1, 1, true);
+ waitForBindings(i, address, 2, 2, false);
+ }
+
+ final int noMessages = 30;
+ send(0, address, noMessages, true, filter1, null);
+
+ // Each consumer should receive noMessages / noServers
+ for (int i = 0; i < noMessages / 2; i++) {
+ for (int c = 0; c < 2; c++) {
+ assertNotNull(consumers[c].consumer.receive(1000));
+ }
+ }
+
+ assertNull(consumers[2].consumer.receive(1000));
+ }
+
+ /**
+ * Test multicast address that with N queues in a 3 node cluster environment. Each queue should receive all messages
+ * sent from the client.
+ * @throws Exception
+ */
+ @Test
+ public void testMulitcastAddressMultiQueuesRoutingMultiNode() throws Exception {
+
+ String address = "test.address";
+ String queueNamePrefix = "test.queue";
+ String clusterAddress = "test";
+
+ for (int i = 0; i < 3; i++) {
+ setupServer(i, isFileStorage(), isNetty());
+ }
+
+ setupClusterConnection("cluster0", clusterAddress, MessageLoadBalancingType.STRICT, 1, isNetty(), 0, 1, 2);
+ setupClusterConnection("cluster1", clusterAddress, MessageLoadBalancingType.STRICT, 1, isNetty(), 1, 0, 2);
+ setupClusterConnection("cluster2", clusterAddress, MessageLoadBalancingType.STRICT, 1, isNetty(), 2, 0, 1);
+
+ setUpGroupHandler(GroupingHandlerConfiguration.TYPE.LOCAL, 0);
+ setUpGroupHandler(GroupingHandlerConfiguration.TYPE.REMOTE, 1);
+ setUpGroupHandler(GroupingHandlerConfiguration.TYPE.REMOTE, 2);
+
+ startServers(0, 1, 2);
+
+ List<Queue> queues;
+ for (int i = 0; i < 3; i++) {
+ createAddressInfo(i, address, AddressInfo.RoutingType.MULTICAST, -1, false);
+ setupSessionFactory(i, isNetty());
+ createQueue(i, address, queueNamePrefix + i, null, false);
+ addConsumer(i, i, queueNamePrefix + i, null);
+ }
+
+ for (int i = 0; i < 3; i++) {
+ waitForBindings(i, address, 1, 1, true);
+ waitForBindings(i, address, 2, 2, false);
+ }
+
+ final int noMessages = 30;
+ send(0, address, noMessages, true, null, null);
+
+ for (int s = 0; s < 3; s++) {
+ final Queue queue = servers[s].locateQueue(new SimpleString(queueNamePrefix + s));
+ Wait.waitFor(new Wait.Condition() {
+ @Override
+ public boolean isSatisfied() throws Exception {
+ return queue.getMessageCount() == noMessages;
+ }
+ });
+ }
+
+ // Each consumer should receive noMessages
+ for (int i = 0; i < noMessages; i++) {
+ for (int c = 0; c < 3; c++) {
+ assertNotNull(consumers[c].consumer.receive(1000));
+ }
+ }
+ }
+
+ private boolean isNetty() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/74be33f2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
index 538779f..2623e9c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
@@ -78,6 +78,7 @@ import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancing
import org.apache.activemq.artemis.core.server.cluster.qourum.SharedNothingBackupQuorum;
import org.apache.activemq.artemis.core.server.group.GroupingHandler;
import org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.core.server.impl.InVMNodeManager;
import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
@@ -518,6 +519,19 @@ public abstract class ClusterTestBase extends ActiveMQTestBase {
session.close();
}
+ protected void createAddressInfo(final int node,
+ final String address,
+ final AddressInfo.RoutingType routingType,
+ final int defaulMaxConsumers,
+ boolean defaultDeleteOnNoConsumers) {
+ AddressInfo addressInfo = new AddressInfo(new SimpleString(address));
+ addressInfo.setRoutingType(routingType);
+ addressInfo.setDefaultMaxConsumers(defaulMaxConsumers);
+ addressInfo.setDefaultDeleteOnNoConsumers(defaultDeleteOnNoConsumers);
+
+ servers[node].createOrUpdateAddressInfo(addressInfo);
+ }
+
protected void deleteQueue(final int node, final String queueName) throws Exception {
ClientSessionFactory sf = sfs[node];
[10/34] activemq-artemis git commit: This closes #871
Posted by ma...@apache.org.
This closes #871
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/d505f5cc
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/d505f5cc
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/d505f5cc
Branch: refs/heads/ARTEMIS-780
Commit: d505f5cc39e6f2375098ca5f2a913ce0a688efce
Parents: 10187d0 b4924ce
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Oct 28 16:30:18 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Oct 28 16:30:18 2016 -0400
----------------------------------------------------------------------
.../apache/activemq/artemis/core/io/AbstractSequentialFile.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
[28/34] activemq-artemis git commit: ARTEMIS-790 Added Configuration
conversion tooL
Posted by ma...@apache.org.
ARTEMIS-790 Added Configuration conversion tooL
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e1bc0a36
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e1bc0a36
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e1bc0a36
Branch: refs/heads/ARTEMIS-780
Commit: e1bc0a368e9ac284d625b637b3695870d8adf589
Parents: 54ad2bc
Author: Martyn Taylor <mt...@redhat.com>
Authored: Fri Oct 21 10:51:21 2016 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Nov 1 10:20:52 2016 +0000
----------------------------------------------------------------------
artemis-tools/pom.xml | 56 +
.../config/XMLConfigurationMigration.java | 237 ++
.../migrate/config/addressing/Address.java | 73 +
.../tools/migrate/config/addressing/Queue.java | 50 +
.../src/main/resources/META-INF/MANIFEST.MF | 2 +
.../config/XMLConfigurationMigrationTest.java | 47 +
.../test/resources/artemis-configuration.xsd | 2591 ++++++++++++++++++
.../src/test/resources/artemis-server.xsd | 46 +
artemis-tools/src/test/resources/broker.xml | 64 +
.../src/test/resources/replace/broker.xml | 64 +
.../src/test/resources/replace/broker2.xml | 64 +
pom.xml | 1 +
12 files changed, 3295 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1bc0a36/artemis-tools/pom.xml
----------------------------------------------------------------------
diff --git a/artemis-tools/pom.xml b/artemis-tools/pom.xml
new file mode 100644
index 0000000..9ce22fd
--- /dev/null
+++ b/artemis-tools/pom.xml
@@ -0,0 +1,56 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>artemis-pom</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+
+ <name>ActiveMQ Artemis Tools</name>
+ <groupId>org.apache.activemq.tools</groupId>
+ <artifactId>artemis-tools</artifactId>
+ <packaging>jar</packaging>
+
+ <properties>
+ <activemq.basedir>${project.basedir}/..</activemq.basedir>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1bc0a36/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigration.java
----------------------------------------------------------------------
diff --git a/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigration.java b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigration.java
new file mode 100644
index 0000000..56833ea
--- /dev/null
+++ b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigration.java
@@ -0,0 +1,237 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.tools.migrate.config;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathFactory;
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.activemq.artemis.tools.migrate.config.addressing.Address;
+import org.apache.activemq.artemis.tools.migrate.config.addressing.Queue;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+public class XMLConfigurationMigration {
+
+ private static XMLConfigurationMigration migration;
+
+ private final Document document;
+
+ public static void main(String[] args) throws Exception {
+
+ if (args.length == 0) {
+ System.err.println("Invalid args");
+ printUsage();
+ }
+ else {
+ File input = new File(args[0]);
+ if (input.isDirectory()) {
+ System.out.println("Scanning directory: " + input.getAbsolutePath());
+ recursiveTransform(input);
+ }
+ else {
+ if (args.length != 2) {
+ System.err.println("Invalid args");
+ printUsage();
+ }
+ else {
+ transform(input, new File(args[1]));
+ }
+ }
+ }
+ }
+
+ private static void recursiveTransform(File root) throws Exception {
+ for ( File file : root.listFiles())
+ {
+ scanAndTransform(file);
+ }
+ }
+
+
+ public static void scanAndTransform(File pFile) throws Exception {
+ try {
+ for (File f : pFile.listFiles()) {
+ if (f.isDirectory()) {
+ scanAndTransform(f);
+ } else {
+ try {
+ if (f.getName().endsWith("xml")) {
+ File file = new File(f.getAbsolutePath() + ".new");
+ if (transform(f, file)) {
+ File r = new File(f.getAbsolutePath());
+
+ f.renameTo(new File(f.getAbsolutePath() + ".bk"));
+ file.renameTo(r);
+ }
+ }
+ }
+ catch (Exception e) {
+ //continue
+ }
+ }
+ }
+ }
+ catch (NullPointerException e) {
+ System.out.println(pFile.getAbsoluteFile());
+ }
+ }
+
+ public static void printUsage() {
+ System.out.println("Please specify a directory to scan, or input and output file");
+ }
+
+ public static boolean transform(File input, File output) throws Exception {
+
+ migration = new XMLConfigurationMigration(input);
+ try {
+ if (!input.exists()) {
+ System.err.println("Input file not found: " + input);
+ }
+
+ if (migration.convertQueuesToAddresses()) {
+ Properties properties = new Properties();
+ properties.put(OutputKeys.INDENT, "yes");
+ properties.put("{http://xml.apache.org/xslt}indent-amount", "3");
+ properties.put(OutputKeys.ENCODING, "UTF-8");
+ migration.write(output, properties);
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ System.err.println("Error tranforming document");
+ e.printStackTrace();
+ }
+ return false;
+ }
+
+ public XMLConfigurationMigration(File input) throws Exception {
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setIgnoringElementContentWhitespace(true);
+
+ DocumentBuilder db = factory.newDocumentBuilder();
+ this.document = db.parse(input);
+ }
+
+ public boolean convertQueuesToAddresses() throws Exception {
+
+ Map<String, Address> addresses = new HashMap<>();
+
+ String xPathQueues = "/configuration/core/queues";
+ String xPathQueue = "/configuration/core/queues/queue";
+ String xPathAttrName = "@name";
+ String xPathAddress = "address";
+ String xPathFilter = "filter/@string";
+ String xPathDurable = "durable";
+
+ XPath xPath = XPathFactory.newInstance().newXPath();
+
+ NodeList xpathResult = (NodeList) xPath.evaluate(xPathQueue, document, XPathConstants.NODESET);
+ if (xpathResult == null || xpathResult.getLength() == 0) {
+ // doesn't require change
+ return false;
+ }
+
+ for (int i = 0; i < xpathResult.getLength(); i++) {
+ Node queueNode = xpathResult.item(i);
+
+ Queue queue = new Queue();
+ queue.setName(xPath.evaluate(xPathAttrName, queueNode, XPathConstants.STRING).toString());
+ queue.setDurable(xPath.evaluate(xPathDurable, queueNode, XPathConstants.STRING).toString());
+ queue.setFilter(xPath.evaluate(xPathFilter, queueNode, XPathConstants.STRING).toString());
+
+ String addressName = xPath.evaluate(xPathAddress, queueNode, XPathConstants.STRING).toString();
+ Address address;
+
+ if (addresses.containsKey(addressName)) {
+ address = addresses.get(addressName);
+ }
+ else {
+ address = new Address();
+ address.setName(addressName);
+ addresses.put(addressName, address);
+ }
+ address.getQueues().add(queue);
+ }
+
+ Node queues = ((Node) xPath.evaluate(xPathQueues, document, XPathConstants.NODE));
+
+ if (queues != null) {
+ Node core = queues.getParentNode();
+ core.removeChild(queues);
+
+ Element a = document.createElement("addresses");
+ for (Address addr : addresses.values()) {
+ Element eAddr = document.createElement("address");
+ eAddr.setAttribute("name", addr.getName());
+ eAddr.setAttribute("type", addr.getRoutingType());
+
+ if (addr.getQueues().size() > 0) {
+ Element eQueues = document.createElement("queues");
+ for (Queue queue : addr.getQueues()) {
+ Element eQueue = document.createElement("queue");
+ eQueue.setAttribute("name", queue.getName());
+ eQueue.setAttribute("max-consumers", addr.getDefaultMaxConsumers());
+ eQueue.setAttribute("delete-on-no-consumers", addr.getDefaultDeleteOnNoConsumers());
+
+ if (queue.getDurable() != null && !queue.getDurable().isEmpty()) {
+ Element eDurable = document.createElement("durable");
+ eDurable.setTextContent(queue.getDurable());
+ eQueue.appendChild(eDurable);
+ }
+
+ if (queue.getFilter() != null && !queue.getFilter().isEmpty()) {
+ Element eFilter = document.createElement("filter");
+ eFilter.setAttribute("string", queue.getFilter());
+ eQueue.appendChild(eFilter);
+ }
+
+ eQueues.appendChild(eQueue);
+ }
+ eAddr.appendChild(eQueues);
+ }
+ a.appendChild(eAddr);
+ }
+ core.appendChild(a);
+ }
+
+ document.normalize();
+ return true;
+ }
+
+ public void write(File output, Properties outputProperties) throws TransformerException {
+ Transformer transformer = TransformerFactory.newInstance().newTransformer();
+ transformer.setOutputProperties(outputProperties);
+ StreamResult streamResult = new StreamResult(output);
+ transformer.transform(new DOMSource(document), streamResult);
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1bc0a36/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/addressing/Address.java
----------------------------------------------------------------------
diff --git a/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/addressing/Address.java b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/addressing/Address.java
new file mode 100644
index 0000000..c483c75
--- /dev/null
+++ b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/addressing/Address.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.tools.migrate.config.addressing;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Address {
+
+ private String name;
+
+ private String routingType = "multicast";
+
+ private String defaultMaxConsumers = "-1";
+
+ private String defaultDeleteOnNoConsumers = "false";
+
+ private List<Queue> queues = new ArrayList<>();
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getRoutingType() {
+ return routingType;
+ }
+
+ public void setRoutingType(String routingType) {
+ this.routingType = routingType;
+ }
+
+ public String getDefaultMaxConsumers() {
+ return defaultMaxConsumers;
+ }
+
+ public void setDefaultMaxConsumers(String defaultMaxConsumers) {
+ this.defaultMaxConsumers = defaultMaxConsumers;
+ }
+
+ public String getDefaultDeleteOnNoConsumers() {
+ return defaultDeleteOnNoConsumers;
+ }
+
+ public void setDefaultDeleteOnNoConsumers(String defaultDeleteOnNoConsumers) {
+ this.defaultDeleteOnNoConsumers = defaultDeleteOnNoConsumers;
+ }
+
+ public List<Queue> getQueues() {
+ return queues;
+ }
+
+ public void setQueues(List<Queue> queues) {
+ this.queues = queues;
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1bc0a36/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/addressing/Queue.java
----------------------------------------------------------------------
diff --git a/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/addressing/Queue.java b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/addressing/Queue.java
new file mode 100644
index 0000000..f88b8ef
--- /dev/null
+++ b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/addressing/Queue.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.tools.migrate.config.addressing;
+
+public class Queue {
+
+ String name;
+
+ String filter;
+
+ String durable;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getFilter() {
+ return filter;
+ }
+
+ public void setFilter(String filter) {
+ this.filter = filter;
+ }
+
+ public String getDurable() {
+ return durable;
+ }
+
+ public void setDurable(String durable) {
+ this.durable = durable;
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1bc0a36/artemis-tools/src/main/resources/META-INF/MANIFEST.MF
----------------------------------------------------------------------
diff --git a/artemis-tools/src/main/resources/META-INF/MANIFEST.MF b/artemis-tools/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..72543bf
--- /dev/null
+++ b/artemis-tools/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,2 @@
+Manifest-Version: 1.0
+Main-Class: org.apache.activemq.artemis.tools.migrate.config.XMLConfigurationMigration
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1bc0a36/artemis-tools/src/test/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigrationTest.java
----------------------------------------------------------------------
diff --git a/artemis-tools/src/test/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigrationTest.java b/artemis-tools/src/test/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigrationTest.java
new file mode 100644
index 0000000..f68e9c2
--- /dev/null
+++ b/artemis-tools/src/test/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigrationTest.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.tools.migrate.config;
+
+import javax.xml.transform.OutputKeys;
+import java.io.File;
+import java.util.Properties;
+
+import org.junit.Test;
+
+public class XMLConfigurationMigrationTest {
+
+ @Test
+ public void testQueuesReplacedWithAddresses() throws Exception {
+ File brokerXml = new File(this.getClass().getClassLoader().getResource("broker.xml").toURI());
+ XMLConfigurationMigration tool = new XMLConfigurationMigration(brokerXml);
+
+ File output = new File("target/out.xml");
+ tool.convertQueuesToAddresses();
+
+ Properties properties = new Properties();
+ properties.put(OutputKeys.INDENT, "yes");
+ properties.put("{http://xml.apache.org/xslt}indent-amount", "3");
+ properties.put(OutputKeys.ENCODING, "UTF-8");
+ tool.write(output, properties);
+ }
+
+ @Test
+ public void scanAndReplaceTest() throws Exception {
+ File dir = new File(this.getClass().getClassLoader().getResource("replace").getPath());
+ XMLConfigurationMigration.scanAndTransform(dir);
+ }
+}
[31/34] activemq-artemis git commit: actual persistence work
Posted by ma...@apache.org.
actual persistence work
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/0c84b1d2
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/0c84b1d2
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/0c84b1d2
Branch: refs/heads/ARTEMIS-780
Commit: 0c84b1d2b509f78fb6bdc2405e7f01174a3e5a47
Parents: 74be33f
Author: jbertram <jb...@apache.com>
Authored: Fri Oct 21 19:58:01 2016 -0500
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Nov 1 10:20:52 2016 +0000
----------------------------------------------------------------------
.../core/persistence/AddressBindingInfo.java | 4 --
.../core/persistence/StorageManager.java | 8 +++-
.../journal/AbstractJournalStorageManager.java | 43 +++++++++++++++--
.../impl/journal/DescribeJournal.java | 2 +-
.../impl/journal/JournalRecordIds.java | 2 +
.../codec/PersistentAddressBindingEncoding.java | 49 +------------------
.../impl/nullpm/NullStorageManager.java | 13 ++++-
.../core/server/impl/ActiveMQServerImpl.java | 20 +++++++-
.../artemis/core/server/impl/AddressInfo.java | 9 ++--
.../artemis/core/server/impl/JournalLoader.java | 4 ++
.../server/impl/PostOfficeJournalLoader.java | 16 +++++++
.../transaction/impl/TransactionImplTest.java | 15 +++++-
.../addressing/AddressConfigTest.java | 50 ++++++++++++++++++++
.../DeleteMessagesOnStartupTest.java | 3 +-
.../integration/persistence/RestartSMTest.java | 5 +-
.../persistence/StorageManagerTestBase.java | 3 +-
.../impl/DuplicateDetectionUnitTest.java | 7 +--
.../server/impl/fakes/FakeJournalLoader.java | 6 +++
18 files changed, 188 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c84b1d2/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/AddressBindingInfo.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/AddressBindingInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/AddressBindingInfo.java
index 83d37bc..838be12 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/AddressBindingInfo.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/AddressBindingInfo.java
@@ -25,10 +25,6 @@ public interface AddressBindingInfo {
SimpleString getName();
- boolean isAutoCreated();
-
- SimpleString getUser();
-
AddressInfo.RoutingType getRoutingType();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c84b1d2/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java
index bbfec14..ee11577 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java
@@ -48,6 +48,7 @@ import org.apache.activemq.artemis.core.server.RouteContextList;
import org.apache.activemq.artemis.core.server.ServerMessage;
import org.apache.activemq.artemis.core.server.files.FileStoreMonitor;
import org.apache.activemq.artemis.core.server.group.impl.GroupBinding;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.core.server.impl.JournalLoader;
import org.apache.activemq.artemis.core.transaction.ResourceManager;
import org.apache.activemq.artemis.core.transaction.Transaction;
@@ -298,8 +299,13 @@ public interface StorageManager extends IDGenerator, ActiveMQComponent {
void deleteQueueStatus(long recordID) throws Exception;
+ void addAddressBinding(long tx, AddressInfo addressInfo) throws Exception;
+
+ void deleteAddressBinding(long tx, long addressBindingID) throws Exception;
+
JournalLoadInformation loadBindingJournal(List<QueueBindingInfo> queueBindingInfos,
- List<GroupingInfo> groupingInfos) throws Exception;
+ List<GroupingInfo> groupingInfos,
+ List<AddressBindingInfo> addressBindingInfos) throws Exception;
// grouping related operations
void addGrouping(GroupBinding groupBinding) throws Exception;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c84b1d2/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
index ecaa86e..b67cfa6 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
@@ -56,6 +56,7 @@ import org.apache.activemq.artemis.core.paging.cursor.PagePosition;
import org.apache.activemq.artemis.core.paging.cursor.PageSubscription;
import org.apache.activemq.artemis.core.paging.cursor.PagedReferenceImpl;
import org.apache.activemq.artemis.core.paging.impl.PageTransactionInfoImpl;
+import org.apache.activemq.artemis.core.persistence.AddressBindingInfo;
import org.apache.activemq.artemis.core.persistence.GroupingInfo;
import org.apache.activemq.artemis.core.persistence.OperationContext;
import org.apache.activemq.artemis.core.persistence.QueueBindingInfo;
@@ -77,6 +78,7 @@ import org.apache.activemq.artemis.core.persistence.impl.journal.codec.PageCount
import org.apache.activemq.artemis.core.persistence.impl.journal.codec.PageCountRecordInc;
import org.apache.activemq.artemis.core.persistence.impl.journal.codec.PageUpdateTXEncoding;
import org.apache.activemq.artemis.core.persistence.impl.journal.codec.PendingLargeMessageEncoding;
+import org.apache.activemq.artemis.core.persistence.impl.journal.codec.PersistentAddressBindingEncoding;
import org.apache.activemq.artemis.core.persistence.impl.journal.codec.PersistentQueueBindingEncoding;
import org.apache.activemq.artemis.core.persistence.impl.journal.codec.QueueStatusEncoding;
import org.apache.activemq.artemis.core.persistence.impl.journal.codec.RefEncoding;
@@ -93,6 +95,7 @@ import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.core.server.RouteContextList;
import org.apache.activemq.artemis.core.server.ServerMessage;
import org.apache.activemq.artemis.core.server.group.impl.GroupBinding;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.core.server.impl.JournalLoader;
import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl;
import org.apache.activemq.artemis.core.transaction.ResourceManager;
@@ -1261,7 +1264,29 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} finally {
readUnLock();
}
+ }
+
+ public void addAddressBinding(final long tx, final AddressInfo addressInfo) throws Exception {
+ PersistentAddressBindingEncoding bindingEncoding = new PersistentAddressBindingEncoding(addressInfo.getName(), addressInfo.getRoutingType());
+ readLock();
+ try {
+ long recordID = idGenerator.generateID();
+ bindingEncoding.setId(recordID);
+ bindingsJournal.appendAddRecordTransactional(tx, recordID, JournalRecordIds.ADDRESS_BINDING_RECORD, bindingEncoding);
+ } finally {
+ readUnLock();
+ }
+ }
+
+ @Override
+ public void deleteAddressBinding(long tx, final long addressBindingID) throws Exception {
+ readLock();
+ try {
+ bindingsJournal.appendDeleteRecordTransactional(tx, addressBindingID);
+ } finally {
+ readUnLock();
+ }
}
@Override
@@ -1347,7 +1372,8 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
@Override
public JournalLoadInformation loadBindingJournal(final List<QueueBindingInfo> queueBindingInfos,
- final List<GroupingInfo> groupingInfos) throws Exception {
+ final List<GroupingInfo> groupingInfos,
+ final List<AddressBindingInfo> addressBindingInfos) throws Exception {
List<RecordInfo> records = new ArrayList<>();
List<PreparedTransactionInfo> preparedTransactions = new ArrayList<>();
@@ -1364,12 +1390,15 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
byte rec = record.getUserRecordType();
if (rec == JournalRecordIds.QUEUE_BINDING_RECORD) {
- PersistentQueueBindingEncoding bindingEncoding = newBindingEncoding(id, buffer);
-
+ PersistentQueueBindingEncoding bindingEncoding = newQueueBindingEncoding(id, buffer);
queueBindingInfos.add(bindingEncoding);
mapBindings.put(bindingEncoding.getId(), bindingEncoding);
} else if (rec == JournalRecordIds.ID_COUNTER_RECORD) {
idGenerator.loadState(record.id, buffer);
+ } else if (rec == JournalRecordIds.ADDRESS_BINDING_RECORD) {
+ PersistentAddressBindingEncoding bindingEncoding = newAddressBindingEncoding(id, buffer);
+ ActiveMQServerLogger.LOGGER.info("=== Loading: " + bindingEncoding);
+ addressBindingInfos.add(bindingEncoding);
} else if (rec == JournalRecordIds.GROUP_RECORD) {
GroupingEncoding encoding = newGroupEncoding(id, buffer);
groupingInfos.add(encoding);
@@ -1849,7 +1878,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
* @param buffer
* @return
*/
- protected static PersistentQueueBindingEncoding newBindingEncoding(long id, ActiveMQBuffer buffer) {
+ protected static PersistentQueueBindingEncoding newQueueBindingEncoding(long id, ActiveMQBuffer buffer) {
PersistentQueueBindingEncoding bindingEncoding = new PersistentQueueBindingEncoding();
bindingEncoding.decode(buffer);
@@ -1872,8 +1901,14 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
return statusEncoding;
}
+ protected static PersistentAddressBindingEncoding newAddressBindingEncoding(long id, ActiveMQBuffer buffer) {
+ PersistentAddressBindingEncoding bindingEncoding = new PersistentAddressBindingEncoding();
+ bindingEncoding.decode(buffer);
+ bindingEncoding.setId(id);
+ return bindingEncoding;
+ }
@Override
public boolean addToPage(PagingStore store,
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c84b1d2/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java
index 58723c6..a5c1fd7 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java
@@ -555,7 +555,7 @@ public final class DescribeJournal {
return AbstractJournalStorageManager.newQueueStatusEncoding(id, buffer);
case QUEUE_BINDING_RECORD:
- return AbstractJournalStorageManager.newBindingEncoding(id, buffer);
+ return AbstractJournalStorageManager.newQueueBindingEncoding(id, buffer);
case ID_COUNTER_RECORD:
EncodingSupport idReturn = new IDCounterEncoding();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c84b1d2/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalRecordIds.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalRecordIds.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalRecordIds.java
index 0169f38..cd1d526 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalRecordIds.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalRecordIds.java
@@ -83,4 +83,6 @@ public final class JournalRecordIds {
public static final byte PAGE_CURSOR_COMPLETE = 42;
public static final byte PAGE_CURSOR_PENDING_COUNTER = 43;
+
+ public static final byte ADDRESS_BINDING_RECORD = 44;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c84b1d2/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentAddressBindingEncoding.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentAddressBindingEncoding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentAddressBindingEncoding.java
index 9f47362..7ef7e4d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentAddressBindingEncoding.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentAddressBindingEncoding.java
@@ -29,10 +29,6 @@ public class PersistentAddressBindingEncoding implements EncodingSupport, Addres
public SimpleString name;
- public boolean autoCreated;
-
- public SimpleString user;
-
public AddressInfo.RoutingType routingType;
public PersistentAddressBindingEncoding() {
@@ -43,22 +39,14 @@ public class PersistentAddressBindingEncoding implements EncodingSupport, Addres
return "PersistentAddressBindingEncoding [id=" + id +
", name=" +
name +
- ", user=" +
- user +
- ", autoCreated=" +
- autoCreated +
", routingType=" +
routingType +
"]";
}
public PersistentAddressBindingEncoding(final SimpleString name,
- final SimpleString user,
- final boolean autoCreated,
final AddressInfo.RoutingType routingType) {
this.name = name;
- this.user = user;
- this.autoCreated = autoCreated;
this.routingType = routingType;
}
@@ -77,16 +65,6 @@ public class PersistentAddressBindingEncoding implements EncodingSupport, Addres
}
@Override
- public SimpleString getUser() {
- return user;
- }
-
- @Override
- public boolean isAutoCreated() {
- return autoCreated;
- }
-
- @Override
public AddressInfo.RoutingType getRoutingType() {
return routingType;
}
@@ -94,42 +72,17 @@ public class PersistentAddressBindingEncoding implements EncodingSupport, Addres
@Override
public void decode(final ActiveMQBuffer buffer) {
name = buffer.readSimpleString();
-
- String metadata = buffer.readNullableSimpleString().toString();
- if (metadata != null) {
- String[] elements = metadata.split(";");
- for (String element : elements) {
- String[] keyValuePair = element.split("=");
- if (keyValuePair.length == 2) {
- if (keyValuePair[0].equals("user")) {
- user = SimpleString.toSimpleString(keyValuePair[1]);
- }
- }
- }
- }
-
- autoCreated = buffer.readBoolean();
routingType = AddressInfo.RoutingType.getType(buffer.readByte());
}
@Override
public void encode(final ActiveMQBuffer buffer) {
buffer.writeSimpleString(name);
- buffer.writeNullableSimpleString(createMetadata());
- buffer.writeBoolean(autoCreated);
buffer.writeByte(routingType.getType());
}
@Override
public int getEncodeSize() {
- return SimpleString.sizeofString(name) + DataConstants.SIZE_BOOLEAN +
- SimpleString.sizeofNullableString(createMetadata()) +
- DataConstants.SIZE_BYTE;
- }
-
- private SimpleString createMetadata() {
- StringBuilder metadata = new StringBuilder();
- metadata.append("user=").append(user).append(";");
- return SimpleString.toSimpleString(metadata.toString());
+ return SimpleString.sizeofString(name) + DataConstants.SIZE_BYTE;
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c84b1d2/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageManager.java
index 3a2999e..404f248 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/nullpm/NullStorageManager.java
@@ -38,6 +38,7 @@ import org.apache.activemq.artemis.core.paging.PagedMessage;
import org.apache.activemq.artemis.core.paging.PagingManager;
import org.apache.activemq.artemis.core.paging.PagingStore;
import org.apache.activemq.artemis.core.paging.cursor.PagePosition;
+import org.apache.activemq.artemis.core.persistence.AddressBindingInfo;
import org.apache.activemq.artemis.core.persistence.GroupingInfo;
import org.apache.activemq.artemis.core.persistence.OperationContext;
import org.apache.activemq.artemis.core.persistence.QueueBindingInfo;
@@ -55,6 +56,7 @@ import org.apache.activemq.artemis.core.server.RouteContextList;
import org.apache.activemq.artemis.core.server.ServerMessage;
import org.apache.activemq.artemis.core.server.files.FileStoreMonitor;
import org.apache.activemq.artemis.core.server.group.impl.GroupBinding;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.core.server.impl.JournalLoader;
import org.apache.activemq.artemis.core.transaction.ResourceManager;
import org.apache.activemq.artemis.core.transaction.Transaction;
@@ -155,12 +157,21 @@ public class NullStorageManager implements StorageManager {
}
@Override
+ public void addAddressBinding(long tx, AddressInfo addressInfo) throws Exception {
+ }
+
+ @Override
+ public void deleteAddressBinding(long tx, long addressBindingID) throws Exception {
+ }
+
+ @Override
public void commit(final long txID) throws Exception {
}
@Override
public JournalLoadInformation loadBindingJournal(final List<QueueBindingInfo> queueBindingInfos,
- final List<GroupingInfo> groupingInfos) throws Exception {
+ final List<GroupingInfo> groupingInfos,
+ final List<AddressBindingInfo> addressBindingInfos) throws Exception {
return new JournalLoadInformation();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c84b1d2/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 2e09083..a42acd9 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -72,6 +72,7 @@ import org.apache.activemq.artemis.core.paging.PagingManager;
import org.apache.activemq.artemis.core.paging.cursor.PageSubscription;
import org.apache.activemq.artemis.core.paging.impl.PagingManagerImpl;
import org.apache.activemq.artemis.core.paging.impl.PagingStoreFactoryNIO;
+import org.apache.activemq.artemis.core.persistence.AddressBindingInfo;
import org.apache.activemq.artemis.core.persistence.GroupingInfo;
import org.apache.activemq.artemis.core.persistence.OperationContext;
import org.apache.activemq.artemis.core.persistence.QueueBindingInfo;
@@ -2132,7 +2133,9 @@ public class ActiveMQServerImpl implements ActiveMQServer {
List<GroupingInfo> groupingInfos = new ArrayList<>();
- journalInfo[0] = storageManager.loadBindingJournal(queueBindingInfos, groupingInfos);
+ List<AddressBindingInfo> addressBindingInfos = new ArrayList<>();
+
+ journalInfo[0] = storageManager.loadBindingJournal(queueBindingInfos, groupingInfos, addressBindingInfos);
recoverStoredConfigs();
@@ -2142,6 +2145,10 @@ public class ActiveMQServerImpl implements ActiveMQServer {
journalLoader.handleGroupingBindings(groupingInfos);
+ Map<Long, AddressBindingInfo> addressBindingInfosMap = new HashMap<>();
+
+ journalLoader.initAddresses(addressBindingInfosMap, addressBindingInfos);
+
Map<SimpleString, List<Pair<byte[], Long>>> duplicateIDMap = new HashMap<>();
HashSet<Pair<Long, Long>> pendingLargeMessages = new HashSet<>();
@@ -2240,6 +2247,14 @@ public class ActiveMQServerImpl implements ActiveMQServer {
final QueueConfig queueConfig = queueConfigBuilder.filter(filter).pagingManager(pagingManager).user(user).durable(durable).temporary(temporary).autoCreated(autoCreated).build();
final Queue queue = queueFactory.createQueueWith(queueConfig);
+ boolean addressAlreadyExists = true;
+
+ if (postOffice.getAddressInfo(queue.getAddress()) == null) {
+ postOffice.addAddressInfo(new AddressInfo(queue.getAddress())
+ .setRoutingType(AddressInfo.RoutingType.MULTICAST));
+ addressAlreadyExists = false;
+ }
+
if (transientQueue) {
queue.setConsumersRefCount(new TransientQueueManagerImpl(this, queue.getName()));
} else if (queue.isAutoCreated()) {
@@ -2250,6 +2265,9 @@ public class ActiveMQServerImpl implements ActiveMQServer {
if (queue.isDurable()) {
storageManager.addQueueBinding(txID, localQueueBinding);
+ if (!addressAlreadyExists) {
+ storageManager.addAddressBinding(txID, getAddressInfo(queue.getAddress()));
+ }
}
try {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c84b1d2/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
index 1449107..4e982c4 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
@@ -36,24 +36,27 @@ public class AddressInfo {
return routingType;
}
- public void setRoutingType(RoutingType routingType) {
+ public AddressInfo setRoutingType(RoutingType routingType) {
this.routingType = routingType;
+ return this;
}
public boolean isDefaultDeleteOnNoConsumers() {
return defaultDeleteOnNoConsumers;
}
- public void setDefaultDeleteOnNoConsumers(boolean defaultDeleteOnNoConsumers) {
+ public AddressInfo setDefaultDeleteOnNoConsumers(boolean defaultDeleteOnNoConsumers) {
this.defaultDeleteOnNoConsumers = defaultDeleteOnNoConsumers;
+ return this;
}
public int getDefaultMaxConsumers() {
return defaultMaxConsumers;
}
- public void setDefaultMaxConsumers(int defaultMaxConsumers) {
+ public AddressInfo setDefaultMaxConsumers(int defaultMaxConsumers) {
this.defaultMaxConsumers = defaultMaxConsumers;
+ return this;
}
public SimpleString getName() {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c84b1d2/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/JournalLoader.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/JournalLoader.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/JournalLoader.java
index 6f36ff5..40cef50 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/JournalLoader.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/JournalLoader.java
@@ -23,6 +23,7 @@ import java.util.Map;
import org.apache.activemq.artemis.api.core.Pair;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.journal.Journal;
+import org.apache.activemq.artemis.core.persistence.AddressBindingInfo;
import org.apache.activemq.artemis.core.persistence.GroupingInfo;
import org.apache.activemq.artemis.core.persistence.QueueBindingInfo;
import org.apache.activemq.artemis.core.persistence.impl.PageCountPending;
@@ -37,6 +38,9 @@ public interface JournalLoader {
void initQueues(Map<Long, QueueBindingInfo> queueBindingInfosMap,
List<QueueBindingInfo> queueBindingInfos) throws Exception;
+ void initAddresses(Map<Long, AddressBindingInfo> addressBindingInfosMap,
+ List<AddressBindingInfo> addressBindingInfo) throws Exception;
+
void handleAddMessage(Map<Long, Map<Long, AddMessageRecord>> queueMap) throws Exception;
void handleNoMessageReferences(Map<Long, ServerMessage> messages);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c84b1d2/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
index 71c5b2b..4e89e8a 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
@@ -37,6 +37,7 @@ import org.apache.activemq.artemis.core.paging.PagingManager;
import org.apache.activemq.artemis.core.paging.PagingStore;
import org.apache.activemq.artemis.core.paging.cursor.PageSubscriptionCounter;
import org.apache.activemq.artemis.core.paging.impl.Page;
+import org.apache.activemq.artemis.core.persistence.AddressBindingInfo;
import org.apache.activemq.artemis.core.persistence.GroupingInfo;
import org.apache.activemq.artemis.core.persistence.QueueBindingInfo;
import org.apache.activemq.artemis.core.persistence.QueueStatus;
@@ -166,6 +167,21 @@ public class PostOfficeJournalLoader implements JournalLoader {
}
@Override
+ public void initAddresses(Map<Long, AddressBindingInfo> addressBindingInfosMap,
+ List<AddressBindingInfo> addressBindingInfos) throws Exception {
+ for (AddressBindingInfo addressBindingInfo : addressBindingInfos) {
+ addressBindingInfosMap.put(addressBindingInfo.getId(), addressBindingInfo);
+
+ // TODO: figure out what else to set here
+ AddressInfo addressInfo = new AddressInfo(addressBindingInfo.getName())
+ .setRoutingType(addressBindingInfo.getRoutingType());
+
+ postOffice.addAddressInfo(addressInfo);
+ managementService.registerAddress(addressInfo.getName());
+ }
+ }
+
+ @Override
public void handleAddMessage(Map<Long, Map<Long, AddMessageRecord>> queueMap) throws Exception {
for (Map.Entry<Long, Map<Long, AddMessageRecord>> entry : queueMap.entrySet()) {
long queueID = entry.getKey();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c84b1d2/artemis-server/src/test/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImplTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImplTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImplTest.java
index 93c5c9d..97dc90d 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImplTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/transaction/impl/TransactionImplTest.java
@@ -38,6 +38,7 @@ import org.apache.activemq.artemis.core.paging.PagedMessage;
import org.apache.activemq.artemis.core.paging.PagingManager;
import org.apache.activemq.artemis.core.paging.PagingStore;
import org.apache.activemq.artemis.core.paging.cursor.PagePosition;
+import org.apache.activemq.artemis.core.persistence.AddressBindingInfo;
import org.apache.activemq.artemis.core.persistence.GroupingInfo;
import org.apache.activemq.artemis.core.persistence.OperationContext;
import org.apache.activemq.artemis.core.persistence.QueueBindingInfo;
@@ -55,6 +56,7 @@ import org.apache.activemq.artemis.core.server.RouteContextList;
import org.apache.activemq.artemis.core.server.ServerMessage;
import org.apache.activemq.artemis.core.server.files.FileStoreMonitor;
import org.apache.activemq.artemis.core.server.group.impl.GroupBinding;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.core.server.impl.JournalLoader;
import org.apache.activemq.artemis.core.transaction.ResourceManager;
import org.apache.activemq.artemis.core.transaction.Transaction;
@@ -529,8 +531,19 @@ public class TransactionImplTest extends ActiveMQTestBase {
}
@Override
+ public void addAddressBinding(long tx, AddressInfo addressInfo) throws Exception {
+
+ }
+
+ @Override
+ public void deleteAddressBinding(long tx, long addressBindingID) throws Exception {
+
+ }
+
+ @Override
public JournalLoadInformation loadBindingJournal(List<QueueBindingInfo> queueBindingInfos,
- List<GroupingInfo> groupingInfos) throws Exception {
+ List<GroupingInfo> groupingInfos,
+ List<AddressBindingInfo> addressBindingInfos) throws Exception {
return null;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c84b1d2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressConfigTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressConfigTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressConfigTest.java
new file mode 100644
index 0000000..f3a0beb
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressConfigTest.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * <br>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <br>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.artemis.tests.integration.addressing;
+
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.junit.Before;
+import org.junit.Test;
+
+public class AddressConfigTest extends ActiveMQTestBase {
+
+ protected ActiveMQServer server;
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ super.setUp();
+ Configuration configuration = createDefaultInVMConfig();
+ server = createServer(true, configuration);
+ server.start();
+ }
+
+ @Test
+ public void persistAddressConfigTest() throws Exception {
+ server.createQueue(SimpleString.toSimpleString("myAddress"), SimpleString.toSimpleString("myQueue"), null, true, false);
+ server.stop();
+ server.start();
+ AddressInfo addressInfo = server.getAddressInfo(SimpleString.toSimpleString("myAddress"));
+ assertNotNull(addressInfo);
+ assertEquals(AddressInfo.RoutingType.MULTICAST, addressInfo.getRoutingType());
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c84b1d2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java
index 7d515d8..90f7c5f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.config.StoreConfiguration;
+import org.apache.activemq.artemis.core.persistence.AddressBindingInfo;
import org.apache.activemq.artemis.core.persistence.GroupingInfo;
import org.apache.activemq.artemis.core.persistence.QueueBindingInfo;
import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager;
@@ -76,7 +77,7 @@ public class DeleteMessagesOnStartupTest extends StorageManagerTestBase {
journal.start();
- journal.loadBindingJournal(new ArrayList<QueueBindingInfo>(), new ArrayList<GroupingInfo>());
+ journal.loadBindingJournal(new ArrayList<QueueBindingInfo>(), new ArrayList<GroupingInfo>(), new ArrayList<AddressBindingInfo>());
FakePostOffice postOffice = new FakePostOffice();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c84b1d2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
index 49d3a12..2ee879f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutorService;
+import org.apache.activemq.artemis.core.persistence.AddressBindingInfo;
import org.apache.activemq.artemis.core.persistence.GroupingInfo;
import org.apache.activemq.artemis.core.persistence.QueueBindingInfo;
import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager;
@@ -73,7 +74,7 @@ public class RestartSMTest extends ActiveMQTestBase {
List<QueueBindingInfo> queueBindingInfos = new ArrayList<>();
- journal.loadBindingJournal(queueBindingInfos, new ArrayList<GroupingInfo>());
+ journal.loadBindingJournal(queueBindingInfos, new ArrayList<GroupingInfo>(), new ArrayList<AddressBindingInfo>());
journal.loadMessageJournal(postOffice, null, null, null, null, null, null, new FakeJournalLoader());
@@ -87,7 +88,7 @@ public class RestartSMTest extends ActiveMQTestBase {
queueBindingInfos = new ArrayList<>();
- journal.loadBindingJournal(queueBindingInfos, new ArrayList<GroupingInfo>());
+ journal.loadBindingJournal(queueBindingInfos, new ArrayList<GroupingInfo>(), new ArrayList<AddressBindingInfo>());
journal.start();
} finally {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c84b1d2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java
index a104363..508f23b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/StorageManagerTestBase.java
@@ -25,6 +25,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.config.StoreConfiguration;
+import org.apache.activemq.artemis.core.persistence.AddressBindingInfo;
import org.apache.activemq.artemis.core.persistence.GroupingInfo;
import org.apache.activemq.artemis.core.persistence.QueueBindingInfo;
import org.apache.activemq.artemis.core.persistence.StorageManager;
@@ -128,7 +129,7 @@ public abstract class StorageManagerTestBase extends ActiveMQTestBase {
journal.start();
- journal.loadBindingJournal(new ArrayList<QueueBindingInfo>(), new ArrayList<GroupingInfo>());
+ journal.loadBindingJournal(new ArrayList<QueueBindingInfo>(), new ArrayList<GroupingInfo>(), new ArrayList<AddressBindingInfo>());
journal.loadMessageJournal(new FakePostOffice(), null, null, null, null, null, null, new FakeJournalLoader());
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c84b1d2/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
index 96fa35c..58c5c4f 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
@@ -27,6 +27,7 @@ import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.api.core.Pair;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.persistence.AddressBindingInfo;
import org.apache.activemq.artemis.core.persistence.GroupingInfo;
import org.apache.activemq.artemis.core.persistence.QueueBindingInfo;
import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager;
@@ -95,7 +96,7 @@ public class DuplicateDetectionUnitTest extends ActiveMQTestBase {
journal = new JournalStorageManager(configuration, factory, factory);
journal.start();
- journal.loadBindingJournal(new ArrayList<QueueBindingInfo>(), new ArrayList<GroupingInfo>());
+ journal.loadBindingJournal(new ArrayList<QueueBindingInfo>(), new ArrayList<GroupingInfo>(), new ArrayList<AddressBindingInfo>());
HashMap<SimpleString, List<Pair<byte[], Long>>> mapDups = new HashMap<>();
@@ -114,7 +115,7 @@ public class DuplicateDetectionUnitTest extends ActiveMQTestBase {
journal = new JournalStorageManager(configuration, factory, factory);
journal.start();
- journal.loadBindingJournal(new ArrayList<QueueBindingInfo>(), new ArrayList<GroupingInfo>());
+ journal.loadBindingJournal(new ArrayList<QueueBindingInfo>(), new ArrayList<GroupingInfo>(), new ArrayList<AddressBindingInfo>());
journal.loadMessageJournal(postOffice, pagingManager, new ResourceManagerImpl(0, 0, scheduledThreadPool), null, mapDups, null, null, new PostOfficeJournalLoader(postOffice, pagingManager, null, null, null, null, null, null));
@@ -137,7 +138,7 @@ public class DuplicateDetectionUnitTest extends ActiveMQTestBase {
journal = new JournalStorageManager(configuration, factory, factory);
journal.start();
- journal.loadBindingJournal(new ArrayList<QueueBindingInfo>(), new ArrayList<GroupingInfo>());
+ journal.loadBindingJournal(new ArrayList<QueueBindingInfo>(), new ArrayList<GroupingInfo>(), new ArrayList<AddressBindingInfo>());
journal.loadMessageJournal(postOffice, pagingManager, new ResourceManagerImpl(0, 0, scheduledThreadPool), null, mapDups, null, null, new PostOfficeJournalLoader(postOffice, pagingManager, null, null, null, null, null, null));
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0c84b1d2/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakeJournalLoader.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakeJournalLoader.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakeJournalLoader.java
index 32ad718..547d669 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakeJournalLoader.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakeJournalLoader.java
@@ -23,6 +23,7 @@ import java.util.Map;
import org.apache.activemq.artemis.api.core.Pair;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.journal.Journal;
+import org.apache.activemq.artemis.core.persistence.AddressBindingInfo;
import org.apache.activemq.artemis.core.persistence.GroupingInfo;
import org.apache.activemq.artemis.core.persistence.QueueBindingInfo;
import org.apache.activemq.artemis.core.persistence.impl.PageCountPending;
@@ -49,6 +50,11 @@ public class FakeJournalLoader implements JournalLoader {
}
@Override
+ public void initAddresses(Map<Long, AddressBindingInfo> addressBindingInfosMap,
+ List<AddressBindingInfo> addressBindingInfo) throws Exception {
+ }
+
+ @Override
public void handleGroupingBindings(List<GroupingInfo> groupingInfos) {
}
[23/34] activemq-artemis git commit: XML Tranform JMS Queue/Topic to
new model
Posted by ma...@apache.org.
XML Tranform JMS Queue/Topic to new model
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c3ece068
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c3ece068
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c3ece068
Branch: refs/heads/ARTEMIS-780
Commit: c3ece0685722b2aa8dad5175baf8c21289960a02
Parents: 0c84b1d
Author: Martyn Taylor <mt...@redhat.com>
Authored: Tue Oct 25 14:15:34 2016 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Nov 1 10:20:52 2016 +0000
----------------------------------------------------------------------
.../artemis/tools/migrate/config/Main.java | 85 +++++
.../config/XMLConfigurationMigration.java | 330 ++++++++++++-------
.../src/main/resources/META-INF/MANIFEST.MF | 2 +-
.../config/XMLConfigurationMigrationTest.java | 9 +-
artemis-tools/src/test/resources/broker.xml | 13 +-
5 files changed, 307 insertions(+), 132 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c3ece068/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/Main.java
----------------------------------------------------------------------
diff --git a/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/Main.java b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/Main.java
new file mode 100644
index 0000000..c45d92a
--- /dev/null
+++ b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/Main.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.tools.migrate.config;
+
+import java.io.File;
+
+public class Main {
+
+ public static void main(String[] args) throws Exception {
+
+ if (args.length == 0) {
+ System.err.println("Invalid args");
+ printUsage();
+ } else {
+ File input = new File(args[0]);
+ if (input.isDirectory()) {
+ System.out.println("Scanning directory: " + input.getAbsolutePath());
+ recursiveTransform(input);
+ } else {
+ if (args.length != 2) {
+ System.err.println("Invalid args");
+ printUsage();
+ } else {
+ try {
+ XMLConfigurationMigration migration = new XMLConfigurationMigration(input, new File(args[1]));
+ }
+ catch (Exception e) {
+ // Unable to process file, move on.
+ }
+ }
+ }
+ }
+ }
+
+ private static void recursiveTransform(File root) throws Exception {
+ for (File file : root.listFiles()) {
+ scanAndTransform(file);
+ }
+ }
+
+ public static void scanAndTransform(File pFile) throws Exception {
+ try {
+ for (File f : pFile.listFiles()) {
+ if (f.isDirectory()) {
+ scanAndTransform(f);
+ } else {
+ try {
+ if (f.getName().endsWith("xml")) {
+ File file = new File(f.getAbsolutePath() + ".new");
+ XMLConfigurationMigration migration = new XMLConfigurationMigration(f, file);
+ if (migration.transform()) {
+ File r = new File(f.getAbsolutePath());
+ f.renameTo(new File(f.getAbsolutePath() + ".bk"));
+ file.renameTo(r);
+ }
+ }
+ } catch (Exception e) {
+ //Unable to process file, continue
+ }
+ }
+ }
+ } catch (NullPointerException e) {
+ System.out.println(pFile.getAbsoluteFile());
+ }
+ }
+
+ public static void printUsage() {
+ System.out.println("Please specify a directory to scan, or input and output file");
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c3ece068/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigration.java
----------------------------------------------------------------------
diff --git a/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigration.java b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigration.java
index 90be53c..f5811a6 100644
--- a/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigration.java
+++ b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigration.java
@@ -26,9 +26,12 @@ import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
import java.io.File;
+import java.util.Collection;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
@@ -41,83 +44,97 @@ import org.w3c.dom.NodeList;
public class XMLConfigurationMigration {
- private static XMLConfigurationMigration migration;
+ // Attributes
+ private static final String xPathAttrName = "@name";
+
+ // JMS XPaths
+ private static final String xPathJMS = "/configuration/jms";
+
+ private static final String xPathJMSQueues = "/configuration/jms/queue";
+
+ private static final String xPathJMSTopics = "/configuration/jms/topic";
+
+ // Core Queue XPaths
+ private static final String xPathQueues = "/configuration/core/queues";
+
+ private static final String xPathQueue = "/configuration/core/queues/queue";
+
+ private static final String xPathAddress = "address";
+
+ private static final String xPathFilter = "filter/@string";
+
+ private static final String xPathSelector = "selector/@string";
+
+ private static final String xPathDurable = "durable";
+
+ private static final String jmsQueuePrefix = "jms.queue.";
+
+ private static final String jmsTopicPrefix = "jms.topic.";
+
+ private final Map<String, Address> jmsQueueAddresses = new HashMap<>();
+
+ private final Map<String, Address> jmsTopicAddresses = new HashMap<>();
+
+ private final Map<String, Address> coreAddresses = new HashMap<>();
+
+ private final Map<String, Address> aliases = new HashMap<>();
private final Document document;
- public static void main(String[] args) throws Exception {
+ private final File input;
- if (args.length == 0) {
- System.err.println("Invalid args");
- printUsage();
- } else {
- File input = new File(args[0]);
- if (input.isDirectory()) {
- System.out.println("Scanning directory: " + input.getAbsolutePath());
- recursiveTransform(input);
- } else {
- if (args.length != 2) {
- System.err.println("Invalid args");
- printUsage();
- } else {
- transform(input, new File(args[1]));
- }
- }
- }
- }
+ private final File output;
- private static void recursiveTransform(File root) throws Exception {
- for (File file : root.listFiles()) {
- scanAndTransform(file);
- }
- }
+ private final Node coreElement;
+
+ private final XPath xPath;
+
+ public XMLConfigurationMigration(File input, File output) throws Exception {
+
+ this.input = input;
+ this.output = output;
- public static void scanAndTransform(File pFile) throws Exception {
try {
- for (File f : pFile.listFiles()) {
- if (f.isDirectory()) {
- scanAndTransform(f);
- } else {
- try {
- if (f.getName().endsWith("xml")) {
- File file = new File(f.getAbsolutePath() + ".new");
- if (transform(f, file)) {
- File r = new File(f.getAbsolutePath());
-
- f.renameTo(new File(f.getAbsolutePath() + ".bk"));
- file.renameTo(r);
- }
- }
- } catch (Exception e) {
- //continue
- }
- }
+ if (!input.exists()) {
+ throw new Exception("Input file not found: " + input);
+ }
+
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ factory.setIgnoringElementContentWhitespace(true);
+
+ DocumentBuilder db = factory.newDocumentBuilder();
+ this.document = db.parse(this.input);
+
+ xPath = XPathFactory.newInstance().newXPath();
+ coreElement = (Node) xPath.evaluate("/configuration/core", document, XPathConstants.NODE);
+
+ if (coreElement == null) {
+ throw new Exception("Not a artemis config");
}
- } catch (NullPointerException e) {
- System.out.println(pFile.getAbsoluteFile());
+ }
+ catch (Exception e) {
+ throw new Exception(e);
}
}
- public static void printUsage() {
- System.out.println("Please specify a directory to scan, or input and output file");
- }
+ public boolean transform() throws Exception {
+ try {
- public static boolean transform(File input, File output) throws Exception {
+ boolean queuesChanged = convertQueuesToAddresses();
+ boolean jmsChanged = convertJMSToAddresses();
- migration = new XMLConfigurationMigration(input);
- try {
- if (!input.exists()) {
- System.err.println("Input file not found: " + input);
- }
+ writeAddressesToDocument();
+ document.normalize();
- if (migration.convertQueuesToAddresses()) {
+ if (queuesChanged || jmsChanged) {
Properties properties = new Properties();
properties.put(OutputKeys.INDENT, "yes");
properties.put("{http://xml.apache.org/xslt}indent-amount", "3");
properties.put(OutputKeys.ENCODING, "UTF-8");
- migration.write(output, properties);
+ write(output, properties);
return true;
}
+
} catch (Exception e) {
System.err.println("Error tranforming document");
e.printStackTrace();
@@ -125,97 +142,147 @@ public class XMLConfigurationMigration {
return false;
}
- public XMLConfigurationMigration(File input) throws Exception {
- DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
- factory.setIgnoringElementContentWhitespace(true);
+ public boolean convertQueuesToAddresses() throws Exception {
- DocumentBuilder db = factory.newDocumentBuilder();
- this.document = db.parse(input);
- }
+ Node coreQueuesElement = getNode(xPathQueues);
+ if (coreQueuesElement == null) {
+ return false;
+ }
- public boolean convertQueuesToAddresses() throws Exception {
+ NodeList coreQueueElements = getNodeList(xPathQueue);
+ for (int i = 0; i < coreQueueElements.getLength(); i++) {
+ Node queueNode = coreQueueElements.item(i);
+
+ Queue queue = new Queue();
+ queue.setName(getString(queueNode, xPathAttrName));
+ queue.setDurable(getString(queueNode, xPathDurable));
+ queue.setFilter(getString(queueNode, xPathFilter));
- Map<String, Address> addresses = new HashMap<>();
+ String addressName = getString(queueNode, xPathAddress);
- String xPathQueues = "/configuration/core/queues";
- String xPathQueue = "/configuration/core/queues/queue";
- String xPathAttrName = "@name";
- String xPathAddress = "address";
- String xPathFilter = "filter/@string";
- String xPathDurable = "durable";
+ Address address;
+ if (coreAddresses.containsKey(addressName)) {
+ address = coreAddresses.get(addressName);
+ } else {
+ address = new Address();
+ address.setName(addressName);
+ coreAddresses.put(addressName, address);
+ }
+ address.getQueues().add(queue);
+ }
+
+ // Remove Core Queues Element from Core
+ Node queues = getNode(xPathQueues);
+ if (queues != null) {
+ coreElement.removeChild(queues);
+ }
- XPath xPath = XPathFactory.newInstance().newXPath();
+ return true;
+ }
- NodeList xpathResult = (NodeList) xPath.evaluate(xPathQueue, document, XPathConstants.NODESET);
- if (xpathResult == null || xpathResult.getLength() == 0) {
- // doesn't require change
+ public boolean convertJMSToAddresses() throws Exception {
+ Node jmsElement = getNode(xPathJMS);
+ if (jmsElement == null) {
return false;
}
- for (int i = 0; i < xpathResult.getLength(); i++) {
- Node queueNode = xpathResult.item(i);
+ NodeList jmsQueueElements = getNodeList(xPathJMSQueues);
+ for (int i = 0; i < jmsQueueElements.getLength(); i++) {
+ Node jmsQueueElement = jmsQueueElements.item(i);
+ String name = jmsQueuePrefix + getString(jmsQueueElement, xPathAttrName);
+
+ Address address;
+ if (jmsQueueAddresses.containsKey(name)) {
+ address = jmsQueueAddresses.get(name);
+ }
+ else {
+ address = new Address();
+ address.setName(name);
+ address.setRoutingType("anycast");
+ jmsQueueAddresses.put(name, address);
+ }
Queue queue = new Queue();
- queue.setName(xPath.evaluate(xPathAttrName, queueNode, XPathConstants.STRING).toString());
- queue.setDurable(xPath.evaluate(xPathDurable, queueNode, XPathConstants.STRING).toString());
- queue.setFilter(xPath.evaluate(xPathFilter, queueNode, XPathConstants.STRING).toString());
+ queue.setName(name);
+ queue.setDurable(getString(jmsQueueElement, xPathDurable));
+ queue.setFilter(getString(jmsQueueElement, xPathSelector));
+ address.getQueues().add(queue);
+ }
- String addressName = xPath.evaluate(xPathAddress, queueNode, XPathConstants.STRING).toString();
- Address address;
+ NodeList jmsTopicElements = getNodeList(xPathJMSTopics);
+ for (int i = 0; i < jmsTopicElements.getLength(); i++) {
+ Node jmsTopicElement = jmsTopicElements.item(i);
+ String name = jmsTopicPrefix + getString(jmsTopicElement, xPathAttrName);
- if (addresses.containsKey(addressName)) {
- address = addresses.get(addressName);
- } else {
+ Address address;
+ if (jmsTopicAddresses.containsKey(name)) {
+ address = jmsTopicAddresses.get(name);
+ }
+ else {
address = new Address();
- address.setName(addressName);
- addresses.put(addressName, address);
+ address.setName(name);
+ address.setRoutingType("multicast");
+ jmsTopicAddresses.put(name, address);
}
+
+ Queue queue = new Queue();
+ queue.setName(name);
address.getQueues().add(queue);
}
- Node queues = ((Node) xPath.evaluate(xPathQueues, document, XPathConstants.NODE));
+ jmsElement.getParentNode().removeChild(jmsElement);
+ return true;
+ }
+
+ public void writeAddressesToDocument() {
- if (queues != null) {
- Node core = queues.getParentNode();
- core.removeChild(queues);
-
- Element a = document.createElement("addresses");
- for (Address addr : addresses.values()) {
- Element eAddr = document.createElement("address");
- eAddr.setAttribute("name", addr.getName());
- eAddr.setAttribute("type", addr.getRoutingType());
-
- if (addr.getQueues().size() > 0) {
- Element eQueues = document.createElement("queues");
- for (Queue queue : addr.getQueues()) {
- Element eQueue = document.createElement("queue");
- eQueue.setAttribute("name", queue.getName());
- eQueue.setAttribute("max-consumers", addr.getDefaultMaxConsumers());
- eQueue.setAttribute("delete-on-no-consumers", addr.getDefaultDeleteOnNoConsumers());
-
- if (queue.getDurable() != null && !queue.getDurable().isEmpty()) {
- Element eDurable = document.createElement("durable");
- eDurable.setTextContent(queue.getDurable());
- eQueue.appendChild(eDurable);
- }
-
- if (queue.getFilter() != null && !queue.getFilter().isEmpty()) {
- Element eFilter = document.createElement("filter");
- eFilter.setAttribute("string", queue.getFilter());
- eQueue.appendChild(eFilter);
- }
-
- eQueues.appendChild(eQueue);
+ Element addressElement = document.createElement("addresses");
+
+ writeAddressListToDoc("= JMS Queues =", jmsQueueAddresses.values(), addressElement);
+ writeAddressListToDoc("= JMS Topics =", jmsTopicAddresses.values(), addressElement);
+ writeAddressListToDoc("= Core Queues =", coreAddresses.values(), addressElement);
+
+ coreElement.appendChild(addressElement);
+
+ }
+
+ private void writeAddressListToDoc(String comment, Collection<Address> addresses, Node addressElement) {
+ if (addresses.isEmpty()) return;
+
+ addressElement.appendChild(document.createComment("=================="));
+ addressElement.appendChild(document.createComment(comment));
+ addressElement.appendChild(document.createComment("=================="));
+ for (Address addr : addresses) {
+ Element eAddr = document.createElement("address");
+ eAddr.setAttribute("name", addr.getName());
+ eAddr.setAttribute("type", addr.getRoutingType());
+
+ if (addr.getQueues().size() > 0) {
+ Element eQueues = document.createElement("queues");
+ for (Queue queue : addr.getQueues()) {
+ Element eQueue = document.createElement("queue");
+ eQueue.setAttribute("name", queue.getName());
+ eQueue.setAttribute("max-consumers", addr.getDefaultMaxConsumers());
+ eQueue.setAttribute("delete-on-no-consumers", addr.getDefaultDeleteOnNoConsumers());
+
+ if (queue.getDurable() != null && !queue.getDurable().isEmpty()) {
+ Element eDurable = document.createElement("durable");
+ eDurable.setTextContent(queue.getDurable());
+ eQueue.appendChild(eDurable);
}
- eAddr.appendChild(eQueues);
+
+ if (queue.getFilter() != null && !queue.getFilter().isEmpty()) {
+ Element eFilter = document.createElement("filter");
+ eFilter.setAttribute("string", queue.getFilter());
+ eQueue.appendChild(eFilter);
+ }
+
+ eQueues.appendChild(eQueue);
}
- a.appendChild(eAddr);
+ eAddr.appendChild(eQueues);
}
- core.appendChild(a);
+ addressElement.appendChild(eAddr);
}
-
- document.normalize();
- return true;
}
public void write(File output, Properties outputProperties) throws TransformerException {
@@ -224,4 +291,17 @@ public class XMLConfigurationMigration {
StreamResult streamResult = new StreamResult(output);
transformer.transform(new DOMSource(document), streamResult);
}
+
+ private String getString(Node node, String xPathQuery) throws XPathExpressionException {
+ return xPath.evaluate(xPathQuery, node, XPathConstants.STRING).toString();
+ }
+
+ private NodeList getNodeList(String xPathQuery) throws XPathExpressionException {
+ return (NodeList) xPath.evaluate(xPathQuery, document, XPathConstants.NODESET);
+ }
+
+ private Node getNode(String xPathQuery) throws XPathExpressionException {
+ return (Node) xPath.evaluate(xPathQuery, document, XPathConstants.NODE);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c3ece068/artemis-tools/src/main/resources/META-INF/MANIFEST.MF
----------------------------------------------------------------------
diff --git a/artemis-tools/src/main/resources/META-INF/MANIFEST.MF b/artemis-tools/src/main/resources/META-INF/MANIFEST.MF
index 72543bf..fc08aed 100644
--- a/artemis-tools/src/main/resources/META-INF/MANIFEST.MF
+++ b/artemis-tools/src/main/resources/META-INF/MANIFEST.MF
@@ -1,2 +1,2 @@
Manifest-Version: 1.0
-Main-Class: org.apache.activemq.artemis.tools.migrate.config.XMLConfigurationMigration
+Main-Class: org.apache.activemq.artemis.tools.migrate.config.Main
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c3ece068/artemis-tools/src/test/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigrationTest.java
----------------------------------------------------------------------
diff --git a/artemis-tools/src/test/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigrationTest.java b/artemis-tools/src/test/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigrationTest.java
index f68e9c2..e653920 100644
--- a/artemis-tools/src/test/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigrationTest.java
+++ b/artemis-tools/src/test/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigrationTest.java
@@ -27,10 +27,11 @@ public class XMLConfigurationMigrationTest {
@Test
public void testQueuesReplacedWithAddresses() throws Exception {
File brokerXml = new File(this.getClass().getClassLoader().getResource("broker.xml").toURI());
- XMLConfigurationMigration tool = new XMLConfigurationMigration(brokerXml);
-
File output = new File("target/out.xml");
- tool.convertQueuesToAddresses();
+
+ XMLConfigurationMigration tool = new XMLConfigurationMigration(brokerXml, output);
+
+ tool.transform();
Properties properties = new Properties();
properties.put(OutputKeys.INDENT, "yes");
@@ -42,6 +43,6 @@ public class XMLConfigurationMigrationTest {
@Test
public void scanAndReplaceTest() throws Exception {
File dir = new File(this.getClass().getClassLoader().getResource("replace").getPath());
- XMLConfigurationMigration.scanAndTransform(dir);
+ Main.scanAndTransform(dir);
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c3ece068/artemis-tools/src/test/resources/broker.xml
----------------------------------------------------------------------
diff --git a/artemis-tools/src/test/resources/broker.xml b/artemis-tools/src/test/resources/broker.xml
index bd33d59..488be74 100644
--- a/artemis-tools/src/test/resources/broker.xml
+++ b/artemis-tools/src/test/resources/broker.xml
@@ -18,8 +18,17 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
<jms xmlns="urn:activemq:jms">
- <!--the queue used by the example-->
- <queue name="exampleQueue"/>
+ <queue name="queue1">
+ <durable>true</durable>
+ <selector string="car='red'" />
+ </queue>
+
+ <queue name="queue2"/>
+ <queue name="queue3"/>
+
+ <topic name="topic1"/>
+ <topic name="topic2"/>
+ <topic name="topic3"/>
</jms>
<core xmlns="urn:activemq:core">
[22/34] activemq-artemis git commit: Implemented MaxConsumers
DeleteOnNoConsumers for Queues
Posted by ma...@apache.org.
Implemented MaxConsumers DeleteOnNoConsumers for Queues
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ec1762b1
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ec1762b1
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ec1762b1
Branch: refs/heads/ARTEMIS-780
Commit: ec1762b1c37d78289580d6a4190319812df32bac
Parents: 19ce2fb
Author: Martyn Taylor <mt...@redhat.com>
Authored: Tue Nov 1 10:19:55 2016 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Nov 1 10:20:52 2016 +0000
----------------------------------------------------------------------
.../artemis/api/core/ActiveMQExceptionType.java | 8 +-
.../ActiveMQQueueMaxConsumerLimitReached.java | 31 ++++++
.../core/ServerSessionPacketHandler.java | 8 ++
.../core/server/ActiveMQMessageBundle.java | 3 +
.../artemis/core/server/ActiveMQServer.java | 26 ++++-
.../activemq/artemis/core/server/Queue.java | 2 +-
.../core/server/impl/ActiveMQServerImpl.java | 50 +++++++---
.../core/server/impl/LastValueQueue.java | 4 +-
.../server/impl/PostOfficeJournalLoader.java | 4 +-
.../core/server/impl/QueueFactoryImpl.java | 6 +-
.../artemis/core/server/impl/QueueImpl.java | 63 ++++++++++++
.../core/server/impl/ServerConsumerImpl.java | 1 +
.../impl/ScheduledDeliveryHandlerTest.java | 10 ++
.../integration/addressing/AddressingTest.java | 100 ++++++++++++++++---
.../integration/client/HangConsumerTest.java | 8 +-
.../unit/core/postoffice/impl/FakeQueue.java | 10 ++
16 files changed, 290 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec1762b1/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
index 752574a..0221562 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQExceptionType.java
@@ -213,7 +213,13 @@ public enum ActiveMQExceptionType {
}
},
- NOT_IMPLEMTNED_EXCEPTION(213);
+ NOT_IMPLEMTNED_EXCEPTION(213),
+ MAX_CONSUMER_LIMIT_EXCEEDED(214) {
+ @Override
+ public ActiveMQException createException(String msg) {
+ return new ActiveMQQueueMaxConsumerLimitReached(msg);
+ }
+ };
private static final Map<Integer, ActiveMQExceptionType> TYPE_MAP;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec1762b1/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQQueueMaxConsumerLimitReached.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQQueueMaxConsumerLimitReached.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQQueueMaxConsumerLimitReached.java
new file mode 100644
index 0000000..0577e08
--- /dev/null
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/ActiveMQQueueMaxConsumerLimitReached.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.api.core;
+
+/**
+ * An operation failed because a queue exists on the server.
+ */
+public final class ActiveMQQueueMaxConsumerLimitReached extends ActiveMQException {
+
+ public ActiveMQQueueMaxConsumerLimitReached() {
+ super(ActiveMQExceptionType.MAX_CONSUMER_LIMIT_EXCEEDED);
+ }
+
+ public ActiveMQQueueMaxConsumerLimitReached(String msg) {
+ super(ActiveMQExceptionType.MAX_CONSUMER_LIMIT_EXCEEDED, msg);
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec1762b1/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
index b52534c..2a45f29 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/ServerSessionPacketHandler.java
@@ -24,6 +24,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
import org.apache.activemq.artemis.api.core.ActiveMQIOErrorException;
import org.apache.activemq.artemis.api.core.ActiveMQInternalErrorException;
+import org.apache.activemq.artemis.api.core.ActiveMQQueueMaxConsumerLimitReached;
import org.apache.activemq.artemis.core.exception.ActiveMQXAException;
import org.apache.activemq.artemis.core.io.IOCallback;
import org.apache.activemq.artemis.core.persistence.StorageManager;
@@ -494,6 +495,13 @@ public class ServerSessionPacketHandler implements ChannelHandler {
} else {
ActiveMQServerLogger.LOGGER.caughtXaException(e);
}
+ } catch (ActiveMQQueueMaxConsumerLimitReached e) {
+ if (requiresResponse) {
+ logger.debug("Sending exception to client", e);
+ response = new ActiveMQExceptionMessage(e);
+ } else {
+ ActiveMQServerLogger.LOGGER.caughtException(e);
+ }
} catch (ActiveMQException e) {
if (requiresResponse) {
logger.debug("Sending exception to client", e);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec1762b1/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
index f22873b..769d183 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
@@ -32,6 +32,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQInvalidFilterExpressionExcep
import org.apache.activemq.artemis.api.core.ActiveMQInvalidTransientQueueUseException;
import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException;
import org.apache.activemq.artemis.api.core.ActiveMQQueueExistsException;
+import org.apache.activemq.artemis.api.core.ActiveMQQueueMaxConsumerLimitReached;
import org.apache.activemq.artemis.api.core.ActiveMQSecurityException;
import org.apache.activemq.artemis.api.core.ActiveMQSessionCreationException;
import org.apache.activemq.artemis.api.core.DiscoveryGroupConfiguration;
@@ -378,4 +379,6 @@ public interface ActiveMQMessageBundle {
@Message(id = 119119, value = "Disk Capacity is Low, cannot produce more messages.")
ActiveMQIOErrorException diskBeyondLimit();
+ @Message(id = 119200, value = "Maximum Consumer Limit Reached on Queue:(address={0},queue={1})", format = Message.Format.MESSAGE_FORMAT)
+ ActiveMQQueueMaxConsumerLimitReached maxConsumerLimitReachedForQueue(SimpleString address, SimpleString queueName);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec1762b1/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
index 25db8c6..ba2a1c7 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
@@ -297,6 +297,14 @@ public interface ActiveMQServer extends ActiveMQComponent {
Queue createQueue(SimpleString address,
SimpleString queueName,
+ SimpleString filterString,
+ boolean durable,
+ boolean temporary,
+ Integer maxConsumers,
+ Boolean deleteOnNoConsumers) throws Exception;
+
+ Queue createQueue(SimpleString address,
+ SimpleString queueName,
SimpleString filter,
SimpleString user,
boolean durable,
@@ -389,10 +397,22 @@ public interface ActiveMQServer extends ActiveMQComponent {
AddressInfo getAddressInfo(SimpleString address);
+ Queue createQueue(SimpleString addressName,
+ SimpleString queueName,
+ SimpleString filterString,
+ SimpleString user,
+ boolean durable,
+ boolean temporary,
+ boolean ignoreIfExists,
+ boolean transientQueue,
+ boolean autoCreated,
+ Integer maxConsumers,
+ Boolean deleteOnNoConsumers) throws Exception;
+
/*
- * add a ProtocolManagerFactory to be used. Note if @see Configuration#isResolveProtocols is tur then this factory will
- * replace any factories with the same protocol
- * */
+ * add a ProtocolManagerFactory to be used. Note if @see Configuration#isResolveProtocols is tur then this factory will
+ * replace any factories with the same protocol
+ * */
void addProtocolManagerFactory(ProtocolManagerFactory factory);
/*
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec1762b1/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java
index 270e0cd..2b845d5 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java
@@ -48,7 +48,7 @@ public interface Queue extends Bindable {
boolean isDeleteOnNoConsumers();
- boolean getMaxConsumers();
+ int getMaxConsumers();
void addConsumer(Consumer consumer) throws Exception;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec1762b1/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index c6f5b66..3bda134 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -1428,6 +1428,17 @@ public class ActiveMQServerImpl implements ActiveMQServer {
public Queue createQueue(final SimpleString address,
final SimpleString queueName,
final SimpleString filterString,
+ final boolean durable,
+ final boolean temporary,
+ final Integer maxConsumers,
+ final Boolean deleteOnNoConsumers) throws Exception {
+ return createQueue(address, queueName, filterString, null, durable, temporary, false, false, false, maxConsumers, deleteOnNoConsumers);
+ }
+
+ @Override
+ public Queue createQueue(final SimpleString address,
+ final SimpleString queueName,
+ final SimpleString filterString,
final SimpleString user,
final boolean durable,
final boolean temporary) throws Exception {
@@ -2256,17 +2267,18 @@ public class ActiveMQServerImpl implements ActiveMQServer {
null);
}
- private Queue createQueue(final SimpleString addressName,
- final SimpleString queueName,
- final SimpleString filterString,
- final SimpleString user,
- final boolean durable,
- final boolean temporary,
- final boolean ignoreIfExists,
- final boolean transientQueue,
- final boolean autoCreated,
- final Integer maxConsumers,
- final Boolean deleteOnNoConsumers) throws Exception {
+ @Override
+ public Queue createQueue(final SimpleString addressName,
+ final SimpleString queueName,
+ final SimpleString filterString,
+ final SimpleString user,
+ final boolean durable,
+ final boolean temporary,
+ final boolean ignoreIfExists,
+ final boolean transientQueue,
+ final boolean autoCreated,
+ final Integer maxConsumers,
+ final Boolean deleteOnNoConsumers) throws Exception {
final QueueBinding binding = (QueueBinding) postOffice.getBinding(queueName);
if (binding != null) {
@@ -2292,8 +2304,16 @@ public class ActiveMQServerImpl implements ActiveMQServer {
address = addressName;
}
+
+ AddressInfo defaultAddressInfo = new AddressInfo(address);
// FIXME This boils down to a putIfAbsent (avoids race). This should be reflected in the API.
- AddressInfo info = postOffice.addAddressInfo(new AddressInfo(address));
+ AddressInfo info = postOffice.addAddressInfo(defaultAddressInfo);
+
+ boolean addressExists = true;
+ if (info == null) {
+ info = defaultAddressInfo;
+ addressExists = false;
+ }
final boolean isDeleteOnNoConsumers = deleteOnNoConsumers == null ? info.isDefaultDeleteOnNoConsumers() : deleteOnNoConsumers;
final int noMaxConsumers = maxConsumers == null ? info.getDefaultMaxConsumers() : maxConsumers;
@@ -2318,10 +2338,10 @@ public class ActiveMQServerImpl implements ActiveMQServer {
final QueueBinding localQueueBinding = new LocalQueueBinding(getAddressInfo(queue.getAddress()), queue, nodeManager.getNodeId());
if (queue.isDurable()) {
- storageManager.addQueueBinding(txID, localQueueBinding);
- if (info == null) {
- storageManager.addAddressBinding(txID, getAddressInfo(queue.getAddress()));
+ if (!addressExists) {
+ storageManager.addAddressBinding(txID, getAddressInfo(address));
}
+ storageManager.addQueueBinding(txID, localQueueBinding);
}
try {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec1762b1/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LastValueQueue.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LastValueQueue.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LastValueQueue.java
index 453f588..a4fa5dc 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LastValueQueue.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LastValueQueue.java
@@ -56,12 +56,14 @@ public class LastValueQueue extends QueueImpl {
final boolean durable,
final boolean temporary,
final boolean autoCreated,
+ final Integer maxConsumers,
+ final Boolean deleteOnNoConsumers,
final ScheduledExecutorService scheduledExecutor,
final PostOffice postOffice,
final StorageManager storageManager,
final HierarchicalRepository<AddressSettings> addressSettingsRepository,
final Executor executor) {
- super(persistenceID, address, name, filter, pageSubscription, user, durable, temporary, autoCreated, scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executor);
+ super(persistenceID, address, name, filter, pageSubscription, user, durable, temporary, autoCreated, maxConsumers, deleteOnNoConsumers, scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executor);
new Exception("LastValueQeue " + this).toString();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec1762b1/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
index 9bd14f0..6f4cf03 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
@@ -148,8 +148,8 @@ public class PostOfficeJournalLoader implements JournalLoader {
.durable(true)
.temporary(false)
.autoCreated(queueBindingInfo.isAutoCreated())
- .de
- );
+ .deleteOnNoConsumers(queueBindingInfo.isDeleteOnNoConsumers())
+ .maxConsumers(queueBindingInfo.getMaxConsumers());
final Queue queue = queueFactory.createQueueWith(queueConfigBuilder.build());
if (queue.isAutoCreated()) {
queue.setConsumersRefCount(new AutoCreatedQueueManagerImpl(((PostOfficeImpl) postOffice).getServer().getJMSQueueDeleter(), queueBindingInfo.getQueueName()));
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec1762b1/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueFactoryImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueFactoryImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueFactoryImpl.java
index 3678553..bcc7c79 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueFactoryImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueFactoryImpl.java
@@ -75,9 +75,9 @@ public class QueueFactoryImpl implements QueueFactory {
final AddressSettings addressSettings = addressSettingsRepository.getMatch(config.address().toString());
final Queue queue;
if (addressSettings.isLastValueQueue()) {
- queue = new LastValueQueue(config.id(), config.address(), config.name(), config.filter(), config.pageSubscription(), config.user(), config.isDurable(), config.isTemporary(), config.isAutoCreated(), scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executorFactory.getExecutor());
+ queue = new LastValueQueue(config.id(), config.address(), config.name(), config.filter(), config.pageSubscription(), config.user(), config.isDurable(), config.isTemporary(), config.isAutoCreated(), config.maxConsumers(), config.isDeleteOnNoConsumers(), scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executorFactory.getExecutor());
} else {
- queue = new QueueImpl(config.id(), config.address(), config.name(), config.filter(), config.pageSubscription(), config.user(), config.isDurable(), config.isTemporary(), config.isAutoCreated(), scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executorFactory.getExecutor());
+ queue = new QueueImpl(config.id(), config.address(), config.name(), config.filter(), config.pageSubscription(), config.user(), config.isDurable(), config.isTemporary(), config.isAutoCreated(), config.maxConsumers(), config.isDeleteOnNoConsumers(), scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executorFactory.getExecutor());
}
return queue;
}
@@ -101,7 +101,7 @@ public class QueueFactoryImpl implements QueueFactory {
Queue queue;
if (addressSettings.isLastValueQueue()) {
- queue = new LastValueQueue(persistenceID, address, name, filter, pageSubscription, user, durable, temporary, autoCreated, scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executorFactory.getExecutor());
+ queue = new LastValueQueue(persistenceID, address, name, filter, pageSubscription, user, durable, temporary, autoCreated, null, null, scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executorFactory.getExecutor());
} else {
queue = new QueueImpl(persistenceID, address, name, filter, pageSubscription, user, durable, temporary, autoCreated, scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executorFactory.getExecutor());
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec1762b1/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
index 56a33ef..2246c8e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@@ -41,6 +41,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQSecurityException;
import org.apache.activemq.artemis.api.core.Message;
import org.apache.activemq.artemis.api.core.Pair;
import org.apache.activemq.artemis.api.core.SimpleString;
@@ -53,6 +54,7 @@ import org.apache.activemq.artemis.core.paging.cursor.PageSubscription;
import org.apache.activemq.artemis.core.paging.cursor.PagedReference;
import org.apache.activemq.artemis.core.persistence.QueueStatus;
import org.apache.activemq.artemis.core.persistence.StorageManager;
+import org.apache.activemq.artemis.core.postoffice.AddressManager;
import org.apache.activemq.artemis.core.postoffice.Binding;
import org.apache.activemq.artemis.core.postoffice.Bindings;
import org.apache.activemq.artemis.core.postoffice.DuplicateIDCache;
@@ -238,6 +240,14 @@ public class QueueImpl implements Queue {
private SlowConsumerReaperRunnable slowConsumerReaperRunnable;
+ private int maxConsumers;
+
+ private boolean deleteOnNoConsumers;
+
+ private final AddressInfo addressInfo;
+
+ private final AtomicInteger noConsumers = new AtomicInteger(0);
+
/**
* This is to avoid multi-thread races on calculating direct delivery,
* to guarantee ordering will be always be correct
@@ -334,10 +344,32 @@ public class QueueImpl implements Queue {
final StorageManager storageManager,
final HierarchicalRepository<AddressSettings> addressSettingsRepository,
final Executor executor) {
+ this(id, address, name, filter, null, user, durable, temporary, autoCreated, null, null, scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executor);
+ }
+
+ public QueueImpl(final long id,
+ final SimpleString address,
+ final SimpleString name,
+ final Filter filter,
+ final PageSubscription pageSubscription,
+ final SimpleString user,
+ final boolean durable,
+ final boolean temporary,
+ final boolean autoCreated,
+ final Integer maxConsumers,
+ final Boolean deleteOnNoConsumers,
+ final ScheduledExecutorService scheduledExecutor,
+ final PostOffice postOffice,
+ final StorageManager storageManager,
+ final HierarchicalRepository<AddressSettings> addressSettingsRepository,
+ final Executor executor) {
+
this.id = id;
this.address = address;
+ this.addressInfo = postOffice.getAddressInfo(address);
+
this.name = name;
this.filter = filter;
@@ -350,6 +382,10 @@ public class QueueImpl implements Queue {
this.autoCreated = autoCreated;
+ this.maxConsumers = maxConsumers == null ? addressInfo.getDefaultMaxConsumers() : maxConsumers;
+
+ this.deleteOnNoConsumers = deleteOnNoConsumers == null ? addressInfo.isDefaultDeleteOnNoConsumers() : deleteOnNoConsumers;
+
this.postOffice = postOffice;
this.storageManager = storageManager;
@@ -437,6 +473,16 @@ public class QueueImpl implements Queue {
}
@Override
+ public boolean isDeleteOnNoConsumers() {
+ return deleteOnNoConsumers;
+ }
+
+ @Override
+ public int getMaxConsumers() {
+ return maxConsumers;
+ }
+
+ @Override
public SimpleString getName() {
return name;
}
@@ -709,6 +755,11 @@ public class QueueImpl implements Queue {
}
synchronized (this) {
+
+ if (maxConsumers != -1 && noConsumers.get() >= maxConsumers) {
+ throw ActiveMQMessageBundle.BUNDLE.maxConsumerLimitReachedForQueue(address, name);
+ }
+
flushDeliveriesInTransit();
consumersChanged = true;
@@ -722,6 +773,8 @@ public class QueueImpl implements Queue {
if (refCountForConsumers != null) {
refCountForConsumers.increment();
}
+
+ noConsumers.incrementAndGet();
}
}
@@ -770,6 +823,15 @@ public class QueueImpl implements Queue {
if (refCountForConsumers != null) {
refCountForConsumers.decrement();
}
+
+ if (noConsumers.decrementAndGet() == 0 && deleteOnNoConsumers) {
+ try {
+ deleteQueue();
+ }
+ catch (Exception e) {
+ logger.error("Error deleting queue on no consumers. " + this.toString(), e);
+ }
+ }
}
}
@@ -1361,6 +1423,7 @@ public class QueueImpl implements Queue {
@Override
public void deleteQueue(boolean removeConsumers) throws Exception {
synchronized (this) {
+ if (this.queueDestroyed) return;
this.queueDestroyed = true;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec1762b1/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
index 98a9c84..389b07e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
@@ -205,6 +205,7 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
this.creationTime = System.currentTimeMillis();
+
if (browseOnly) {
browserDeliverer = new BrowserDeliverer(messageQueue.browserIterator());
} else {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec1762b1/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
index 55a287a..11b11ab 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
@@ -901,6 +901,16 @@ public class ScheduledDeliveryHandlerTest extends Assert {
}
@Override
+ public boolean isDeleteOnNoConsumers() {
+ return false;
+ }
+
+ @Override
+ public int getMaxConsumers() {
+ return -1;
+ }
+
+ @Override
public void addConsumer(Consumer consumer) throws Exception {
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec1762b1/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
index 03739e9..a21a62b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
@@ -19,8 +19,11 @@ package org.apache.activemq.artemis.tests.integration.addressing;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.UUID;
import java.util.concurrent.TimeUnit;
+import org.apache.activemq.artemis.api.core.ActiveMQException;
+import org.apache.activemq.artemis.api.core.ActiveMQQueueMaxConsumerLimitReached;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.api.core.TransportConfiguration;
import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
@@ -187,8 +190,6 @@ public class AddressingTest extends ActiveMQTestBase {
assertEquals(0, count);
}
-
-
@Test
public void testMulticastRoutingBackwardsCompat() throws Exception {
@@ -222,34 +223,103 @@ public class AddressingTest extends ActiveMQTestBase {
}
}
- @Ignore
@Test
- public void testDeleteQueueOnNoConsumersTrue() {
- fail("Not Implemented");
+ public void testDeleteQueueOnNoConsumersTrue() throws Exception {
+
+ SimpleString address = new SimpleString("test.address");
+ SimpleString queueName = SimpleString.toSimpleString(UUID.randomUUID().toString());
+ // For each address, create 2 Queues with the same address, assert both queues receive message
+ boolean deleteOnNoConsumers = true;
+ Queue q1 = server.createQueue(address, queueName, null, true, false, null, deleteOnNoConsumers);
+
+ ClientSession session = sessionFactory.createSession();
+ session.start();
+
+ ClientConsumer consumer1 = session.createConsumer(q1.getName());
+ consumer1.close();
+
+ assertFalse(server.queueQuery(queueName).isExists());
}
- @Ignore
@Test
- public void testDeleteQueueOnNoConsumersFalse() {
- fail("Not Implemented");
+ public void testDeleteQueueOnNoConsumersFalse() throws Exception {
+ SimpleString address = new SimpleString("test.address");
+ SimpleString queueName = SimpleString.toSimpleString(UUID.randomUUID().toString());
+ // For each address, create 2 Queues with the same address, assert both queues receive message
+ boolean deleteOnNoConsumers = false;
+ Queue q1 = server.createQueue(address, queueName, null, true, false, null, deleteOnNoConsumers);
+
+ ClientSession session = sessionFactory.createSession();
+ session.start();
+
+ ClientConsumer consumer1 = session.createConsumer(q1.getName());
+ consumer1.close();
+
+ assertTrue(server.queueQuery(queueName).isExists());
}
- @Ignore
@Test
- public void testLimitOnMaxConsumers() {
- fail("Not Implemented");
+ public void testLimitOnMaxConsumers() throws Exception {
+ SimpleString address = new SimpleString("test.address");
+ SimpleString queueName = SimpleString.toSimpleString(UUID.randomUUID().toString());
+ // For each address, create 2 Queues with the same address, assert both queues receive message
+ boolean deleteOnNoConsumers = false;
+ Queue q1 = server.createQueue(address, queueName, null, true, false, 0, deleteOnNoConsumers);
+
+ Exception expectedException = null;
+ String expectedMessage = "Maximum Consumer Limit Reached on Queue";
+ try {
+ ClientSession session = sessionFactory.createSession();
+ session.start();
+
+ ClientConsumer consumer1 = session.createConsumer(q1.getName());
+ }
+ catch (ActiveMQQueueMaxConsumerLimitReached e) {
+ expectedException = e;
+ }
+
+ assertNotNull(expectedException);
+ assertTrue(expectedException.getMessage().contains(expectedMessage));
+ assertTrue(expectedException.getMessage().contains(address));
+ assertTrue(expectedException.getMessage().contains(queueName));
}
@Ignore
@Test
- public void testUnlimitedMaxConsumers() {
- fail("Not Implemented");
+ public void testUnlimitedMaxConsumers() throws Exception {
+ int noConsumers = 50;
+ SimpleString address = new SimpleString("test.address");
+ SimpleString queueName = SimpleString.toSimpleString(UUID.randomUUID().toString());
+ // For each address, create 2 Queues with the same address, assert both queues receive message
+ boolean deleteOnNoConsumers = false;
+ Queue q1 = server.createQueue(address, queueName, null, true, false, -1, deleteOnNoConsumers);
+
+ ClientSession session = sessionFactory.createSession();
+ session.start();
+
+ for (int i = 0; i < noConsumers; i++) {
+ session.createConsumer(q1.getName());
+ }
}
@Ignore
@Test
- public void testDefaultMaxConsumersFromAddress() {
- fail("Not Implemented");
+ public void testDefaultMaxConsumersFromAddress() throws Exception {
+ int noConsumers = 50;
+ SimpleString address = new SimpleString("test.address");
+ SimpleString queueName = SimpleString.toSimpleString(UUID.randomUUID().toString());
+ // For each address, create 2 Queues with the same address, assert both queues receive message
+ boolean deleteOnNoConsumers = false;
+ AddressInfo addressInfo = new AddressInfo(address);
+ addressInfo.setDefaultMaxConsumers(0);
+ Queue q1 = server.createQueue(address, queueName, null, true, false, null, deleteOnNoConsumers);
+
+ ClientSession session = sessionFactory.createSession();
+ session.start();
+
+ for (int i = 0; i < noConsumers; i++) {
+ session.createConsumer(q1.getName());
+ }
}
@Ignore
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec1762b1/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
index 2fd5915..124ece3 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
@@ -224,12 +224,14 @@ public class HangConsumerTest extends ActiveMQTestBase {
final boolean durable,
final boolean temporary,
final boolean autoCreated,
+ final Integer maxConsumers,
+ final Boolean deleteOnNoConsumers,
final ScheduledExecutorService scheduledExecutor,
final PostOffice postOffice,
final StorageManager storageManager,
final HierarchicalRepository<AddressSettings> addressSettingsRepository,
final Executor executor) {
- super(id, address, name, filter, pageSubscription, user, durable, temporary, autoCreated, scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executor);
+ super(id, address, name, filter, pageSubscription, user, durable, temporary, autoCreated, maxConsumers, deleteOnNoConsumers, scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executor);
}
@Override
@@ -256,7 +258,7 @@ public class HangConsumerTest extends ActiveMQTestBase {
@Override
public Queue createQueueWith(final QueueConfig config) {
- queue = new MyQueueWithBlocking(config.id(), config.address(), config.name(), config.filter(), config.user(), config.pageSubscription(), config.isDurable(), config.isTemporary(), config.isAutoCreated(), scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executorFactory.getExecutor());
+ queue = new MyQueueWithBlocking(config.id(), config.address(), config.name(), config.filter(), config.user(), config.pageSubscription(), config.isDurable(), config.isTemporary(), config.isAutoCreated(), config.maxConsumers(), config.isDeleteOnNoConsumers(), scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executorFactory.getExecutor());
return queue;
}
@@ -271,7 +273,7 @@ public class HangConsumerTest extends ActiveMQTestBase {
final boolean durable,
final boolean temporary,
final boolean autoCreated) {
- queue = new MyQueueWithBlocking(persistenceID, address, name, filter, user, pageSubscription, durable, temporary, autoCreated, scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executorFactory.getExecutor());
+ queue = new MyQueueWithBlocking(persistenceID, address, name, filter, user, pageSubscription, durable, temporary, autoCreated, null, null, scheduledExecutor, postOffice, storageManager, addressSettingsRepository, executorFactory.getExecutor());
return queue;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ec1762b1/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
index 9a20d70..ef5c05e 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
@@ -443,6 +443,16 @@ public class FakeQueue implements Queue {
}
@Override
+ public boolean isDeleteOnNoConsumers() {
+ return false;
+ }
+
+ @Override
+ public int getMaxConsumers() {
+ return -1;
+ }
+
+ @Override
public LinkedListIterator<MessageReference> iterator() {
// no-op
return null;
[09/34] activemq-artemis git commit: ARTEMIS-831 avoid shutting down
the server after interrupted threads on divert (copy and rename)
Posted by ma...@apache.org.
ARTEMIS-831 avoid shutting down the server after interrupted threads on
divert (copy and rename)
probably introduced at ARTEMIS-322
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b4924ce7
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b4924ce7
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b4924ce7
Branch: refs/heads/ARTEMIS-780
Commit: b4924ce73b8d92ac9a6ae3faaabdefc5844a4a64
Parents: 10187d0
Author: Ravi Soni <rv...@hotmail.com>
Authored: Thu Oct 27 21:47:35 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Oct 28 16:28:57 2016 -0400
----------------------------------------------------------------------
.../apache/activemq/artemis/core/io/AbstractSequentialFile.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b4924ce7/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFile.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFile.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFile.java
index 5665e57..0c6dcdf 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFile.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFile.java
@@ -19,6 +19,7 @@ package org.apache.activemq.artemis.core.io;
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
+import java.nio.channels.ClosedChannelException;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
@@ -117,6 +118,8 @@ public abstract class AbstractSequentialFile implements SequentialFile {
FileIOUtil.copyData(this, newFileName, buffer);
newFileName.close();
this.close();
+ } catch (ClosedChannelException e) {
+ throw e;
} catch (IOException e) {
factory.onIOError(new ActiveMQIOErrorException(e.getMessage(), e), e.getMessage(), this);
throw e;
@@ -140,6 +143,8 @@ public abstract class AbstractSequentialFile implements SequentialFile {
public final void renameTo(final String newFileName) throws IOException, InterruptedException, ActiveMQException {
try {
close();
+ } catch (ClosedChannelException e) {
+ throw e;
} catch (IOException e) {
factory.onIOError(new ActiveMQIOErrorException(e.getMessage(), e), e.getMessage(), this);
throw e;
[06/34] activemq-artemis git commit: This closes #867
Posted by ma...@apache.org.
This closes #867
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/9e7fe6b0
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/9e7fe6b0
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/9e7fe6b0
Branch: refs/heads/ARTEMIS-780
Commit: 9e7fe6b01151ece19e00f1b1ce49241ab681e6fe
Parents: 2dfd144 1b7033a
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Oct 26 13:21:13 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Oct 26 13:21:13 2016 -0400
----------------------------------------------------------------------
.../core/management/ActiveMQServerControl.java | 12 +++++
.../impl/ActiveMQServerControlImpl.java | 43 +++++++++++++++
.../artemis/core/server/ServiceRegistry.java | 8 +++
.../core/server/impl/ConnectorsService.java | 57 ++++++++++++--------
.../core/server/impl/ServiceRegistryImpl.java | 44 +++++++--------
.../management/ActiveMQServerControlTest.java | 16 ++++++
.../ActiveMQServerControlUsingCoreTest.java | 17 ++++++
.../core/config/impl/ConnectorsServiceTest.java | 48 ++++++++++++++++-
8 files changed, 196 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
[20/34] activemq-artemis git commit: This closes #872
Posted by ma...@apache.org.
This closes #872
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/cdb52b8a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/cdb52b8a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/cdb52b8a
Branch: refs/heads/ARTEMIS-780
Commit: cdb52b8a0f7a2e7190685b2de634da4056f728db
Parents: 51fa840 7eadff7
Author: jbertram <jb...@apache.com>
Authored: Mon Oct 31 15:00:45 2016 -0500
Committer: jbertram <jb...@apache.com>
Committed: Mon Oct 31 15:00:45 2016 -0500
----------------------------------------------------------------------
.../cli/commands/tools/DecodeJournal.java | 20 +-
.../cli/commands/tools/XmlDataExporter.java | 14 +-
.../activemq/artemis/utils/ExecutorFactory.java | 24 +
.../artemis/utils/OrderedExecutorFactory.java | 127 +++
.../activemq/artemis/utils/SimpleFuture.java | 79 ++
.../artemis/utils/SimpleFutureTest.java | 69 ++
.../core/client/impl/ClientProducerImpl.java | 2 -
.../core/client/impl/ClientSessionImpl.java | 26 +-
.../core/client/impl/ClientSessionInternal.java | 2 -
.../core/impl/ActiveMQSessionContext.java | 10 +-
.../spi/core/remoting/SessionContext.java | 3 +-
.../activemq/artemis/utils/ExecutorFactory.java | 24 -
.../artemis/utils/OrderedExecutorFactory.java | 128 ---
.../activemq/artemis/jdbc/store/JDBCUtils.java | 143 ----
.../jdbc/store/drivers/AbstractJDBCDriver.java | 76 +-
.../artemis/jdbc/store/drivers/JDBCUtils.java | 66 ++
.../PostgresSequentialSequentialFileDriver.java | 164 ----
.../artemis/jdbc/store/file/JDBCFileUtils.java | 48 ++
.../jdbc/store/file/JDBCSequentialFile.java | 20 +-
.../store/file/JDBCSequentialFileFactory.java | 10 +-
.../file/JDBCSequentialFileFactoryDriver.java | 18 +-
.../PostgresSequentialSequentialFileDriver.java | 162 ++++
.../jdbc/store/journal/JDBCJournalImpl.java | 27 +-
.../journal/JDBCJournalLoaderCallback.java | 12 +-
.../journal/JDBCJournalReaderCallback.java | 6 +-
.../jdbc/store/journal/JDBCJournalRecord.java | 100 +--
.../jdbc/store/journal/JDBCJournalSync.java | 45 --
.../jdbc/store/journal/TransactionHolder.java | 4 +-
.../file/JDBCSequentialFileFactoryTest.java | 10 +-
.../journal/JMSJournalStorageManagerImpl.java | 6 +-
.../jms/server/impl/JMSServerManagerImpl.java | 15 +-
.../activemq/artemis/core/journal/Journal.java | 5 +
.../core/journal/impl/FileWrapperJournal.java | 4 +
.../artemis/core/journal/impl/JournalImpl.java | 791 +++++++++++--------
.../core/journal/impl/JournalTransaction.java | 48 +-
.../artemis/journal/ActiveMQJournalLogger.java | 12 +-
.../client/HornetQClientSessionContext.java | 5 +-
.../artemis/osgi/DataSourceTracker.java | 2 +-
.../impl/ActiveMQServerControlImpl.java | 6 +-
.../core/management/impl/QueueControlImpl.java | 8 +-
.../core/paging/cursor/PageSubscription.java | 5 +-
.../impl/PageSubscriptionCounterImpl.java | 1 -
.../cursor/impl/PageSubscriptionImpl.java | 24 +-
.../journal/AbstractJournalStorageManager.java | 30 +-
.../impl/journal/JDBCJournalStorageManager.java | 12 +-
.../impl/journal/JournalStorageManager.java | 41 +-
.../core/replication/ReplicatedJournal.java | 5 +
.../artemis/core/server/ActiveMQServer.java | 2 +
.../activemq/artemis/core/server/Queue.java | 2 +-
.../artemis/core/server/ServiceRegistry.java | 4 +
.../core/server/impl/ActiveMQServerImpl.java | 71 +-
.../artemis/core/server/impl/QueueImpl.java | 67 +-
.../core/server/impl/ScaleDownHandler.java | 4 +-
.../core/server/impl/ServerConsumerImpl.java | 2 +-
.../core/server/impl/ServiceRegistryImpl.java | 12 +
.../impl/ScheduledDeliveryHandlerTest.java | 2 +-
.../artemis/tests/util/ActiveMQTestBase.java | 28 +-
.../extras/byteman/ClosingConnectionTest.java | 160 ----
.../byteman/JMSBridgeReconnectionTest.java | 2 +-
.../tests/extras/byteman/PagingLeakTest.java | 14 +-
.../tests/integration/client/ProducerTest.java | 6 +-
.../cluster/failover/BackupSyncJournalTest.java | 2 +-
.../journal/NIOJournalCompactTest.java | 195 +++--
.../journal/ValidateTransactionHealthTest.java | 27 +-
.../management/ActiveMQServerControlTest.java | 9 +-
.../integration/paging/PagingSendTest.java | 4 +-
.../tests/integration/paging/PagingTest.java | 12 +-
.../DeleteMessagesOnStartupTest.java | 2 +-
.../integration/persistence/RestartSMTest.java | 2 +-
.../persistence/StorageManagerTestBase.java | 6 +-
.../replication/ReplicationTest.java | 7 +-
.../server/SuppliedThreadPoolTest.java | 2 +
.../journal/impl/AlignedJournalImplTest.java | 45 +-
.../core/journal/impl/JournalAsyncTest.java | 15 +-
.../core/journal/impl/JournalImplTestUnit.java | 80 +-
.../impl/DuplicateDetectionUnitTest.java | 10 +-
.../unit/core/postoffice/impl/FakeQueue.java | 2 +-
.../unit/core/server/impl/QueueImplTest.java | 2 +-
78 files changed, 1763 insertions(+), 1494 deletions(-)
----------------------------------------------------------------------
[02/34] activemq-artemis git commit: This closes #860
Posted by ma...@apache.org.
This closes #860
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/1ac69fd1
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/1ac69fd1
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/1ac69fd1
Branch: refs/heads/ARTEMIS-780
Commit: 1ac69fd173cc9e6509ffed916ba3af8ef9d438de
Parents: ad8919d 1a4a148
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Oct 25 12:01:06 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Oct 25 12:01:06 2016 -0400
----------------------------------------------------------------------
.../protocol/openwire/OpenWireConnection.java | 9 ++++++-
.../openwire/OpenWireMessageConverter.java | 25 +++++++++++---------
.../openwire/SimpleOpenWireTest.java | 23 ++++++++++++++++++
3 files changed, 45 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
[29/34] activemq-artemis git commit: Consolidate RoutingType impls
Posted by ma...@apache.org.
Consolidate RoutingType impls
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/43db2871
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/43db2871
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/43db2871
Branch: refs/heads/ARTEMIS-780
Commit: 43db287176c32a4045804ce53771a9e93e6d5b8d
Parents: 40063be
Author: jbertram <jb...@apache.com>
Authored: Fri Oct 21 10:51:29 2016 -0500
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Nov 1 10:20:52 2016 +0000
----------------------------------------------------------------------
.../core/config/CoreAddressConfiguration.java | 8 ++---
.../core/persistence/AddressBindingInfo.java | 4 +--
.../codec/PersistentAddressBindingEncoding.java | 10 +++---
.../artemis/core/server/impl/AddressInfo.java | 33 ++++++++++++++++----
.../core/config/impl/FileConfigurationTest.java | 7 ++---
pom.xml | 1 +
6 files changed, 41 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/43db2871/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
index e01c398..6327f79 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
@@ -21,13 +21,13 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
-import org.apache.activemq.artemis.core.server.impl.AddressInfo.RoutingType;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
public class CoreAddressConfiguration implements Serializable {
private String name = null;
- private RoutingType routingType = null;
+ private AddressInfo.RoutingType routingType = null;
private Integer defaultMaxConsumers = ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers();
@@ -47,11 +47,11 @@ public class CoreAddressConfiguration implements Serializable {
return this;
}
- public RoutingType getRoutingType() {
+ public AddressInfo.RoutingType getRoutingType() {
return routingType;
}
- public CoreAddressConfiguration setRoutingType(RoutingType routingType) {
+ public CoreAddressConfiguration setRoutingType(AddressInfo.RoutingType routingType) {
this.routingType = routingType;
return this;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/43db2871/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/AddressBindingInfo.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/AddressBindingInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/AddressBindingInfo.java
index 4256774..83d37bc 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/AddressBindingInfo.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/AddressBindingInfo.java
@@ -17,7 +17,7 @@
package org.apache.activemq.artemis.core.persistence;
import org.apache.activemq.artemis.api.core.SimpleString;
-import org.apache.activemq.artemis.core.persistence.impl.RoutingType;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
public interface AddressBindingInfo {
@@ -29,6 +29,6 @@ public interface AddressBindingInfo {
SimpleString getUser();
- RoutingType getRoutingType();
+ AddressInfo.RoutingType getRoutingType();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/43db2871/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentAddressBindingEncoding.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentAddressBindingEncoding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentAddressBindingEncoding.java
index 8aa54e4..9f47362 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentAddressBindingEncoding.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentAddressBindingEncoding.java
@@ -20,7 +20,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.journal.EncodingSupport;
import org.apache.activemq.artemis.core.persistence.AddressBindingInfo;
-import org.apache.activemq.artemis.core.persistence.impl.RoutingType;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.utils.DataConstants;
public class PersistentAddressBindingEncoding implements EncodingSupport, AddressBindingInfo {
@@ -33,7 +33,7 @@ public class PersistentAddressBindingEncoding implements EncodingSupport, Addres
public SimpleString user;
- public RoutingType routingType;
+ public AddressInfo.RoutingType routingType;
public PersistentAddressBindingEncoding() {
}
@@ -55,7 +55,7 @@ public class PersistentAddressBindingEncoding implements EncodingSupport, Addres
public PersistentAddressBindingEncoding(final SimpleString name,
final SimpleString user,
final boolean autoCreated,
- final RoutingType routingType) {
+ final AddressInfo.RoutingType routingType) {
this.name = name;
this.user = user;
this.autoCreated = autoCreated;
@@ -87,7 +87,7 @@ public class PersistentAddressBindingEncoding implements EncodingSupport, Addres
}
@Override
- public RoutingType getRoutingType() {
+ public AddressInfo.RoutingType getRoutingType() {
return routingType;
}
@@ -109,7 +109,7 @@ public class PersistentAddressBindingEncoding implements EncodingSupport, Addres
}
autoCreated = buffer.readBoolean();
- routingType = RoutingType.getType(buffer.readByte());
+ routingType = AddressInfo.RoutingType.getType(buffer.readByte());
}
@Override
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/43db2871/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
index 03c3fa0..4c6ec1f 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
@@ -16,18 +16,13 @@
*/
package org.apache.activemq.artemis.core.server.impl;
-import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.api.core.SimpleString;
public class AddressInfo {
- public enum RoutingType {
- MULTICAST, ANYCAST
- }
-
private final SimpleString name;
- private RoutingType routingType = RoutingType.MULTICAST;
+ private RoutingType routingType = RoutingType.Multicast;
private boolean defaultDeleteOnNoConsumers;
@@ -64,4 +59,30 @@ public class AddressInfo {
public SimpleString getName() {
return name;
}
+
+ public enum RoutingType {
+ Multicast, Anycast;
+
+ public byte getType() {
+ switch (this) {
+ case Multicast:
+ return 0;
+ case Anycast:
+ return 1;
+ default:
+ return -1;
+ }
+ }
+
+ public static RoutingType getType(byte type) {
+ switch (type) {
+ case 0:
+ return Multicast;
+ case 1:
+ return Anycast;
+ default:
+ return null;
+ }
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/43db2871/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
index ce924c0..f7a0175 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
@@ -52,9 +52,6 @@ import org.apache.activemq.artemis.core.settings.impl.SlowConsumerPolicy;
import org.junit.Assert;
import org.junit.Test;
-import static org.apache.activemq.artemis.core.server.impl.AddressInfo.RoutingType.ANYCAST;
-import static org.apache.activemq.artemis.core.server.impl.AddressInfo.RoutingType.MULTICAST;
-
public class FileConfigurationTest extends ConfigurationImplTest {
private final String fullConfigurationName = "ConfigurationTest-full-config.xml";
@@ -370,7 +367,7 @@ public class FileConfigurationTest extends ConfigurationImplTest {
// Addr 1
CoreAddressConfiguration addressConfiguration = conf.getAddressConfigurations().get(0);
assertEquals("addr1", addressConfiguration.getName());
- assertEquals(ANYCAST, addressConfiguration.getRoutingType());
+ assertEquals(AddressInfo.RoutingType.Anycast, addressConfiguration.getRoutingType());
assertEquals(2, addressConfiguration.getQueueConfigurations().size());
// Addr 1 Queue 1
@@ -396,7 +393,7 @@ public class FileConfigurationTest extends ConfigurationImplTest {
// Addr 2
addressConfiguration = conf.getAddressConfigurations().get(1);
assertEquals("addr2", addressConfiguration.getName());
- assertEquals(MULTICAST, addressConfiguration.getRoutingType());
+ assertEquals(AddressInfo.RoutingType.Multicast, addressConfiguration.getRoutingType());
assertEquals(2, addressConfiguration.getQueueConfigurations().size());
// Addr 2 Queue 1
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/43db2871/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cd43231..1062d55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1259,6 +1259,7 @@
<exclude>docs/**/_book/</exclude>
<exclude>**/target/</exclude>
<exclude>**/META-INF/services/*</exclude>
+ <exclude>**/META-INF/MANIFEST.MF</exclude>
<exclude>**/*.iml</exclude>
<exclude>**/*.jceks</exclude>
<exclude>**/*.jks</exclude>
[07/34] activemq-artemis git commit: NO-JIRA: Fix checkstyle false
friend
Posted by ma...@apache.org.
NO-JIRA: Fix checkstyle false friend
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/20183f94
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/20183f94
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/20183f94
Branch: refs/heads/ARTEMIS-780
Commit: 20183f94a4171f8d35cd956e490e2457711e330d
Parents: 9e7fe6b
Author: Benjamin Graf <be...@gmx.net>
Authored: Fri Oct 28 19:09:41 2016 +0200
Committer: Benjamin Graf <be...@gmx.net>
Committed: Fri Oct 28 19:09:41 2016 +0200
----------------------------------------------------------------------
.../activemq/artemis/core/server/impl/ServiceRegistryImpl.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/20183f94/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
index 4add7b5..1d08f4a 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
@@ -196,6 +196,7 @@ public class ServiceRegistryImpl implements ServiceRegistry {
acceptorFactories.put(name, acceptorFactory);
}
+ @SuppressWarnings("TypeParameterUnusedInFormals")
public <T> T loadClass(final String className) {
return AccessController.doPrivileged(new PrivilegedAction<T>() {
@Override
[03/34] activemq-artemis git commit: This closes #865
Posted by ma...@apache.org.
This closes #865
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/2dfd1442
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/2dfd1442
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/2dfd1442
Branch: refs/heads/ARTEMIS-780
Commit: 2dfd14421faa64d7b2d17714fb2e1ce53ad80060
Parents: 1ac69fd 490bd31
Author: Clebert Suconic <cl...@apache.org>
Authored: Tue Oct 25 14:15:28 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Oct 25 14:15:28 2016 -0400
----------------------------------------------------------------------
.../transport/amqp/client/AmqpConnection.java | 31 ++++-
.../amqp/client/AmqpFrameValidator.java | 103 ++++++++++++++++
.../amqp/client/AmqpProtocolTracer.java | 116 +++++++++++++++++++
.../transport/amqp/client/AmqpSession.java | 57 ++++++++-
.../amqp/AmqpDurableReceiverTest.java | 26 +++++
5 files changed, 328 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[30/34] activemq-artemis git commit: Added ANYCAST routing to local
queues
Posted by ma...@apache.org.
Added ANYCAST routing to local queues
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4de48304
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4de48304
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4de48304
Branch: refs/heads/ARTEMIS-780
Commit: 4de48304634ac031ee3731fbfdbbc966be31337d
Parents: 853c5a4
Author: Martyn Taylor <mt...@redhat.com>
Authored: Mon Oct 24 14:27:00 2016 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Nov 1 10:20:52 2016 +0000
----------------------------------------------------------------------
.../artemis/core/postoffice/AddressManager.java | 2 +
.../artemis/core/postoffice/PostOffice.java | 2 +
.../core/postoffice/impl/BindingsImpl.java | 1 +
.../core/postoffice/impl/LocalQueueBinding.java | 9 +-
.../core/postoffice/impl/PostOfficeImpl.java | 5 +
.../postoffice/impl/SimpleAddressManager.java | 15 ++
.../artemis/core/server/ActiveMQServer.java | 2 +-
.../core/server/impl/ActiveMQServerImpl.java | 12 +-
.../artemis/core/server/impl/AddressInfo.java | 12 +-
.../server/impl/PostOfficeJournalLoader.java | 3 +-
.../core/server/impl/QueueFactoryImpl.java | 8 +
.../core/config/impl/FileConfigurationTest.java | 4 +-
.../integration/addressing/AddressingTest.java | 240 ++++++++++++++++++-
.../integration/client/HangConsumerTest.java | 2 +-
.../jms/client/TopicCleanupTest.java | 2 +-
.../core/server/impl/fakes/FakePostOffice.java | 5 +
16 files changed, 300 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4de48304/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java
index 5519822..1cf1a07 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java
@@ -54,6 +54,8 @@ public interface AddressManager {
AddressInfo addAddressInfo(AddressInfo addressInfo);
+ AddressInfo addOrUpdateAddressInfo(AddressInfo addressInfo);
+
AddressInfo removeAddressInfo(SimpleString address);
AddressInfo getAddressInfo(SimpleString address);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4de48304/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
index f719966..7902352 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
@@ -45,6 +45,8 @@ public interface PostOffice extends ActiveMQComponent {
AddressInfo addAddressInfo(AddressInfo addressInfo);
+ AddressInfo addOrUpdateAddressInfo(AddressInfo addressInfo);
+
AddressInfo removeAddressInfo(SimpleString address);
AddressInfo getAddressInfo(SimpleString address);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4de48304/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java
index e5df737..6be0311 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java
@@ -262,6 +262,7 @@ public final class BindingsImpl implements Bindings {
boolean routed = false;
for (Binding binding : exclusiveBindings) {
+
if (binding.getFilter() == null || binding.getFilter().match(message)) {
binding.getBindable().route(message, context);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4de48304/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/LocalQueueBinding.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/LocalQueueBinding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/LocalQueueBinding.java
index 2a6d9c5..2921388 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/LocalQueueBinding.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/LocalQueueBinding.java
@@ -24,10 +24,11 @@ import org.apache.activemq.artemis.core.server.Bindable;
import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.core.server.RoutingContext;
import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
public class LocalQueueBinding implements QueueBinding {
- private final SimpleString address;
+ private final AddressInfo address;
private final Queue queue;
@@ -37,7 +38,7 @@ public class LocalQueueBinding implements QueueBinding {
private final SimpleString clusterName;
- public LocalQueueBinding(final SimpleString address, final Queue queue, final SimpleString nodeID) {
+ public LocalQueueBinding(final AddressInfo address, final Queue queue, final SimpleString nodeID) {
this.address = address;
this.queue = queue;
@@ -61,7 +62,7 @@ public class LocalQueueBinding implements QueueBinding {
@Override
public SimpleString getAddress() {
- return address;
+ return address.getName();
}
@Override
@@ -76,7 +77,7 @@ public class LocalQueueBinding implements QueueBinding {
@Override
public SimpleString getRoutingName() {
- return name;
+ return (address.getRoutingType() == AddressInfo.RoutingType.MULTICAST) ? name : address.getName();
}
@Override
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4de48304/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
index 9b7ed0c..6c654bf 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
@@ -425,6 +425,11 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
}
@Override
+ public AddressInfo addOrUpdateAddressInfo(AddressInfo addressInfo) {
+ return addressManager.addOrUpdateAddressInfo(addressInfo);
+ }
+
+ @Override
public AddressInfo removeAddressInfo(SimpleString address) {
return addressManager.removeAddressInfo(address);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4de48304/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
index 2994f9e..969a1a9 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
@@ -188,6 +188,21 @@ public class SimpleAddressManager implements AddressManager {
}
@Override
+ public AddressInfo addOrUpdateAddressInfo(AddressInfo addressInfo) {
+ AddressInfo from = addAddressInfo(addressInfo);
+ return (from == null) ? addressInfo : updateAddressInfo(from, addressInfo);
+ }
+
+ private AddressInfo updateAddressInfo(AddressInfo from, AddressInfo to) {
+ synchronized (from) {
+ from.setRoutingType(to.getRoutingType());
+ from.setDefaultMaxConsumers(to.getDefaultMaxConsumers());
+ from.setDefaultDeleteOnNoConsumers(to.isDefaultDeleteOnNoConsumers());
+ return from;
+ }
+ }
+
+ @Override
public AddressInfo removeAddressInfo(SimpleString address) {
return addressInfoMap.remove(address);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4de48304/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
index fb5aee4..2a3a0b4 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
@@ -413,7 +413,7 @@ public interface ActiveMQServer extends ActiveMQComponent {
void removeClientConnection(String clientId);
- AddressInfo addAddressInfo(AddressInfo addressInfo);
+ AddressInfo createOrUpdateAddressInfo(AddressInfo addressInfo);
AddressInfo removeAddressInfo(SimpleString address);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4de48304/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 208a317..2e09083 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -2089,7 +2089,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
info.setDefaultDeleteOnNoConsumers(config.getDefaultDeleteOnNoConsumers());
info.setDefaultMaxConsumers(config.getDefaultMaxConsumers());
- addAddressInfo(info);
+ createOrUpdateAddressInfo(info);
deployQueuesFromListCoreQueueConfiguration(config.getQueueConfigurations());
}
}
@@ -2193,8 +2193,8 @@ public class ActiveMQServerImpl implements ActiveMQServer {
}
@Override
- public AddressInfo addAddressInfo(AddressInfo addressInfo) {
- return postOffice.addAddressInfo(addressInfo);
+ public AddressInfo createOrUpdateAddressInfo(AddressInfo addressInfo) {
+ return postOffice.addOrUpdateAddressInfo(addressInfo);
}
@Override
@@ -2204,7 +2204,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
@Override
public AddressInfo getAddressInfo(SimpleString address) {
- return postOffice.removeAddressInfo(address);
+ return postOffice.getAddressInfo(address);
}
private Queue createQueue(final SimpleString addressName,
@@ -2240,15 +2240,13 @@ public class ActiveMQServerImpl implements ActiveMQServer {
final QueueConfig queueConfig = queueConfigBuilder.filter(filter).pagingManager(pagingManager).user(user).durable(durable).temporary(temporary).autoCreated(autoCreated).build();
final Queue queue = queueFactory.createQueueWith(queueConfig);
- addAddressInfo(new AddressInfo(queue.getAddress()));
-
if (transientQueue) {
queue.setConsumersRefCount(new TransientQueueManagerImpl(this, queue.getName()));
} else if (queue.isAutoCreated()) {
queue.setConsumersRefCount(new AutoCreatedQueueManagerImpl(this.getJMSQueueDeleter(), queue.getName()));
}
- final QueueBinding localQueueBinding = new LocalQueueBinding(queue.getAddress(), queue, nodeManager.getNodeId());
+ final QueueBinding localQueueBinding = new LocalQueueBinding(getAddressInfo(queue.getAddress()), queue, nodeManager.getNodeId());
if (queue.isDurable()) {
storageManager.addQueueBinding(txID, localQueueBinding);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4de48304/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
index 4c6ec1f..1449107 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
@@ -22,7 +22,7 @@ public class AddressInfo {
private final SimpleString name;
- private RoutingType routingType = RoutingType.Multicast;
+ private RoutingType routingType = RoutingType.MULTICAST;
private boolean defaultDeleteOnNoConsumers;
@@ -61,13 +61,13 @@ public class AddressInfo {
}
public enum RoutingType {
- Multicast, Anycast;
+ MULTICAST, ANYCAST;
public byte getType() {
switch (this) {
- case Multicast:
+ case MULTICAST:
return 0;
- case Anycast:
+ case ANYCAST:
return 1;
default:
return -1;
@@ -77,9 +77,9 @@ public class AddressInfo {
public static RoutingType getType(byte type) {
switch (type) {
case 0:
- return Multicast;
+ return MULTICAST;
case 1:
- return Anycast;
+ return ANYCAST;
default:
return null;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4de48304/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
index 9a8ae74..71c5b2b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
@@ -155,7 +155,8 @@ public class PostOfficeJournalLoader implements JournalLoader {
}
}
- final Binding binding = new LocalQueueBinding(queue.getAddress(), queue, nodeManager.getNodeId());
+ final Binding binding = new LocalQueueBinding(postOffice.getAddressInfo(queue.getAddress()), queue, nodeManager.getNodeId());
+
queues.put(queue.getID(), queue);
postOffice.addBinding(binding);
managementService.registerAddress(queue.getAddress());
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4de48304/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueFactoryImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueFactoryImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueFactoryImpl.java
index 5686c7b..3678553 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueFactoryImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueFactoryImpl.java
@@ -68,6 +68,10 @@ public class QueueFactoryImpl implements QueueFactory {
@Override
public Queue createQueueWith(final QueueConfig config) {
+
+ // Add default address info if one doesn't exist
+ postOffice.addAddressInfo(new AddressInfo(config.address()));
+
final AddressSettings addressSettings = addressSettingsRepository.getMatch(config.address().toString());
final Queue queue;
if (addressSettings.isLastValueQueue()) {
@@ -89,6 +93,10 @@ public class QueueFactoryImpl implements QueueFactory {
final boolean durable,
final boolean temporary,
final boolean autoCreated) {
+
+ // Add default address info if one doesn't exist
+ postOffice.addAddressInfo(new AddressInfo(address));
+
AddressSettings addressSettings = addressSettingsRepository.getMatch(address.toString());
Queue queue;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4de48304/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
index f7a0175..46f3958 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
@@ -367,7 +367,7 @@ public class FileConfigurationTest extends ConfigurationImplTest {
// Addr 1
CoreAddressConfiguration addressConfiguration = conf.getAddressConfigurations().get(0);
assertEquals("addr1", addressConfiguration.getName());
- assertEquals(AddressInfo.RoutingType.Anycast, addressConfiguration.getRoutingType());
+ assertEquals(AddressInfo.RoutingType.ANYCAST, addressConfiguration.getRoutingType());
assertEquals(2, addressConfiguration.getQueueConfigurations().size());
// Addr 1 Queue 1
@@ -393,7 +393,7 @@ public class FileConfigurationTest extends ConfigurationImplTest {
// Addr 2
addressConfiguration = conf.getAddressConfigurations().get(1);
assertEquals("addr2", addressConfiguration.getName());
- assertEquals(AddressInfo.RoutingType.Multicast, addressConfiguration.getRoutingType());
+ assertEquals(AddressInfo.RoutingType.MULTICAST, addressConfiguration.getRoutingType());
assertEquals(2, addressConfiguration.getQueueConfigurations().size());
// Addr 2 Queue 1
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4de48304/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
index 43d6071..2e0fda4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
@@ -16,6 +16,244 @@
*/
package org.apache.activemq.artemis.tests.integration.addressing;
-public class AddressingTest {
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
+import org.apache.activemq.artemis.api.core.client.ClientConsumer;
+import org.apache.activemq.artemis.api.core.client.ClientMessage;
+import org.apache.activemq.artemis.api.core.client.ClientProducer;
+import org.apache.activemq.artemis.api.core.client.ClientSession;
+import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
+import org.apache.activemq.artemis.api.core.client.ServerLocator;
+import org.apache.activemq.artemis.core.server.ActiveMQServer;
+import org.apache.activemq.artemis.core.server.Queue;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.junit.Before;
+import org.junit.Test;
+
+public class AddressingTest extends ActiveMQTestBase {
+
+ private ActiveMQServer server;
+
+ private ClientSessionFactory sessionFactory;
+
+ @Before
+ public void setup() throws Exception {
+ server = createServer(true);
+ server.start();
+
+ server.waitForActivation(10, TimeUnit.SECONDS);
+
+ ServerLocator sl = ActiveMQClient.createServerLocatorWithoutHA(new TransportConfiguration(INVM_CONNECTOR_FACTORY));
+ sessionFactory = sl.createSessionFactory();
+
+ addSessionFactory(sessionFactory);
+ }
+
+ @Test
+ public void testMulticastRouting() throws Exception {
+
+ SimpleString sendAddress = new SimpleString("test.address");
+
+ List<String> testAddresses = Arrays.asList("test.address", "test.#", "test.*");
+
+ for (String consumeAddress : testAddresses) {
+
+ // For each address, create 2 Queues with the same address, assert both queues receive message
+
+ AddressInfo addressInfo = new AddressInfo(new SimpleString(consumeAddress));
+ addressInfo.setRoutingType(AddressInfo.RoutingType.MULTICAST);
+
+ server.createOrUpdateAddressInfo(addressInfo);
+ Queue q1 = server.createQueue(new SimpleString(consumeAddress), new SimpleString(consumeAddress + ".1"), null, true, false);
+ Queue q2 = server.createQueue(new SimpleString(consumeAddress), new SimpleString(consumeAddress + ".2"), null, true, false);
+
+ ClientSession session = sessionFactory.createSession();
+ session.start();
+
+ ClientConsumer consumer1 = session.createConsumer(q1.getName());
+ ClientConsumer consumer2 = session.createConsumer(q2.getName());
+
+ ClientProducer producer = session.createProducer(sendAddress);
+ ClientMessage m = session.createMessage(ClientMessage.TEXT_TYPE, true);
+ m.getBodyBuffer().writeString("TestMessage");
+
+ producer.send(m);
+
+ assertNotNull(consumer1.receive(2000));
+ assertNotNull(consumer2.receive(2000));
+
+ q1.deleteQueue();
+ q2.deleteQueue();
+
+ System.out.println(consumeAddress);
+ }
+ }
+
+ @Test
+ public void testAnycastRouting() throws Exception {
+
+ SimpleString sendAddress = new SimpleString("test.address");
+
+ List<String> testAddresses = Arrays.asList("test.address", "test.#", "test.*");
+
+ for (String consumeAddress : testAddresses) {
+
+ // For each address, create 2 Queues with the same address, assert one queue receive message
+
+ AddressInfo addressInfo = new AddressInfo(new SimpleString(consumeAddress));
+ addressInfo.setRoutingType(AddressInfo.RoutingType.ANYCAST);
+
+ server.createOrUpdateAddressInfo(addressInfo);
+ Queue q1 = server.createQueue(new SimpleString(consumeAddress), new SimpleString(consumeAddress + ".1"), null, true, false);
+ Queue q2 = server.createQueue(new SimpleString(consumeAddress), new SimpleString(consumeAddress + ".2"), null, true, false);
+
+ ClientSession session = sessionFactory.createSession();
+ session.start();
+
+ ClientConsumer consumer1 = session.createConsumer(q1.getName());
+ ClientConsumer consumer2 = session.createConsumer(q2.getName());
+
+ ClientProducer producer = session.createProducer(sendAddress);
+ ClientMessage m = session.createMessage(ClientMessage.TEXT_TYPE, true);
+
+ m.getBodyBuffer().writeString("TestMessage");
+
+ producer.send(m);
+
+ int count = 0;
+ count = (consumer1.receive(1000) == null) ? count : count + 1;
+ count = (consumer2.receive(1000) == null) ? count : count + 1;
+ assertEquals(1, count);
+
+ q1.deleteQueue();
+ q2.deleteQueue();
+
+ System.out.println(consumeAddress);
+ }
+ }
+
+ @Test
+ public void testAnycastRoutingRoundRobin() throws Exception {
+
+ SimpleString address = new SimpleString("test.address");
+ AddressInfo addressInfo = new AddressInfo(address);
+ addressInfo.setRoutingType(AddressInfo.RoutingType.ANYCAST);
+
+ server.createOrUpdateAddressInfo(addressInfo);
+ Queue q1 = server.createQueue(address, address.concat(".1"), null, true, false);
+ Queue q2 = server.createQueue(address, address.concat(".2"), null, true, false);
+ Queue q3 = server.createQueue(address, address.concat(".3"), null, true, false);
+
+ ClientSession session = sessionFactory.createSession();
+ session.start();
+
+ ClientProducer producer = session.createProducer(address);
+
+ ClientConsumer consumer1 = session.createConsumer(q1.getName());
+ ClientConsumer consumer2 = session.createConsumer(q2.getName());
+ ClientConsumer consumer3 = session.createConsumer(q3.getName());
+ List<ClientConsumer> consumers = new ArrayList<>(Arrays.asList(new ClientConsumer[] {consumer1, consumer2, consumer3}));
+
+ List<String> messages = new ArrayList<>();
+ messages.add("Message1");
+ messages.add("Message2");
+ messages.add("Message3");
+
+ ClientMessage clientMessage;
+ for (String message : messages) {
+ clientMessage = session.createMessage(true);
+ clientMessage.getBodyBuffer().writeString(message);
+ producer.send(clientMessage);
+ }
+
+ String m;
+ for (ClientConsumer consumer : consumers) {
+ clientMessage = consumer.receive(1000);
+ m = clientMessage.getBodyBuffer().readString();
+ messages.remove(m);
+ }
+
+ assertTrue(messages.isEmpty());
+
+ // Check we don't receive more messages
+ int count = 0;
+ for (ClientConsumer consumer : consumers) {
+ count = (consumer.receive(1000) == null) ? count : count + 1;
+ }
+ assertEquals(0, count);
+ }
+
+
+
+ @Test
+ public void testMulticastRoutingBackwardsCompat() throws Exception {
+
+ SimpleString sendAddress = new SimpleString("test.address");
+
+ List<String> testAddresses = Arrays.asList("test.address", "test.#", "test.*");
+
+ for (String consumeAddress : testAddresses) {
+
+ // For each address, create 2 Queues with the same address, assert both queues receive message
+ Queue q1 = server.createQueue(new SimpleString(consumeAddress), new SimpleString(consumeAddress + ".1"), null, true, false);
+ Queue q2 = server.createQueue(new SimpleString(consumeAddress), new SimpleString(consumeAddress + ".2"), null, true, false);
+
+ ClientSession session = sessionFactory.createSession();
+ session.start();
+
+ ClientConsumer consumer1 = session.createConsumer(q1.getName());
+ ClientConsumer consumer2 = session.createConsumer(q2.getName());
+
+ ClientProducer producer = session.createProducer(sendAddress);
+ ClientMessage m = session.createMessage(ClientMessage.TEXT_TYPE, true);
+ m.getBodyBuffer().writeString("TestMessage");
+
+ producer.send(m);
+
+ assertNotNull(consumer1.receive(2000));
+ assertNotNull(consumer2.receive(2000));
+
+ q1.deleteQueue();
+ q2.deleteQueue();
+
+ System.out.println(consumeAddress);
+ }
+ }
+
+ @Test
+ public void testDeleteQueueOnNoConsumersTrue() {
+ fail("Not Implemented");
+ }
+
+ @Test
+ public void testDeleteQueueOnNoConsumersFalse() {
+ fail("Not Implemented");
+ }
+
+ @Test
+ public void testLimitOnMaxConsumers() {
+ fail("Not Implemented");
+ }
+
+ @Test
+ public void testUnlimitedMaxConsumers() {
+ fail("Not Implemented");
+ }
+
+ @Test
+ public void testDefaultMaxConsumersFromAddress() {
+ fail("Not Implemented");
+ }
+
+ @Test
+ public void testDefaultDeleteOnNoConsumersFromAddress() {
+ fail("Not Implemented");
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4de48304/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
index 83d28a1..2fd5915 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HangConsumerTest.java
@@ -353,7 +353,7 @@ public class HangConsumerTest extends ActiveMQTestBase {
long txID = server.getStorageManager().generateID();
// Forcing a situation where the server would unexpectedly create a duplicated queue. The server should still start normally
- LocalQueueBinding newBinding = new LocalQueueBinding(QUEUE, new QueueImpl(queueID, QUEUE, QUEUE, null, null, true, false, false, null, null, null, null, null), server.getNodeID());
+ LocalQueueBinding newBinding = new LocalQueueBinding(server.getAddressInfo(QUEUE), new QueueImpl(queueID, QUEUE, QUEUE, null, null, true, false, false, null, null, null, null, null), server.getNodeID());
server.getStorageManager().addQueueBinding(txID, newBinding);
server.getStorageManager().commitBindings(txID);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4de48304/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TopicCleanupTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TopicCleanupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TopicCleanupTest.java
index 280596a..ec279ee 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TopicCleanupTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TopicCleanupTest.java
@@ -83,7 +83,7 @@ public class TopicCleanupTest extends JMSTestBase {
final Queue queue = new QueueImpl(storage.generateID(), SimpleString.toSimpleString("jms.topic.topic"), SimpleString.toSimpleString("jms.topic.topic"), FilterImpl.createFilter(ActiveMQServerImpl.GENERIC_IGNORED_FILTER), null, true, false, false, server.getScheduledPool(), server.getPostOffice(), storage, server.getAddressSettingsRepository(), server.getExecutorFactory().getExecutor());
- LocalQueueBinding binding = new LocalQueueBinding(queue.getAddress(), queue, server.getNodeID());
+ LocalQueueBinding binding = new LocalQueueBinding(server.getAddressInfo(queue.getAddress()), queue, server.getNodeID());
storage.addQueueBinding(txid, binding);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4de48304/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
index 9424fc3..512f0f2 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
@@ -65,6 +65,11 @@ public class FakePostOffice implements PostOffice {
return null;
}
+ @Override
+ public AddressInfo addOrUpdateAddressInfo(AddressInfo addressInfo) {
+ return null;
+ }
+
@Override
public AddressInfo removeAddressInfo(SimpleString address) {
[27/34] activemq-artemis git commit: ARTEMIS-790 Added Configuration
conversion tooL
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1bc0a36/artemis-tools/src/test/resources/artemis-configuration.xsd
----------------------------------------------------------------------
diff --git a/artemis-tools/src/test/resources/artemis-configuration.xsd b/artemis-tools/src/test/resources/artemis-configuration.xsd
new file mode 100644
index 0000000..4c3e068
--- /dev/null
+++ b/artemis-tools/src/test/resources/artemis-configuration.xsd
@@ -0,0 +1,2591 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns="urn:activemq:core"
+ targetNamespace="urn:activemq:core"
+ attributeFormDefault="unqualified"
+ elementFormDefault="qualified"
+ version="1.0">
+
+ <xsd:element name="core" type="configurationType"/>
+
+ <xsd:complexType name="configurationType">
+ <xsd:all>
+ <xsd:element name="name" type="xsd:string" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Node name. If set, it will be used in topology notifications.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="resolve-protocols" type="xsd:boolean" default="true" maxOccurs="1"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ If true then the ActiveMQ Artemis Server will make use of any Protocol Managers that are in available
+ on the
+ classpath. If false then only the core protocol will be available, unless in Embedded mode where users
+ can inject their own Protocol Managers.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="persistence-enabled" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ true means that the server will use the file based journal for persistence.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="scheduled-thread-pool-max-size" type="xsd:int" default="5" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Maximum number of threads to use for the scheduled thread pool
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="thread-pool-max-size" type="xsd:int" default="30" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Maximum number of threads to use for the thread pool. -1 means 'no limits'.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="graceful-shutdown-enabled" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ true means that graceful shutdown is enabled
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="graceful-shutdown-timeout" type="xsd:long" default="-1" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ how long (in ms) to wait for clients to disconnect before shutting down the server
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="security-enabled" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ true means that security is enabled
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="security-invalidation-interval" type="xsd:long" default="10000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ how long (in ms) to wait before invalidating the security cache
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="journal-lock-acquisition-timeout" type="xsd:long" default="-1" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ how long (in ms) to wait to acquire a file lock on the journal
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="wild-card-routing-enabled" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ true means that the server supports wild card routing
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="management-address" type="xsd:string" default="jms.queue.activemq.management" maxOccurs="1"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ the name of the management address to send management messages to. It is prefixed with "jms.queue" so
+ that JMS clients can send messages to it.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="management-notification-address" type="xsd:string" default="activemq.notifications"
+ maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ the name of the address that consumers bind to receive management notifications
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="cluster-user" type="xsd:string" default="ACTIVEMQ.CLUSTER.ADMIN.USER" maxOccurs="1"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Cluster username. It applies to all cluster configurations.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="cluster-password" maxOccurs="1" minOccurs="0" type="xsd:string" default="CHANGE ME!!">
+ <xsd:annotation>
+ <xsd:documentation>
+ Cluster password. It applies to all cluster configurations.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="password-codec" type="xsd:string"
+ default="org.apache.activemq.artemis.utils.DefaultSensitiveStringCodec" maxOccurs="1"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Class name and its parameters for the Decoder used to decode the masked password. Ignored if
+ mask-password is false. The format of this property is a full qualified class name optionally followed
+ by key/value pairs.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="mask-password" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ This option controls whether passwords in server configuration need be masked. If set to "true" the
+ passwords are masked.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="log-delegate-factory-class-name" type="xsd:string" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ XXX
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="jmx-management-enabled" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ true means that the management API is available via JMX
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="jmx-domain" type="xsd:string" default="org.apache.activemq" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ the JMX domain used to registered ActiveMQ Artemis MBeans in the MBeanServer
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="jmx-use-broker-name" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Whether or not to use the broker name in the JMX properties
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="message-counter-enabled" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ true means that message counters are enabled
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="message-counter-sample-period" type="xsd:long" default="10000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ the sample period (in ms) to use for message counters
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="message-counter-max-day-history" type="xsd:int" default="10" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ how many days to keep message counter history
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="connection-ttl-override" type="xsd:long" default="-1" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ if set, this will override how long (in ms) to keep a connection alive without receiving a ping. -1
+ disables this setting.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="connection-ttl-check-interval" type="xsd:long" default="2000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ how often (in ms) to check connections for ttl violation
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="configuration-file-refresh-period" type="xsd:long" default="5000" maxOccurs="1"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ how often (in ms) to check the configuration file for modifications
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="async-connection-execution-enabled" type="xsd:boolean" default="true" maxOccurs="1"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ should certain incoming packets on the server be handed off to a thread from the thread pool for
+ processing or should they be handled on the remoting thread?
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="transaction-timeout" type="xsd:long" default="300000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ how long (in ms) before a transaction can be removed from the resource manager after create time
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="transaction-timeout-scan-period" type="xsd:long" default="1000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ how often (in ms) to scan for timeout transactions
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="message-expiry-scan-period" type="xsd:long" default="30000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ how often (in ms) to scan for expired messages
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="message-expiry-thread-priority" type="xsd:int" default="3" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ the priority of the thread expiring messages
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="id-cache-size" type="xsd:int" default="20000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ the size of the cache for pre-creating message ID's
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="persist-id-cache" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ true means that ID's are persisted to the journal
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="remoting-incoming-interceptors" type="class-name-sequenceType" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ a list of <class-name/> elements with the names of classes to use for interceptor incoming
+ remoting packets
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="remoting-outgoing-interceptors" type="class-name-sequenceType" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ a list of <class-name/> elements with the names of classes to use for interceptor outcoming
+ remoting packets
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="persist-delivery-count-before-delivery" type="xsd:boolean" default="false" maxOccurs="1"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ True means that the delivery count is persisted before delivery. False means that this only happens
+ after a message has been cancelled.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="populate-validated-user" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ true means that the server will add the name of the validated user to messages it sends
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="connectors" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ a list of remoting connectors configurations to create
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="connector" type="transportType" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element maxOccurs="1" minOccurs="0" name="acceptors">
+ <xsd:annotation>
+ <xsd:documentation>
+ a list of remoting acceptors to create
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="acceptor" type="transportType" maxOccurs="unbounded"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element maxOccurs="1" minOccurs="0" name="broadcast-groups">
+ <xsd:annotation>
+ <xsd:documentation>
+ a list of broadcast groups to create
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="broadcast-group" maxOccurs="unbounded" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element maxOccurs="1" minOccurs="0" name="discovery-groups">
+ <xsd:annotation>
+ <xsd:documentation>
+ a list of discovery groups to create
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element maxOccurs="unbounded" minOccurs="0" ref="discovery-group">
+ <xsd:annotation>
+ <xsd:documentation>
+ a discovery group specification element
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="diverts" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ a list of diverts to use
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="divert" type="divertType" maxOccurs="unbounded" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <!-- QUEUES -->
+ <xsd:element name="queues" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ a list of pre configured queues to create
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="queue" maxOccurs="unbounded" minOccurs="0">
+ <xsd:complexType>
+ <xsd:all>
+ <xsd:element name="address" type="xsd:string" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ address for the queue
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element ref="filter" maxOccurs="1" minOccurs="0"/>
+ <xsd:element name="durable" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ whether the queue is durable (persistent)
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:all>
+ <xsd:attribute name="name" type="xsd:ID" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ unique name of this queue
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="bridges" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ a list of bridges to create
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="bridge" type="bridgeType" maxOccurs="unbounded" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="ha-policy" type="haPolicyType" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ The HA policy of this server
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="cluster-connections" type="clusterConnectionChoiceType" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ a list of cluster connections
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="grouping-handler" type="groupingHandlerType" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Message Group configuration
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="paging-directory" type="xsd:string" default="data/paging" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ the directory to store paged messages in
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="bindings-directory" type="xsd:string" default="data/bindings" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ the directory to store the persisted bindings to
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="create-bindings-dir" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ true means that the server will create the bindings directory on start up
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="page-max-concurrent-io" type="xsd:int" default="5" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ The max number of concurrent reads allowed on paging
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="journal-directory" type="xsd:string" default="data/journal" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ the directory to store the journal files in
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="create-journal-dir" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ true means that the journal directory will be created
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="journal-type" default="ASYNCIO" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ the type of journal to use
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="ASYNCIO"/>
+ <xsd:enumeration value="NIO"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:element>
+
+ <xsd:element name="journal-buffer-timeout" type="xsd:long" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ The timeout (in nanoseconds) used to flush internal buffers on the journal. The exact default value
+ depend on whether the journal is ASYNCIO or NIO.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="journal-buffer-size" type="xsd:long" default="501760" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ The size of the internal buffer on the journal in KiB.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="journal-sync-transactional" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ if true wait for transaction data to be synchronized to the journal before returning response to
+ client
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="journal-sync-non-transactional" type="xsd:boolean" default="true" maxOccurs="1"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ if true wait for non transaction data to be synced to the journal before returning response to client.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="log-journal-write-rate" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Whether to log messages about the journal write rate
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="journal-file-size" default="10485760" type="xsd:int" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ the size (in bytes) of each journal file
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="journal-min-files" type="xsd:int" default="2" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ how many journal files to pre-create
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="journal-pool-files" type="xsd:int" default="-1" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ how many journal files to pre-create
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="journal-compact-percentage" type="xsd:int" default="30" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ The percentage of live data on which we consider compacting the journal
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="journal-compact-min-files" type="xsd:int" default="10" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ The minimal number of data files before we can start compacting
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="journal-max-io" type="xsd:int" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ the maximum number of write requests that can be in the AIO queue at any one time. Default is 500 for
+ AIO and 1 for NIO.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="perf-blast-pages" type="xsd:int" default="-1" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ XXX Only meant to be used by project developers
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="run-sync-speed-test" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ XXX Only meant to be used by project developers
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="server-dump-interval" type="xsd:long" default="-1" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Interval to log server specific information (e.g. memory usage etc)
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="global-max-size" type="xsd:long" default="-1" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Global Max Size before all addresses will enter into their Full Policy configured upon messages being
+ produced.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="max-disk-usage" type="xsd:int" default="90" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Max percentage of disk usage before the system blocks or fail clients.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="disk-scan-period" type="xsd:long" default="5000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ how often (in ms) to scan the disks for full disks.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="memory-warning-threshold" type="xsd:int" default="25" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Percentage of available memory which will trigger a warning log
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="memory-measure-interval" type="xsd:long" default="-1" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ frequency to sample JVM memory in ms (or -1 to disable memory sampling)
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="large-messages-directory" type="xsd:string" default="data/largemessages"
+ maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ the directory to store large messages
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="store" type="storeType" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ The Store Type used by the server
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="security-settings" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ a list of security settings
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:choice>
+ <xsd:element name="security-setting" maxOccurs="unbounded" minOccurs="0">
+ <xsd:complexType>
+ <xsd:annotation>
+ <xsd:documentation>
+ a permission to add to the matched addresses
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="permission" maxOccurs="unbounded" minOccurs="0">
+ <xsd:complexType>
+ <xsd:attribute name="type" type="xsd:string" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ the type of permission
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="roles" type="xsd:string" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ a comma-separated list of roles to apply the permission to
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="match" type="xsd:string" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ regular expression for matching security roles against addresses
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="security-setting-plugin" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:annotation>
+ <xsd:documentation>
+ a plugin
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="setting" maxOccurs="unbounded" minOccurs="0">
+ <xsd:complexType>
+ <xsd:attribute name="name" type="xsd:string" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ the name of the setting
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="value" type="xsd:string" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ the value for the setting
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="class-name" type="xsd:string" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ the name of the plugin class to instantiate
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="address-settings" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ a list of address settings
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="address-setting" maxOccurs="unbounded" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="resource-limit-settings" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ a list of resource limit settings
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="resource-limit-setting" maxOccurs="unbounded" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="connector-services" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="connector-service" type="connector-serviceType" maxOccurs="unbounded"
+ minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="addresses" type="addressesType" maxOccurs="1" minOccurs="0" />
+ </xsd:all>
+ </xsd:complexType>
+
+ <xsd:element name="local-bind-address" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation>
+ local bind address that the datagram socket is bound to
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="local-bind-port" type="xsd:int" default="-1">
+ <xsd:annotation>
+ <xsd:documentation>
+ local port to which the datagram socket is bound to
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <!-- BROADCAST GROUP CONFIGURATION -->
+ <xsd:element name="broadcast-group">
+ <xsd:complexType>
+ <xsd:sequence>
+ <!-- XXX these 2 local-* here...-->
+ <xsd:element ref="local-bind-address" maxOccurs="1" minOccurs="0"/>
+ <xsd:element ref="local-bind-port" maxOccurs="1" minOccurs="0"/>
+ <xsd:element name="group-address" type="xsd:string" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ multicast address to which the data will be broadcast
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="group-port" type="xsd:int" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ UDP port number used for broadcasting
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="broadcast-period" type="xsd:long" default="2000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ period in milliseconds between consecutive broadcasts
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="jgroups-file" type="xsd:string" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Name of JGroups configuration file. If specified, the server uses JGroups for broadcasting.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="jgroups-channel" type="xsd:string" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Name of JGroups Channel. If specified, the server uses the named channel for broadcasting.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="connector-ref" type="xsd:string" maxOccurs="unbounded" minOccurs="0"/>
+ </xsd:sequence>
+
+ <xsd:attribute name="name" type="xsd:ID" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ a unique name for the broadcast group
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="discovery-group">
+ <xsd:complexType>
+ <xsd:all>
+ <!-- XXX -->
+ <xsd:element name="group-address" type="xsd:string" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Multicast IP address of the group to listen on
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="group-port" type="xsd:int" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ UDP port number of the multi cast group
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="jgroups-file" type="xsd:string" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Name of a JGroups configuration file. If specified, the server uses JGroups for discovery.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="jgroups-channel" type="xsd:string" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Name of a JGroups Channel. If specified, the server uses the named channel for discovery.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="refresh-timeout" type="xsd:int" default="10000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Period the discovery group waits after receiving the last broadcast from a particular server before
+ removing that servers connector pair entry from its list.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element ref="local-bind-address" maxOccurs="1" minOccurs="0"/>
+ <xsd:element ref="local-bind-port" maxOccurs="1" minOccurs="0"/>
+ <xsd:element name="initial-wait-timeout" type="xsd:int" default="10000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ time to wait for an initial broadcast to give us at least one node in the cluster
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:all>
+
+ <xsd:attribute name="name" type="xsd:ID" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ a unique name for the discovery group
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="discovery-group-ref">
+ <xsd:complexType>
+ <xsd:attribute name="discovery-group-name" type="xsd:IDREF"/>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:complexType name="class-name-sequenceType">
+ <xsd:annotation>
+ <xsd:documentation>
+ unlimited sequence of <class-name/>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element maxOccurs="unbounded" minOccurs="1" name="class-name" type="xsd:string">
+ <xsd:annotation>
+ <xsd:documentation>
+ the fully qualified name of the interceptor class
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="paramType">
+ <xsd:attribute name="key" type="xsd:string" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ Key of a configuration parameter
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="value" type="xsd:string" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ Value of a configuration parameter
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+
+ <!-- BRIDGE CONFIGURATION -->
+ <xsd:complexType name="bridgeType">
+ <xsd:sequence>
+ <xsd:element name="queue-name" type="xsd:IDREF" maxOccurs="1" minOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ name of queue that this bridge consumes from
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="forwarding-address" type="xsd:string" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ address to forward to. If omitted original address is used
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="ha" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ whether this bridge supports fail-over
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element ref="filter" maxOccurs="1" minOccurs="0"/>
+
+ <xsd:element name="transformer-class-name" type="xsd:string" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ optional name of transformer class
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="min-large-message-size" type="xsd:int" default="102400" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Any message larger than this size is considered a large message (to be sent in
+ chunks)
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="check-period" type="xsd:long" default="30000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ The period (in milliseconds) a bridge's client will check if it failed to receive a ping from the
+ server. -1 disables this check.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="connection-ttl" type="xsd:long" default="60000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ how long to keep a connection alive in the absence of any data arriving from the client. This should
+ be greater than the ping period.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="retry-interval" type="xsd:long" default="2000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ period (in ms) between successive retries
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="retry-interval-multiplier" type="xsd:double" default="1" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ multiplier to apply to successive retry intervals
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="max-retry-interval" type="xsd:long" default="2000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Limit to the retry-interval growth (due to retry-interval-multiplier)
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="initial-connect-attempts" type="xsd:int" default="-1" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ maximum number of initial connection attempts, -1 means 'no limits'
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="reconnect-attempts" type="xsd:int" default="-1" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ maximum number of retry attempts, -1 means 'no limits'
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="failover-on-server-shutdown" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ should failover be prompted if target server is cleanly shutdown?
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="use-duplicate-detection" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ should duplicate detection headers be inserted in forwarded messages?
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="confirmation-window-size" type="xsd:int" maxOccurs="1" minOccurs="0" default="1048576">
+ <xsd:annotation>
+ <xsd:documentation>
+ Once the bridge has received this many bytes, it sends a confirmation
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="producer-window-size" type="xsd:int" maxOccurs="1" minOccurs="0" default="-1">
+ <xsd:annotation>
+ <xsd:documentation>
+ Producer flow control
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="user" type="xsd:string" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ username, if unspecified the cluster-user is used
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="password" type="xsd:string" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ password, if unspecified the cluster-password is used
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="reconnect-attempts-same-node" default="10" type="xsd:int" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Upon reconnection this configures the number of time the same node on the topology will be retried
+ before reseting the server locator and using the initial connectors
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:choice>
+ <xsd:element name="static-connectors" maxOccurs="1" minOccurs="1">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="connector-ref" type="xsd:string" maxOccurs="unbounded" minOccurs="1"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="discovery-group-ref" maxOccurs="1" minOccurs="1">
+ <xsd:complexType>
+ <xsd:attribute name="discovery-group-name" type="xsd:IDREF" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ name of discovery group used by this bridge
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:sequence>
+
+ <xsd:attribute name="name" type="xsd:ID" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ unique name for this bridge
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+
+
+ <!-- CLUSTER CONNECTION CONFIGURATION -->
+
+ <xsd:complexType name="clusterConnectionChoiceType">
+ <xsd:sequence>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="cluster-connection-uri" type="cluster-connectionUriType"/>
+ <xsd:element name="cluster-connection" type="cluster-connectionType">
+ </xsd:element>
+ </xsd:choice>
+ </xsd:sequence>
+ </xsd:complexType>
+
+ <xsd:complexType name="cluster-connectionUriType">
+ <xsd:attribute name="address" type="xsd:string" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ uri of the cluster connection
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="name" type="xsd:string" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ name of the cluster connection
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="cluster-connectionType">
+ <xsd:sequence>
+ <xsd:element name="address" type="xsd:string" maxOccurs="1" minOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ name of the address this cluster connection applies to
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="connector-ref" type="xsd:string" maxOccurs="1" minOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ Name of the connector reference to use.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="check-period" type="xsd:long" default="30000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ The period (in milliseconds) used to check if the cluster connection has failed to receive pings from
+ another server
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="connection-ttl" type="xsd:long" default="60000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ how long to keep a connection alive in the absence of any data arriving from the client
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="min-large-message-size" type="xsd:int" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Messages larger than this are considered large-messages
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="call-timeout" type="xsd:long" default="30000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ How long to wait for a reply
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="retry-interval" type="xsd:long" default="500" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ period (in ms) between successive retries
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="retry-interval-multiplier" type="xsd:double" default="1" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ multiplier to apply to the retry-interval
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="max-retry-interval" type="xsd:long" default="2000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Maximum value for retry-interval
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="initial-connect-attempts" type="xsd:int" default="-1" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ How many attempts should be made to connect initially
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="reconnect-attempts" type="xsd:int" default="-1" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ How many attempts should be made to reconnect after failure
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="use-duplicate-detection" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ should duplicate detection headers be inserted in forwarded messages?
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="forward-when-no-consumers" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ DEPRECATED: use message-load-balancing-type instead. Select STRICT to mimic
+ forward-when-no-consumers=true
+ and ON_DEMAND to mimic forward-when-no-consumers=false.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="message-load-balancing" default="ON_DEMAND" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ how should messages be load balanced between servers in a cluster?
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="OFF"/>
+ <xsd:enumeration value="STRICT"/>
+ <xsd:enumeration value="ON_DEMAND"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:element>
+
+ <xsd:element name="max-hops" type="xsd:int" default="1" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ maximum number of hops cluster topology is propagated
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="confirmation-window-size" type="xsd:int" default="1048576" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ The size (in bytes) of the window used for confirming data from the server connected to.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="producer-window-size" type="xsd:int" maxOccurs="1" minOccurs="0" default="-1">
+ <xsd:annotation>
+ <xsd:documentation>
+ Producer flow control
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="call-failover-timeout" type="xsd:long" default="-1" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ How long to wait for a reply if in the middle of a fail-over. -1 means wait forever.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="notification-interval" type="xsd:long" default="1000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ how often the cluster connection will notify the cluster of its existence right after joining the
+ cluster
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="notification-attempts" type="xsd:int" default="2" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ how many times this cluster connection will notify the cluster of its existence right after joining
+ the cluster
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="scale-down-connector" type="xsd:string" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ The connector to use for scaling down or when as backup in SCALE_DOWN mode
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:choice>
+ <xsd:element name="static-connectors" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="connector-ref" type="xsd:string" maxOccurs="unbounded" minOccurs="0"/>
+ </xsd:sequence>
+ <xsd:attribute name="allow-direct-connections-only" default="false" type="xsd:boolean" use="optional">
+ <xsd:annotation>
+ <xsd:documentation>
+ restricts cluster connections to the listed connector-ref's
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="discovery-group-ref" maxOccurs="1" minOccurs="0">
+ <xsd:complexType>
+ <xsd:attribute name="discovery-group-name" type="xsd:IDREF" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ XXX -- this is a duplicate...
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:ID" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ unique name for this cluster connection
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="uri" type="xsd:string" use="optional">
+ <xsd:annotation>
+ <xsd:documentation>
+ The URI for the cluster connection options
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+
+
+ <xsd:complexType name="cluster-connection-uri-type">
+ <xsd:attribute name="name" type="xsd:ID" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ unique name for this cluster connection
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="uri" type="xsd:string" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ The URI for the cluster connection options
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+
+ <!-- DIVERT CONFIGURATION TYPE -->
+ <xsd:complexType name="divertType">
+ <xsd:all>
+ <xsd:element name="transformer-class-name" type="xsd:string" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ an optional class name of a transformer
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="exclusive" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ whether this is an exclusive divert
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="routing-name" type="xsd:string" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ the routing name for the divert
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="address" type="xsd:string" maxOccurs="1" minOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ the address this divert will divert from
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="forwarding-address" type="xsd:string" maxOccurs="1" minOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ the forwarding address for the divert
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element ref="filter" maxOccurs="1" minOccurs="0"/>
+ </xsd:all>
+
+ <xsd:attribute name="name" type="xsd:ID" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ a unique name for the divert
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+
+ </xsd:complexType>
+
+ <xsd:complexType name="storeType">
+ <xsd:choice>
+ <xsd:element name="file-store" type="fileStoreType" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ Use a file based store for peristing journal, paging and large messages
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="database-store" type="databaseStoreType" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ Use a database for persisting journal, paging and large messages
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+
+ <xsd:complexType name="fileStoreType">
+ </xsd:complexType>
+
+ <xsd:complexType name="databaseStoreType">
+ <xsd:all>
+ <xsd:element name="jdbc-driver-class-name" type="xsd:string" minOccurs="1" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ The JDBC Driver class name
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="jdbc-connection-url" type="xsd:string" minOccurs="1" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ The JDBC Connection URL e.g. jdbc:mysql://localhost:3306/
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="message-table-name" type="xsd:string" minOccurs="1" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ The table name used to store message journal entries
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="bindings-table-name" type="xsd:string" minOccurs="1" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ The table name used to store bindings journal entries
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="large-message-table-name" type="xsd:string" minOccurs="1" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ The table name used to large message files
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:all>
+ </xsd:complexType>
+
+ <xsd:complexType name="haPolicyType">
+ <xsd:choice>
+ <xsd:element name="live-only" type="haLiveOnlyPolicyType" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ A live only server with no HA capabilities apart from scale down.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="replication" type="haReplicationType" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ Configuration for a replicated server, either master, slave or colocated.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="shared-store" type="haSharedStoreType" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ Configuration for a shared store server, either master, slave or colocated.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+
+ <xsd:complexType name="haReplicationType">
+ <xsd:choice>
+ <xsd:element name="master" type="replicatedPolicyType" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ A live server configured to replicate.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="slave" type="replicaPolicyType" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ A backup server configured to replicate.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="colocated" type="haColocationReplicationType" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ a replicated lives server that will allow requests to create colocated replicated backup servers.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+
+
+ <xsd:complexType name="haColocationReplicationType">
+ <xsd:all>
+ <xsd:element name="request-backup" type="xsd:boolean" minOccurs="0" maxOccurs="1" default="false">
+ <xsd:annotation>
+ <xsd:documentation>
+ If true then the server will request a backup on another node
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="backup-request-retries" type="xsd:int" minOccurs="0" maxOccurs="1" default="-1">
+ <xsd:annotation>
+ <xsd:documentation>
+ How many times the live server will try to request a backup, -1 means for ever.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="backup-request-retry-interval" type="xsd:long" minOccurs="0" maxOccurs="1" default="5000">
+ <xsd:annotation>
+ <xsd:documentation>
+ How long to wait for retries between attempts to request a backup server.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="max-backups" type="xsd:int" minOccurs="0" maxOccurs="1" default="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ Whether or not this live server will accept backup requests from other live servers.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="backup-port-offset" type="xsd:int" minOccurs="0" maxOccurs="1" default="100">
+ <xsd:annotation>
+ <xsd:documentation>
+ The offset to use for the Connectors and Acceptors when creating a new backup server.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="excludes" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ the connectors that shouldn't have their ports offset, typically remote connectors or the
+ connector used in the cluster connection if scalinmg down
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="connector-ref" type="xsd:string" maxOccurs="unbounded" minOccurs="1"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="master" type="replicatedPolicyType" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ The configuration for the live replicated server.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="slave" type="replicaPolicyType" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ The configuration for any slaves created.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:all>
+ </xsd:complexType>
+
+ <xsd:complexType name="haColocationSharedStoreType">
+ <xsd:all>
+ <xsd:element name="request-backup" type="xsd:boolean" minOccurs="0" maxOccurs="1" default="false">
+ <xsd:annotation>
+ <xsd:documentation>
+ If true then the server will request a backup on another node
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="backup-request-retries" type="xsd:int" minOccurs="0" maxOccurs="1" default="-1">
+ <xsd:annotation>
+ <xsd:documentation>
+ How many times the live server will try to request a backup, -1 means for ever.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="backup-request-retry-interval" type="xsd:long" minOccurs="0" maxOccurs="1" default="5000">
+ <xsd:annotation>
+ <xsd:documentation>
+ How long to wait for retries between attempts to request a backup server.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="max-backups" type="xsd:int" minOccurs="0" maxOccurs="1" default="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ Whether or not this live server will accept backup requests from other live servers.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="backup-port-offset" type="xsd:int" minOccurs="0" maxOccurs="1" default="100">
+ <xsd:annotation>
+ <xsd:documentation>
+ The offset to use for the Connectors and Acceptors when creating a new backup server.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="master" type="sharedStoreMasterPolicyType" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ The configuration for the live shared store server.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="slave" type="sharedStoreSlavePolicyType" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ The configuration for any shared store backups created.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:all>
+ </xsd:complexType>
+
+ <xsd:complexType name="haSharedStoreType">
+ <xsd:choice>
+ <xsd:element name="master" type="sharedStoreMasterPolicyType" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ A shared store live server configuration.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="slave" type="sharedStoreSlavePolicyType" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ A shared store backup server configuration.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="colocated" type="haColocationSharedStoreType" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ A shared store colocated configuration
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+
+ <xsd:complexType name="haLiveOnlyPolicyType">
+ <xsd:all>
+ <xsd:element name="scale-down" type="scaleDownType" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ The scale down configuration of this live server.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:all>
+ </xsd:complexType>
+ <xsd:complexType name="replicatedPolicyType">
+ <xsd:all>
+ <xsd:element name="group-name" type="xsd:string" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ used for replication, if set, (remote) backup servers will only pair with live servers with matching
+ group-name
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="cluster-name" type="xsd:string" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Name of the cluster configuration to use for replication. This setting is only necessary in case you
+ configure multiple cluster connections. It is used by a replicating backups and by live servers that
+ may attempt fail-back.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="check-for-live-server" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Whether to check the cluster for a (live) server using our own server ID when starting
+ up. This option is only necessary for performing 'fail-back' on replicating
+ servers. Strictly speaking this setting only applies to live servers and not to
+ backups.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="initial-replication-sync-timeout" type="xsd:long" default="30000" maxOccurs="1"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ The amount of time to wait for the replica to acknowledge it has received all the necessary data from
+ the replicating server at the final step of the initial replication synchronization process.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:all>
+ </xsd:complexType>
+ <xsd:complexType name="replicaPolicyType">
+ <xsd:all>
+ <xsd:element name="group-name" type="xsd:string" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ used for replication, if set, (remote) backup servers will only pair with live servers with matching
+ group-name
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="cluster-name" type="xsd:string" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Name of the cluster configuration to use for replication. This setting is only necessary in case you
+ configure multiple cluster connections. It is used by a replicating backups and by live servers that
+ may attempt fail-back.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="max-saved-replicated-journals-size" type="xsd:int" default="2" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ This specifies how many times a replicated backup server can restart after moving its files on start.
+ Once there are this number of backup journal files the server will stop permanently after if fails
+ back.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="scale-down" type="scaleDownType" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ if provided then this backup will scale down rather than becoming live after fail over.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="restart-backup" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Will this server, if a backup, restart once it has been stopped because of failback or scaling down.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="allow-failback" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Whether a server will automatically stop when a another places a request to take over
+ its place. The use case is when a regular server stops and its backup takes over its
+ duties, later the main server restarts and requests the server (the former backup) to
+ stop operating.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="failback-delay" type="xsd:long" default="5000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ DEPRECATED: if we have to start as a replicated server this is the delay to wait before fail-back
+ occurs
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="initial-replication-sync-timeout" type="xsd:long" default="30000" maxOccurs="1"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ If we have to start as a replicated server this is the amount of time to wait for the replica to
+ acknowledge it has received all the necessary data from the replicating server at the final step
+ of the initial replication synchronization process.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:all>
+ </xsd:complexType>
+ <xsd:complexType name="colocatedReplicaPolicyType">
+ <xsd:all>
+ <xsd:element name="group-name" type="xsd:string" minOccurs="0" maxOccurs="1">
+ <xsd:annotation>
+ <xsd:documentation>
+ used for replication, if set, (remote) backup servers will only pair with live servers with matching
+ group-name
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="cluster-name" type="xsd:string" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Name of the cluster configuration to use for replication. This setting is only necessary in case you
+ configure multiple cluster connections. It is used by a replicating backups and by live servers that
+ may attempt fail-back.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="max-saved-replicated-journals-size" type="xsd:int" default="2" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ This specifies how many times a replicated backup server can restart after moving its files on start.
+ Once there are this number of backup journal files the server will stop permanently after if fails
+ back.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="scale-down" type="scaleDownType" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ if provided then this backup will scale down rather than becoming live after fail over.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="restart-backup" type="xsd:boolean" default="false" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ Will this server, if a backup, restart once it has been stopped because of failback or scaling down.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:all>
+ </xsd:complexType>
+ <xsd:complexType name="sharedStoreMasterPolicyType">
+ <xsd:all>
+ <xsd:element name="failback-delay" type="xsd:long" default="5000" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ DEPRECATED: delay to wait before fail-back occurs on (live's) restar
<TRUNCATED>
[33/34] activemq-artemis git commit: ARTEMIS-813 Load AddressInfo
into AddressManager
Posted by ma...@apache.org.
ARTEMIS-813 Load AddressInfo into AddressManager
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/54ad2bc7
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/54ad2bc7
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/54ad2bc7
Branch: refs/heads/ARTEMIS-780
Commit: 54ad2bc72309e10addc9d0a8e430ff9e3c4b816b
Parents: af5f1b1
Author: Martyn Taylor <mt...@redhat.com>
Authored: Wed Oct 19 19:16:31 2016 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Nov 1 10:20:52 2016 +0000
----------------------------------------------------------------------
.../core/config/CoreAddressConfiguration.java | 6 +-
.../deployers/impl/FileConfigurationParser.java | 3 +-
.../artemis/core/postoffice/AddressManager.java | 7 ++
.../artemis/core/postoffice/PostOffice.java | 8 +++
.../core/postoffice/impl/PostOfficeImpl.java | 16 +++++
.../postoffice/impl/SimpleAddressManager.java | 18 ++++++
.../artemis/core/server/ActiveMQServer.java | 13 +++-
.../core/server/impl/ActiveMQServerImpl.java | 49 ++++++++++++--
.../artemis/core/server/impl/AddressInfo.java | 67 ++++++++++++++++++++
.../core/config/impl/FileConfigurationTest.java | 5 +-
.../integration/addressing/AddressingTest.java | 21 ++++++
.../core/server/impl/fakes/FakePostOffice.java | 17 +++++
12 files changed, 213 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/54ad2bc7/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
index cb6d43f..e01c398 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
@@ -21,14 +21,10 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo.RoutingType;
public class CoreAddressConfiguration implements Serializable {
- public enum RoutingType {
- MULTICAST,
- ANYCAST
- }
-
private String name = null;
private RoutingType routingType = null;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/54ad2bc7/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
index fc045b3..2dccb03 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
@@ -64,6 +64,7 @@ import org.apache.activemq.artemis.core.server.JournalType;
import org.apache.activemq.artemis.core.server.SecuritySettingPlugin;
import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType;
import org.apache.activemq.artemis.core.server.group.impl.GroupingHandlerConfiguration;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.core.settings.impl.ResourceLimitSettings;
@@ -895,7 +896,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
CoreAddressConfiguration addressConfiguration = new CoreAddressConfiguration();
addressConfiguration.setName(name)
- .setRoutingType(CoreAddressConfiguration.RoutingType.valueOf(routingType.toUpperCase()));
+ .setRoutingType(AddressInfo.RoutingType.valueOf(routingType.toUpperCase()));
NodeList children = node.getChildNodes();
for (int j = 0; j < children.getLength(); j++) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/54ad2bc7/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java
index efc1297..5519822 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/AddressManager.java
@@ -20,6 +20,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.activemq.artemis.api.core.SimpleString;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.core.transaction.Transaction;
/**
@@ -50,4 +51,10 @@ public interface AddressManager {
Map<SimpleString, Binding> getBindings();
Set<SimpleString> getAddresses();
+
+ AddressInfo addAddressInfo(AddressInfo addressInfo);
+
+ AddressInfo removeAddressInfo(SimpleString address);
+
+ AddressInfo getAddressInfo(SimpleString address);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/54ad2bc7/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
index 4c0c4b0..f719966 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/PostOffice.java
@@ -27,6 +27,7 @@ import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.core.server.QueueCreator;
import org.apache.activemq.artemis.core.server.RoutingContext;
import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.core.transaction.Transaction;
/**
@@ -42,6 +43,12 @@ import org.apache.activemq.artemis.core.transaction.Transaction;
*/
public interface PostOffice extends ActiveMQComponent {
+ AddressInfo addAddressInfo(AddressInfo addressInfo);
+
+ AddressInfo removeAddressInfo(SimpleString address);
+
+ AddressInfo getAddressInfo(SimpleString address);
+
void addBinding(Binding binding) throws Exception;
Binding removeBinding(SimpleString uniqueName, Transaction tx, boolean deleteData) throws Exception;
@@ -113,4 +120,5 @@ public interface PostOffice extends ActiveMQComponent {
Set<SimpleString> getAddresses();
+
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/54ad2bc7/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
index cc06603..9b7ed0c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
@@ -69,6 +69,7 @@ import org.apache.activemq.artemis.core.server.RouteContextList;
import org.apache.activemq.artemis.core.server.RoutingContext;
import org.apache.activemq.artemis.core.server.ServerMessage;
import org.apache.activemq.artemis.core.server.group.GroupingHandler;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.core.server.impl.RoutingContextImpl;
import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl;
import org.apache.activemq.artemis.core.server.management.ManagementService;
@@ -418,6 +419,21 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
// PostOffice implementation -----------------------------------------------
+ @Override
+ public AddressInfo addAddressInfo(AddressInfo addressInfo) {
+ return addressManager.addAddressInfo(addressInfo);
+ }
+
+ @Override
+ public AddressInfo removeAddressInfo(SimpleString address) {
+ return addressManager.removeAddressInfo(address);
+ }
+
+ @Override
+ public AddressInfo getAddressInfo(SimpleString addressName) {
+ return addressManager.getAddressInfo(addressName);
+ }
+
// TODO - needs to be synchronized to prevent happening concurrently with activate()
// (and possible removeBinding and other methods)
// Otherwise can have situation where createQueue comes in before failover, then failover occurs
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/54ad2bc7/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
index 9f26b0b..2994f9e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
@@ -30,6 +30,7 @@ import org.apache.activemq.artemis.core.postoffice.Binding;
import org.apache.activemq.artemis.core.postoffice.Bindings;
import org.apache.activemq.artemis.core.postoffice.BindingsFactory;
import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.core.transaction.Transaction;
import org.jboss.logging.Logger;
@@ -40,6 +41,8 @@ public class SimpleAddressManager implements AddressManager {
private static final Logger logger = Logger.getLogger(Page.class);
+ private final ConcurrentMap<SimpleString, AddressInfo> addressInfoMap = new ConcurrentHashMap<>();
+
/**
* HashMap<Address, Binding>
*/
@@ -178,4 +181,19 @@ public class SimpleAddressManager implements AddressManager {
return prevBindings != null;
}
+
+ @Override
+ public AddressInfo addAddressInfo(AddressInfo addressInfo) {
+ return addressInfoMap.putIfAbsent(addressInfo.getName(), addressInfo);
+ }
+
+ @Override
+ public AddressInfo removeAddressInfo(SimpleString address) {
+ return addressInfoMap.remove(address);
+ }
+
+ @Override
+ public AddressInfo getAddressInfo(SimpleString addressName) {
+ return addressInfoMap.get(addressName);
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/54ad2bc7/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
index a43fec8..fb5aee4 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
@@ -39,6 +39,7 @@ import org.apache.activemq.artemis.core.server.cluster.ClusterManager;
import org.apache.activemq.artemis.core.server.cluster.ha.HAPolicy;
import org.apache.activemq.artemis.core.server.group.GroupingHandler;
import org.apache.activemq.artemis.core.server.impl.Activation;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.core.server.impl.ConnectorsService;
import org.apache.activemq.artemis.core.server.management.ManagementService;
import org.apache.activemq.artemis.core.server.reload.ReloadManager;
@@ -377,10 +378,12 @@ public interface ActiveMQServer extends ActiveMQComponent {
void stop(boolean failoverOnServerShutdown) throws Exception;
+ AddressInfo getAddressInfo(SimpleString address);
+
/*
- * add a ProtocolManagerFactory to be used. Note if @see Configuration#isResolveProtocols is tur then this factory will
- * replace any factories with the same protocol
- * */
+ * add a ProtocolManagerFactory to be used. Note if @see Configuration#isResolveProtocols is tur then this factory will
+ * replace any factories with the same protocol
+ * */
void addProtocolManagerFactory(ProtocolManagerFactory factory);
/*
@@ -409,4 +412,8 @@ public interface ActiveMQServer extends ActiveMQComponent {
boolean addClientConnection(String clientId, boolean unique);
void removeClientConnection(String clientId);
+
+ AddressInfo addAddressInfo(AddressInfo addressInfo);
+
+ AddressInfo removeAddressInfo(SimpleString address);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/54ad2bc7/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index d2de964..208a317 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -55,6 +55,7 @@ import org.apache.activemq.artemis.core.client.impl.ClientSessionFactoryImpl;
import org.apache.activemq.artemis.core.config.BridgeConfiguration;
import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.config.ConfigurationUtils;
+import org.apache.activemq.artemis.core.config.CoreAddressConfiguration;
import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
import org.apache.activemq.artemis.core.config.DivertConfiguration;
import org.apache.activemq.artemis.core.config.StoreConfiguration;
@@ -2000,6 +2001,9 @@ public class ActiveMQServerImpl implements ActiveMQServer {
// Deploy the rest of the stuff
+ // Deploy predefined addresses
+ deployAddressesFromConfiguration();
+
// Deploy any predefined queues
deployQueuesFromConfiguration();
@@ -2078,11 +2082,26 @@ public class ActiveMQServerImpl implements ActiveMQServer {
}
}
- private void deployQueuesFromConfiguration() throws Exception {
- for (CoreQueueConfiguration config : configuration.getQueueConfigurations()) {
+ private void deployAddressesFromConfiguration() throws Exception {
+ for (CoreAddressConfiguration config : configuration.getAddressConfigurations()) {
+ AddressInfo info = new AddressInfo(SimpleString.toSimpleString(config.getName()));
+ info.setRoutingType(config.getRoutingType());
+ info.setDefaultDeleteOnNoConsumers(config.getDefaultDeleteOnNoConsumers());
+ info.setDefaultMaxConsumers(config.getDefaultMaxConsumers());
+
+ addAddressInfo(info);
+ deployQueuesFromListCoreQueueConfiguration(config.getQueueConfigurations());
+ }
+ }
+
+ private void deployQueuesFromListCoreQueueConfiguration(List<CoreQueueConfiguration> queues) throws Exception {
+ for (CoreQueueConfiguration config : queues) {
deployQueue(SimpleString.toSimpleString(config.getAddress()), SimpleString.toSimpleString(config.getName()), SimpleString.toSimpleString(config.getFilterString()), config.isDurable(), false);
}
}
+ private void deployQueuesFromConfiguration() throws Exception {
+ deployQueuesFromListCoreQueueConfiguration(configuration.getQueueConfigurations());
+ }
private void checkForPotentialOOMEInAddressConfiguration() {
long totalMaxSizeBytes = 0;
@@ -2173,7 +2192,22 @@ public class ActiveMQServerImpl implements ActiveMQServer {
}
}
- private Queue createQueue(final SimpleString address,
+ @Override
+ public AddressInfo addAddressInfo(AddressInfo addressInfo) {
+ return postOffice.addAddressInfo(addressInfo);
+ }
+
+ @Override
+ public AddressInfo removeAddressInfo(SimpleString address) {
+ return postOffice.removeAddressInfo(address);
+ }
+
+ @Override
+ public AddressInfo getAddressInfo(SimpleString address) {
+ return postOffice.removeAddressInfo(address);
+ }
+
+ private Queue createQueue(final SimpleString addressName,
final SimpleString queueName,
final SimpleString filterString,
final SimpleString user,
@@ -2182,6 +2216,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
final boolean ignoreIfExists,
final boolean transientQueue,
final boolean autoCreated) throws Exception {
+
final QueueBinding binding = (QueueBinding) postOffice.getBinding(queueName);
if (binding != null) {
if (ignoreIfExists) {
@@ -2197,14 +2232,16 @@ public class ActiveMQServerImpl implements ActiveMQServer {
final long queueID = storageManager.generateID();
final QueueConfig.Builder queueConfigBuilder;
- if (address == null) {
+ if (addressName == null) {
queueConfigBuilder = QueueConfig.builderWith(queueID, queueName);
} else {
- queueConfigBuilder = QueueConfig.builderWith(queueID, queueName, address);
-
+ queueConfigBuilder = QueueConfig.builderWith(queueID, queueName, addressName);
}
final QueueConfig queueConfig = queueConfigBuilder.filter(filter).pagingManager(pagingManager).user(user).durable(durable).temporary(temporary).autoCreated(autoCreated).build();
final Queue queue = queueFactory.createQueueWith(queueConfig);
+
+ addAddressInfo(new AddressInfo(queue.getAddress()));
+
if (transientQueue) {
queue.setConsumersRefCount(new TransientQueueManagerImpl(this, queue.getName()));
} else if (queue.isAutoCreated()) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/54ad2bc7/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
new file mode 100644
index 0000000..03c3fa0
--- /dev/null
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.core.server.impl;
+
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+import org.apache.activemq.artemis.api.core.SimpleString;
+
+public class AddressInfo {
+
+ public enum RoutingType {
+ MULTICAST, ANYCAST
+ }
+
+ private final SimpleString name;
+
+ private RoutingType routingType = RoutingType.MULTICAST;
+
+ private boolean defaultDeleteOnNoConsumers;
+
+ private int defaultMaxConsumers;
+
+ public AddressInfo(SimpleString name) {
+ this.name = name;
+ }
+
+ public RoutingType getRoutingType() {
+ return routingType;
+ }
+
+ public void setRoutingType(RoutingType routingType) {
+ this.routingType = routingType;
+ }
+
+ public boolean isDefaultDeleteOnNoConsumers() {
+ return defaultDeleteOnNoConsumers;
+ }
+
+ public void setDefaultDeleteOnNoConsumers(boolean defaultDeleteOnNoConsumers) {
+ this.defaultDeleteOnNoConsumers = defaultDeleteOnNoConsumers;
+ }
+
+ public int getDefaultMaxConsumers() {
+ return defaultMaxConsumers;
+ }
+
+ public void setDefaultMaxConsumers(int defaultMaxConsumers) {
+ this.defaultMaxConsumers = defaultMaxConsumers;
+ }
+
+ public SimpleString getName() {
+ return name;
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/54ad2bc7/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
index d004a22..ce924c0 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
@@ -46,13 +46,14 @@ import org.apache.activemq.artemis.core.security.Role;
import org.apache.activemq.artemis.core.server.JournalType;
import org.apache.activemq.artemis.core.server.SecuritySettingPlugin;
import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.core.server.impl.LegacyLDAPSecuritySettingPlugin;
import org.apache.activemq.artemis.core.settings.impl.SlowConsumerPolicy;
import org.junit.Assert;
import org.junit.Test;
-import static org.apache.activemq.artemis.core.config.CoreAddressConfiguration.RoutingType.ANYCAST;
-import static org.apache.activemq.artemis.core.config.CoreAddressConfiguration.RoutingType.MULTICAST;
+import static org.apache.activemq.artemis.core.server.impl.AddressInfo.RoutingType.ANYCAST;
+import static org.apache.activemq.artemis.core.server.impl.AddressInfo.RoutingType.MULTICAST;
public class FileConfigurationTest extends ConfigurationImplTest {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/54ad2bc7/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
new file mode 100644
index 0000000..43d6071
--- /dev/null
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AddressingTest.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.tests.integration.addressing;
+
+public class AddressingTest {
+
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/54ad2bc7/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
index 6f23e34..9424fc3 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/fakes/FakePostOffice.java
@@ -33,6 +33,7 @@ import org.apache.activemq.artemis.core.server.Queue;
import org.apache.activemq.artemis.core.server.QueueCreator;
import org.apache.activemq.artemis.core.server.RoutingContext;
import org.apache.activemq.artemis.core.server.ServerMessage;
+import org.apache.activemq.artemis.core.server.impl.AddressInfo;
import org.apache.activemq.artemis.core.server.impl.MessageReferenceImpl;
import org.apache.activemq.artemis.core.transaction.Transaction;
@@ -60,6 +61,22 @@ public class FakePostOffice implements PostOffice {
}
@Override
+ public AddressInfo addAddressInfo(AddressInfo addressInfo) {
+ return null;
+ }
+
+
+ @Override
+ public AddressInfo removeAddressInfo(SimpleString address) {
+ return null;
+ }
+
+ @Override
+ public AddressInfo getAddressInfo(SimpleString addressName) {
+ return null;
+ }
+
+ @Override
public void addBinding(final Binding binding) throws Exception {
}
[12/34] activemq-artemis git commit: This closes #870
Posted by ma...@apache.org.
This closes #870
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/51fa8406
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/51fa8406
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/51fa8406
Branch: refs/heads/ARTEMIS-780
Commit: 51fa840617d938964edd1b78c90a9980b5737385
Parents: d505f5c ebc2bbc
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Oct 28 16:31:41 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Oct 28 16:31:41 2016 -0400
----------------------------------------------------------------------
docs/user-manual/en/configuring-transports.md | 1 -
docs/user-manual/en/perf-tuning.md | 10 ----------
docs/user-manual/en/thread-pooling.md | 22 +---------------------
3 files changed, 1 insertion(+), 32 deletions(-)
----------------------------------------------------------------------
[21/34] activemq-artemis git commit: Fix formatting
Posted by ma...@apache.org.
Fix formatting
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/853c5a41
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/853c5a41
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/853c5a41
Branch: refs/heads/ARTEMIS-780
Commit: 853c5a419499cc01f7488cb7a614f6947f378531
Parents: 43db287
Author: jbertram <jb...@apache.com>
Authored: Fri Oct 21 11:25:07 2016 -0500
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Nov 1 10:20:52 2016 +0000
----------------------------------------------------------------------
.../core/persistence/impl/RoutingType.java | 43 --------------------
.../config/XMLConfigurationMigration.java | 26 ++++--------
2 files changed, 8 insertions(+), 61 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/853c5a41/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/RoutingType.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/RoutingType.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/RoutingType.java
deleted file mode 100644
index 329d8e9..0000000
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/RoutingType.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.artemis.core.persistence.impl;
-
-public enum RoutingType {
- Multicast, Anycast;
-
- public byte getType() {
- switch (this) {
- case Multicast:
- return 0;
- case Anycast:
- return 1;
- default:
- return -1;
- }
- }
-
- public static RoutingType getType(byte type) {
- switch (type) {
- case 0:
- return Multicast;
- case 1:
- return Anycast;
- default:
- return null;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/853c5a41/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigration.java
----------------------------------------------------------------------
diff --git a/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigration.java b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigration.java
index 56833ea..90be53c 100644
--- a/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigration.java
+++ b/artemis-tools/src/main/java/org/apache/activemq/artemis/tools/migrate/config/XMLConfigurationMigration.java
@@ -50,19 +50,16 @@ public class XMLConfigurationMigration {
if (args.length == 0) {
System.err.println("Invalid args");
printUsage();
- }
- else {
+ } else {
File input = new File(args[0]);
if (input.isDirectory()) {
System.out.println("Scanning directory: " + input.getAbsolutePath());
recursiveTransform(input);
- }
- else {
+ } else {
if (args.length != 2) {
System.err.println("Invalid args");
printUsage();
- }
- else {
+ } else {
transform(input, new File(args[1]));
}
}
@@ -70,13 +67,11 @@ public class XMLConfigurationMigration {
}
private static void recursiveTransform(File root) throws Exception {
- for ( File file : root.listFiles())
- {
+ for (File file : root.listFiles()) {
scanAndTransform(file);
}
}
-
public static void scanAndTransform(File pFile) throws Exception {
try {
for (File f : pFile.listFiles()) {
@@ -93,14 +88,12 @@ public class XMLConfigurationMigration {
file.renameTo(r);
}
}
- }
- catch (Exception e) {
+ } catch (Exception e) {
//continue
}
}
}
- }
- catch (NullPointerException e) {
+ } catch (NullPointerException e) {
System.out.println(pFile.getAbsoluteFile());
}
}
@@ -125,9 +118,7 @@ public class XMLConfigurationMigration {
migration.write(output, properties);
return true;
}
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
System.err.println("Error tranforming document");
e.printStackTrace();
}
@@ -174,8 +165,7 @@ public class XMLConfigurationMigration {
if (addresses.containsKey(addressName)) {
address = addresses.get(addressName);
- }
- else {
+ } else {
address = new Address();
address.setName(addressName);
addresses.put(addressName, address);
[04/34] activemq-artemis git commit: ARTEMIS-820 AMQP: Add frame
inspection capability to the test client.
Posted by ma...@apache.org.
ARTEMIS-820 AMQP: Add frame inspection capability to the test client.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/490bd31c
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/490bd31c
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/490bd31c
Branch: refs/heads/ARTEMIS-780
Commit: 490bd31c4b07df1e3d8b9636afdab9e9f89e81d6
Parents: 1ac69fd
Author: Francesco Nigro <ni...@gmail.com>
Authored: Tue Oct 25 17:15:43 2016 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Tue Oct 25 14:15:28 2016 -0400
----------------------------------------------------------------------
.../transport/amqp/client/AmqpConnection.java | 31 ++++-
.../amqp/client/AmqpFrameValidator.java | 103 ++++++++++++++++
.../amqp/client/AmqpProtocolTracer.java | 116 +++++++++++++++++++
.../transport/amqp/client/AmqpSession.java | 57 ++++++++-
.../amqp/AmqpDurableReceiverTest.java | 26 +++++
5 files changed, 328 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/490bd31c/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java
----------------------------------------------------------------------
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java
index 53fb9f5..01c60bc 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java
@@ -50,6 +50,7 @@ import org.apache.qpid.proton.engine.Event.Type;
import org.apache.qpid.proton.engine.Sasl;
import org.apache.qpid.proton.engine.Transport;
import org.apache.qpid.proton.engine.impl.CollectorImpl;
+import org.apache.qpid.proton.engine.impl.TransportImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -87,6 +88,8 @@ public class AmqpConnection extends AmqpAbstractResource<Connection> implements
private List<Symbol> offeredCapabilities = Collections.emptyList();
private Map<Symbol, Object> offeredProperties = Collections.emptyMap();
+ private volatile AmqpFrameValidator sentFrameInspector;
+ private volatile AmqpFrameValidator receivedFrameInspector;
private AmqpConnectionListener listener;
private SaslAuthenticator authenticator;
private String mechanismRestriction;
@@ -100,6 +103,7 @@ public class AmqpConnection extends AmqpAbstractResource<Connection> implements
private long connectTimeout = DEFAULT_CONNECT_TIMEOUT;
private long closeTimeout = DEFAULT_CLOSE_TIMEOUT;
private long drainTimeout = DEFAULT_DRAIN_TIMEOUT;
+ private boolean trace;
public AmqpConnection(org.apache.activemq.transport.amqp.client.transport.NettyTransport transport,
String username,
@@ -155,6 +159,7 @@ public class AmqpConnection extends AmqpAbstractResource<Connection> implements
sasl.client();
}
authenticator = new SaslAuthenticator(sasl, username, password, authzid, mechanismRestriction);
+ ((TransportImpl) protonTransport).setProtocolTracer(new AmqpProtocolTracer(AmqpConnection.this));
open(future);
pumpToProtonTransport(future);
@@ -439,6 +444,30 @@ public class AmqpConnection extends AmqpAbstractResource<Connection> implements
return mechanismRestriction;
}
+ public boolean isTraceFrames() {
+ return trace;
+ }
+
+ public void setTraceFrames(boolean trace) {
+ this.trace = trace;
+ }
+
+ public AmqpFrameValidator getSentFrameInspector() {
+ return sentFrameInspector;
+ }
+
+ public void setSentFrameInspector(AmqpFrameValidator amqpFrameInspector) {
+ this.sentFrameInspector = amqpFrameInspector;
+ }
+
+ public AmqpFrameValidator getReceivedFrameInspector() {
+ return receivedFrameInspector;
+ }
+
+ public void setReceivedFrameInspector(AmqpFrameValidator amqpFrameInspector) {
+ this.receivedFrameInspector = amqpFrameInspector;
+ }
+
//----- Internal getters used from the child AmqpResource classes --------//
ScheduledExecutorService getScheduler() {
@@ -706,4 +735,4 @@ public class AmqpConnection extends AmqpAbstractResource<Connection> implements
public String toString() {
return "AmqpConnection { " + connectionId + " }";
}
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/490bd31c/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpFrameValidator.java
----------------------------------------------------------------------
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpFrameValidator.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpFrameValidator.java
new file mode 100644
index 0000000..4796110
--- /dev/null
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpFrameValidator.java
@@ -0,0 +1,103 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.transport.amqp.client;
+
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.transport.Attach;
+import org.apache.qpid.proton.amqp.transport.Begin;
+import org.apache.qpid.proton.amqp.transport.Close;
+import org.apache.qpid.proton.amqp.transport.Detach;
+import org.apache.qpid.proton.amqp.transport.Disposition;
+import org.apache.qpid.proton.amqp.transport.End;
+import org.apache.qpid.proton.amqp.transport.Flow;
+import org.apache.qpid.proton.amqp.transport.Open;
+import org.apache.qpid.proton.amqp.transport.Transfer;
+
+/**
+ * Abstract base for a validation hook that is used in tests to check
+ * the state of a remote resource after a variety of lifecycle events.
+ */
+public class AmqpFrameValidator {
+
+ private boolean valid = true;
+ private String errorMessage;
+
+ public void inspectOpen(Open open, Binary encoded) {
+
+ }
+
+ public void inspectBegin(Begin begin, Binary encoded) {
+
+ }
+
+ public void inspectAttach(Attach attach, Binary encoded) {
+
+ }
+
+ public void inspectFlow(Flow flow, Binary encoded) {
+
+ }
+
+ public void inspectTransfer(Transfer transfer, Binary encoded) {
+
+ }
+
+ public void inspectDisposition(Disposition disposition, Binary encoded) {
+
+ }
+
+ public void inspectDetach(Detach detach, Binary encoded) {
+
+ }
+
+ public void inspectEnd(End end, Binary encoded) {
+
+ }
+
+ public void inspectClose(Close close, Binary encoded) {
+
+ }
+
+ public boolean isValid() {
+ return valid;
+ }
+
+ protected void setValid(boolean valid) {
+ this.valid = valid;
+ }
+
+ public String getErrorMessage() {
+ return errorMessage;
+ }
+
+ protected void setErrorMessage(String errorMessage) {
+ this.errorMessage = errorMessage;
+ }
+
+ protected void markAsInvalid(String errorMessage) {
+ if (valid) {
+ setValid(false);
+ setErrorMessage(errorMessage);
+ }
+ }
+
+ public void assertValid() {
+ if (!isValid()) {
+ throw new AssertionError(errorMessage);
+ }
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/490bd31c/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpProtocolTracer.java
----------------------------------------------------------------------
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpProtocolTracer.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpProtocolTracer.java
new file mode 100644
index 0000000..68fcd85
--- /dev/null
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpProtocolTracer.java
@@ -0,0 +1,116 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.transport.amqp.client;
+
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.transport.Attach;
+import org.apache.qpid.proton.amqp.transport.Begin;
+import org.apache.qpid.proton.amqp.transport.Close;
+import org.apache.qpid.proton.amqp.transport.Detach;
+import org.apache.qpid.proton.amqp.transport.Disposition;
+import org.apache.qpid.proton.amqp.transport.End;
+import org.apache.qpid.proton.amqp.transport.Flow;
+import org.apache.qpid.proton.amqp.transport.FrameBody.FrameBodyHandler;
+import org.apache.qpid.proton.amqp.transport.Open;
+import org.apache.qpid.proton.amqp.transport.Transfer;
+import org.apache.qpid.proton.engine.impl.ProtocolTracer;
+import org.apache.qpid.proton.framing.TransportFrame;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Tracer used to spy on AMQP traffic
+ */
+public class AmqpProtocolTracer implements ProtocolTracer, FrameBodyHandler<AmqpFrameValidator> {
+
+ private static final Logger TRACE_FRAMES = LoggerFactory.getLogger(AmqpProtocolTracer.class.getPackage().getName() + ".FRAMES");
+
+ private final AmqpConnection connection;
+
+ public AmqpProtocolTracer(AmqpConnection connection) {
+ this.connection = connection;
+ }
+
+ @Override
+ public void receivedFrame(TransportFrame transportFrame) {
+ if (connection.isTraceFrames()) {
+ TRACE_FRAMES.trace("{} | RECV: {}", connection.getRemoteURI(), transportFrame.getBody());
+ }
+
+ AmqpFrameValidator inspector = connection.getReceivedFrameInspector();
+ if (inspector != null) {
+ transportFrame.getBody().invoke(this, transportFrame.getPayload(), inspector);
+ }
+ }
+
+ @Override
+ public void sentFrame(TransportFrame transportFrame) {
+ if (connection.isTraceFrames()) {
+ TRACE_FRAMES.trace("{} | SENT: {}", connection.getRemoteURI(), transportFrame.getBody());
+ }
+
+ AmqpFrameValidator inspector = connection.getSentFrameInspector();
+ if (inspector != null) {
+ transportFrame.getBody().invoke(this, transportFrame.getPayload(), inspector);
+ }
+ }
+
+ @Override
+ public void handleOpen(Open open, Binary payload, AmqpFrameValidator context) {
+ context.inspectOpen(open, payload);
+ }
+
+ @Override
+ public void handleBegin(Begin begin, Binary payload, AmqpFrameValidator context) {
+ context.inspectBegin(begin, payload);
+ }
+
+ @Override
+ public void handleAttach(Attach attach, Binary payload, AmqpFrameValidator context) {
+ context.inspectAttach(attach, payload);
+ }
+
+ @Override
+ public void handleFlow(Flow flow, Binary payload, AmqpFrameValidator context) {
+ context.inspectFlow(flow, payload);
+ }
+
+ @Override
+ public void handleTransfer(Transfer transfer, Binary payload, AmqpFrameValidator context) {
+ context.inspectTransfer(transfer, payload);
+ }
+
+ @Override
+ public void handleDisposition(Disposition disposition, Binary payload, AmqpFrameValidator context) {
+ context.inspectDisposition(disposition, payload);
+ }
+
+ @Override
+ public void handleDetach(Detach detach, Binary payload, AmqpFrameValidator context) {
+ context.inspectDetach(detach, payload);
+ }
+
+ @Override
+ public void handleEnd(End end, Binary payload, AmqpFrameValidator context) {
+ context.inspectEnd(end, payload);
+ }
+
+ @Override
+ public void handleClose(Close close, Binary payload, AmqpFrameValidator context) {
+ context.inspectClose(close, payload);
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/490bd31c/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSession.java
----------------------------------------------------------------------
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSession.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSession.java
index 936d4ef..fc3fdf7 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSession.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSession.java
@@ -6,7 +6,7 @@
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,7 +16,9 @@
*/
package org.apache.activemq.transport.amqp.client;
+import java.io.IOException;
import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.activemq.transport.amqp.client.util.AsyncResult;
@@ -38,6 +40,7 @@ public class AmqpSession extends AmqpAbstractResource<Session> {
private final AmqpConnection connection;
private final String sessionId;
private final AmqpTransactionContext txContext;
+ private final AtomicBoolean closed = new AtomicBoolean();
/**
* Create a new session instance.
@@ -52,6 +55,40 @@ public class AmqpSession extends AmqpAbstractResource<Session> {
}
/**
+ * Close the receiver, a closed receiver will throw exceptions if any further send
+ * calls are made.
+ *
+ * @throws IOException if an error occurs while closing the receiver.
+ */
+ public void close() throws IOException {
+ if (closed.compareAndSet(false, true)) {
+ final ClientFuture request = new ClientFuture();
+ getScheduler().execute(new Runnable() {
+
+ @Override
+ public void run() {
+ checkClosed();
+ close(request);
+ pumpToProtonTransport(request);
+ }
+ });
+
+ request.sync();
+ }
+ }
+
+ /**
+ * Create an anonymous sender.
+ *
+ * @return a newly created sender that is ready for use.
+ *
+ * @throws Exception if an error occurs while creating the sender.
+ */
+ public AmqpSender createSender() throws Exception {
+ return createSender(null, false);
+ }
+
+ /**
* Create a sender instance using the given address
*
* @param address the address to which the sender will produce its messages.
@@ -101,9 +138,21 @@ public class AmqpSession extends AmqpAbstractResource<Session> {
* @throws Exception if an error occurs while creating the receiver.
*/
public AmqpSender createSender(Target target) throws Exception {
+ return createSender(target, getNextSenderId());
+ }
+
+ /**
+ * Create a sender instance using the given Target
+ *
+ * @param target the caller created and configured Traget used to create the sender link.
+ * @param senderId the sender ID to assign to the newly created Sender.
+ * @return a newly created sender that is ready for use.
+ * @throws Exception if an error occurs while creating the receiver.
+ */
+ public AmqpSender createSender(Target target, String senderId) throws Exception {
checkClosed();
- final AmqpSender sender = new AmqpSender(AmqpSession.this, target, getNextSenderId());
+ final AmqpSender sender = new AmqpSender(AmqpSession.this, target, senderId);
final ClientFuture request = new ClientFuture();
connection.getScheduler().execute(new Runnable() {
@@ -222,7 +271,7 @@ public class AmqpSession extends AmqpAbstractResource<Session> {
checkClosed();
final ClientFuture request = new ClientFuture();
- final AmqpReceiver receiver = new AmqpReceiver(AmqpSession.this, source, receiverId);
+ final AmqpReceiver receiver = new AmqpReceiver(AmqpSession.this, source, getNextReceiverId());
connection.getScheduler().execute(new Runnable() {
@@ -465,4 +514,4 @@ public class AmqpSession extends AmqpAbstractResource<Session> {
throw new IllegalStateException("Session is already closed");
}
}
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/490bd31c/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDurableReceiverTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDurableReceiverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDurableReceiverTest.java
index e0c6b6c..86a35a2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDurableReceiverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpDurableReceiverTest.java
@@ -26,14 +26,17 @@ import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.postoffice.Binding;
import org.apache.activemq.transport.amqp.client.AmqpClient;
import org.apache.activemq.transport.amqp.client.AmqpConnection;
+import org.apache.activemq.transport.amqp.client.AmqpFrameValidator;
import org.apache.activemq.transport.amqp.client.AmqpMessage;
import org.apache.activemq.transport.amqp.client.AmqpReceiver;
import org.apache.activemq.transport.amqp.client.AmqpSender;
import org.apache.activemq.transport.amqp.client.AmqpSession;
+import org.apache.qpid.proton.amqp.Binary;
import org.apache.qpid.proton.amqp.DescribedType;
import org.apache.qpid.proton.amqp.messaging.Source;
import org.apache.qpid.proton.amqp.messaging.TerminusDurability;
import org.apache.qpid.proton.amqp.messaging.TerminusExpiryPolicy;
+import org.apache.qpid.proton.amqp.transport.Detach;
import org.apache.qpid.proton.engine.Receiver;
import org.junit.Test;
import org.slf4j.Logger;
@@ -90,6 +93,26 @@ public class AmqpDurableReceiverTest extends AmqpClientTestSupport {
connection.setContainerId(getContainerID());
connection.connect();
+ connection.setReceivedFrameInspector(new AmqpFrameValidator() {
+
+ @Override
+ public void inspectDetach(Detach detach, Binary encoded) {
+ if (detach.getClosed()) {
+ markAsInvalid("Remote should have detached but closed instead.");
+ }
+ }
+ });
+
+ connection.setSentFrameInspector(new AmqpFrameValidator() {
+
+ @Override
+ public void inspectDetach(Detach detach, Binary encoded) {
+ if (detach.getClosed()) {
+ markAsInvalid("Client should have detached but closed instead.");
+ }
+ }
+ });
+
AmqpSession session = connection.createSession();
AmqpReceiver receiver = session.createDurableReceiver(getTopicName(), getSubscriptionName());
@@ -99,6 +122,9 @@ public class AmqpDurableReceiverTest extends AmqpClientTestSupport {
assertEquals(getTopicName(), lookupSubscription());
+ connection.getSentFrameInspector().assertValid();
+ connection.getReceivedFrameInspector().assertValid();
+
connection.close();
}
[13/34] activemq-artemis git commit: ARTEMIS-830 Remove cyclic
dependencies
Posted by ma...@apache.org.
ARTEMIS-830 Remove cyclic dependencies
Removes cyclic dependencies between classes and packages in the artemis-jdbc-store projetct by moving classes and methods to other locations and reducing the visibility of classes, fields and methods. Solving cyclic dependencies is important to keep the codebase maintainable. Scenarios where "everything uses everything" should be avoided.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4b5cbb86
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4b5cbb86
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4b5cbb86
Branch: refs/heads/ARTEMIS-780
Commit: 4b5cbb86aafef0b3ab969cf38bd17620efc1e7f3
Parents: e49eda9
Author: Bennet Schulz <ma...@bennet-schulz.de>
Authored: Fri Oct 28 13:46:00 2016 +0200
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Oct 28 16:32:04 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/jdbc/store/JDBCUtils.java | 143 ----------------
.../jdbc/store/drivers/AbstractJDBCDriver.java | 76 ++++++---
.../artemis/jdbc/store/drivers/JDBCUtils.java | 66 ++++++++
.../PostgresSequentialSequentialFileDriver.java | 164 -------------------
.../artemis/jdbc/store/file/JDBCFileUtils.java | 48 ++++++
.../jdbc/store/file/JDBCSequentialFile.java | 20 +--
.../store/file/JDBCSequentialFileFactory.java | 10 +-
.../file/JDBCSequentialFileFactoryDriver.java | 18 +-
.../PostgresSequentialSequentialFileDriver.java | 162 ++++++++++++++++++
.../jdbc/store/journal/JDBCJournalImpl.java | 23 ++-
.../journal/JDBCJournalLoaderCallback.java | 12 +-
.../journal/JDBCJournalReaderCallback.java | 6 +-
.../jdbc/store/journal/JDBCJournalRecord.java | 100 ++++-------
.../jdbc/store/journal/JDBCJournalSync.java | 45 -----
.../jdbc/store/journal/TransactionHolder.java | 4 +-
.../file/JDBCSequentialFileFactoryTest.java | 10 +-
.../artemis/osgi/DataSourceTracker.java | 2 +-
.../impl/journal/JDBCJournalStorageManager.java | 4 +-
.../artemis/tests/util/ActiveMQTestBase.java | 28 +++-
19 files changed, 444 insertions(+), 497 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b5cbb86/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/JDBCUtils.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/JDBCUtils.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/JDBCUtils.java
deleted file mode 100644
index a0eba57..0000000
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/JDBCUtils.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.artemis.jdbc.store;
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.Driver;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import org.apache.activemq.artemis.jdbc.store.drivers.derby.DerbySQLProvider;
-import org.apache.activemq.artemis.jdbc.store.drivers.mysql.MySQLSQLProvider;
-import org.apache.activemq.artemis.jdbc.store.drivers.postgres.PostgresSQLProvider;
-import org.apache.activemq.artemis.jdbc.store.drivers.postgres.PostgresSequentialSequentialFileDriver;
-import org.apache.activemq.artemis.jdbc.store.file.JDBCSequentialFileFactoryDriver;
-import org.apache.activemq.artemis.jdbc.store.sql.GenericSQLProvider;
-import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
-import org.jboss.logging.Logger;
-
-public class JDBCUtils {
-
- private static final Logger logger = Logger.getLogger(JDBCUtils.class);
-
- public static Driver getDriver(String className) throws Exception {
-
- try {
- Driver driver = (Driver) Class.forName(className).newInstance();
-
- // Shutdown the derby if using the derby embedded driver.
- if (className.equals("org.apache.derby.jdbc.EmbeddedDriver")) {
- Runtime.getRuntime().addShutdownHook(new Thread() {
- @Override
- public void run() {
- try {
- DriverManager.getConnection("jdbc:derby:;shutdown=true");
- } catch (Exception e) {
- }
- }
- });
- }
- return driver;
- } catch (ClassNotFoundException cnfe) {
- throw new RuntimeException("Could not find class: " + className);
- } catch (Exception e) {
- throw new RuntimeException("Unable to instantiate driver class: ", e);
- }
- }
-
- public static void createTableIfNotExists(Connection connection, String tableName, String sql) throws SQLException {
- logger.tracef("Validating if table %s didn't exist before creating", tableName);
- try {
- connection.setAutoCommit(false);
- try (ResultSet rs = connection.getMetaData().getTables(null, null, tableName, null)) {
- if (rs != null && !rs.next()) {
- logger.tracef("Table %s did not exist, creating it with SQL=%s", tableName, sql);
- try (Statement statement = connection.createStatement()) {
- statement.executeUpdate(sql);
- }
- }
- }
- connection.commit();
- } catch (SQLException e) {
- connection.rollback();
- }
-
- }
-
- public static SQLProvider.Factory getSQLProviderFactory(String url) {
- SQLProvider.Factory factory;
- if (url.contains("derby")) {
- logger.tracef("getSQLProvider Returning Derby SQL provider for url::%s", url);
- factory = new DerbySQLProvider.Factory();
- } else if (url.contains("postgres")) {
- logger.tracef("getSQLProvider Returning postgres SQL provider for url::%s", url);
- factory = new PostgresSQLProvider.Factory();
- } else if (url.contains("mysql")) {
- logger.tracef("getSQLProvider Returning mysql SQL provider for url::%s", url);
- factory = new MySQLSQLProvider.Factory();
- } else {
- logger.tracef("getSQLProvider Returning generic SQL provider for url::%s", url);
- factory = new GenericSQLProvider.Factory();
- }
- return factory;
- }
-
- public static SQLProvider getSQLProvider(String driverClass, String tableName) {
- SQLProvider.Factory factory;
- if (driverClass.contains("derby")) {
- logger.tracef("getSQLProvider Returning Derby SQL provider for driver::%s, tableName::%s", driverClass, tableName);
- factory = new DerbySQLProvider.Factory();
- } else if (driverClass.contains("postgres")) {
- logger.tracef("getSQLProvider Returning postgres SQL provider for driver::%s, tableName::%s", driverClass, tableName);
- factory = new PostgresSQLProvider.Factory();
- } else if (driverClass.contains("mysql")) {
- logger.tracef("getSQLProvider Returning mysql SQL provider for driver::%s, tableName::%s", driverClass, tableName);
- factory = new MySQLSQLProvider.Factory();
- } else {
- logger.tracef("getSQLProvider Returning generic SQL provider for driver::%s, tableName::%s", driverClass, tableName);
- factory = new GenericSQLProvider.Factory();
- }
- return factory.create(tableName);
- }
-
- public static JDBCSequentialFileFactoryDriver getDBFileDriver(String driverClass,
- String jdbcConnectionUrl,
- SQLProvider provider) throws SQLException {
- JDBCSequentialFileFactoryDriver dbDriver = new JDBCSequentialFileFactoryDriver();
- dbDriver.setSqlProvider(provider);
- dbDriver.setJdbcConnectionUrl(jdbcConnectionUrl);
- dbDriver.setJdbcDriverClass(driverClass);
- return dbDriver;
- }
-
- public static JDBCSequentialFileFactoryDriver getDBFileDriver(DataSource dataSource,
- String tableName,
- SQLProvider provider) throws SQLException {
- JDBCSequentialFileFactoryDriver dbDriver;
- if (provider instanceof PostgresSQLProvider) {
- dbDriver = new PostgresSequentialSequentialFileDriver();
- dbDriver.setDataSource(dataSource);
- } else {
- dbDriver = new JDBCSequentialFileFactoryDriver(tableName, dataSource, provider);
- }
- return dbDriver;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b5cbb86/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/AbstractJDBCDriver.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/AbstractJDBCDriver.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/AbstractJDBCDriver.java
index b277523..79cc1e5 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/AbstractJDBCDriver.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/AbstractJDBCDriver.java
@@ -19,30 +19,32 @@ package org.apache.activemq.artemis.jdbc.store.drivers;
import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.Driver;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Properties;
-import org.apache.activemq.artemis.jdbc.store.JDBCUtils;
import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
+import org.jboss.logging.Logger;
/**
* Class to hold common database functionality such as drivers and connections
*/
public abstract class AbstractJDBCDriver {
+ private static final Logger logger = Logger.getLogger(AbstractJDBCDriver.class);
+
protected Connection connection;
protected SQLProvider sqlProvider;
- protected String jdbcConnectionUrl;
-
- protected String jdbcDriverClass;
+ private String jdbcConnectionUrl;
- protected Driver dbDriver;
+ private String jdbcDriverClass;
- protected DataSource dataSource;
+ private DataSource dataSource;
public AbstractJDBCDriver() {
}
@@ -75,7 +77,7 @@ public abstract class AbstractJDBCDriver {
protected abstract void createSchema() throws SQLException;
protected void createTable(String schemaSql) throws SQLException {
- JDBCUtils.createTableIfNotExists(connection, sqlProvider.getTableName(), schemaSql);
+ createTableIfNotExists(connection, sqlProvider.getTableName(), schemaSql);
}
protected void connect() throws Exception {
@@ -83,7 +85,7 @@ public abstract class AbstractJDBCDriver {
connection = dataSource.getConnection();
} else {
try {
- dbDriver = JDBCUtils.getDriver(jdbcDriverClass);
+ Driver dbDriver = getDriver(jdbcDriverClass);
connection = dbDriver.connect(jdbcConnectionUrl, new Properties());
} catch (SQLException e) {
ActiveMQJournalLogger.LOGGER.error("Unable to connect to database using URL: " + jdbcConnectionUrl);
@@ -105,6 +107,48 @@ public abstract class AbstractJDBCDriver {
}
}
+ private static void createTableIfNotExists(Connection connection, String tableName, String sql) throws SQLException {
+ logger.tracef("Validating if table %s didn't exist before creating", tableName);
+ try {
+ connection.setAutoCommit(false);
+ try (ResultSet rs = connection.getMetaData().getTables(null, null, tableName, null)) {
+ if (rs != null && !rs.next()) {
+ logger.tracef("Table %s did not exist, creating it with SQL=%s", tableName, sql);
+ try (Statement statement = connection.createStatement()) {
+ statement.executeUpdate(sql);
+ }
+ }
+ }
+ connection.commit();
+ } catch (SQLException e) {
+ connection.rollback();
+ }
+ }
+
+ private Driver getDriver(String className) throws Exception {
+ try {
+ Driver driver = (Driver) Class.forName(className).newInstance();
+
+ // Shutdown the derby if using the derby embedded driver.
+ if (className.equals("org.apache.derby.jdbc.EmbeddedDriver")) {
+ Runtime.getRuntime().addShutdownHook(new Thread() {
+ @Override
+ public void run() {
+ try {
+ DriverManager.getConnection("jdbc:derby:;shutdown=true");
+ } catch (Exception e) {
+ }
+ }
+ });
+ }
+ return driver;
+ } catch (ClassNotFoundException cnfe) {
+ throw new RuntimeException("Could not find class: " + className);
+ } catch (Exception e) {
+ throw new RuntimeException("Unable to instantiate driver class: ", e);
+ }
+ }
+
public Connection getConnection() {
return connection;
}
@@ -113,34 +157,18 @@ public abstract class AbstractJDBCDriver {
this.connection = connection;
}
- public SQLProvider getSqlProvider() {
- return sqlProvider;
- }
-
public void setSqlProvider(SQLProvider sqlProvider) {
this.sqlProvider = sqlProvider;
}
- public String getJdbcConnectionUrl() {
- return jdbcConnectionUrl;
- }
-
public void setJdbcConnectionUrl(String jdbcConnectionUrl) {
this.jdbcConnectionUrl = jdbcConnectionUrl;
}
- public String getJdbcDriverClass() {
- return jdbcDriverClass;
- }
-
public void setJdbcDriverClass(String jdbcDriverClass) {
this.jdbcDriverClass = jdbcDriverClass;
}
- public DataSource getDataSource() {
- return dataSource;
- }
-
public void setDataSource(DataSource dataSource) {
this.dataSource = dataSource;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b5cbb86/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java
new file mode 100644
index 0000000..418fd43
--- /dev/null
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.jdbc.store.drivers;
+
+import org.apache.activemq.artemis.jdbc.store.drivers.derby.DerbySQLProvider;
+import org.apache.activemq.artemis.jdbc.store.drivers.mysql.MySQLSQLProvider;
+import org.apache.activemq.artemis.jdbc.store.drivers.postgres.PostgresSQLProvider;
+import org.apache.activemq.artemis.jdbc.store.sql.GenericSQLProvider;
+import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
+import org.jboss.logging.Logger;
+
+public class JDBCUtils {
+
+ private static final Logger logger = Logger.getLogger(JDBCUtils.class);
+
+ public static SQLProvider.Factory getSQLProviderFactory(String url) {
+ SQLProvider.Factory factory;
+ if (url.contains("derby")) {
+ logger.tracef("getSQLProvider Returning Derby SQL provider for url::%s", url);
+ factory = new DerbySQLProvider.Factory();
+ } else if (url.contains("postgres")) {
+ logger.tracef("getSQLProvider Returning postgres SQL provider for url::%s", url);
+ factory = new PostgresSQLProvider.Factory();
+ } else if (url.contains("mysql")) {
+ logger.tracef("getSQLProvider Returning mysql SQL provider for url::%s", url);
+ factory = new MySQLSQLProvider.Factory();
+ } else {
+ logger.tracef("getSQLProvider Returning generic SQL provider for url::%s", url);
+ factory = new GenericSQLProvider.Factory();
+ }
+ return factory;
+ }
+
+ public static SQLProvider getSQLProvider(String driverClass, String tableName) {
+ SQLProvider.Factory factory;
+ if (driverClass.contains("derby")) {
+ logger.tracef("getSQLProvider Returning Derby SQL provider for driver::%s, tableName::%s", driverClass, tableName);
+ factory = new DerbySQLProvider.Factory();
+ } else if (driverClass.contains("postgres")) {
+ logger.tracef("getSQLProvider Returning postgres SQL provider for driver::%s, tableName::%s", driverClass, tableName);
+ factory = new PostgresSQLProvider.Factory();
+ } else if (driverClass.contains("mysql")) {
+ logger.tracef("getSQLProvider Returning mysql SQL provider for driver::%s, tableName::%s", driverClass, tableName);
+ factory = new MySQLSQLProvider.Factory();
+ } else {
+ logger.tracef("getSQLProvider Returning generic SQL provider for driver::%s, tableName::%s", driverClass, tableName);
+ factory = new GenericSQLProvider.Factory();
+ }
+ return factory.create(tableName);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b5cbb86/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/postgres/PostgresSequentialSequentialFileDriver.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/postgres/PostgresSequentialSequentialFileDriver.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/postgres/PostgresSequentialSequentialFileDriver.java
deleted file mode 100644
index db74c05..0000000
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/postgres/PostgresSequentialSequentialFileDriver.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.artemis.jdbc.store.drivers.postgres;
-
-import java.nio.ByteBuffer;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-import org.apache.activemq.artemis.jdbc.store.file.JDBCSequentialFile;
-import org.apache.activemq.artemis.jdbc.store.file.JDBCSequentialFileFactoryDriver;
-import org.postgresql.PGConnection;
-import org.postgresql.largeobject.LargeObject;
-import org.postgresql.largeobject.LargeObjectManager;
-
-public class PostgresSequentialSequentialFileDriver extends JDBCSequentialFileFactoryDriver {
-
- private static final String POSTGRES_OID_KEY = "POSTGRES_OID_KEY";
-
- public PostgresSequentialSequentialFileDriver() throws SQLException {
- super();
- }
-
- @Override
- public synchronized void createFile(JDBCSequentialFile file) throws SQLException {
- try {
- connection.setAutoCommit(false);
-
- LargeObjectManager lobjManager = ((PGConnection) connection).getLargeObjectAPI();
- long oid = lobjManager.createLO();
-
- createFile.setString(1, file.getFileName());
- createFile.setString(2, file.getExtension());
- createFile.setLong(3, oid);
- createFile.executeUpdate();
-
- try (ResultSet keys = createFile.getGeneratedKeys()) {
- keys.next();
- file.setId(keys.getInt(1));
- }
- connection.commit();
- } catch (SQLException e) {
- connection.rollback();
- throw e;
- }
- }
-
- @Override
- public synchronized void loadFile(JDBCSequentialFile file) throws SQLException {
- connection.setAutoCommit(false);
- readLargeObject.setInt(1, file.getId());
-
- try (ResultSet rs = readLargeObject.executeQuery()) {
- if (rs.next()) {
- file.setWritePosition(getPostGresLargeObjectSize(file));
- }
- connection.commit();
- } catch (SQLException e) {
- connection.rollback();
- throw e;
- }
- }
-
- @Override
- public synchronized int writeToFile(JDBCSequentialFile file, byte[] data) throws SQLException {
- LargeObjectManager lobjManager = ((PGConnection) connection).getLargeObjectAPI();
- LargeObject largeObject = null;
-
- Long oid = getOID(file);
- try {
- connection.setAutoCommit(false);
- largeObject = lobjManager.open(oid, LargeObjectManager.WRITE);
- largeObject.seek(largeObject.size());
- largeObject.write(data);
- largeObject.close();
- connection.commit();
- } catch (Exception e) {
- connection.rollback();
- throw e;
- }
- return data.length;
- }
-
- @Override
- public synchronized int readFromFile(JDBCSequentialFile file, ByteBuffer bytes) throws SQLException {
- LargeObjectManager lobjManager = ((PGConnection) connection).getLargeObjectAPI();
- LargeObject largeObject = null;
- long oid = getOID(file);
- try {
- connection.setAutoCommit(false);
- largeObject = lobjManager.open(oid, LargeObjectManager.READ);
- int readLength = (int) calculateReadLength(largeObject.size(), bytes.remaining(), file.position());
-
- if (readLength > 0) {
- if (file.position() > 0)
- largeObject.seek((int) file.position());
- byte[] data = largeObject.read(readLength);
- bytes.put(data);
- }
-
- largeObject.close();
- connection.commit();
-
- return readLength;
- } catch (SQLException e) {
- connection.rollback();
- throw e;
- }
- }
-
- private synchronized Long getOID(JDBCSequentialFile file) throws SQLException {
- Long oid = (Long) file.getMetaData(POSTGRES_OID_KEY);
- if (oid == null) {
- connection.setAutoCommit(false);
- readLargeObject.setInt(1, file.getId());
- try (ResultSet rs = readLargeObject.executeQuery()) {
- if (rs.next()) {
- file.addMetaData(POSTGRES_OID_KEY, rs.getLong(1));
- }
- connection.commit();
- } catch (SQLException e) {
- connection.rollback();
- throw e;
- }
- }
- if ((Long) file.getMetaData(POSTGRES_OID_KEY) == 0) {
- System.out.println("FD");
- }
- return (Long) file.getMetaData(POSTGRES_OID_KEY);
- }
-
- private synchronized int getPostGresLargeObjectSize(JDBCSequentialFile file) throws SQLException {
- LargeObjectManager lobjManager = ((PGConnection) connection).getLargeObjectAPI();
-
- int size = 0;
- Long oid = getOID(file);
- if (oid != null) {
- try {
- connection.setAutoCommit(false);
- LargeObject largeObject = lobjManager.open(oid, LargeObjectManager.READ);
- size = largeObject.size();
- largeObject.close();
- connection.commit();
- } catch (SQLException e) {
- connection.rollback();
- throw e;
- }
- }
- return size;
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b5cbb86/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCFileUtils.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCFileUtils.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCFileUtils.java
new file mode 100644
index 0000000..02b1128
--- /dev/null
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCFileUtils.java
@@ -0,0 +1,48 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.artemis.jdbc.store.file;
+
+import javax.sql.DataSource;
+import java.sql.SQLException;
+
+import org.apache.activemq.artemis.jdbc.store.drivers.postgres.PostgresSQLProvider;
+import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
+
+class JDBCFileUtils {
+
+ static JDBCSequentialFileFactoryDriver getDBFileDriver(String driverClass,
+ String jdbcConnectionUrl,
+ SQLProvider provider) throws SQLException {
+ JDBCSequentialFileFactoryDriver dbDriver = new JDBCSequentialFileFactoryDriver();
+ dbDriver.setSqlProvider(provider);
+ dbDriver.setJdbcConnectionUrl(jdbcConnectionUrl);
+ dbDriver.setJdbcDriverClass(driverClass);
+ return dbDriver;
+ }
+
+ static JDBCSequentialFileFactoryDriver getDBFileDriver(DataSource dataSource, SQLProvider provider) throws SQLException {
+ JDBCSequentialFileFactoryDriver dbDriver;
+ if (provider instanceof PostgresSQLProvider) {
+ dbDriver = new PostgresSequentialSequentialFileDriver();
+ dbDriver.setDataSource(dataSource);
+ } else {
+ dbDriver = new JDBCSequentialFileFactoryDriver(dataSource, provider);
+ }
+ return dbDriver;
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b5cbb86/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java
index 8408991..f3215c0 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFile.java
@@ -64,11 +64,11 @@ public class JDBCSequentialFile implements SequentialFile {
// Allows DB Drivers to cache meta data.
private final Map<Object, Object> metaData = new ConcurrentHashMap<>();
- public JDBCSequentialFile(final JDBCSequentialFileFactory fileFactory,
- final String filename,
- final Executor executor,
- final JDBCSequentialFileFactoryDriver driver,
- final Object writeLock) throws SQLException {
+ JDBCSequentialFile(final JDBCSequentialFileFactory fileFactory,
+ final String filename,
+ final Executor executor,
+ final JDBCSequentialFileFactoryDriver driver,
+ final Object writeLock) throws SQLException {
this.fileFactory = fileFactory;
this.filename = filename;
this.extension = filename.contains(".") ? filename.substring(filename.lastIndexOf(".") + 1, filename.length()) : "";
@@ -77,7 +77,7 @@ public class JDBCSequentialFile implements SequentialFile {
this.dbDriver = driver;
}
- public void setWritePosition(int writePosition) {
+ void setWritePosition(int writePosition) {
this.writePosition = writePosition;
}
@@ -172,7 +172,7 @@ public class JDBCSequentialFile implements SequentialFile {
return internalWrite(buffer.array(), callback);
}
- public void scheduleWrite(final ActiveMQBuffer bytes, final IOCallback callback) {
+ private void scheduleWrite(final ActiveMQBuffer bytes, final IOCallback callback) {
executor.execute(new Runnable() {
@Override
public void run() {
@@ -181,7 +181,7 @@ public class JDBCSequentialFile implements SequentialFile {
});
}
- public void scheduleWrite(final ByteBuffer bytes, final IOCallback callback) {
+ private void scheduleWrite(final ByteBuffer bytes, final IOCallback callback) {
executor.execute(new Runnable() {
@Override
public void run() {
@@ -358,10 +358,6 @@ public class JDBCSequentialFile implements SequentialFile {
metaData.put(key, value);
}
- public Object removeMetaData(Object key) {
- return metaData.remove(key);
- }
-
public Object getMetaData(Object key) {
return metaData.get(key);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b5cbb86/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactory.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactory.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactory.java
index 8078417..cafb261 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactory.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactory.java
@@ -30,7 +30,6 @@ import org.apache.activemq.artemis.core.io.SequentialFile;
import org.apache.activemq.artemis.core.io.SequentialFileFactory;
import org.apache.activemq.artemis.core.io.nio.NIOSequentialFileFactory;
import org.apache.activemq.artemis.core.server.ActiveMQComponent;
-import org.apache.activemq.artemis.jdbc.store.JDBCUtils;
import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
@@ -48,10 +47,9 @@ public class JDBCSequentialFileFactory implements SequentialFileFactory, ActiveM
public JDBCSequentialFileFactory(final DataSource dataSource,
final SQLProvider sqlProvider,
- final String tableName,
Executor executor) throws Exception {
this.executor = executor;
- dbDriver = JDBCUtils.getDBFileDriver(dataSource, tableName, sqlProvider);
+ dbDriver = JDBCFileUtils.getDBFileDriver(dataSource, sqlProvider);
}
public JDBCSequentialFileFactory(final String connectionUrl,
@@ -59,7 +57,7 @@ public class JDBCSequentialFileFactory implements SequentialFileFactory, ActiveM
final SQLProvider sqlProvider,
Executor executor) throws Exception {
this.executor = executor;
- dbDriver = JDBCUtils.getDBFileDriver(className, connectionUrl, sqlProvider);
+ dbDriver = JDBCFileUtils.getDBFileDriver(className, connectionUrl, sqlProvider);
}
@Override
@@ -88,9 +86,7 @@ public class JDBCSequentialFileFactory implements SequentialFileFactory, ActiveM
@Override
public SequentialFile createSequentialFile(String fileName) {
try {
- if (fileLocks.get(fileName) == null) {
- fileLocks.put(fileName, new Object());
- }
+ fileLocks.putIfAbsent(fileName, new Object());
JDBCSequentialFile file = new JDBCSequentialFile(this, fileName, executor, dbDriver, fileLocks.get(fileName));
files.add(file);
return file;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b5cbb86/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
index 00f73b3..7b9eaf1 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/JDBCSequentialFileFactoryDriver.java
@@ -33,25 +33,25 @@ public class JDBCSequentialFileFactoryDriver extends AbstractJDBCDriver {
protected PreparedStatement deleteFile;
- protected PreparedStatement createFile;
+ PreparedStatement createFile;
- protected PreparedStatement selectFileByFileName;
+ private PreparedStatement selectFileByFileName;
- protected PreparedStatement copyFileRecord;
+ private PreparedStatement copyFileRecord;
- protected PreparedStatement renameFile;
+ private PreparedStatement renameFile;
- protected PreparedStatement readLargeObject;
+ PreparedStatement readLargeObject;
- protected PreparedStatement appendToLargeObject;
+ private PreparedStatement appendToLargeObject;
- protected PreparedStatement selectFileNamesByExtension;
+ private PreparedStatement selectFileNamesByExtension;
- public JDBCSequentialFileFactoryDriver() {
+ JDBCSequentialFileFactoryDriver() {
super();
}
- public JDBCSequentialFileFactoryDriver(String tableName, DataSource dataSource, SQLProvider provider) {
+ JDBCSequentialFileFactoryDriver(DataSource dataSource, SQLProvider provider) {
super(dataSource, provider);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b5cbb86/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/PostgresSequentialSequentialFileDriver.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/PostgresSequentialSequentialFileDriver.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/PostgresSequentialSequentialFileDriver.java
new file mode 100644
index 0000000..c7411a6
--- /dev/null
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/file/PostgresSequentialSequentialFileDriver.java
@@ -0,0 +1,162 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.jdbc.store.file;
+
+import java.nio.ByteBuffer;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import org.postgresql.PGConnection;
+import org.postgresql.largeobject.LargeObject;
+import org.postgresql.largeobject.LargeObjectManager;
+
+public class PostgresSequentialSequentialFileDriver extends JDBCSequentialFileFactoryDriver {
+
+ private static final String POSTGRES_OID_KEY = "POSTGRES_OID_KEY";
+
+ public PostgresSequentialSequentialFileDriver() throws SQLException {
+ super();
+ }
+
+ @Override
+ public synchronized void createFile(JDBCSequentialFile file) throws SQLException {
+ try {
+ connection.setAutoCommit(false);
+
+ LargeObjectManager lobjManager = ((PGConnection) connection).getLargeObjectAPI();
+ long oid = lobjManager.createLO();
+
+ createFile.setString(1, file.getFileName());
+ createFile.setString(2, file.getExtension());
+ createFile.setLong(3, oid);
+ createFile.executeUpdate();
+
+ try (ResultSet keys = createFile.getGeneratedKeys()) {
+ keys.next();
+ file.setId(keys.getInt(1));
+ }
+ connection.commit();
+ } catch (SQLException e) {
+ connection.rollback();
+ throw e;
+ }
+ }
+
+ @Override
+ public synchronized void loadFile(JDBCSequentialFile file) throws SQLException {
+ connection.setAutoCommit(false);
+ readLargeObject.setInt(1, file.getId());
+
+ try (ResultSet rs = readLargeObject.executeQuery()) {
+ if (rs.next()) {
+ file.setWritePosition(getPostGresLargeObjectSize(file));
+ }
+ connection.commit();
+ } catch (SQLException e) {
+ connection.rollback();
+ throw e;
+ }
+ }
+
+ @Override
+ public synchronized int writeToFile(JDBCSequentialFile file, byte[] data) throws SQLException {
+ LargeObjectManager lobjManager = ((PGConnection) connection).getLargeObjectAPI();
+ LargeObject largeObject = null;
+
+ Long oid = getOID(file);
+ try {
+ connection.setAutoCommit(false);
+ largeObject = lobjManager.open(oid, LargeObjectManager.WRITE);
+ largeObject.seek(largeObject.size());
+ largeObject.write(data);
+ largeObject.close();
+ connection.commit();
+ } catch (Exception e) {
+ connection.rollback();
+ throw e;
+ }
+ return data.length;
+ }
+
+ @Override
+ public synchronized int readFromFile(JDBCSequentialFile file, ByteBuffer bytes) throws SQLException {
+ LargeObjectManager lobjManager = ((PGConnection) connection).getLargeObjectAPI();
+ LargeObject largeObject = null;
+ long oid = getOID(file);
+ try {
+ connection.setAutoCommit(false);
+ largeObject = lobjManager.open(oid, LargeObjectManager.READ);
+ int readLength = (int) calculateReadLength(largeObject.size(), bytes.remaining(), file.position());
+
+ if (readLength > 0) {
+ if (file.position() > 0)
+ largeObject.seek((int) file.position());
+ byte[] data = largeObject.read(readLength);
+ bytes.put(data);
+ }
+
+ largeObject.close();
+ connection.commit();
+
+ return readLength;
+ } catch (SQLException e) {
+ connection.rollback();
+ throw e;
+ }
+ }
+
+ private synchronized Long getOID(JDBCSequentialFile file) throws SQLException {
+ Long oid = (Long) file.getMetaData(POSTGRES_OID_KEY);
+ if (oid == null) {
+ connection.setAutoCommit(false);
+ readLargeObject.setInt(1, file.getId());
+ try (ResultSet rs = readLargeObject.executeQuery()) {
+ if (rs.next()) {
+ file.addMetaData(POSTGRES_OID_KEY, rs.getLong(1));
+ }
+ connection.commit();
+ } catch (SQLException e) {
+ connection.rollback();
+ throw e;
+ }
+ }
+ if ((Long) file.getMetaData(POSTGRES_OID_KEY) == 0) {
+ System.out.println("FD");
+ }
+ return (Long) file.getMetaData(POSTGRES_OID_KEY);
+ }
+
+ private synchronized int getPostGresLargeObjectSize(JDBCSequentialFile file) throws SQLException {
+ LargeObjectManager lobjManager = ((PGConnection) connection).getLargeObjectAPI();
+
+ int size = 0;
+ Long oid = getOID(file);
+ if (oid != null) {
+ try {
+ connection.setAutoCommit(false);
+ LargeObject largeObject = lobjManager.open(oid, LargeObjectManager.READ);
+ size = largeObject.size();
+ largeObject.close();
+ connection.commit();
+ } catch (SQLException e) {
+ connection.rollback();
+ throw e;
+ }
+ }
+ return size;
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b5cbb86/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
index ef45fe0..636309e 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
@@ -41,6 +41,7 @@ import org.apache.activemq.artemis.core.journal.RecordInfo;
import org.apache.activemq.artemis.core.journal.TransactionFailureCallback;
import org.apache.activemq.artemis.core.journal.impl.JournalFile;
import org.apache.activemq.artemis.core.journal.impl.SimpleWaitIOCallback;
+import org.apache.activemq.artemis.core.server.ActiveMQScheduledComponent;
import org.apache.activemq.artemis.jdbc.store.drivers.AbstractJDBCDriver;
import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
@@ -51,7 +52,7 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
private static final Logger logger = Logger.getLogger(JDBCJournalImpl.class);
// Sync Delay in ms
- public static final int SYNC_DELAY = 5;
+ private static final int SYNC_DELAY = 5;
private static int USER_VERSION = 1;
@@ -741,4 +742,24 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
return started;
}
+ private static class JDBCJournalSync extends ActiveMQScheduledComponent {
+
+ private final JDBCJournalImpl journal;
+
+ JDBCJournalSync(ScheduledExecutorService scheduledExecutorService,
+ Executor executor,
+ long checkPeriod,
+ TimeUnit timeUnit,
+ JDBCJournalImpl journal) {
+ super(scheduledExecutorService, executor, checkPeriod, timeUnit, true);
+ this.journal = journal;
+ }
+
+ @Override
+ public void run() {
+ if (journal.isStarted()) {
+ journal.sync();
+ }
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b5cbb86/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalLoaderCallback.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalLoaderCallback.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalLoaderCallback.java
index eaa5387..f5a5d26 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalLoaderCallback.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalLoaderCallback.java
@@ -27,7 +27,7 @@ import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo;
import org.apache.activemq.artemis.core.journal.RecordInfo;
import org.apache.activemq.artemis.core.journal.TransactionFailureCallback;
-public class JDBCJournalLoaderCallback implements LoaderCallback {
+class JDBCJournalLoaderCallback implements LoaderCallback {
private final List<PreparedTransactionInfo> preparedTransactions;
@@ -41,16 +41,16 @@ public class JDBCJournalLoaderCallback implements LoaderCallback {
private long maxId = -1;
- public JDBCJournalLoaderCallback(final List<RecordInfo> committedRecords,
- final List<PreparedTransactionInfo> preparedTransactions,
- final TransactionFailureCallback failureCallback,
- final boolean fixBadTX) {
+ JDBCJournalLoaderCallback(final List<RecordInfo> committedRecords,
+ final List<PreparedTransactionInfo> preparedTransactions,
+ final TransactionFailureCallback failureCallback,
+ final boolean fixBadTX) {
this.committedRecords = committedRecords;
this.preparedTransactions = preparedTransactions;
this.failureCallback = failureCallback;
}
- public synchronized void checkMaxId(long id) {
+ private synchronized void checkMaxId(long id) {
if (maxId < id) {
maxId = id;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b5cbb86/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalReaderCallback.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalReaderCallback.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalReaderCallback.java
index cd8a411..3c200a4 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalReaderCallback.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalReaderCallback.java
@@ -27,13 +27,13 @@ import org.apache.activemq.artemis.core.journal.impl.JournalFile;
import org.apache.activemq.artemis.core.journal.impl.JournalReaderCallback;
import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
-public class JDBCJournalReaderCallback implements JournalReaderCallback {
+class JDBCJournalReaderCallback implements JournalReaderCallback {
private final Map<Long, TransactionHolder> loadTransactions = new LinkedHashMap<>();
private final LoaderCallback loadManager;
- public JDBCJournalReaderCallback(final LoaderCallback loadManager) {
+ JDBCJournalReaderCallback(final LoaderCallback loadManager) {
this.loadManager = loadManager;
}
@@ -126,7 +126,7 @@ public class JDBCJournalReaderCallback implements JournalReaderCallback {
// Not needed for JDBC journal impl
}
- public void checkPreparedTx() {
+ void checkPreparedTx() {
for (TransactionHolder transaction : loadTransactions.values()) {
if ((!transaction.prepared && !transaction.committed) || transaction.invalid) {
ActiveMQJournalLogger.LOGGER.uncomittedTxFound(transaction.transactionID);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b5cbb86/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalRecord.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalRecord.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalRecord.java
index 3b570a0..9691d3e 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalRecord.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalRecord.java
@@ -32,7 +32,7 @@ import org.apache.activemq.artemis.core.journal.RecordInfo;
import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
import org.apache.activemq.artemis.utils.ActiveMQBufferInputStream;
-public class JDBCJournalRecord {
+class JDBCJournalRecord {
/*
Database Table Schema:
@@ -49,17 +49,17 @@ public class JDBCJournalRecord {
*/
// Record types taken from Journal Impl
- public static final byte ADD_RECORD = 11;
- public static final byte UPDATE_RECORD = 12;
- public static final byte ADD_RECORD_TX = 13;
- public static final byte UPDATE_RECORD_TX = 14;
+ static final byte ADD_RECORD = 11;
+ static final byte UPDATE_RECORD = 12;
+ static final byte ADD_RECORD_TX = 13;
+ static final byte UPDATE_RECORD_TX = 14;
- public static final byte DELETE_RECORD_TX = 15;
- public static final byte DELETE_RECORD = 16;
+ static final byte DELETE_RECORD_TX = 15;
+ static final byte DELETE_RECORD = 16;
- public static final byte PREPARE_RECORD = 17;
- public static final byte COMMIT_RECORD = 18;
- public static final byte ROLLBACK_RECORD = 19;
+ static final byte PREPARE_RECORD = 17;
+ static final byte COMMIT_RECORD = 18;
+ static final byte ROLLBACK_RECORD = 19;
// Callback and sync operations
private IOCompletion ioCompletion = null;
@@ -90,7 +90,7 @@ public class JDBCJournalRecord {
private long seq;
- public JDBCJournalRecord(long id, byte recordType, long seq) {
+ JDBCJournalRecord(long id, byte recordType, long seq) {
this.id = id;
this.recordType = recordType;
@@ -110,26 +110,6 @@ public class JDBCJournalRecord {
this.seq = seq;
}
- public static String createTableSQL(String tableName) {
- return "CREATE TABLE " + tableName + "(id BIGINT,recordType SMALLINT,compactCount SMALLINT,txId BIGINT,userRecordType SMALLINT,variableSize INTEGER,record BLOB,txDataSize INTEGER,txData BLOB,txCheckNoRecords INTEGER,seq BIGINT)";
- }
-
- public static String insertRecordsSQL(String tableName) {
- return "INSERT INTO " + tableName + "(id,recordType,compactCount,txId,userRecordType,variableSize,record,txDataSize,txData,txCheckNoRecords,seq) " + "VALUES (?,?,?,?,?,?,?,?,?,?,?)";
- }
-
- public static String selectRecordsSQL(String tableName) {
- return "SELECT id,recordType,compactCount,txId,userRecordType,variableSize,record,txDataSize,txData,txCheckNoRecords,seq " + "FROM " + tableName + " ORDER BY seq ASC";
- }
-
- public static String deleteRecordsSQL(String tableName) {
- return "DELETE FROM " + tableName + " WHERE id = ?";
- }
-
- public static String deleteJournalTxRecordsSQL(String tableName) {
- return "DELETE FROM " + tableName + " WHERE txId=?";
- }
-
public void complete(boolean success) {
if (ioCompletion != null) {
if (success) {
@@ -146,7 +126,7 @@ public class JDBCJournalRecord {
}
}
- protected void writeRecord(PreparedStatement statement) throws SQLException {
+ void writeRecord(PreparedStatement statement) throws SQLException {
byte[] recordBytes = new byte[variableSize];
byte[] txDataBytes = new byte[txDataSize];
@@ -172,12 +152,12 @@ public class JDBCJournalRecord {
statement.addBatch();
}
- protected void writeDeleteRecord(PreparedStatement deleteStatement) throws SQLException {
+ void writeDeleteRecord(PreparedStatement deleteStatement) throws SQLException {
deleteStatement.setLong(1, id);
deleteStatement.addBatch();
}
- public static JDBCJournalRecord readRecord(ResultSet rs) throws SQLException {
+ static JDBCJournalRecord readRecord(ResultSet rs) throws SQLException {
JDBCJournalRecord record = new JDBCJournalRecord(rs.getLong(1), (byte) rs.getShort(2), rs.getLong(11));
record.setCompactCount((byte) rs.getShort(3));
record.setTxId(rs.getLong(4));
@@ -190,18 +170,14 @@ public class JDBCJournalRecord {
return record;
}
- public IOCompletion getIoCompletion() {
+ IOCompletion getIoCompletion() {
return ioCompletion;
}
- public void setIoCompletion(IOCompletion ioCompletion) {
+ void setIoCompletion(IOCompletion ioCompletion) {
this.ioCompletion = ioCompletion;
}
- public boolean isStoreLineUp() {
- return storeLineUp;
- }
-
public void setStoreLineUp(boolean storeLineUp) {
this.storeLineUp = storeLineUp;
}
@@ -222,27 +198,23 @@ public class JDBCJournalRecord {
return recordType;
}
- public byte getCompactCount() {
+ byte getCompactCount() {
return compactCount;
}
- public void setCompactCount(byte compactCount) {
+ private void setCompactCount(byte compactCount) {
this.compactCount = compactCount;
}
- public long getTxId() {
+ long getTxId() {
return txId;
}
- public void setTxId(long txId) {
+ void setTxId(long txId) {
this.txId = txId;
}
- public int getVariableSize() {
- return variableSize;
- }
-
- public void setVariableSize(int variableSize) {
+ private void setVariableSize(int variableSize) {
this.variableSize = variableSize;
}
@@ -277,31 +249,19 @@ public class JDBCJournalRecord {
return record;
}
- public int getTxCheckNoRecords() {
+ int getTxCheckNoRecords() {
return txCheckNoRecords;
}
- public void setTxCheckNoRecords(int txCheckNoRecords) {
+ private void setTxCheckNoRecords(int txCheckNoRecords) {
this.txCheckNoRecords = txCheckNoRecords;
}
- public void setTxDataSize(int txDataSize) {
+ private void setTxDataSize(int txDataSize) {
this.txDataSize = txDataSize;
}
- public int getTxDataSize() {
- return txDataSize;
- }
-
- public InputStream getTxData() {
- return txData;
- }
-
- public void setTxData(InputStream record) {
- this.record = record;
- }
-
- public void setTxData(EncodingSupport txData) {
+ void setTxData(EncodingSupport txData) {
this.txDataSize = txData.getEncodeSize();
ActiveMQBuffer encodedBuffer = ActiveMQBuffers.fixedBuffer(txDataSize);
@@ -309,7 +269,7 @@ public class JDBCJournalRecord {
this.txData = new ActiveMQBufferInputStream(encodedBuffer);
}
- public void setTxData(byte[] txData) {
+ void setTxData(byte[] txData) {
if (txData != null) {
this.txDataSize = txData.length;
this.txData = new ByteArrayInputStream(txData);
@@ -320,19 +280,19 @@ public class JDBCJournalRecord {
return isUpdate;
}
- public byte[] getRecordData() throws IOException {
+ private byte[] getRecordData() throws IOException {
byte[] data = new byte[variableSize];
record.read(data);
return data;
}
- public byte[] getTxDataAsByteArray() throws IOException {
+ byte[] getTxDataAsByteArray() throws IOException {
byte[] data = new byte[txDataSize];
txData.read(data);
return data;
}
- public RecordInfo toRecordInfo() throws IOException {
+ RecordInfo toRecordInfo() throws IOException {
return new RecordInfo(getId(), getUserRecordType(), getRecordData(), isUpdate(), getCompactCount());
}
@@ -340,7 +300,7 @@ public class JDBCJournalRecord {
return isTransactional;
}
- public long getSeq() {
+ long getSeq() {
return seq;
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b5cbb86/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalSync.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalSync.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalSync.java
deleted file mode 100644
index 8ef7e08..0000000
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalSync.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.activemq.artemis.jdbc.store.journal;
-
-import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.apache.activemq.artemis.core.server.ActiveMQScheduledComponent;
-
-public class JDBCJournalSync extends ActiveMQScheduledComponent {
-
- private final JDBCJournalImpl journal;
-
- public JDBCJournalSync(ScheduledExecutorService scheduledExecutorService,
- Executor executor,
- long checkPeriod,
- TimeUnit timeUnit,
- JDBCJournalImpl journal) {
- super(scheduledExecutorService, executor, checkPeriod, timeUnit, true);
- this.journal = journal;
- }
-
- @Override
- public void run() {
- if (journal.isStarted()) {
- journal.sync();
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b5cbb86/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/TransactionHolder.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/TransactionHolder.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/TransactionHolder.java
index 12c0d59..39f40ab 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/TransactionHolder.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/TransactionHolder.java
@@ -30,7 +30,7 @@ final class TransactionHolder {
public final long transactionID;
- public final List<RecordInfo> recordInfos = new ArrayList<>();
+ final List<RecordInfo> recordInfos = new ArrayList<>();
public final List<RecordInfo> recordsToDelete = new ArrayList<>();
@@ -38,7 +38,7 @@ final class TransactionHolder {
public boolean invalid;
- public byte[] extraData;
+ byte[] extraData;
public boolean committed;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b5cbb86/artemis-jdbc-store/src/test/java/org/apache/activemq/artemis/jdbc/file/JDBCSequentialFileFactoryTest.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/test/java/org/apache/activemq/artemis/jdbc/file/JDBCSequentialFileFactoryTest.java b/artemis-jdbc-store/src/test/java/org/apache/activemq/artemis/jdbc/file/JDBCSequentialFileFactoryTest.java
index e94f51a..75bdf44 100644
--- a/artemis-jdbc-store/src/test/java/org/apache/activemq/artemis/jdbc/file/JDBCSequentialFileFactoryTest.java
+++ b/artemis-jdbc-store/src/test/java/org/apache/activemq/artemis/jdbc/file/JDBCSequentialFileFactoryTest.java
@@ -32,7 +32,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
import org.apache.activemq.artemis.core.io.IOCallback;
import org.apache.activemq.artemis.core.io.SequentialFile;
-import org.apache.activemq.artemis.jdbc.store.JDBCUtils;
+import org.apache.activemq.artemis.jdbc.store.drivers.JDBCUtils;
import org.apache.activemq.artemis.jdbc.store.file.JDBCSequentialFile;
import org.apache.activemq.artemis.jdbc.store.file.JDBCSequentialFileFactory;
import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
@@ -53,10 +53,6 @@ public class JDBCSequentialFileFactoryTest {
@Rule
public ThreadLeakCheckRule leakCheckRule = new ThreadLeakCheckRule();
- private static String connectionUrl = "jdbc:derby:target/data;create=true";
-
- private static String tableName = "FILES";
-
private static String className = EmbeddedDriver.class.getCanonicalName();
private JDBCSequentialFileFactory factory;
@@ -65,6 +61,8 @@ public class JDBCSequentialFileFactoryTest {
public void setup() throws Exception {
Executor executor = Executors.newSingleThreadExecutor(ActiveMQThreadFactory.defaultThreadFactory());
+ String connectionUrl = "jdbc:derby:target/data;create=true";
+ String tableName = "FILES";
factory = new JDBCSequentialFileFactory(connectionUrl, className, JDBCUtils.getSQLProvider(className, tableName), executor);
factory.start();
}
@@ -198,7 +196,7 @@ public class JDBCSequentialFileFactoryTest {
fail(errorMessage);
}
- public void assertEmpty(int timeout) throws InterruptedException {
+ void assertEmpty(int timeout) throws InterruptedException {
countDownLatch.await(timeout, TimeUnit.SECONDS);
assertEquals(countDownLatch.getCount(), 0);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b5cbb86/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/DataSourceTracker.java
----------------------------------------------------------------------
diff --git a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/DataSourceTracker.java b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/DataSourceTracker.java
index 69c54b3..941d39f 100644
--- a/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/DataSourceTracker.java
+++ b/artemis-server-osgi/src/main/java/org/apache/activemq/artemis/osgi/DataSourceTracker.java
@@ -23,7 +23,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.activemq.artemis.core.config.storage.DatabaseStorageConfiguration;
-import org.apache.activemq.artemis.jdbc.store.JDBCUtils;
+import org.apache.activemq.artemis.jdbc.store.drivers.JDBCUtils;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTrackerCustomizer;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b5cbb86/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JDBCJournalStorageManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JDBCJournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JDBCJournalStorageManager.java
index 5d30b48..a0f0ed1 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JDBCJournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JDBCJournalStorageManager.java
@@ -25,7 +25,7 @@ import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.config.storage.DatabaseStorageConfiguration;
import org.apache.activemq.artemis.core.io.IOCriticalErrorListener;
import org.apache.activemq.artemis.core.io.nio.NIOSequentialFileFactory;
-import org.apache.activemq.artemis.jdbc.store.JDBCUtils;
+import org.apache.activemq.artemis.jdbc.store.drivers.JDBCUtils;
import org.apache.activemq.artemis.jdbc.store.file.JDBCSequentialFileFactory;
import org.apache.activemq.artemis.jdbc.store.journal.JDBCJournalImpl;
import org.apache.activemq.artemis.jdbc.store.sql.GenericSQLProvider;
@@ -59,7 +59,7 @@ public class JDBCJournalStorageManager extends JournalStorageManager {
}
bindingsJournal = new JDBCJournalImpl(dbConf.getDataSource(), sqlProviderFactory.create(dbConf.getBindingsTableName()), dbConf.getBindingsTableName(), scheduledExecutorService, executorFactory.getExecutor());
messageJournal = new JDBCJournalImpl(dbConf.getDataSource(), sqlProviderFactory.create(dbConf.getMessageTableName()), dbConf.getMessageTableName(), scheduledExecutorService, executorFactory.getExecutor());
- largeMessagesFactory = new JDBCSequentialFileFactory(dbConf.getDataSource(), sqlProviderFactory.create(dbConf.getLargeMessageTableName()), dbConf.getLargeMessageTableName(), executor);
+ largeMessagesFactory = new JDBCSequentialFileFactory(dbConf.getDataSource(), sqlProviderFactory.create(dbConf.getLargeMessageTableName()), executor);
} else {
String driverClassName = dbConf.getJdbcDriverClassName();
bindingsJournal = new JDBCJournalImpl(dbConf.getJdbcConnectionUrl(), driverClassName, JDBCUtils.getSQLProvider(driverClassName, dbConf.getBindingsTableName()), scheduledExecutorService, executorFactory.getExecutor());
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b5cbb86/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
index 69ed8b6..29119f8 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
@@ -129,7 +129,7 @@ import org.apache.activemq.artemis.core.server.impl.SharedNothingBackupActivatio
import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.core.transaction.impl.XidImpl;
-import org.apache.activemq.artemis.jdbc.store.JDBCUtils;
+import org.apache.activemq.artemis.jdbc.store.drivers.JDBCUtils;
import org.apache.activemq.artemis.jdbc.store.sql.SQLProvider;
import org.apache.activemq.artemis.jlibaio.LibaioContext;
import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager;
@@ -467,7 +467,7 @@ public abstract class ActiveMQTestBase extends Assert {
}
public void destroyTables(List<String> tableNames) throws Exception {
- Driver driver = JDBCUtils.getDriver(getJDBCClassName());
+ Driver driver = getDriver(getJDBCClassName());
Connection connection = driver.connect(getTestJDBCConnectionUrl(), null);
Statement statement = connection.createStatement();
try {
@@ -490,6 +490,30 @@ public abstract class ActiveMQTestBase extends Assert {
}
}
+ private Driver getDriver(String className) throws Exception {
+ try {
+ Driver driver = (Driver) Class.forName(className).newInstance();
+
+ // Shutdown the derby if using the derby embedded driver.
+ if (className.equals("org.apache.derby.jdbc.EmbeddedDriver")) {
+ Runtime.getRuntime().addShutdownHook(new Thread() {
+ @Override
+ public void run() {
+ try {
+ DriverManager.getConnection("jdbc:derby:;shutdown=true");
+ } catch (Exception e) {
+ }
+ }
+ });
+ }
+ return driver;
+ } catch (ClassNotFoundException cnfe) {
+ throw new RuntimeException("Could not find class: " + className);
+ } catch (Exception e) {
+ throw new RuntimeException("Unable to instantiate driver class: ", e);
+ }
+ }
+
protected Map<String, Object> generateInVMParams(final int node) {
Map<String, Object> params = new HashMap<>();
[18/34] activemq-artemis git commit: ARTEMIS-822 Add executor service
to JournalImpl for append operations and remove synchronization
Posted by ma...@apache.org.
ARTEMIS-822 Add executor service to JournalImpl for append operations and remove synchronization
https://issues.apache.org/jira/browse/ARTEMIS-822
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4b47461f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4b47461f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4b47461f
Branch: refs/heads/ARTEMIS-780
Commit: 4b47461f03a607b9ef517beb2a1666ffae43a2a7
Parents: bfb9bed
Author: barreiro <lb...@gmail.com>
Authored: Fri Jan 22 03:23:26 2016 +0000
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Oct 28 16:54:59 2016 -0400
----------------------------------------------------------------------
.../cli/commands/tools/DecodeJournal.java | 20 +-
.../activemq/artemis/utils/ExecutorFactory.java | 24 +
.../artemis/utils/OrderedExecutorFactory.java | 127 ++++
.../activemq/artemis/utils/SimpleFuture.java | 79 +++
.../artemis/utils/SimpleFutureTest.java | 69 ++
.../activemq/artemis/utils/ExecutorFactory.java | 24 -
.../artemis/utils/OrderedExecutorFactory.java | 128 ----
.../artemis/core/journal/impl/JournalImpl.java | 662 +++++++++++--------
.../core/journal/impl/JournalTransaction.java | 46 +-
.../artemis/journal/ActiveMQJournalLogger.java | 12 +-
.../journal/impl/AlignedJournalImplTest.java | 39 +-
.../core/journal/impl/JournalAsyncTest.java | 15 +-
12 files changed, 761 insertions(+), 484 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b47461f/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DecodeJournal.java
----------------------------------------------------------------------
diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DecodeJournal.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DecodeJournal.java
index b392f6f..f290eba 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DecodeJournal.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/DecodeJournal.java
@@ -33,7 +33,6 @@ import org.apache.activemq.artemis.cli.commands.ActionContext;
import org.apache.activemq.artemis.core.io.nio.NIOSequentialFileFactory;
import org.apache.activemq.artemis.core.journal.RecordInfo;
import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
-import org.apache.activemq.artemis.core.journal.impl.JournalRecord;
import org.apache.activemq.artemis.utils.Base64;
@Command(name = "decode", description = "Decode a journal's internal format into a new journal set of files")
@@ -125,8 +124,6 @@ public class DecodeJournal extends LockAbstract {
long lineNumber = 0;
- Map<Long, JournalRecord> journalRecords = journal.getRecords();
-
while ((line = buffReader.readLine()) != null) {
lineNumber++;
String[] splitLine = line.split(",");
@@ -150,12 +147,6 @@ public class DecodeJournal extends LockAbstract {
counter.incrementAndGet();
RecordInfo info = parseRecord(lineProperties);
journal.appendAddRecordTransactional(txID, info.id, info.userRecordType, info.data);
- } else if (operation.equals("AddRecordTX")) {
- long txID = parseLong("txID", lineProperties);
- AtomicInteger counter = getCounter(txID, txCounters);
- counter.incrementAndGet();
- RecordInfo info = parseRecord(lineProperties);
- journal.appendAddRecordTransactional(txID, info.id, info.userRecordType, info.data);
} else if (operation.equals("UpdateTX")) {
long txID = parseLong("txID", lineProperties);
AtomicInteger counter = getCounter(txID, txCounters);
@@ -168,20 +159,17 @@ public class DecodeJournal extends LockAbstract {
} else if (operation.equals("DeleteRecord")) {
long id = parseLong("id", lineProperties);
- // If not found it means the append/update records were reclaimed already
- if (journalRecords.get(id) != null) {
+ try {
journal.appendDeleteRecord(id, false);
+ } catch (IllegalStateException ignored) {
+ // If not found it means the append/update records were reclaimed already
}
} else if (operation.equals("DeleteRecordTX")) {
long txID = parseLong("txID", lineProperties);
long id = parseLong("id", lineProperties);
AtomicInteger counter = getCounter(txID, txCounters);
counter.incrementAndGet();
-
- // If not found it means the append/update records were reclaimed already
- if (journalRecords.get(id) != null) {
- journal.appendDeleteRecordTransactional(txID, id);
- }
+ journal.appendDeleteRecordTransactional(txID, id);
} else if (operation.equals("Prepare")) {
long txID = parseLong("txID", lineProperties);
int numberOfRecords = parseInt("numberOfRecords", lineProperties);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b47461f/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ExecutorFactory.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ExecutorFactory.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ExecutorFactory.java
new file mode 100644
index 0000000..dd0209b
--- /dev/null
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/ExecutorFactory.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.utils;
+
+import java.util.concurrent.Executor;
+
+public interface ExecutorFactory {
+
+ Executor getExecutor();
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b47461f/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/OrderedExecutorFactory.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/OrderedExecutorFactory.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/OrderedExecutorFactory.java
new file mode 100644
index 0000000..c7d5c03
--- /dev/null
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/OrderedExecutorFactory.java
@@ -0,0 +1,127 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.utils;
+
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+
+import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException;
+import org.jboss.logging.Logger;
+
+/**
+ * A factory for producing executors that run all tasks in order, which delegate to a single common executor instance.
+ */
+public final class OrderedExecutorFactory implements ExecutorFactory {
+
+ private static final Logger logger = Logger.getLogger(OrderedExecutorFactory.class);
+
+ private final Executor parent;
+
+ /**
+ * Construct a new instance delegating to the given parent executor.
+ *
+ * @param parent the parent executor
+ */
+ public OrderedExecutorFactory(final Executor parent) {
+ this.parent = parent;
+ }
+
+ /**
+ * Get an executor that always executes tasks in order.
+ *
+ * @return an ordered executor
+ */
+ @Override
+ public Executor getExecutor() {
+ return new OrderedExecutor(parent);
+ }
+
+ /**
+ * An executor that always runs all tasks in order, using a delegate executor to run the tasks.
+ * <br>
+ * More specifically, any call B to the {@link #execute(Runnable)} method that happens-after another call A to the
+ * same method, will result in B's task running after A's.
+ */
+ private static class OrderedExecutor implements Executor {
+
+ private final Queue<Runnable> tasks = new ConcurrentLinkedQueue<>();
+ private final Executor delegate;
+ private final ExecutorTask task = new ExecutorTask();
+
+ // used by stateUpdater
+ @SuppressWarnings("unused")
+ private volatile int state = 0;
+
+ private static final AtomicIntegerFieldUpdater<OrderedExecutor> stateUpdater = AtomicIntegerFieldUpdater.newUpdater(OrderedExecutor.class, "state");
+
+ private static final int STATE_NOT_RUNNING = 0;
+ private static final int STATE_RUNNING = 1;
+
+ private OrderedExecutor(Executor delegate) {
+ this.delegate = delegate;
+ }
+
+ @Override
+ public void execute(Runnable command) {
+ tasks.add(command);
+ if (stateUpdater.get(this) == STATE_NOT_RUNNING) {
+ //note that this can result in multiple tasks being queued
+ //this is not an issue as the CAS will mean that the second (and subsequent) execution is ignored
+ delegate.execute(task);
+ }
+ }
+
+ private final class ExecutorTask implements Runnable {
+
+ @Override
+ public void run() {
+ do {
+ //if there is no thread active then we run
+ if (stateUpdater.compareAndSet(OrderedExecutor.this, STATE_NOT_RUNNING, STATE_RUNNING)) {
+ Runnable task = tasks.poll();
+ //while the queue is not empty we process in order
+ while (task != null) {
+ try {
+ task.run();
+ } catch (ActiveMQInterruptedException e) {
+ // This could happen during shutdowns. Nothing to be concerned about here
+ logger.debug("Interrupted Thread", e);
+ } catch (Throwable t) {
+ logger.warn(t.getMessage(), t);
+ }
+ task = tasks.poll();
+ }
+ //set state back to not running.
+ stateUpdater.set(OrderedExecutor.this, STATE_NOT_RUNNING);
+ } else {
+ return;
+ }
+ //we loop again based on tasks not being empty. Otherwise there is a window where the state is running,
+ //but poll() has returned null, so a submitting thread will believe that it does not need re-execute.
+ //this check fixes the issue
+ } while (!tasks.isEmpty());
+ }
+ }
+
+ @Override
+ public String toString() {
+ return "OrderedExecutor(tasks=" + tasks + ")";
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b47461f/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SimpleFuture.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SimpleFuture.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SimpleFuture.java
new file mode 100644
index 0000000..eedfef4
--- /dev/null
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SimpleFuture.java
@@ -0,0 +1,79 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.artemis.utils;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+public class SimpleFuture<V> implements Future<V> {
+
+ public SimpleFuture() {
+ }
+
+ V value;
+ Exception exception;
+
+ private final CountDownLatch latch = new CountDownLatch(1);
+
+ boolean canceled = false;
+
+ @Override
+ public boolean cancel(boolean mayInterruptIfRunning) {
+ canceled = true;
+ latch.countDown();
+ return true;
+ }
+
+ @Override
+ public boolean isCancelled() {
+ return canceled;
+ }
+
+ @Override
+ public boolean isDone() {
+ return latch.getCount() <= 0;
+ }
+
+ public void fail(Exception e) {
+ this.exception = e;
+ latch.countDown();
+ }
+
+ @Override
+ public V get() throws InterruptedException, ExecutionException {
+ latch.await();
+ if (this.exception != null) {
+ throw new ExecutionException(this.exception);
+ }
+ return value;
+ }
+
+ public void set(V v) {
+ this.value = v;
+ latch.countDown();
+ }
+
+ @Override
+ public V get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
+ latch.await(timeout, unit);
+ return value;
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b47461f/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SimpleFutureTest.java
----------------------------------------------------------------------
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SimpleFutureTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SimpleFutureTest.java
new file mode 100644
index 0000000..00fd5d7
--- /dev/null
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/SimpleFutureTest.java
@@ -0,0 +1,69 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.activemq.artemis.utils;
+
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+
+public class SimpleFutureTest {
+
+ @Rule
+ public ThreadLeakCheckRule threadLeakCheckRule = new ThreadLeakCheckRule();
+
+ @Test
+ public void testFuture() throws Exception {
+ final long randomStart = System.currentTimeMillis();
+ final SimpleFuture<Long> simpleFuture = new SimpleFuture<>();
+ Thread t = new Thread() {
+ @Override
+ public void run() {
+ simpleFuture.set(randomStart);
+ }
+ };
+ t.start();
+
+ Assert.assertEquals(randomStart, simpleFuture.get().longValue());
+ }
+
+
+ @Test
+ public void testException() throws Exception {
+ final SimpleFuture<Long> simpleFuture = new SimpleFuture<>();
+ Thread t = new Thread() {
+ @Override
+ public void run() {
+ simpleFuture.fail(new Exception("hello"));
+ }
+ };
+ t.start();
+
+ boolean failed = false;
+ try {
+ simpleFuture.get();
+ } catch (Exception e) {
+ failed = true;
+ }
+
+
+ Assert.assertTrue(failed);
+ }
+
+
+
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b47461f/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ExecutorFactory.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ExecutorFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ExecutorFactory.java
deleted file mode 100644
index dd0209b..0000000
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ExecutorFactory.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.artemis.utils;
-
-import java.util.concurrent.Executor;
-
-public interface ExecutorFactory {
-
- Executor getExecutor();
-}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b47461f/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/OrderedExecutorFactory.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/OrderedExecutorFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/OrderedExecutorFactory.java
deleted file mode 100644
index 609af8e..0000000
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/OrderedExecutorFactory.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.artemis.utils;
-
-import java.util.Queue;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
-
-import org.apache.activemq.artemis.api.core.ActiveMQInterruptedException;
-import org.apache.activemq.artemis.core.client.ActiveMQClientLogger;
-import org.jboss.logging.Logger;
-
-/**
- * A factory for producing executors that run all tasks in order, which delegate to a single common executor instance.
- */
-public final class OrderedExecutorFactory implements ExecutorFactory {
-
- private static final Logger logger = Logger.getLogger(OrderedExecutorFactory.class);
-
- private final Executor parent;
-
- /**
- * Construct a new instance delegating to the given parent executor.
- *
- * @param parent the parent executor
- */
- public OrderedExecutorFactory(final Executor parent) {
- this.parent = parent;
- }
-
- /**
- * Get an executor that always executes tasks in order.
- *
- * @return an ordered executor
- */
- @Override
- public Executor getExecutor() {
- return new OrderedExecutor(parent);
- }
-
- /**
- * An executor that always runs all tasks in order, using a delegate executor to run the tasks.
- * <br>
- * More specifically, any call B to the {@link #execute(Runnable)} method that happens-after another call A to the
- * same method, will result in B's task running after A's.
- */
- private static class OrderedExecutor implements Executor {
-
- private final Queue<Runnable> tasks = new ConcurrentLinkedQueue<>();
- private final Executor delegate;
- private final ExecutorTask task = new ExecutorTask();
-
- // used by stateUpdater
- @SuppressWarnings("unused")
- private volatile int state = 0;
-
- private static final AtomicIntegerFieldUpdater<OrderedExecutor> stateUpdater = AtomicIntegerFieldUpdater.newUpdater(OrderedExecutor.class, "state");
-
- private static final int STATE_NOT_RUNNING = 0;
- private static final int STATE_RUNNING = 1;
-
- private OrderedExecutor(Executor delegate) {
- this.delegate = delegate;
- }
-
- @Override
- public void execute(Runnable command) {
- tasks.add(command);
- if (stateUpdater.get(this) == STATE_NOT_RUNNING) {
- //note that this can result in multiple tasks being queued
- //this is not an issue as the CAS will mean that the second (and subsequent) execution is ignored
- delegate.execute(task);
- }
- }
-
- private final class ExecutorTask implements Runnable {
-
- @Override
- public void run() {
- do {
- //if there is no thread active then we run
- if (stateUpdater.compareAndSet(OrderedExecutor.this, STATE_NOT_RUNNING, STATE_RUNNING)) {
- Runnable task = tasks.poll();
- //while the queue is not empty we process in order
- while (task != null) {
- try {
- task.run();
- } catch (ActiveMQInterruptedException e) {
- // This could happen during shutdowns. Nothing to be concerned about here
- logger.debug("Interrupted Thread", e);
- } catch (Throwable t) {
- ActiveMQClientLogger.LOGGER.caughtunexpectedThrowable(t);
- }
- task = tasks.poll();
- }
- //set state back to not running.
- stateUpdater.set(OrderedExecutor.this, STATE_NOT_RUNNING);
- } else {
- return;
- }
- //we loop again based on tasks not being empty. Otherwise there is a window where the state is running,
- //but poll() has returned null, so a submitting thread will believe that it does not need re-execute.
- //this check fixes the issue
- } while (!tasks.isEmpty());
- }
- }
-
- @Override
- public String toString() {
- return "OrderedExecutor(tasks=" + tasks + ")";
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b47461f/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
index b6d5e62..43db1f7 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
@@ -29,11 +29,13 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -45,6 +47,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
import org.apache.activemq.artemis.api.core.Pair;
+import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
import org.apache.activemq.artemis.core.io.IOCallback;
import org.apache.activemq.artemis.core.io.SequentialFile;
import org.apache.activemq.artemis.core.io.SequentialFileFactory;
@@ -160,6 +163,8 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
// Compacting may replace this structure
private final ConcurrentMap<Long, JournalRecord> records = new ConcurrentHashMap<>();
+ private final Set<Long> pendingRecords = Collections.newSetFromMap(new ConcurrentHashMap<Long, Boolean>());
+
// Compacting may replace this structure
private final ConcurrentMap<Long, JournalTransaction> transactions = new ConcurrentHashMap<>();
@@ -172,12 +177,9 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
private ExecutorService compactorExecutor = null;
- private ConcurrentHashSet<CountDownLatch> latches = new ConcurrentHashSet<>();
+ private ExecutorService appendExecutor = null;
- // Lock used during the append of records
- // This lock doesn't represent a global lock.
- // After a record is appended, the usedFile can't be changed until the positives and negatives are updated
- private final Object lockAppend = new Object();
+ private ConcurrentHashSet<CountDownLatch> latches = new ConcurrentHashSet<>();
/**
* We don't lock the journal during the whole compacting operation. During compacting we only
@@ -688,32 +690,37 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
final boolean sync,
final IOCompletion callback) throws Exception {
checkJournalIsLoaded();
+ lineUpContext(callback);
+ pendingRecords.add(id);
- journalLock.readLock().lock();
-
- try {
- JournalInternalRecord addRecord = new JournalAddRecord(true, id, recordType, record);
-
- if (callback != null) {
- callback.storeLineUp();
- }
-
- synchronized (lockAppend) {
- JournalFile usedFile = appendRecord(addRecord, false, sync, null, callback);
+ Future<?> result = appendExecutor.submit(new Runnable() {
+ @Override
+ public void run() {
+ journalLock.readLock().lock();
+ try {
+ JournalInternalRecord addRecord = new JournalAddRecord(true, id, recordType, record);
+ JournalFile usedFile = appendRecord(addRecord, false, sync, null, callback);
+ records.put(id, new JournalRecord(usedFile, addRecord.getEncodeSize()));
- if (logger.isTraceEnabled()) {
- logger.trace("appendAddRecord::id=" + id +
- ", userRecordType=" +
- recordType +
- ", record = " + record +
- ", usedFile = " +
- usedFile);
+ if (logger.isTraceEnabled()) {
+ logger.trace("appendAddRecord::id=" + id +
+ ", userRecordType=" +
+ recordType +
+ ", record = " + record +
+ ", usedFile = " +
+ usedFile);
+ }
+ } catch (Exception e) {
+ ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
+ } finally {
+ pendingRecords.remove(id);
+ journalLock.readLock().unlock();
}
-
- records.put(id, new JournalRecord(usedFile, addRecord.getEncodeSize()));
}
- } finally {
- journalLock.readLock().unlock();
+ });
+
+ if (sync && callback == null) {
+ result.get();
}
}
@@ -724,94 +731,86 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
final boolean sync,
final IOCompletion callback) throws Exception {
checkJournalIsLoaded();
+ lineUpContext(callback);
+ checkKnownRecordID(id);
- journalLock.readLock().lock();
+ Future<?> result = appendExecutor.submit(new Runnable() {
+ @Override
+ public void run() {
+ journalLock.readLock().lock();
+ try {
+ JournalRecord jrnRecord = records.get(id);
+ JournalInternalRecord updateRecord = new JournalAddRecord(false, id, recordType, record);
+ JournalFile usedFile = appendRecord(updateRecord, false, sync, null, callback);
- try {
- JournalRecord jrnRecord = records.get(id);
+ if (logger.isTraceEnabled()) {
+ logger.trace("appendUpdateRecord::id=" + id +
+ ", userRecordType=" +
+ recordType +
+ ", usedFile = " +
+ usedFile);
+ }
- if (jrnRecord == null) {
- if (!(compactor != null && compactor.lookupRecord(id))) {
- throw new IllegalStateException("Cannot find add info " + id);
+ // record==null here could only mean there is a compactor
+ // computing the delete should be done after compacting is done
+ if (jrnRecord == null) {
+ compactor.addCommandUpdate(id, usedFile, updateRecord.getEncodeSize());
+ } else {
+ jrnRecord.addUpdateFile(usedFile, updateRecord.getEncodeSize());
+ }
+ } catch (Exception e) {
+ ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
+ } finally {
+ journalLock.readLock().unlock();
}
}
+ });
- JournalInternalRecord updateRecord = new JournalAddRecord(false, id, recordType, record);
-
- if (callback != null) {
- callback.storeLineUp();
- }
-
- synchronized (lockAppend) {
- JournalFile usedFile = appendRecord(updateRecord, false, sync, null, callback);
-
- if (logger.isTraceEnabled()) {
- logger.trace("appendUpdateRecord::id=" + id +
- ", userRecordType=" +
- recordType +
- ", record = " + record +
- ", usedFile = " +
- usedFile);
- }
-
- // record== null here could only mean there is a compactor, and computing the delete should be done after
- // compacting is done
- if (jrnRecord == null) {
- compactor.addCommandUpdate(id, usedFile, updateRecord.getEncodeSize());
- } else {
- jrnRecord.addUpdateFile(usedFile, updateRecord.getEncodeSize());
- }
- }
- } finally {
- journalLock.readLock().unlock();
+ if (sync && callback == null) {
+ result.get();
}
}
@Override
public void appendDeleteRecord(final long id, final boolean sync, final IOCompletion callback) throws Exception {
checkJournalIsLoaded();
+ lineUpContext(callback);
+ checkKnownRecordID(id);
- journalLock.readLock().lock();
- try {
+ Future<?> result = appendExecutor.submit(new Runnable() {
+ @Override
+ public void run() {
+ journalLock.readLock().lock();
+ try {
+ JournalRecord record = null;
+ if (compactor == null) {
+ record = records.remove(id);
+ }
- JournalRecord record = null;
+ JournalInternalRecord deleteRecord = new JournalDeleteRecord(id);
+ JournalFile usedFile = appendRecord(deleteRecord, false, sync, null, callback);
- if (compactor == null) {
- record = records.remove(id);
+ if (logger.isTraceEnabled()) {
+ logger.trace("appendDeleteRecord::id=" + id + ", usedFile = " + usedFile);
+ }
- if (record == null) {
- throw new IllegalStateException("Cannot find add info " + id);
- }
- } else {
- if (!records.containsKey(id) && !compactor.lookupRecord(id)) {
- throw new IllegalStateException("Cannot find add info " + id + " on compactor or current records");
+ // record==null here could only mean there is a compactor
+ // computing the delete should be done after compacting is done
+ if (record == null) {
+ compactor.addCommandDelete(id, usedFile);
+ } else {
+ record.delete(usedFile);
+ }
+ } catch (Exception e) {
+ ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
+ } finally {
+ journalLock.readLock().unlock();
}
}
+ });
- JournalInternalRecord deleteRecord = new JournalDeleteRecord(id);
-
- if (callback != null) {
- callback.storeLineUp();
- }
-
- synchronized (lockAppend) {
- JournalFile usedFile = appendRecord(deleteRecord, false, sync, null, callback);
-
- if (logger.isTraceEnabled()) {
- logger.trace("appendDeleteRecord::id=" + id + ", usedFile = " + usedFile);
- }
-
- // record== null here could only mean there is a compactor, and computing the delete should be done after
- // compacting is done
- if (record == null) {
- compactor.addCommandDelete(id, usedFile);
- } else {
- record.delete(usedFile);
- }
-
- }
- } finally {
- journalLock.readLock().unlock();
+ if (sync && callback == null) {
+ result.get();
}
}
@@ -822,31 +821,62 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
final EncodingSupport record) throws Exception {
checkJournalIsLoaded();
- journalLock.readLock().lock();
+ final JournalTransaction tx = getTransactionInfo(txID);
+ tx.checkErrorCondition();
- try {
- JournalInternalRecord addRecord = new JournalAddRecordTX(true, txID, id, recordType, record);
+ appendExecutor.submit(new Runnable() {
- JournalTransaction tx = getTransactionInfo(txID);
+ @Override
+ public void run() {
+ journalLock.readLock().lock();
+ try {
+ JournalInternalRecord addRecord = new JournalAddRecordTX(true, txID, id, recordType, record);
+ JournalFile usedFile = appendRecord(addRecord, false, false, tx, null);
- synchronized (lockAppend) {
- JournalFile usedFile = appendRecord(addRecord, false, false, tx, null);
+ if (logger.isTraceEnabled()) {
+ logger.trace("appendAddRecordTransactional:txID=" + txID +
+ ",id=" +
+ id +
+ ", userRecordType=" +
+ recordType +
+ ", record = " + record +
+ ", usedFile = " +
+ usedFile);
+ }
- if (logger.isTraceEnabled()) {
- logger.trace("appendAddRecordTransactional:txID=" + txID +
- ",id=" +
- id +
- ", userRecordType=" +
- recordType +
- ", record = " + record +
- ", usedFile = " +
- usedFile);
+ tx.addPositive(usedFile, id, addRecord.getEncodeSize());
+ } catch (Exception e) {
+ ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
+ setErrorCondition(tx, e);
+ } finally {
+ journalLock.readLock().unlock();
}
+ }
+ });
+ }
+
+ private void checkKnownRecordID(final long id) throws Exception {
+ if (records.containsKey(id) || pendingRecords.contains(id) || (compactor != null && compactor.lookupRecord(id))) {
+ return;
+ }
- tx.addPositive(usedFile, id, addRecord.getEncodeSize());
+ // retry on the append thread. maybe the appender thread is not keeping up.
+ Future<Boolean> known = appendExecutor.submit(new Callable<Boolean>() {
+ @Override
+ public Boolean call() throws Exception {
+ journalLock.readLock().lock();
+ try {
+ return records.containsKey(id)
+ || pendingRecords.contains(id)
+ || (compactor != null && compactor.lookupRecord(id));
+ } finally {
+ journalLock.readLock().unlock();
+ }
}
- } finally {
- journalLock.readLock().unlock();
+ });
+
+ if (!known.get()) {
+ throw new IllegalStateException("Cannot find add info " + id + " on compactor or current records");
}
}
@@ -867,32 +897,39 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
final EncodingSupport record) throws Exception {
checkJournalIsLoaded();
- journalLock.readLock().lock();
+ final JournalTransaction tx = getTransactionInfo(txID);
+ tx.checkErrorCondition();
- try {
- JournalInternalRecord updateRecordTX = new JournalAddRecordTX(false, txID, id, recordType, record);
+ appendExecutor.submit(new Runnable() {
- JournalTransaction tx = getTransactionInfo(txID);
+ @Override
+ public void run() {
+ journalLock.readLock().lock();
+ try {
- synchronized (lockAppend) {
- JournalFile usedFile = appendRecord(updateRecordTX, false, false, tx, null);
+ JournalInternalRecord updateRecordTX = new JournalAddRecordTX( false, txID, id, recordType, record );
+ JournalFile usedFile = appendRecord( updateRecordTX, false, false, tx, null );
+
+ if ( logger.isTraceEnabled() ) {
+ logger.trace( "appendUpdateRecordTransactional::txID=" + txID +
+ ",id=" +
+ id +
+ ", userRecordType=" +
+ recordType +
+ ", record = " + record +
+ ", usedFile = " +
+ usedFile );
+ }
- if (logger.isTraceEnabled()) {
- logger.trace("appendUpdateRecordTransactional::txID=" + txID +
- ",id=" +
- id +
- ", userRecordType=" +
- recordType +
- ", record = " + record +
- ", usedFile = " +
- usedFile);
+ tx.addPositive( usedFile, id, updateRecordTX.getEncodeSize() );
+ } catch ( Exception e ) {
+ ActiveMQJournalLogger.LOGGER.error( e.getMessage(), e );
+ setErrorCondition( tx, e );
+ } finally {
+ journalLock.readLock().unlock();
}
-
- tx.addPositive(usedFile, id, updateRecordTX.getEncodeSize());
}
- } finally {
- journalLock.readLock().unlock();
- }
+ });
}
@Override
@@ -901,29 +938,35 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
final EncodingSupport record) throws Exception {
checkJournalIsLoaded();
- journalLock.readLock().lock();
+ final JournalTransaction tx = getTransactionInfo(txID);
+ tx.checkErrorCondition();
- try {
- JournalInternalRecord deleteRecordTX = new JournalDeleteRecordTX(txID, id, record);
+ appendExecutor.submit(new Runnable() {
+ @Override
+ public void run() {
+ journalLock.readLock().lock();
+ try {
- JournalTransaction tx = getTransactionInfo(txID);
+ JournalInternalRecord deleteRecordTX = new JournalDeleteRecordTX(txID, id, record);
+ JournalFile usedFile = appendRecord(deleteRecordTX, false, false, tx, null);
- synchronized (lockAppend) {
- JournalFile usedFile = appendRecord(deleteRecordTX, false, false, tx, null);
+ if (logger.isTraceEnabled()) {
+ logger.trace("appendDeleteRecordTransactional::txID=" + txID +
+ ", id=" +
+ id +
+ ", usedFile = " +
+ usedFile);
+ }
- if (logger.isTraceEnabled()) {
- logger.trace("appendDeleteRecordTransactional::txID=" + txID +
- ", id=" +
- id +
- ", usedFile = " +
- usedFile);
+ tx.addNegative(usedFile, id);
+ } catch (Exception e) {
+ ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
+ setErrorCondition(tx, e);
+ } finally {
+ journalLock.readLock().unlock();
}
-
- tx.addNegative(usedFile, id);
}
- } finally {
- journalLock.readLock().unlock();
- }
+ });
}
/**
@@ -943,36 +986,53 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
final IOCompletion callback) throws Exception {
checkJournalIsLoaded();
+ lineUpContext(callback);
- journalLock.readLock().lock();
-
- try {
- JournalTransaction tx = getTransactionInfo(txID);
-
- JournalInternalRecord prepareRecord = new JournalCompleteRecordTX(TX_RECORD_TYPE.PREPARE, txID, transactionData);
+ final JournalTransaction tx = getTransactionInfo(txID);
+ tx.checkErrorCondition();
- if (callback != null) {
- callback.storeLineUp();
- }
+ Future<?> result = appendExecutor.submit(new Runnable() {
+ @Override
+ public void run() {
+ journalLock.readLock().lock();
+ try {
+ JournalInternalRecord prepareRecord = new JournalCompleteRecordTX(TX_RECORD_TYPE.PREPARE, txID, transactionData);
+ JournalFile usedFile = appendRecord(prepareRecord, true, sync, tx, callback);
- synchronized (lockAppend) {
- JournalFile usedFile = appendRecord(prepareRecord, true, sync, tx, callback);
+ if (logger.isTraceEnabled()) {
+ logger.trace("appendPrepareRecord::txID=" + txID + ", usedFile = " + usedFile);
+ }
- if (logger.isTraceEnabled()) {
- logger.trace("appendPrepareRecord::txID=" + txID + ", usedFile = " + usedFile);
+ tx.prepare(usedFile);
+ } catch (Exception e) {
+ ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
+ setErrorCondition(tx, e);
+ } finally {
+ journalLock.readLock().unlock();
}
-
- tx.prepare(usedFile);
}
+ });
- } finally {
- journalLock.readLock().unlock();
+ if (sync && callback == null) {
+ result.get();
+ tx.checkErrorCondition();
}
}
@Override
public void lineUpContext(IOCompletion callback) {
- callback.storeLineUp();
+ if (callback != null) {
+ callback.storeLineUp();
+ }
+ }
+
+ private void setErrorCondition(JournalTransaction jt, Throwable t) {
+ if (jt != null) {
+ TransactionCallback callback = jt.getCurrentCallback();
+ if (callback != null && callback.getErrorMessage() != null) {
+ callback.onError(ActiveMQExceptionType.IO_ERROR.getCode(), t.getMessage());
+ }
+ }
}
/**
@@ -982,68 +1042,83 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
public void appendCommitRecord(final long txID,
final boolean sync,
final IOCompletion callback,
- boolean lineUpContext) throws Exception {
+ final boolean lineUpContext) throws Exception {
checkJournalIsLoaded();
+ if (lineUpContext) {
+ lineUpContext(callback);
+ }
- journalLock.readLock().lock();
+ final JournalTransaction tx = transactions.remove(txID);
- try {
- JournalTransaction tx = transactions.remove(txID);
+ if (tx == null) {
+ throw new IllegalStateException("Cannot find tx with id " + txID);
+ }
- if (tx == null) {
- throw new IllegalStateException("Cannot find tx with id " + txID);
- }
+ tx.checkErrorCondition();
- JournalInternalRecord commitRecord = new JournalCompleteRecordTX(TX_RECORD_TYPE.COMMIT, txID, null);
+ Future<?> result = appendExecutor.submit(new Runnable() {
+ @Override
+ public void run() {
+ journalLock.readLock().lock();
+ try {
+ JournalInternalRecord commitRecord = new JournalCompleteRecordTX(TX_RECORD_TYPE.COMMIT, txID, null);
+ JournalFile usedFile = appendRecord(commitRecord, true, sync, tx, callback);
- if (callback != null && lineUpContext) {
- callback.storeLineUp();
- }
- synchronized (lockAppend) {
- JournalFile usedFile = appendRecord(commitRecord, true, sync, tx, callback);
+ if (logger.isTraceEnabled()) {
+ logger.trace("appendCommitRecord::txID=" + txID + ", usedFile = " + usedFile);
+ }
- if (logger.isTraceEnabled()) {
- logger.trace("appendCommitRecord::txID=" + txID + ", usedFile = " + usedFile);
+ tx.commit(usedFile);
+ } catch (Exception e) {
+ ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
+ setErrorCondition(tx, e);
+ } finally {
+ journalLock.readLock().unlock();
}
-
- tx.commit(usedFile);
}
+ });
- } finally {
- journalLock.readLock().unlock();
+ if (sync && callback == null) {
+ result.get();
+ tx.checkErrorCondition();
}
}
@Override
public void appendRollbackRecord(final long txID, final boolean sync, final IOCompletion callback) throws Exception {
checkJournalIsLoaded();
+ lineUpContext(callback);
- journalLock.readLock().lock();
-
- JournalTransaction tx = null;
-
- try {
- tx = transactions.remove(txID);
-
- if (tx == null) {
- throw new IllegalStateException("Cannot find tx with id " + txID);
- }
+ final JournalTransaction tx = transactions.remove(txID);
- JournalInternalRecord rollbackRecord = new JournalRollbackRecordTX(txID);
+ if (tx == null) {
+ throw new IllegalStateException("Cannot find tx with id " + txID);
+ }
- if (callback != null) {
- callback.storeLineUp();
- }
+ tx.checkErrorCondition();
- synchronized (lockAppend) {
- JournalFile usedFile = appendRecord(rollbackRecord, false, sync, tx, callback);
+ Future<?> result = appendExecutor.submit(new Runnable() {
+ @Override
+ public void run() {
+ journalLock.readLock().lock();
+ try {
+ JournalInternalRecord rollbackRecord = new JournalRollbackRecordTX(txID);
+ JournalFile usedFile = appendRecord(rollbackRecord, false, sync, tx, callback);
- tx.rollback(usedFile);
+ tx.rollback(usedFile);
+ } catch (Exception e) {
+ ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
+ setErrorCondition(tx, e);
+ } finally {
+ journalLock.readLock().unlock();
+ }
}
+ });
- } finally {
- journalLock.readLock().unlock();
+ if (sync && callback == null) {
+ result.get();
+ tx.checkErrorCondition();
}
}
@@ -1906,13 +1981,23 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
public void debugWait() throws InterruptedException {
fileFactory.flush();
- for (JournalTransaction tx : transactions.values()) {
- tx.waitCallbacks();
+ if (appendExecutor != null && !appendExecutor.isShutdown()) {
+ // Send something to the closingExecutor, just to make sure we went until its end
+ final CountDownLatch latch = newLatch(1);
+
+ appendExecutor.execute(new Runnable() {
+
+ @Override
+ public void run() {
+ latch.countDown();
+ }
+
+ });
+ awaitLatch(latch, -1);
}
if (filesExecutor != null && !filesExecutor.isShutdown()) {
- // Send something to the closingExecutor, just to make sure we went
- // until its end
+ // Send something to the closingExecutor, just to make sure we went until its end
final CountDownLatch latch = newLatch(1);
filesExecutor.execute(new Runnable() {
@@ -1985,20 +2070,52 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
// In some tests we need to force the journal to move to a next file
@Override
public void forceMoveNextFile() throws Exception {
- journalLock.readLock().lock();
+ debugWait();
+ journalLock.writeLock().lock();
try {
- synchronized (lockAppend) {
- moveNextFile(false);
- debugWait();
- }
+ moveNextFile(false);
} finally {
- journalLock.readLock().unlock();
+ journalLock.writeLock().unlock();
}
}
@Override
public void perfBlast(final int pages) {
- new PerfBlast(pages).start();
+
+ checkJournalIsLoaded();
+
+ final ByteArrayEncoding byteEncoder = new ByteArrayEncoding(new byte[128 * 1024]);
+
+ final JournalInternalRecord blastRecord = new JournalInternalRecord() {
+
+ @Override
+ public int getEncodeSize() {
+ return byteEncoder.getEncodeSize();
+ }
+
+ @Override
+ public void encode(final ActiveMQBuffer buffer) {
+ byteEncoder.encode(buffer);
+ }
+ };
+
+ appendExecutor.submit(new Runnable() {
+ @Override
+ public void run() {
+ journalLock.readLock().lock();
+ try {
+
+ for (int i = 0; i < pages; i++) {
+ appendRecord(blastRecord, false, false, null, null);
+ }
+
+ } catch (Exception e) {
+ ActiveMQJournalLogger.LOGGER.failedToPerfBlast(e);
+ } finally {
+ journalLock.readLock().unlock();
+ }
+ }
+ });
}
// ActiveMQComponent implementation
@@ -2031,6 +2148,14 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
}
});
+ appendExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() {
+
+ @Override
+ public Thread newThread(final Runnable r) {
+ return new Thread(r, "JournalImpl::appendExecutor");
+ }
+ });
+
filesRepository.setExecutor(filesExecutor);
fileFactory.start();
@@ -2044,46 +2169,50 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
throw new IllegalStateException("Journal is already stopped");
}
- journalLock.writeLock().lock();
- try {
- synchronized (lockAppend) {
+ setJournalState(JournalState.STOPPED);
- setJournalState(JournalState.STOPPED);
+ // appendExecutor must be shut down first
+ appendExecutor.shutdown();
- compactorExecutor.shutdown();
+ if (!appendExecutor.awaitTermination(60, TimeUnit.SECONDS)) {
+ ActiveMQJournalLogger.LOGGER.couldNotStopJournalAppendExecutor();
+ }
- if (!compactorExecutor.awaitTermination(120, TimeUnit.SECONDS)) {
- ActiveMQJournalLogger.LOGGER.couldNotStopCompactor();
- }
+ journalLock.writeLock().lock();
+ try {
+ compactorExecutor.shutdown();
- filesExecutor.shutdown();
+ if (!compactorExecutor.awaitTermination(120, TimeUnit.SECONDS)) {
+ ActiveMQJournalLogger.LOGGER.couldNotStopCompactor();
+ }
- filesRepository.setExecutor(null);
+ filesExecutor.shutdown();
- if (!filesExecutor.awaitTermination(60, TimeUnit.SECONDS)) {
- ActiveMQJournalLogger.LOGGER.couldNotStopJournalExecutor();
- }
+ filesRepository.setExecutor(null);
- try {
- for (CountDownLatch latch : latches) {
- latch.countDown();
- }
- } catch (Throwable e) {
- ActiveMQJournalLogger.LOGGER.warn(e.getMessage(), e);
+ if (!filesExecutor.awaitTermination(60, TimeUnit.SECONDS)) {
+ ActiveMQJournalLogger.LOGGER.couldNotStopJournalExecutor();
+ }
+
+ try {
+ for (CountDownLatch latch : latches) {
+ latch.countDown();
}
+ } catch (Throwable e) {
+ ActiveMQJournalLogger.LOGGER.warn(e.getMessage(), e);
+ }
- fileFactory.deactivateBuffer();
+ fileFactory.deactivateBuffer();
- if (currentFile != null && currentFile.getFile().isOpen()) {
- currentFile.getFile().close();
- }
+ if (currentFile != null && currentFile.getFile().isOpen()) {
+ currentFile.getFile().close();
+ }
- filesRepository.clear();
+ filesRepository.clear();
- fileFactory.stop();
+ fileFactory.stop();
- currentFile = null;
- }
+ currentFile = null;
} finally {
journalLock.writeLock().unlock();
}
@@ -2358,7 +2487,6 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
final boolean sync,
final JournalTransaction tx,
final IOCallback parameterCallback) throws Exception {
- checkJournalIsLoaded();
final IOCallback callback;
@@ -2552,46 +2680,6 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
}
}
- private final class PerfBlast extends Thread {
-
- private final int pages;
-
- private PerfBlast(final int pages) {
- super("activemq-perfblast-thread");
-
- this.pages = pages;
- }
-
- @Override
- public void run() {
- synchronized (lockAppend) {
- try {
-
- final ByteArrayEncoding byteEncoder = new ByteArrayEncoding(new byte[128 * 1024]);
-
- JournalInternalRecord blastRecord = new JournalInternalRecord() {
-
- @Override
- public int getEncodeSize() {
- return byteEncoder.getEncodeSize();
- }
-
- @Override
- public void encode(final ActiveMQBuffer buffer) {
- byteEncoder.encode(buffer);
- }
- };
-
- for (int i = 0; i < pages; i++) {
- appendRecord(blastRecord, false, false, null, null);
- }
- } catch (Exception e) {
- ActiveMQJournalLogger.LOGGER.failedToPerfBlast(e);
- }
- }
- }
- }
-
@Override
public final void synchronizationLock() {
compactorLock.writeLock().lock();
@@ -2624,7 +2712,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
long maxID = -1;
for (long id : fileIds) {
maxID = Math.max(maxID, id);
- map.put(Long.valueOf(id), filesRepository.createRemoteBackupSyncFile(id));
+ map.put(id, filesRepository.createRemoteBackupSyncFile(id));
}
filesRepository.setNextFileID(maxID);
return map;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b47461f/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java
index 6e41c17..1542bd4 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java
@@ -17,11 +17,13 @@
package org.apache.activemq.artemis.core.journal.impl;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.artemis.api.core.ActiveMQExceptionType;
@@ -45,12 +47,14 @@ public class JournalTransaction {
private boolean compacting = false;
- private Map<JournalFile, TransactionCallback> callbackList;
+ private final Map<JournalFile, TransactionCallback> callbackList = Collections.synchronizedMap(new HashMap<JournalFile, TransactionCallback>());
private JournalFile lastFile = null;
private final AtomicInteger counter = new AtomicInteger();
+ private CountDownLatch firstCallbackLatch;
+
public JournalTransaction(final long id, final JournalRecordProvider journal) {
this.id = id;
this.journal = journal;
@@ -139,9 +143,7 @@ public class JournalTransaction {
pendingFiles.clear();
}
- if (callbackList != null) {
- callbackList.clear();
- }
+ callbackList.clear();
if (pos != null) {
pos.clear();
@@ -156,6 +158,8 @@ public class JournalTransaction {
lastFile = null;
currentCallback = null;
+
+ firstCallbackLatch = null;
}
/**
@@ -166,9 +170,13 @@ public class JournalTransaction {
data.setNumberOfRecords(getCounter(currentFile));
}
+ public TransactionCallback getCurrentCallback() {
+ return currentCallback;
+ }
+
public TransactionCallback getCallback(final JournalFile file) throws Exception {
- if (callbackList == null) {
- callbackList = new HashMap<>();
+ if (firstCallbackLatch != null && callbackList.isEmpty()) {
+ firstCallbackLatch.countDown();
}
currentCallback = callbackList.get(file);
@@ -178,15 +186,19 @@ public class JournalTransaction {
callbackList.put(file, currentCallback);
}
- if (currentCallback.getErrorMessage() != null) {
- throw ActiveMQExceptionType.createException(currentCallback.getErrorCode(), currentCallback.getErrorMessage());
- }
-
currentCallback.countUp();
return currentCallback;
}
+ public void checkErrorCondition() throws Exception {
+ if (currentCallback != null) {
+ if (currentCallback.getErrorMessage() != null) {
+ throw ActiveMQExceptionType.createException(currentCallback.getErrorCode(), currentCallback.getErrorMessage());
+ }
+ }
+ }
+
public void addPositive(final JournalFile file, final long id, final int size) {
incCounter(file);
@@ -264,7 +276,8 @@ public class JournalTransaction {
}
public void waitCallbacks() throws InterruptedException {
- if (callbackList != null) {
+ waitFirstCallback();
+ synchronized (callbackList) {
for (TransactionCallback callback : callbackList.values()) {
callback.waitCompletion();
}
@@ -275,8 +288,15 @@ public class JournalTransaction {
* Wait completion at the latest file only
*/
public void waitCompletion() throws Exception {
- if (currentCallback != null) {
- currentCallback.waitCompletion();
+ waitFirstCallback();
+ currentCallback.waitCompletion();
+ }
+
+ private void waitFirstCallback() throws InterruptedException {
+ if (currentCallback == null) {
+ firstCallbackLatch = new CountDownLatch(1);
+ firstCallbackLatch.await();
+ firstCallbackLatch = null;
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b47461f/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java
index 198185c..6758c64 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/journal/ActiveMQJournalLogger.java
@@ -143,7 +143,7 @@ public interface ActiveMQJournalLogger extends BasicLogger {
void compactReadError(JournalFile file);
@LogMessage(level = Logger.Level.WARN)
- @Message(id = 142012, value = "Couldn''t find tx={0} to merge after compacting",
+ @Message(id = 142012, value = "Couldn't find tx={0} to merge after compacting",
format = Message.Format.MESSAGE_FORMAT)
void compactMergeError(Long id);
@@ -163,12 +163,12 @@ public interface ActiveMQJournalLogger extends BasicLogger {
void uncomittedTxFound(Long id);
@LogMessage(level = Logger.Level.WARN)
- @Message(id = 142016, value = "Couldn''t stop compactor executor after 120 seconds",
+ @Message(id = 142016, value = "Could not stop compactor executor after 120 seconds",
format = Message.Format.MESSAGE_FORMAT)
void couldNotStopCompactor();
@LogMessage(level = Logger.Level.WARN)
- @Message(id = 142017, value = "Couldn''t stop journal executor after 60 seconds",
+ @Message(id = 142017, value = "Could not stop journal executor after 60 seconds",
format = Message.Format.MESSAGE_FORMAT)
void couldNotStopJournalExecutor();
@@ -182,7 +182,7 @@ public interface ActiveMQJournalLogger extends BasicLogger {
void deletingOrphanedFile(String fileToDelete);
@LogMessage(level = Logger.Level.WARN)
- @Message(id = 142020, value = "Couldn''t get lock after 60 seconds on closing Asynchronous File: {0}", format = Message.Format.MESSAGE_FORMAT)
+ @Message(id = 142020, value = "Could not get lock after 60 seconds on closing Asynchronous File: {0}", format = Message.Format.MESSAGE_FORMAT)
void errorClosingFile(String fileToDelete);
@LogMessage(level = Logger.Level.WARN)
@@ -241,6 +241,10 @@ public interface ActiveMQJournalLogger extends BasicLogger {
@Message(id = 142034, value = "Exception on submitting write", format = Message.Format.MESSAGE_FORMAT)
void errorSubmittingWrite(@Cause Throwable e);
+ @LogMessage(level = Logger.Level.WARN)
+ @Message(id = 142035, value = "Could not stop journal append executor after 60 seconds", format = Message.Format.MESSAGE_FORMAT)
+ void couldNotStopJournalAppendExecutor();
+
@LogMessage(level = Logger.Level.ERROR)
@Message(id = 144000, value = "Failed to delete file {0}", format = Message.Format.MESSAGE_FORMAT)
void errorDeletingFile(Object e);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b47461f/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
index 080db78..5e27b36 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
@@ -532,6 +532,8 @@ public class AlignedJournalImplTest extends ActiveMQTestBase {
journalImpl.appendCommitRecord(1L, false);
+ journalImpl.debugWait();
+
System.out.println("Files = " + factory.listFiles("tt"));
SequentialFile file = factory.createSequentialFile("tt-1.tt");
@@ -598,6 +600,8 @@ public class AlignedJournalImplTest extends ActiveMQTestBase {
journalImpl.appendCommitRecord(2L, false);
+ journalImpl.debugWait();
+
SequentialFile file = factory.createSequentialFile("tt-1.tt");
file.open();
@@ -697,6 +701,8 @@ public class AlignedJournalImplTest extends ActiveMQTestBase {
journalImpl.appendCommitRecord(1L, false);
+ journalImpl.debugWait();
+
SequentialFile file = factory.createSequentialFile("tt-1.tt");
file.open();
@@ -936,8 +942,7 @@ public class AlignedJournalImplTest extends ActiveMQTestBase {
journalImpl.forceMoveNextFile();
- // Reclaiming should still be able to reclaim a file if a transaction was
- // ignored
+ // Reclaiming should still be able to reclaim a file if a transaction was ignored
journalImpl.checkReclaimStatus();
Assert.assertEquals(2, factory.listFiles("tt").size());
@@ -1109,7 +1114,16 @@ public class AlignedJournalImplTest extends ActiveMQTestBase {
}
@Test
- public void testReclaimingAfterConcurrentAddsAndDeletes() throws Exception {
+ public void testReclaimingAfterConcurrentAddsAndDeletesTx() throws Exception {
+ testReclaimingAfterConcurrentAddsAndDeletes(true);
+ }
+
+ @Test
+ public void testReclaimingAfterConcurrentAddsAndDeletesNonTx() throws Exception {
+ testReclaimingAfterConcurrentAddsAndDeletes(false);
+ }
+
+ public void testReclaimingAfterConcurrentAddsAndDeletes(final boolean transactional) throws Exception {
final int JOURNAL_SIZE = 10 * 1024;
setupAndLoadJournal(JOURNAL_SIZE, 1);
@@ -1131,8 +1145,14 @@ public class AlignedJournalImplTest extends ActiveMQTestBase {
latchReady.countDown();
ActiveMQTestBase.waitForLatch(latchStart);
for (int i = 0; i < NUMBER_OF_ELEMENTS; i++) {
- journalImpl.appendAddRecordTransactional(i, i, (byte) 1, new SimpleEncoding(50, (byte) 1));
- journalImpl.appendCommitRecord(i, false);
+
+ if (transactional) {
+ journalImpl.appendAddRecordTransactional(i, i, (byte) 1, new SimpleEncoding(50, (byte) 1));
+ journalImpl.appendCommitRecord(i, false);
+ } else {
+ journalImpl.appendAddRecord(i, (byte) 1, new SimpleEncoding(50, (byte) 1), false);
+ }
+
queueDelete.offer(i);
}
finishedOK.incrementAndGet();
@@ -1153,7 +1173,14 @@ public class AlignedJournalImplTest extends ActiveMQTestBase {
if (toDelete == null) {
break;
}
- journalImpl.appendDeleteRecord(toDelete, false);
+
+ if (transactional) {
+ journalImpl.appendDeleteRecordTransactional(toDelete, toDelete, new SimpleEncoding(50, (byte) 1));
+ journalImpl.appendCommitRecord(i, false);
+ } else {
+ journalImpl.appendDeleteRecord(toDelete, false);
+ }
+
}
finishedOK.incrementAndGet();
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4b47461f/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalAsyncTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalAsyncTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalAsyncTest.java
index 41058c6..204600e 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalAsyncTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalAsyncTest.java
@@ -81,6 +81,8 @@ public class JournalAsyncTest extends ActiveMQTestBase {
journalImpl.appendAddRecordTransactional(1L, i, (byte) 1, new SimpleEncoding(1, (byte) 0));
}
+ journalImpl.debugWait();
+
latch.countDown();
factory.setHoldCallbacks(false, null);
if (isCommit) {
@@ -115,8 +117,7 @@ public class JournalAsyncTest extends ActiveMQTestBase {
}
}
- // If a callback error already arrived, we should just throw the exception
- // right away
+ // If a callback error already arrived, we should just throw the exception right away
@Test
public void testPreviousError() throws Exception {
final int JOURNAL_SIZE = 20000;
@@ -128,6 +129,8 @@ public class JournalAsyncTest extends ActiveMQTestBase {
journalImpl.appendAddRecordTransactional(1L, 1, (byte) 1, new SimpleEncoding(1, (byte) 0));
+ journalImpl.debugWait();
+
factory.flushAllCallbacks();
factory.setGenerateErrors(false);
@@ -135,11 +138,11 @@ public class JournalAsyncTest extends ActiveMQTestBase {
try {
journalImpl.appendAddRecordTransactional(1L, 2, (byte) 1, new SimpleEncoding(1, (byte) 0));
- Assert.fail("Exception expected"); // An exception already happened in one
- // of the elements on this transaction.
- // We can't accept any more elements on
- // the transaction
+ Assert.fail("Exception expected");
+ // An exception already happened in one of the elements on this transaction.
+ // We can't accept any more elements on the transaction
} catch (Exception ignored) {
+
}
}
[14/34] activemq-artemis git commit: NO-JIRA fixing byteman (extra
tests)
Posted by ma...@apache.org.
NO-JIRA fixing byteman (extra tests)
Two issues encountered here:
i - ClosingConnectionTest was intermittently breaking other tests, in particular it was breaking PagingLeakTest for no apparent reason
. apparently it was a dead lock from removeAddress on the ServerController
ii - it still showing issues after removing the not needed synchronziation. Since the test is not really needed I am just removing the offending test.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/e49eda96
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/e49eda96
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/e49eda96
Branch: refs/heads/ARTEMIS-780
Commit: e49eda966417e83906e9f7a5bf9c89b978ceaff0
Parents: 51fa840
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Oct 28 00:31:42 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Oct 28 16:32:04 2016 -0400
----------------------------------------------------------------------
.../impl/ActiveMQServerControlImpl.java | 6 +-
.../extras/byteman/ClosingConnectionTest.java | 160 -------------------
2 files changed, 3 insertions(+), 163 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e49eda96/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
index fb7deee..b0e8b9b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
@@ -1189,7 +1189,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
}
@Override
- public synchronized boolean closeConnectionsForAddress(final String ipAddress) {
+ public boolean closeConnectionsForAddress(final String ipAddress) {
checkStarted();
clearIO();
@@ -1213,7 +1213,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
}
@Override
- public synchronized boolean closeConsumerConnectionsForAddress(final String address) {
+ public boolean closeConsumerConnectionsForAddress(final String address) {
boolean closed = false;
checkStarted();
@@ -1251,7 +1251,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
}
@Override
- public synchronized boolean closeConnectionsForUser(final String userName) {
+ public boolean closeConnectionsForUser(final String userName) {
boolean closed = false;
checkStarted();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e49eda96/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java
deleted file mode 100644
index d4bfc00..0000000
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ClosingConnectionTest.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.artemis.tests.extras.byteman;
-
-import javax.management.MBeanServer;
-import javax.management.MBeanServerFactory;
-
-import org.apache.activemq.artemis.api.core.SimpleString;
-import org.apache.activemq.artemis.api.core.client.ClientMessage;
-import org.apache.activemq.artemis.api.core.client.ClientProducer;
-import org.apache.activemq.artemis.api.core.client.ClientSession;
-import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
-import org.apache.activemq.artemis.api.core.client.ServerLocator;
-import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;
-import org.apache.activemq.artemis.core.server.ActiveMQServer;
-import org.apache.activemq.artemis.core.server.JournalType;
-import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
-import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
-import org.apache.activemq.artemis.tests.integration.management.ManagementControlHelper;
-import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
-import org.jboss.byteman.contrib.bmunit.BMRule;
-import org.jboss.byteman.contrib.bmunit.BMRules;
-import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(BMUnitRunner.class)
-public class ClosingConnectionTest extends ActiveMQTestBase {
-
- public static final SimpleString ADDRESS = new SimpleString("SimpleAddress");
-
- private ServerLocator locator;
-
- private ActiveMQServer server;
-
- private static MBeanServer mBeanServer;
-
- private static boolean readyToKill = false;
-
- protected boolean isNetty() {
- return true;
- }
-
- @Override
- @Before
- public void setUp() throws Exception {
- super.setUp();
- mBeanServer = MBeanServerFactory.createMBeanServer();
- server = newActiveMQServer();
- server.getConfiguration().setJournalType(JournalType.NIO);
- server.getConfiguration().setJMXManagementEnabled(true);
- server.start();
- waitForServerToStart(server);
- locator = createFactory(isNetty());
- readyToKill = false;
- }
-
- public static void killConnection() throws InterruptedException {
- if (readyToKill) {
- // We have to kill the connection in a new thread otherwise Netty won't interrupt the current thread
- Thread closeConnectionThread = new Thread(new Runnable() {
- @Override
- public void run() {
- try {
- ActiveMQServerControl serverControl = ManagementControlHelper.createActiveMQServerControl(mBeanServer);
- serverControl.closeConnectionsForUser("guest");
- readyToKill = false;
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- });
-
- closeConnectionThread.start();
-
- try {
- /* We want to simulate a long-running remoting thread here. If closing the connection in the closeConnectionThread
- * interrupts this thread then it will cause sleep() to throw and InterruptedException. Therefore we catch
- * the InterruptedException and re-interrupt the current thread so the interrupt will be passed properly
- * back to the caller. It's a bit of a hack, but I couldn't find any other way to simulate it.
- */
- Thread.sleep(1500);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- }
- }
- }
-
- /*
- * Test for https://bugzilla.redhat.com/show_bug.cgi?id=1193085
- * */
- @Test
- @BMRules(rules = {@BMRule(
- name = "rule to kill connection",
- targetClass = "org.apache.activemq.artemis.core.io.nio.NIOSequentialFile",
- targetMethod = "open(int, boolean)",
- targetLocation = "AT INVOKE java.nio.channels.FileChannel.size()",
- action = "org.apache.activemq.artemis.tests.extras.byteman.ClosingConnectionTest.killConnection();")})
- public void testKillConnection() throws Exception {
- locator.setBlockOnNonDurableSend(true).setBlockOnDurableSend(true).setBlockOnAcknowledge(true);
-
- ClientSessionFactory sf = createSessionFactory(locator);
- ClientSession session = sf.createSession("guest", null, false, true, true, false, 0);
-
- session.createQueue(ADDRESS, ADDRESS, null, true);
-
- ClientProducer producer = session.createProducer(ADDRESS);
-
- ClientMessage message = session.createMessage(true);
- message.getBodyBuffer().writeBytes(new byte[1024]);
-
- for (int i = 0; i < 200; i++) {
- producer.send(message);
- }
-
- assertTrue(server.locateQueue(ADDRESS).getPageSubscription().getPagingStore().isPaging());
-
- readyToKill = true;
- try {
- for (int i = 0; i < 10; i++) {
- producer.send(message);
- }
- fail("Sending message here should result in failure.");
- } catch (Exception e) {
- IntegrationTestLogger.LOGGER.info("Caught exception: " + e.getMessage());
- }
-
- Thread.sleep(1000);
-
- assertTrue(server.isStarted());
-
- session.close();
- }
-
- private ActiveMQServer newActiveMQServer() throws Exception {
- ActiveMQServer server = createServer(true, createDefaultConfig(isNetty()));
- server.setMBeanServer(mBeanServer);
-
- AddressSettings defaultSetting = new AddressSettings().setPageSizeBytes(10 * 1024).setMaxSizeBytes(20 * 1024);
-
- server.getAddressSettingsRepository().addMatch("#", defaultSetting);
-
- return server;
- }
-}
[26/34] activemq-artemis git commit: ARTEMIS-790 Added Configuration
conversion tooL
Posted by ma...@apache.org.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1bc0a36/artemis-tools/src/test/resources/artemis-server.xsd
----------------------------------------------------------------------
diff --git a/artemis-tools/src/test/resources/artemis-server.xsd b/artemis-tools/src/test/resources/artemis-server.xsd
new file mode 100644
index 0000000..1e2e816
--- /dev/null
+++ b/artemis-tools/src/test/resources/artemis-server.xsd
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<xsd:schema xmlns="urn:activemq"
+ targetNamespace="urn:activemq"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ attributeFormDefault="unqualified"
+ elementFormDefault="qualified"
+ version="1.0">
+ <xsd:element name="configuration">
+ <xsd:annotation>
+ <xsd:documentation>
+ Root element for a document specifying the configuration
+ of a single "standalone" server that does not operate
+ as part of a domain.
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:choice minOccurs="1" maxOccurs="unbounded">
+ <xsd:any namespace="##other">
+ <xsd:annotation>
+ <xsd:documentation>A profile declaration may include configuration
+ elements from other namespaces for the subsystems that make up the profile.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:any>
+ </xsd:choice>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+</xsd:schema>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1bc0a36/artemis-tools/src/test/resources/broker.xml
----------------------------------------------------------------------
diff --git a/artemis-tools/src/test/resources/broker.xml b/artemis-tools/src/test/resources/broker.xml
new file mode 100644
index 0000000..bd33d59
--- /dev/null
+++ b/artemis-tools/src/test/resources/broker.xml
@@ -0,0 +1,64 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
+ <jms xmlns="urn:activemq:jms">
+ <!--the queue used by the example-->
+ <queue name="exampleQueue"/>
+ </jms>
+
+ <core xmlns="urn:activemq:core">
+
+ <persistence-enabled>false</persistence-enabled>
+ <!-- Connectors -->
+
+ <connectors>
+ <connector name="in-vm">vm://0</connector>
+ </connectors>
+
+ <acceptors>
+ <acceptor name="in-vm">vm://0</acceptor>
+ </acceptors>
+
+ <!-- Other config -->
+
+ <security-settings>
+ <!--security for example queue-->
+ <security-setting match="jms.queue.exampleQueue">
+ <permission type="createDurableQueue" roles="guest"/>
+ <permission type="deleteDurableQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+ <queues>
+ <queue name="foo">
+ <address>bar</address>
+ </queue>
+ <queue name="bar">
+ <address>afar</address>
+ <durable>true</durable>
+ <filter string="name='car'" />
+ </queue>
+ </queues>
+ </core>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1bc0a36/artemis-tools/src/test/resources/replace/broker.xml
----------------------------------------------------------------------
diff --git a/artemis-tools/src/test/resources/replace/broker.xml b/artemis-tools/src/test/resources/replace/broker.xml
new file mode 100644
index 0000000..bd33d59
--- /dev/null
+++ b/artemis-tools/src/test/resources/replace/broker.xml
@@ -0,0 +1,64 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
+ <jms xmlns="urn:activemq:jms">
+ <!--the queue used by the example-->
+ <queue name="exampleQueue"/>
+ </jms>
+
+ <core xmlns="urn:activemq:core">
+
+ <persistence-enabled>false</persistence-enabled>
+ <!-- Connectors -->
+
+ <connectors>
+ <connector name="in-vm">vm://0</connector>
+ </connectors>
+
+ <acceptors>
+ <acceptor name="in-vm">vm://0</acceptor>
+ </acceptors>
+
+ <!-- Other config -->
+
+ <security-settings>
+ <!--security for example queue-->
+ <security-setting match="jms.queue.exampleQueue">
+ <permission type="createDurableQueue" roles="guest"/>
+ <permission type="deleteDurableQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+ <queues>
+ <queue name="foo">
+ <address>bar</address>
+ </queue>
+ <queue name="bar">
+ <address>afar</address>
+ <durable>true</durable>
+ <filter string="name='car'" />
+ </queue>
+ </queues>
+ </core>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1bc0a36/artemis-tools/src/test/resources/replace/broker2.xml
----------------------------------------------------------------------
diff --git a/artemis-tools/src/test/resources/replace/broker2.xml b/artemis-tools/src/test/resources/replace/broker2.xml
new file mode 100644
index 0000000..bd33d59
--- /dev/null
+++ b/artemis-tools/src/test/resources/replace/broker2.xml
@@ -0,0 +1,64 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<configuration xmlns="urn:activemq"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
+ <jms xmlns="urn:activemq:jms">
+ <!--the queue used by the example-->
+ <queue name="exampleQueue"/>
+ </jms>
+
+ <core xmlns="urn:activemq:core">
+
+ <persistence-enabled>false</persistence-enabled>
+ <!-- Connectors -->
+
+ <connectors>
+ <connector name="in-vm">vm://0</connector>
+ </connectors>
+
+ <acceptors>
+ <acceptor name="in-vm">vm://0</acceptor>
+ </acceptors>
+
+ <!-- Other config -->
+
+ <security-settings>
+ <!--security for example queue-->
+ <security-setting match="jms.queue.exampleQueue">
+ <permission type="createDurableQueue" roles="guest"/>
+ <permission type="deleteDurableQueue" roles="guest"/>
+ <permission type="createNonDurableQueue" roles="guest"/>
+ <permission type="deleteNonDurableQueue" roles="guest"/>
+ <permission type="consume" roles="guest"/>
+ <permission type="send" roles="guest"/>
+ </security-setting>
+ </security-settings>
+
+ <queues>
+ <queue name="foo">
+ <address>bar</address>
+ </queue>
+ <queue name="bar">
+ <address>afar</address>
+ <durable>true</durable>
+ <filter string="name='car'" />
+ </queue>
+ </queues>
+ </core>
+
+</configuration>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/e1bc0a36/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index eefc4cd..cd43231 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,7 @@
<module>integration/activemq-aerogear-integration</module>
<module>integration/activemq-vertx-integration</module>
<module>artemis-distribution</module>
+ <module>artemis-tools</module>
<module>tests</module>
<module>artemis-features</module>
</modules>
[25/34] activemq-artemis git commit: Add Queue Meta Data for
DeleteOnNoConsumers, MaxConsumers
Posted by ma...@apache.org.
Add Queue Meta Data for DeleteOnNoConsumers,MaxConsumers
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/19ce2fbf
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/19ce2fbf
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/19ce2fbf
Branch: refs/heads/ARTEMIS-780
Commit: 19ce2fbff0cc67f20656de17cc47eb74fdc79121
Parents: c3ece06
Author: Martyn Taylor <mt...@redhat.com>
Authored: Mon Oct 31 13:19:02 2016 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Nov 1 10:20:52 2016 +0000
----------------------------------------------------------------------
.../impl/ActiveMQServerControlImpl.java | 1 -
.../core/persistence/QueueBindingInfo.java | 7 ++
.../codec/PersistentQueueBindingEncoding.java | 43 ++++++++++-
.../artemis/core/server/ActiveMQServer.java | 9 +++
.../activemq/artemis/core/server/Queue.java | 4 ++
.../artemis/core/server/QueueConfig.java | 51 ++++++++++++-
.../core/server/impl/ActiveMQServerImpl.java | 76 +++++++++++++++++---
.../artemis/core/server/impl/AddressInfo.java | 5 +-
.../server/impl/PostOfficeJournalLoader.java | 8 ++-
9 files changed, 185 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/19ce2fbf/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
index b0e8b9b..fcbf15c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
@@ -573,7 +573,6 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
SimpleString filter = filterStr == null ? null : new SimpleString(filterStr);
clearIO();
try {
-
server.deployQueue(SimpleString.toSimpleString(address), new SimpleString(name), filter, durable, false);
} finally {
blockOnIO();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/19ce2fbf/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/QueueBindingInfo.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/QueueBindingInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/QueueBindingInfo.java
index 8c80a8a..4d435c6 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/QueueBindingInfo.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/QueueBindingInfo.java
@@ -46,4 +46,11 @@ public interface QueueBindingInfo {
List<QueueStatusEncoding> getQueueStatusEncodings();
+ int getMaxConsumers();
+
+ void setMaxConsumers(int maxConsumers);
+
+ boolean isDeleteOnNoConsumers();
+
+ void setDeleteOnNoConsumers();
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/19ce2fbf/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentQueueBindingEncoding.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentQueueBindingEncoding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentQueueBindingEncoding.java
index 039460c..78a81ea 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentQueueBindingEncoding.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentQueueBindingEncoding.java
@@ -41,6 +41,10 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin
public List<QueueStatusEncoding> queueStatusEncodings;
+ public int maxConsumers;
+
+ public boolean deleteOnNoConsumers;
+
public PersistentQueueBindingEncoding() {
}
@@ -57,6 +61,10 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin
user +
", autoCreated=" +
autoCreated +
+ ", maxConsumers=" +
+ maxConsumers +
+ ", deleteOnNoConsumers=" +
+ deleteOnNoConsumers +
"]";
}
@@ -125,6 +133,26 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin
}
@Override
+ public int getMaxConsumers() {
+ return 0;
+ }
+
+ @Override
+ public void setMaxConsumers(int maxConsumers) {
+
+ }
+
+ @Override
+ public boolean isDeleteOnNoConsumers() {
+ return false;
+ }
+
+ @Override
+ public void setDeleteOnNoConsumers() {
+
+ }
+
+ @Override
public void decode(final ActiveMQBuffer buffer) {
name = buffer.readSimpleString();
address = buffer.readSimpleString();
@@ -144,6 +172,15 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin
}
autoCreated = buffer.readBoolean();
+
+ if (buffer.readableBytes() > 0) {
+ maxConsumers = buffer.readInt();
+ deleteOnNoConsumers = buffer.readBoolean();
+ }
+ else {
+ maxConsumers = -1;
+ deleteOnNoConsumers = false;
+ }
}
@Override
@@ -153,13 +190,17 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin
buffer.writeNullableSimpleString(filterString);
buffer.writeNullableSimpleString(createMetadata());
buffer.writeBoolean(autoCreated);
+ buffer.writeInt(maxConsumers);
+ buffer.writeBoolean(deleteOnNoConsumers);
}
@Override
public int getEncodeSize() {
return SimpleString.sizeofString(name) + SimpleString.sizeofString(address) +
SimpleString.sizeofNullableString(filterString) + DataConstants.SIZE_BOOLEAN +
- SimpleString.sizeofNullableString(createMetadata());
+ SimpleString.sizeofNullableString(createMetadata()) +
+ DataConstants.SIZE_INT +
+ DataConstants.SIZE_BOOLEAN;
}
private SimpleString createMetadata() {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/19ce2fbf/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
index 2a3a0b4..25db8c6 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
@@ -329,6 +329,15 @@ public interface ActiveMQServer extends ActiveMQComponent {
QueueQueryResult queueQuery(SimpleString name) throws Exception;
+ Queue deployQueue(SimpleString address,
+ SimpleString resourceName,
+ SimpleString filterString,
+ boolean durable,
+ boolean temporary,
+ boolean autoCreated,
+ Integer maxConsumers,
+ Boolean deleteOnNoConsumers) throws Exception;
+
void destroyQueue(SimpleString queueName) throws Exception;
void destroyQueue(SimpleString queueName, SecurityAuth session) throws Exception;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/19ce2fbf/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java
index 52cd2f0..270e0cd 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java
@@ -46,6 +46,10 @@ public interface Queue extends Bindable {
boolean isAutoCreated();
+ boolean isDeleteOnNoConsumers();
+
+ boolean getMaxConsumers();
+
void addConsumer(Consumer consumer) throws Exception;
void removeConsumer(Consumer consumer);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/19ce2fbf/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueConfig.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueConfig.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueConfig.java
index f750f6c..3b7ed71 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueConfig.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/QueueConfig.java
@@ -33,6 +33,8 @@ public final class QueueConfig {
private final boolean durable;
private final boolean temporary;
private final boolean autoCreated;
+ private final int maxConsumers;
+ private final boolean deleteOnNoConsumers;
public static final class Builder {
@@ -45,6 +47,8 @@ public final class QueueConfig {
private boolean durable;
private boolean temporary;
private boolean autoCreated;
+ private int maxConsumers;
+ private boolean deleteOnNoConsumers;
private Builder(final long id, final SimpleString name) {
this(id, name, name);
@@ -60,6 +64,8 @@ public final class QueueConfig {
this.durable = true;
this.temporary = false;
this.autoCreated = true;
+ this.maxConsumers = -1;
+ this.deleteOnNoConsumers = false;
validateState();
}
@@ -106,6 +112,16 @@ public final class QueueConfig {
return this;
}
+ public Builder maxConsumers(final int maxConsumers) {
+ this.maxConsumers = maxConsumers;
+ return this;
+ }
+
+ public Builder deleteOnNoConsumers(final boolean deleteOnNoConsumers) {
+ this.deleteOnNoConsumers = deleteOnNoConsumers;
+ return this;
+ }
+
/**
* Returns a new {@link QueueConfig} using the parameters configured on the {@link Builder}.
* <br>
@@ -127,7 +143,7 @@ public final class QueueConfig {
} else {
pageSubscription = null;
}
- return new QueueConfig(id, address, name, filter, pageSubscription, user, durable, temporary, autoCreated);
+ return new QueueConfig(id, address, name, filter, pageSubscription, user, durable, temporary, autoCreated, maxConsumers, deleteOnNoConsumers);
}
}
@@ -168,7 +184,9 @@ public final class QueueConfig {
final SimpleString user,
final boolean durable,
final boolean temporary,
- final boolean autoCreated) {
+ final boolean autoCreated,
+ final int maxConsumers,
+ final boolean deleteOnNoConsumers) {
this.id = id;
this.address = address;
this.name = name;
@@ -178,6 +196,8 @@ public final class QueueConfig {
this.durable = durable;
this.temporary = temporary;
this.autoCreated = autoCreated;
+ this.deleteOnNoConsumers = deleteOnNoConsumers;
+ this.maxConsumers = maxConsumers;
}
public long id() {
@@ -216,6 +236,14 @@ public final class QueueConfig {
return autoCreated;
}
+ public boolean isDeleteOnNoConsumers() {
+ return deleteOnNoConsumers;
+ }
+
+ public int maxConsumers() {
+ return maxConsumers;
+ }
+
@Override
public boolean equals(Object o) {
if (this == o)
@@ -241,6 +269,10 @@ public final class QueueConfig {
return false;
if (pageSubscription != null ? !pageSubscription.equals(that.pageSubscription) : that.pageSubscription != null)
return false;
+ if (maxConsumers != that.maxConsumers)
+ return false;
+ if (deleteOnNoConsumers != that.deleteOnNoConsumers)
+ return false;
return user != null ? user.equals(that.user) : that.user == null;
}
@@ -256,11 +288,24 @@ public final class QueueConfig {
result = 31 * result + (durable ? 1 : 0);
result = 31 * result + (temporary ? 1 : 0);
result = 31 * result + (autoCreated ? 1 : 0);
+ result = 31 * result + maxConsumers;
+ result = 31 * result + (deleteOnNoConsumers ? 1 : 0);
return result;
}
@Override
public String toString() {
- return "QueueConfig{" + "id=" + id + ", address=" + address + ", name=" + name + ", filter=" + filter + ", pageSubscription=" + pageSubscription + ", user=" + user + ", durable=" + durable + ", temporary=" + temporary + ", autoCreated=" + autoCreated + '}';
+ return "QueueConfig{"
+ + "id=" + id
+ + ", address=" + address
+ + ", name=" + name
+ + ", filter=" + filter
+ + ", pageSubscription=" + pageSubscription
+ + ", user=" + user
+ + ", durable=" + durable
+ + ", temporary=" + temporary
+ + ", autoCreated=" + autoCreated
+ + ", maxConsumers=" + maxConsumers
+ + ", deleteOnNoConsumers=" + deleteOnNoConsumers + '}';
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/19ce2fbf/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index a42acd9..c6f5b66 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -1504,6 +1504,18 @@ public class ActiveMQServerImpl implements ActiveMQServer {
final boolean durable,
final boolean temporary,
final boolean autoCreated) throws Exception {
+ return deployQueue(address, resourceName, filterString, durable, temporary, autoCreated, null, null);
+ }
+
+ @Override
+ public Queue deployQueue(final SimpleString address,
+ final SimpleString resourceName,
+ final SimpleString filterString,
+ final boolean durable,
+ final boolean temporary,
+ final boolean autoCreated,
+ final Integer maxConsumers,
+ final Boolean deleteOnNoConsumers) throws Exception {
if (resourceName.toString().toLowerCase().startsWith("jms.topic")) {
ActiveMQServerLogger.LOGGER.deployTopic(resourceName);
@@ -1511,7 +1523,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
ActiveMQServerLogger.LOGGER.deployQueue(resourceName);
}
- return createQueue(address, resourceName, filterString, null, durable, temporary, true, false, autoCreated);
+ return createQueue(address, resourceName, filterString, null, durable, temporary, true, false, autoCreated, maxConsumers, deleteOnNoConsumers);
}
@Override
@@ -2097,9 +2109,17 @@ public class ActiveMQServerImpl implements ActiveMQServer {
private void deployQueuesFromListCoreQueueConfiguration(List<CoreQueueConfiguration> queues) throws Exception {
for (CoreQueueConfiguration config : queues) {
- deployQueue(SimpleString.toSimpleString(config.getAddress()), SimpleString.toSimpleString(config.getName()), SimpleString.toSimpleString(config.getFilterString()), config.isDurable(), false);
+ deployQueue(SimpleString.toSimpleString(config.getAddress()),
+ SimpleString.toSimpleString(config.getName()),
+ SimpleString.toSimpleString(config.getFilterString()),
+ config.isDurable(),
+ false,
+ false,
+ config.getMaxConsumers(),
+ config.getDeleteOnNoConsumers());
}
}
+
private void deployQueuesFromConfiguration() throws Exception {
deployQueuesFromListCoreQueueConfiguration(configuration.getQueueConfigurations());
}
@@ -2223,6 +2243,30 @@ public class ActiveMQServerImpl implements ActiveMQServer {
final boolean ignoreIfExists,
final boolean transientQueue,
final boolean autoCreated) throws Exception {
+ return createQueue(addressName,
+ queueName,
+ filterString,
+ user,
+ durable,
+ temporary,
+ ignoreIfExists,
+ transientQueue,
+ autoCreated,
+ null,
+ null);
+ }
+
+ private Queue createQueue(final SimpleString addressName,
+ final SimpleString queueName,
+ final SimpleString filterString,
+ final SimpleString user,
+ final boolean durable,
+ final boolean temporary,
+ final boolean ignoreIfExists,
+ final boolean transientQueue,
+ final boolean autoCreated,
+ final Integer maxConsumers,
+ final Boolean deleteOnNoConsumers) throws Exception {
final QueueBinding binding = (QueueBinding) postOffice.getBinding(queueName);
if (binding != null) {
@@ -2239,21 +2283,31 @@ public class ActiveMQServerImpl implements ActiveMQServer {
final long queueID = storageManager.generateID();
final QueueConfig.Builder queueConfigBuilder;
+ final SimpleString address;
if (addressName == null) {
queueConfigBuilder = QueueConfig.builderWith(queueID, queueName);
+ address = queueName;
} else {
queueConfigBuilder = QueueConfig.builderWith(queueID, queueName, addressName);
+ address = addressName;
}
- final QueueConfig queueConfig = queueConfigBuilder.filter(filter).pagingManager(pagingManager).user(user).durable(durable).temporary(temporary).autoCreated(autoCreated).build();
- final Queue queue = queueFactory.createQueueWith(queueConfig);
- boolean addressAlreadyExists = true;
+ // FIXME This boils down to a putIfAbsent (avoids race). This should be reflected in the API.
+ AddressInfo info = postOffice.addAddressInfo(new AddressInfo(address));
- if (postOffice.getAddressInfo(queue.getAddress()) == null) {
- postOffice.addAddressInfo(new AddressInfo(queue.getAddress())
- .setRoutingType(AddressInfo.RoutingType.MULTICAST));
- addressAlreadyExists = false;
- }
+ final boolean isDeleteOnNoConsumers = deleteOnNoConsumers == null ? info.isDefaultDeleteOnNoConsumers() : deleteOnNoConsumers;
+ final int noMaxConsumers = maxConsumers == null ? info.getDefaultMaxConsumers() : maxConsumers;
+
+ final QueueConfig queueConfig = queueConfigBuilder.filter(filter)
+ .pagingManager(pagingManager)
+ .user(user)
+ .durable(durable)
+ .temporary(temporary)
+ .autoCreated(autoCreated)
+ .deleteOnNoConsumers(isDeleteOnNoConsumers)
+ .maxConsumers(noMaxConsumers)
+ .build();
+ final Queue queue = queueFactory.createQueueWith(queueConfig);
if (transientQueue) {
queue.setConsumersRefCount(new TransientQueueManagerImpl(this, queue.getName()));
@@ -2265,7 +2319,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
if (queue.isDurable()) {
storageManager.addQueueBinding(txID, localQueueBinding);
- if (!addressAlreadyExists) {
+ if (info == null) {
storageManager.addAddressBinding(txID, getAddressInfo(queue.getAddress()));
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/19ce2fbf/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
index 4e982c4..7c71c1f 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AddressInfo.java
@@ -16,6 +16,7 @@
*/
package org.apache.activemq.artemis.core.server.impl;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.api.core.SimpleString;
public class AddressInfo {
@@ -24,9 +25,9 @@ public class AddressInfo {
private RoutingType routingType = RoutingType.MULTICAST;
- private boolean defaultDeleteOnNoConsumers;
+ private boolean defaultDeleteOnNoConsumers = ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers();
- private int defaultMaxConsumers;
+ private int defaultMaxConsumers = ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers();
public AddressInfo(SimpleString name) {
this.name = name;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/19ce2fbf/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
index 4e89e8a..9bd14f0 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/PostOfficeJournalLoader.java
@@ -143,7 +143,13 @@ public class PostOfficeJournalLoader implements JournalLoader {
} else {
queueConfigBuilder = QueueConfig.builderWith(queueBindingInfo.getId(), queueBindingInfo.getQueueName(), queueBindingInfo.getAddress());
}
- queueConfigBuilder.filter(filter).pagingManager(pagingManager).user(queueBindingInfo.getUser()).durable(true).temporary(false).autoCreated(queueBindingInfo.isAutoCreated());
+ queueConfigBuilder.filter(filter).pagingManager(pagingManager)
+ .user(queueBindingInfo.getUser())
+ .durable(true)
+ .temporary(false)
+ .autoCreated(queueBindingInfo.isAutoCreated())
+ .de
+ );
final Queue queue = queueFactory.createQueueWith(queueConfigBuilder.build());
if (queue.isAutoCreated()) {
queue.setConsumersRefCount(new AutoCreatedQueueManagerImpl(((PostOfficeImpl) postOffice).getServer().getJMSQueueDeleter(), queueBindingInfo.getQueueName()));
[11/34] activemq-artemis git commit: NO-JIRA removing OIO references,
since Netty is only NIO now
Posted by ma...@apache.org.
NO-JIRA removing OIO references, since Netty is only NIO now
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ebc2bbc6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ebc2bbc6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ebc2bbc6
Branch: refs/heads/ARTEMIS-780
Commit: ebc2bbc672c33bd20130f9a2ca8ff2c98146f49a
Parents: d505f5c
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Oct 27 11:30:10 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Oct 28 16:31:41 2016 -0400
----------------------------------------------------------------------
docs/user-manual/en/configuring-transports.md | 1 -
docs/user-manual/en/perf-tuning.md | 10 ----------
docs/user-manual/en/thread-pooling.md | 22 +---------------------
3 files changed, 1 insertion(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ebc2bbc6/docs/user-manual/en/configuring-transports.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/configuring-transports.md b/docs/user-manual/en/configuring-transports.md
index 5f32d77..37e779d 100644
--- a/docs/user-manual/en/configuring-transports.md
+++ b/docs/user-manual/en/configuring-transports.md
@@ -144,7 +144,6 @@ Out of the box, Apache ActiveMQ Artemis currently uses
network library.
Our Netty transport can be configured in several different ways; to use
-old (blocking) Java IO, or NIO (non-blocking), also to use
straightforward TCP sockets, SSL, or to tunnel over HTTP or HTTPS..
We believe this caters for the vast majority of transport requirements.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ebc2bbc6/docs/user-manual/en/perf-tuning.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/perf-tuning.md b/docs/user-manual/en/perf-tuning.md
index 653d0be..39f9993 100644
--- a/docs/user-manual/en/perf-tuning.md
+++ b/docs/user-manual/en/perf-tuning.md
@@ -132,16 +132,6 @@ tuning:
consumer-window-size. This effectively disables consumer flow
control.
-- Socket NIO vs Socket Old IO. By default Apache ActiveMQ Artemis uses old (blocking)
- on the server and the client side (see the chapter on configuring
- transports for more information [Configuring the Transport](configuring-transports.md). NIO is much more scalable but
- can give you some latency hit compared to old blocking IO. If you
- need to be able to service many thousands of connections on the
- server, then you should make sure you're using NIO on the server.
- However, if don't expect many thousands of connections on the server
- you can keep the server acceptors using old IO, and might get a
- small performance advantage.
-
- Use the core API not JMS. Using the JMS API you will have slightly
lower performance than using the core API, since all JMS operations
need to be translated into core operations before the server can
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ebc2bbc6/docs/user-manual/en/thread-pooling.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/thread-pooling.md b/docs/user-manual/en/thread-pooling.md
index 2d3b8d1..1a98203 100644
--- a/docs/user-manual/en/thread-pooling.md
+++ b/docs/user-manual/en/thread-pooling.md
@@ -13,27 +13,7 @@ a scheduled thread pool for scheduled use. A Java scheduled thread pool
cannot be configured to use a standard thread pool, otherwise we could
use a single thread pool for both scheduled and non scheduled activity.
-A separate thread pool is also used to service connections. Apache ActiveMQ Artemis can
-use "old" (blocking) IO or "new" (non-blocking) IO also called NIO. Both
-of these options use a separate thread pool, but each of them behaves
-uniquely.
-
-Since old IO requires a thread per connection its thread pool is
-unbounded. The thread pool is created via `
- java.util.concurrent.Executors.newCachedThreadPool(ThreadFactory)`.
-As the JavaDoc for this method states: \u201cCreates a thread pool that
-creates new threads as needed, but will reuse previously constructed
-threads when they are available, and uses the provided ThreadFactory to
-create new threads when needed.\u201d Threads from this pool which are idle
-for more than 60 seconds will time out and be removed. If old IO
-connections were serviced from the standard pool the pool would easily
-get exhausted if too many connections were made, resulting in the server
-"hanging" since it has no remaining threads to do anything else.
-However, even an unbounded thread pool can run into trouble if it
-becomes too large. If you require the server to handle many concurrent
-connections you should use NIO, not old IO.
-
-When using new IO (NIO), Apache ActiveMQ Artemis will, by default, cap its thread pool
+Apache ActiveMQ Artemis will, by default, cap its thread pool
at three times the number of cores (or hyper-threads) as reported by `
Runtime.getRuntime().availableProcessors()` for processing
incoming packets. To override this value, you can set the number of
[08/34] activemq-artemis git commit: This closes #874
Posted by ma...@apache.org.
This closes #874
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/10187d00
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/10187d00
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/10187d00
Branch: refs/heads/ARTEMIS-780
Commit: 10187d00364c7919707ca6028f2bd08223cd806a
Parents: 9e7fe6b 20183f9
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri Oct 28 14:24:46 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Oct 28 14:24:46 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/core/server/impl/ServiceRegistryImpl.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
[17/34] activemq-artemis git commit: ARTEMIS-822 Review journal
threading model
Posted by ma...@apache.org.
ARTEMIS-822 Review journal threading model
https://issues.apache.org/jira/browse/ARTEMIS-822
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6afde8f4
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6afde8f4
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6afde8f4
Branch: refs/heads/ARTEMIS-780
Commit: 6afde8f45aaa4f6a477066f3bc85fa8f89718a1d
Parents: 4b47461
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Oct 27 12:32:04 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Oct 28 16:54:59 2016 -0400
----------------------------------------------------------------------
.../jdbc/store/journal/JDBCJournalImpl.java | 4 +
.../activemq/artemis/core/journal/Journal.java | 5 +
.../core/journal/impl/FileWrapperJournal.java | 4 +
.../artemis/core/journal/impl/JournalImpl.java | 236 ++++++++++++-------
.../core/journal/impl/JournalTransaction.java | 2 +-
.../cursor/impl/PageSubscriptionImpl.java | 3 +-
.../journal/AbstractJournalStorageManager.java | 20 +-
.../impl/journal/JDBCJournalStorageManager.java | 2 -
.../impl/journal/JournalStorageManager.java | 21 +-
.../core/replication/ReplicatedJournal.java | 5 +
.../artemis/core/server/ServiceRegistry.java | 4 +
.../core/server/impl/ActiveMQServerImpl.java | 61 +++--
.../core/server/impl/ServiceRegistryImpl.java | 12 +
.../byteman/JMSBridgeReconnectionTest.java | 2 +-
.../journal/NIOJournalCompactTest.java | 2 +
.../journal/ValidateTransactionHealthTest.java | 2 +
.../management/ActiveMQServerControlTest.java | 9 +-
.../replication/ReplicationTest.java | 5 +
.../journal/impl/AlignedJournalImplTest.java | 4 +-
.../core/journal/impl/JournalImplTestUnit.java | 74 +++---
20 files changed, 308 insertions(+), 169 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afde8f4/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
----------------------------------------------------------------------
diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
index 636309e..e112dbc 100644
--- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
+++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/journal/JDBCJournalImpl.java
@@ -114,6 +114,10 @@ public class JDBCJournalImpl extends AbstractJDBCDriver implements Journal {
}
@Override
+ public void flush() throws Exception {
+ }
+
+ @Override
protected void createSchema() throws SQLException {
createTable(sqlProvider.getCreateJournalTableSQL());
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afde8f4/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java
index 3c1f7fd..fbd4182 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/Journal.java
@@ -237,4 +237,9 @@ public interface Journal extends ActiveMQComponent {
* only be called once the synchronization of the backup and live servers is completed.
*/
void replicationSyncFinished();
+
+ /**
+ * It will make sure there are no more pending operations on the Executors.
+ * */
+ void flush() throws Exception;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afde8f4/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/FileWrapperJournal.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/FileWrapperJournal.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/FileWrapperJournal.java
index 51fb154..0b702a5 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/FileWrapperJournal.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/FileWrapperJournal.java
@@ -98,6 +98,10 @@ public final class FileWrapperJournal extends JournalBase {
writeRecord(addRecord, sync, callback);
}
+ @Override
+ public void flush() throws Exception {
+ }
+
/**
* Write the record to the current file.
*/
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afde8f4/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
index 43db1f7..983bd7d 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java
@@ -18,6 +18,8 @@ package org.apache.activemq.artemis.core.journal.impl;
import java.io.Serializable;
import java.nio.ByteBuffer;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -29,14 +31,13 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
+import java.util.concurrent.Executor;
+import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@@ -70,8 +71,11 @@ import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalInternalR
import org.apache.activemq.artemis.core.journal.impl.dataformat.JournalRollbackRecordTX;
import org.apache.activemq.artemis.journal.ActiveMQJournalBundle;
import org.apache.activemq.artemis.journal.ActiveMQJournalLogger;
+import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
import org.apache.activemq.artemis.utils.ConcurrentHashSet;
import org.apache.activemq.artemis.utils.DataConstants;
+import org.apache.activemq.artemis.utils.OrderedExecutorFactory;
+import org.apache.activemq.artemis.utils.SimpleFuture;
import org.jboss.logging.Logger;
/**
@@ -163,7 +167,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
// Compacting may replace this structure
private final ConcurrentMap<Long, JournalRecord> records = new ConcurrentHashMap<>();
- private final Set<Long> pendingRecords = Collections.newSetFromMap(new ConcurrentHashMap<Long, Boolean>());
+ private final Set<Long> pendingRecords = new ConcurrentHashSet<>();
// Compacting may replace this structure
private final ConcurrentMap<Long, JournalTransaction> transactions = new ConcurrentHashMap<>();
@@ -173,14 +177,18 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
private final AtomicBoolean compactorRunning = new AtomicBoolean();
- private ExecutorService filesExecutor = null;
+ private Executor filesExecutor = null;
- private ExecutorService compactorExecutor = null;
+ private Executor compactorExecutor = null;
- private ExecutorService appendExecutor = null;
+ private Executor appendExecutor = null;
private ConcurrentHashSet<CountDownLatch> latches = new ConcurrentHashSet<>();
+ private final OrderedExecutorFactory providedIOThreadPool;
+ protected OrderedExecutorFactory ioExecutorFactory;
+ private ThreadPoolExecutor threadPool;
+
/**
* We don't lock the journal during the whole compacting operation. During compacting we only
* lock it (i) when gathering the initial structure, and (ii) when replicating the structures
@@ -223,8 +231,25 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
final String fileExtension,
final int maxAIO,
final int userVersion) {
+ this(null, fileSize, minFiles, poolSize, compactMinFiles, compactPercentage, fileFactory, filePrefix, fileExtension, maxAIO, userVersion);
+ }
+
+ public JournalImpl(final OrderedExecutorFactory ioExecutors,
+ final int fileSize,
+ final int minFiles,
+ final int poolSize,
+ final int compactMinFiles,
+ final int compactPercentage,
+ final SequentialFileFactory fileFactory,
+ final String filePrefix,
+ final String fileExtension,
+ final int maxAIO,
+ final int userVersion) {
+
super(fileFactory.isSupportsCallbacks(), fileSize);
+ this.providedIOThreadPool = ioExecutors;
+
if (fileSize % fileFactory.getAlignment() != 0) {
throw new IllegalArgumentException("Invalid journal-file-size " + fileSize + ", It should be multiple of " +
fileFactory.getAlignment());
@@ -693,7 +718,9 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
lineUpContext(callback);
pendingRecords.add(id);
- Future<?> result = appendExecutor.submit(new Runnable() {
+
+ final SimpleFuture<Boolean> result = newSyncAndCallbackResult(sync, callback);
+ appendExecutor.execute(new Runnable() {
@Override
public void run() {
journalLock.readLock().lock();
@@ -710,7 +737,13 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
", usedFile = " +
usedFile);
}
+ if (result != null) {
+ result.set(true);
+ }
} catch (Exception e) {
+ if (result != null) {
+ result.fail(e);
+ }
ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
} finally {
pendingRecords.remove(id);
@@ -719,7 +752,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
}
});
- if (sync && callback == null) {
+ if (result != null) {
result.get();
}
}
@@ -734,7 +767,9 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
lineUpContext(callback);
checkKnownRecordID(id);
- Future<?> result = appendExecutor.submit(new Runnable() {
+ final SimpleFuture<Boolean> result = newSyncAndCallbackResult(sync, callback);
+
+ appendExecutor.execute(new Runnable() {
@Override
public void run() {
journalLock.readLock().lock();
@@ -758,7 +793,14 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
} else {
jrnRecord.addUpdateFile(usedFile, updateRecord.getEncodeSize());
}
+
+ if (result != null) {
+ result.set(true);
+ }
} catch (Exception e) {
+ if (result != null) {
+ result.fail(e);
+ }
ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
} finally {
journalLock.readLock().unlock();
@@ -766,7 +808,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
}
});
- if (sync && callback == null) {
+ if (result != null) {
result.get();
}
}
@@ -777,7 +819,8 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
lineUpContext(callback);
checkKnownRecordID(id);
- Future<?> result = appendExecutor.submit(new Runnable() {
+ final SimpleFuture<Boolean> result = newSyncAndCallbackResult(sync, callback);
+ appendExecutor.execute(new Runnable() {
@Override
public void run() {
journalLock.readLock().lock();
@@ -801,7 +844,13 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
} else {
record.delete(usedFile);
}
+ if (result != null) {
+ result.set(true);
+ }
} catch (Exception e) {
+ if (result != null) {
+ result.fail(e);
+ }
ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
} finally {
journalLock.readLock().unlock();
@@ -809,11 +858,15 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
}
});
- if (sync && callback == null) {
+ if (result != null) {
result.get();
}
}
+ private static SimpleFuture<Boolean> newSyncAndCallbackResult(boolean sync, IOCompletion callback) {
+ return (sync && callback == null) ? new SimpleFuture<>() : null;
+ }
+
@Override
public void appendAddRecordTransactional(final long txID,
final long id,
@@ -824,7 +877,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
final JournalTransaction tx = getTransactionInfo(txID);
tx.checkErrorCondition();
- appendExecutor.submit(new Runnable() {
+ appendExecutor.execute(new Runnable() {
@Override
public void run() {
@@ -860,15 +913,18 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
return;
}
+ final SimpleFuture<Boolean> known = new SimpleFuture<>();
+
// retry on the append thread. maybe the appender thread is not keeping up.
- Future<Boolean> known = appendExecutor.submit(new Callable<Boolean>() {
+ appendExecutor.execute(new Runnable() {
@Override
- public Boolean call() throws Exception {
+ public void run() {
journalLock.readLock().lock();
try {
- return records.containsKey(id)
+
+ known.set(records.containsKey(id)
|| pendingRecords.contains(id)
- || (compactor != null && compactor.lookupRecord(id));
+ || (compactor != null && compactor.lookupRecord(id)));
} finally {
journalLock.readLock().unlock();
}
@@ -900,7 +956,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
final JournalTransaction tx = getTransactionInfo(txID);
tx.checkErrorCondition();
- appendExecutor.submit(new Runnable() {
+ appendExecutor.execute(new Runnable() {
@Override
public void run() {
@@ -941,7 +997,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
final JournalTransaction tx = getTransactionInfo(txID);
tx.checkErrorCondition();
- appendExecutor.submit(new Runnable() {
+ appendExecutor.execute(new Runnable() {
@Override
public void run() {
journalLock.readLock().lock();
@@ -991,7 +1047,9 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
final JournalTransaction tx = getTransactionInfo(txID);
tx.checkErrorCondition();
- Future<?> result = appendExecutor.submit(new Runnable() {
+ final SimpleFuture<Boolean> result = newSyncAndCallbackResult(sync, callback);
+
+ appendExecutor.execute(new Runnable() {
@Override
public void run() {
journalLock.readLock().lock();
@@ -1004,7 +1062,13 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
}
tx.prepare(usedFile);
+ if (result != null) {
+ result.set(true);
+ }
} catch (Exception e) {
+ if (result != null) {
+ result.fail(e);
+ }
ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
setErrorCondition(tx, e);
} finally {
@@ -1013,7 +1077,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
}
});
- if (sync && callback == null) {
+ if (result != null) {
result.get();
tx.checkErrorCondition();
}
@@ -1055,8 +1119,9 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
}
tx.checkErrorCondition();
+ final SimpleFuture<Boolean> result = newSyncAndCallbackResult(sync, callback);
- Future<?> result = appendExecutor.submit(new Runnable() {
+ appendExecutor.execute(new Runnable() {
@Override
public void run() {
journalLock.readLock().lock();
@@ -1070,7 +1135,13 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
}
tx.commit(usedFile);
+ if (result != null) {
+ result.set(true);
+ }
} catch (Exception e) {
+ if (result != null) {
+ result.fail(e);
+ }
ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
setErrorCondition(tx, e);
} finally {
@@ -1079,7 +1150,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
}
});
- if (sync && callback == null) {
+ if (result != null) {
result.get();
tx.checkErrorCondition();
}
@@ -1097,8 +1168,8 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
}
tx.checkErrorCondition();
-
- Future<?> result = appendExecutor.submit(new Runnable() {
+ final SimpleFuture<Boolean> result = newSyncAndCallbackResult(sync, callback);
+ appendExecutor.execute(new Runnable() {
@Override
public void run() {
journalLock.readLock().lock();
@@ -1107,7 +1178,13 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
JournalFile usedFile = appendRecord(rollbackRecord, false, sync, tx, callback);
tx.rollback(usedFile);
+ if (result != null) {
+ result.set(true);
+ }
} catch (Exception e) {
+ if (result != null) {
+ result.fail(e);
+ }
ActiveMQJournalLogger.LOGGER.error(e.getMessage(), e);
setErrorCondition(tx, e);
} finally {
@@ -1116,7 +1193,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
}
});
- if (sync && callback == null) {
+ if (result != null) {
result.get();
tx.checkErrorCondition();
}
@@ -1981,35 +2058,39 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
public void debugWait() throws InterruptedException {
fileFactory.flush();
- if (appendExecutor != null && !appendExecutor.isShutdown()) {
- // Send something to the closingExecutor, just to make sure we went until its end
- final CountDownLatch latch = newLatch(1);
+ flushExecutor(filesExecutor);
- appendExecutor.execute(new Runnable() {
+ flushExecutor(appendExecutor);
+ }
- @Override
- public void run() {
- latch.countDown();
- }
+ @Override
+ public void flush() throws Exception {
+ fileFactory.flush();
- });
- awaitLatch(latch, -1);
- }
- if (filesExecutor != null && !filesExecutor.isShutdown()) {
+ flushExecutor(appendExecutor);
+
+ flushExecutor(filesExecutor);
+
+ flushExecutor(compactorExecutor);
+ }
+
+ private void flushExecutor(Executor executor) throws InterruptedException {
+
+ if (executor != null) {
// Send something to the closingExecutor, just to make sure we went until its end
- final CountDownLatch latch = newLatch(1);
+ final CountDownLatch latch = new CountDownLatch(1);
+
+ executor.execute(new Runnable() {
- filesExecutor.execute(new Runnable() {
@Override
public void run() {
latch.countDown();
}
- });
- awaitLatch(latch, -1);
+ });
+ latch.await(10, TimeUnit.SECONDS);
}
-
}
@Override
@@ -2099,7 +2180,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
}
};
- appendExecutor.submit(new Runnable() {
+ appendExecutor.execute(new Runnable() {
@Override
public void run() {
journalLock.readLock().lock();
@@ -2132,29 +2213,25 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
throw new IllegalStateException("Journal " + this + " is not stopped, state is " + state);
}
- filesExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() {
-
- @Override
- public Thread newThread(final Runnable r) {
- return new Thread(r, "JournalImpl::FilesExecutor");
- }
- });
+ if (providedIOThreadPool == null) {
+ ThreadFactory factory = AccessController.doPrivileged(new PrivilegedAction<ThreadFactory>() {
+ @Override
+ public ThreadFactory run() {
+ return new ActiveMQThreadFactory("ArtemisIOThread", true, JournalImpl.class.getClassLoader());
+ }
+ });
- compactorExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() {
+ threadPool = new ThreadPoolExecutor(0,Integer.MAX_VALUE, 60L,TimeUnit.SECONDS, new SynchronousQueue<>(), factory);
+ ioExecutorFactory = new OrderedExecutorFactory(threadPool);
+ } else {
+ ioExecutorFactory = providedIOThreadPool;
+ }
- @Override
- public Thread newThread(final Runnable r) {
- return new Thread(r, "JournalImpl::CompactorExecutor");
- }
- });
+ filesExecutor = ioExecutorFactory.getExecutor();
- appendExecutor = Executors.newSingleThreadExecutor(new ThreadFactory() {
+ compactorExecutor = ioExecutorFactory.getExecutor();
- @Override
- public Thread newThread(final Runnable r) {
- return new Thread(r, "JournalImpl::appendExecutor");
- }
- });
+ appendExecutor = ioExecutorFactory.getExecutor();
filesRepository.setExecutor(filesExecutor);
@@ -2171,29 +2248,21 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
setJournalState(JournalState.STOPPED);
- // appendExecutor must be shut down first
- appendExecutor.shutdown();
-
- if (!appendExecutor.awaitTermination(60, TimeUnit.SECONDS)) {
- ActiveMQJournalLogger.LOGGER.couldNotStopJournalAppendExecutor();
- }
+ flush();
- journalLock.writeLock().lock();
- try {
- compactorExecutor.shutdown();
+ if (providedIOThreadPool == null) {
+ threadPool.shutdown();
- if (!compactorExecutor.awaitTermination(120, TimeUnit.SECONDS)) {
- ActiveMQJournalLogger.LOGGER.couldNotStopCompactor();
+ if (!threadPool.awaitTermination(120, TimeUnit.SECONDS)) {
+ threadPool.shutdownNow();
}
+ threadPool = null;
+ ioExecutorFactory = null;
+ }
- filesExecutor.shutdown();
-
- filesRepository.setExecutor(null);
-
- if (!filesExecutor.awaitTermination(60, TimeUnit.SECONDS)) {
- ActiveMQJournalLogger.LOGGER.couldNotStopJournalExecutor();
- }
+ journalLock.writeLock().lock();
+ try {
try {
for (CountDownLatch latch : latches) {
latch.countDown();
@@ -2207,7 +2276,6 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
if (currentFile != null && currentFile.getFile().isOpen()) {
currentFile.getFile().close();
}
-
filesRepository.clear();
fileFactory.stop();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afde8f4/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java
index 1542bd4..8e40f3b 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalTransaction.java
@@ -229,7 +229,7 @@ public class JournalTransaction {
public void commit(final JournalFile file) {
JournalCompactor compactor = journal.getCompactor();
- if (compacting) {
+ if (compacting && compactor != null) {
compactor.addCommandCommit(this, file);
} else {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afde8f4/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
index 063722c..c40d20d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
@@ -192,7 +192,8 @@ final class PageSubscriptionImpl implements PageSubscription {
@Override
public void reloadPageCompletion(PagePosition position) throws Exception {
// if the current page is complete, we must move it out of the way
- if (pageStore.getCurrentPage().getPageId() == position.getPageNr()) {
+ if (pageStore != null && pageStore.getCurrentPage() != null &&
+ pageStore.getCurrentPage().getPageId() == position.getPageNr()) {
pageStore.forceAnotherPage();
}
PageCursorInfo info = new PageCursorInfo(position.getPageNr(), position.getMessageNr(), null);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afde8f4/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
index a6938d6..768be45 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
@@ -19,11 +19,9 @@ package org.apache.activemq.artemis.core.persistence.impl.journal;
import javax.transaction.xa.Xid;
import java.io.File;
import java.io.FileInputStream;
-import java.security.AccessController;
import java.security.DigestInputStream;
import java.security.InvalidParameterException;
import java.security.MessageDigest;
-import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -34,8 +32,6 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
@@ -103,7 +99,6 @@ import org.apache.activemq.artemis.core.transaction.ResourceManager;
import org.apache.activemq.artemis.core.transaction.Transaction;
import org.apache.activemq.artemis.core.transaction.TransactionPropertyIndexes;
import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl;
-import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
import org.apache.activemq.artemis.utils.Base64;
import org.apache.activemq.artemis.utils.ExecutorFactory;
import org.apache.activemq.artemis.utils.IDGenerator;
@@ -168,7 +163,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
final Executor executor;
- ExecutorService singleThreadExecutor;
+ Executor singleThreadExecutor;
private final boolean syncTransactional;
@@ -286,10 +281,6 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
OperationContextImpl.setContext(context);
}
- public Executor getSingleThreadExecutor() {
- return singleThreadExecutor;
- }
-
@Override
public OperationContext newSingleThreadContext() {
return newContext(singleThreadExecutor);
@@ -1429,12 +1420,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
beforeStart();
- singleThreadExecutor = Executors.newSingleThreadExecutor(AccessController.doPrivileged(new PrivilegedAction<ActiveMQThreadFactory>() {
- @Override
- public ActiveMQThreadFactory run() {
- return new ActiveMQThreadFactory("ActiveMQ-IO-SingleThread", true, JournalStorageManager.class.getClassLoader());
- }
- }));
+ singleThreadExecutor = executorFactory.getExecutor();
bindingsJournal.start();
@@ -1490,8 +1476,6 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
messageJournal.stop();
- singleThreadExecutor.shutdown();
-
journalLoaded = false;
started = false;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afde8f4/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JDBCJournalStorageManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JDBCJournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JDBCJournalStorageManager.java
index a0f0ed1..d97f988 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JDBCJournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JDBCJournalStorageManager.java
@@ -101,8 +101,6 @@ public class JDBCJournalStorageManager extends JournalStorageManager {
messageJournal.stop();
largeMessagesFactory.stop();
- singleThreadExecutor.shutdown();
-
journalLoaded = false;
started = false;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afde8f4/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
index 9eaa203..2d8411a 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
@@ -26,6 +26,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
@@ -197,14 +198,18 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
}
final CountDownLatch latch = new CountDownLatch(1);
- executor.execute(new Runnable() {
- @Override
- public void run() {
- latch.countDown();
- }
- });
+ try {
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ latch.countDown();
+ }
+ });
- latch.await(30, TimeUnit.SECONDS);
+ latch.await(30, TimeUnit.SECONDS);
+ } catch (RejectedExecutionException ignored) {
+ // that's ok
+ }
// We cache the variable as the replicator could be changed between here and the time we call stop
// since sendLiveIsStopping may issue a close back from the channel
@@ -225,8 +230,6 @@ public class JournalStorageManager extends AbstractJournalStorageManager {
messageJournal.stop();
- singleThreadExecutor.shutdown();
-
journalLoaded = false;
started = false;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afde8f4/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedJournal.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedJournal.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedJournal.java
index 6668c71..d70316f 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedJournal.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedJournal.java
@@ -64,6 +64,11 @@ public class ReplicatedJournal implements Journal {
this.replicationManager = replicationManager;
}
+ @Override
+ public void flush() throws Exception {
+
+ }
+
/**
* @param id
* @param recordType
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afde8f4/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServiceRegistry.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServiceRegistry.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServiceRegistry.java
index b0fa658..0583600 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServiceRegistry.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServiceRegistry.java
@@ -36,6 +36,10 @@ public interface ServiceRegistry {
void setExecutorService(ExecutorService executorService);
+ ExecutorService getIOExecutorService();
+
+ void setIOExecutorService(ExecutorService ioExecutorService);
+
ScheduledExecutorService getScheduledExecutorService();
void setScheduledExecutorService(ScheduledExecutorService scheduledExecutorService);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afde8f4/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 98abce0..6288bdf 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -38,11 +38,12 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.Semaphore;
+import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@@ -150,6 +151,7 @@ import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
import org.apache.activemq.artemis.spi.core.protocol.SessionCallback;
import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager;
import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
+import org.apache.activemq.artemis.utils.ActiveMQThreadPoolExecutor;
import org.apache.activemq.artemis.utils.CertificateUtil;
import org.apache.activemq.artemis.utils.ConcurrentHashSet;
import org.apache.activemq.artemis.utils.ExecutorFactory;
@@ -230,6 +232,14 @@ public class ActiveMQServerImpl implements ActiveMQServer {
private volatile ExecutorFactory executorFactory;
+
+ private volatile ExecutorService ioExecutorPool;
+ /**
+ * This is a thread pool for io tasks only.
+ * We can't use the same global executor to avoid starvations.
+ */
+ private volatile ExecutorFactory ioExecutorFactory;
+
private final HierarchicalRepository<Set<Role>> securityRepository;
private volatile ResourceManager resourceManager;
@@ -859,17 +869,11 @@ public class ActiveMQServerImpl implements ActiveMQServer {
}
if (threadPool != null && !threadPoolSupplied) {
- threadPool.shutdown();
- try {
- if (!threadPool.awaitTermination(10, TimeUnit.SECONDS)) {
- ActiveMQServerLogger.LOGGER.timedOutStoppingThreadpool(threadPool);
- for (Runnable r : threadPool.shutdownNow()) {
- logger.debug("Cancelled the execution of " + r);
- }
- }
- } catch (InterruptedException e) {
- ActiveMQServerLogger.LOGGER.interruptWhilstStoppingComponent(threadPool.getClass().getName());
- }
+ shutdownPool(threadPool);
+ }
+
+ if (ioExecutorPool != null) {
+ shutdownPool(ioExecutorPool);
}
if (!threadPoolSupplied)
@@ -950,6 +954,20 @@ public class ActiveMQServerImpl implements ActiveMQServer {
}
}
+ private void shutdownPool(ExecutorService executorService) {
+ executorService.shutdown();
+ try {
+ if (!executorService.awaitTermination(10, TimeUnit.SECONDS)) {
+ ActiveMQServerLogger.LOGGER.timedOutStoppingThreadpool(threadPool);
+ for (Runnable r : executorService.shutdownNow()) {
+ logger.debug("Cancelled the execution of " + r);
+ }
+ }
+ } catch (InterruptedException e) {
+ ActiveMQServerLogger.LOGGER.interruptWhilstStoppingComponent(threadPool.getClass().getName());
+ }
+ }
+
public boolean checkLiveIsNotColocated(String nodeId) {
if (parentServer == null) {
return true;
@@ -1805,10 +1823,11 @@ public class ActiveMQServerImpl implements ActiveMQServer {
return new ActiveMQThreadFactory("ActiveMQ-server-" + this.toString(), false, ClientSessionFactoryImpl.class.getClassLoader());
}
});
+
if (configuration.getThreadPoolMaxSize() == -1) {
- threadPool = Executors.newCachedThreadPool(tFactory);
+ threadPool = new ThreadPoolExecutor(0, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(), tFactory);
} else {
- threadPool = Executors.newFixedThreadPool(configuration.getThreadPoolMaxSize(), tFactory);
+ threadPool = new ActiveMQThreadPoolExecutor(0, configuration.getThreadPoolMaxSize(), 60L, TimeUnit.SECONDS, tFactory);
}
} else {
threadPool = serviceRegistry.getExecutorService();
@@ -1816,6 +1835,20 @@ public class ActiveMQServerImpl implements ActiveMQServer {
}
this.executorFactory = new OrderedExecutorFactory(threadPool);
+
+ if (serviceRegistry.getIOExecutorService() != null) {
+ this.ioExecutorFactory = new OrderedExecutorFactory(serviceRegistry.getIOExecutorService());
+ } else {
+ ThreadFactory tFactory = AccessController.doPrivileged(new PrivilegedAction<ThreadFactory>() {
+ @Override
+ public ThreadFactory run() {
+ return new ActiveMQThreadFactory("ActiveMQ-IO-server-" + this.toString(), false, ClientSessionFactoryImpl.class.getClassLoader());
+ }
+ });
+
+ this.ioExecutorPool = new ThreadPoolExecutor(0, Integer.MAX_VALUE, 60L, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(), tFactory);
+ }
+
/* We check to see if a Scheduled Executor Service is provided in the InjectedObjectRegistry. If so we use this
* Scheduled ExecutorService otherwise we create a new one.
*/
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afde8f4/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
index 1d08f4a..a287a00 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
@@ -41,6 +41,8 @@ public class ServiceRegistryImpl implements ServiceRegistry {
private ExecutorService executorService;
+ private ExecutorService ioExecutorService;
+
private ScheduledExecutorService scheduledExecutorService;
/* We are using a List rather than HashMap here as ActiveMQ Artemis allows multiple instances of the same class to be added
@@ -163,6 +165,16 @@ public class ServiceRegistryImpl implements ServiceRegistry {
}
@Override
+ public ExecutorService getIOExecutorService() {
+ return ioExecutorService;
+ }
+
+ @Override
+ public void setIOExecutorService(ExecutorService ioExecutorService) {
+ this.ioExecutorService = ioExecutorService;
+ }
+
+ @Override
public void addBridgeTransformer(String name, Transformer transformer) {
bridgeTransformers.put(name, transformer);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afde8f4/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/JMSBridgeReconnectionTest.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/JMSBridgeReconnectionTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/JMSBridgeReconnectionTest.java
index 0a5d52d..ef71e89 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/JMSBridgeReconnectionTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/JMSBridgeReconnectionTest.java
@@ -50,7 +50,7 @@ public class JMSBridgeReconnectionTest extends BridgeTestBase {
targetClass = "org.apache.activemq.artemis.core.client.impl.ClientProducerImpl",
targetMethod = "sendRegularMessage",
targetLocation = "ENTRY",
- action = "org.apache.activemq.artemis.tests.extras.byteman.JMSBridgeReconnectionTest.pause2($1,$2,$3);")})
+ action = "org.apache.activemq.artemis.tests.extras.byteman.JMSBridgeReconnectionTest.pause2($2,$3,$4);")})
public void performCrashDestinationStopBridge() throws Exception {
activeMQServer = jmsServer1;
ConnectionFactoryFactory factInUse0 = cff0;
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afde8f4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
index 2dd38ae..519ffb5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java
@@ -713,6 +713,8 @@ public class NIOJournalCompactTest extends JournalImplTestBase {
journal.testCompact();
}
+ journal.flush();
+
stopJournal();
createJournal();
startJournal();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afde8f4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java
index 2d3df3e..8f15c48 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java
@@ -314,6 +314,8 @@ public class ValidateTransactionHealthTest extends ActiveMQTestBase {
throw e;
}
+ journal.flush();
+
return journal;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afde8f4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
index 7dd2d0b..27a2838 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
@@ -58,6 +58,7 @@ import org.apache.activemq.artemis.jlibaio.LibaioContext;
import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager;
import org.apache.activemq.artemis.spi.core.security.jaas.InVMLoginModule;
import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger;
+import org.apache.activemq.artemis.tests.integration.mqtt.imported.util.Wait;
import org.apache.activemq.artemis.tests.unit.core.config.impl.fakes.FakeConnectorServiceFactory;
import org.apache.activemq.artemis.utils.RandomUtil;
import org.apache.activemq.artemis.utils.UUIDGenerator;
@@ -265,12 +266,18 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
ServerLocator receiveLocator = createInVMNonHALocator();
ClientSessionFactory receiveCsf = createSessionFactory(receiveLocator);
ClientSession receiveClientSession = receiveCsf.createSession(true, false, false);
- ClientConsumer consumer = receiveClientSession.createConsumer(name);
+ final ClientConsumer consumer = receiveClientSession.createConsumer(name);
Assert.assertFalse(consumer.isClosed());
checkResource(ObjectNameBuilder.DEFAULT.getQueueObjectName(address, name));
serverControl.destroyQueue(name.toString(), true);
+ Wait.waitFor(new Wait.Condition() {
+ @Override
+ public boolean isSatisified() throws Exception {
+ return consumer.isClosed();
+ }
+ }, 1000, 100);
Assert.assertTrue(consumer.isClosed());
checkNoResource(ObjectNameBuilder.DEFAULT.getQueueObjectName(address, name));
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afde8f4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
index 9d63e1d..7d2d514 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
@@ -651,6 +651,11 @@ public final class ReplicationTest extends ActiveMQTestBase {
}
@Override
+ public void flush() throws Exception {
+
+ }
+
+ @Override
public void appendCommitRecord(final long txID, final boolean sync) throws Exception {
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afde8f4/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
index 5e27b36..2b24296 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/AlignedJournalImplTest.java
@@ -434,9 +434,6 @@ public class AlignedJournalImplTest extends ActiveMQTestBase {
Assert.assertEquals(0, records.size());
Assert.assertEquals(0, transactions.size());
-
- Assert.assertEquals(2, factory.listFiles("tt").size());
-
}
@Test
@@ -944,6 +941,7 @@ public class AlignedJournalImplTest extends ActiveMQTestBase {
// Reclaiming should still be able to reclaim a file if a transaction was ignored
journalImpl.checkReclaimStatus();
+ journalImpl.flush();
Assert.assertEquals(2, factory.listFiles("tt").size());
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6afde8f4/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java
index 8f23c2c..eb815ae 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java
@@ -25,6 +25,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQIOErrorException;
import org.apache.activemq.artemis.core.io.SequentialFile;
import org.apache.activemq.artemis.core.journal.EncodingSupport;
import org.apache.activemq.artemis.core.journal.RecordInfo;
+import org.apache.activemq.artemis.core.journal.TestableJournal;
import org.apache.activemq.artemis.core.journal.impl.JournalImpl;
import org.apache.activemq.artemis.tests.unit.UnitTestLogger;
import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.SimpleEncoding;
@@ -439,7 +440,10 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
/**
* Use: calculateNumberOfFiles (fileSize, numberOfRecords, recordSize, numberOfRecords2, recordSize2, , ...., numberOfRecordsN, recordSizeN);
*/
- private int calculateNumberOfFiles(final int fileSize, final int alignment, final int... record) throws Exception {
+ private int calculateNumberOfFiles(TestableJournal journal, final int fileSize, final int alignment, final int... record) throws Exception {
+ if (journal != null) {
+ journal.flush();
+ }
int headerSize = calculateRecordSize(JournalImpl.SIZE_HEADER, alignment);
int currentPosition = headerSize;
int totalFiles = 0;
@@ -489,7 +493,7 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
add(i);
}
- int numberOfFiles = calculateNumberOfFiles(10 * 1024, journal.getAlignment(), 91, JournalImpl.SIZE_ADD_RECORD + recordLength);
+ int numberOfFiles = calculateNumberOfFiles(journal, 10 * 1024, journal.getAlignment(), 91, JournalImpl.SIZE_ADD_RECORD + recordLength);
Assert.assertEquals(numberOfFiles, journal.getDataFilesCount());
Assert.assertEquals(0, journal.getFreeFilesCount());
@@ -512,7 +516,7 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
add(i);
}
- numberOfFiles = calculateNumberOfFiles(10 * 1024, journal.getAlignment(), 95, JournalImpl.SIZE_ADD_RECORD + recordLength);
+ numberOfFiles = calculateNumberOfFiles(journal, 10 * 1024, journal.getAlignment(), 95, JournalImpl.SIZE_ADD_RECORD + recordLength);
Assert.assertEquals(numberOfFiles, journal.getDataFilesCount());
Assert.assertEquals(0, journal.getFreeFilesCount());
@@ -533,7 +537,7 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
add(i);
}
- numberOfFiles = calculateNumberOfFiles(10 * 1024, journal.getAlignment(), 200, JournalImpl.SIZE_ADD_RECORD + recordLength);
+ numberOfFiles = calculateNumberOfFiles(journal, 10 * 1024, journal.getAlignment(), 200, JournalImpl.SIZE_ADD_RECORD + recordLength);
Assert.assertEquals(numberOfFiles, journal.getDataFilesCount());
Assert.assertEquals(0, journal.getFreeFilesCount());
@@ -646,14 +650,14 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
@Test
public void testCalculations() throws Exception {
- Assert.assertEquals(0, calculateNumberOfFiles(10 * 1024, 1, 1, 10, 2, 20));
- Assert.assertEquals(0, calculateNumberOfFiles(10 * 1024, 512, 1, 1));
- Assert.assertEquals(0, calculateNumberOfFiles(10 * 1024, 512, 19, 10));
- Assert.assertEquals(1, calculateNumberOfFiles(10 * 1024, 512, 20, 10));
- Assert.assertEquals(0, calculateNumberOfFiles(3000, 500, 2, 1000, 1, 500));
- Assert.assertEquals(1, calculateNumberOfFiles(3000, 500, 2, 1000, 1, 1000));
- Assert.assertEquals(9, calculateNumberOfFiles(10240, 1, 90, 1038, 45, 10));
- Assert.assertEquals(11, calculateNumberOfFiles(10 * 1024, 512, 60, 14 + 1024, 30, 14));
+ Assert.assertEquals(0, calculateNumberOfFiles(journal, 10 * 1024, 1, 1, 10, 2, 20));
+ Assert.assertEquals(0, calculateNumberOfFiles(journal, 10 * 1024, 512, 1, 1));
+ Assert.assertEquals(0, calculateNumberOfFiles(journal, 10 * 1024, 512, 19, 10));
+ Assert.assertEquals(1, calculateNumberOfFiles(journal, 10 * 1024, 512, 20, 10));
+ Assert.assertEquals(0, calculateNumberOfFiles(journal, 3000, 500, 2, 1000, 1, 500));
+ Assert.assertEquals(1, calculateNumberOfFiles(journal, 3000, 500, 2, 1000, 1, 1000));
+ Assert.assertEquals(9, calculateNumberOfFiles(journal, 10240, 1, 90, 1038, 45, 10));
+ Assert.assertEquals(11, calculateNumberOfFiles(journal, 10 * 1024, 512, 60, 14 + 1024, 30, 14));
}
@Test
@@ -862,13 +866,13 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
addTx(1, i);
}
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 100, recordLength), journal.getDataFilesCount());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 100, recordLength), journal.getDataFilesCount());
Assert.assertEquals(0, journal.getFreeFilesCount());
Assert.assertEquals(0, journal.getIDMapSize());
List<String> files2 = fileFactory.listFiles(fileExtension);
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 100, recordLength) + 2, files2.size());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 100, recordLength) + 2, files2.size());
Assert.assertEquals(1, journal.getOpenedFilesCount());
for (String file : files1) {
@@ -879,13 +883,13 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
// Make sure nothing reclaimed
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 100, recordLength), journal.getDataFilesCount());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 100, recordLength), journal.getDataFilesCount());
Assert.assertEquals(0, journal.getFreeFilesCount());
Assert.assertEquals(0, journal.getIDMapSize());
List<String> files3 = fileFactory.listFiles(fileExtension);
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 100, recordLength) + 2, files3.size());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 100, recordLength) + 2, files3.size());
Assert.assertEquals(1, journal.getOpenedFilesCount());
for (String file : files1) {
@@ -898,13 +902,13 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
updateTx(1, i);
}
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 200, recordLength), journal.getDataFilesCount());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 200, recordLength), journal.getDataFilesCount());
Assert.assertEquals(0, journal.getFreeFilesCount());
Assert.assertEquals(0, journal.getIDMapSize());
List<String> files4 = fileFactory.listFiles(fileExtension);
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 200, recordLength) + 2, files4.size());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 200, recordLength) + 2, files4.size());
Assert.assertEquals(1, journal.getOpenedFilesCount());
for (String file : files1) {
@@ -915,7 +919,7 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
// Make sure nothing reclaimed
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 200, recordLength), journal.getDataFilesCount());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 200, recordLength), journal.getDataFilesCount());
Assert.assertEquals(0, journal.getFreeFilesCount());
Assert.assertEquals(0, journal.getIDMapSize());
@@ -934,14 +938,14 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
deleteTx(1, i);
}
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 200, recordLength, 200, JournalImpl.SIZE_DELETE_RECORD_TX), journal.getDataFilesCount());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 200, recordLength, 200, JournalImpl.SIZE_DELETE_RECORD_TX), journal.getDataFilesCount());
Assert.assertEquals(0, journal.getFreeFilesCount());
Assert.assertEquals(0, journal.getIDMapSize());
List<String> files7 = fileFactory.listFiles(fileExtension);
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 200, recordLength, 200, JournalImpl.SIZE_DELETE_RECORD_TX) + 2, files7.size());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 200, recordLength, 200, JournalImpl.SIZE_DELETE_RECORD_TX) + 2, files7.size());
Assert.assertEquals(1, journal.getOpenedFilesCount());
for (String file : files1) {
@@ -950,13 +954,13 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
checkAndReclaimFiles();
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 200, recordLength, 200, JournalImpl.SIZE_DELETE_RECORD_TX), journal.getDataFilesCount());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 200, recordLength, 200, JournalImpl.SIZE_DELETE_RECORD_TX), journal.getDataFilesCount());
Assert.assertEquals(0, journal.getFreeFilesCount());
Assert.assertEquals(0, journal.getIDMapSize());
List<String> files8 = fileFactory.listFiles(fileExtension);
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 200, recordLength, 200, JournalImpl.SIZE_DELETE_RECORD_TX) + 2, files8.size());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 200, recordLength, 200, JournalImpl.SIZE_DELETE_RECORD_TX) + 2, files8.size());
Assert.assertEquals(1, journal.getOpenedFilesCount());
for (String file : files1) {
@@ -977,13 +981,13 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
add(i);
}
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 200, recordLength, 200, JournalImpl.SIZE_DELETE_RECORD_TX, 1, JournalImpl.SIZE_COMMIT_RECORD, 10, JournalImpl.SIZE_ADD_RECORD + recordLength), journal.getDataFilesCount());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 200, recordLength, 200, JournalImpl.SIZE_DELETE_RECORD_TX, 1, JournalImpl.SIZE_COMMIT_RECORD, 10, JournalImpl.SIZE_ADD_RECORD + recordLength), journal.getDataFilesCount());
Assert.assertEquals(0, journal.getFreeFilesCount());
Assert.assertEquals(10, journal.getIDMapSize());
List<String> files9 = fileFactory.listFiles(fileExtension);
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 200, recordLength, 200, JournalImpl.SIZE_DELETE_RECORD_TX, 1, JournalImpl.SIZE_COMMIT_RECORD, 10, JournalImpl.SIZE_ADD_RECORD + recordLength) + 2, files9.size());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 200, recordLength, 200, JournalImpl.SIZE_DELETE_RECORD_TX, 1, JournalImpl.SIZE_COMMIT_RECORD, 10, JournalImpl.SIZE_ADD_RECORD + recordLength) + 2, files9.size());
Assert.assertEquals(1, journal.getOpenedFilesCount());
for (String file : files1) {
@@ -1458,7 +1462,7 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
Assert.assertEquals(3, files2.size());
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 2, recordLength), journal.getDataFilesCount());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 2, recordLength), journal.getDataFilesCount());
Assert.assertEquals(0, journal.getFreeFilesCount());
Assert.assertEquals(1, journal.getOpenedFilesCount());
Assert.assertEquals(1, journal.getIDMapSize());
@@ -1467,10 +1471,10 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
List<String> files3 = fileFactory.listFiles(fileExtension);
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 2, recordLength, 1, JournalImpl.SIZE_COMMIT_RECORD + 1) + 2, files3.size());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 2, recordLength, 1, JournalImpl.SIZE_COMMIT_RECORD + 1) + 2, files3.size());
Assert.assertEquals(1, journal.getOpenedFilesCount());
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 2, recordLength, 1, JournalImpl.SIZE_COMMIT_RECORD), journal.getDataFilesCount());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 2, recordLength, 1, JournalImpl.SIZE_COMMIT_RECORD), journal.getDataFilesCount());
Assert.assertEquals(0, journal.getFreeFilesCount());
Assert.assertEquals(2, journal.getIDMapSize());
@@ -1478,10 +1482,10 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
List<String> files4 = fileFactory.listFiles(fileExtension);
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 2, recordLength, 1, JournalImpl.SIZE_COMMIT_RECORD + 1, 1, JournalImpl.SIZE_DELETE_RECORD + 1) + 2, files4.size());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 2, recordLength, 1, JournalImpl.SIZE_COMMIT_RECORD + 1, 1, JournalImpl.SIZE_DELETE_RECORD + 1) + 2, files4.size());
Assert.assertEquals(1, journal.getOpenedFilesCount());
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 2, recordLength, 1, JournalImpl.SIZE_COMMIT_RECORD + 1, 1, JournalImpl.SIZE_DELETE_RECORD + 1), journal.getDataFilesCount());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 2, recordLength, 1, JournalImpl.SIZE_COMMIT_RECORD + 1, 1, JournalImpl.SIZE_DELETE_RECORD + 1), journal.getDataFilesCount());
Assert.assertEquals(0, journal.getFreeFilesCount());
Assert.assertEquals(1, journal.getIDMapSize());
@@ -1549,10 +1553,10 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
rollback(1); // in file 1
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 2, recordLength, 1, JournalImpl.SIZE_ROLLBACK_RECORD + 1), journal.getDataFilesCount());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 2, recordLength, 1, JournalImpl.SIZE_ROLLBACK_RECORD + 1), journal.getDataFilesCount());
Assert.assertEquals(1, journal.getOpenedFilesCount());
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 2, recordLength, 1, JournalImpl.SIZE_ROLLBACK_RECORD + 1), journal.getDataFilesCount());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 2, recordLength, 1, JournalImpl.SIZE_ROLLBACK_RECORD + 1), journal.getDataFilesCount());
Assert.assertEquals(0, journal.getFreeFilesCount());
Assert.assertEquals(1, journal.getIDMapSize());
@@ -1560,10 +1564,10 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
List<String> files4 = fileFactory.listFiles(fileExtension);
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 2, recordLength, 1, JournalImpl.SIZE_ROLLBACK_RECORD + 1, 1, JournalImpl.SIZE_DELETE_RECORD + 1) + 2, files4.size());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 2, recordLength, 1, JournalImpl.SIZE_ROLLBACK_RECORD + 1, 1, JournalImpl.SIZE_DELETE_RECORD + 1) + 2, files4.size());
Assert.assertEquals(1, journal.getOpenedFilesCount());
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 2, recordLength, 1, JournalImpl.SIZE_ROLLBACK_RECORD + 1, 1, JournalImpl.SIZE_DELETE_RECORD + 1), journal.getDataFilesCount());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 2, recordLength, 1, JournalImpl.SIZE_ROLLBACK_RECORD + 1, 1, JournalImpl.SIZE_DELETE_RECORD + 1), journal.getDataFilesCount());
Assert.assertEquals(0, journal.getFreeFilesCount());
Assert.assertEquals(0, journal.getIDMapSize());
@@ -1669,7 +1673,7 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase {
Assert.assertEquals(3, files2.size());
- Assert.assertEquals(calculateNumberOfFiles(fileSize, journal.getAlignment(), 2, recordLength), journal.getDataFilesCount());
+ Assert.assertEquals(calculateNumberOfFiles(journal, fileSize, journal.getAlignment(), 2, recordLength), journal.getDataFilesCount());
Assert.assertEquals(0, journal.getFreeFilesCount());
Assert.assertEquals(1, journal.getOpenedFilesCount());
Assert.assertEquals(1, journal.getIDMapSize());
[24/34] activemq-artemis git commit: ARTEMIS-782 Added configuration
elements for new address model
Posted by ma...@apache.org.
ARTEMIS-782 Added configuration elements for new address model
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/af5f1b1b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/af5f1b1b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/af5f1b1b
Branch: refs/heads/ARTEMIS-780
Commit: af5f1b1b0da46dac608d582186b2062433a307c2
Parents: cdb52b8
Author: Martyn Taylor <mt...@redhat.com>
Authored: Tue Oct 18 19:45:02 2016 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue Nov 1 10:20:52 2016 +0000
----------------------------------------------------------------------
.../config/ActiveMQDefaultConfiguration.java | 12 ++
.../artemis/core/config/Configuration.java | 15 ++
.../core/config/CoreAddressConfiguration.java | 145 +++++++++++++++++++
.../core/config/CoreQueueConfiguration.java | 43 ++++++
.../core/config/impl/ConfigurationImpl.java | 20 +++
.../deployers/impl/FileConfigurationParser.java | 80 +++++++++-
.../resources/schema/artemis-configuration.xsd | 78 +++++++++-
.../impl/DefaultsFileConfigurationTest.java | 2 +
.../core/config/impl/FileConfigurationTest.java | 63 ++++++++
.../resources/ConfigurationTest-full-config.xml | 26 ++++
10 files changed, 478 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/af5f1b1b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
index e07493f..04d06c0 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/config/ActiveMQDefaultConfiguration.java
@@ -435,6 +435,10 @@ public final class ActiveMQDefaultConfiguration {
public static final int DEFAULT_DISK_SCAN = 5000;
+ public static final int DEFAULT_MAX_QUEUE_CONSUMERS = -1;
+
+ public static final boolean DEFAULT_DELETE_QUEUE_ON_NO_CONSUMERS = false;
+
/**
* If true then the ActiveMQ Artemis Server will make use of any Protocol Managers that are in available on the classpath. If false then only the core protocol will be available, unless in Embedded mode where users can inject their own Protocol Managers.
*/
@@ -1168,4 +1172,12 @@ public final class ActiveMQDefaultConfiguration {
public static int getDefaultDiskScanPeriod() {
return DEFAULT_DISK_SCAN;
}
+
+ public static int getDefaultMaxQueueConsumers() {
+ return DEFAULT_MAX_QUEUE_CONSUMERS;
+ }
+
+ public static boolean getDefaultDeleteQueueOnNoConsumers() {
+ return DEFAULT_DELETE_QUEUE_ON_NO_CONSUMERS;
+ }
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/af5f1b1b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
index f486a88..17a305e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/Configuration.java
@@ -387,6 +387,21 @@ public interface Configuration {
Configuration addQueueConfiguration(final CoreQueueConfiguration config);
/**
+ * Returns the addresses configured for this server.
+ */
+ List<CoreAddressConfiguration> getAddressConfigurations();
+
+ /**
+ * Sets the addresses configured for this server.
+ */
+ Configuration setAddressConfigurations(final List<CoreAddressConfiguration> configs);
+
+ /**
+ * Adds an addresses configuration
+ */
+ Configuration addAddressConfiguration(final CoreAddressConfiguration config);
+
+ /**
* Returns the management address of this server. <br>
* Clients can send management messages to this address to manage this server. <br>
* Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MANAGEMENT_ADDRESS}.
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/af5f1b1b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
new file mode 100644
index 0000000..cb6d43f
--- /dev/null
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreAddressConfiguration.java
@@ -0,0 +1,145 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.artemis.core.config;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
+
+public class CoreAddressConfiguration implements Serializable {
+
+ public enum RoutingType {
+ MULTICAST,
+ ANYCAST
+ }
+
+ private String name = null;
+
+ private RoutingType routingType = null;
+
+ private Integer defaultMaxConsumers = ActiveMQDefaultConfiguration.getDefaultMaxQueueConsumers();
+
+ private Boolean defaultDeleteOnNoConsumers = ActiveMQDefaultConfiguration.getDefaultDeleteQueueOnNoConsumers();
+
+ private List<CoreQueueConfiguration> queueConfigurations = new ArrayList<>();
+
+ public CoreAddressConfiguration() {
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public CoreAddressConfiguration setName(String name) {
+ this.name = name;
+ return this;
+ }
+
+ public RoutingType getRoutingType() {
+ return routingType;
+ }
+
+ public CoreAddressConfiguration setRoutingType(RoutingType routingType) {
+ this.routingType = routingType;
+ return this;
+ }
+
+ public CoreAddressConfiguration setQueueConfigurations(List<CoreQueueConfiguration> queueConfigurations) {
+ this.queueConfigurations = queueConfigurations;
+ return this;
+ }
+
+ public CoreAddressConfiguration addQueueConfiguration(CoreQueueConfiguration queueConfiguration) {
+ this.queueConfigurations.add(queueConfiguration);
+ return this;
+ }
+
+ public List<CoreQueueConfiguration> getQueueConfigurations() {
+ return queueConfigurations;
+ }
+
+ public Boolean getDefaultDeleteOnNoConsumers() {
+ return defaultDeleteOnNoConsumers;
+ }
+
+ public CoreAddressConfiguration setDefaultDeleteOnNoConsumers(Boolean defaultDeleteOnNoConsumers) {
+ this.defaultDeleteOnNoConsumers = defaultDeleteOnNoConsumers;
+ return this;
+ }
+
+ public Integer getDefaultMaxConsumers() {
+ return defaultMaxConsumers;
+ }
+
+ public CoreAddressConfiguration setDefaultMaxConsumers(Integer defaultMaxConsumers) {
+ this.defaultMaxConsumers = defaultMaxConsumers;
+ return this;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ result = prime * result + ((routingType == null) ? 0 : routingType.hashCode());
+ result = prime * result + ((queueConfigurations == null) ? 0 : queueConfigurations.hashCode());
+ result = prime * result + ((defaultMaxConsumers == null) ? 0 : defaultMaxConsumers.hashCode());
+ result = prime * result + ((defaultDeleteOnNoConsumers == null) ? 0 : defaultDeleteOnNoConsumers.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ CoreAddressConfiguration other = (CoreAddressConfiguration) obj;
+ if (name == null) {
+ if (other.name != null)
+ return false;
+ } else if (!name.equals(other.name))
+ return false;
+ if (routingType == null) {
+ if (other.routingType != null)
+ return false;
+ } else if (!routingType.equals(other.routingType))
+ return false;
+ if (queueConfigurations == null) {
+ if (other.queueConfigurations != null)
+ return false;
+ } else if (!queueConfigurations.equals(other.queueConfigurations))
+ return false;
+ if (defaultMaxConsumers == null) {
+ if (other.defaultMaxConsumers != null)
+ return false;
+ } else if (!defaultMaxConsumers.equals(other.defaultMaxConsumers))
+ return false;
+ if (defaultDeleteOnNoConsumers == null) {
+ if (other.defaultDeleteOnNoConsumers != null)
+ return false;
+ } else if (!defaultDeleteOnNoConsumers.equals(other.defaultDeleteOnNoConsumers)) {
+ return false;
+ }
+
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/af5f1b1b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java
index 2e7b9ca..79b2fd2 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/CoreQueueConfiguration.java
@@ -30,6 +30,10 @@ public class CoreQueueConfiguration implements Serializable {
private boolean durable = true;
+ private Integer maxConsumers = null;
+
+ private Boolean deleteOnNoConsumers = null;
+
public CoreQueueConfiguration() {
}
@@ -49,6 +53,8 @@ public class CoreQueueConfiguration implements Serializable {
return durable;
}
+
+
/**
* @param address the address to set
*/
@@ -81,6 +87,30 @@ public class CoreQueueConfiguration implements Serializable {
return this;
}
+ /**
+ * @param maxConsumers for this queue, default is -1 (unlimited)
+ */
+ public CoreQueueConfiguration setMaxConsumers(Integer maxConsumers) {
+ this.maxConsumers = maxConsumers;
+ return this;
+ }
+
+ /**
+ * @param deleteOnNoConsumers delete this queue when consumer count reaches 0, default is false
+ */
+ public CoreQueueConfiguration setDeleteOnNoConsumers(Boolean deleteOnNoConsumers) {
+ this.deleteOnNoConsumers = deleteOnNoConsumers;
+ return this;
+ }
+
+ public Boolean getDeleteOnNoConsumers() {
+ return deleteOnNoConsumers;
+ }
+
+ public Integer getMaxConsumers() {
+ return maxConsumers;
+ }
+
@Override
public int hashCode() {
final int prime = 31;
@@ -89,6 +119,8 @@ public class CoreQueueConfiguration implements Serializable {
result = prime * result + (durable ? 1231 : 1237);
result = prime * result + ((filterString == null) ? 0 : filterString.hashCode());
result = prime * result + ((name == null) ? 0 : name.hashCode());
+ result = prime * result + ((maxConsumers == null) ? 0 : maxConsumers.hashCode());
+ result = prime * result + ((deleteOnNoConsumers == null) ? 0 : deleteOnNoConsumers.hashCode());
return result;
}
@@ -118,6 +150,17 @@ public class CoreQueueConfiguration implements Serializable {
return false;
} else if (!name.equals(other.name))
return false;
+ if (maxConsumers == null) {
+ if (other.maxConsumers != null)
+ return false;
+ } else if (!maxConsumers.equals(other.maxConsumers))
+ return false;
+ if (deleteOnNoConsumers == null) {
+ if (other.deleteOnNoConsumers != null)
+ return false;
+ } else if (!deleteOnNoConsumers.equals(other.deleteOnNoConsumers)) {
+ return false;
+ }
return true;
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/af5f1b1b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
index 2613929..8ff1922 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
@@ -47,6 +47,7 @@ import org.apache.activemq.artemis.core.config.BridgeConfiguration;
import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration;
import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.config.ConnectorServiceConfiguration;
+import org.apache.activemq.artemis.core.config.CoreAddressConfiguration;
import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
import org.apache.activemq.artemis.core.config.DivertConfiguration;
import org.apache.activemq.artemis.core.config.HAPolicyConfiguration;
@@ -127,6 +128,8 @@ public class ConfigurationImpl implements Configuration, Serializable {
private List<CoreQueueConfiguration> queueConfigurations = new ArrayList<>();
+ private List<CoreAddressConfiguration> addressConfigurations = new ArrayList<>();
+
protected transient List<BroadcastGroupConfiguration> broadcastGroupConfigurations = new ArrayList<>();
protected transient Map<String, DiscoveryGroupConfiguration> discoveryGroupConfigurations = new LinkedHashMap<>();
@@ -582,6 +585,23 @@ public class ConfigurationImpl implements Configuration, Serializable {
}
@Override
+ public List<CoreAddressConfiguration> getAddressConfigurations() {
+ return addressConfigurations;
+ }
+
+ @Override
+ public Configuration setAddressConfigurations(List<CoreAddressConfiguration> configs) {
+ this.addressConfigurations = configs;
+ return this;
+ }
+
+ @Override
+ public Configuration addAddressConfiguration(CoreAddressConfiguration config) {
+ this.addressConfigurations.add(config);
+ return this;
+ }
+
+ @Override
public Map<String, DiscoveryGroupConfiguration> getDiscoveryGroupConfigurations() {
return discoveryGroupConfigurations;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/af5f1b1b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
index d90c343..fc045b3 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
@@ -43,6 +43,7 @@ import org.apache.activemq.artemis.core.config.BridgeConfiguration;
import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration;
import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.config.ConnectorServiceConfiguration;
+import org.apache.activemq.artemis.core.config.CoreAddressConfiguration;
import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
import org.apache.activemq.artemis.core.config.DivertConfiguration;
import org.apache.activemq.artemis.core.config.ScaleDownConfiguration;
@@ -542,6 +543,8 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
parseQueues(e, config);
+ parseAddresses(e, config);
+
parseSecurity(e, config);
NodeList connectorServiceConfigs = e.getElementsByTagName("connector-service");
@@ -585,13 +588,35 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
*/
private void parseQueues(final Element e, final Configuration config) {
NodeList elements = e.getElementsByTagName("queues");
+ if (elements.getLength() != 0) {
+ Element node = (Element) elements.item(0);
+ config.setQueueConfigurations(parseQueueConfigurations(node));
+ }
+ }
+
+ private List<CoreQueueConfiguration> parseQueueConfigurations(final Element node) {
+ List<CoreQueueConfiguration> queueConfigurations = new ArrayList<>();
+ NodeList list = node.getElementsByTagName("queue");
+ for (int i = 0; i < list.getLength(); i++) {
+ CoreQueueConfiguration queueConfig = parseQueueConfiguration(list.item(i));
+ queueConfigurations.add(queueConfig);
+ }
+ return queueConfigurations;
+ }
+
+ /**
+ * @param e
+ * @param config
+ */
+ private void parseAddresses(final Element e, final Configuration config) {
+ NodeList elements = e.getElementsByTagName("addresses");
if (elements.getLength() != 0) {
Element node = (Element) elements.item(0);
- NodeList list = node.getElementsByTagName("queue");
+ NodeList list = node.getElementsByTagName("address");
for (int i = 0; i < list.getLength(); i++) {
- CoreQueueConfiguration queueConfig = parseQueueConfiguration(list.item(i));
- config.getQueueConfigurations().add(queueConfig);
+ CoreAddressConfiguration addrConfig = parseAddressConfiguration(list.item(i));
+ config.getAddressConfigurations().add(addrConfig);
}
}
}
@@ -829,9 +854,20 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
String address = null;
String filterString = null;
boolean durable = true;
+ Integer maxConsumers = null;
+ Boolean deleteOnNoConsumers = null;
+
+ NamedNodeMap attributes = node.getAttributes();
+ for (int i = 0; i < attributes.getLength(); i++) {
+ Node item = attributes.item(i);
+ if (item.getNodeName().equals("max-consumers")) {
+ maxConsumers = Integer.parseInt(item.getNodeValue());
+ } else if (item.getNodeName().equals("delete-on-no-consumers")) {
+ deleteOnNoConsumers = Boolean.parseBoolean(item.getNodeValue());
+ }
+ }
NodeList children = node.getChildNodes();
-
for (int j = 0; j < children.getLength(); j++) {
Node child = children.item(j);
@@ -844,7 +880,41 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
}
}
- return new CoreQueueConfiguration().setAddress(address).setName(name).setFilterString(filterString).setDurable(durable);
+ return new CoreQueueConfiguration()
+ .setAddress(address)
+ .setName(name)
+ .setFilterString(filterString)
+ .setDurable(durable)
+ .setMaxConsumers(maxConsumers)
+ .setDeleteOnNoConsumers(deleteOnNoConsumers);
+ }
+
+ protected CoreAddressConfiguration parseAddressConfiguration(final Node node) {
+ String name = getAttributeValue(node, "name");
+ String routingType = getAttributeValue(node, "type");
+
+ CoreAddressConfiguration addressConfiguration = new CoreAddressConfiguration();
+ addressConfiguration.setName(name)
+ .setRoutingType(CoreAddressConfiguration.RoutingType.valueOf(routingType.toUpperCase()));
+
+ NodeList children = node.getChildNodes();
+ for (int j = 0; j < children.getLength(); j++) {
+ Node child = children.item(j);
+ if (child.getNodeName().equals("queues")) {
+ addressConfiguration.setQueueConfigurations(parseQueueConfigurations((Element) child));
+ }
+ }
+
+ for (CoreQueueConfiguration coreQueueConfiguration : addressConfiguration.getQueueConfigurations()) {
+ coreQueueConfiguration.setAddress(addressConfiguration.getName());
+ if (coreQueueConfiguration.getMaxConsumers() == null) {
+ coreQueueConfiguration.setMaxConsumers(addressConfiguration.getDefaultMaxConsumers());
+ }
+ if (coreQueueConfiguration.getDeleteOnNoConsumers() == null) {
+ coreQueueConfiguration.setDeleteOnNoConsumers(addressConfiguration.getDefaultDeleteOnNoConsumers());
+ }
+ }
+ return addressConfiguration;
}
private TransportConfiguration parseAcceptorTransportConfiguration(final Element e,
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/af5f1b1b/artemis-server/src/main/resources/schema/artemis-configuration.xsd
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/resources/schema/artemis-configuration.xsd b/artemis-server/src/main/resources/schema/artemis-configuration.xsd
index 73aa20b..4c3e068 100644
--- a/artemis-server/src/main/resources/schema/artemis-configuration.xsd
+++ b/artemis-server/src/main/resources/schema/artemis-configuration.xsd
@@ -422,7 +422,6 @@
</xsd:complexType>
</xsd:element>
-
<!-- QUEUES -->
<xsd:element name="queues" maxOccurs="1" minOccurs="0">
<xsd:annotation>
@@ -855,6 +854,8 @@
</xsd:sequence>
</xsd:complexType>
</xsd:element>
+
+ <xsd:element name="addresses" type="addressesType" maxOccurs="1" minOccurs="0" />
</xsd:all>
</xsd:complexType>
@@ -2512,4 +2513,79 @@
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
+
+
+ <!-- 2.0 Addressing configuration -->
+ <xsd:simpleType name="routingType">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="multicast" />
+ <xsd:enumeration value="anycast" />
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:complexType name="queueType">
+ <xsd:all>
+ <xsd:element ref="filter" maxOccurs="1" minOccurs="0"/>
+ <xsd:element name="durable" type="xsd:boolean" default="true" maxOccurs="1" minOccurs="0" />
+ </xsd:all>
+ <xsd:attribute name="name" type="xsd:ID" use="required"/>
+ <xsd:attribute name="max-consumers" type="xsd:integer" use="optional"/>
+ <xsd:attribute name="delete-on-no-consumers" type="xsd:boolean" use="optional"/>
+ </xsd:complexType>
+
+ <xsd:complexType name="addressType">
+ <xsd:all>
+ <xsd:element name="queues" maxOccurs="1" minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ a list of pre configured queues to create
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="queue" type="queueType" maxOccurs="unbounded" minOccurs="0" />
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:all>
+ <xsd:attribute name="name" type="xsd:string" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ The address name to matches incoming message addresses
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="type" type="routingType" use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+ The address name to matches incoming message addresses
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="default-max-consumers" type="xsd:int" use="optional" default="-1">
+ <xsd:annotation>
+ <xsd:documentation>
+ The default value of max-consumers applied to all queues that are
+ auto-created under this address. Also applies to any queues that do not
+ specify a value for max-consumers.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="default-delete-on-no-consumers" type="xsd:boolean" use="optional" default="false">
+ <xsd:annotation>
+ <xsd:documentation>
+ The default value of delete-on-no-consumers applied to all queues that are
+ auto-created under this address. Also applies to any queues that do not
+ specify a value for delete-on-no-consumers.
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ </xsd:complexType>
+
+ <xsd:complexType name="addressesType">
+ <xsd:sequence>
+ <xsd:element name="address" type="addressType" maxOccurs="unbounded" minOccurs="0"/>
+ </xsd:sequence>
+ </xsd:complexType>
+
</xsd:schema>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/af5f1b1b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/DefaultsFileConfigurationTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/DefaultsFileConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/DefaultsFileConfigurationTest.java
index 700c290..07d5f58 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/DefaultsFileConfigurationTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/DefaultsFileConfigurationTest.java
@@ -64,6 +64,8 @@ public class DefaultsFileConfigurationTest extends ConfigurationImplTest {
Assert.assertEquals(Collections.emptyList(), conf.getQueueConfigurations());
+ Assert.assertEquals(Collections.emptyList(), conf.getAddressConfigurations());
+
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultManagementAddress(), conf.getManagementAddress());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress(), conf.getManagementNotificationAddress());
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/af5f1b1b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
index a2afd97..d004a22 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
@@ -35,6 +35,8 @@ import org.apache.activemq.artemis.api.core.UDPBroadcastEndpointFactory;
import org.apache.activemq.artemis.core.config.BridgeConfiguration;
import org.apache.activemq.artemis.core.config.ClusterConnectionConfiguration;
import org.apache.activemq.artemis.core.config.Configuration;
+import org.apache.activemq.artemis.core.config.CoreAddressConfiguration;
+import org.apache.activemq.artemis.core.config.CoreQueueConfiguration;
import org.apache.activemq.artemis.core.config.DivertConfiguration;
import org.apache.activemq.artemis.core.config.FileDeploymentManager;
import org.apache.activemq.artemis.core.config.HAPolicyConfiguration;
@@ -49,6 +51,9 @@ import org.apache.activemq.artemis.core.settings.impl.SlowConsumerPolicy;
import org.junit.Assert;
import org.junit.Test;
+import static org.apache.activemq.artemis.core.config.CoreAddressConfiguration.RoutingType.ANYCAST;
+import static org.apache.activemq.artemis.core.config.CoreAddressConfiguration.RoutingType.MULTICAST;
+
public class FileConfigurationTest extends ConfigurationImplTest {
private final String fullConfigurationName = "ConfigurationTest-full-config.xml";
@@ -324,6 +329,8 @@ public class FileConfigurationTest extends ConfigurationImplTest {
assertEquals("color='blue'", conf.getQueueConfigurations().get(1).getFilterString());
assertEquals(false, conf.getQueueConfigurations().get(1).isDurable());
+ verifyAddresses();
+
Map<String, Set<Role>> roles = conf.getSecurityRoles();
assertEquals(2, roles.size());
@@ -356,6 +363,62 @@ public class FileConfigurationTest extends ConfigurationImplTest {
assertEquals(123, conf.getDiskScanPeriod());
}
+ private void verifyAddresses() {
+ assertEquals(2, conf.getAddressConfigurations().size());
+
+ // Addr 1
+ CoreAddressConfiguration addressConfiguration = conf.getAddressConfigurations().get(0);
+ assertEquals("addr1", addressConfiguration.getName());
+ assertEquals(ANYCAST, addressConfiguration.getRoutingType());
+ assertEquals(2, addressConfiguration.getQueueConfigurations().size());
+
+ // Addr 1 Queue 1
+ CoreQueueConfiguration queueConfiguration = addressConfiguration.getQueueConfigurations().get(0);
+
+ assertEquals("q1", queueConfiguration.getName());
+ assertFalse(queueConfiguration.isDurable());
+ assertEquals("color='blue'", queueConfiguration.getFilterString());
+ assertEquals(addressConfiguration.getDefaultDeleteOnNoConsumers(), queueConfiguration.getDeleteOnNoConsumers());
+ assertEquals("addr1", queueConfiguration.getAddress());
+ assertEquals(addressConfiguration.getDefaultMaxConsumers(), queueConfiguration.getMaxConsumers());
+
+ // Addr 1 Queue 2
+ queueConfiguration = addressConfiguration.getQueueConfigurations().get(1);
+
+ assertEquals("q2", queueConfiguration.getName());
+ assertTrue(queueConfiguration.isDurable());
+ assertEquals("color='green'", queueConfiguration.getFilterString());
+ assertEquals(new Integer(-1), queueConfiguration.getMaxConsumers());
+ assertFalse(queueConfiguration.getDeleteOnNoConsumers());
+ assertEquals("addr1", queueConfiguration.getAddress());
+
+ // Addr 2
+ addressConfiguration = conf.getAddressConfigurations().get(1);
+ assertEquals("addr2", addressConfiguration.getName());
+ assertEquals(MULTICAST, addressConfiguration.getRoutingType());
+ assertEquals(2, addressConfiguration.getQueueConfigurations().size());
+
+ // Addr 2 Queue 1
+ queueConfiguration = addressConfiguration.getQueueConfigurations().get(0);
+
+ assertEquals("q3", queueConfiguration.getName());
+ assertTrue(queueConfiguration.isDurable());
+ assertEquals("color='red'", queueConfiguration.getFilterString());
+ assertEquals(new Integer(10), queueConfiguration.getMaxConsumers());
+ assertEquals(addressConfiguration.getDefaultDeleteOnNoConsumers(), queueConfiguration.getDeleteOnNoConsumers());
+ assertEquals("addr2", queueConfiguration.getAddress());
+
+ // Addr 2 Queue 2
+ queueConfiguration = addressConfiguration.getQueueConfigurations().get(1);
+
+ assertEquals("q4", queueConfiguration.getName());
+ assertTrue(queueConfiguration.isDurable());
+ assertNull(queueConfiguration.getFilterString());
+ assertEquals(addressConfiguration.getDefaultMaxConsumers(), queueConfiguration.getMaxConsumers());
+ assertTrue(queueConfiguration.getDeleteOnNoConsumers());
+ assertEquals("addr2", queueConfiguration.getAddress());
+ }
+
@Test
public void testSecuritySettingPlugin() throws Exception {
FileConfiguration fc = new FileConfiguration();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/af5f1b1b/artemis-server/src/test/resources/ConfigurationTest-full-config.xml
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/resources/ConfigurationTest-full-config.xml b/artemis-server/src/test/resources/ConfigurationTest-full-config.xml
index 8984405..3bc14bf 100644
--- a/artemis-server/src/test/resources/ConfigurationTest-full-config.xml
+++ b/artemis-server/src/test/resources/ConfigurationTest-full-config.xml
@@ -289,5 +289,31 @@
<factory-class>org.foo</factory-class>
</connector-service>
</connector-services>
+
+ <addresses>
+ <address name="addr1" type="anycast">
+ <queues>
+ <queue name="q1">
+ <durable>false</durable>
+ <filter string="color='blue'"/>
+ </queue>
+ <queue name="q2" max-consumers="-1" delete-on-no-consumers="false">
+ <durable>true</durable>
+ <filter string="color='green'"/>
+ </queue>
+ </queues>
+ </address>
+ <address name="addr2" type="multicast">
+ <queues>
+ <queue name="q3" max-consumers="10" >
+ <filter string="color='red'"/>
+ </queue>
+ <queue name="q4" delete-on-no-consumers="true">
+ <durable>true</durable>
+ </queue>
+ </queues>
+ </address>
+ </addresses>
+
</core>
</configuration>
[15/34] activemq-artemis git commit: ARTEMIS-828 Queue browsing can
be out of sync while paging
Posted by ma...@apache.org.
ARTEMIS-828 Queue browsing can be out of sync while paging
https://issues.apache.org/jira/browse/ARTEMIS-828
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/bfb9bedb
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/bfb9bedb
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/bfb9bedb
Branch: refs/heads/ARTEMIS-780
Commit: bfb9bedb2d7a3d8ab5e336509915eb6ecafaefb3
Parents: e002125
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Oct 27 17:30:34 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri Oct 28 16:54:58 2016 -0400
----------------------------------------------------------------------
.../core/management/impl/QueueControlImpl.java | 8 +--
.../core/paging/cursor/PageSubscription.java | 5 +-
.../impl/PageSubscriptionCounterImpl.java | 1 -
.../cursor/impl/PageSubscriptionImpl.java | 21 ++++--
.../activemq/artemis/core/server/Queue.java | 2 +-
.../artemis/core/server/impl/QueueImpl.java | 67 ++++++++++++++------
.../core/server/impl/ScaleDownHandler.java | 4 +-
.../core/server/impl/ServerConsumerImpl.java | 2 +-
.../impl/ScheduledDeliveryHandlerTest.java | 2 +-
.../integration/paging/PagingSendTest.java | 4 +-
.../unit/core/postoffice/impl/FakeQueue.java | 2 +-
.../unit/core/server/impl/QueueImplTest.java | 2 +-
12 files changed, 81 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bfb9bedb/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
index cfa8aa5..85bad25 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
@@ -410,7 +410,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
Filter filter = FilterImpl.createFilter(filterStr);
List<Map<String, Object>> messages = new ArrayList<>();
queue.flushExecutor();
- try (LinkedListIterator<MessageReference> iterator = queue.totalIterator()) {
+ try (LinkedListIterator<MessageReference> iterator = queue.browserIterator()) {
while (iterator.hasNext()) {
MessageReference ref = iterator.next();
if (filter == null || filter.match(ref.getMessage())) {
@@ -446,7 +446,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
try {
List<Map<String, Object>> messages = new ArrayList<>();
queue.flushExecutor();
- try (LinkedListIterator<MessageReference> iterator = queue.totalIterator()) {
+ try (LinkedListIterator<MessageReference> iterator = queue.browserIterator()) {
// returns just the first, as it's the first only
if (iterator.hasNext()) {
MessageReference ref = iterator.next();
@@ -499,7 +499,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
if (filter == null) {
return getMessageCount();
} else {
- try (LinkedListIterator<MessageReference> iterator = queue.totalIterator()) {
+ try (LinkedListIterator<MessageReference> iterator = queue.browserIterator()) {
int count = 0;
while (iterator.hasNext()) {
MessageReference ref = iterator.next();
@@ -895,7 +895,7 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
ArrayList<CompositeData> c = new ArrayList<>();
Filter filter = FilterImpl.createFilter(filterStr);
queue.flushExecutor();
- try (LinkedListIterator<MessageReference> iterator = queue.totalIterator()) {
+ try (LinkedListIterator<MessageReference> iterator = queue.browserIterator()) {
while (iterator.hasNext() && currentPageSize++ < pageSize) {
MessageReference ref = iterator.next();
if (filter == null || filter.match(ref.getMessage())) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bfb9bedb/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageSubscription.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageSubscription.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageSubscription.java
index 89c6d44..6e569c1 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageSubscription.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/PageSubscription.java
@@ -56,7 +56,10 @@ public interface PageSubscription {
LinkedListIterator<PagedReference> iterator();
- // To be called when the cursor is closed for good. Most likely when the queue is deleted
+ LinkedListIterator<PagedReference> iterator(boolean jumpRemoves);
+
+
+ // To be called when the cursor is closed for good. Most likely when the queue is deleted
void destroy() throws Exception;
void scheduleCleanupCheck();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bfb9bedb/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionCounterImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionCounterImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionCounterImpl.java
index e01098d..01ad778 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionCounterImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionCounterImpl.java
@@ -251,7 +251,6 @@ public class PageSubscriptionCounterImpl implements PageSubscriptionCounter {
recordID = -1;
value.set(0);
- added.set(0);
incrementRecords.clear();
}
} finally {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bfb9bedb/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
index c1c54a2..063722c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
@@ -351,6 +351,11 @@ final class PageSubscriptionImpl implements PageSubscription {
return new CursorIterator();
}
+ @Override
+ public PageIterator iterator(boolean browsing) {
+ return new CursorIterator(browsing);
+ }
+
private PagedReference internalGetNext(final PagePosition pos) {
PagePosition retPos = pos.nextMessage();
@@ -1100,6 +1105,8 @@ final class PageSubscriptionImpl implements PageSubscription {
private volatile PagedReference lastRedelivery = null;
+ private final boolean browsing;
+
// We only store the position for redeliveries. They will be read from the SoftCache again during delivery.
private final java.util.Queue<PagePosition> redeliveries = new LinkedList<>();
@@ -1109,7 +1116,13 @@ final class PageSubscriptionImpl implements PageSubscription {
*/
private volatile PagedReference cachedNext;
+ private CursorIterator(boolean browsing) {
+ this.browsing = browsing;
+ }
+
+
private CursorIterator() {
+ this.browsing = false;
}
@Override
@@ -1199,7 +1212,7 @@ final class PageSubscriptionImpl implements PageSubscription {
PageCursorInfo info = getPageInfo(message.getPosition().getPageNr());
- if (info != null && (info.isRemoved(message.getPosition()) || info.getCompleteInfo() != null)) {
+ if (!browsing && info != null && (info.isRemoved(message.getPosition()) || info.getCompleteInfo() != null)) {
continue;
}
@@ -1225,7 +1238,7 @@ final class PageSubscriptionImpl implements PageSubscription {
// nothing
// is being changed. That's why the false is passed as a parameter here
- if (info != null && info.isRemoved(message.getPosition())) {
+ if (!browsing && info != null && info.isRemoved(message.getPosition())) {
valid = false;
}
}
@@ -1237,10 +1250,10 @@ final class PageSubscriptionImpl implements PageSubscription {
if (valid) {
match = match(message.getMessage());
- if (!match) {
+ if (!browsing && !match) {
processACK(message.getPosition());
}
- } else if (ignored) {
+ } else if (!browsing && ignored) {
positionIgnored(message.getPosition());
}
} while (!match);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bfb9bedb/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java
index 0dcef3d..52cd2f0 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Queue.java
@@ -195,7 +195,7 @@ public interface Queue extends Bindable {
*/
LinkedListIterator<MessageReference> iterator();
- LinkedListIterator<MessageReference> totalIterator();
+ LinkedListIterator<MessageReference> browserIterator();
SimpleString getExpiryAddress();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bfb9bedb/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
index b70fe8d..56a33ef 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@@ -867,8 +867,8 @@ public class QueueImpl implements Queue {
}
@Override
- public TotalQueueIterator totalIterator() {
- return new TotalQueueIterator();
+ public QueueBrowserIterator browserIterator() {
+ return new QueueBrowserIterator();
}
@Override
@@ -2863,17 +2863,23 @@ public class QueueImpl implements Queue {
//Readonly (no remove) iterator over the messages in the queue, in order of
//paging store, intermediateMessageReferences and MessageReferences
- private class TotalQueueIterator implements LinkedListIterator<MessageReference> {
+ private class QueueBrowserIterator implements LinkedListIterator<MessageReference> {
- LinkedListIterator<PagedReference> pageIter = null;
+ LinkedListIterator<PagedReference> pagingIterator = null;
LinkedListIterator<MessageReference> messagesIterator = null;
+ private LinkedListIterator<PagedReference> getPagingIterator() {
+ if (pagingIterator == null) {
+ pagingIterator = pageSubscription.iterator(true);
+ }
+ return pagingIterator;
+ }
+
Iterator lastIterator = null;
- private TotalQueueIterator() {
- if (pageSubscription != null) {
- pageIter = pageSubscription.iterator();
- }
+ MessageReference cachedNext = null;
+
+ private QueueBrowserIterator() {
messagesIterator = new SynchronizedIterator(messageReferences.iterator());
}
@@ -2883,9 +2889,9 @@ public class QueueImpl implements Queue {
lastIterator = messagesIterator;
return true;
}
- if (pageIter != null) {
- if (pageIter.hasNext()) {
- lastIterator = pageIter;
+ if (getPagingIterator() != null) {
+ if (getPagingIterator().hasNext()) {
+ lastIterator = getPagingIterator();
return true;
}
}
@@ -2893,16 +2899,37 @@ public class QueueImpl implements Queue {
return false;
}
+
+
@Override
public MessageReference next() {
- if (messagesIterator != null && messagesIterator.hasNext()) {
- MessageReference msg = messagesIterator.next();
- return msg;
+
+ if (cachedNext != null) {
+ try {
+ return cachedNext;
+ } finally {
+ cachedNext = null;
+ }
+
}
- if (pageIter != null) {
- if (pageIter.hasNext()) {
- lastIterator = pageIter;
- return pageIter.next();
+ while (true) {
+ if (messagesIterator != null && messagesIterator.hasNext()) {
+ MessageReference msg = messagesIterator.next();
+ if (msg.isPaged()) {
+ System.out.println("** Rejecting because it's paged " + msg.getMessage());
+ continue;
+ }
+// System.out.println("** Returning because it's not paged " + msg.getMessage());
+ return msg;
+ } else {
+ break;
+ }
+ }
+ if (getPagingIterator() != null) {
+ if (getPagingIterator().hasNext()) {
+ lastIterator = getPagingIterator();
+ MessageReference ref = getPagingIterator().next();
+ return ref;
}
}
@@ -2922,8 +2949,8 @@ public class QueueImpl implements Queue {
@Override
public void close() {
- if (pageIter != null) {
- pageIter.close();
+ if (getPagingIterator() != null) {
+ getPagingIterator().close();
}
if (messagesIterator != null) {
messagesIterator.close();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bfb9bedb/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java
index b763ff2..dc62676 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ScaleDownHandler.java
@@ -165,7 +165,7 @@ public class ScaleDownHandler {
for (Queue loopQueue : queues) {
logger.debug("Scaling down messages on address " + address + " / performing loop on queue " + loopQueue);
- try (LinkedListIterator<MessageReference> messagesIterator = loopQueue.totalIterator()) {
+ try (LinkedListIterator<MessageReference> messagesIterator = loopQueue.browserIterator()) {
while (messagesIterator.hasNext()) {
MessageReference messageReference = messagesIterator.next();
@@ -249,7 +249,7 @@ public class ScaleDownHandler {
for (Queue queue : queues) {
// using auto-closeable
- try (LinkedListIterator<MessageReference> messagesIterator = queue.totalIterator()) {
+ try (LinkedListIterator<MessageReference> messagesIterator = queue.browserIterator()) {
// loop through every message of this queue
while (messagesIterator.hasNext()) {
MessageReference messageRef = messagesIterator.next();
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bfb9bedb/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
index 1318ff3..98a9c84 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
@@ -206,7 +206,7 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
this.creationTime = System.currentTimeMillis();
if (browseOnly) {
- browserDeliverer = new BrowserDeliverer(messageQueue.totalIterator());
+ browserDeliverer = new BrowserDeliverer(messageQueue.browserIterator());
} else {
messageQueue.addConsumer(this);
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bfb9bedb/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
index d82f7d3..55a287a 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/ScheduledDeliveryHandlerTest.java
@@ -1212,7 +1212,7 @@ public class ScheduledDeliveryHandlerTest extends Assert {
}
@Override
- public LinkedListIterator<MessageReference> totalIterator() {
+ public LinkedListIterator<MessageReference> browserIterator() {
return null;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bfb9bedb/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java
index ca8a9a1..1f0d7e0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java
@@ -308,7 +308,7 @@ public class PagingSendTest extends ActiveMQTestBase {
* duplicates that may have happened before this point).
*/
public void checkBatchMessagesAreNotPagedTwice(Queue queue) throws Exception {
- LinkedListIterator<MessageReference> pageIterator = queue.totalIterator();
+ LinkedListIterator<MessageReference> pageIterator = queue.browserIterator();
Set<String> messageOrderSet = new HashSet<>();
@@ -344,7 +344,7 @@ public class PagingSendTest extends ActiveMQTestBase {
* duplicates that may have happened before this point).
*/
protected int processCountThroughIterator(Queue queue) throws Exception {
- LinkedListIterator<MessageReference> pageIterator = queue.totalIterator();
+ LinkedListIterator<MessageReference> pageIterator = queue.browserIterator();
int count = 0;
while (pageIterator.hasNext()) {
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bfb9bedb/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
index bba5dc1..9a20d70 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/postoffice/impl/FakeQueue.java
@@ -604,7 +604,7 @@ public class FakeQueue implements Queue {
}
@Override
- public LinkedListIterator<MessageReference> totalIterator() {
+ public LinkedListIterator<MessageReference> browserIterator() {
// TODO Auto-generated method stub
return null;
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/bfb9bedb/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java
----------------------------------------------------------------------
diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java
index b9bdba7..804429f 100644
--- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java
+++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/server/impl/QueueImplTest.java
@@ -1274,7 +1274,7 @@ public class QueueImplTest extends ActiveMQTestBase {
locator.close();
Queue queue = ((LocalQueueBinding) server.getPostOffice().getBinding(new SimpleString(MY_QUEUE))).getQueue();
- LinkedListIterator<MessageReference> totalIterator = queue.totalIterator();
+ LinkedListIterator<MessageReference> totalIterator = queue.browserIterator();
try {
int i = 0;