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

This closes #3708

This commit is contained in:
Clebert Suconic 2021-08-24 19:08:00 -04:00
parent fd801148a2 0266582a8f
commit 3cb7501f53
7 changed files with 0 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/PriorityLinkedListImpl.java
View File

@ -208,11 +208,6 @@ public class PriorityLinkedListImpl<E> implements PriorityLinkedList<E> {
index = levels.length - 1; index = levels.length - 1;
} }
@Override
protected void finalize() {
close();
}
@Override @Override
public void repeat() { public void repeat() {
if (lastIter == null) { if (lastIter == null) {

11
artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
View File

@ -1257,17 +1257,6 @@ public class LargeMessageControllerImpl implements LargeMessageController {
} }
} }
@Override
protected void finalize() {
close();
if (cachedFile != null && cachedFile.exists()) {
try {
cachedFile.delete();
} catch (Exception e) {
ActiveMQClientLogger.LOGGER.errorFinalisingCache(e);
}
}
}
} }
/** /**

8
artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PagePositionImpl.java
View File

@ -162,12 +162,4 @@ public class PagePositionImpl implements PagePosition {
", fileOffset=" + fileOffset + "]"; ", fileOffset=" + fileOffset + "]";
} }
/**
* I needed a finalize method defined here just as a way to get a hook on the PagingLeakTest through ByteMan
* There is a rule for finalizing it where I'm establishing a counter, and that rule won't work without this method defined.
* So, please don't remove it unless you had to remove that test for any weird reason.. it's here for a purpose!
*/
@Override
protected void finalize() {
}
} }

7
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
View File

@ -1571,13 +1571,6 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
clearRedistributorFuture(); clearRedistributorFuture();
} }
@Override
protected void finalize() throws Throwable {
cancelRedistributor();
super.finalize();
}
@Override @Override
public int getConsumerCount() { public int getConsumerCount() {
return consumers.size(); return consumers.size();

5
artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceRecovery.java
View File

@ -121,11 +121,6 @@ public class ActiveMQXAResourceRecovery {
return new XAResource[]{res}; return new XAResource[]{res};
} }
@Override
protected void finalize() {
res.close();
}
public static class ConfigParser { public static class ConfigParser {
private final String connectorFactoryClassName; private final String connectorFactoryClassName;

4
artemis-service-extensions/src/main/java/org/apache/activemq/artemis/service/extensions/xa/recovery/ActiveMQXAResourceWrapper.java
View File

@ -422,8 +422,4 @@ public class ActiveMQXAResourceWrapper implements XAResource, SessionFailureList
throw e; throw e;
} }
@Override
protected void finalize() throws Throwable {
close();
}
} }

237
tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/PagingLeakTest.java
View File

@ -1,237 +0,0 @@
/*
* 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.tests.extras.byteman;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.artemis.api.core.QueueConfiguration;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.api.core.client.ClientConsumer;
import org.apache.activemq.artemis.api.core.client.ClientMessage;
import org.apache.activemq.artemis.api.core.client.ClientProducer;
import org.apache.activemq.artemis.api.core.client.ClientSession;
import org.apache.activemq.artemis.api.core.client.ClientSessionFactory;
import org.apache.activemq.artemis.api.core.client.ServerLocator;
import org.apache.activemq.artemis.core.config.Configuration;
import org.apache.activemq.artemis.core.paging.cursor.impl.PagePositionImpl;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.ActiveMQServers;
import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.tests.util.Wait;
import org.jboss.byteman.contrib.bmunit.BMRule;
import org.jboss.byteman.contrib.bmunit.BMRules;
import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
import org.jboss.logging.Logger;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@RunWith(BMUnitRunner.class)
public class PagingLeakTest extends ActiveMQTestBase {
private static final Logger log = Logger.getLogger(PagingLeakTest.class);
private static final AtomicInteger pagePosInstances = new AtomicInteger(0);
public static void newPosition() {
pagePosInstances.incrementAndGet();
}
public static void deletePosition() {
pagePosInstances.decrementAndGet();
}
@Before
public void setup() {
pagePosInstances.set(0);
}
@Test
@BMRules(
rules = {
@BMRule(
name = "newPosition",
targetClass = "org.apache.activemq.artemis.core.paging.cursor.impl.PagePositionImpl",
targetMethod = "<init>()",
targetLocation = "ENTRY",
action = "org.apache.activemq.artemis.tests.extras.byteman.PagingLeakTest.newPosition()"),
@BMRule(
name = "finalPosition",
targetClass = "org.apache.activemq.artemis.core.paging.cursor.impl.PagePositionImpl",
targetMethod = "finalize",
targetLocation = "ENTRY",
action = "org.apache.activemq.artemis.tests.extras.byteman.PagingLeakTest.deletePosition()")})
public void testValidateLeak() throws Throwable {
log.debug("location::" + getBindingsDir());
List<PagePositionImpl> positions = new ArrayList<>();
for (int i = 0; i < 300; i++) {
positions.add(new PagePositionImpl(3, 3));
}
long timeout = System.currentTimeMillis() + 5000;
while (pagePosInstances.get() != 300 && timeout > System.currentTimeMillis()) {
forceGC();
}
// This is just to validate the rules are correctly applied on byteman
assertEquals("You have changed something on PagePositionImpl in such way that these byteman rules are no longer working", 300, pagePosInstances.get());
positions.clear();
Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisfied() throws Exception {
forceGC();
return pagePosInstances.get() == 0;
}
}, 5000, 100);
// This is just to validate the rules are correctly applied on byteman
assertEquals("You have changed something on PagePositionImpl in such way that these byteman rules are no longer working", 0, pagePosInstances.get());
final ArrayList<Exception> errors = new ArrayList<>();
// A backup that will be waiting to be activated
Configuration config = createDefaultNettyConfig();
config.setJournalBufferTimeout_AIO(10).setJournalBufferTimeout_NIO(10);
final ActiveMQServer server = addServer(ActiveMQServers.newActiveMQServer(config, true));
server.start();
AddressSettings settings = new AddressSettings().setPageSizeBytes(2 * 1024).setMaxSizeBytes(10 * 1024).setAddressFullMessagePolicy(AddressFullMessagePolicy.PAGE);
server.getAddressSettingsRepository().addMatch("#", settings);
final SimpleString address = new SimpleString("pgdAddress");
class Consumer extends Thread {
final ServerLocator locator;
final ClientSessionFactory sf;
final ClientSession session;
final ClientConsumer consumer;
final int sleepTime;
final int maxConsumed;
Consumer(int sleepTime, String suffix, int maxConsumed) throws Exception {
server.createQueue(new QueueConfiguration(address.concat(suffix)).setAddress(address));
this.sleepTime = sleepTime;
locator = createInVMLocator(0);
sf = locator.createSessionFactory();
session = sf.createSession(true, true);
consumer = session.createConsumer(address.concat(suffix));
this.maxConsumed = maxConsumed;
}
@Override
public void run() {
try {
session.start();
long lastTime = System.currentTimeMillis();
for (long i = 0; i < maxConsumed; i++) {
ClientMessage msg = consumer.receive(5000);
if (msg == null) {
errors.add(new Exception("didn't receive a message"));
return;
}
msg.acknowledge();
if (sleepTime > 0) {
Thread.sleep(sleepTime);
}
if (i % 1000 == 0) {
log.debug("Consumed " + i + " events in " + (System.currentTimeMillis() - lastTime));
lastTime = System.currentTimeMillis();
}
}
} catch (Exception e) {
e.printStackTrace();
}
}
}
int numberOfMessages = 500;
Consumer consumer1 = new Consumer(10, "-1", 150);
Consumer consumer2 = new Consumer(0, "-2", numberOfMessages);
final ServerLocator locator = createInVMLocator(0);
final ClientSessionFactory sf = locator.createSessionFactory();
final ClientSession session = sf.createSession(true, true);
final ClientProducer producer = session.createProducer(address);
byte[] b = new byte[1024];
for (long i = 0; i < numberOfMessages; i++) {
ClientMessage msg = session.createMessage(true);
msg.getBodyBuffer().writeBytes(b);
producer.send(msg);
if (i == 100) {
log.debug("Starting consumers!!!");
consumer1.start();
consumer2.start();
}
if (i % 250 == 0) {
validateInstances();
}
}
log.debug("Sent " + numberOfMessages);
consumer1.join();
consumer2.join();
validateInstances();
Throwable elast = null;
for (Throwable e : errors) {
e.printStackTrace();
elast = e;
}
if (elast != null) {
throw elast;
}
}
private void validateInstances() {
forceGC();
int count2 = pagePosInstances.get();
Assert.assertTrue("There is a leak, you shouldn't have this many instances (" + count2 + ")", count2 < 5000);
}
}