You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/05/06 15:50:50 UTC
[1/4] activemq-artemis git commit: Fix/update auto-create/delete tests
Repository: activemq-artemis
Updated Branches:
refs/heads/master 41d81d68c -> 784652160
Fix/update auto-create/delete tests
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/41800c2a
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/41800c2a
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/41800c2a
Branch: refs/heads/master
Commit: 41800c2aa8a3c1316edc89592ab1c92271abfe8d
Parents: 41d81d6
Author: jbertram <jb...@apache.org>
Authored: Thu May 5 19:51:09 2016 -0500
Committer: jbertram <jb...@apache.org>
Committed: Thu May 5 20:21:09 2016 -0500
----------------------------------------------------------------------
.../artemis/tests/integration/client/AutoCreateJmsQueueTest.java | 4 ++--
.../artemis/tests/integration/client/AutoDeleteJmsQueueTest.java | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/41800c2a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java
index 91878c8..54f18dc 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoCreateJmsQueueTest.java
@@ -65,10 +65,10 @@ public class AutoCreateJmsQueueTest extends JMSTestBase {
Assert.assertNotNull(m);
}
- connection.close();
-
// make sure the JMX control was created for the JMS queue
assertNotNull(server.getManagementService().getResource("jms.queue.test"));
+
+ connection.close();
}
@Test
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/41800c2a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteJmsQueueTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteJmsQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteJmsQueueTest.java
index b120b29..81cd6ec 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteJmsQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/AutoDeleteJmsQueueTest.java
@@ -75,6 +75,9 @@ public class AutoDeleteJmsQueueTest extends JMSTestBase {
// ensure the queue was removed
Assert.assertNull(server.getPostOffice().getBinding(new SimpleString("jms.queue.test")));
+
+ // make sure the JMX control was removed for the JMS queue
+ assertNull(server.getManagementService().getResource("jms.queue.test"));
}
@Test
[2/4] activemq-artemis git commit: Fix
RaceOnSyncLargeMessageOverReplication2Test
Posted by cl...@apache.org.
Fix RaceOnSyncLargeMessageOverReplication2Test
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/19147113
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/19147113
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/19147113
Branch: refs/heads/master
Commit: 19147113cbc3f0addbf843f3e52a2fac64f45d4b
Parents: 41800c2
Author: jbertram <jb...@apache.org>
Authored: Thu May 5 20:20:43 2016 -0500
Committer: jbertram <jb...@apache.org>
Committed: Thu May 5 20:21:18 2016 -0500
----------------------------------------------------------------------
.../artemis/core/server/impl/AutoCreatedQueueManagerImpl.java | 4 +++-
.../byteman/RaceOnSyncLargeMessageOverReplication2Test.java | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/19147113/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java
index 25fc60a..c39d269 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AutoCreatedQueueManagerImpl.java
@@ -46,7 +46,9 @@ public class AutoCreatedQueueManagerImpl implements AutoCreatedQueueManager {
logger.debug("deleting auto-created queue \"" + queueName + ".\" consumerCount = " + consumerCount + "; messageCount = " + messageCount + "; isAutoDeleteJmsQueues = " + isAutoDeleteJmsQueues);
}
- server.getJMSQueueDeleter().delete(queueName);
+ if (server.getJMSQueueDeleter() != null) {
+ server.getJMSQueueDeleter().delete(queueName);
+ }
}
else if (logger.isDebugEnabled()) {
logger.debug("NOT deleting auto-created queue \"" + queueName + ".\" consumerCount = " + consumerCount + "; messageCount = " + messageCount + "; isAutoDeleteJmsQueues = " + isAutoDeleteJmsQueues);
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/19147113/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java
----------------------------------------------------------------------
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java
index 417f98c..34e6336 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/RaceOnSyncLargeMessageOverReplication2Test.java
@@ -120,7 +120,7 @@ public class RaceOnSyncLargeMessageOverReplication2Test extends ActiveMQTestBase
connection = (ActiveMQConnection) factory.createConnection();
session = connection.createSession(true, Session.SESSION_TRANSACTED);
- queue = session.createQueue("jms.queue.Queue");
+ queue = session.createQueue("Queue");
producer = session.createProducer(queue);
}
[3/4] activemq-artemis git commit: Fix ScaleDownTest
Posted by cl...@apache.org.
Fix ScaleDownTest
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/2a2a9473
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/2a2a9473
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/2a2a9473
Branch: refs/heads/master
Commit: 2a2a94733b0df7cf472e93c7467bdf6563976205
Parents: 1914711
Author: jbertram <jb...@apache.org>
Authored: Fri May 6 10:26:02 2016 -0500
Committer: jbertram <jb...@apache.org>
Committed: Fri May 6 10:26:02 2016 -0500
----------------------------------------------------------------------
.../tests/integration/server/ScaleDownTest.java | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/2a2a9473/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java
index f35fb61..db2a907 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java
@@ -76,6 +76,8 @@ public class ScaleDownTest extends ClusterTestBase {
setupClusterConnection("cluster0", "testAddress", MessageLoadBalancingType.ON_DEMAND, 1, isNetty(), 1, 0);
haPolicyConfiguration0.getScaleDownConfiguration().getConnectors().addAll(servers[0].getConfiguration().getClusterConfigurations().iterator().next().getStaticConnectors());
haPolicyConfiguration1.getScaleDownConfiguration().getConnectors().addAll(servers[1].getConfiguration().getClusterConfigurations().iterator().next().getStaticConnectors());
+ servers[0].getConfiguration().getAddressesSettings().put("#", new AddressSettings().setRedistributionDelay(0));
+ servers[1].getConfiguration().getAddressesSettings().put("#", new AddressSettings().setRedistributionDelay(0));
startServers(0, 1);
setupSessionFactory(0, isNetty());
setupSessionFactory(1, isNetty());
@@ -156,10 +158,6 @@ public class ScaleDownTest extends ClusterTestBase {
createQueue(0, addressName2, queueName2, null, false);
createQueue(1, addressName2, queueName2, null, false);
- // add consumers to node 1 to force any messages we send into the sf queue
- addConsumer(0, 1, queueName1, null);
- addConsumer(1, 1, queueName2, null);
-
// find and pause the sf queue so no messages actually move from node 0 to node 1
String sfQueueName = null;
for (Map.Entry<SimpleString, Binding> entry : servers[0].getPostOffice().getAllBindings().entrySet()) {
@@ -175,17 +173,22 @@ public class ScaleDownTest extends ClusterTestBase {
assertNotNull(sfQueueName);
- // send messages to node 0 that will get stuck in the paused sf queue going to node 1
+ // send messages to node 0
send(0, addressName1, TEST_SIZE, false, null);
send(0, addressName2, TEST_SIZE, false, null);
- removeConsumer(0);
- removeConsumer(1);
- // at this point on node 0 there should be 0 messages in testQueue and TEST_SIZE messages in the sfQueue
+ // add consumers to node 1 to force messages messages to redistribute to node 2 through the paused sf queue
+ addConsumer(0, 1, queueName1, null);
+ addConsumer(1, 1, queueName2, null);
+
+ // at this point on node 0 there should be 0 messages in test queues and TEST_SIZE * 2 messages in the sf queue
Assert.assertEquals(0, getMessageCount(((LocalQueueBinding) servers[0].getPostOffice().getBinding(new SimpleString(queueName1))).getQueue()));
Assert.assertEquals(0, getMessageCount(((LocalQueueBinding) servers[0].getPostOffice().getBinding(new SimpleString(queueName2))).getQueue()));
Assert.assertEquals(TEST_SIZE * 2, getMessageCount(((LocalQueueBinding) servers[0].getPostOffice().getBinding(new SimpleString(sfQueueName))).getQueue()));
+ removeConsumer(0);
+ removeConsumer(1);
+
// trigger scaleDown from node 0 to node 1
servers[0].stop();
[4/4] activemq-artemis git commit: This closes #510
Posted by cl...@apache.org.
This closes #510
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/78465216
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/78465216
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/78465216
Branch: refs/heads/master
Commit: 78465216034818e4b70a96b4e3ce035fa60cce74
Parents: 41d81d6 2a2a947
Author: Clebert Suconic <cl...@apache.org>
Authored: Fri May 6 11:48:52 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Fri May 6 11:48:52 2016 -0400
----------------------------------------------------------------------
.../server/impl/AutoCreatedQueueManagerImpl.java | 4 +++-
...ceOnSyncLargeMessageOverReplication2Test.java | 2 +-
.../client/AutoCreateJmsQueueTest.java | 4 ++--
.../client/AutoDeleteJmsQueueTest.java | 3 +++
.../tests/integration/server/ScaleDownTest.java | 19 +++++++++++--------
5 files changed, 20 insertions(+), 12 deletions(-)
----------------------------------------------------------------------