Scale core pool size with actual number of cores as fallback

1 files changed, 3 insertions, 1 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/handler/threadpool/ContainerThreadPool.java b/container-core/src/main/java/com/yahoo/container/handler/threadpool/ContainerThreadPool.java
index 6fc9da298a8..edbe12b64c6 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/threadpool/ContainerThreadPool.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/threadpool/ContainerThreadPool.java
@@ -83,7 +83,9 @@ public class ContainerThreadPool implements AutoCloseable {
     }
 
     private static int computeCoreThreadPoolSize(int corePoolSize, int maxNumThreads) {
-        return Math.min(corePoolSize, maxNumThreads);
+        return Math.min(
+                corePoolSize <= 0 ? Runtime.getRuntime().availableProcessors() * 2 : corePoolSize,
+                maxNumThreads);
     }
 
 }