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 /container-disc/src/main/sh | |
parent | a8054db6cdf4ea764c5a333c5448a53f82a499f3 (diff) |
Revert "Revert "Fail Vespa startup if no numactl .""
Diffstat (limited to 'container-disc/src/main/sh')
-rwxr-xr-x | container-disc/src/main/sh/vespa-start-container-daemon.sh | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/container-disc/src/main/sh/vespa-start-container-daemon.sh b/container-disc/src/main/sh/vespa-start-container-daemon.sh index 223124c29d6..a0cbd9d9186 100755 --- a/container-disc/src/main/sh/vespa-start-container-daemon.sh +++ b/container-disc/src/main/sh/vespa-start-container-daemon.sh @@ -110,27 +110,8 @@ configure_cpu() { } configure_numactl() { - log_message debug "starting ${VESPA_SERVICE_NAME} for ${VESPA_CONFIG_ID}" - if numactl --interleave all true &> /dev/null; then - # We are allowed to use numactl - numnodes=$(numactl --hardware | - grep available | - awk '$3 == "nodes" { print $2 }') - if [ "$VESPA_AFFINITY_CPU_SOCKET" ] && - [ "$numnodes" -gt 1 ] - then - node=$(($VESPA_AFFINITY_CPU_SOCKET % $numnodes)) - log_message debug "with affinity to $VESPA_AFFINITY_CPU_SOCKET out of $numnodes cpu sockets" - numactlcmd="numactl --cpunodebind=$node --membind=$node" - else - log_message debug "with memory interleaving on all nodes" - numactlcmd="numactl --interleave all" - fi - else - log_message debug "without numactl (no permission or not available)" - numactlcmd="" - fi - log_message debug "numactlcmd: $numactlcmd" + numactlcmd=$(get_numa_ctl_cmd) + log_message debug "starting ${VESPA_SERVICE_NAME} for ${VESPA_CONFIG_ID} with numactl command : $numactlcmd" } configure_gcopts() { |