b=24037 Remove iopen patch.

[fs/lustre-release.git] / lustre / tests / mdsrate-create-large.sh

diff --git a/lustre/tests/mdsrate-create-large.sh b/lustre/tests/mdsrate-create-large.sh
index 5201349..07b04e5 100644 (file)
--- a/lustre/tests/mdsrate-create-large.sh
+++ b/lustre/tests/mdsrate-create-large.sh
@@ -10,7 +10,7 @@ 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  
@@ -18,8 +18,8 @@ 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
@@ -32,16 +32,18 @@ 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}
 
@@ -66,7 +68,7 @@ else
     log "===== $0 ### 1 NODE UNLINK ###"
 
     if [ -f "$LOG" ]; then
-        CREATED=$(awk '/total:/ { print $7 }' $LOG)
+        CREATED=$(sed -n '/^Rate:/s/^.* \([0-9]*\) creates .*/\1/p' $LOG)
         [ $CREATED -gt 0 ] && NUM_FILES=$CREATED
     fi
 
@@ -79,9 +81,11 @@ else
        [ -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
@@ -107,7 +111,7 @@ else
     log "===== $0 ### $NUM_CLIENTS NODES UNLINK ###"
 
     if [ -f "$LOG" ]; then
-        CREATED=$(awk '/total:/ { print $7 }' $LOG)
+        CREATED=$(sed -n '/^Rate:/s/^.* \([0-9]*\) creates .*/\1/p' $LOG)
         [ $CREATED -gt 0 ] && NUM_FILES=$CREATED
     fi
 
@@ -120,8 +124,11 @@ else
        [ -f $LOG ] && sed -e "s/^/log: /" $LOG
        error "mdsrate unlink on multiple nodes failed, aborting"
     fi
+
+    rmdir $TESTDIR_MULTI
 fi
 
+rmdir $BASEDIR || true
 rm -f $MACHINEFILE
 check_and_cleanup_lustre
 #rm -f $LOG