diff options
| author | Harald Musum <musum@oath.com> | 2018-02-12 13:10:54 +0100 |
|---|---|---|
| committer | Harald Musum <musum@oath.com> | 2018-02-12 13:10:54 +0100 |
| commit | e8be6752616c645e6c1f6983869d42ce65d7ed85 (patch) | |
| tree | 9c6468109b7ddc483bd7af58b16dcb849a695444 /configserver/src | |
| parent | 48e1509e7c89c8140615010e3231fcab82c7c8a1 (diff) | |
Use available processors for number of RPC threads by default
Diffstat (limited to 'configserver/src')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java | 3 | ||||
| -rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/rpc/TestWithRpc.java | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java index 08095c55373..0563120001d 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/rpc/RpcServer.java @@ -116,7 +116,8 @@ public class RpcServer implements Runnable, ReloadListener, TenantListener { this.metrics = metrics.getOrCreateMetricUpdater(Collections.<String, String>emptyMap()); this.hostLivenessTracker = hostLivenessTracker; BlockingQueue<Runnable> workQueue = new LinkedBlockingQueue<>(config.maxgetconfigclients()); - executorService = new ThreadPoolExecutor(config.numthreads(), config.numthreads(), + int rpcNumThreads = config.numRpcThreads() == 0 ? Runtime.getRuntime().availableProcessors() : config.numRpcThreads(); + executorService = new ThreadPoolExecutor(rpcNumThreads, rpcNumThreads, 0, TimeUnit.SECONDS, workQueue, ThreadFactoryFactory.getThreadFactory(THREADPOOL_NAME)); delayedConfigResponses = new DelayedConfigResponses(this, config.numDelayedResponseThreads()); spec = new Spec(null, config.rpcport()); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/TestWithRpc.java b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/TestWithRpc.java index 12dc584f055..e022b622fb0 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/TestWithRpc.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/rpc/TestWithRpc.java @@ -82,7 +82,11 @@ public class TestWithRpc { protected void createAndStartRpcServer(boolean hostedVespa) { ConfigserverConfig configserverConfig = new ConfigserverConfig(new ConfigserverConfig.Builder()); - rpcServer = new RpcServer(new ConfigserverConfig(new ConfigserverConfig.Builder().rpcport(port).numthreads(1).maxgetconfigclients(1).hostedVespa(hostedVespa)), + rpcServer = new RpcServer(new ConfigserverConfig(new ConfigserverConfig.Builder() + .rpcport(port) + .numRpcThreads(1) + .maxgetconfigclients(1) + .hostedVespa(hostedVespa)), new SuperModelRequestHandler(new TestConfigDefinitionRepo(), configserverConfig, new SuperModelManager( |