X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fmdsrate-create-small.sh;h=d3d18b564d3223b31b8b6b65b2048a7fe3e54a0a;hb=764218793b300af6ae16706314392518aee55024;hp=ce4bd06bc0a71c843fce015545d90d835bc2d026;hpb=39b944ec54655bb70bcb79fe8223c724f7d08dbf;p=fs%2Flustre-release.git diff --git a/lustre/tests/mdsrate-create-small.sh b/lustre/tests/mdsrate-create-small.sh index ce4bd06..d3d18b5 100644 --- a/lustre/tests/mdsrate-create-small.sh +++ b/lustre/tests/mdsrate-create-small.sh @@ -69,10 +69,13 @@ else mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np 1 ${COMMAND} | tee ${LOG} - if [ ${PIPESTATUS[0]} != 0 ]; then - [ -f $LOG ] && sed -e "s/^/log: /" $LOG - error "mdsrate create for a single client failed, aborting" - fi + if [ ${PIPESTATUS[0]} != 0 ]; then + [ -f $LOG ] && sed -e "s/^/log: /" $LOG + error_noexit "mdsrate create on single client failed, aborting" + mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES \ + $TESTDIR_SINGLE 'f%%d' --ignore + exit 1 + fi fi if [ -n "$NOUNLINK" ]; then @@ -116,10 +119,15 @@ else mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} \ -np $((NUM_CLIENTS * THREADS_PER_CLIENT)) ${COMMAND} | tee ${LOG} - if [ ${PIPESTATUS[0]} != 0 ]; then - [ -f $LOG ] && sed -e "s/^/log: /" $LOG - error "mdsrate create on multiple nodes failed, aborting" - fi + + if [ ${PIPESTATUS[0]} != 0 ]; then + [ -f $LOG ] && sed -e "s/^/log: /" $LOG + error_noexit "mdsrate create on multiple nodes failed, aborting" + mdsrate_cleanup $((NUM_CLIENTS * THREADS_PER_CLIENT)) \ + $MACHINEFILE $NUM_FILES \ + $TESTDIR_MULTI 'f%%d' --ignore + exit 1 + fi fi if [ -n "$NOUNLINK" ]; then