From 6900a9c60a833e72ddec4a31acbc41d26459a696 Mon Sep 17 00:00:00 2001 From: Lai Siyao Date: Mon, 22 Jun 2020 10:17:06 +0800 Subject: [PATCH] LU-13700 test: increase sanity 230o/230p wait time ZFS may be slow to finish dir split/merge in time, triple wait time to avoid failure. Test-parameters: trivial fstype=zfs testlist=sanity mdscount=2 \ mdtcount=4 env=ONLY=230,ONLY_REPEAT=30 Signed-off-by: Lai Siyao Change-Id: I3d28c942ac925ea201936b53d0487d9a6bf9376c Reviewed-on: https://review.whamcloud.com/39119 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: James Nunez --- lustre/tests/sanity.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 7ba639d..b4d2cea 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -18059,12 +18059,15 @@ test_230o() { skip "Need MDS version at least 2.13.52" local mdts=$(comma_list $(mdts_nodes)) + local timeout=100 local restripe_status local delta local i local j + [[ $(facet_fstype mds1) == zfs ]] && timeout=300 + # in case "crush" hash type is not set do_nodes $mdts "$LCTL set_param lod.*.mdt_hash=crush" @@ -18085,7 +18088,7 @@ test_230o() { $LFS setdirstripe -c $i $DIR/$tdir || error "split -c $i $tdir failed" wait_update $HOSTNAME \ - "$LFS getdirstripe -H $DIR/$tdir" "crush" 100 || + "$LFS getdirstripe -H $DIR/$tdir" "crush" $timeout || error "dir split not finished" delta=$(do_nodes $mdts "lctl get_param -n mdt.*MDT*.md_stats" | awk '/migrate/ {sum += $2} END { print sum }') @@ -18103,12 +18106,15 @@ test_230p() { skip "Need MDS version at least 2.13.52" local mdts=$(comma_list $(mdts_nodes)) + local timeout=100 local restripe_status local delta local i local j + [[ $(facet_fstype mds1) == zfs ]] && timeout=300 + do_nodes $mdts "$LCTL set_param lod.*.mdt_hash=crush" restripe_status=$(do_facet mds1 $LCTL get_param -n \ @@ -18131,7 +18137,7 @@ test_230p() { error "split -c $i $tdir failed" [ $i -eq 1 ] && mdt_hash="none" wait_update $HOSTNAME \ - "$LFS getdirstripe -H $DIR/$tdir" $mdt_hash 100 || + "$LFS getdirstripe -H $DIR/$tdir" $mdt_hash $timeout || error "dir merge not finished" delta=$(do_nodes $mdts "lctl get_param -n mdt.*MDT*.md_stats" | awk '/migrate/ {sum += $2} END { print sum }') -- 1.8.3.1