diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-02-01 12:32:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-01 12:32:08 +0100 |
| commit | c2dc7f1e3f9371cc8b04246ca346b1c5f7f2fd3f (patch) | |
| tree | 87dcc15d77c572c2ac37c1eff75965f2975c30cc | |
| parent | a3ac1da80933462fcb332839074efbddaf661023 (diff) | |
| parent | b65b71a28a220eb31f49267befc3ed220be30ccb (diff) | |
Merge pull request #21004 from vespa-engine/arnej/cleanup-vespamalloc-fallbacks
Arnej/cleanup vespamalloc fallbacks
| -rw-r--r-- | vespabase/conf/default-env.txt.in | 1 | ||||
| -rwxr-xr-x | vespabase/src/common-env.sh | 13 |
2 files changed, 7 insertions, 7 deletions
diff --git a/vespabase/conf/default-env.txt.in b/vespabase/conf/default-env.txt.in index a25d31a8a17..56926e32186 100644 --- a/vespabase/conf/default-env.txt.in +++ b/vespabase/conf/default-env.txt.in @@ -2,4 +2,3 @@ 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 9eb968ea9a6..7e1fbf5d06a 100755 --- a/vespabase/src/common-env.sh +++ b/vespabase/src/common-env.sh @@ -148,15 +148,16 @@ 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)" +consider_fallback VESPA_USE_NO_VESPAMALLOC "vespa-rpc-invoke vespa-get-config vespa-sentinel-cmd vespa-route vespa-proton-cmd vespa-configproxy-cmd vespa-config-status" # TODO: # if [ "$VESPA_USE_HUGEPAGES_LIST" = "all" ]; then |