Skip to content

Commit dd89cae

Browse files
committed
Avoiding numactl execution to avoid crashes of FST in container env without accesibility to numactl
1 parent 0a58abe commit dd89cae

1 file changed

Lines changed: 11 additions & 2 deletions

File tree

prodtests/full-system-test/start_tmux.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,17 @@ else
147147
: ${CALIB_TASKS:=""}
148148
fi
149149

150+
if command -v numactl >/dev/null 2>&1; then
151+
NUMACTL_CMD="numactl --interleave=all"
152+
else
153+
NUMACTL_CMD=""
154+
fi
155+
150156
if [ "0$FST_TMUX_BATCH_MODE" == "01" ]; then
151157
{ sleep $FST_SLEEP0; eval "NUMAID=0 $GEN_TOPO_MYDIR/dpl-workflow.sh ${LOGCMD/\[REPLACE]/0}"; eval "$ENDCMD"; } &
152158
{ sleep $FST_SLEEP1; eval "NUMAID=1 $GEN_TOPO_MYDIR/dpl-workflow.sh ${LOGCMD/\[REPLACE]/1}"; eval "$ENDCMD"; } &
153-
{ sleep $FST_SLEEP2; eval "SEVERITY=debug numactl --interleave=all $GEN_TOPO_MYDIR/$CMD ${LOGCMD/\[REPLACE]/2}"; eval "$KILLCMD $ENDCMD"; } &
159+
{ sleep $FST_SLEEP2; eval "SEVERITY=debug $NUMACTL_CMD $GEN_TOPO_MYDIR/$CMD ${LOGCMD/\[REPLACE]/2}"; eval "$KILLCMD $ENDCMD"; } &
160+
154161
for i in $CALIB_TASKS; do
155162
{ eval "AGGREGATOR_TASKS=$i $CALIB_COMMAND ${LOGCMD/\[REPLACE]/3_${i}}"; eval "$ENDCMD"; } &
156163
done
@@ -162,7 +169,9 @@ else
162169
for i in `seq 1 $(($NUM_DPL_WORKFLOWS - 1))`; do
163170
TMUX_COMMAND+=" $TMUX_SPLIT_COMMAND \"sleep $FST_SLEEP1; NUMAID=$i $GEN_TOPO_MYDIR/dpl-workflow.sh ${LOGCMD/\[REPLACE]/1}; $ENDCMD\" ';'"
164171
done
165-
TMUX_COMMAND+=" $TMUX_SPLIT_COMMAND \"sleep $FST_SLEEP2; SEVERITY=debug numactl --interleave=all $GEN_TOPO_MYDIR/$CMD; $KILLCMD $ENDCMD\" ';'"
172+
173+
TMUX_COMMAND+=" $TMUX_SPLIT_COMMAND \"sleep $FST_SLEEP2; SEVERITY=debug $NUMACTL_CMD $GEN_TOPO_MYDIR/$CMD; $KILLCMD $ENDCMD\" ';'"
174+
166175
FIRST_CALIB=1
167176
for i in $CALIB_TASKS; do
168177
TMUX_COMMAND+=" $TMUX_SPLIT_COMMAND \"AGGREGATOR_TASKS=$i $CALIB_COMMAND ${LOGCMD/\[REPLACE]/3_${i}}; $ENDCMD\" ';'"

0 commit comments

Comments
 (0)