X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fparallel-scale.sh;h=b7d9a8256570584c9fac50c3d93dab613bbfeb11;hb=6b979daaffc36aeef145316b41d0e2fe8abcf20f;hp=c725969a18f675af634dc0f862c5da725600ba61;hpb=94470f7eeab5fde0648a14dda36941402c6a3e10;p=fs%2Flustre-release.git

diff --git a/lustre/tests/parallel-scale.sh b/lustre/tests/parallel-scale.sh
index c725969..b7d9a82 100644
--- a/lustre/tests/parallel-scale.sh
+++ b/lustre/tests/parallel-scale.sh
@@ -11,7 +11,7 @@ init_logging
 # 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
 
@@ -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
@@ -143,10 +146,10 @@ test_write_disjoint() {
 run_test write_disjoint "write_disjoint"
 
 # Make sure to exercise the tiny write code
-test_write_disjoint() {
-    run_write_disjoint 16384
+test_write_disjoint_tiny() {
+	run_write_disjoint 16384
 }
-run_test write_disjoint "write_disjoint_tiny"
+run_test write_disjoint_tiny "write_disjoint_tiny"
 
 test_parallel_grouplock() {
     run_parallel_grouplock
@@ -158,6 +161,11 @@ 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
 }
@@ -168,7 +176,13 @@ test_fio () {
 }
 run_test fio "fio"
 
-[ $(facet_fstype $SINGLEMDS) = zfs -o $(facet_fstype "ost1") = zfs ] &&
+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