Merge pull request #42672 from ataxexe/infinispan-client-config

Add socket timeout config for the hotrod client
quarkusio · Aug 27, 2024 · 2ca2703 · 2ca2703
2 parents 96a0036 + 8a16314
commit 2ca2703
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/.../test/java/org/quarkus/infinispan/client/deployment/InfinispanConfigurationSetupTest.java b/.../test/java/org/quarkus/infinispan/client/deployment/InfinispanConfigurationSetupTest.java
@@ -45,6 +45,7 @@ public void infinispanConnectionConfiguration() {
         assertThat(configuration.security().ssl().ciphers()).containsExactlyInAnyOrder("SSL_cipher1", "SSL_cipher2");
         assertThat(configuration.security().ssl().hostnameValidation()).isTrue();
         assertThat(configuration.security().ssl().sniHostName()).isEqualTo("sniHostName");
+        assertThat(configuration.socketTimeout()).isEqualTo(10000);
         assertThat(configuration.clusters()).extracting("clusterName", "clientIntelligence")
                 .containsExactly(tuple("bsite", ClientIntelligence.BASIC));
         assertThat(configuration.clusters()).hasSize(1);

diff --git a/...sions/infinispan-client/deployment/src/test/resources/cache-config-application.properties b/...sions/infinispan-client/deployment/src/test/resources/cache-config-application.properties
@@ -18,6 +18,7 @@ quarkus.infinispan-client.ssl-protocol=SSL_protocol
 quarkus.infinispan-client.ssl-ciphers=SSL_cipher1,SSL_cipher2
 quarkus.infinispan-client.ssl-host-name-validation=true
 quarkus.infinispan-client.sni-host-name=sniHostName
+quarkus.infinispan-client.socket-timeout=10000
 
 quarkus.infinispan-client.backup-cluster.bsite.hosts=bsite1:32111
 quarkus.infinispan-client.backup-cluster.bsite.client-intelligence=BASIC

diff --git a/.../runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java b/.../runtime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientProducer.java
@@ -273,6 +273,10 @@ private ConfigurationBuilder builderFromProperties(String infinispanClientName,
             properties.put(ConfigurationProperties.SNI_HOST_NAME, infinispanClientRuntimeConfig.sniHostName.get());
         }
 
+        if (infinispanClientRuntimeConfig.socketTimeout.isPresent()) {
+            properties.put(ConfigurationProperties.SO_TIMEOUT, infinispanClientRuntimeConfig.socketTimeout.get());
+        }
+
         builder.withProperties(properties);
 
         if (infinispanClientRuntimeConfig.tracingPropagationEnabled.isPresent()) {

diff --git a/...ime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientRuntimeConfig.java b/...ime/src/main/java/io/quarkus/infinispan/client/runtime/InfinispanClientRuntimeConfig.java
@@ -179,6 +179,12 @@ public class InfinispanClientRuntimeConfig {
     @ConfigItem
     Optional<String> sniHostName;
 
+    /**
+     * Configures the socket timeout.
+     */
+    @ConfigItem
+    Optional<Integer> socketTimeout;
+
     /**
      * Whether a tracing propagation is enabled in case the Opentelemetry extension is present.
      * By default the propagation of the context is propagated from the client to the Infinispan Server.