Skip to content
Snippets Groups Projects
Commit e2143027 authored by Elena Gryaznova's avatar Elena Gryaznova
Browse files

b=17661 

i=Brian
run mpi tests as MPI_USER
parent 1c6a9dc0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
lustre/tests/cfg/ncli.sh
+ 2
− 2
View file @ e2143027
...@@ -13,5 +13,5 @@ init_clients_lists ...@@ -13,5 +13,5 @@ init_clients_lists
MPIBIN=${MPIBIN:-/testsuite/tests/`arch`/bin} MPIBIN=${MPIBIN:-/testsuite/tests/`arch`/bin}
export PATH=:$PATH:$MPIBIN export PATH=:$PATH:$MPIBIN
MPIRUN=$(which mpirun) MPIRUN=$(which mpirun) || true
MPI_USER=${MPI_USER:-mpiuser}
lustre/tests/mdsrate-create-large.sh
+ 4
− 8
View file @ e2143027
...@@ -49,8 +49,7 @@ else ...@@ -49,8 +49,7 @@ else
COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --time ${TIME_PERIOD} COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --time ${TIME_PERIOD}
--dir ${TESTDIR_SINGLE} --filefmt 'f%%d'" --dir ${TESTDIR_SINGLE} --filefmt 'f%%d'"
echo "+ ${COMMAND}" echo "+ ${COMMAND}"
$MPIRUN -np 1 -machinefile ${MACHINEFILE} \ mpi_run -np 1 -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
${MPIRUN_OPTIONS} ${COMMAND} | tee ${LOG}
if [ ${PIPESTATUS[0]} != 0 ]; then if [ ${PIPESTATUS[0]} != 0 ]; then
[ -f $LOG ] && cat $LOG [ -f $LOG ] && cat $LOG
...@@ -66,8 +65,7 @@ else ...@@ -66,8 +65,7 @@ else
COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink --time ${TIME_PERIOD} COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink --time ${TIME_PERIOD}
--nfiles ${NUM_FILES} --dir ${TESTDIR_SINGLE} --filefmt 'f%%d'" --nfiles ${NUM_FILES} --dir ${TESTDIR_SINGLE} --filefmt 'f%%d'"
echo "+ ${COMMAND}" echo "+ ${COMMAND}"
$MPIRUN -np 1 -machinefile ${MACHINEFILE} \ mpi_run -np 1 -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
${MPIRUN_OPTIONS} ${COMMAND} | tee ${LOG}
if [ ${PIPESTATUS[0]} != 0 ]; then if [ ${PIPESTATUS[0]} != 0 ]; then
[ -f $LOG ] && cat $LOG [ -f $LOG ] && cat $LOG
...@@ -87,8 +85,7 @@ else ...@@ -87,8 +85,7 @@ else
COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --time ${TIME_PERIOD} COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --time ${TIME_PERIOD}
--dir ${TESTDIR_MULTI} --filefmt 'f%%d'" --dir ${TESTDIR_MULTI} --filefmt 'f%%d'"
echo "+ ${COMMAND}" echo "+ ${COMMAND}"
$MPIRUN -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} \ mpi_run -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
${MPIRUN_OPTIONS} ${COMMAND} | tee ${LOG}
if [ ${PIPESTATUS[0]} != 0 ]; then if [ ${PIPESTATUS[0]} != 0 ]; then
[ -f $LOG ] && cat $LOG [ -f $LOG ] && cat $LOG
...@@ -103,8 +100,7 @@ else ...@@ -103,8 +100,7 @@ else
COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink --time ${TIME_PERIOD} COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink --time ${TIME_PERIOD}
--nfiles ${NUM_FILES} --dir ${TESTDIR_MULTI} --filefmt 'f%%d'" --nfiles ${NUM_FILES} --dir ${TESTDIR_MULTI} --filefmt 'f%%d'"
echo "+ ${COMMAND}" echo "+ ${COMMAND}"
$MPIRUN -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} \ mpi_run -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
${MPIRUN_OPTIONS} ${COMMAND} | tee ${LOG}
if [ ${PIPESTATUS[0]} != 0 ]; then if [ ${PIPESTATUS[0]} != 0 ]; then
[ -f $LOG ] && cat $LOG [ -f $LOG ] && cat $LOG
......
lustre/tests/mdsrate-create-small.sh
+ 6
− 8
View file @ e2143027
...@@ -61,8 +61,7 @@ else ...@@ -61,8 +61,7 @@ else
COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --time ${TIME_PERIOD} COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --time ${TIME_PERIOD}
--dir ${TESTDIR_SINGLE} --filefmt 'f%%d'" --dir ${TESTDIR_SINGLE} --filefmt 'f%%d'"
echo "+ ${COMMAND}" echo "+ ${COMMAND}"
$MPIRUN -np 1 -machinefile ${MACHINEFILE} \ mpi_run -np 1 -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
${MPIRUN_OPTIONS} ${COMMAND} | tee ${LOG}
if [ ${PIPESTATUS[0]} != 0 ]; then if [ ${PIPESTATUS[0]} != 0 ]; then
[ -f $LOG ] && cat $LOG [ -f $LOG ] && cat $LOG
...@@ -81,8 +80,7 @@ else ...@@ -81,8 +80,7 @@ else
COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink --time ${TIME_PERIOD} COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink --time ${TIME_PERIOD}
--nfiles ${NUM_FILES} --dir ${TESTDIR_SINGLE} --filefmt 'f%%d'" --nfiles ${NUM_FILES} --dir ${TESTDIR_SINGLE} --filefmt 'f%%d'"
echo "+ ${COMMAND}" echo "+ ${COMMAND}"
$MPIRUN -np 1 -machinefile ${MACHINEFILE} \ mpi_run -np 1 -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
${MPIRUN_OPTIONS} ${COMMAND} | tee ${LOG}
if [ ${PIPESTATUS[0]} != 0 ]; then if [ ${PIPESTATUS[0]} != 0 ]; then
[ -f $LOG ] && cat $LOG [ -f $LOG ] && cat $LOG
...@@ -106,8 +104,8 @@ else ...@@ -106,8 +104,8 @@ else
COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --time ${TIME_PERIOD} COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --time ${TIME_PERIOD}
--dir ${TESTDIR_MULTI} --filefmt 'f%%d'" --dir ${TESTDIR_MULTI} --filefmt 'f%%d'"
echo "+ ${COMMAND}" echo "+ ${COMMAND}"
$MPIRUN -np $((${NUM_CLIENTS}*THREADS_PER_CLIENT)) -machinefile ${MACHINEFILE} \ mpi_run -np $((NUM_CLIENTS * THREADS_PER_CLIENT)) -machinefile ${MACHINEFILE} \
${MPIRUN_OPTIONS} ${COMMAND} | tee ${LOG} ${COMMAND} | tee ${LOG}
if [ ${PIPESTATUS[0]} != 0 ]; then if [ ${PIPESTATUS[0]} != 0 ]; then
[ -f $LOG ] && cat $LOG [ -f $LOG ] && cat $LOG
error "mpirun ... mdsrate ... failed, aborting" error "mpirun ... mdsrate ... failed, aborting"
...@@ -125,8 +123,8 @@ else ...@@ -125,8 +123,8 @@ else
COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink --time ${TIME_PERIOD} COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink --time ${TIME_PERIOD}
--nfiles ${NUM_FILES} --dir ${TESTDIR_MULTI} --filefmt 'f%%d'" --nfiles ${NUM_FILES} --dir ${TESTDIR_MULTI} --filefmt 'f%%d'"
echo "+ ${COMMAND}" echo "+ ${COMMAND}"
$MPIRUN -np $((${NUM_CLIENTS}*THREADS_PER_CLIENT)) -machinefile ${MACHINEFILE} \ mpi_run -np $((NUM_CLIENTS * THREADS_PER_CLIENT)) -machinefile ${MACHINEFILE} \
${MPIRUN_OPTIONS} ${COMMAND} | tee ${LOG} ${COMMAND} | tee ${LOG}
if [ ${PIPESTATUS[0]} != 0 ]; then if [ ${PIPESTATUS[0]} != 0 ]; then
[ -f $LOG ] && cat $LOG [ -f $LOG ] && cat $LOG
error "mpirun ... mdsrate ... failed, aborting" error "mpirun ... mdsrate ... failed, aborting"
......
lustre/tests/mdsrate-lookup-1dir.sh
+ 3
− 6
View file @ e2143027
...@@ -56,8 +56,7 @@ else ...@@ -56,8 +56,7 @@ else
COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --mknod --dir ${TESTDIR} COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --mknod --dir ${TESTDIR}
--nfiles ${NUM_FILES} --filefmt 'f%%d'" --nfiles ${NUM_FILES} --filefmt 'f%%d'"
echo "+" ${COMMAND} echo "+" ${COMMAND}
$MPIRUN -np ${NUM_THREADS} -machinefile ${MACHINEFILE} \ mpi_run -np ${NUM_THREADS} -machinefile ${MACHINEFILE} ${COMMAND} 2>&1
${MPIRUN_OPTIONS} ${COMMAND} 2>&1
# No lockup if error occurs on file creation, abort. # No lockup if error occurs on file creation, abort.
[ ${PIPESTATUS[0]} != 0 ] && error "mpirun ... mdsrate ... file creation failed, aborting" [ ${PIPESTATUS[0]} != 0 ] && error "mpirun ... mdsrate ... file creation failed, aborting"
...@@ -73,8 +72,7 @@ else ...@@ -73,8 +72,7 @@ else
log "===== $0 ### 1 NODE LOOKUPS ###" log "===== $0 ### 1 NODE LOOKUPS ###"
echo "Running lookups on 1 node(s)." echo "Running lookups on 1 node(s)."
echo "+" ${COMMAND} echo "+" ${COMMAND}
$MPIRUN -np 1 -machinefile ${MACHINEFILE} \ mpi_run -np 1 -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
${MPIRUN_OPTIONS} ${COMMAND} | tee ${LOG}
if [ ${PIPESTATUS[0]} != 0 ]; then if [ ${PIPESTATUS[0]} != 0 ]; then
[ -f $LOG ] && cat $LOG [ -f $LOG ] && cat $LOG
...@@ -90,8 +88,7 @@ else ...@@ -90,8 +88,7 @@ else
log "===== $0 ### ${NUM_CLIENTS} NODES LOOKUPS ###" log "===== $0 ### ${NUM_CLIENTS} NODES LOOKUPS ###"
echo "Running lookups on ${NUM_CLIENTS} node(s)." echo "Running lookups on ${NUM_CLIENTS} node(s)."
echo "+" ${COMMAND} echo "+" ${COMMAND}
$MPIRUN -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} \ mpi_run -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
${MPIRUN_OPTIONS} ${COMMAND} | tee ${LOG}
if [ ${PIPESTATUS[0]} != 0 ]; then if [ ${PIPESTATUS[0]} != 0 ]; then
[ -f $LOG ] && cat $LOG [ -f $LOG ] && cat $LOG
......
lustre/tests/mdsrate-stat-large.sh
+ 3
− 4
View file @ e2143027
...@@ -63,8 +63,7 @@ else ...@@ -63,8 +63,7 @@ else
NUM_THREADS=$NUM_CLIENTS NUM_THREADS=$NUM_CLIENTS
fi fi
$MPIRUN -np ${NUM_THREADS} -machinefile ${MACHINEFILE} \ mpi_run -np ${NUM_THREADS} -machinefile ${MACHINEFILE} ${COMMAND} 2>&1
${MPIRUN_OPTIONS} ${COMMAND} 2>&1
[ ${PIPESTATUS[0]} != 0 ] && error "mpirun ... mdsrate ... file creation failed, aborting" [ ${PIPESTATUS[0]} != 0 ] && error "mpirun ... mdsrate ... file creation failed, aborting"
fi fi
...@@ -81,7 +80,7 @@ else ...@@ -81,7 +80,7 @@ else
echo "Running stats on 1 node(s)." echo "Running stats on 1 node(s)."
echo "+" ${COMMAND} echo "+" ${COMMAND}
$MPIRUN -np 1 -machinefile ${MACHINEFILE} ${MPIRUN_OPTIONS} ${COMMAND} | tee ${LOG} mpi_run -np 1 -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
if [ ${PIPESTATUS[0]} != 0 ]; then if [ ${PIPESTATUS[0]} != 0 ]; then
[ -f $LOG ] && cat $LOG [ -f $LOG ] && cat $LOG
...@@ -99,7 +98,7 @@ else ...@@ -99,7 +98,7 @@ else
echo "+" ${COMMAND} echo "+" ${COMMAND}
NUM_THREADS=$(get_node_count ${NODES_TO_USE//,/ }) NUM_THREADS=$(get_node_count ${NODES_TO_USE//,/ })
$MPIRUN -np ${NUM_THREADS} -machinefile ${MACHINEFILE} ${MPIRUN_OPTIONS} ${COMMAND} | tee ${LOG} mpi_run -np ${NUM_THREADS} -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
if [ ${PIPESTATUS[0]} != 0 ]; then if [ ${PIPESTATUS[0]} != 0 ]; then
[ -f $LOG ] && cat $LOG [ -f $LOG ] && cat $LOG
......
lustre/tests/mdsrate-stat-small.sh
+ 3
− 4
View file @ e2143027
...@@ -63,8 +63,7 @@ else ...@@ -63,8 +63,7 @@ else
NUM_THREADS=$NUM_CLIENTS NUM_THREADS=$NUM_CLIENTS
fi fi
$MPIRUN -np ${NUM_THREADS} -machinefile ${MACHINEFILE} \ mpi_run -np ${NUM_THREADS} -machinefile ${MACHINEFILE} ${COMMAND} 2>&1
${MPIRUN_OPTIONS} ${COMMAND} 2>&1
[ ${PIPESTATUS[0]} != 0 ] && error "Error running mdsrate, aborting..." [ ${PIPESTATUS[0]} != 0 ] && error "Error running mdsrate, aborting..."
fi fi
...@@ -81,7 +80,7 @@ else ...@@ -81,7 +80,7 @@ else
echo "Running stats on 1 node(s)." echo "Running stats on 1 node(s)."
echo "+" ${COMMAND} echo "+" ${COMMAND}
$MPIRUN -np 1 -machinefile ${MACHINEFILE} ${MPIRUN_OPTIONS} ${COMMAND} | tee ${LOG} mpi_run -np 1 -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
if [ ${PIPESTATUS[0]} != 0 ]; then if [ ${PIPESTATUS[0]} != 0 ]; then
[ -f $LOG ] && cat $LOG [ -f $LOG ] && cat $LOG
...@@ -98,7 +97,7 @@ else ...@@ -98,7 +97,7 @@ else
echo "Running stats on ${NUM_CLIENTS} node(s)." echo "Running stats on ${NUM_CLIENTS} node(s)."
echo "+" ${COMMAND} echo "+" ${COMMAND}
$MPIRUN -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} ${MPIRUN_OPTIONS} ${COMMAND} | tee ${LOG} mpi_run -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
if [ ${PIPESTATUS[0]} != 0 ]; then if [ ${PIPESTATUS[0]} != 0 ]; then
[ -f $LOG ] && cat $LOG [ -f $LOG ] && cat $LOG
......
lustre/tests/test-framework.sh
+ 17
− 1
View file @ e2143027
...@@ -2095,7 +2095,7 @@ check_rate() { ...@@ -2095,7 +2095,7 @@ check_rate() {
# We need to use bc since the rate is a floating point number # We need to use bc since the rate is a floating point number
local RES=$(echo "${RATE} < ${TARGET_RATE}" | bc -l ) local RES=$(echo "${RATE} < ${TARGET_RATE}" | bc -l )
if [ ${RES} -eq 0 ]; then if [ "${RES}" = 0 ]; then
echo "Success: ${RATE} ${OP}s/sec met target rate" \ echo "Success: ${RATE} ${OP}s/sec met target rate" \
"${TARGET_RATE} ${OP}s/sec for ${NUM_CLIENTS} client(s)." "${TARGET_RATE} ${OP}s/sec for ${NUM_CLIENTS} client(s)."
return 0 return 0
...@@ -2181,3 +2181,19 @@ get_stripe_info() { ...@@ -2181,3 +2181,19 @@ get_stripe_info() {
stripe_index=`awk '/obdidx/ {start = 1; getline; print $1; exit}' $tmp_file` stripe_index=`awk '/obdidx/ {start = 1; getline; print $1; exit}' $tmp_file`
rm -f $tmp_file rm -f $tmp_file
} }
mpi_run () {
local mpirun="$MPIRUN $MPIRUN_OPTIONS"
local command="$mpirun $@"
if [ "$MPI_USER" != root -a $mpirun ]; then
echo "+ chmod 0777 $MOUNT"
chmod 0777 $MOUNT
command="su $MPI_USER sh -c \"$command \""
fi
ls -ald $MOUNT
echo "+ $command"
eval $command
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

https://git.gsi.de is provided by CIT→Linux&Web | GSI Helmholtzzentrum fuer Schwerionenforschung GmbH | Imprint (in German) | Privacy policy