diff options
| author | Bjørn Meland <bjormel@users.noreply.github.com> | 2021-04-22 18:12:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-22 18:12:30 +0200 |
| commit | f40237d5bdfe32a7b33df13e426b67b88fd0288a (patch) | |
| tree | a514323db1bf35cb1a5e4bc17dcbc9b6b47df725 | |
| parent | b66e6cd43bc38cdae1ad41a850fe1e9a78c3a994 (diff) | |
| parent | 928a01edaf34bf7635b668fa211862ac534c41dc (diff) | |
Merge pull request #17548 from vespa-engine/revert-17519-bjormel/reduce-jdisc-idleTimeout
Revert "Reduce maximum idleTimeout for a connection to 30 sec"
2 files changed, 2 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java index 51570cac4a7..9d715073f77 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java @@ -90,7 +90,7 @@ public class HostedSslConnectorFactory extends ConnectorFactory { connectorBuilder .proxyProtocol(new ConnectorConfig.ProxyProtocol.Builder().enabled(true).mixedMode(true)) - .idleTimeout(Duration.ofMinutes(3).toSeconds()) + .idleTimeout(Duration.ofSeconds(30).toSeconds()) .maxConnectionLife(Duration.ofMinutes(10).toSeconds()); } } diff --git a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def index fa28416e545..cb1e366f843 100644 --- a/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def +++ b/container-core/src/main/resources/configdefinitions/jdisc.http.jdisc.http.connector.def @@ -26,7 +26,7 @@ acceptQueueSize int default=0 reuseAddress bool default=true # The maximum idle time for a connection, which roughly translates to the Socket.setSoTimeout(int). -idleTimeout double default=30.0 +idleTimeout double default=180.0 # DEPRECATED - Ignored, no longer in use stopTimeout double default = 30.0 |