LU-2872 tests: EXCEPT sanity-quota/0+1 for zfs

[fs/lustre-release.git] / lustre / tests / sanity-quota.sh

diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh
index af980c8..aaae98a 100644 (file)
--- a/lustre/tests/sanity-quota.sh
+++ b/lustre/tests/sanity-quota.sh
@@ -50,8 +50,8 @@ if [ $(facet_fstype $SINGLEMDS) == ldiskfs ] && \
 fi
 
 if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then
-# bug number for skipped test:        LU-2836 LU-2836 LU-2059
-       ALWAYS_EXCEPT="$ALWAYS_EXCEPT 3       6       7d"
+# bug number for skipped test:        LU-2872 LU-2836 LU-2836 LU-2059
+       ALWAYS_EXCEPT="$ALWAYS_EXCEPT 1       3       6       7d"
 # bug number:     LU-2887
        ZFS_SLOW="12a"
 fi
@@ -367,8 +367,14 @@ test_quota_performance() {
        delta=$((etime - stime))
        if [ $delta -gt 0 ]; then
            rate=$((size * 1024 / delta))
-           [ $rate -gt 1024 ] ||
-               error "SLOW IO for $TSTUSR (user): $rate KB/sec"
+           if [ $(facet_fstype $SINGLEMDS) = "zfs" ]; then
+               # LU-2872 - see LU-2887 for fix
+               [ $rate -gt 256 ] ||
+                       error "SLOW IO for $TSTUSR (user): $rate KB/sec"
+           else
+               [ $rate -gt 1024 ] ||
+                       error "SLOW IO for $TSTUSR (user): $rate KB/sec"
+           fi
        fi
        rm -f $TESTFILE
 }
@@ -1242,7 +1248,7 @@ test_7e() {
                quota_error -u $TSTUSR "create failed, expect success"
 
        $RUNAS unlinkmany $TESTFILE $((ilimit + 1)) || "unlink failed"
-       $LFS rmdir $DIR/${tdir}-1 || "unlink remote dir failed"
+       rmdir $DIR/${tdir}-1 || "unlink remote dir failed"
 
        cleanup_quota_test
        resetquota -u $TSTUSR
@@ -1478,7 +1484,7 @@ test_12b() {
 
        $RUNAS unlinkmany $TESTFILE1 $((ilimit / 2)) ||
                error "unlink mdt1 files failed"
-       $LFS rmdir $DIR/${tdir}-1 || error "unlink remote dir failed"
+       rmdir $DIR/${tdir}-1 || error "unlink remote dir failed"
 
        cleanup_quota_test
        resetquota -u $TSTUSR