Apache/activemq
1
0
Fork 0
mirror of https://github.com/apache/activemq.git synced 2025-02-24 02:54:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

https://issues.apache.org/jira/browse/AMQ-5794 - duplex network case calls start twice and would start a connect check timer in error. Fix is to only start connectiontimeout if we have not already started the rest of the monitoring

Browse Source
This commit is contained in:
gtully 2015-08-12 16:07:05 +01:00
parent 04ee70a161
commit e5a94bfee2
3 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-client/src/main/java/org/apache/activemq/transport/AbstractInactivityMonitor.java
View File

@ -89,7 +89,7 @@ public abstract class AbstractInactivityMonitor extends TransportFilter {
@Override
public void run() {
onException(new InactivityIOException(
"Channel was inactive for too (>" + (connectAttemptTimeout) + ") long: " + next.getRemoteAddress()));
"Channel was inactive (no connection attempt made) for too (>" + (connectAttemptTimeout) + ") long: " + next.getRemoteAddress()));
}
});
} catch (RejectedExecutionException ex) {

4
activemq-client/src/main/java/org/apache/activemq/transport/InactivityMonitor.java
View File

@ -46,7 +46,9 @@ public class InactivityMonitor extends AbstractInactivityMonitor {
@Override
public void start() throws Exception {
startConnectCheckTask();
if (!isMonitorStarted()) {
startConnectCheckTask();
}
super.start();
}

31
activemq-unit-tests/src/test/java/org/apache/activemq/network/DuplexNetworkTest.java
View File

@ -16,6 +16,8 @@
*/
package org.apache.activemq.network;
import java.util.concurrent.TimeUnit;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@ -25,8 +27,11 @@ import javax.jms.TemporaryQueue;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.util.Wait;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DuplexNetworkTest extends SimpleNetworkTest {
private static final Logger LOG = LoggerFactory.getLogger(DuplexNetworkTest.class);
@Override
protected String getLocalBrokerURI() {
@ -37,7 +42,7 @@ public class DuplexNetworkTest extends SimpleNetworkTest {
protected BrokerService createRemoteBroker() throws Exception {
BrokerService broker = new BrokerService();
broker.setBrokerName("remoteBroker");
broker.addConnector("tcp://localhost:61617");
broker.addConnector("tcp://localhost:61617?transport.connectAttemptTimeout=2000");
return broker;
}
@ -57,4 +62,28 @@ public class DuplexNetworkTest extends SimpleNetworkTest {
}
}));
}
@Test
public void testStaysUp() throws Exception {
int bridgeIdentity = getBridgeId();
LOG.info("Bridges: " + bridgeIdentity);
TimeUnit.SECONDS.sleep(5);
assertEquals("Same bridges", bridgeIdentity, getBridgeId());
}
private int getBridgeId() {
int id = 0;
while (id == 0) {
try {
id = localBroker.getNetworkConnectors().get(0).activeBridges().iterator().next().hashCode();
} catch (Throwable tryAgainInABit) {
try {
TimeUnit.MILLISECONDS.sleep(500);
} catch (InterruptedException ignored) {
}
}
}
return id;
}
}