[activemq-artemis] branch main updated: ARTEMIS-3115 use correct call timeout defaults for cluster-connection

[jbertram]

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 996f6f4  ARTEMIS-3115 use correct call timeout defaults for 
cluster-connection
     new 753cf2a  This closes #3816
996f6f4 is described below

commit 996f6f46fe11bf6ffc53cf97761bae1eb69ab8e4
Author: Justin Bertram <jbert...@apache.org>
AuthorDate: Mon Oct 25 12:42:29 2021 -0500

    ARTEMIS-3115 use correct call timeout defaults for cluster-connection
---
 .../activemq/artemis/core/deployers/impl/FileConfigurationParser.java | 4 ++--
 .../activemq/artemis/core/config/impl/FileConfigurationTest.java      | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
index bd27103..4d9b9cd 100644
--- 
a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
+++ 
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
@@ -2135,9 +2135,9 @@ public final class FileConfigurationParser extends 
XMLConfigurationUtil {
 
       long retryInterval = getLong(e, "retry-interval", 
ActiveMQDefaultConfiguration.getDefaultClusterRetryInterval(), 
Validators.GT_ZERO);
 
-      long callTimeout = getLong(e, "call-timeout", 
ActiveMQClient.DEFAULT_CALL_TIMEOUT, Validators.GT_ZERO);
+      long callTimeout = getLong(e, "call-timeout", 
ActiveMQDefaultConfiguration.getDefaultClusterCallTimeout(), 
Validators.GT_ZERO);
 
-      long callFailoverTimeout = getLong(e, "call-failover-timeout", 
ActiveMQClient.DEFAULT_CALL_FAILOVER_TIMEOUT, Validators.MINUS_ONE_OR_GT_ZERO);
+      long callFailoverTimeout = getLong(e, "call-failover-timeout", 
ActiveMQDefaultConfiguration.getDefaultClusterCallFailoverTimeout(), 
Validators.MINUS_ONE_OR_GT_ZERO);
 
       double retryIntervalMultiplier = getDouble(e, 
"retry-interval-multiplier", 
ActiveMQDefaultConfiguration.getDefaultClusterRetryIntervalMultiplier(), 
Validators.GT_ZERO);
 
diff --git 
a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
 
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
index 344aae0..d5ab55a 100644
--- 
a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
+++ 
b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
@@ -364,6 +364,8 @@ public class FileConfigurationTest extends 
ConfigurationImplTest {
       for (ClusterConnectionConfiguration ccc : 
conf.getClusterConfigurations()) {
          if (ccc.getName().equals("cluster-connection3")) {
             
Assert.assertEquals(MessageLoadBalancingType.OFF_WITH_REDISTRIBUTION, 
ccc.getMessageLoadBalancingType());
+            
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultClusterCallTimeout(),
 ccc.getCallTimeout());
+            
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultClusterCallFailoverTimeout(),
 ccc.getCallFailoverTimeout());
          } else if (ccc.getName().equals("cluster-connection1")) {
             Assert.assertEquals("cluster-connection1", ccc.getName());
             Assert.assertEquals("clusterConnectionConf minLargeMessageSize", 
321, ccc.getMinLargeMessageSize());