From: Patrick Farrell Date: Fri, 28 Jun 2019 15:32:29 +0000 (-0400) Subject: LU-11873 tests: Increase barrier freeze time X-Git-Tag: 2.12.58~56 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=96771280b330af07781326ff8811facd1ca39deb;p=fs%2Flustre-release.git LU-11873 tests: Increase barrier freeze time Barrier freeze times of 10 seconds or less are roughly the same length as ZFS commit intervals, and because barriers generate sync ops, they have to wait for those. This means that a 10 second barrier will occassionally expire before the commit has finished. Switch to barriers of at least 20 seconds. Signed-off-by: Patrick Farrell Change-Id: I50fc8315c791ed444ccf39755441fdbe3aa1db6c Reviewed-on: https://review.whamcloud.com/35361 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Li Xi --- diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 36ae722..2ed3f57 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -20806,7 +20806,8 @@ test_801a() { echo "Start barrier_freeze at: $(date)" #define OBD_FAIL_BARRIER_DELAY 0x2202 do_facet mgs $LCTL set_param fail_val=5 fail_loc=0x2202 - do_facet mgs $LCTL barrier_freeze $FSNAME 10 & + # Do not reduce barrier time - See LU-11873 + do_facet mgs $LCTL barrier_freeze $FSNAME 20 & sleep 2 local b_status=$(barrier_stat) @@ -20828,7 +20829,8 @@ test_801a() { [ "$b_status" = "'expired'" ] || error "(3) unexpected barrier status $b_status" - do_facet mgs $LCTL barrier_freeze $FSNAME 10 || + # Do not reduce barrier time - See LU-11873 + do_facet mgs $LCTL barrier_freeze $FSNAME 20 || error "(4) fail to freeze barrier" b_status=$(barrier_stat) @@ -20953,7 +20955,8 @@ test_801c() { do_facet mgs $LCTL barrier_rescan $FSNAME || error "(3) Fail to rescan barrier bitmap" - do_facet mgs $LCTL barrier_freeze $FSNAME 10 + # Do not reduce barrier time - See LU-11873 + do_facet mgs $LCTL barrier_freeze $FSNAME 20 b_status=$(barrier_stat) [ "$b_status" = "'frozen'" ] ||