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

[AMQ-6640] either broker dispatch to bridge or bridge dispatch to broker needs to be async - dispatchAsync network option is the trigger for the vm transport to be sync in line with the current defaults. original BacklogNetworkCrossTalkTest scenario exposed this. upshot is dispatchAsync=false is not compatible with duplicate subscription suppression which is fair.

This commit is contained in:
gtully 2017-03-30 12:12:13 +01:00
parent 5ac9657c12
commit 4ef1fc74cf
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java
View File

@ -1428,7 +1428,7 @@ public class TransportConnection implements Connection, Task, CommandVisitor {
}
setDuplexNetworkConnectorId(duplexNetworkConnectorId);
}
Transport localTransport = NetworkBridgeFactory.createLocalTransport(broker.getVmConnectorURI());
Transport localTransport = NetworkBridgeFactory.createLocalTransport(config, broker.getVmConnectorURI());
Transport remoteBridgeTransport = transport;
if (! (remoteBridgeTransport instanceof ResponseCorrelator)) {
// the vm transport case is already wrapped

5
activemq-broker/src/main/java/org/apache/activemq/network/NetworkBridgeFactory.java
View File

@ -58,8 +58,9 @@ public final class NetworkBridgeFactory {
return result;
}
public static Transport createLocalTransport(URI uri) throws Exception {
return createLocalTransport(uri, false);
public static Transport createLocalTransport(NetworkBridgeConfiguration configuration, URI uri) throws Exception {
// one end of the localbroker<->bridge transport needs to be async to allow concurrent forwards and acks
return createLocalTransport(uri, !configuration.isDispatchAsync());
}
public static Transport createLocalAsyncTransport(URI uri) throws Exception {

2
activemq-broker/src/main/java/org/apache/activemq/network/NetworkConnector.java
View File

@ -140,7 +140,7 @@ public abstract class NetworkConnector extends NetworkBridgeConfiguration implem
}
protected Transport createLocalTransport() throws Exception {
return NetworkBridgeFactory.createLocalTransport(localURI);
return NetworkBridgeFactory.createLocalTransport(this, localURI);
}
public static ActiveMQDestination[] getDurableTopicDestinations(final Set<ActiveMQDestination> durableDestinations) {

4
activemq-unit-tests/src/test/java/org/apache/activemq/usecases/BacklogNetworkCrossTalkTest.java
View File

@ -52,7 +52,7 @@ public class BacklogNetworkCrossTalkTest extends JmsMultipleBrokersTestSupport {
waitForBridgeFormation();
final int numMessages = 2000;
final int numMessages = 1000;
// Create queue
ActiveMQDestination destA = createDestination("AAA", false);
sendMessages("A", destA, numMessages);
@ -88,7 +88,7 @@ public class BacklogNetworkCrossTalkTest extends JmsMultipleBrokersTestSupport {
@Override
public void setUp() throws Exception {
messageSize = 500;
messageSize = 5000;
super.setMaxTestTime(10*60*1000);
super.setAutoFail(true);
super.setUp();