From 19d5b835fd1b11b7b2db5cd09da4a0a80c7bda33 Mon Sep 17 00:00:00 2001 From: Nathaniel Clark Date: Sun, 10 Mar 2013 17:27:02 -0400 Subject: [PATCH] LU-2342 tests: account for log size in replay-single/20b Account for larger ondisk log size in ZFS (256) vs. ldiskfs (50). Test-Parameters: mdsfilesystemtype=zfs ostfilesystemtype=zfs mdtfilesystemtype=zfs testlist=replay-single Signed-off-by: Nathaniel Clark Change-Id: I4150d58556240b128c02ba667c4c390c79b8a463 Reviewed-on: http://review.whamcloud.com/5666 Tested-by: Hudson Reviewed-by: Mike Pershin Reviewed-by: Andreas Dilger Tested-by: Maloo --- lustre/tests/replay-single.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh index abc0c5e..6a3260f 100755 --- a/lustre/tests/replay-single.sh +++ b/lustre/tests/replay-single.sh @@ -25,8 +25,8 @@ require_dsh_mds || exit 0 ALWAYS_EXCEPT="61d 33a 33b 89 $REPLAY_SINGLE_EXCEPT" [ $(facet_fstype $SINGLEMDS) = "zfs" ] && -# bug number for skipped test: LU-2342 LU-951 - ALWAYS_EXCEPT="$ALWAYS_EXCEPT 20b 70a 73a" +# bug number for skipped test: LU-951 + ALWAYS_EXCEPT="$ALWAYS_EXCEPT 73a" # 63 min 7 min AT AT AT AT" [ "$SLOW" = "no" ] && EXCEPT_SLOW="1 2 3 4 6 12 16 44a 44b 65 66 67 68" @@ -438,7 +438,7 @@ test_20b() { # bug 10480 wait_mds_ost_sync || return 3 AFTERUSED=`df -P $DIR | tail -1 | awk '{ print $3 }'` log "before $BEFOREUSED, after $AFTERUSED" - [ $AFTERUSED -gt $((BEFOREUSED + 20)) ] && \ + (( $AFTERUSED > $BEFOREUSED + $(fs_log_size) )) && error "after $AFTERUSED > before $BEFOREUSED" return 0 } -- 1.8.3.1