Skip to content

ARTEMIS-5800 Fix AMQP session leak #6106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tabish121 merged 1 commit into from
Dec 8, 2025
Merged

ARTEMIS-5800 Fix AMQP session leak #6106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...va/org/apache/activemq/artemis/protocol/amqp/broker/ActiveMQProtonRemotingConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,12 @@ public void destroy() {

@Override
public void disconnect(boolean criticalError) {
if (destroyed) {
return;
}

destroyed = true;

ErrorCondition errorCondition = new ErrorCondition();
errorCondition.setCondition(AmqpSupport.CONNECTION_FORCED);
amqpConnection.close(errorCondition);
Expand Down
33 changes: 26 additions & 7 deletions ...sts/src/test/java/org/apache/activemq/artemis/tests/integration/amqp/AmqpSessionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,10 @@
*/
package org.apache.activemq.artemis.tests.integration.amqp;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertNotNull;

import java.lang.invoke.MethodHandles;
import java.util.concurrent.TimeUnit;

import org.apache.activemq.artemis.core.server.ServerSession;
import org.apache.activemq.artemis.core.server.impl.ServerSessionImpl;
import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection;
import org.apache.activemq.artemis.tests.util.Wait;
import org.apache.activemq.transport.amqp.client.AmqpClient;
import org.apache.activemq.transport.amqp.client.AmqpConnection;
import org.apache.activemq.transport.amqp.client.AmqpReceiver;
Expand All @@ -39,6 +34,13 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.lang.invoke.MethodHandles;
import java.util.concurrent.TimeUnit;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;

public class AmqpSessionTest extends AmqpClientTestSupport {

private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
Expand Down Expand Up @@ -113,6 +115,23 @@ public void testCreateSessionProducerConsumerDoesNotLeakClosable() throws Except
connection.close();
}

@Test
public void testServerSessionCloseOnRemotingConnectionDisconnect() throws Exception {
AmqpClient client = createAmqpClient();
AmqpConnection connection = addConnection(client.connect());
AmqpSession session = connection.createSession();

assertNotNull(session);

for (RemotingConnection remoteConnection : server.getRemotingService().getConnections()) {
remoteConnection.disconnect(true);
}

Wait.assertTrue(connection::isClosed);

assertEquals(0, server.getSessions().size());
}

@Test
public void testSessionClosedOnServerEndsClientSession() throws Exception {
doTestSessionClosedOnServerEndsClientSession(false, false);
Expand Down