This is an automated email from the ASF dual-hosted git repository.
jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 4d429b1 [ARTEMIS-1946] Cluster with
allow-direct-connections-only="true" and localAddress in netty connections with
allow-direct-connections-only="true" prevents core bridge to be created.
new 0d81e39 This closes #2220
4d429b1 is described below
commit 4d429b115c21e37d5763daa124616c9b77a19408
Author: JiriOndrusek <[email protected]>
AuthorDate: Mon Aug 6 17:20:40 2018 +0200
[ARTEMIS-1946] Cluster with allow-direct-connections-only="true" and
localAddress in netty connections with allow-direct-connections-only="true"
prevents core bridge to be created.
---
.../server/cluster/impl/ClusterConnectionImpl.java | 11 +-
.../impl/ClusterConnectionImplMockTest.java | 120 +++++++++++++++++++++
2 files changed, 129 insertions(+), 2 deletions(-)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
index 7a8130d..a88c9b4 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
@@ -52,6 +52,7 @@ import
org.apache.activemq.artemis.core.config.impl.ConfigurationImpl;
import org.apache.activemq.artemis.core.postoffice.Binding;
import org.apache.activemq.artemis.core.postoffice.PostOffice;
import org.apache.activemq.artemis.core.postoffice.impl.PostOfficeImpl;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
import org.apache.activemq.artemis.core.server.ActiveMQMessageBundle;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.ActiveMQServerLogger;
@@ -155,7 +156,8 @@ public final class ClusterConnectionImpl implements
ClusterConnection, AfterConn
private final boolean allowDirectConnectionsOnly;
- private final Set<TransportConfiguration> allowableConnections = new
HashSet<>();
+ //default access modifier is used because of test, see {@link
org.apache.activemq.artemis.core.server.cluster.impl.ClusterConnectionImplMockTest}
+ final Set<TransportConfiguration> allowableConnections = new HashSet<>();
private final ClusterManager manager;
@@ -279,7 +281,12 @@ public final class ClusterConnectionImpl implements
ClusterConnection, AfterConn
// through a static list of connectors or broadcasting using UDP.
if (allowDirectConnectionsOnly) {
for (TransportConfiguration configuration : staticTranspConfigs) {
-
allowableConnections.add(configuration.newTransportConfig(TRANSPORT_CONFIG_NAME));
+ TransportConfiguration transportConfiguration =
configuration.newTransportConfig(TRANSPORT_CONFIG_NAME);
+ //localAddress and localPort have to be removed because of
comparison with in {@link
org.apache.activemq.artemis.core.server.cluster.impl.ClusterConnectionImpl#nodeUP()}
(issue https://issues.apache.org/jira/browse/ARTEMIS-1946)
+ //(opposing TransportConnection can not have local address of
different node)
+
transportConfiguration.getParams().remove(TransportConstants.LOCAL_ADDRESS_PROP_NAME);
+
transportConfiguration.getParams().remove(TransportConstants.LOCAL_PORT_PROP_NAME);
+ allowableConnections.add(transportConfiguration);
}
}
}
diff --git
a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImplMockTest.java
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImplMockTest.java
new file mode 100644
index 0000000..ef765f9
--- /dev/null
+++
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImplMockTest.java
@@ -0,0 +1,120 @@
+/*
+ * 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.cluster.impl;
+
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.artemis.core.server.cluster.ClusterManager;
+import org.apache.activemq.artemis.core.server.impl.Activation;
+import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
+import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
+import org.apache.activemq.artemis.utils.ActiveMQThreadFactory;
+import org.apache.activemq.artemis.utils.ExecutorFactory;
+import org.apache.activemq.artemis.utils.actors.ArtemisExecutor;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.concurrent.Executors;
+
+public class ClusterConnectionImplMockTest extends ActiveMQTestBase {
+
+ /**
+ * Verification for the fix
https://issues.apache.org/jira/browse/ARTEMIS-1946
+ */
+ @Test
+ public void testRemvalOfLocalParameters() throws Exception {
+ TransportConfiguration tc = new TransportConfiguration();
+ tc.setFactoryClassName("mock");
+ tc.getParams().put(TransportConstants.LOCAL_ADDRESS_PROP_NAME,
"localAddress");
+ tc.getParams().put(TransportConstants.LOCAL_PORT_PROP_NAME, "localPort");
+
+ ArtemisExecutor executor =
ArtemisExecutor.delegate(Executors.newSingleThreadExecutor(ActiveMQThreadFactory.defaultThreadFactory()));
+
+ ClusterConnectionImpl cci = new ClusterConnectionImpl(
+ null, //final ClusterManager manager,
+ new TransportConfiguration[]{tc}, //final
TransportConfiguration[] staticTranspConfigs,
+ null, //final TransportConfiguration connector,
+ null, //final SimpleString name,
+ null, //final SimpleString address,
+ 0, //final int minLargeMessageSize,
+ 0L, //final long clientFailureCheckPeriod,
+ 0L, //final long connectionTTL,
+ 0L, //final long retryInterval,
+ 0, //final double retryIntervalMultiplier,
+ 0L, //final long maxRetryInterval,
+ 0, //final int initialConnectAttempts,
+ 0, //final int reconnectAttempts,
+ 0L, //final long callTimeout,
+ 0L, //final long callFailoverTimeout,
+ false, //final boolean useDuplicateDetection,
+ null, //final MessageLoadBalancingType
messageLoadBalancingType,
+ 0, //final int confirmationWindowSize,
+ 0, //final int producerWindowSize,
+ () -> executor,//final ExecutorFactory executorFactory,
+ new MockServer(), //final ActiveMQServer server,
+ null, //final PostOffice postOffice,
+ null, //final ManagementService managementService,
+ null, //final ScheduledExecutorService scheduledExecutor,
+ 0, //final int maxHops,
+ null, //final NodeManager nodeManager,
+ null, //final String clusterUser,
+ null, //final String clusterPassword,
+ true, //final boolean allowDirectConnectionsOnly,
+ 0, //final long clusterNotificationInterval,
+ 0 //final int clusterNotificationAttempts)
+ );
+
+ Assert.assertEquals(1, cci.allowableConnections.size());
+ Assert.assertFalse("Local address can not be part of allowable
connection.",
cci.allowableConnections.iterator().next().getParams().containsKey(TransportConstants.LOCAL_ADDRESS_PROP_NAME));
+ Assert.assertFalse("Local port can not be part of allowable
connection.",
cci.allowableConnections.iterator().next().getParams().containsKey(TransportConstants.LOCAL_PORT_PROP_NAME));
+
+ }
+
+ static final class MockServer extends ActiveMQServerImpl {
+
+ @Override
+ public ClusterManager getClusterManager() {
+ return new ClusterManager(getExecutorFactory(), this, null, null,
null, null, null, false);
+ }
+
+ @Override
+ public ExecutorFactory getExecutorFactory() {
+ return new ExecutorFactory() {
+ @Override
+ public ArtemisExecutor getExecutor() {
+ return null;
+ }
+ };
+ }
+
+ @Override
+ public Activation getActivation() {
+ return new Activation() {
+ @Override
+ public void close(boolean permanently, boolean restarting) throws
Exception {
+
+ }
+
+ @Override
+ public void run() {
+
+ }
+ };
+ }
+ }
+}
