LU-5624 tests: ignore bad lfsck performance for ZFS backend

Currently, the LFSCK performance has only been verified against
ldiskfs-based backend. The ZFS-based backend may hit bad performance
in sanity-lfsck test_9. Ignore the slow performance for ZFS-based
backend until we resolved the ZFS performance issues.

Signed-off-by: Fan Yong <fan.yong@intel.com>
Change-Id: Ic70e33b1e10c1798b3df01039c34ac8f00d14375
Reviewed-on: http://review.whamcloud.com/12322
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Lai Siyao <lai.siyao@intel.com>

diff --git a/lustre/tests/sanity-lfsck.sh b/lustre/tests/sanity-lfsck.sh
index c2bb00d..38c7f3a 100644 (file)
--- a/lustre/tests/sanity-lfsck.sh
+++ b/lustre/tests/sanity-lfsck.sh
@@ -968,9 +968,15 @@ test_9a() {
        local MIN_SPEED=$(((BASE_SPEED1 * (RUN_TIME1 - TIME_DIFF) + \
                            BASE_SPEED2 * (RUN_TIME2 - TIME_DIFF)) / \
                           (RUN_TIME1 + RUN_TIME2) * 8 / 10))
-       # Account for slow ZFS performance - LU-4934
-       [ $SPEED -gt $MIN_SPEED ] || [ $(facet_fstype $SINGLEMDS) -eq zfs ] ||
-               error "(5) Got speed $SPEED, expected more than $MIN_SPEED"
+       [ $SPEED -gt $MIN_SPEED ] || {
+               if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then
+                       error_ignore LU-5624 \
+                       "(5.1) Got speed $SPEED, expected more than $MIN_SPEED"
+               else
+                       error \
+                       "(5.2) Got speed $SPEED, expected more than $MIN_SPEED"
+               fi
+       }
 
        # MAX_MARGIN = 1.2 = 12 / 10
        MAX_SPEED=$(((BASE_SPEED1 * (RUN_TIME1 + TIME_DIFF) + \
@@ -1051,8 +1057,15 @@ test_9b() {
        local MIN_SPEED=$(((BASE_SPEED1 * (RUN_TIME1 - TIME_DIFF) + \
                            BASE_SPEED2 * (RUN_TIME2 - TIME_DIFF)) / \
                           (RUN_TIME1 + RUN_TIME2) * 8 / 10))
-       [ $SPEED -gt $MIN_SPEED ] ||[ $(facet_fstype $SINGLEMDS) -eq zfs ] ||
-               error "(9) Got speed $SPEED, expected more than $MIN_SPEED"
+       [ $SPEED -gt $MIN_SPEED ] || {
+               if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then
+                       error_ignore LU-5624 \
+                       "(9.1) Got speed $SPEED, expected more than $MIN_SPEED"
+               else
+                       error \
+                       "(9.2) Got speed $SPEED, expected more than $MIN_SPEED"
+               fi
+       }
 
        # MAX_MARGIN = 1.2 = 12 / 10
        MAX_SPEED=$(((BASE_SPEED1 * (RUN_TIME1 + TIME_DIFF) + \