Set HTTP timeouts for log retrieving

1 files changed, 9 insertions, 7 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java
index 5d1d8da3648..f3dc095193b 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/LogRetriever.java
@@ -2,10 +2,13 @@
 package com.yahoo.vespa.config.server.http;
 
 import ai.vespa.util.http.hc5.VespaHttpClientBuilder;
+import com.yahoo.container.jdisc.EmptyResponse;
 import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.yolean.Exceptions;
 import org.apache.hc.client5.http.classic.methods.HttpGet;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.core5.util.Timeout;
+
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
@@ -18,7 +21,10 @@ import java.util.Optional;
  */
 public class LogRetriever {
 
-    private final CloseableHttpClient httpClient = VespaHttpClientBuilder.custom().buildClient();
+    private final CloseableHttpClient httpClient = VespaHttpClientBuilder.custom()
+                                                                         .connectTimeout(Timeout.ofSeconds(5))
+                                                                         .socketTimeout(Timeout.ofSeconds(45))
+                                                                         .buildClient();
 
     @SuppressWarnings("deprecation")
     public HttpResponse getLogs(String logServerUri, Optional<Instant> deployTime) {
@@ -29,12 +35,8 @@ public class LogRetriever {
             // It takes some time before nodes are up after first-time deployment, return empty log for up to 2 minutes
             // if getting logs fail
             if (deployTime.isPresent() && Instant.now().isBefore(deployTime.get().plus(Duration.ofMinutes(2))))
-                return new HttpResponse(200) {
-                    @Override
-                    public void render(OutputStream outputStream) throws IOException {
-                        outputStream.write("".getBytes(StandardCharsets.UTF_8));
-                    }
-                };
+                return new EmptyResponse();
+
             return HttpErrorResponse.internalServerError("Failed to get logs: " + Exceptions.toMessageString(e));
         }
     }