Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[WFLY-9004] Artemis leaks JGroups channels on reload
Refactor messaging-activemq subsystem code to create channels on demand every time Artemis creates a JGroupsBroadcastEndpoint. The ActiveMQServerServices track only the channels created by the discovery groups since they can be referenced by Artemis RA (when the RA is using JGroups to discover the Artemis servers). JIRA: https://issues.jboss.org/browse/WFLY-9004
- Loading branch information
Showing
4 changed files
with
88 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
79 changes: 79 additions & 0 deletions
79
...c/main/java/org/wildfly/extension/messaging/activemq/JGroupsBroadcastEndpointFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -0,0 +1,79 @@ | |||
| /* | |||
| * JBoss, Home of Professional Open Source. | |||
| * Copyright 2017, Red Hat, Inc., and individual contributors | |||
| * as indicated by the @author tags. See the copyright.txt file in the | |||
| * distribution for a full listing of individual contributors. | |||
| * | |||
| * This is free software; you can redistribute it and/or modify it | |||
| * under the terms of the GNU Lesser General Public License as | |||
| * published by the Free Software Foundation; either version 2.1 of | |||
| * the License, or (at your option) any later version. | |||
| * | |||
| * This software is distributed in the hope that it will be useful, | |||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |||
| * Lesser General Public License for more details. | |||
| * | |||
| * You should have received a copy of the GNU Lesser General Public | |||
| * License along with this software; if not, write to the Free | |||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | |||
| * 02110-1301 USA, or see the FSF site: http://www.fsf.org. | |||
| */ | |||
|
|
|||
| package org.wildfly.extension.messaging.activemq; | |||
|
|
|||
| import java.util.Map; | |||
|
|
|||
| import org.apache.activemq.artemis.api.core.BroadcastEndpoint; | |||
| import org.apache.activemq.artemis.api.core.BroadcastEndpointFactory; | |||
| import org.apache.activemq.artemis.api.core.JGroupsBroadcastEndpoint; | |||
| import org.apache.activemq.artemis.api.core.jgroups.JChannelManager; | |||
| import org.apache.activemq.artemis.api.core.jgroups.JChannelWrapper; | |||
| import org.jgroups.JChannel; | |||
| import org.wildfly.clustering.jgroups.spi.ChannelFactory; | |||
|
|
|||
| /** | |||
| * @author <a href="http://jmesnil.net/">Jeff Mesnil</a> (c) 2017 Red Hat inc. | |||
| */ | |||
| class JGroupsBroadcastEndpointFactory implements BroadcastEndpointFactory { | |||
| private final String channelName; | |||
| private final ChannelFactory channelFactory; | |||
| // can be null | |||
| private Map<String, JChannel> channels; | |||
|
|
|||
| /** | |||
| * @param channels a Map of <channel names, JChannel> can will be filled with channels created from the broadcast endpoints | |||
| */ | |||
| public JGroupsBroadcastEndpointFactory(String channelName, ChannelFactory channelFactory, Map<String, JChannel> channels) { | |||
| this.channelName = channelName; | |||
| this.channelFactory = channelFactory; | |||
| this.channels = channels; | |||
| } | |||
|
|
|||
| public JGroupsBroadcastEndpointFactory(String channelName, ChannelFactory channelFactory) { | |||
| this(channelName, channelFactory, null); | |||
| } | |||
|
|
|||
| @Override | |||
| public BroadcastEndpoint createBroadcastEndpoint() throws Exception { | |||
| JGroupsBroadcastEndpoint endpoint = new JGroupsBroadcastEndpoint(JChannelManager.getInstance(), channelName) { | |||
| @Override | |||
| public JChannel createChannel() throws Exception { | |||
| JChannel channel = (JChannel) channelFactory.createChannel(channelName); | |||
| if (channels != null) { | |||
| channels.put(channelName, channel); | |||
| } | |||
| return channel; | |||
| } | |||
|
|
|||
| @Override | |||
| protected void internalCloseChannel(JChannelWrapper channel) { | |||
| if (channels != null) { | |||
| channels.remove(channelName); | |||
| } | |||
| super.internalCloseChannel(channel); | |||
| } | |||
| }; | |||
| return endpoint.initChannel(); | |||
| } | |||
| } | |||