Merge pull request #17468 from vespa-engine/jonmv/short-conn-ttl-for-config-convergence-checker

Use a short connection TTL to avoid many connections, instead of Conn…

1 files changed, 2 insertions, 3 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java
index c2342278236..2dd655c91d8 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java
@@ -23,6 +23,7 @@ import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http2.HttpVersionPolicy;
 import org.apache.hc.core5.net.URIBuilder;
 import org.apache.hc.core5.reactor.IOReactorConfig;
+import org.apache.hc.core5.util.TimeValue;
 import org.apache.hc.core5.util.Timeout;
 
 import java.io.IOException;
@@ -152,7 +153,6 @@ public class ConfigConvergenceChecker extends AbstractComponent {
     /** Get service generation of service at given URL */
     private CompletableFuture<Long> getServiceGeneration(CloseableHttpAsyncClient client, URI serviceUrl, Duration timeout) {
         SimpleHttpRequest request = SimpleHttpRequests.get(createApiUri(serviceUrl));
-        request.setHeader("Connection", "close");
         request.setConfig(createRequestConfig(timeout));
 
         // Ignoring returned Future object as we want to use the more flexible CompletableFuture instead
@@ -240,14 +240,13 @@ public class ConfigConvergenceChecker extends AbstractComponent {
                         PoolingAsyncClientConnectionManagerBuilder.create()
                                 .setMaxConnTotal(100)
                                 .setMaxConnPerRoute(10)
+                                .setConnectionTimeToLive(TimeValue.ofMilliseconds(1))
                                 .setTlsStrategy(tlsStrategy)
                                 .build())
                 .setIOReactorConfig(IOReactorConfig.custom()
                         .setSoTimeout(Timeout.ofSeconds(2))
                         .build())
                 .setUserAgent("config-convergence-checker")
-                .setConnectionReuseStrategy((request, response, context) -> false) // Disable connection reuse
-                .setVersionPolicy(HttpVersionPolicy.FORCE_HTTP_1)
                 .build();
     }