From: Fan Yong <fan.yong@intel.com>
Date: Tue, 22 Nov 2016 17:39:05 +0000 (+0800)
Subject: LU-9271 tests: remove unnecessary sanity-scrub test delay
X-Git-Tag: 2.9.56~5
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=73d6f8f93ff3b8c1cf85f759b11ddc00fc07d931;p=fs%2Flustre-release.git

LU-9271 tests: remove unnecessary sanity-scrub test delay

In sanity-scrub test_5, we want to check the OI scrub state machine.
For that, we inject some failure stub to delay the test for checking
status. But sometimes, we want to check the status within some short
time that may be not enough because of the injected test delay. This
patch removes one unnecessary status checking since it has been done
in former check. On the other hand, the subsequent checking also can
indicate the correctness of the skipped status.

Test-parameters: trivial

Signed-off-by: Fan Yong <fan.yong@intel.com>
Change-Id: I14b5096db3d7ca255f3de1a8853dde85ead54215
Reviewed-on: https://review.whamcloud.com/26457
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
---

diff --git a/lustre/tests/sanity-scrub.sh b/lustre/tests/sanity-scrub.sh
index 29ba554..818dc40 100644
--- a/lustre/tests/sanity-scrub.sh
+++ b/lustre/tests/sanity-scrub.sh
@@ -674,9 +674,8 @@ test_5() {
 	mount_client $MOUNT || error "(16) Fail to start client!"
 
 	full_scrub_ratio 0
-	#define OBD_FAIL_OSD_SCRUB_DELAY	 0x190
 	do_nodes $(comma_list $(mdts_nodes)) \
-		$LCTL set_param fail_val=3 fail_loc=0x190
+		$LCTL set_param fail_loc=0 fail_val=0
 
 	local n
 	declare -a pids
@@ -686,13 +685,6 @@ test_5() {
 		pids[$n]=$!
 	done
 
-	sleep 3
-
-	scrub_check_status 17 scanning
-
-	do_nodes $(comma_list $(mdts_nodes)) \
-		$LCTL set_param fail_loc=0 fail_val=0
-
 	for n in $(seq $MDSCOUNT); do
 		wait ${pids[$n]} || error "(18) Fail to stat mds$n/${tfile}800"
 	done