Set jdisc handler timeout for all session handlers

2 files changed, 9 insertions, 5 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java
index 3f2cd1e41af..d0c4f43359a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/SessionHandler.java
@@ -26,6 +26,15 @@ public class SessionHandler extends HttpHandler {
     }
 
     /**
+     * Set to make sure that timeout for the handler is higher than any timeouts used inside the handler (e.g. zookeeper barrier timeout)
+     * Setting this too low will lead to a response with status code 504 and empty response body.
+     */
+     @Override
+    public Duration getTimeout() {
+        return Duration.ofSeconds(applicationRepository.configserverConfig().zookeeper().barrierTimeout()).plus(Duration.ofSeconds(30));
+    }
+
+    /**
      * Gets the raw session id from request (v2). Input request must have a valid path.
      *
      * @param request a request
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java
index 620f76961d4..7fd94667159 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java
@@ -53,11 +53,6 @@ public class SessionPrepareHandler extends SessionHandler {
         return new SessionPrepareResponse(tenant.getName(), request, sessionId);
     }
 
-    @Override
-    public Duration getTimeout() {
-        return zookeeperBarrierTimeout.plus(Duration.ofSeconds(10));
-    }
-
     private Tenant getExistingTenant(HttpRequest request) {
         TenantName tenantName = Utils.getTenantNameFromSessionRequest(request);
         Utils.checkThatTenantExists(tenantRepository, tenantName);