From 6b42f26283eef49201f8b7ccc6db94eefcd08acb Mon Sep 17 00:00:00 2001 From: Clebert Suconic Date: Thu, 7 Jan 2016 15:07:59 -0500 Subject: [PATCH] fixing thread leakage from jgroups test --- .../broadcast/JGroupsBroadcastTest.java | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/broadcast/JGroupsBroadcastTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/broadcast/JGroupsBroadcastTest.java index 83b8f28e43..cae743754f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/broadcast/JGroupsBroadcastTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/broadcast/JGroupsBroadcastTest.java @@ -19,12 +19,13 @@ package org.apache.activemq.artemis.tests.integration.broadcast; import org.apache.activemq.artemis.api.core.BroadcastEndpoint; import org.apache.activemq.artemis.api.core.BroadcastEndpointFactory; import org.apache.activemq.artemis.api.core.ChannelBroadcastEndpointFactory; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.jgroups.JChannel; import org.jgroups.conf.PlainConfigurator; import org.junit.Assert; import org.junit.Test; -public class JGroupsBroadcastTest { +public class JGroupsBroadcastTest extends ActiveMQTestBase { private final String jgroupsConfigString = "UDP(oob_thread_pool.max_threads=300;" + "bind_addr=127.0.0.1;oob_thread_pool.keep_alive_time=1000;" + "max_bundle_size=31k;mcast_send_buf_size=640000;" + "internal_thread_pool.keep_alive_time=60000;" + "internal_thread_pool.rejection_policy=discard;" + "mcast_recv_buf_size=25000000;bind_port=55200;" + "internal_thread_pool.queue_max_size=100;" + "mcast_port=45688;thread_pool.min_threads=20;" + "oob_thread_pool.rejection_policy=discard;" + "thread_pool.max_threads=300;enable_diagnostics=false;" + "thread_pool.enabled=true;internal_thread_pool.queue_enabled=true;" + "ucast_recv_buf_size=20000000;ucast_send_buf_size=640000;" + "internal_thread_pool.enabled=true;oob_thread_pool.enabled=true;" + "ip_ttl=2;thread_pool.rejection_policy=discard;thread_pool.keep_alive_time=5000;" + "internal_thread_pool.max_threads=10;thread_pool.queue_enabled=true;" + "mcast_addr=230.0.0.4;singleton_name=udp;max_bundle_timeout=30;" + "oob_thread_pool.queue_enabled=false;internal_thread_pool.min_threads=1;" + "bundler_type=old;oob_thread_pool.min_threads=20;" + "thread_pool.queue_max_size=1000):PING(num_initial_members=3;" + "timeout=2000):MERGE3(min_interval=20000;max_interval=100000)" + ":FD_SOCK(bind_addr=127.0.0.1;start_port=54200):FD_ALL(interval=3000;" + "timeout=15000):VERIFY_SUSPECT(bind_addr=127.0.0.1;" + "timeout=1500):pbcast.NAKACK2(max_msg_batch_size=100;" + "xmit_table_msgs_per_row=10000;xmit_table_max_compaction_time=10000;" + "xmit_table_num_rows=100;xmit_interval=1000):UNICAST3(xmit_table_msgs_per_row=10000;" + "xmit_table_max_compaction_time=10000;xmit_table_num_rows=20)" + ":pbcast.STABLE(desired_avg_gossip=50000;max_bytes=400000;" + "stability_delay=1000):pbcast.GMS(print_local_addr=true;" + "view_bundling=true;join_timeout=3000;view_ack_collection_timeout=5000;" + "resume_task_timeout=7500):UFC(max_credits=1m;min_threshold=0.40)" + ":MFC(max_credits=1m;min_threshold=0.40):FRAG2(frag_size=30k)" + ":RSVP(resend_interval=500;ack_on_delivery=false;timeout=60000)"; @@ -33,10 +34,13 @@ public class JGroupsBroadcastTest { @Test public void testRefCount() throws Exception { + JChannel channel = null; + JChannel newChannel = null; + try { PlainConfigurator configurator = new PlainConfigurator(jgroupsConfigString); - JChannel channel = new JChannel(configurator); + channel = new JChannel(configurator); String channelName1 = "channel1"; @@ -71,7 +75,7 @@ public class JGroupsBroadcastTest { catch (Exception e) { } - JChannel newChannel = new JChannel(configurator); + newChannel = new JChannel(configurator); jgroupsBroadcastCfg1 = new ChannelBroadcastEndpointFactory(newChannel, channelName1); @@ -85,6 +89,20 @@ public class JGroupsBroadcastTest { e.printStackTrace(); throw e; } + finally { + try { + channel.close(); + } + catch (Throwable ignored) { + + } + try { + newChannel.close(); + } + catch (Throwable ignored) { + + } + } } }