LU-676 tests: machinefile option for mpirun via a variable

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

diff --git a/lustre/tests/large-scale.sh b/lustre/tests/large-scale.sh
index 8da9783..195f93b 100644 (file)
--- a/lustre/tests/large-scale.sh
+++ b/lustre/tests/large-scale.sh
@@ -71,42 +71,46 @@ test_3a() {
 
     local num=$increment
 
-    while [ $num -le $CLIENTCOUNT ]; do
-        list=$(comma_list ${nodes[@]:0:$num}) 
-
-        generate_machine_file $list $machinefile ||
-            { error "can not generate machinefile"; exit 1; }
-
-        for i in $(seq $iters); do
-            mdsrate_cleanup $num $machinefile $nfiles $dir 'f%%d' --ignore
-
-            COMMAND="${MDSRATE} --create --nfiles $nfiles --dir $dir --filefmt 'f%%d'"
-            mpi_run -np $((num * nthreads)) -machinefile $machinefile ${COMMAND} | tee ${LOG} &
-
-            pid=$!
-            echo "pid=$pid"
-
-            # 2 threads 100000 creates 117 secs
-            sleep 20
-
-            log "$i : Starting failover on $SINGLEMDS"
-            facet_failover $SINGLEMDS
-            if ! wait_recovery_complete $SINGLEMDS $((TIMEOUT * 10)); then
-                echo "$SINGLEMDS recovery is not completed!"
-                kill -9 $pid
-                exit 7
-            fi
-
-            duration=$(do_facet $SINGLEMDS lctl get_param -n $procfile | grep recovery_duration)
-            
-            res=( "${res[@]}" "$num" )
-            res=( "${res[@]}" "$duration" )
-            echo "RECOVERY TIME: NFILES=$nfiles number of clients: $num  $duration"
-            wait $pid
-
-        done
-        num=$((num + increment))
-    done
+       while [ $num -le $CLIENTCOUNT ]; do
+               list=$(comma_list ${nodes[@]:0:$num})
+
+               generate_machine_file $list $machinefile ||
+                       { error "can not generate machinefile"; exit 1; }
+
+               for i in $(seq $iters); do
+                       mdsrate_cleanup $num $machinefile $nfiles $dir 'f%%d' \
+                               --ignore
+
+                       COMMAND="${MDSRATE} --create --nfiles $nfiles --dir
+                                $dir --filefmt 'f%%d'"
+                       mpi_run -np $((num * nthreads)) ${MACHINEFILE_OPTION} \
+                               $machinefile ${COMMAND} | tee ${LOG} &
+
+                       pid=$!
+                       echo "pid=$pid"
+
+                       # 2 threads 100000 creates 117 secs
+                       sleep 20
+
+                       log "$i : Starting failover on $SINGLEMDS"
+                       facet_failover $SINGLEMDS
+                       if ! wait_recovery_complete $SINGLEMDS \
+                            $((TIMEOUT * 10)); then
+                               echo "$SINGLEMDS recovery is not completed!"
+                               kill -9 $pid
+                               exit 7
+                       fi
+
+                       duration=$(do_facet $SINGLEMDS lctl get_param -n \
+                               $procfile | grep recovery_duration)
+
+                       res=( "${res[@]}" "$num" )
+                       res=( "${res[@]}" "$duration" )
+                       echo "RECOVERY TIME: NFILES=$nfiles number of clients: $num $duration"
+                       wait $pid
+               done
+               num=$((num + increment))
+       done
 
     mdsrate_cleanup $num $machinefile $nfiles $dir 'f%%d' --ignore