X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fmdsrate-create-large.sh;h=2fbdd8dcc8ebb7189f545b7818c1a853d40bca28;hb=7ab18ff6ffef4f5267e3893210a5fbc6cb46efb0;hp=b45dae1baa57794837e62b9d6589461cd6527d76;hpb=daec2a459dccb51c843731fa9a0bc205fe4be154;p=fs%2Flustre-release.git

diff --git a/lustre/tests/mdsrate-create-large.sh b/lustre/tests/mdsrate-create-large.sh
index b45dae1..2fbdd8d 100644
--- a/lustre/tests/mdsrate-create-large.sh
+++ b/lustre/tests/mdsrate-create-large.sh
@@ -10,16 +10,16 @@ init_test_env $@
 assert_env CLIENTS MDSRATE SINGLECLIENT MPIRUN
 
 MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines}
-TESTDIR=$MOUNT
+BASEDIR=$MOUNT/mdsrate
 
 # Requirements
-# set NUM_FILES=0 to force TIME_PERIOD work  
+# set NUM_FILES=0 to force TIME_PERIOD work
 NUM_FILES=${NUM_FILES:-1000000}
 TIME_PERIOD=${TIME_PERIOD:-600}                        # seconds
 
 # Local test variables
-TESTDIR_SINGLE="${TESTDIR}/single"
-TESTDIR_MULTI="${TESTDIR}/multi"
+TESTDIR_SINGLE="${BASEDIR}/single"
+TESTDIR_MULTI="${BASEDIR}/multi"
 
 LOG=${TESTSUITELOG:-$TMP/$(basename $0 .sh).log}
 CLIENT=$SINGLECLIENT
@@ -28,90 +28,106 @@ NUM_CLIENTS=$(get_node_count ${NODES_TO_USE//,/ })
 
 [ ! -x ${MDSRATE} ] && error "${MDSRATE} not built."
 
-log "===== $0 ====== " 
+log "===== $0 ====== "
 
 check_and_setup_lustre
 
-IFree=$(inodes_available)
+mkdir -p $BASEDIR
+chmod 0777 $BASEDIR
+$LFS setstripe $BASEDIR -c -1
+get_stripe $BASEDIR
+
+IFree=$(mdsrate_inodes_available)
 if [ $IFree -lt $NUM_FILES ]; then
     NUM_FILES=$IFree
 fi
 
 generate_machine_file $NODES_TO_USE $MACHINEFILE || error "can not generate machinefile"
 
-$LFS setstripe $TESTDIR -c -1
-get_stripe $TESTDIR
-
 # Make sure we start with a clean slate
-rm -f ${LOG} PI*
+rm -f ${LOG}
 
 if [ -n "$NOSINGLE" ]; then
     echo "NO Test for creates for a single client."
 else
+    # We can use np = $NUM_CLIENTS to speed up the cleanup
+    mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $TESTDIR_SINGLE 'f%%d' --ignore
+
     log "===== $0 ### 1 NODE CREATE ###"
-    echo "Running creates on 1 node(s)."
 
-    COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --time ${TIME_PERIOD}
-                --nfiles ${NUM_FILES} --dir ${TESTDIR_SINGLE} --filefmt 'f%%d'"
-    echo "+ ${COMMAND}"
-    mpi_run -np 1 -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
+	COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --time ${TIME_PERIOD}
+		--nfiles ${NUM_FILES} --dir ${TESTDIR_SINGLE} --filefmt 'f%%d'"
+	echo "+ ${COMMAND}"
+	mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np 1 ${COMMAND} |
+		tee ${LOG}
+
+	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
 
-    if [ ${PIPESTATUS[0]} != 0 ]; then
-	[ -f $LOG ] && cat $LOG
-	error "mpirun ... mdsrate ... failed, aborting"
-    fi
-    
     log "===== $0 ### 1 NODE UNLINK ###"
-    echo "Running unlinks on 1 node(s)."
 
-    COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink --time ${TIME_PERIOD}
+    COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink
                 --nfiles ${NUM_FILES} --dir ${TESTDIR_SINGLE} --filefmt 'f%%d'"
     echo "+ ${COMMAND}"
-    mpi_run -np 1 -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
- 
+    mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np 1 ${COMMAND} | tee ${LOG}
+
     if [ ${PIPESTATUS[0]} != 0 ]; then
-	[ -f $LOG ] && cat $LOG
-	error "mpirun ... mdsrate ... failed, aborting"
+	[ -f $LOG ] && sed -e "s/^/log: /" $LOG
+	error "mdsrate unlink on a single client failed, aborting"
     fi
+
+    rmdir $TESTDIR_SINGLE
 fi
 
-IFree=$(inodes_available)
+IFree=$(mdsrate_inodes_available)
 if [ $IFree -lt $NUM_FILES ]; then
     NUM_FILES=$IFree
 fi
 
+[ $NUM_CLIENTS -eq 1 ] && NOMULTI=yes
 if [ -n "$NOMULTI" ]; then
     echo "NO test for create on multiple nodes."
 else
+    mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $TESTDIR_MULTI 'f%%d' --ignore
 
     log "===== $0 ### $NUM_CLIENTS NODES CREATE ###"
-    echo "Running creates on ${NUM_CLIENTS} node(s)."
 
-    COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --time ${TIME_PERIOD}
-                --nfiles $NUM_FILES --dir ${TESTDIR_MULTI} --filefmt 'f%%d'"
-    echo "+ ${COMMAND}"
-    mpi_run -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
+	COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --time ${TIME_PERIOD}
+		--nfiles $NUM_FILES --dir ${TESTDIR_MULTI} --filefmt 'f%%d'"
+	echo "+ ${COMMAND}"
+	mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np ${NUM_CLIENTS} \
+		${COMMAND} | tee ${LOG}
 
-    if [ ${PIPESTATUS[0]} != 0 ]; then
-	[ -f $LOG ] && cat $LOG
-	error "mpirun ... mdsrate ... 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
 
-    echo "Running unlinks on ${NUM_CLIENTS} node(s)."
+    log "===== $0 ### $NUM_CLIENTS NODES UNLINK ###"
 
-    COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink --time ${TIME_PERIOD}
-                --nfiles ${NUM_FILES} --dir ${TESTDIR_MULTI} --filefmt 'f%%d'"
-    echo "+ ${COMMAND}"
-    mpi_run -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG}
+	COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink
+		--nfiles ${NUM_FILES} --dir ${TESTDIR_MULTI} --filefmt 'f%%d'"
+	echo "+ ${COMMAND}"
+	mpi_run ${MACHINEFILE_OPTION} ${MACHINEFILE} -np ${NUM_CLIENTS} \
+		${COMMAND} | tee ${LOG}
 
     if [ ${PIPESTATUS[0]} != 0 ]; then
-	[ -f $LOG ] && cat $LOG
-	error "mpirun ... mdsrate ... failed, aborting"
+	[ -f $LOG ] && sed -e "s/^/log: /" $LOG
+	error "mdsrate unlink on multiple nodes failed, aborting"
     fi
 
+    rmdir $TESTDIR_MULTI
 fi
 
-equals_msg `basename $0`: test complete, cleaning up
+rmdir $BASEDIR || true
 rm -f $MACHINEFILE
 check_and_cleanup_lustre
 #rm -f $LOG