diff options
author | Martin Polden <mpolden@mpolden.no> | 2017-09-28 14:32:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-28 14:32:57 +0200 |
commit | 92da7ce48b2e45229e3c60c0f16d79abecbfe652 (patch) | |
tree | cb0266704f0f44321f47a31eeb511f9a88644c49 | |
parent | 2770275348e0c673590f2602965e2d444b923e27 (diff) | |
parent | 1fc46dfc64402bfe6a6ef043b55adbcbc8f48a61 (diff) |
Merge pull request #3572 from vespa-engine/hmusum/set-timeout-for-prepare
Set correct timeout for prepare requests
-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(); |