X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Frun_dd.sh;h=36af6ae888bf1e774181a07222ee69a988b98b68;hb=fbdd08b958f974dd4d40a518ea3db8279428f013;hp=0f2a1f9de5e91f4e8eda81c2f57cd40bcf5ee701;hpb=285389479125decaefa3d64a8460a7bfe0a7c889;p=fs%2Flustre-release.git diff --git a/lustre/tests/run_dd.sh b/lustre/tests/run_dd.sh index 0f2a1f9..36af6ae 100755 --- a/lustre/tests/run_dd.sh +++ b/lustre/tests/run_dd.sh @@ -1,9 +1,11 @@ #!/bin/bash -set -x TMP=${TMP:-/tmp} TESTLOG_PREFIX=${TESTLOG_PREFIX:-$TMP/recovery-mds-scale} +TESTNAME=${TESTNAME:-""} +[ -n "$TESTNAME" ] && TESTLOG_PREFIX=$TESTLOG_PREFIX.$TESTNAME + LOG=$TESTLOG_PREFIX.$(basename $0 .sh)_stdout.$(hostname -s).log DEBUGLOG=$(echo $LOG | sed 's/\(.*\)stdout/\1debug/') @@ -11,6 +13,7 @@ mkdir -p ${LOG%/*} rm -f $LOG $DEBUGLOG exec 2>$DEBUGLOG +set -x . $(dirname $0)/functions.sh @@ -35,19 +38,19 @@ while [ ! -e "$END_RUN_FILE" ] && $CONTINUE; do wait $load_pid if [ $? -eq 0 ]; then - echoerr "$(date +'%F %H:%M:%S'): dd succeeded" - cd $TMP - rm -rf $TESTDIR - echoerr "$(date +'%F %H:%M:%S'): dd run finished" + echoerr "$(date +'%F %H:%M:%S'): dd succeeded" + cd $TMP + rm -rf $TESTDIR + echoerr "$(date +'%F %H:%M:%S'): dd run finished" else - echoerr "$(date +'%F %H:%M:%S'): dd failed" - if [ -z "$ERRORS_OK" ]; then - echo $(hostname) >> $END_RUN_FILE - fi - if [ $BREAK_ON_ERROR ]; then - # break + echoerr "$(date +'%F %H:%M:%S'): dd failed" + if [ -z "$ERRORS_OK" ]; then + echo $(hostname) >> $END_RUN_FILE + fi + if [ $BREAK_ON_ERROR ]; then + # break CONTINUE=false - fi + fi fi done