Skip to content
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

Jump to bottom

ARTEMIS-3467 FD leak on receiving AMQP large messages #540

Merged
merged 1 commit into from
Sep 10, 2021
Merged

ARTEMIS-3467 FD leak on receiving AMQP large messages #540

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions ...rc/main/java/org/apache/activemq/artemis/protocol/amqp/proton/ProtonAbstractReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@ public void onMessage(Delivery delivery) throws ActiveMQAMQPException {
currentLargeMessage.addBytes(receiver.recv());
receiver.advance();
message = currentLargeMessage;
currentLargeMessage.releaseResources(true, true);
currentLargeMessage = null;
} else {
ReadableBuffer data = receiver.recv();
Expand Down
57 changes: 57 additions & 0 deletions .../src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,28 @@
*/
package org.apache.activemq.artemis.tests.integration.client;

import javax.jms.BytesMessage;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
import java.io.ByteArrayOutputStream;
import java.lang.management.ManagementFactory;
import java.lang.management.OperatingSystemMXBean;
import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.UUID;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;

import com.sun.management.UnixOperatingSystemMXBean;
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.Message;
import org.apache.activemq.artemis.api.core.QueueConfiguration;
import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
import org.apache.activemq.artemis.api.core.client.ClientConsumer;
Expand All @@ -53,11 +62,13 @@
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.tests.integration.largemessage.LargeMessageTestBase;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.tests.util.RandomUtil;
import org.apache.activemq.artemis.tests.util.Wait;
import org.apache.activemq.artemis.utils.collections.LinkedListIterator;
import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;

Expand Down Expand Up @@ -2738,6 +2749,52 @@ public void testGlobalSizeBytesAndAddressSize(boolean isPage) throws Exception {
cons.close();
}

@Test
public void testAMQPLargeMessageFDs() throws Exception {
OperatingSystemMXBean os = ManagementFactory.getOperatingSystemMXBean();

Assume.assumeTrue(os instanceof UnixOperatingSystemMXBean);

final SimpleString MY_QUEUE = new SimpleString("MY-QUEUE");
final int numberOfMessages = 30;
ActiveMQServer server = createServer(true, true);

server.start();

long fdBefore = ((UnixOperatingSystemMXBean)os).getOpenFileDescriptorCount();

server.createQueue(new QueueConfiguration(MY_QUEUE).setRoutingType(RoutingType.ANYCAST));

ConnectionFactory connectionFactory = CFUtil.createConnectionFactory("AMQP", "tcp://localhost:61616");
Connection connection = connectionFactory.createConnection();
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);

byte[] bufferSample = new byte[300 * 1024];

for (int i = 0; i < bufferSample.length; i++) {
bufferSample[i] = getSamplebyte(i);
}

javax.jms.Queue jmsQueue = session.createQueue(MY_QUEUE.toString());

MessageProducer producer = session.createProducer(jmsQueue);
producer.setTimeToLive(300);

for (int i = 0; i < numberOfMessages; i++) {
BytesMessage message = session.createBytesMessage();
message.writeBytes(bufferSample);

message.setIntProperty("count", i);

producer.send(message);
}

session.close();
connection.close();

Wait.assertTrue(() -> ((UnixOperatingSystemMXBean)os).getOpenFileDescriptorCount() - fdBefore < 3);
}

// Private -------------------------------------------------------

// Inner classes -------------------------------------------------
Expand Down