Add connector config for HTTP/2 streams

2 files changed, 8 insertions, 4 deletions

diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
index fc39de72018..4ad39f91a83 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
@@ -75,7 +75,7 @@ public class ConnectorFactory {
         connector.setName(connectorConfig.name());
         connector.setAcceptQueueSize(connectorConfig.acceptQueueSize());
         connector.setReuseAddress(connectorConfig.reuseAddress());
-        connector.setIdleTimeout(idleTimeoutInMillis());
+        connector.setIdleTimeout(toMillis(connector.getIdleTimeout()));
         return connector;
     }
 
@@ -162,8 +162,8 @@ public class ConnectorFactory {
 
     private HTTP2ServerConnectionFactory newHttp2ConnectionFactory() {
         HTTP2ServerConnectionFactory factory = new HTTP2ServerConnectionFactory(newHttpConfiguration());
-        factory.setStreamIdleTimeout(idleTimeoutInMillis());
-        factory.setMaxConcurrentStreams(4096);
+        factory.setStreamIdleTimeout(toMillis(connectorConfig.http2().streamIdleTimeout()));
+        factory.setMaxConcurrentStreams(connectorConfig.http2().maxConcurrentStreams());
         return factory;
     }
 
@@ -194,6 +194,6 @@ public class ConnectorFactory {
                 || (config.implicitTlsEnabled() && TransportSecurityUtils.isTransportSecurityEnabled());
     }
 
-    private long idleTimeoutInMillis() { return (long) (connectorConfig.idleTimeout() * 1000.0); }
+    private static long toMillis(double seconds) { return (long)(seconds * 1000); }
 
 }
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 09b883a620e..0b01f690aea 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
@@ -128,3 +128,7 @@ maxConnectionLife              double  default=0.0
 
 # Enable HTTP/2 (in addition to HTTP/1.1 using ALPN)
 http2Enabled                   bool  default=true
+
+http2.streamIdleTimeout double default=600
+
+http2.maxConcurrentStreams int default=4096