From 59d5bb1558b281d75f1fd4bb360498454228afd7 Mon Sep 17 00:00:00 2001 From: Patrick Farrell Date: Mon, 24 Apr 2023 17:49:18 -0400 Subject: [PATCH] LU-13706 tests: remove test 119d The fail_loc used by test 119d was removed in Lustre 2.0. The fail_loc tests for a bug which should be obvious - a serious delay when doing DIO writes - and is definitely fixed in current versions. (Bugzilla 15950) And without the fail_loc, the test isn't doing anything interesting. But the timer based aspect of it fails occasionally due to hardware delays. So let's just remove the test. test-parameters: trivial Signed-off-by: Patrick Farrell Change-Id: I2bc18869258e26dad99c72006f55f31315e67bdd Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50731 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Alex Zhuravlev Reviewed-by: Oleg Drokin --- lustre/include/obd_support.h | 2 +- lustre/tests/sanity.sh | 27 --------------------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h index 0cdde3b..d190c1a 100644 --- a/lustre/include/obd_support.h +++ b/lustre/include/obd_support.h @@ -428,7 +428,7 @@ extern char obd_jobid_var[]; #define OBD_FAIL_OSC_BRW_PREP_REQ2 0x40a /* #define OBD_FAIL_OSC_CONNECT_CKSUM 0x40b Obsolete since 2.9 */ #define OBD_FAIL_OSC_CKSUM_ADLER_ONLY 0x40c -#define OBD_FAIL_OSC_DIO_PAUSE 0x40d +/*#define OBD_FAIL_OSC_DIO_PAUSE 0x40d removed in 2.0 */ #define OBD_FAIL_OSC_OBJECT_CONTENTION 0x40e #define OBD_FAIL_OSC_CP_CANCEL_RACE 0x40f #define OBD_FAIL_OSC_CP_ENQ_RACE 0x410 diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index d0fc80a..f58f69f 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -13269,33 +13269,6 @@ test_119c() # bug 13099 } run_test 119c "Testing for direct read hitting hole" -test_119d() # bug 15950 -{ - [ $PARALLEL == "yes" ] && skip "skip parallel run" - - MAX_RPCS_IN_FLIGHT=`$LCTL get_param -n osc.*OST0000-osc-[^mM]*.max_rpcs_in_flight` - $LCTL set_param -n osc.*OST0000-osc-[^mM]*.max_rpcs_in_flight 1 - BSIZE=1048576 - $LFS setstripe $DIR/$tfile -i 0 -c 1 || error "setstripe failed" - $DIRECTIO write $DIR/$tfile 0 1 $BSIZE || error "first directio failed" - #define OBD_FAIL_OSC_DIO_PAUSE 0x40d - lctl set_param fail_loc=0x40d - $DIRECTIO write $DIR/$tfile 1 4 $BSIZE & - pid_dio=$! - sleep 1 - cat $DIR/$tfile > /dev/null & - lctl set_param fail_loc=0 - pid_reads=$! - wait $pid_dio - log "the DIO writes have completed, now wait for the reads (should not block very long)" - sleep 2 - [ -n "`ps h -p $pid_reads -o comm`" ] && \ - error "the read rpcs have not completed in 2s" - rm -f $DIR/$tfile - $LCTL set_param -n osc.*OST0000-osc-[^mM]*.max_rpcs_in_flight $MAX_RPCS_IN_FLIGHT -} -run_test 119d "The DIO path should try to send a new rpc once one is completed" - test_120a() { [ $PARALLEL == "yes" ] && skip "skip parallel run" remote_mds_nodsh && skip "remote MDS with nodsh" -- 1.8.3.1