Override method for setting timeout instead of setting property

2 files changed, 8 insertions, 1 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 5f01b1e1f49..847852240fc 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
@@ -11,6 +11,7 @@ import com.yahoo.yolean.Exceptions;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.time.Duration;
 import java.util.concurrent.Executor;
 
 /**
@@ -63,6 +64,13 @@ public class HttpHandler extends LoggingRequestHandler {
         }
     }
 
+    // Override default, since we need a higher timeout
+    @Override
+    public Duration getTimeout() {
+        // TODO: Make configurable? Should be higher than timeouts used by clients
+        return Duration.ofSeconds(910);
+    }
+
     private String getMessage(Exception e, HttpRequest request) {
         String message;
         if (request.getBooleanProperty("debug")) {
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver
index 7fbf0c6757a..48fdfb31361 100755
--- a/configserver/src/main/sh/start-configserver
+++ b/configserver/src/main/sh/start-configserver
@@ -149,6 +149,5 @@ run-as-yahoo vespa-runserver -s configserver -r 30 -p $pidfile -- \
 	-Djdisc.logger.tag=jdisc/configserver \
 	-Dfile.encoding=UTF-8 \
 	-Dzookeeperlogfile=${VESPA_HOME}logs/vespa/zookeeper.configserver.log \
-	-DThreadedRequestHandler.timeout=910 \
 	-cp "$CP" \
 	com.yahoo.jdisc.core.StandaloneMain standalone-container-jar-with-dependencies.jar