From commits-return-63542-archive-asf-public=cust-asf.ponee.io@activemq.apache.org Thu Jun 3 14:18:17 2021 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mxout1-he-de.apache.org (mxout1-he-de.apache.org [95.216.194.37]) by mx-eu-01.ponee.io (Postfix) with ESMTPS id D5F10180643 for ; Thu, 3 Jun 2021 16:18:17 +0200 (CEST) Received: from mail.apache.org (mailroute1-lw-us.apache.org [207.244.88.153]) by mxout1-he-de.apache.org (ASF Mail Server at mxout1-he-de.apache.org) with SMTP id 5A0425FF30 for ; Thu, 3 Jun 2021 14:18:17 +0000 (UTC) Received: (qmail 96797 invoked by uid 500); 3 Jun 2021 14:18:16 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 96788 invoked by uid 99); 3 Jun 2021 14:18:16 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jun 2021 14:18:16 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 77BDE81A86; Thu, 3 Jun 2021 14:18:16 +0000 (UTC) Date: Thu, 03 Jun 2021 14:18:16 +0000 To: "commits@activemq.apache.org" Subject: [activemq-artemis] branch main updated: no jira - only delay on expected messages and no wait on null. speed up test - thanks rgemmell MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <162272989619.29652.10515239901384088897@gitbox.apache.org> From: gtully@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: activemq-artemis X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Oldrev: 3f67d935926519aa6fd701ad3b9740e7c33a08d5 X-Git-Newrev: f4f31df97b2ee2fee4f5f30307c643389fce41ac X-Git-Rev: f4f31df97b2ee2fee4f5f30307c643389fce41ac X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. gtully pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git The following commit(s) were added to refs/heads/main by this push: new f4f31df no jira - only delay on expected messages and no wait on null. speed up test - thanks rgemmell f4f31df is described below commit f4f31df97b2ee2fee4f5f30307c643389fce41ac Author: gtully AuthorDate: Thu Jun 3 15:17:48 2021 +0100 no jira - only delay on expected messages and no wait on null. speed up test - thanks rgemmell --- .../tests/integration/server/ScaleDownTest.java | 61 +++++++++++----------- 1 file changed, 30 insertions(+), 31 deletions(-) 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 6e1cfa4..66d3c35 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 @@ -67,7 +67,6 @@ import static org.apache.activemq.artemis.utils.collections.IterableStream.itera public class ScaleDownTest extends ClusterTestBase { private static final String AMQP_ACCEPTOR_URI = "tcp://127.0.0.1:5672"; - private static final int RECEIVE_TIMEOUT_MILLIS = 1000; private boolean useScaleDownGroupName; @@ -135,7 +134,7 @@ public class ScaleDownTest extends ClusterTestBase { // consume a message from queue 2 addConsumer(1, 0, queueName2, null, false); - ClientMessage clientMessage = consumers[1].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + ClientMessage clientMessage = consumers[1].getConsumer().receive(1000); Assert.assertNotNull(clientMessage); clientMessage.acknowledge(); consumers[1].getSession().commit(); @@ -150,26 +149,26 @@ public class ScaleDownTest extends ClusterTestBase { // get the 2 messages from queue 1 addConsumer(0, 1, queueName1, null); - clientMessage = consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + clientMessage = consumers[0].getConsumer().receive(1000); Assert.assertNotNull(clientMessage); clientMessage.acknowledge(); - clientMessage = consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + clientMessage = consumers[0].getConsumer().receive(1000); Assert.assertNotNull(clientMessage); clientMessage.acknowledge(); // ensure there are no more messages on queue 1 - clientMessage = consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + clientMessage = consumers[0].getConsumer().receiveImmediate(); Assert.assertNull(clientMessage); removeConsumer(0); // get the 1 message from queue 2 addConsumer(0, 1, queueName2, null); - clientMessage = consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + clientMessage = consumers[0].getConsumer().receive(1000); Assert.assertNotNull(clientMessage); clientMessage.acknowledge(); // ensure there are no more messages on queue 1 - clientMessage = consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + clientMessage = consumers[0].getConsumer().receiveImmediate(); Assert.assertNull(clientMessage); removeConsumer(0); } @@ -318,23 +317,23 @@ public class ScaleDownTest extends ClusterTestBase { // get the messages from node 1 addConsumer(0, 1, queueName1, null); for (int i = 0; i < TEST_SIZE; i++) { - ClientMessage clientMessage = consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + ClientMessage clientMessage = consumers[0].getConsumer().receive(250); Assert.assertNotNull(clientMessage); clientMessage.acknowledge(); } - ClientMessage clientMessage = consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + ClientMessage clientMessage = consumers[0].getConsumer().receiveImmediate(); Assert.assertNull(clientMessage); removeConsumer(0); addConsumer(0, 1, queueName2, null); for (int i = 0; i < TEST_SIZE; i++) { - clientMessage = consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + clientMessage = consumers[0].getConsumer().receive(250); Assert.assertNotNull(clientMessage); clientMessage.acknowledge(); } - clientMessage = consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + clientMessage = consumers[0].getConsumer().receiveImmediate(); Assert.assertNull(clientMessage); removeConsumer(0); } @@ -356,7 +355,7 @@ public class ScaleDownTest extends ClusterTestBase { // consume a message from node 0 addConsumer(1, 0, queueName2, null, false); - ClientMessage clientMessage = consumers[1].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + ClientMessage clientMessage = consumers[1].getConsumer().receive(250); Assert.assertNotNull(clientMessage); clientMessage.acknowledge(); consumers[1].getSession().commit(); @@ -366,26 +365,26 @@ public class ScaleDownTest extends ClusterTestBase { // get the 2 messages from queue 1 addConsumer(0, 1, queueName1, null); - clientMessage = consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + clientMessage = consumers[0].getConsumer().receive(250); Assert.assertNotNull(clientMessage); clientMessage.acknowledge(); - clientMessage = consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + clientMessage = consumers[0].getConsumer().receive(250); Assert.assertNotNull(clientMessage); clientMessage.acknowledge(); // ensure there are no more messages on queue 1 - clientMessage = consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + clientMessage = consumers[0].getConsumer().receiveImmediate(); Assert.assertNull(clientMessage); removeConsumer(0); // get the 1 message from queue 2 addConsumer(0, 1, queueName2, null); - clientMessage = consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + clientMessage = consumers[0].getConsumer().receive(250); Assert.assertNotNull(clientMessage); clientMessage.acknowledge(); // ensure there are no more messages on queue 1 - clientMessage = consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + clientMessage = consumers[0].getConsumer().receiveImmediate(); Assert.assertNull(clientMessage); removeConsumer(0); } @@ -408,7 +407,7 @@ public class ScaleDownTest extends ClusterTestBase { Assert.assertEquals(((QueueImpl)((LocalQueueBinding) servers[1].getPostOffice().getBinding(new SimpleString(queueName))).getBindable()).getRoutingType(), RoutingType.ANYCAST); // get the 1 message from queue 2 addConsumer(0, 1, queueName, null); - ClientMessage clientMessage = consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + ClientMessage clientMessage = consumers[0].getConsumer().receive(250); Assert.assertNotNull(clientMessage); clientMessage.acknowledge(); @@ -449,7 +448,7 @@ public class ScaleDownTest extends ClusterTestBase { Assert.assertEquals(((QueueImpl)((LocalQueueBinding) servers[1].getPostOffice().getBinding(new SimpleString(queueName))).getBindable()).getRoutingType(), RoutingType.ANYCAST); // get the 1 message from queue 2 addConsumer(0, 1, queueName, null); - ClientMessage clientMessage = consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + ClientMessage clientMessage = consumers[0].getConsumer().receive(250); Assert.assertNotNull(clientMessage); clientMessage.acknowledge(); } @@ -483,13 +482,13 @@ public class ScaleDownTest extends ClusterTestBase { // get the 1 message from queue 1 addConsumer(0, 1, queueName1, null); - clientMessage = consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + clientMessage = consumers[0].getConsumer().receive(250); Assert.assertNotNull(clientMessage); clientMessage.acknowledge(); // get the 1 message from queue 2 addConsumer(1, 1, queueName2, null); - clientMessage = consumers[1].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + clientMessage = consumers[1].getConsumer().receive(250); Assert.assertNotNull(clientMessage); clientMessage.acknowledge(); } @@ -541,7 +540,7 @@ public class ScaleDownTest extends ClusterTestBase { session.start(); for (int i = 0; i < 5; i++) { - ClientMessage msg = consumer.receive(RECEIVE_TIMEOUT_MILLIS); + ClientMessage msg = consumer.receive(250); byte[] body = new byte[msg.getBodySize()]; msg.getBodyBuffer().readBytes(body); Assert.assertTrue(new String(body).contains("Bob the giant pig " + i)); @@ -595,7 +594,7 @@ public class ScaleDownTest extends ClusterTestBase { session.start(); for (int nmsg = 0; nmsg < 10; nmsg++) { - ClientMessage msg = consumer.receive(RECEIVE_TIMEOUT_MILLIS); + ClientMessage msg = consumer.receive(250); Assert.assertNotNull(msg); @@ -642,10 +641,10 @@ public class ScaleDownTest extends ClusterTestBase { addConsumer(0, 1, queueName, null); for (int i = 0; i < messageCount; i++) { - Assert.assertNotNull(consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS)); + Assert.assertNotNull(consumers[0].getConsumer().receive(250)); } - Assert.assertNull(consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS)); + Assert.assertNull(consumers[0].getConsumer().receiveImmediate()); removeConsumer(0); } @@ -681,10 +680,10 @@ public class ScaleDownTest extends ClusterTestBase { addConsumer(0, 1, queueName, null); for (int i = 0; i < messageCount; i++) { - Assert.assertEquals(i, consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS).getIntProperty("order").intValue()); + Assert.assertEquals(i, consumers[0].getConsumer().receive(250).getIntProperty("order").intValue()); } - Assert.assertNull(consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS)); + Assert.assertNull(consumers[0].getConsumer().receiveImmediate()); removeConsumer(0); } @@ -722,17 +721,17 @@ public class ScaleDownTest extends ClusterTestBase { String compare; ClientMessage message; if (i % 2 == 0) { - message = consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + message = consumers[0].getConsumer().receive(250); compare = "0"; } else { - message = consumers[1].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS); + message = consumers[1].getConsumer().receive(250); compare = "1"; } Assert.assertEquals(compare, message.getStringProperty(ClusterTestBase.FILTER_PROP)); } - Assert.assertNull(consumers[0].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS)); - Assert.assertNull(consumers[1].getConsumer().receive(RECEIVE_TIMEOUT_MILLIS)); + Assert.assertNull(consumers[0].getConsumer().receiveImmediate()); + Assert.assertNull(consumers[1].getConsumer().receiveImmediate()); removeConsumer(0); removeConsumer(1); }