diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2020-02-20 14:46:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-20 14:46:34 +0100 |
| commit | 80aae454e3425e970fc95b8de2f91f4d9a673496 (patch) | |
| tree | 861b20ebab4424a0b19158ef1ba58beb78d3d1ac /container-disc | |
| parent | 8b5de98db88a3e463fad6273c9622573c19d6fc6 (diff) | |
Revert "Control -XX:CompressedClassSpaceSize jvm option."
Diffstat (limited to 'container-disc')
| -rwxr-xr-x | container-disc/src/main/sh/vespa-start-container-daemon.sh | 11 |
1 files changed, 3 insertions, 8 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 f097d6d72bc..382843b5688 100755 --- a/container-disc/src/main/sh/vespa-start-container-daemon.sh +++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh @@ -64,7 +64,6 @@ configure_memory() { consider_fallback jvm_heapsize 1536 consider_fallback jvm_stacksize 512 consider_fallback jvm_baseMaxDirectMemorySize 75 - consider_fallback jvm_compressedClassSpaceSize 32 consider_fallback jvm_directMemorySizeCache 0 # Update jvm_heapsize only if percentage is explicitly set (default is 0). @@ -81,20 +80,16 @@ configure_memory() { fi # Safety measure against bad min vs max heapsize. - if ((jvm_minHeapsize > jvm_heapsize)); then + 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." - fi + fi maxDirectMemorySize=$(( jvm_baseMaxDirectMemorySize + jvm_heapsize / 8 + jvm_directMemorySizeCache )) 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" - - if ((jvm_compressedClassSpaceSize != 0)); then - memory_options="${memory_options} -XX:CompressedClassSpaceSize=${compressedClassSpaceSize}m" - fi + memory_options="${memory_options} -XX:MaxDirectMemorySize=${maxDirectMemorySize}m" if [ "${VESPA_USE_HUGEPAGES}" ]; then memory_options="${memory_options} -XX:+UseLargePages" |