X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fmdsrate-stat-small.sh;h=6de066af619799f82c9f420aa02ba336a582d5a9;hb=f771a638b8033e71f3d9d328e593e2f369e7bf53;hp=9ae440a0cf5a15bb57295ff10a34d667d2650668;hpb=6c68e036af0b2a360bd245284e4813d7014b7311;p=fs%2Flustre-release.git diff --git a/lustre/tests/mdsrate-stat-small.sh b/lustre/tests/mdsrate-stat-small.sh index 9ae440a..6de066a 100644 --- a/lustre/tests/mdsrate-stat-small.sh +++ b/lustre/tests/mdsrate-stat-small.sh @@ -19,7 +19,8 @@ assert_env CLIENTS MDSRATE SINGLECLIENT MPIRUN MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines} # Do not use name [df][0-9]* to avoid cleanup by rm, bug 18045 -TESTDIR=$MOUNT/mdsrate +BASEDIR=$MOUNT/mdsrate +TESTDIR=$BASEDIR/stat # Requirements NUM_FILES=${NUM_FILES:-1000000} @@ -40,8 +41,11 @@ rm -f $LOG log "===== $0 ====== " check_and_setup_lustre -mkdir -p $TESTDIR -chmod 0777 $TESTDIR + +mkdir -p $BASEDIR +chmod 0777 $BASEDIR +$LFS setstripe $BASEDIR -i 0 -c 1 +get_stripe $BASEDIR IFree=$(inodes_available) if [ $IFree -lt $NUM_FILES ]; then @@ -50,9 +54,6 @@ fi generate_machine_file $NODES_TO_USE $MACHINEFILE || error "can not generate machinefile" -$LFS setstripe $TESTDIR -i 0 -c 1 -get_stripe $TESTDIR - if [ -n "$NOCREATE" ]; then echo "NOCREATE=$NOCREATE => no file creation." else @@ -112,6 +113,7 @@ fi equals_msg `basename $0`: test complete, cleaning up mdsrate_cleanup $NUM_CLIENTS $MACHINEFILE $NUM_FILES $TESTDIR 'f%%d' +rmdir $BASEDIR || true rm -f $MACHINEFILE check_and_cleanup_lustre #rm -f $LOG