LU-1233 tests: clean up files in performance-sanity test

This patch cleans up the files created in performance-sanity.sh
through mdsrate-{create,lookup,stat}-*.sh after create/lookup/stat
operation fails.

Test-Parameters: envdefinitions=SLOW=yes,ENABLE_QUOTA=yes \
testlist=performance-sanity

Signed-off-by: Jian Yu <jian.yu@intel.com>
Change-Id: I6d51b847fcc9c514c4eab72cd8d422527bdbbc71
Reviewed-on: http://review.whamcloud.com/8289
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Bobi Jam <bobijam@gmail.com>
Reviewed-by: Emoly Liu <emoly.liu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/tests/mdsrate-create-large.sh b/lustre/tests/mdsrate-create-large.sh
index 5b7414a..2612bdf 100644 (file)
--- a/lustre/tests/mdsrate-create-large.sh
+++ b/lustre/tests/mdsrate-create-large.sh
@@ -61,10 +61,13 @@ else
        mpi_run -np 1 ${MACHINEFILE_OPTION} ${MACHINEFILE} ${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 -np ${NUM_CLIENTS} ${MACHINEFILE_OPTION} ${MACHINEFILE} \
                ${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 ###"
 

diff --git a/lustre/tests/mdsrate-create-small.sh b/lustre/tests/mdsrate-create-small.sh
index dcb8d56..3802585 100644 (file)
--- a/lustre/tests/mdsrate-create-small.sh
+++ b/lustre/tests/mdsrate-create-small.sh
@@ -69,10 +69,13 @@ else
        mpi_run -np 1 ${MACHINEFILE_OPTION} ${MACHINEFILE} ${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
@@ -115,10 +118,15 @@ else
        echo "+ ${COMMAND}"
        mpi_run -np $((NUM_CLIENTS * THREADS_PER_CLIENT)) \
                ${MACHINEFILE_OPTION} ${MACHINEFILE} ${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

diff --git a/lustre/tests/mdsrate-lookup-10dirs.sh b/lustre/tests/mdsrate-lookup-10dirs.sh
index 6dd5b11..0b7febd 100644 (file)
--- a/lustre/tests/mdsrate-lookup-10dirs.sh
+++ b/lustre/tests/mdsrate-lookup-10dirs.sh
@@ -52,13 +52,22 @@ generate_machine_file $NODES_TO_USE $MACHINEFILE || error "can not generate mach
 
 DIRfmt="${BASEDIR}/lookup-%d"
 
+#
+# Unlink the files created in the directories under $BASEDIR.
+# FIXME: does it make sense to add the possibility to unlink dirfmt to mdsrate?
+#
+mdsrate_cleanup_all() {
+       local i
+       for i in $(seq 0 $NUM_DIRS); do
+               mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES \
+                               $BASEDIR/lookup-$i 'f%%d' --ignore
+       done
+}
+
 if [ -n "$NOCREATE" ]; then
     echo "NOCREATE=$NOCREATE  => no file creation."
 else
-    # FIXME: does it make sense to add the possibility to unlink dirfmt to mdsrate?
-    for i in $(seq 0 $NUM_DIRS); do
-        mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $BASEDIR/lookup-$i 'f%%d' --ignore
-    done
+       mdsrate_cleanup_all
 
     log "===== $0 Test preparation: creating ${NUM_DIRS} dirs with ${NUM_FILES} files."
 
@@ -74,8 +83,12 @@ else
        mpi_run -np ${NUM_DIRS} ${MACHINEFILE_OPTION} ${MACHINEFILE} \
                ${COMMAND} 2>&1
 
-    # No lookup if error occurs on file creation, abort.
-    [ ${PIPESTATUS[0]} != 0 ] && error "mdsrate file creation failed, aborting"
+       # No lookup if error occurs on file creation, abort.
+       if [ ${PIPESTATUS[0]} != 0 ]; then
+               error_noexit "mdsrate file creation failed, aborting"
+               mdsrate_cleanup_all
+               exit 1
+       fi
 fi
 
 COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --lookup --time ${TIME_PERIOD} ${SEED_OPTION}
@@ -91,10 +104,12 @@ else
        mpi_run -np 1 ${MACHINEFILE_OPTION} ${MACHINEFILE} ${COMMAND} |
                tee ${LOG}
 
-    if [ ${PIPESTATUS[0]} != 0 ]; then
-        [ -f $LOG ] && sed -e "s/^/log: /" $LOG
-        error "mdsrate lookups on a single client failed, aborting"
-    fi
+       if [ ${PIPESTATUS[0]} != 0 ]; then
+               [ -f $LOG ] && sed -e "s/^/log: /" $LOG
+               error_noexit "mdsrate lookup on single client failed, aborting"
+               mdsrate_cleanup_all
+               exit 1
+       fi
 fi
 
 # 2
@@ -107,19 +122,16 @@ else
        mpi_run -np ${NUM_CLIENTS} ${MACHINEFILE_OPTION} ${MACHINEFILE} \
                ${COMMAND} | tee ${LOG}
 
-    if [ ${PIPESTATUS[0]} != 0 ]; then
-        [ -f $LOG ] && sed -e "s/^/log: /" $LOG
-        error "mdsrate lookups on multiple nodes failed, aborting"
-    fi
+       if [ ${PIPESTATUS[0]} != 0 ]; then
+               [ -f $LOG ] && sed -e "s/^/log: /" $LOG
+               error_noexit "mdsrate lookup on multiple nodes failed, aborting"
+               mdsrate_cleanup_all
+               exit 1
+       fi
 fi
 
 complete $SECONDS
-# FIXME: does it make sense to add the possibility to unlink dirfmt to mdsrate?
-for i in $(seq 0 $NUM_DIRS); do
-       mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES \
-               $BASEDIR/lookup-$i 'f%%d' --ignore
-done
-
+mdsrate_cleanup_all
 rmdir $BASEDIR || true
 rm -f $MACHINEFILE
 check_and_cleanup_lustre

diff --git a/lustre/tests/mdsrate-lookup-1dir.sh b/lustre/tests/mdsrate-lookup-1dir.sh
index ac25e72..7ce9c06 100644 (file)
--- a/lustre/tests/mdsrate-lookup-1dir.sh
+++ b/lustre/tests/mdsrate-lookup-1dir.sh
@@ -67,8 +67,13 @@ else
        mpi_run -np ${NUM_THREADS} ${MACHINEFILE_OPTION} ${MACHINEFILE} \
                ${COMMAND} 2>&1
 
-    # No lockup if error occurs on file creation, abort.
-    [ ${PIPESTATUS[0]} != 0 ] && error "mdsrate file creation failed, aborting"
+       # No lockup if error occurs on file creation, abort.
+       if [ ${PIPESTATUS[0]} != 0 ]; then
+               error_noexit "mdsrate file creation failed, aborting"
+               mdsrate_cleanup $NUM_THREADS $MACHINEFILE $NUM_FILES \
+                               $TESTDIR 'f%%d' --ignore
+               exit 1
+       fi
 fi
 
 COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --lookup --time ${TIME_PERIOD} ${SEED_OPTION}
@@ -83,10 +88,13 @@ else
        mpi_run -np 1 ${MACHINEFILE_OPTION} ${MACHINEFILE} ${COMMAND} |
                tee ${LOG}
 
-    if [ ${PIPESTATUS[0]} != 0 ]; then
-        [ -f $LOG ] && sed -e "s/^/log: /" $LOG
-        error "mdsrate lookups on a single client failed, aborting"
-    fi
+       if [ ${PIPESTATUS[0]} != 0 ]; then
+               [ -f $LOG ] && sed -e "s/^/log: /" $LOG
+               error_noexit "mdsrate lookup on single client failed, aborting"
+               mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES \
+                               $TESTDIR 'f%%d' --ignore
+               exit 1
+       fi
 fi
 
 # 2
@@ -99,10 +107,13 @@ else
        mpi_run -np ${NUM_CLIENTS} ${MACHINEFILE_OPTION} ${MACHINEFILE} \
                ${COMMAND} | tee ${LOG}
 
-    if [ ${PIPESTATUS[0]} != 0 ]; then
-        [ -f $LOG ] && sed -e "s/^/log: /" $LOG
-        error "mdsrate lookups on multiple nodes failed, aborting"
-    fi
+       if [ ${PIPESTATUS[0]} != 0 ]; then
+               [ -f $LOG ] && sed -e "s/^/log: /" $LOG
+               error_noexit "mdsrate lookup on multiple nodes failed, aborting"
+               mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES \
+                               $TESTDIR 'f%%d' --ignore
+               exit 1
+       fi
 fi
 
 complete $SECONDS

diff --git a/lustre/tests/mdsrate-stat-large.sh b/lustre/tests/mdsrate-stat-large.sh
index 19c4375..d4996d3 100644 (file)
--- a/lustre/tests/mdsrate-stat-large.sh
+++ b/lustre/tests/mdsrate-stat-large.sh
@@ -70,8 +70,13 @@ else
 
        mpi_run -np ${NUM_THREADS} ${MACHINEFILE_OPTION} ${MACHINEFILE} \
                ${COMMAND} 2>&1
-       [ ${PIPESTATUS[0]} != 0 ] &&
-               error "mdsrate file creation failed, aborting"
+
+       if [ ${PIPESTATUS[0]} != 0 ]; then
+               error_noexit "mdsrate file creation failed, aborting"
+               mdsrate_cleanup $NUM_THREADS $MACHINEFILE $NUM_FILES \
+                               $TESTDIR 'f%%d' --ignore
+               exit 1
+       fi
 fi
 
 COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --stat --time ${TIME_PERIOD}
@@ -87,10 +92,13 @@ else
        mpi_run -np 1 ${MACHINEFILE_OPTION} ${MACHINEFILE} ${COMMAND} |
                tee ${LOG}
 
-    if [ ${PIPESTATUS[0]} != 0 ]; then
-        [ -f $LOG ] && sed -e "s/^/log: /" $LOG
-        error "mdsrate stats on a single client failed, aborting"
-    fi
+       if [ ${PIPESTATUS[0]} != 0 ]; then
+               [ -f $LOG ] && sed -e "s/^/log: /" $LOG
+               error_noexit "mdsrate stat on single client failed, aborting"
+               mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES \
+                               $TESTDIR 'f%%d' --ignore
+               exit 1
+       fi
 fi
 
 # 2
@@ -104,10 +112,13 @@ else
        mpi_run -np ${NUM_CLIENTS} ${MACHINEFILE_OPTION} ${MACHINEFILE} \
                ${COMMAND} | tee ${LOG}
 
-    if [ ${PIPESTATUS[0]} != 0 ]; then
-        [ -f $LOG ] && sed -e "s/^/log: /" $LOG
-        error "mdsrate stats on multiple nodes failed, aborting"
-    fi
+       if [ ${PIPESTATUS[0]} != 0 ]; then
+               [ -f $LOG ] && sed -e "s/^/log: /" $LOG
+               error_noexit "mdsrate stat on multiple nodes failed, aborting"
+               mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES \
+                               $TESTDIR 'f%%d' --ignore
+               exit 1
+       fi
 fi
 
 

diff --git a/lustre/tests/mdsrate-stat-small.sh b/lustre/tests/mdsrate-stat-small.sh
index 0d75135..b15d719 100644 (file)
--- a/lustre/tests/mdsrate-stat-small.sh
+++ b/lustre/tests/mdsrate-stat-small.sh
@@ -70,9 +70,13 @@ else
 
        mpi_run -np ${NUM_THREADS} ${MACHINEFILE_OPTION} ${MACHINEFILE} \
                ${COMMAND} 2>&1
-       [ ${PIPESTATUS[0]} != 0 ] &&
-               error "mdsrate file creation failed, aborting"
 
+       if [ ${PIPESTATUS[0]} != 0 ]; then
+               error_noexit "mdsrate file creation failed, aborting"
+               mdsrate_cleanup $NUM_THREADS $MACHINEFILE $NUM_FILES \
+                               $TESTDIR 'f%%d' --ignore
+               exit 1
+       fi
 fi
 
 COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --stat --time ${TIME_PERIOD}
@@ -88,10 +92,13 @@ else
        mpi_run -np 1 ${MACHINEFILE_OPTION} ${MACHINEFILE} ${COMMAND} |
                tee ${LOG}
 
-    if [ ${PIPESTATUS[0]} != 0 ]; then
-        [ -f $LOG ] && sed -e "s/^/log: /" $LOG
-        error "mdsrate on a single client failed, aborting"
-    fi
+       if [ ${PIPESTATUS[0]} != 0 ]; then
+               [ -f $LOG ] && sed -e "s/^/log: /" $LOG
+               error_noexit "mdsrate stat on single client failed, aborting"
+               mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES \
+                               $TESTDIR 'f%%d' --ignore
+               exit 1
+       fi
 fi
 
 # 2
@@ -105,10 +112,13 @@ else
        mpi_run -np ${NUM_CLIENTS} ${MACHINEFILE_OPTION} ${MACHINEFILE} \
                ${COMMAND} | tee ${LOG}
 
-    if [ ${PIPESTATUS[0]} != 0 ]; then
-        [ -f $LOG ] && sed -e "s/^/log: /" $LOG
-        error "mdsrate stats on multiple nodes failed, aborting"
-    fi
+       if [ ${PIPESTATUS[0]} != 0 ]; then
+               [ -f $LOG ] && sed -e "s/^/log: /" $LOG
+               error_noexit "mdsrate stat on multiple nodes failed, aborting"
+               mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES \
+                               $TESTDIR 'f%%d' --ignore
+               exit 1
+       fi
 fi
 
 complete $SECONDS