X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fmdsrate-create-small.sh;h=59b33a637995535383f273bc070791fde2d67409;hb=d835a52642f1f5e08624d539516ca8640f459b19;hp=b5db20f88c2e3ef5029e0cca60f3afd5b1ab63d2;hpb=78d2b902cdebd8c964abd7ed6ecd06ad0645b99a;p=fs%2Flustre-release.git

diff --git a/lustre/tests/mdsrate-create-small.sh b/lustre/tests/mdsrate-create-small.sh
index b5db20f..59b33a6 100644
--- a/lustre/tests/mdsrate-create-small.sh
+++ b/lustre/tests/mdsrate-create-small.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+ #!/bin/bash
 #
 # This test was used in a set of CMD3 tests (cmd3-3 test). 
 
@@ -10,15 +10,15 @@ init_test_env $@
 assert_env CLIENTS MDSRATE SINGLECLIENT MPIRUN
 
 MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines}
-TESTDIR=$MOUNT
+BASEDIR=$MOUNT/mdsrate
 
 # Requirements
 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
@@ -40,16 +40,18 @@ log "===== $0 ====== "
 
 check_and_setup_lustre
 
-IFree=$(inodes_available)
+mkdir -p $BASEDIR
+chmod 0777 $BASEDIR
+$LFS setstripe $BASEDIR -i 0 -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 -i 0 -c 1
-get_stripe $TESTDIR
-
 if [ -n "$NOSINGLE" ]; then
     echo "NO Tests on single client."
 else
@@ -78,7 +80,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
 
@@ -91,10 +93,12 @@ else
             [ -f $LOG ] && sed -e "s/^/log: /" $LOG
             error "mdsrate unlinks for a single client failed, aborting"
         fi
+
+        rmdir $TESTDIR_SINGLE
     fi
 fi
 
-IFree=$(inodes_available)
+IFree=$(mdsrate_inodes_available)
 if [ $IFree -lt $NUM_FILES ]; then
     NUM_FILES=$IFree
 fi
@@ -126,7 +130,7 @@ else
         log "===== $0 ### $NUM_CLIENTS NODES UNLINK with $THREADS_PER_CLIENT threads per client ###"
 
         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
 
@@ -139,10 +143,13 @@ else
             [ -f $LOG ] && sed -e "s/^/log: /" $LOG
             error "mdsrate unlinks multiple nodes failed, aborting"
         fi
+
+        rmdir $TESTDIR_MULTI
     fi
 fi
 
 equals_msg `basename $0`: test complete, cleaning up
+rmdir $BASEDIR || true
 rm -f $MACHINEFILE 
 check_and_cleanup_lustre
 #rm -f $LOG