diff options
author | Arnstein Ressem <aressem@verizonmedia.com> | 2021-08-18 14:33:08 +0200 |
---|---|---|
committer | Arnstein Ressem <aressem@verizonmedia.com> | 2021-08-18 14:33:08 +0200 |
commit | 6a5eda8ab6642ef223192a863fa5df37ba232ad8 (patch) | |
tree | 9d8a05a46386da6671208c0756d45eea165694c5 /vespabase/src | |
parent | b263204961c87de5c664be6cb3f90c45da119ba3 (diff) |
Fail Vespa startup if no numactl [run-systemtest].
Diffstat (limited to 'vespabase/src')
-rwxr-xr-x | vespabase/src/start-cbinaries.sh | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/vespabase/src/start-cbinaries.sh b/vespabase/src/start-cbinaries.sh index f17829aa081..6e2671089e9 100755 --- a/vespabase/src/start-cbinaries.sh +++ b/vespabase/src/start-cbinaries.sh @@ -164,17 +164,14 @@ configure_vespa_malloc () { } configure_numa_ctl () { - numactl="" - if numactl --interleave all true &> /dev/null; then - # We are allowed to use numactl - numactl="numactl --interleave all" - if [ "$VESPA_AFFINITY_CPU_SOCKET" ]; then - numcpu=`numactl --hardware 2>/dev/null | grep available | cut -d' ' -f2` - if [ "$numcpu" ] && [ "$numcpu" -gt 1 ]; then - log_debug_message "Starting $0 with affinity $VESPA_AFFINITY_CPU_SOCKET out of $numcpu" - node=$(($VESPA_AFFINITY_CPU_SOCKET % $numcpu)) - numactl="numactl --cpunodebind=$node --membind=$node" - fi + # We are allowed to use numactl + numactl="numactl --interleave all" + if [ "$VESPA_AFFINITY_CPU_SOCKET" ]; then + numcpu=`numactl --hardware 2>/dev/null | grep available | cut -d' ' -f2` + if [ "$numcpu" ] && [ "$numcpu" -gt 1 ]; then + log_debug_message "Starting $0 with affinity $VESPA_AFFINITY_CPU_SOCKET out of $numcpu" + node=$(($VESPA_AFFINITY_CPU_SOCKET % $numcpu)) + numactl="numactl --cpunodebind=$node --membind=$node" fi fi } |