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.

Lustre-change: https://review.whamcloud.com/35361
Lustre-commit: 96771280b330af07781326ff8811facd1ca39deb

Signed-off-by: Patrick Farrell <pfarrell@whamcloud.com>
Change-Id: I50fc8315c791ed444ccf39755441fdbe3aa1db6c
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Li Xi <lixi@ddn.com>
Signed-off-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/35952
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 4c32dda..f3010bf 100755 (executable)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -19691,7 +19691,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)
@@ -19713,7 +19714,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)
@@ -19838,7 +19840,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'" ] ||