Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Stop using an infinite timeout for connecting to Hazelcast

Browse Source 
Closes gh-35771
This commit is contained in:
Andy Wilkinson 2023-06-07 11:22:38 +01:00
parent 140e806357
commit ca50cd8c8a
5 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java
View File

@ -18,6 +18,8 @@ package org.springframework.boot.autoconfigure.hazelcast;
import com.hazelcast.client.HazelcastClient;
import com.hazelcast.client.config.ClientConfig;
import com.hazelcast.client.config.ClientConnectionStrategyConfig;
import com.hazelcast.client.config.ConnectionRetryConfig;
import com.hazelcast.client.impl.clientside.HazelcastClientProxy;
import com.hazelcast.config.Config;
import com.hazelcast.core.Hazelcast;
@ -201,7 +203,8 @@ class HazelcastAutoConfigurationClientTests {
@Bean
ClientConfig clientConfig() {
return new ClientConfig();
return new ClientConfig().setConnectionStrategyConfig(new ClientConnectionStrategyConfig()
.setConnectionRetryConfig(new ConnectionRetryConfig().setClusterConnectTimeoutMillis(60000)));
}
}

6
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-instance.xml
View File

@ -4,5 +4,11 @@
xsi:schemaLocation="http://www.hazelcast.com/schema/client-config hazelcast-client-config-5.0.xsd">
<instance-name>spring-boot</instance-name>
<connection-strategy>
<connection-retry>
<cluster-connect-timeout-millis>60000</cluster-connect-timeout-millis>
</connection-retry>
</connection-strategy>
</hazelcast-client>

5
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.xml
View File

@ -5,5 +5,10 @@
<client-labels>
<label>explicit-xml</label>
</client-labels>
<connection-strategy>
<connection-retry>
<cluster-connect-timeout-millis>60000</cluster-connect-timeout-millis>
</connection-retry>
</connection-strategy>
</hazelcast-client>

3
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.yaml
View File

@ -1,3 +1,6 @@
hazelcast-client:
client-labels:
- explicit-yaml
connection-strategy:
connection-retry:
cluster-connect-timeout-millis: 60000

3
spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.yml
View File

@ -1,3 +1,6 @@
hazelcast-client:
client-labels:
- explicit-yml
connection-strategy:
connection-retry:
cluster-connect-timeout-millis: 60000