From 1fc46dfc64402bfe6a6ef043b55adbcbc8f48a61 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Thu, 28 Sep 2017 13:29:04 +0200 Subject: Set correct timeout for prepare requests --- .../main/java/com/yahoo/vespa/config/server/http/HttpHandler.java | 4 ++-- .../com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'configserver') diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java index c13d1b3fcfa..a1fd3ffd729 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java @@ -70,8 +70,8 @@ public class HttpHandler extends LoggingRequestHandler { } } - // Override default, since we need a higher timeout - // TODO: Make configurable? Should be higher than timeouts used by clients + // Override default, since we need a higher timeout for some calls + // TODO: Review and see if overriding only in SessionPrepareHandler is enough @Override public Duration getTimeout() { return Duration.ofSeconds(910); 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 bfc5714467e..03a3f3556e4 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 @@ -51,6 +51,11 @@ public class SessionPrepareHandler extends SessionHandler { this.zookeeperBarrierTimeout = Duration.ofSeconds(configserverConfig.zookeeper().barrierTimeout()); } + @Override + public Duration getTimeout() { + return zookeeperBarrierTimeout.plus(Duration.ofSeconds(10)); + } + @Override protected HttpResponse handlePUT(HttpRequest request) { Tenant tenant = getExistingTenant(request); -- cgit v1.2.3