Make thread pool size configurable

2 files changed, 8 insertions, 3 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/DefaultRpcAuthorizerProvider.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/DefaultRpcAuthorizerProvider.java
index b129e53f7d3..c7bbecc157c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/DefaultRpcAuthorizerProvider.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/DefaultRpcAuthorizerProvider.java
@@ -31,7 +31,7 @@ public class DefaultRpcAuthorizerProvider implements Provider<RpcAuthorizer> {
                 TransportSecurityUtils.isTransportSecurityEnabled() && config.multitenant() && config.hostedVespa() && !authorizerMode.equals("disable");
         this.rpcAuthorizer =
                 useMultiTenantAuthorizer
-                        ? new MultiTenantRpcAuthorizer(nodeIdentifier, hostRegistries, handlerProvider, toMultiTenantRpcAuthorizerMode(authorizerMode))
+                        ? new MultiTenantRpcAuthorizer(nodeIdentifier, hostRegistries, handlerProvider, toMultiTenantRpcAuthorizerMode(authorizerMode), getThreadPoolSize(config))
                         : new NoopRpcAuthorizer();
     }
 
@@ -43,6 +43,10 @@ public class DefaultRpcAuthorizerProvider implements Provider<RpcAuthorizer> {
         }
     }
 
+    private static int getThreadPoolSize(ConfigserverConfig config) {
+        return config.numRpcThreads() != 0 ? config.numRpcThreads() : 8;
+    }
+
     @Override
     public RpcAuthorizer get() {
         return rpcAuthorizer;
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizer.java
index 93ece2069b4..f9361b43045 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/security/MultiTenantRpcAuthorizer.java
@@ -51,11 +51,12 @@ public class MultiTenantRpcAuthorizer implements RpcAuthorizer {
     public MultiTenantRpcAuthorizer(NodeIdentifier nodeIdentifier,
                                     HostRegistries hostRegistries,
                                     RequestHandlerProvider handlerProvider,
-                                    Mode mode) {
+                                    Mode mode,
+                                    int threadPoolSize) {
         this(nodeIdentifier,
              hostRegistries.getTenantHostRegistry(),
              handlerProvider,
-             Executors.newFixedThreadPool(4, new DaemonThreadFactory("RPC-Authorizer-")),
+             Executors.newFixedThreadPool(threadPoolSize, new DaemonThreadFactory("multi-tenant-rpc-authorizer-")),
              mode);
     }