cshannon commented on code in PR #2474:
URL: https://github.com/apache/activemq/pull/2474#discussion_r3822165514
##########
activemq-client/src/main/java/org/apache/activemq/transport/tcp/TcpTransport.java:
##########
@@ -613,26 +613,36 @@ public void stop() throws Exception {
}
protected void initializeStreams() throws Exception {
+ // receiveCounter feeds AbstractInactivityMonitor.readCheck() so only
increment when there is data read
TcpBufferedInputStream buffIn = new
TcpBufferedInputStream(socket.getInputStream(), ioBufferSize) {
@Override
public int read() throws IOException {
- receiveCounter.incrementAndGet();
- return super.read();
+ int result = super.read();
+ if (result >= 0) {
Review Comment:
This should be > 0
##########
activemq-unit-tests/src/test/java/org/apache/activemq/network/SoTimeoutInactivityMonitorTest.java:
##########
@@ -0,0 +1,162 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.network;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import jakarta.jms.Connection;
+import jakarta.jms.Session;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.test.annotations.ParallelTest;
+import org.apache.activemq.util.SocketProxy;
+import org.apache.activemq.util.Wait;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * InactivityMonitor detects dead links and should not conflict with soTimeout
+ *
+ * Before the TcpTransport receiveCounter size check a read on a dead socket
throws
+ * SocketTimeoutException every soTimeout ms, doRun() swallows it and retries,
and every retry
+ * bumps receiveCounter — so AbstractInactivityMonitor.readCheck() sees
"activity" forever
+ * and the dead link isn't handled for the read scenario.
+ */
+@Category(ParallelTest.class)
+public class SoTimeoutInactivityMonitorTest {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(SoTimeoutInactivityMonitorTest.class);
+
+ private static final String QUEUE_NAME = "SOTIMEOUT.TEST";
+ private static final int MAX_INACTIVITY = 2000;
+ private static final long DETECT_WAIT = 30_000; // >> several soTimeout
and inactivity periods
+
+ private BrokerService localBroker;
+ private BrokerService remoteBroker;
+ private SocketProxy proxy;
+ private Connection remoteConnection;
+ private final AtomicInteger remoteReceived = new AtomicInteger();
+
+ @Before
+ public void setUp() throws Exception {
+ remoteBroker = new BrokerService();
+ remoteBroker.setBrokerName("remote");
+ remoteBroker.setPersistent(false);
+ remoteBroker.setUseJmx(false);
+ remoteBroker.addConnector("tcp://127.0.0.1:0");
+ remoteBroker.start();
+ remoteBroker.waitUntilStarted();
+
+ var remoteUri =
remoteBroker.getTransportConnectors().get(0).getPublishableConnectURI();
+ proxy = new SocketProxy(remoteUri);
+
+ localBroker = new BrokerService();
+ localBroker.setBrokerName("local");
+ localBroker.setPersistent(false);
+ localBroker.setUseJmx(false);
+ localBroker.start();
+ localBroker.waitUntilStarted();
+
+ // a draining remote consumer creates demand so the bridge forwards
+ remoteConnection = new
ActiveMQConnectionFactory(remoteUri).createConnection();
+ remoteConnection.start();
+ remoteConnection.createSession(false, Session.AUTO_ACKNOWLEDGE)
+ .createConsumer(new ActiveMQQueue(QUEUE_NAME))
+ .setMessageListener(m -> remoteReceived.incrementAndGet());
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ if (remoteConnection != null) {
+ try { remoteConnection.close(); } catch (Exception ignored) {}
+ }
+ if (proxy != null) {
+ proxy.close();
+ }
+ if (localBroker != null) {
+ localBroker.stop();
+ localBroker.waitUntilStopped();
+ }
+ if (remoteBroker != null) {
+ remoteBroker.stop();
+ remoteBroker.waitUntilStopped();
+ }
+ }
+
+ @Test(timeout = 120_000)
+ public void testInactivityMonitorDetectsDeadLinkWithSoTimeout() throws
Exception {
+ var detectMs =
runDeadLinkScenario("?wireFormat.maxInactivityDuration=" + MAX_INACTIVITY
+ + "&soTimeout=1000&soWriteTimeout=1000&keepAlive=true");
+ assertTrue("the inactivity monitor must detect a daed link and tear
the bridge down even when soTimeout is "
Review Comment:
dead is misspelled here
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
