From 73d6f8f93ff3b8c1cf85f759b11ddc00fc07d931 Mon Sep 17 00:00:00 2001 From: Fan Yong Date: Wed, 23 Nov 2016 01:39:05 +0800 Subject: [PATCH] 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 Change-Id: I14b5096db3d7ca255f3de1a8853dde85ead54215 Reviewed-on: https://review.whamcloud.com/26457 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Jian Yu Reviewed-by: Andreas Dilger --- lustre/tests/sanity-scrub.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) 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 -- 1.8.3.1