Merge pull request #21003 from vespa-engine/balder/disable-vespamalloc-for-small-utilities

Balder/disable vespamalloc for small utilities

3 files changed, 12 insertions, 11 deletions

diff --git a/vespabase/conf/default-env.txt.in b/vespabase/conf/default-env.txt.in
index 56926e32186..a25d31a8a17 100644
--- a/vespabase/conf/default-env.txt.in
+++ b/vespabase/conf/default-env.txt.in
@@ -2,3 +2,4 @@
 fallback VESPA_HOME @CMAKE_INSTALL_PREFIX@
 override VESPA_USER @VESPA_USER@
 override VESPA_UNPRIVILEGED @VESPA_UNPRIVILEGED@
+fallback NO_VESPAMALLOC_LIST "vespa-rpc-invoke vespa-get-config vespa-sentinel-cmd vespa-route vespa-proton-cmd vespa-configproxy-cmd vespa-config-status"
diff --git a/vespabase/src/common-env.sh b/vespabase/src/common-env.sh
index d2677e58a00..9eb968ea9a6 100755
--- a/vespabase/src/common-env.sh
+++ b/vespabase/src/common-env.sh
@@ -148,15 +148,15 @@ consider_fallback VESPA_VALGRIND_OPT "--num-callers=32 \
 --show-reachable=yes \
 ${VESPA_VALGRIND_SUPPREESSIONS_OPT}"
 
-consider_fallback VESPA_USE_HUGEPAGES_LIST  $(get_var "hugepages_list")
+consider_fallback VESPA_USE_HUGEPAGES_LIST  "$(get_var "hugepages_list")"
 consider_fallback VESPA_USE_HUGEPAGES_LIST  "all"
 
-consider_fallback VESPA_USE_MADVISE_LIST    $(get_var "madvise_list")
+consider_fallback VESPA_USE_MADVISE_LIST    "$(get_var "madvise_list")"
 
-consider_fallback VESPA_USE_VESPAMALLOC     $(get_var "vespamalloc_list")
-consider_fallback VESPA_USE_VESPAMALLOC_D   $(get_var "vespamallocd_list")
-consider_fallback VESPA_USE_VESPAMALLOC_DST $(get_var "vespamallocdst_list")
-consider_fallback VESPA_USE_NO_VESPAMALLOC  $(get_var "no_vespamalloc_list")
+consider_fallback VESPA_USE_VESPAMALLOC     "$(get_var "vespamalloc_list")"
+consider_fallback VESPA_USE_VESPAMALLOC_D   "$(get_var "vespamallocd_list")"
+consider_fallback VESPA_USE_VESPAMALLOC_DST "$(get_var "vespamallocdst_list")"
+consider_fallback VESPA_USE_NO_VESPAMALLOC  "$(get_var "no_vespamalloc_list")"
 
 # TODO:
 # if [ "$VESPA_USE_HUGEPAGES_LIST" = "all" ]; then
diff --git a/vespabase/src/start-cbinaries.sh b/vespabase/src/start-cbinaries.sh
index 52c4c5a0de8..2f0a923b074 100755
--- a/vespabase/src/start-cbinaries.sh
+++ b/vespabase/src/start-cbinaries.sh
@@ -97,7 +97,7 @@ check_bname_in_value () {
 configure_valgrind () {
     no_valgrind=true
     if which valgrind >/dev/null 2>&1; then
-        if check_bname_in_value $VESPA_USE_VALGRIND; then
+        if check_bname_in_value "$VESPA_USE_VALGRIND"; then
             no_valgrind=false
             valgrind_log=$VESPA_HOME/tmp/valgrind.$bname.log.$$
             case $VESPA_VALGRIND_OPT in
@@ -108,7 +108,7 @@ configure_valgrind () {
 }
 
 configure_huge_pages () {
-    if check_bname_in_value $VESPA_USE_HUGEPAGES_LIST; then
+    if check_bname_in_value "$VESPA_USE_HUGEPAGES_LIST"; then
         log_debug_message "Want huge pages for '$bname' since VESPA_USE_HUGEPAGES_LIST=${VESPA_USE_HUGEPAGES_LIST}"
         export VESPA_USE_HUGEPAGES="yes"
     fi
@@ -134,15 +134,15 @@ configure_use_madvise () {
 }
 
 configure_vespa_malloc () {
-    if check_bname_in_value $VESPA_USE_NO_VESPAMALLOC; then
+    if check_bname_in_value "$VESPA_USE_NO_VESPAMALLOC"; then
         # log_debug_message "Not using vespamalloc for '$bname' since VESPA_USE_NO_VESPAMALLOC=${VESPA_USE_NO_VESPAMALLOC}"
         return
     fi
     suf=vespa/malloc/libvespamalloc.so
-    if check_bname_in_value $VESPA_USE_VESPAMALLOC_D; then
+    if check_bname_in_value "$VESPA_USE_VESPAMALLOC_D"; then
         suf=vespa/malloc/libvespamallocd.so
     fi
-    if check_bname_in_value $VESPA_USE_VESPAMALLOC_DST; then
+    if check_bname_in_value "$VESPA_USE_VESPAMALLOC_DST"; then
         suf=vespa/malloc/libvespamallocdst16.so
     fi