diff options
author | Harald Musum <musum@oath.com> | 2017-09-28 13:29:04 +0200 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2017-09-28 13:29:04 +0200 |
commit | 1fc46dfc64402bfe6a6ef043b55adbcbc8f48a61 (patch) | |
tree | 925a10c2d120fcebed7bb53a094c4f74690076ef /configserver | |
parent | 85e3ec191db3d843bfe0d8d58d3c0bbd7b082514 (diff) |
Set correct timeout for prepare requests
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/http/HttpHandler.java | 4 | ||||
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/SessionPrepareHandler.java | 5 |
2 files changed, 7 insertions, 2 deletions
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 @@ -52,6 +52,11 @@ public class SessionPrepareHandler extends SessionHandler { } @Override + public Duration getTimeout() { + return zookeeperBarrierTimeout.plus(Duration.ofSeconds(10)); + } + + @Override protected HttpResponse handlePUT(HttpRequest request) { Tenant tenant = getExistingTenant(request); TenantName tenantName = tenant.getName(); |