LU-7790 test: skip test_130a and test_130b if server is less than 2.7.2

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

diff --git a/lustre/tests/parallel-scale.sh b/lustre/tests/parallel-scale.sh
index 8746655..a590d21 100644 (file)
--- a/lustre/tests/parallel-scale.sh
+++ b/lustre/tests/parallel-scale.sh
@@ -9,41 +9,58 @@ init_test_env $@
 init_logging
 
 #              bug 20670
-ALWAYS_EXCEPT="parallel_grouplock $PARALLEL_SCALE_EXCEPT"
+ALWAYS_EXCEPT="$PARALLEL_SCALE_EXCEPT"
+
+if [ $(facet_fstype $SINGLEMDS) = zfs -o $(facet_fstype "ost1") = zfs ]; then
+       ZFSSLOW=$SLOW
+       SLOW=no
+
+       cbench_IDIRS=${cbench_IDIRS:-1}
+       cbench_RUNS=${cbench_RUNS:-1}
+
+       mdtest_nFiles=${mdtest_nFiles:-"10000"}
+       statahead_NUMFILES=${statahead_NUMFILES:-100000}
+fi
 
 # common setup
 MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines}
 clients=${CLIENTS:-$HOSTNAME}
-generate_machine_file $clients $MACHINEFILE || \
+generate_machine_file $clients $MACHINEFILE ||
     error "Failed to generate machine file"
 num_clients=$(get_node_count ${clients//,/ })
 
 # compilbench
 if [ "$SLOW" = "no" ]; then
-    cbench_IDIRS=2
-    cbench_RUNS=2
+       cbench_IDIRS=${cbench_IDIRS:-2}
+       cbench_RUNS=${cbench_RUNS:-2}
 fi
 
 # metabench
-[ "$SLOW" = "no" ] && mbench_NFILES=10000
+[ "$SLOW" = "no" ] && mbench_NFILES=${mbench_NFILES:-10000}
 
 # simul
-[ "$SLOW" = "no" ] && simul_REP=2
+[ "$SLOW" = "no" ] && simul_REP=${simul_REP:-2}
 
 # connectathon
-[ "$SLOW" = "no" ] && cnt_NRUN=2
+[ "$SLOW" = "no" ] && cnt_NRUN=${cnt_NRUN:-2}
 
 # cascading rw
-[ "$SLOW" = "no" ] && casc_REP=10
+[ "$SLOW" = "no" ] && casc_REP=${casc_REP:-10}
 
 # IOR
-[ "$SLOW" = "no" ] && ior_DURATION=5
+[ "$SLOW" = "no" ] && ior_DURATION=${ior_DURATION:-5}
 
 # write_append_truncate
-[ "$SLOW" = "no" ] && write_REP=100
+[ "$SLOW" = "no" ] && write_REP=${write_REP:-100}
 
 # write_disjoint
-[ "$SLOW" = "no" ] && wdisjoint_REP=100
+[ "$SLOW" = "no" ] && wdisjoint_REP=${wdisjoint_REP:-100}
+
+# fs_test
+if [ "$SLOW" = "no" ]; then
+       fs_test_ndirs=${fs_test_ndirs:-10000}
+       fs_test_nobj=${fs_test_nobj:-2}
+fi
 
 . $LUSTRE/tests/functions.sh
 
@@ -94,6 +111,16 @@ test_iorfpp() {
 }
 run_test iorfpp "iorfpp"
 
+test_ior_mdtest_parallel_ssf() {
+       ior_mdtest_parallel "ssf"
+}
+run_test ior_mdtest_parallel_ssf "iormdtestssf"
+
+test_ior_mdtest_parallel_fpp() {
+       ior_mdtest_parallel "fpp"
+}
+run_test ior_mdtest_parallel_fpp "iormdtestfpp"
+
 test_mib() {
     run_mib
 }
@@ -124,6 +151,14 @@ test_statahead () {
 }
 run_test statahead "statahead test, multiple clients"
 
+test_fs_test () {
+       run_fs_test
+}
+run_test fs_test "fs_test"
+
+[ $(facet_fstype $SINGLEMDS) = zfs -o $(facet_fstype "ost1") = zfs ] &&
+       SLOW=$ZFSSLOW
+
 complete $SECONDS
 check_and_cleanup_lustre
 exit_status