X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fparallel-scale.sh;h=c82a30233ac59a7ab174ba512340a0933389b8a8;hb=b9c4dc3c33fe87ecaa79a290190524ea21b7fa8a;hp=bb366a9ee8f6a4c5c81f8c69304125554d9299a5;hpb=39b944ec54655bb70bcb79fe8223c724f7d08dbf;p=fs%2Flustre-release.git

diff --git a/lustre/tests/parallel-scale.sh b/lustre/tests/parallel-scale.sh
index bb366a9..c82a302 100644
--- a/lustre/tests/parallel-scale.sh
+++ b/lustre/tests/parallel-scale.sh
@@ -1,32 +1,31 @@
 #!/bin/bash
-#
-#set -vx
 
-LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+LUSTRE=${LUSTRE:-$(dirname $0)/..}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
-. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
-#              bug 20670
-ALWAYS_EXCEPT="parallel_grouplock $PARALLEL_SCALE_EXCEPT"
+ALWAYS_EXCEPT="$PARALLEL_SCALE_EXCEPT "
+# bug number for skipped test: LU-9429
+ALWAYS_EXCEPT+="               parallel_grouplock "
 
-if [ $(facet_fstype $SINGLEMDS) = zfs -o $(facet_fstype "ost1") = zfs ]; then
+if [ "$mds1_FSTYPE" = zfs -o "$ost1_FSTYPE" = zfs ]; then
 	ZFSSLOW=$SLOW
 	SLOW=no
 
-	cbench_IDIRS=1
-	cbench_RUNS=1
+	cbench_IDIRS=${cbench_IDIRS:-1}
+	cbench_RUNS=${cbench_RUNS:-1}
 
-	mdtest_nFiles=10000
-	statahead_NUMFILES=100000
+	mdtest_nFiles=${mdtest_nFiles:-"10000"}
+	statahead_NUMFILES=${statahead_NUMFILES:-100000}
 fi
 
+build_test_filter
+
 # common setup
-MACHINEFILE=${MACHINEFILE:-$TMP/$(basename $0 .sh).machines}
 clients=${CLIENTS:-$HOSTNAME}
 generate_machine_file $clients $MACHINEFILE ||
-    error "Failed to generate machine file"
+	error "Failed to generate machine file"
 num_clients=$(get_node_count ${clients//,/ })
 
 # compilbench
@@ -36,29 +35,37 @@ if [ "$SLOW" = "no" ]; then
 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
+
+# xdd
+[ "$SLOW" = "no" ] && xdd_passes=${xdd_passes:-15}
 
 . $LUSTRE/tests/functions.sh
 
-build_test_filter
 check_and_setup_lustre
 
 get_mpiuser_id $MPI_USER
@@ -105,6 +112,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
 }
@@ -120,11 +137,18 @@ test_write_append_truncate() {
 }
 run_test write_append_truncate "write_append_truncate"
 
+# Argument is chunk size limit, the upper bound on write size
 test_write_disjoint() {
-    run_write_disjoint
+    run_write_disjoint 123456
 }
 run_test write_disjoint "write_disjoint"
 
+# Make sure to exercise the tiny write code
+test_write_disjoint_tiny() {
+	run_write_disjoint 16384
+}
+run_test write_disjoint_tiny "write_disjoint_tiny"
+
 test_parallel_grouplock() {
     run_parallel_grouplock
 }
@@ -135,7 +159,28 @@ test_statahead () {
 }
 run_test statahead "statahead test, multiple clients"
 
-[ $(facet_fstype $SINGLEMDS) = zfs -o $(facet_fstype "ost1") = zfs] &&
+test_rr_alloc () {
+	run_rr_alloc
+}
+run_test rr_alloc "Checking even file distribution over OSTs in RR policy"
+
+test_fs_test () {
+	run_fs_test
+}
+run_test fs_test "fs_test"
+
+test_fio () {
+	run_fio
+}
+run_test fio "fio"
+
+test_xdd () {
+	run_xdd
+}
+run_test xdd "xdd"
+
+# If necessary, return SLOW to its original value
+[ "$mds1_FSTYPE" = zfs -o "$ost1_FSTYPE" = zfs ] &&
 	SLOW=$ZFSSLOW
 
 complete $SECONDS