From: Andreas Dilger Date: Tue, 16 Jun 2020 06:48:01 +0000 (-0600) Subject: LU-10934 tests: increase timeout for sanityn test_51b X-Git-Tag: 2.13.56~85 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=9edec7ab92fb24f0a46e019c65a21481f9314d07;hp=3d4b5dacb3053f39d79d59860a903a19e76b9318 LU-10934 tests: increase timeout for sanityn test_51b Increase the timeout for sanityn test_51b, since this is causing intermittent test failures when stat() is run before dd finishes. Test-Parameters: trivial testlist=sanityn env=ONLY=51b,ONLY_REPEAT=100 Signed-off-by: Andreas Dilger Change-Id: Ieb3d50e6b534b535e8255cbbc566f053f33ebbe5 Reviewed-on: https://review.whamcloud.com/38947 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Nunez Reviewed-by: Yingjin Qian Reviewed-by: Oleg Drokin --- diff --git a/lustre/llite/glimpse.c b/lustre/llite/glimpse.c index d0bb414..bc09c33 100644 --- a/lustre/llite/glimpse.c +++ b/lustre/llite/glimpse.c @@ -215,7 +215,7 @@ int cl_glimpse_size0(struct inode *inode, int agl) io->ci_need_restart = 1; } - OBD_FAIL_TIMEOUT(OBD_FAIL_GLIMPSE_DELAY, 2); + OBD_FAIL_TIMEOUT(OBD_FAIL_GLIMPSE_DELAY, cfs_fail_val ?: 4); cl_io_fini(env, io); } while (unlikely(io->ci_need_restart)); diff --git a/lustre/tests/sanityn.sh b/lustre/tests/sanityn.sh index c75a476..9ee1e95 100755 --- a/lustre/tests/sanityn.sh +++ b/lustre/tests/sanityn.sh @@ -2932,10 +2932,10 @@ test_51b() { # delay glimpse so that layout has changed when glimpse finish #define OBD_FAIL_GLIMPSE_DELAY 0x1404 - $LCTL set_param fail_loc=0x1404 + $LCTL set_param fail_loc=0x1404 fail_val=4 stat -c %s $DIR2/$tfile |tee $tmpfile & local pid=$! - sleep 1 + sleep 0.2 # extend layout of testing file dd if=/dev/zero of=$DIR1/$tfile bs=1M count=1 seek=2 conv=notrunc ||