aboutsummaryrefslogtreecommitdiffstats
path: root/container-disc
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-12-18 09:09:27 +0100
committerHarald Musum <musum@verizonmedia.com>2019-12-18 09:09:27 +0100
commit78f003bd236672f7420b1430eaf5da1c0033602e (patch)
tree4066d3befc83eef9beefd5ca30683abb76e1893f /container-disc
parentfc377cc8c9e9f4f471e80ddf8e83bd8a3e42857a (diff)
Stop requiring at least 1 Gb heap when using heaps size as percentage of physical memory
Make it easier to get this working for e.g. Docker containers with less memory
Diffstat (limited to 'container-disc')
-rwxr-xr-xcontainer-disc/src/main/sh/vespa-start-container-daemon.sh5
1 files changed, 1 insertions, 4 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 f6a1388e34f..e64d6a9bac1 100755
--- a/container-disc/src/main/sh/vespa-start-container-daemon.sh
+++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh
@@ -76,13 +76,10 @@ configure_memory() {
fi
jvm_heapsize=$((available * jvm_heapSizeAsPercentageOfPhysicalMemory / 100))
- if (( jvm_heapsize < 1024 )); then
- jvm_heapsize=1024
- fi
jvm_minHeapsize=${jvm_heapsize}
fi
- # Safety measure against bad of min vs max heapsize.
+ # Safety measure against bad min vs max heapsize.
if ((jvm_minHeapsize > jvm_heapsize)); then
jvm_minHeapsize=${jvm_heapsize}
echo "Misconfigured heap size, jvm_minHeapsize(${jvm_minHeapsize} is larger than jvm_heapsize(${jvm_heapsize}). It has been capped."