From 55a55daa7b84b390d79dc0a7747b176ad322ec67 Mon Sep 17 00:00:00 2001 From: brusdev Date: Tue, 5 Nov 2019 13:45:39 +0100 Subject: [PATCH] ARTEMIS-2538 Removing all messages from a huge queue causes OOM The iterQueue transaction commits are locked by the synchronization context. So removing all messages from a huge queue causes the creation of too locked transactions for the paged messages and so OOM. The iteration on paged message is executed out the iterQueue synchronization context to avoid to lock the transaction commits. --- .../artemis/core/server/impl/QueueImpl.java | 80 ++++++++++------- .../core/server/impl/QueueImplTest.java | 89 +++++++++++++++++++ 2 files changed, 135 insertions(+), 34 deletions(-) create mode 100644 artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/QueueImplTest.java diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java index d1103779fc..9d88e3a4a3 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java @@ -227,6 +227,8 @@ public class QueueImpl extends CriticalComponentImpl implements Queue { //This lock is used to prevent deadlocks between direct and async deliveries private final ReentrantLock deliverLock = new ReentrantLock(); + private final ReentrantLock depageLock = new ReentrantLock(); + private volatile boolean depagePending = false; private final StorageManager storageManager; @@ -1967,57 +1969,62 @@ public class QueueImpl extends CriticalComponentImpl implements Queue { * @return * @throws Exception */ - private synchronized int iterQueue(final int flushLimit, + private int iterQueue(final int flushLimit, final Filter filter1, QueueIterateAction messageAction, final boolean remove) throws Exception { int count = 0; int txCount = 0; - Transaction tx = new TransactionImpl(storageManager); + depageLock.lock(); - synchronized (this) { - try (LinkedListIterator iter = iterator()) { + try { + Transaction tx = new TransactionImpl(storageManager); - while (iter.hasNext()) { - MessageReference ref = iter.next(); + synchronized (this) { - if (ref.isPaged() && queueDestroyed) { - // this means the queue is being removed - // hence paged references are just going away through - // page cleanup - continue; - } + try (LinkedListIterator iter = iterator()) { - if (filter1 == null || filter1.match(ref.getMessage())) { - messageAction.actMessage(tx, ref); - if (remove) { - iter.remove(); + while (iter.hasNext()) { + MessageReference ref = iter.next(); + + if (ref.isPaged() && queueDestroyed) { + // this means the queue is being removed + // hence paged references are just going away through + // page cleanup + continue; + } + + if (filter1 == null || filter1.match(ref.getMessage())) { + messageAction.actMessage(tx, ref); + if (remove) { + iter.remove(); + } + txCount++; + count++; } - txCount++; - count++; } - } - if (txCount > 0) { - tx.commit(); + if (txCount > 0) { + tx.commit(); - tx = new TransactionImpl(storageManager); + tx = new TransactionImpl(storageManager); - txCount = 0; - } + txCount = 0; + } - List cancelled = scheduledDeliveryHandler.cancel(filter1); - for (MessageReference messageReference : cancelled) { - messageAction.actMessage(tx, messageReference, false); - count++; - txCount++; - } + List cancelled = scheduledDeliveryHandler.cancel(filter1); + for (MessageReference messageReference : cancelled) { + messageAction.actMessage(tx, messageReference, false); + count++; + txCount++; + } - if (txCount > 0) { - tx.commit(); - tx = new TransactionImpl(storageManager); - txCount = 0; + if (txCount > 0) { + tx.commit(); + tx = new TransactionImpl(storageManager); + txCount = 0; + } } } @@ -2052,6 +2059,8 @@ public class QueueImpl extends CriticalComponentImpl implements Queue { } return count; + } finally { + depageLock.unlock(); } } @@ -3879,10 +3888,13 @@ public class QueueImpl extends CriticalComponentImpl implements Queue { @Override public void run() { + depageLock.lock(); try { depage(scheduleExpiry); } catch (Exception e) { ActiveMQServerLogger.LOGGER.errorDelivering(e); + } finally { + depageLock.unlock(); } } } diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/QueueImplTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/QueueImplTest.java new file mode 100644 index 0000000000..a2b42dbf79 --- /dev/null +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/impl/QueueImplTest.java @@ -0,0 +1,89 @@ +/* + * 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.artemis.core.server.impl; + +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.Semaphore; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.io.IOCallback; +import org.apache.activemq.artemis.core.paging.cursor.PageIterator; +import org.apache.activemq.artemis.core.paging.cursor.PagePosition; +import org.apache.activemq.artemis.core.paging.cursor.PageSubscription; +import org.apache.activemq.artemis.core.paging.cursor.PagedReferenceImpl; +import org.apache.activemq.artemis.core.paging.impl.PagedMessageImpl; +import org.apache.activemq.artemis.core.persistence.StorageManager; +import org.apache.activemq.artemis.core.postoffice.PostOffice; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.core.server.QueueFactory; +import org.apache.activemq.artemis.utils.actors.ArtemisExecutor; +import org.junit.Assert; +import org.junit.Test; +import org.mockito.Mockito; + +public class QueueImplTest { + + @Test + public void deleteAllPagedReferencesTest() throws Exception { + SimpleString address = new SimpleString("test"); + AtomicInteger pageIteratorIndex = new AtomicInteger(0); + PageIterator pageIterator = Mockito.mock(PageIterator.class); + PageSubscription pageSubscription = Mockito.mock(PageSubscription.class); + ExecutorService executorService = Executors.newSingleThreadExecutor(); + StorageManager storageManager = Mockito.mock(StorageManager.class); + + final int flushLimit = 100; + final int pagedReferences = 5 * flushLimit; + Semaphore availableTransactions = new Semaphore(3); + + //Mock pageIterator. + Mockito.doAnswer(invocationOnMock -> pageIteratorIndex.get() < pagedReferences). + when(pageIterator).hasNext(); + Mockito.doAnswer(invocationOnMock -> { + pageIteratorIndex.incrementAndGet(); + return new PagedReferenceImpl(Mockito.mock(PagePosition.class), new PagedMessageImpl( + Mockito.mock(Message.class), new long[]{0}), pageSubscription); + }).when(pageIterator).next(); + Mockito.doReturn(pageIterator).when(pageSubscription).iterator(); + + //Mock storageManager. + Mockito.doAnswer(invocationOnMock -> { + Assert.assertTrue("Too transactions locked on afterCommit.", + availableTransactions.tryAcquire(3000, TimeUnit.MILLISECONDS)); + executorService.execute(() -> { + ((IOCallback) invocationOnMock.getArgument(0)).done(); + availableTransactions.release(); + }); + return null; + }).when(storageManager).afterCompleteOperations(Mockito.any(IOCallback.class)); + + QueueImpl queue = new QueueImpl(0, address, address, null, pageSubscription, null, false, + false, false, Mockito.mock(ScheduledExecutorService.class), + Mockito.mock(PostOffice.class), storageManager, null, + Mockito.mock(ArtemisExecutor.class), Mockito.mock(ActiveMQServer.class), + Mockito.mock(QueueFactory.class)); + + Mockito.doReturn(queue).when(pageSubscription).getQueue(); + + Assert.assertEquals(pagedReferences, queue.deleteAllReferences(flushLimit)); + } +} \ No newline at end of file