diff options
3 files changed, 10 insertions, 6 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); diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java index d4cf6324721..1f95e7fc75e 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedRequestHandler.java @@ -27,7 +27,7 @@ import java.util.logging.Logger; /** * A request handler which assigns a worker thread to handle each request. - * This is mean to be subclasses by handlers who does work by executing each + * This is meant to be subclassed by handlers who do work by executing each * request in a separate thread. * <p> * Note that this means that subclass handlers are synchronous - the request io can |