X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fparallel-scale.sh;h=b7d9a8256570584c9fac50c3d93dab613bbfeb11;hb=7c99f67d9d39e8a037e830cf08a9df305e6d8da2;hp=840a8b8cdc20b217c0f6aad7f4d06689cd536b2b;hpb=21501dedf64e027b529a3382d92bf4bf8039638c;p=fs%2Flustre-release.git

diff --git a/lustre/tests/parallel-scale.sh b/lustre/tests/parallel-scale.sh
index 840a8b8..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
 
@@ -146,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
@@ -181,7 +181,8 @@ test_xdd () {
 }
 run_test xdd "xdd"
 
-[ $(facet_fstype $SINGLEMDS) = zfs -o $(facet_fstype "ost1") = zfs ] &&
+# If necessary, return SLOW to its original value
+[ "$mds1_FSTYPE" = zfs -o "$ost1_FSTYPE" = zfs ] &&
 	SLOW=$ZFSSLOW
 
 complete $SECONDS