Add minheapsize as a controllable entity. Control it explicit and avoid using append of jvmargs which is intended for user specified overrides.

1 files changed, 3 insertions, 1 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 c7406f1f166..c850db776a7 100755
--- a/container-disc/src/main/sh/vespa-start-container-daemon.sh
+++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh
@@ -60,6 +60,7 @@ getconfig() {
 }
 
 configure_memory() {
+    consider_fallback jvm_minheapsize 1536
     consider_fallback jvm_heapsize 1536
     consider_fallback jvm_stacksize 512
     consider_fallback jvm_baseMaxDirectMemorySize 75
@@ -78,11 +79,12 @@ configure_memory() {
         if (( jvm_heapsize < 1024 )); then
             jvm_heapsize=1024
         fi
+        jvm_minheapsize=${jvm_heapsize}
     fi
 
     maxDirectMemorySize=$(( jvm_baseMaxDirectMemorySize + jvm_heapsize / 8 + jvm_directMemorySizeCache ))
 
-    memory_options="-Xms${jvm_heapsize}m -Xmx${jvm_heapsize}m"
+    memory_options="-Xms${jvm_minheapsize}m -Xmx${jvm_heapsize}m"
     memory_options="${memory_options} -XX:ThreadStackSize=${jvm_stacksize}"
     memory_options="${memory_options} -XX:MaxDirectMemorySize=${maxDirectMemorySize}m"