diff options
| author | Harald Musum <musum@oath.com> | 2019-01-17 11:41:50 +0100 |
|---|---|---|
| committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:30 +0100 |
| commit | f3b0a87619695b90f1cf68caa90592b5774bc0f7 (patch) | |
| tree | 8347cb59ca0aea770f68da0ce87511c4d342ae2d | |
| parent | 87fc9dd7319da4cff9d96e769c5375cb220a0d23 (diff) | |
Set -XX:ActiveProcessorCount option if set in config
Use VESPA_CONTAINER_JVMARGS if set
| -rwxr-xr-x | container-disc/src/main/sh/vespa-start-container-daemon.sh | 9 | ||||
| -rw-r--r-- | container-search/src/main/resources/configdefinitions/qr-start.def | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/container-disc/src/main/sh/vespa-start-container-daemon.sh b/container-disc/src/main/sh/vespa-start-container-daemon.sh index 8a32f6797a0..65826e650c4 100755 --- a/container-disc/src/main/sh/vespa-start-container-daemon.sh +++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh @@ -90,6 +90,12 @@ configure_memory() { fi } +configure_cpu() { + if ((jvm_availableProcessors > 0)); then + cpu_options="-XX:ActiveProcessorCount=${jvm_availableProcessors}" + fi +} + configure_numactl() { log_message debug "starting ${VESPA_SERVICE_NAME} for ${VESPA_CONFIG_ID}" if numactl --interleave all true &> /dev/null; then @@ -177,11 +183,14 @@ configure_gcopts configure_env_vars configure_classpath configure_numactl +configure_cpu configure_preload exec $numactlcmd $envcmd java \ -Dconfig.id="${VESPA_CONFIG_ID}" \ -XX:+PreserveFramePointer \ + ${VESPA_CONTAINER_JVMARGS} \ + ${cpu_options} \ ${memory_options} \ ${jvm_gcopts} \ -XX:MaxJavaStackTraceDepth=1000000 \ diff --git a/container-search/src/main/resources/configdefinitions/qr-start.def b/container-search/src/main/resources/configdefinitions/qr-start.def index 46a35ef2fc8..8547ad08458 100644 --- a/container-search/src/main/resources/configdefinitions/qr-start.def +++ b/container-search/src/main/resources/configdefinitions/qr-start.def @@ -27,6 +27,10 @@ jvm.directMemorySizeCache int default=0 restart ## value above. Setting outside [1, 99] disables this setting. jvm.heapSizeAsPercentageOfPhysicalMemory int default=0 restart +## Number of processors available, can be used to set -XX:ActiveProcessorCount if set to non-zero. +## In that case will be the number returned by the JVM when calling Runtime.getRuntime().availableProcessors() +jvm.availableProcessors int default=0 restart + ## Extra environment variables qrs.env string default="YELL_MA_EURO=INXIGHT" restart |