From 1c8b40d5e445fac4b4809e082f622efb642e3da5 Mon Sep 17 00:00:00 2001 From: Alex Zhuravlev Date: Thu, 19 Jan 2023 17:14:21 +0300 Subject: [PATCH] LU-16493 tests: recovery-small/144b to wait longer when ZFS is used as ZFS's primitives like osd_write() and osd_declare_write() are still few times slower compared to ldiskfs and this 144b creating wide-striped files which causes lots of tiny writes to the last-used file. Test-Parameters: trivial testlist=recovery-small Test-Parameters: testlist=recovery-small fstype=zfs env=ONLY=144b,ONLY_REPEAT=100 Signed-off-by: Alex Zhuravlev Change-Id: Ib023c7c71a3bb486f9f9908e4cc03cc6e53ace7a Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49693 Reviewed-by: Andreas Dilger Reviewed-by: Arshad Hussain Reviewed-by: Oleg Drokin Tested-by: jenkins Tested-by: Maloo --- lustre/tests/recovery-small.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh index 3356fa8..c5e0ee3 100755 --- a/lustre/tests/recovery-small.sh +++ b/lustre/tests/recovery-small.sh @@ -3118,9 +3118,9 @@ test_144a() { kill -9 $pid >/dev/null 2>&1 done - before=$(date +%s) + before=$SECONDS fail mds1 - after=$(date +%s) + after=$SECONDS # here we measure MDT stop + MDT start time. For error case MDT stop takes # about obd_timeout-60 (240) seconds. Without error - less than 30s. # MDT start takes different time depends on a configuration, let's check @@ -3160,7 +3160,12 @@ test_144b() { done fail ost1 - sleep 60 + + # 60s is not enought with ZFS which is still significatnly + # slower on some operations like record writing + local stime=60 + [[ "$mds1_FSTYPE" != "zfs" ]] || stime=120 + sleep $stime for pid in $pids; do ps -p $pid > /dev/null -- 1.8.3.1