Fix request thread-pool initialization

italiangrid · Mar 16, 2024 · a3e5ed2 · a3e5ed2
1 parent ebe83ec
commit a3e5ed2
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/src/main/java/org/italiangrid/storm/webdav/config/ServiceConfiguration.java b/src/main/java/org/italiangrid/storm/webdav/config/ServiceConfiguration.java
@@ -33,6 +33,8 @@ public interface ServiceConfiguration {
 
   public long getTrustAnchorsRefreshIntervalInSeconds();
 
+  public int getMinConnections();
+
   public int getMaxConnections();
 
   public int getMaxQueueSize();

diff --git a/src/main/java/org/italiangrid/storm/webdav/config/ServiceConfigurationProperties.java b/src/main/java/org/italiangrid/storm/webdav/config/ServiceConfigurationProperties.java
@@ -259,11 +259,14 @@ public static class ConnectorProperties {
     @Max(65536)
     int securePort = 8443;
 
+    @Positive
+    int minConnections = 10;
+
     @Positive
     int maxConnections = 200;
 
     @Positive
-    int maxQueueSize = 512;
+    int maxQueueSize = 50;
 
     @Positive
     int maxIdleTimeMsec = 30000;
@@ -292,6 +295,14 @@ public void setSecurePort(int securePort) {
       this.securePort = securePort;
     }
 
+    public int getMinConnections() {
+      return minConnections;
+    }
+
+    public void setMinConnections(int minConnections) {
+      this.minConnections = minConnections;
+    }
+
     public int getMaxConnections() {
       return maxConnections;
     }
@@ -732,6 +743,10 @@ public long getTrustAnchorsRefreshIntervalInSeconds() {
     return getTls().getTrustAnchorsRefreshIntervalSecs();
   }
 
+  @Override
+  public int getMinConnections() {
+    return getConnector().getMinConnections();
+  }
 
   @Override
   public int getMaxConnections() {
@@ -887,4 +902,5 @@ public TapeProperties getTape() {
   public void setTape(TapeProperties tape) {
     this.tape = tape;
   }
+
 }
diff --git a/src/main/java/org/italiangrid/storm/webdav/server/DefaultWebServerFactory.java b/src/main/java/org/italiangrid/storm/webdav/server/DefaultWebServerFactory.java
@@ -47,8 +47,8 @@ public void customize(JettyServletWebServerFactory factory) {
 
     factory.setThreadPool(ThreadPoolBuilder.instance()
       .withMaxRequestQueueSize(configuration.getMaxQueueSize())
-      .withMaxThreads(serverProperties.getJetty().getThreads().getMax())
-      .withMinThreads(serverProperties.getJetty().getThreads().getMin())
+      .withMaxThreads(configuration.getMaxConnections())
+      .withMinThreads(configuration.getMinConnections())
       .registry(metricRegistry)
       .withPrefix("storm.http")
       .withName("thread-pool")

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -87,6 +87,8 @@ storm:
     port:  ${STORM_WEBDAV_HTTP_PORT:8085}
     # HTTPS connector port
     secure-port: ${STORM_WEBDAV_HTTPS_PORT:8443}
+    # Min concurrent connections
+    min-connections: ${STORM_WEBDAV_MIN_CONNECTIONS:50}
     # Max concurrent connections
     max-connections: ${STORM_WEBDAV_MAX_CONNECTIONS:300}
     # Connection queue size