summaryrefslogtreecommitdiffstats
path: root/container-disc
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-08-20 15:03:13 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2019-08-20 15:03:13 +0200
commitff3280f9e169a5b99b7db38b98728a6e861bb279 (patch)
treedc1f46de486150f50fd8a0fb85f7e5f44767027f /container-disc
parente95f9418f8dd5cf163fbbe4b802f8e4480f9a4c7 (diff)
Since Java 11 and docker are note the best of friends we will use nproc instead.
Diffstat (limited to 'container-disc')
-rwxr-xr-xcontainer-disc/src/main/sh/vespa-start-container-daemon.sh2
1 files changed, 2 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 53b1e54dda5..ca609e4ebe8 100755
--- a/container-disc/src/main/sh/vespa-start-container-daemon.sh
+++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh
@@ -98,6 +98,8 @@ configure_memory() {
configure_cpu() {
if ((jvm_availableProcessors > 0)); then
cpu_options="-XX:ActiveProcessorCount=${jvm_availableProcessors}"
+ else
+ cpu_options=`nproc`
fi
}