From 7719a26a96f2ca0d51519235fd778a05607da8d6 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 16 Mar 2021 18:53:41 -0400 Subject: [PATCH 1/2] Change ES Heap calculation --- setup/so-functions | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 6a0874756..f53b696b1 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1201,8 +1201,13 @@ es_heapsize() { # https://www.elastic.co/guide/en/elasticsearch/guide/current/heap-sizing.html ES_HEAP_SIZE="25000m" else - # Set heap size to 25% of available memory - ES_HEAP_SIZE=$(( total_mem / 4 ))"m" + # Set heap size to 33% of available memory + ES_HEAP_SIZE=$(( total_mem / 3 ))"m" + if [ "$ES_HEAP_SIZE" -ge 25001 ] ; then + ES_HEAP_SIZE="25000m" + else + ES_HEAP_SIZE=$ES_HEAP_SIZE + fi fi export ES_HEAP_SIZE From 137e1a699d08bd36653b4bd379438b7f7ce7610c Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Tue, 16 Mar 2021 19:01:10 -0400 Subject: [PATCH 2/2] Fix the math --- setup/so-functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index f53b696b1..06f845737 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1202,11 +1202,11 @@ es_heapsize() { ES_HEAP_SIZE="25000m" else # Set heap size to 33% of available memory - ES_HEAP_SIZE=$(( total_mem / 3 ))"m" + ES_HEAP_SIZE=$(( total_mem / 3 )) if [ "$ES_HEAP_SIZE" -ge 25001 ] ; then ES_HEAP_SIZE="25000m" else - ES_HEAP_SIZE=$ES_HEAP_SIZE + ES_HEAP_SIZE=$ES_HEAP_SIZE"m" fi fi export ES_HEAP_SIZE