Merge pull request #3572 from vespa-engine/hmusum/set-timeout-for-prepare

Set correct timeout for prepare requests

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();