X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fparallel-scale.sh;h=3cd3474c18b746a335e73f98e82183a0d41dcee1;hb=892c2251d854f480c272ab2999cdc6f4c87fecf0;hp=4530b3e002c21d4a19fd7c35f8f0fe7f110ba8ac;hpb=0bf8b39127129aa08276ac3ff364d4435f0eabe9;p=fs%2Flustre-release.git

diff --git a/lustre/tests/parallel-scale.sh b/lustre/tests/parallel-scale.sh
index 4530b3e..3cd3474 100644
--- a/lustre/tests/parallel-scale.sh
+++ b/lustre/tests/parallel-scale.sh
@@ -8,8 +8,8 @@ init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
-#              bug 20670
-ALWAYS_EXCEPT="$PARALLEL_SCALE_EXCEPT"
+# bug number for skipped test:  LU-9429
+     ALWAYS_EXCEPT="            parallel_grouplock  $PARALLEL_SCALE_EXCEPT "
 
 if [ $(facet_fstype $SINGLEMDS) = zfs -o $(facet_fstype "ost1") = zfs ]; then
 	ZFSSLOW=$SLOW
@@ -62,6 +62,9 @@ if [ "$SLOW" = "no" ]; then
 	fs_test_nobj=${fs_test_nobj:-2}
 fi
 
+# xdd
+[ "$SLOW" = "no" ] && xdd_passes=${xdd_passes:-15}
+
 . $LUSTRE/tests/functions.sh
 
 build_test_filter
@@ -111,6 +114,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
 }
@@ -126,11 +139,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
 }
@@ -141,11 +161,26 @@ test_statahead () {
 }
 run_test statahead "statahead test, multiple clients"
 
+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"
+
 [ $(facet_fstype $SINGLEMDS) = zfs -o $(facet_fstype "ost1") = zfs ] &&
 	SLOW=$ZFSSLOW