Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NO-JIRA Fixing ConcurrentDeliveryCancelTest on extra-tests

This commit is contained in:
Clebert Suconic 2019-05-07 11:24:53 -04:00
parent 4c6447ea27
commit a461f23b32
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/ConcurrentDeliveryCancelTest.java
View File

@ -61,10 +61,11 @@ public class ConcurrentDeliveryCancelTest extends JMSTestBase {
private static final ReusableLatch latchFlag = new ReusableLatch(1);
public static void enterCancel() {
latchEnter.countDown();
try {
latchFlag.await();
} catch (Exception ignored) {
latchEnter.countDown();
latchFlag.await(1, TimeUnit.SECONDS);
} catch (Throwable ignored) {
ignored.printStackTrace();
}
}
@ -105,7 +106,7 @@ public class ConcurrentDeliveryCancelTest extends JMSTestBase {
String queueName = RandomUtil.randomString();
Queue queue = createQueue(queueName);
int numberOfMessages = 10000;
int numberOfMessages = 100;
{
Connection connection = cf.createConnection();
@ -122,7 +123,7 @@ public class ConcurrentDeliveryCancelTest extends JMSTestBase {
connection.close();
}
for (int i = 0; i < 100; i++) {
for (int i = 0; i < 10; i++) {
XAConnectionFactory xacf = ActiveMQJMSClient.createConnectionFactory("tcp://localhost:61616", "test");
final XAConnection connection = xacf.createXAConnection();
@ -152,8 +153,12 @@ public class ConcurrentDeliveryCancelTest extends JMSTestBase {
serverSessions.add(srvSess);
}
}
latchFlag.countDown();
resetLatches(2); // from Transactional reaper
latchFlag.countUp();
latchEnter.countUp();
latchEnter.countUp();
List<Thread> threads = new LinkedList<>();
@ -192,7 +197,7 @@ public class ConcurrentDeliveryCancelTest extends JMSTestBase {
t.start();
}
Assert.assertTrue(latchEnter.await(10, TimeUnit.MINUTES));
latchEnter.await(1, TimeUnit.SECONDS);
latchFlag.countDown();
for (Thread t : threads) {