This is an automated email from the ASF dual-hosted git repository.
clebertsuconic 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 cb2b293810 ARTEMIS-4647 use specified call-timeout on backup connector
cb2b293810 is described below
commit cb2b293810d81f4755b0bfb29a8b558a6b132d0c
Author: Justin Bertram <[email protected]>
AuthorDate: Mon Feb 19 11:20:57 2024 -0600
ARTEMIS-4647 use specified call-timeout on backup connector
---
.../artemis/core/server/cluster/BackupManager.java | 1 +
.../cluster/failover/BackupManagerConfigTest.java | 78 ++++++++++++++++++++++
2 files changed, 79 insertions(+)
diff --git
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/BackupManager.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/BackupManager.java
index 86bee80a4d..dd447e54bf 100644
---
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/BackupManager.java
+++
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/BackupManager.java
@@ -240,6 +240,7 @@ public class BackupManager implements ActiveMQComponent {
backupServerLocator.setIdentity("backupLocatorFor='" + server +
"'");
backupServerLocator.setReconnectAttempts(-1);
backupServerLocator.setInitialConnectAttempts(-1);
+ backupServerLocator.setCallTimeout(config.getCallTimeout());
backupServerLocator.setProtocolManagerFactory(ActiveMQServerSideProtocolManagerFactory.getInstance(backupServerLocator,
server.getStorageManager()));
}
}
diff --git
a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupManagerConfigTest.java
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupManagerConfigTest.java
new file mode 100644
index 0000000000..a85f1663cf
--- /dev/null
+++
b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/BackupManagerConfigTest.java
@@ -0,0 +1,78 @@
+/*
+ * 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.integration.cluster.failover;
+
+import org.apache.activemq.artemis.api.core.TransportConfiguration;
+import
org.apache.activemq.artemis.core.config.ha.SharedStoreBackupPolicyConfiguration;
+import
org.apache.activemq.artemis.core.config.ha.SharedStorePrimaryPolicyConfiguration;
+import org.apache.activemq.artemis.core.server.cluster.BackupManager;
+import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl;
+import org.apache.activemq.artemis.tests.util.TransportConfigurationUtils;
+import org.apache.activemq.artemis.utils.Wait;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class BackupManagerConfigTest extends FailoverTestBase {
+
+ @Override
+ protected void createConfigs() throws Exception {
+ nodeManager = createNodeManager();
+ TransportConfiguration primaryConnector =
getConnectorTransportConfiguration(true);
+ TransportConfiguration backupConnector =
getConnectorTransportConfiguration(false);
+
+ backupConfig = super.createDefaultInVMConfig()
+ .clearAcceptorConfigurations()
+
.addAcceptorConfiguration(getAcceptorTransportConfiguration(false))
+ .setHAPolicyConfiguration(new
SharedStoreBackupPolicyConfiguration())
+
.addConnectorConfiguration(primaryConnector.getName(), primaryConnector)
+
.addConnectorConfiguration(backupConnector.getName(), backupConnector)
+
.addClusterConfiguration(createBasicClusterConfig(backupConnector.getName(),
primaryConnector.getName())
+ .setCallTimeout(333));
+
+ backupServer = createTestableServer(backupConfig);
+
+ primaryConfig = super.createDefaultInVMConfig()
+ .clearAcceptorConfigurations()
+
.addAcceptorConfiguration(getAcceptorTransportConfiguration(true))
+ .setHAPolicyConfiguration(new
SharedStorePrimaryPolicyConfiguration())
+
.addConnectorConfiguration(primaryConnector.getName(), primaryConnector)
+
.addClusterConfiguration(createBasicClusterConfig(primaryConnector.getName()));
+
+ primaryServer = createTestableServer(primaryConfig);
+ }
+
+ @Test
+ public void testCallTimeout() {
+ ActiveMQServerImpl server = (ActiveMQServerImpl)
backupServer.getServer();
+ for (BackupManager.BackupConnector backupConnector :
server.getBackupManager().getBackupConnectors()) {
+
+ Wait.assertTrue(() -> backupConnector.getBackupServerLocator() !=
null);
+ Assert.assertEquals(333,
backupConnector.getBackupServerLocator().getCallTimeout());
+ }
+ }
+
+ @Override
+ protected TransportConfiguration getAcceptorTransportConfiguration(final
boolean live) {
+ return TransportConfigurationUtils.getInVMAcceptor(live);
+ }
+
+ @Override
+ protected TransportConfiguration getConnectorTransportConfiguration(final
boolean live) {
+ return TransportConfigurationUtils.getInVMConnector(live);
+ }
+
+}
