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

ARTEMIS-5218 StompHandler HeartBeat restarted after being stopped

This commit is contained in:
Clebert Suconic 2024-12-16 20:06:43 -05:00 committed by Justin Bertram
parent 5c1ecea69a
commit 54f99937bd
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java
View File

@ -266,6 +266,8 @@ public class StompFrameHandlerV11 extends VersionedStompFrameHandler implements
private static final int MIN_SERVER_PING = 500; private static final int MIN_SERVER_PING = 500;
private boolean previouslyStopped = false;
long serverPingPeriod = 0; long serverPingPeriod = 0;
long clientPingResponse; long clientPingResponse;
AtomicLong lastPingTimestamp = new AtomicLong(0); AtomicLong lastPingTimestamp = new AtomicLong(0);
@ -321,7 +323,14 @@ public class StompFrameHandlerV11 extends VersionedStompFrameHandler implements
public void shutdown() { public void shutdown() {
this.stop(); this.stop();
previouslyStopped = true;
}
@Override
public void start() {
if (!previouslyStopped) {
super.start();
}
} }
public void pinged() { public void pinged() {

4
artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/utils/Wait.java
View File

@ -152,6 +152,10 @@ public class Wait {
assertTrue(failureMessage, () -> !condition.isSatisfied(), duration, SLEEP_MILLIS); assertTrue(failureMessage, () -> !condition.isSatisfied(), duration, SLEEP_MILLIS);
} }
public static void assertFalse(Supplier<String> failureMessage, Condition condition, final long duration, final long sleep) {
assertTrue(failureMessage, () -> !condition.isSatisfied(), duration, sleep);
}
public static void assertFalse(Condition condition, final long duration, final long sleep) { public static void assertFalse(Condition condition, final long duration, final long sleep) {
assertTrue(DEFAULT_FAILURE_MESSAGE, () -> !condition.isSatisfied(), duration, sleep); assertTrue(DEFAULT_FAILURE_MESSAGE, () -> !condition.isSatisfied(), duration, sleep);
} }

4
tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/stomp/v11/StompV11Test.java
View File

@ -2255,6 +2255,8 @@ public class StompV11Test extends StompTestBase {
subFrame.addHeader("destination", getTopicPrefix() + getTopicName()); subFrame.addHeader("destination", getTopicPrefix() + getTopicName());
subFrame.addHeader("id", "0"); subFrame.addHeader("id", "0");
Wait.assertTrue(() -> "HeartBeater is not running!! -> " + System.identityHashCode(stompFrameHandler.getHeartBeater()), () -> stompFrameHandler.getHeartBeater().isStarted(), 5000, 100);
ClientStompFrame f = conn.sendFrame(subFrame); ClientStompFrame f = conn.sendFrame(subFrame);
f = conn.sendFrame(subFrame); f = conn.sendFrame(subFrame);
@ -2269,7 +2271,7 @@ public class StompV11Test extends StompTestBase {
Wait.assertEquals(0, () -> server.getRemotingService().getConnections().size()); Wait.assertEquals(0, () -> server.getRemotingService().getConnections().size());
Wait.assertFalse("HeartBeater is still running!!", () -> stompFrameHandler.getHeartBeater().isStarted()); Wait.assertFalse(() -> "HeartBeater is still running!! -> " + System.identityHashCode(stompFrameHandler.getHeartBeater()), () -> stompFrameHandler.getHeartBeater().isStarted(), 5000, 100);
} }