From: Nathaniel Clark <nathaniel.l.clark@intel.com>
Date: Mon, 28 Apr 2014 22:14:06 +0000 (-0400)
Subject: LU-4934 tests: Account for slow ZFS in sanity-lfsck/9a-b
X-Git-Tag: 2.5.59~48
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=2af7b2b33c8255d14eeb6cfb573eac8438e412f3;p=fs%2Flustre-release.git

LU-4934 tests: Account for slow ZFS in sanity-lfsck/9a-b

Allow lfsck speed to be too slow with ZFS due to it's performance
issues.

Signed-off-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Change-Id: Id39d9468327a02b648ba2c8b4b131250946a04b1
Reviewed-on: http://review.whamcloud.com/10140
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
Reviewed-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/tests/sanity-lfsck.sh b/lustre/tests/sanity-lfsck.sh
index 96b2716..0bdd684 100644
--- a/lustre/tests/sanity-lfsck.sh
+++ b/lustre/tests/sanity-lfsck.sh
@@ -808,7 +808,8 @@ test_9a() {
 	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 ] ||
+	# 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"
 
 	# MAX_MARGIN = 1.2 = 12 / 10
@@ -890,7 +891,7 @@ 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 ] ||
+	[ $SPEED -gt $MIN_SPEED ] ||[ $(facet_fstype $SINGLEMDS) -eq zfs ] ||
 		error "(9) Got speed $SPEED, expected more than $MIN_SPEED"
 
 	# MAX_MARGIN = 1.2 = 12 / 10