X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fmdsrate-create-large.sh;h=2fbdd8dcc8ebb7189f545b7818c1a853d40bca28;hb=7ab18ff6ffef4f5267e3893210a5fbc6cb46efb0;hp=fd10e028d8d7af314e626e79e21a3c8ab9205e56;hpb=39b944ec54655bb70bcb79fe8223c724f7d08dbf;p=fs%2Flustre-release.git diff --git a/lustre/tests/mdsrate-create-large.sh b/lustre/tests/mdsrate-create-large.sh index fd10e02..2fbdd8d 100644 --- a/lustre/tests/mdsrate-create-large.sh +++ b/lustre/tests/mdsrate-create-large.sh @@ -61,10 +61,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 creates 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 log "===== $0 ### 1 NODE UNLINK ###" @@ -100,10 +103,13 @@ else mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np ${NUM_CLIENTS} \ ${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 $MACHINEFILE $NUM_FILES \ + $TESTDIR_MULTI 'f%%d' --ignore + exit 1 + fi log "===== $0 ### $NUM_CLIENTS NODES UNLINK ###"