mirror of https://github.com/apache/activemq.git
skipped first dispatch on vmtransport needed a better test - reworked to avoid busy loop on full and ensured sync on started for enqueue. Sort FailoverStaticNetworkTest and NetworkOfTwentyBrokersTest intermittent failures
This commit is contained in:
parent
ccbbecb4a4
commit
b8a20e9ef6
|
@ -100,11 +100,23 @@ public class VMTransport implements Transport, Task {
|
||||||
|
|
||||||
if (!peer.started.get()) {
|
if (!peer.started.get()) {
|
||||||
LinkedBlockingQueue<Object> pending = peer.getMessageQueue();
|
LinkedBlockingQueue<Object> pending = peer.getMessageQueue();
|
||||||
|
int sleepTimeMillis;
|
||||||
boolean accepted = false;
|
boolean accepted = false;
|
||||||
do {
|
do {
|
||||||
|
sleepTimeMillis = 0;
|
||||||
|
// the pending queue is drained on start so we need to ensure we add before
|
||||||
|
// the drain commences, otherwise we never get the command dispatched!
|
||||||
synchronized (peer.started) {
|
synchronized (peer.started) {
|
||||||
accepted = pending.offer(command);
|
if (!peer.started.get()) {
|
||||||
|
accepted = pending.offer(command);
|
||||||
|
if (!accepted) {
|
||||||
|
sleepTimeMillis = 500;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
// give start thread a chance if we will loop
|
||||||
|
TimeUnit.MILLISECONDS.sleep(sleepTimeMillis);
|
||||||
|
|
||||||
} while (!accepted && !peer.started.get());
|
} while (!accepted && !peer.started.get());
|
||||||
if (accepted) {
|
if (accepted) {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -19,12 +19,11 @@ package org.apache.activemq.transport.vm;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.util.concurrent.CountDownLatch;
|
import java.util.concurrent.CountDownLatch;
|
||||||
|
import java.util.concurrent.ExecutorService;
|
||||||
|
import java.util.concurrent.Executors;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
import javax.jms.Connection;
|
import javax.jms.Connection;
|
||||||
|
import org.junit.Test;
|
||||||
import junit.framework.TestCase;
|
|
||||||
|
|
||||||
import org.apache.activemq.ActiveMQConnection;
|
import org.apache.activemq.ActiveMQConnection;
|
||||||
import org.apache.activemq.ActiveMQConnectionFactory;
|
import org.apache.activemq.ActiveMQConnectionFactory;
|
||||||
import org.apache.activemq.broker.BrokerRegistry;
|
import org.apache.activemq.broker.BrokerRegistry;
|
||||||
|
@ -33,11 +32,16 @@ import org.apache.activemq.transport.Transport;
|
||||||
import org.apache.activemq.transport.TransportFactory;
|
import org.apache.activemq.transport.TransportFactory;
|
||||||
import org.apache.activemq.transport.TransportListener;
|
import org.apache.activemq.transport.TransportListener;
|
||||||
|
|
||||||
public class VMTransportBrokerNameTest extends TestCase {
|
import static org.junit.Assert.assertEquals;
|
||||||
|
import static org.junit.Assert.assertNotNull;
|
||||||
|
import static org.junit.Assert.assertTrue;
|
||||||
|
|
||||||
|
public class VMTransportBrokerNameTest {
|
||||||
|
|
||||||
private static final String MY_BROKER = "myBroker";
|
private static final String MY_BROKER = "myBroker";
|
||||||
final String vmUrl = "vm:(broker:(tcp://localhost:61616)/" + MY_BROKER + "?persistent=false)";
|
final String vmUrl = "vm:(broker:(tcp://localhost:61616)/" + MY_BROKER + "?persistent=false)";
|
||||||
|
|
||||||
|
@Test
|
||||||
public void testBrokerName() throws Exception {
|
public void testBrokerName() throws Exception {
|
||||||
ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(new URI(vmUrl));
|
ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(new URI(vmUrl));
|
||||||
ActiveMQConnection c1 = (ActiveMQConnection) cf.createConnection();
|
ActiveMQConnection c1 = (ActiveMQConnection) cf.createConnection();
|
||||||
|
@ -55,44 +59,65 @@ public class VMTransportBrokerNameTest extends TestCase {
|
||||||
c2.close();
|
c2.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testBrokerInfoClientAsync() throws Exception {
|
@Test
|
||||||
|
public void testBrokerInfoReceiptClientAsync() throws Exception {
|
||||||
|
|
||||||
ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(new URI(vmUrl));
|
ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory(new URI(vmUrl));
|
||||||
ActiveMQConnection c1 = (ActiveMQConnection) cf.createConnection();
|
ActiveMQConnection c1 = (ActiveMQConnection) cf.createConnection();
|
||||||
assertTrue("Transport has name in it: " + c1.getTransport(), c1.getTransport().toString().contains(MY_BROKER));
|
|
||||||
|
|
||||||
for (int i=0;i<20; i++) {
|
final int numIterations = 400;
|
||||||
final CountDownLatch gotBrokerInfo = new CountDownLatch(1);
|
final CountDownLatch successLatch = new CountDownLatch(numIterations);
|
||||||
Transport transport = TransportFactory.connect(new URI("vm://" + MY_BROKER + "?async=false"));
|
ExecutorService executor = Executors.newFixedThreadPool(100);
|
||||||
transport.setTransportListener(new TransportListener() {
|
for (int i = 0; i < numIterations; i++) {
|
||||||
|
executor.submit(new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void onCommand(Object command) {
|
public void run() {
|
||||||
if (command instanceof BrokerInfo) {
|
try {
|
||||||
gotBrokerInfo.countDown();
|
verifyBrokerInfo(successLatch);
|
||||||
|
} catch (Exception ignored) {
|
||||||
|
ignored.printStackTrace();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onException(IOException error) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void transportInterupted() {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void transportResumed() {
|
|
||||||
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
transport.start();
|
|
||||||
|
|
||||||
assertTrue("got broker info on iteration:" + i, gotBrokerInfo.await(5, TimeUnit.SECONDS));
|
|
||||||
|
|
||||||
transport.stop();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
executor.shutdown();
|
||||||
|
executor.awaitTermination(20, TimeUnit.SECONDS);
|
||||||
c1.close();
|
c1.close();
|
||||||
|
|
||||||
|
assertTrue("all success: " + successLatch.getCount(), successLatch.await(1, TimeUnit.SECONDS));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void verifyBrokerInfo(CountDownLatch success) throws Exception {
|
||||||
|
final CountDownLatch gotBrokerInfo = new CountDownLatch(1);
|
||||||
|
Transport transport = TransportFactory.connect(new URI("vm://" + MY_BROKER + "?async=false"));
|
||||||
|
transport.setTransportListener(new TransportListener() {
|
||||||
|
@Override
|
||||||
|
public void onCommand(Object command) {
|
||||||
|
if (command instanceof BrokerInfo) {
|
||||||
|
gotBrokerInfo.countDown();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onException(IOException error) {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void transportInterupted() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void transportResumed() {
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
transport.start();
|
||||||
|
if (gotBrokerInfo.await(5, TimeUnit.SECONDS)) {
|
||||||
|
success.countDown();
|
||||||
|
}
|
||||||
|
transport.stop();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue