From: James Nunez <james.a.nunez@intel.com>
Date: Thu, 17 Aug 2017 20:04:14 +0000 (-0600)
Subject: LU-9887 tests: ignore error sanity-lfsck test 9a,b
X-Git-Tag: 2.10.52~2
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=6754b09335508ca4d977d10d1d05b5befd1a8aad

LU-9887 tests: ignore error sanity-lfsck test 9a,b

sanity-lfsck tests 9a and 9b are failing consistently on
checking that speed limiting LFSCK takes less time than the
user defined maximum speed. We should ignore these errors
for now and print the layout or namespace to help understand
this issue.

Test-Parameters: trivial testgroup=review-zfs-part-1
Test-Parameters: testgroup=review-dne-part-2

Signed-off-by: James Nunez <james.a.nunez@intel.com>
Change-Id: I64cac59edd456e6fd519961a4055130c8dbc8a4a
Reviewed-on: https://review.whamcloud.com/28588
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
---

diff --git a/lustre/tests/sanity-lfsck.sh b/lustre/tests/sanity-lfsck.sh
index 99b1c4e..77588e9 100644
--- a/lustre/tests/sanity-lfsck.sh
+++ b/lustre/tests/sanity-lfsck.sh
@@ -1047,8 +1047,11 @@ test_9a() {
 	# MAX_MARGIN = 1.2 = 12 / 10
 	local MAX_SPEED=$((BASE_SPEED1 * (RUN_TIME1 + TIME_DIFF) / \
 			   RUN_TIME1 * 12 / 10))
-	[ $SPEED -lt $MAX_SPEED ] ||
-		error "(4) Got speed $SPEED, expected less than $MAX_SPEED"
+	[ $SPEED -lt $MAX_SPEED ] || {
+		$SHOW_LAYOUT
+		log "speed1: $BASE_SPEED1 time1: $RUN_TIME1"
+		error_ignore LU-9887 "(4) Speed $SPEED, expected < $MAX_SPEED"
+	}
 
 	# adjust speed limit
 	local BASE_SPEED2=300
@@ -1076,8 +1079,12 @@ test_9a() {
 	MAX_SPEED=$(((BASE_SPEED1 * (RUN_TIME1 + TIME_DIFF) + \
 		      BASE_SPEED2 * (RUN_TIME2 + TIME_DIFF)) / \
 		     (RUN_TIME1 + RUN_TIME2) * 12 / 10))
-	[ $SPEED -lt $MAX_SPEED ] ||
-		error "(6) Got speed $SPEED, expected less than $MAX_SPEED"
+	[ $SPEED -lt $MAX_SPEED ] || {
+		$SHOW_LAYOUT
+		log "speed1: $BASE_SPEED1 time1: $RUN_TIME1"
+		log "speed2: $BASE_SPEED2 time2: $RUN_TIME2"
+		error_ignore LU-9887 "(6) Speed $SPEED, expected < $MAX_SPEED"
+	}
 
 	do_facet $SINGLEMDS \
 		$LCTL set_param -n mdd.${MDT_DEV}.lfsck_speed_limit 0
@@ -1139,8 +1146,11 @@ test_9b() {
 	# MAX_MARGIN = 1.2 = 12 / 10
 	local MAX_SPEED=$((BASE_SPEED1 * (RUN_TIME1 + TIME_DIFF) / \
 			  RUN_TIME1 * 12 / 10))
-	[ $SPEED -lt $MAX_SPEED ] ||
-		error "(8) Got speed $SPEED, expected less than $MAX_SPEED"
+	[ $SPEED -lt $MAX_SPEED ] || {
+		$SHOW_NAMESPACE
+		log "speed1: $BASE_SPEED1 time1: $RUN_TIME1"
+		error_ignore LU-9887 "(8) Speed $SPEED, expected < $MAX_SPEED"
+	}
 
 	# adjust speed limit
 	local BASE_SPEED2=150
@@ -1168,8 +1178,12 @@ test_9b() {
 	MAX_SPEED=$(((BASE_SPEED1 * (RUN_TIME1 + TIME_DIFF) + \
 		      BASE_SPEED2 * (RUN_TIME2 + TIME_DIFF)) / \
 		     (RUN_TIME1 + RUN_TIME2) * 12 / 10))
-	[ $SPEED -lt $MAX_SPEED ] ||
-		error "(10) Got speed $SPEED, expected less than $MAX_SPEED"
+	[ $SPEED -lt $MAX_SPEED ] || {
+		$SHOW_NAMESPACE
+		log "speed1: $BASE_SPEED1 time1: $RUN_TIME1"
+		log "speed2: $BASE_SPEED2 time2: $RUN_TIME2"
+		error_ignore LU-9887 "(10) Speed $SPEED, expected < $MAX_SPEED"
+	}
 
 	do_facet $SINGLEMDS \
 		$LCTL set_param -n mdd.${MDT_DEV}.lfsck_speed_limit 0