summaryrefslogtreecommitdiffstats
path: root/container-disc
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-10-15 16:10:17 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2019-10-15 16:10:17 +0200
commit4790760429263e5606bdce87a1ac75cdfd08483b (patch)
tree11eefbabbfd0e65389b6aee81c39e6460c8adde0 /container-disc
parentec3423d79c6699de2543019740d4adcb062c4498 (diff)
Add a safety against specifying a min heap size lager than max heap size.
Diffstat (limited to 'container-disc')
-rwxr-xr-xcontainer-disc/src/main/sh/vespa-start-container-daemon.sh5
1 files changed, 5 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 bac80b35ac8..aa0a1293ef5 100755
--- a/container-disc/src/main/sh/vespa-start-container-daemon.sh
+++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh
@@ -82,6 +82,11 @@ configure_memory() {
jvm_minHeapsize=${jvm_heapsize}
fi
+ # Safety measure against bad of min vs max heapsize.
+ if ((jvm_minHeapsize > jvm_heapsize)); then
+ jvm_minHeapsize=${jvm_heapsize}
+ fi
+
maxDirectMemorySize=$(( jvm_baseMaxDirectMemorySize + jvm_heapsize / 8 + jvm_directMemorySizeCache ))
memory_options="-Xms${jvm_minHeapsize}m -Xmx${jvm_heapsize}m"