From ba8a80ca7e315ada7b3b77e8dba1aafb4bc0b7f5 Mon Sep 17 00:00:00 2001 From: grev Date: Thu, 28 May 2009 14:15:58 +0000 Subject: [PATCH] b=19194 o=Adilger,grev i=grev limit unlink tests patch --- lustre/tests/mdsrate-create-large.sh | 40 +++++++++++++++++++---------------- lustre/tests/mdsrate-create-small.sh | 40 +++++++++++++++++++---------------- lustre/tests/mdsrate-lookup-10dirs.sh | 26 ++++++++--------------- lustre/tests/mdsrate-lookup-1dir.sh | 22 ++++++------------- lustre/tests/mdsrate-stat-large.sh | 26 +++++++---------------- lustre/tests/mdsrate-stat-small.sh | 23 ++++++-------------- 6 files changed, 75 insertions(+), 102 deletions(-) diff --git a/lustre/tests/mdsrate-create-large.sh b/lustre/tests/mdsrate-create-large.sh index 94bb805..c78ce9a 100644 --- a/lustre/tests/mdsrate-create-large.sh +++ b/lustre/tests/mdsrate-create-large.sh @@ -52,7 +52,6 @@ else 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'" @@ -60,21 +59,25 @@ else mpi_run -np 1 -machinefile ${MACHINEFILE} ${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 creates for a single client failed, aborting" fi log "===== $0 ### 1 NODE UNLINK ###" - echo "Running unlinks on 1 node(s)." - COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink --time ${TIME_PERIOD} + if [ -f "$LOG" ]; then + CREATED=$(awk '/total:/ { print $7 }' $LOG) + [ $CREATED -gt 0 ] && NUM_FILES=$CREATED + fi + + 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} 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 fi @@ -83,13 +86,13 @@ 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'" @@ -97,27 +100,28 @@ else mpi_run -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} ${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 create on multiple nodes failed, aborting" fi - echo "Running unlinks on ${NUM_CLIENTS} node(s)." + log "===== $0 ### $NUM_CLIENTS NODES UNLINK ###" - COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink --time ${TIME_PERIOD} + if [ -f "$LOG" ]; then + CREATED=$(awk '/total:/ { print $7 }' $LOG) + [ $CREATED -gt 0 ] && NUM_FILES=$CREATED + fi + + COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink --nfiles ${NUM_FILES} --dir ${TESTDIR_MULTI} --filefmt 'f%%d'" echo "+ ${COMMAND}" mpi_run -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} ${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 - fi -equals_msg `basename $0`: test complete, cleaning up -mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $TESTDIR_SINGLE 'f%%d' --ignore -mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $TESTDIR_MULTI 'f%%d' --ignore rm -f $MACHINEFILE check_and_cleanup_lustre #rm -f $LOG diff --git a/lustre/tests/mdsrate-create-small.sh b/lustre/tests/mdsrate-create-small.sh index cb4a1c0..4babb26 100644 --- a/lustre/tests/mdsrate-create-small.sh +++ b/lustre/tests/mdsrate-create-small.sh @@ -60,7 +60,6 @@ else 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'" @@ -68,8 +67,8 @@ else mpi_run -np 1 -machinefile ${MACHINEFILE} ${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 create for a single client failed, aborting" fi fi @@ -77,16 +76,20 @@ else echo "NO Test for unlinks for a single client." else log "===== $0 ### 1 NODE UNLINK ###" - echo "Running unlinks on 1 node(s)." - COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink --time ${TIME_PERIOD} + if [ -f "$LOG" ]; then + CREATED=$(awk '/total:/ { print $7 }' $LOG) + [ $CREATED -gt 0 ] && NUM_FILES=$CREATED + fi + + 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} if [ ${PIPESTATUS[0]} != 0 ]; then - [ -f $LOG ] && cat $LOG - error "mpirun ... mdsrate ... failed, aborting" + [ -f $LOG ] && sed -e "s/^/log: /" $LOG + error "mdsrate unlinks for a single client failed, aborting" fi fi fi @@ -104,8 +107,7 @@ else 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) with $THREADS_PER_CLIENT threads per client." + log "===== $0 ### $NUM_CLIENTS NODES CREATE with $THREADS_PER_CLIENT threads per client ###" COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --time ${TIME_PERIOD} --nfiles $NUM_FILES --dir ${TESTDIR_MULTI} --filefmt 'f%%d'" @@ -113,32 +115,34 @@ else mpi_run -np $((NUM_CLIENTS * THREADS_PER_CLIENT)) -machinefile ${MACHINEFILE} \ ${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 create on multiple nodes failed, aborting" fi fi if [ -n "$NOUNLINK" ]; then echo "NO Test for unlinks multiple nodes." else - log "===== $0 ### $NUM_CLIENTS NODES UNLINK ###" - echo "Running unlinks on ${NUM_CLIENTS} node(s) with $THREADS_PER_CLIENT threads per client." + log "===== $0 ### $NUM_CLIENTS NODES UNLINK with $THREADS_PER_CLIENT threads per client ###" + + if [ -f "$LOG" ]; then + CREATED=$(awk '/total:/ { print $7 }' $LOG) + [ $CREATED -gt 0 ] && NUM_FILES=$CREATED + fi - COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink --time ${TIME_PERIOD} + COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --unlink --nfiles ${NUM_FILES} --dir ${TESTDIR_MULTI} --filefmt 'f%%d'" echo "+ ${COMMAND}" mpi_run -np $((NUM_CLIENTS * THREADS_PER_CLIENT)) -machinefile ${MACHINEFILE} \ ${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 unlinks multiple nodes failed, aborting" fi fi fi equals_msg `basename $0`: test complete, cleaning up -mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $TESTDIR_SINGLE 'f%%d' --ignore -mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $TESTDIR_MULTI 'f%%d' --ignore rm -f $MACHINEFILE check_and_cleanup_lustre #rm -f $LOG diff --git a/lustre/tests/mdsrate-lookup-10dirs.sh b/lustre/tests/mdsrate-lookup-10dirs.sh index c0650ad..f132055 100644 --- a/lustre/tests/mdsrate-lookup-10dirs.sh +++ b/lustre/tests/mdsrate-lookup-10dirs.sh @@ -61,26 +61,19 @@ else done log "===== $0 Test preparation: creating ${NUM_DIRS} dirs with ${NUM_FILES} files." - echo "Test preparation: creating ${NUM_DIRS} dirs with ${NUM_FILES} files." - - MDSCOUNT=1 - NUM_CLIENTS=$(get_node_count ${NODES_TO_USE//,/ }) - - log "===== $0 Test preparation: creating ${NUM_DIRS} dirs with ${NUM_FILES} files." - echo "Test preparation: creating ${NUM_DIRS} dirs with ${NUM_FILES} files." COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --mknod --ndirs ${NUM_DIRS} --dirfmt '${DIRfmt}' --nfiles ${NUM_FILES} --filefmt 'f%%d'" echo "+" ${COMMAND} - # For files creation we can use NUM_THREADS equal to NUM_DIRS + # For files creation we can use -np equal to NUM_DIRS # This is just a test preparation, does not matter how many threads we use for files creation; - # we just should be aware that NUM_DIRS is less than or equal to the number of threads NUM_THREADS + # we just should be aware that NUM_DIRS is less than or equal to the number of threads np mpi_run -np ${NUM_DIRS} -machinefile ${MACHINEFILE} ${COMMAND} 2>&1 - # No lockup if error occurs on file creation, abort. - [ ${PIPESTATUS[0]} != 0 ] && error "mpirun ... mdsrate ... file creation failed, aborting" + # No lookup if error occurs on file creation, abort. + [ ${PIPESTATUS[0]} != 0 ] && error "mdsrate file creation failed, aborting" fi COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --lookup --time ${TIME_PERIOD} ${SEED_OPTION} @@ -92,28 +85,27 @@ if [ -n "$NOSINGLE" ]; then echo "NO Test for lookups on a single client." else log "===== $0 ### 1 NODE LOOKUPS ###" - echo "Running lookups on 1 node(s)." echo "+" ${COMMAND} mpi_run -np 1 -machinefile ${MACHINEFILE} ${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 lookups on a single client failed, aborting" fi fi # 2 +[ $NUM_CLIENTS -eq 1 ] && NOMULTI=yes if [ -n "$NOMULTI" ]; then echo "NO test for lookups on multiple nodes." else log "===== $0 ### ${NUM_CLIENTS} NODES LOOKUPS ###" - echo "Running lookups on ${NUM_CLIENTS} node(s)." echo "+" ${COMMAND} mpi_run -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} ${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 lookups on multiple nodes failed, aborting" fi fi diff --git a/lustre/tests/mdsrate-lookup-1dir.sh b/lustre/tests/mdsrate-lookup-1dir.sh index 6276fc4..752deb7 100644 --- a/lustre/tests/mdsrate-lookup-1dir.sh +++ b/lustre/tests/mdsrate-lookup-1dir.sh @@ -54,21 +54,14 @@ else mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $TESTDIR 'f%%d' --ignore log "===== $0 Test preparation: creating ${NUM_FILES} files." - echo "Test preparation: creating ${NUM_FILES} files." - MDSCOUNT=1 - NUM_CLIENTS=$(get_node_count ${NODES_TO_USE//,/ }) - NUM_THREADS=$((NUM_CLIENTS * MDSCOUNT)) - if [ $NUM_CLIENTS -gt 50 ]; then - NUM_THREADS=$NUM_CLIENTS - fi COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --mknod --dir ${TESTDIR} --nfiles ${NUM_FILES} --filefmt 'f%%d'" echo "+" ${COMMAND} - mpi_run -np ${NUM_THREADS} -machinefile ${MACHINEFILE} ${COMMAND} 2>&1 + mpi_run -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} ${COMMAND} 2>&1 # No lockup if error occurs on file creation, abort. - [ ${PIPESTATUS[0]} != 0 ] && error "mpirun ... mdsrate ... file creation failed, aborting" + [ ${PIPESTATUS[0]} != 0 ] && error "mdsrate file creation failed, aborting" fi COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --lookup --time ${TIME_PERIOD} ${SEED_OPTION} @@ -79,28 +72,27 @@ if [ -n "$NOSINGLE" ]; then echo "NO Test for lookups on a single client." else log "===== $0 ### 1 NODE LOOKUPS ###" - echo "Running lookups on 1 node(s)." echo "+" ${COMMAND} mpi_run -np 1 -machinefile ${MACHINEFILE} ${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 lookups on a single client failed, aborting" fi fi # 2 +[ $NUM_CLIENTS -eq 1 ] && NOMULTI=yes if [ -n "$NOMULTI" ]; then echo "NO test for lookups on multiple nodes." else log "===== $0 ### ${NUM_CLIENTS} NODES LOOKUPS ###" - echo "Running lookups on ${NUM_CLIENTS} node(s)." echo "+" ${COMMAND} mpi_run -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} ${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 lookups on multiple nodes failed, aborting" fi fi diff --git a/lustre/tests/mdsrate-stat-large.sh b/lustre/tests/mdsrate-stat-large.sh index 5299fc5..730eb01 100644 --- a/lustre/tests/mdsrate-stat-large.sh +++ b/lustre/tests/mdsrate-stat-large.sh @@ -59,21 +59,13 @@ else mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $TESTDIR 'f%%d' --ignore log "===== $0 Test preparation: creating ${NUM_FILES} files." - echo "Test preparation: creating ${NUM_FILES} files." COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --create --dir ${TESTDIR} --nfiles ${NUM_FILES} --filefmt 'f%%d'" echo "+" ${COMMAND} - MDSCOUNT=1 - NUM_CLIENTS=$(get_node_count ${NODES_TO_USE//,/ }) - NUM_THREADS=$((NUM_CLIENTS * MDSCOUNT)) - if [ $NUM_CLIENTS -gt 50 ]; then - NUM_THREADS=$NUM_CLIENTS - fi - - mpi_run -np ${NUM_THREADS} -machinefile ${MACHINEFILE} ${COMMAND} 2>&1 - [ ${PIPESTATUS[0]} != 0 ] && error "mpirun ... mdsrate ... file creation failed, aborting" + mpi_run -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} ${COMMAND} 2>&1 + [ ${PIPESTATUS[0]} != 0 ] && error "mdsrate file creation failed, aborting" fi @@ -86,31 +78,29 @@ if [ -n "$NOSINGLE" ]; then echo "NO Test for stats on a single client." else log "===== $0 ### 1 NODE STAT ###" - echo "Running stats on 1 node(s)." echo "+" ${COMMAND} mpi_run -np 1 -machinefile ${MACHINEFILE} ${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 stats on a single client failed, aborting" fi fi # 2 +[ $NUM_CLIENTS -eq 1 ] && NOMULTI=yes if [ -n "$NOMULTI" ]; then echo "NO test for stats on multiple nodes." else log "===== $0 ### ${NUM_CLIENTS} NODES STAT ###" - echo "Running stats on ${NUM_CLIENTS} node(s)." echo "+" ${COMMAND} - NUM_THREADS=$(get_node_count ${NODES_TO_USE//,/ }) - mpi_run -np ${NUM_THREADS} -machinefile ${MACHINEFILE} ${COMMAND} | tee ${LOG} + mpi_run -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} ${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 stats on multiple nodes failed, aborting" fi fi diff --git a/lustre/tests/mdsrate-stat-small.sh b/lustre/tests/mdsrate-stat-small.sh index 355f408..21e3a03 100644 --- a/lustre/tests/mdsrate-stat-small.sh +++ b/lustre/tests/mdsrate-stat-small.sh @@ -59,21 +59,13 @@ else mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $TESTDIR 'f%%d' --ignore log "===== $0 Test preparation: creating ${NUM_FILES} files." - echo "Test preparation: creating ${NUM_FILES} files." COMMAND="${MDSRATE} ${MDSRATE_DEBUG} --mknod --dir ${TESTDIR} --nfiles ${NUM_FILES} --filefmt 'f%%d'" echo "+" ${COMMAND} - MDSCOUNT=1 - NUM_CLIENTS=$(get_node_count ${NODES_TO_USE//,/ }) - NUM_THREADS=$((NUM_CLIENTS * MDSCOUNT)) - if [ $NUM_CLIENTS -gt 50 ]; then - NUM_THREADS=$NUM_CLIENTS - fi - - mpi_run -np ${NUM_THREADS} -machinefile ${MACHINEFILE} ${COMMAND} 2>&1 - [ ${PIPESTATUS[0]} != 0 ] && error "Error running mdsrate, aborting..." + mpi_run -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} ${COMMAND} 2>&1 + [ ${PIPESTATUS[0]} != 0 ] && error "mdsrate file creation failed, aborting" fi @@ -86,30 +78,29 @@ if [ -n "$NOSINGLE" ]; then echo "NO Test for stats on a single client." else log "===== $0 ### 1 NODE STAT ###" - echo "Running stats on 1 node(s)." echo "+" ${COMMAND} mpi_run -np 1 -machinefile ${MACHINEFILE} ${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 on a single client failed, aborting" fi fi # 2 +[ $NUM_CLIENTS -eq 1 ] && NOMULTI=yes if [ -n "$NOMULTI" ]; then echo "NO test for stats on multiple nodes." else log "===== $0 ### ${NUM_CLIENTS} NODES STAT ###" - echo "Running stats on ${NUM_CLIENTS} node(s)." echo "+" ${COMMAND} mpi_run -np ${NUM_CLIENTS} -machinefile ${MACHINEFILE} ${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 stats on multiple nodes failed, aborting" fi fi -- 1.8.3.1