diff options
author | Arnstein Ressem <aressem@gmail.com> | 2021-08-20 11:06:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-20 11:06:21 +0200 |
commit | 07ea15de3724cbe48a8a0a3e90bf61538d81adae (patch) | |
tree | 2b356fccc15cf060cbbf24f567ba8a85b9cdfe42 /vespabase/src/start-cbinaries.sh | |
parent | a8054db6cdf4ea764c5a333c5448a53f82a499f3 (diff) |
Revert "Revert "Fail Vespa startup if no numactl .""
Diffstat (limited to 'vespabase/src/start-cbinaries.sh')
-rwxr-xr-x | vespabase/src/start-cbinaries.sh | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/vespabase/src/start-cbinaries.sh b/vespabase/src/start-cbinaries.sh index f17829aa081..ac841793f75 100755 --- a/vespabase/src/start-cbinaries.sh +++ b/vespabase/src/start-cbinaries.sh @@ -163,28 +163,13 @@ configure_vespa_malloc () { fi } -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 - fi - fi -} - configure_valgrind configure_huge_pages configure_use_madvise configure_vespa_malloc if $no_valgrind ; then + numactl=$(get_numa_ctl_cmd) configure_numa_ctl ulimit -c unlimited log_debug_message "Starting $0 with : " \ |