diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-01-25 11:26:46 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-01-25 11:28:15 +0100 |
commit | 0689cd90bfb9c86647b59620cc88f834fb47a98d (patch) | |
tree | 2a2de758f9fdb3456118824e92b0b05d7a296aa4 /container-core/src | |
parent | 02c4f49cb4d2df99c10c07fb7500fd0496a93db9 (diff) |
Reduce default timeout for metrics requests from 300s to 25s to ensure it is shorter than shutdown timeout targeted to be 30s
Diffstat (limited to 'container-core/src')
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/handler/metrics/HttpHandlerBase.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/handler/metrics/HttpHandlerBase.java b/container-core/src/main/java/com/yahoo/container/handler/metrics/HttpHandlerBase.java index 54a4d05853c..71e5e8db3e5 100644 --- a/container-core/src/main/java/com/yahoo/container/handler/metrics/HttpHandlerBase.java +++ b/container-core/src/main/java/com/yahoo/container/handler/metrics/HttpHandlerBase.java @@ -11,6 +11,7 @@ import com.yahoo.container.jdisc.ThreadedHttpRequestHandler; import com.yahoo.restapi.Path; import java.net.URI; +import java.time.Duration; import java.util.List; import java.util.Optional; import java.util.concurrent.Executor; @@ -28,14 +29,25 @@ import static java.util.logging.Level.WARNING; public abstract class HttpHandlerBase extends ThreadedHttpRequestHandler { private static final ObjectMapper jsonMapper = new ObjectMapper(); + private final Duration defaultTimeout; protected HttpHandlerBase(Executor executor) { + this(executor, Duration.ofSeconds(25)); + } + + protected HttpHandlerBase(Executor executor, Duration defaultTimeout) { super(executor); + this.defaultTimeout = defaultTimeout; } protected abstract Optional<HttpResponse> doHandle(URI requestUri, Path apiPath, String consumer); @Override + public Duration getTimeout() { + return defaultTimeout; + } + + @Override public final HttpResponse handle(HttpRequest request) { if (request.getMethod() != GET) return new JsonResponse(METHOD_NOT_ALLOWED, "Only GET is supported"); |