From: Elena Gryaznova <grev@sun.com>
Date: Fri, 26 Feb 2010 16:06:28 +0000 (+0300)
Subject: b=21255 parallel-scale statahead test fix
X-Git-Tag: v1_8_2_52~37
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=7a9dcc2fd05fe557545a7fe1b4d3072c8931fed1;p=fs%2Flustre-release.git

b=21255 parallel-scale statahead test fix

i=Vladimir.Saveliev
i=Andrew.Perepechko

use mpi for create/delete files instead of createmany and rm
---

diff --git a/lustre/tests/parallel-scale.sh b/lustre/tests/parallel-scale.sh
index 0064b7e..ef73f3b 100644
--- a/lustre/tests/parallel-scale.sh
+++ b/lustre/tests/parallel-scale.sh
@@ -166,8 +166,7 @@ test_metabench() {
     # FIXME
     # Need space estimation here.
 
-    generate_machine_file $clients $MACHINEFILE || \
-        error "can not generate machinefile $MACHINEFILE"
+    generate_machine_file $clients $MACHINEFILE || return $?
 
     print_opts METABENCH clients mbench_NFILES mbench_THREADS
 
@@ -208,8 +207,7 @@ test_simul() {
     # FIXME
     # Need space estimation here.
 
-    generate_machine_file $clients $MACHINEFILE || \
-        error "can not generate machinefile $MACHINEFILE"
+    generate_machine_file $clients $MACHINEFILE || return $?
 
     print_opts SIMUL clients simul_REP simul_THREADS
 
@@ -289,8 +287,7 @@ test_ior() {
         echo "free space=$space, Need: $num_clients x $ior_THREADS x $ior_blockSize Gb (blockSize reduced to $ior_blockSize Gb)"
     fi
  
-    generate_machine_file $clients $MACHINEFILE || \
-        error "can not generate machinefile $MACHINEFILE"
+    generate_machine_file $clients $MACHINEFILE || return $?
 
     print_opts IOR ior_THREADS ior_DURATION MACHINEFILE
 
@@ -343,8 +340,7 @@ test_cascading_rw() {
     # FIXME
     # Need space estimation here.
 
-    generate_machine_file $clients $MACHINEFILE || \
-        error "can not generate machinefile $MACHINEFILE"
+    generate_machine_file $clients $MACHINEFILE || return $?
 
     print_opts CASC_RW clients casc_THREADS casc_REP MACHINEFILE
 
@@ -389,8 +385,7 @@ test_write_append_truncate() {
     # FIXME
     # Need space estimation here.
 
-    generate_machine_file $clients $MACHINEFILE || \
-        error "can not generate machinefile $MACHINEFILE"
+    generate_machine_file $clients $MACHINEFILE || return $?
 
     local testdir=$DIR/d0.write_append_truncate
     local file=$testdir/f0.wat
@@ -432,8 +427,7 @@ test_write_disjoint() {
     # FIXME
     # Need space estimation here.
 
-    generate_machine_file $clients $MACHINEFILE || \
-        error "can not generate machinefile $MACHINEFILE"
+    generate_machine_file $clients $MACHINEFILE || return $?
 
     print_opts WRITE_DISJOINT clients wdisjoint_THREADS wdisjoint_REP MACHINEFILE
     local testdir=$DIR/d0.write_disjoint
@@ -468,8 +462,7 @@ test_parallel_grouplock() {
 
     local num_clients=$(get_node_count ${clients//,/ })
 
-    generate_machine_file $clients $MACHINEFILE || \
-        error "can not generate machinefile $MACHINEFILE"
+    generate_machine_file $clients $MACHINEFILE || return $?
 
     print_opts clients parallel_grouplock_MINTASKS MACHINEFILE
 
@@ -522,14 +515,34 @@ cleanup_statahead () {
 }
 
 test_statahead () {
-   
+    [ x$MDSRATE = x ] &&
+        { skip_env "mdsrate not found" && return; }
+
+    local clients=$CLIENTS
+    [ -z $clients ] && clients=$(hostname)
+
+    local num_clients=$(get_node_count ${clients//,/ })
+
+    generate_machine_file $clients $MACHINEFILE || return $?
+
+    print_opts MDSRATE clients statahead_NUMMNTPTS statahead_NUMFILES
+
     # create large dir
 
-    local dir=d0.statahead
-    # FIXME has to use DIR
+    # do not use default "d[0-9]*" dir name
+    # to avoid of rm $statahead_NUMFILES (500k) files in t-f cleanup
+    local dir=dstatahead
     local testdir=$DIR/$dir
 
+    # cleanup only if dir exists
+    # cleanup only $statahead_NUMFILES number of files
+    # ignore the other files created by someone else
+    [ -d $testdir ] &&
+        mdsrate_cleanup $((num_clients * 32)) $MACHINEFILE $statahead_NUMFILES $testdir 'f%%d' --ignore
+
     mkdir -p $testdir
+    # mpi_run uses mpiuser
+    chmod 0777 $testdir
 
     local num_files=$statahead_NUMFILES
 
@@ -540,12 +553,14 @@ test_statahead () {
 
     cancel_lru_locks mdc
 
-    log "createmany -o $testdir/f-%d $num_files"
-    createmany -o $testdir/$f-%d $num_files
+    local cmd="${MDSRATE} ${MDSRATE_DEBUG} --mknod --dir $testdir --nfiles $num_files --filefmt 'f%%d'"    
+    echo "+ $cmd"
+    
+    mpi_run -np $((num_clients * 32)) -machinefile ${MACHINEFILE} $cmd
 
     local rc=$?
     if [ $rc != 0 ] ; then
-        error "createmany failed to create $rc"
+        error "mdsrate failed to create $rc"
         return $rc
     fi
 
@@ -553,12 +568,9 @@ test_statahead () {
     local mntpt_root=$TMP/mntpt/lustre
     mntopts=${MNTOPTSTATAHEAD:-$MOUNTOPT}
 
-    local clients=$CLIENTS
-    [ -z $clients ] && clients=$(hostname)
-
     echo "Mounting $num_mntpts lustre clients starts on $clients"
     trap "cleanup_statahead $clients $mntpt_root $num_mntpts" EXIT ERR
-    for i in $(seq 0 $num_mntpts);do
+    for i in $(seq 0 $num_mntpts); do
         zconf_mount_clients $clients ${mntpt_root}$i $mntopts ||
             error_exit "Failed to mount lustre on ${mntpt_root}$i on $clients"
     done
@@ -567,6 +579,12 @@ test_statahead () {
 
     do_rpc_nodes $clients do_ls $mntpt_root $num_mntpts $dir
 
+    mdsrate_cleanup $((num_clients * 32)) $MACHINEFILE $num_files $testdir 'f%%d' --ignore
+
+    # use rm instead of rmdir because of
+    # testdir could contain the files created by someone else,
+    # or by previous run where is num_files prev > num_files current
+    rm -rf $testdir
     cleanup_statahead $clients $mntpt_root $num_mntpts
 }
 
diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index afaa5c5..93a175b 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -2502,9 +2502,10 @@ mixed_ost_devs () {
 generate_machine_file() {
     local nodes=${1//,/ }
     local machinefile=$2
-    rm -f $machinefile || error "can't rm $machinefile"
+    rm -f $machinefile
     for node in $nodes; do
-        echo $node >>$machinefile
+        echo $node >>$machinefile || \
+            { echo "can not generate machinefile $machinefile" && return 1; }
     done
 }