X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fparallel-scale.sh;h=af4ad5d1bc2fecf1253be2bae6cf306f7c98356c;hb=bfd4600f31691fdad676a8489f591bccc24f2100;hp=87466553f07a23318349f6fb2e59400c312d522b;hpb=dee5f24114531ec34fc56ce2826ada9e5690aabc;p=fs%2Flustre-release.git

diff --git a/lustre/tests/parallel-scale.sh b/lustre/tests/parallel-scale.sh
index 8746655..af4ad5d 100644
--- a/lustre/tests/parallel-scale.sh
+++ b/lustre/tests/parallel-scale.sh
@@ -11,39 +11,50 @@ init_logging
 #              bug 20670
 ALWAYS_EXCEPT="parallel_grouplock $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}
 
 . $LUSTRE/tests/functions.sh
 
@@ -124,6 +135,9 @@ test_statahead () {
 }
 run_test statahead "statahead test, multiple clients"
 
+[ $(facet_fstype $SINGLEMDS) = zfs -o $(facet_fstype "ost1") = zfs ] &&
+	SLOW=$ZFSSLOW
+
 complete $SECONDS
 check_and_cleanup_lustre
 exit_status