diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-03-13 16:39:32 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-03-13 16:39:33 +0100 |
| commit | dd757ef131bb7e44c0aa9031845a1bd3971a687e (patch) | |
| tree | be5e93c494a6857ba9047276cd5fa16ecc4e4a3c /jdisc_http_service | |
| parent | f7795628e0682149ac4e99d3e3903ed6469eea3e (diff) | |
Remove stopTimeout from connector config
Use global stop timeout from server on all connectors
Diffstat (limited to 'jdisc_http_service')
4 files changed, 1 insertions, 9 deletions
diff --git a/jdisc_http_service/abi-spec.json b/jdisc_http_service/abi-spec.json index 04e6d22a445..9b55341211c 100644 --- a/jdisc_http_service/abi-spec.json +++ b/jdisc_http_service/abi-spec.json @@ -34,7 +34,6 @@ "public com.yahoo.jdisc.http.ConnectorConfig$Builder acceptQueueSize(int)", "public com.yahoo.jdisc.http.ConnectorConfig$Builder reuseAddress(boolean)", "public com.yahoo.jdisc.http.ConnectorConfig$Builder idleTimeout(double)", - "public com.yahoo.jdisc.http.ConnectorConfig$Builder stopTimeout(double)", "public com.yahoo.jdisc.http.ConnectorConfig$Builder tcpKeepAliveEnabled(boolean)", "public com.yahoo.jdisc.http.ConnectorConfig$Builder tcpNoDelay(boolean)", "public com.yahoo.jdisc.http.ConnectorConfig$Builder throttling(com.yahoo.jdisc.http.ConnectorConfig$Throttling$Builder)", @@ -196,7 +195,6 @@ "public int acceptQueueSize()", "public boolean reuseAddress()", "public double idleTimeout()", - "public double stopTimeout()", "public boolean tcpKeepAliveEnabled()", "public boolean tcpNoDelay()", "public com.yahoo.jdisc.http.ConnectorConfig$Throttling throttling()", diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java index 5d3550db9d2..c9586530734 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java @@ -48,7 +48,6 @@ public class ConnectorFactory { connector.setAcceptQueueSize(connectorConfig.acceptQueueSize()); connector.setReuseAddress(connectorConfig.reuseAddress()); connector.setIdleTimeout((long)(connectorConfig.idleTimeout() * 1000.0)); - connector.setStopTimeout((long)(connectorConfig.stopTimeout() * 1000.0)); return connector; } diff --git a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def index e5f954fc538..5d9b9d2cc0d 100644 --- a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def +++ b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.connector.def @@ -28,10 +28,6 @@ reuseAddress bool default=true # The maximum idle time for a connection, which roughly translates to the Socket.setSoTimeout(int). idleTimeout double default=180.0 -# The stop timeout in seconds (timeout for processing in-flight requests during server shutdown). -# Should usually match the stopTimeout in the server config. -stopTimeout double default=30.0 - # Whether or not to have socket keep alive turned on. tcpKeepAliveEnabled bool default=false diff --git a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.server.def b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.server.def index 5cbbfdbbb33..0836a080e1f 100644 --- a/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.server.def +++ b/jdisc_http_service/src/main/resources/configdefinitions/jdisc.http.server.def @@ -27,8 +27,7 @@ filter[].binding string # Max number of threads in pool maxWorkerThreads int default = 200 -# Stop timeout in seconds (timeout for processing in-flight requests during server shutdown). -# Should usually match the stopTimeout in the connector config. +# Stop timeout in seconds. The maximum allowed time to process in-flight requests during server shutdown. Setting it to 0 disable graceful shutdown. stopTimeout double default = 30.0 # Enable embedded JMX server. Note: only accessible through the loopback interface. |