diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2021-08-23 09:23:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-23 09:23:21 +0200 |
| commit | 0ea783747646f0433480983f2e084632e0eb421c (patch) | |
| tree | 9d5c481d38c1b13670afe683382a58ef40cd7962 /container-disc/src | |
| parent | 44bdbb1067d3fa0a699d8ccf63369e3fa199f76a (diff) | |
Revert "Revert "Reapply "Fail Vespa startup if no numactl ."""
Diffstat (limited to 'container-disc/src')
| -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() { |