LU-13404 utils: fix lfs mirror duplicate file check

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

diff --git a/lustre/tests/parallel-scale.sh b/lustre/tests/parallel-scale.sh
index 5f138c8..b7d9a82 100644 (file)
--- a/lustre/tests/parallel-scale.sh
+++ b/lustre/tests/parallel-scale.sh
@@ -8,10 +8,10 @@ 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
+if [ "$mds1_FSTYPE" = zfs -o "$ost1_FSTYPE" = zfs ]; then
        ZFSSLOW=$SLOW
        SLOW=no
 
@@ -56,6 +56,15 @@ fi
 # write_disjoint
 [ "$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
@@ -105,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
 }
@@ -120,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
 }
@@ -135,7 +161,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