From 7fe7c11c128ab65e2489a48552d00cefba0a1ac5 Mon Sep 17 00:00:00 2001 From: Fan Yong Date: Wed, 4 Mar 2015 05:13:28 +0800 Subject: [PATCH] LU-6313 tests: more robust for scrub test_11 For the sanity-scrub test_11, except for the known created by the test scripts, there may be other objects (such as for llog) have been created before the first OI scrub scaning. So it is not easy to estimate how many objects should be skipped during the first OI scrub scanning. So we only check that the number of skipped files is more than the number or known created. Signed-off-by: Fan Yong Change-Id: Iced9fb255559394117880514c5e716d05a81a177 Reviewed-on: http://review.whamcloud.com/13957 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Jian Yu Reviewed-by: Lai Siyao Reviewed-by: Oleg Drokin --- lustre/tests/sanity-scrub.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lustre/tests/sanity-scrub.sh b/lustre/tests/sanity-scrub.sh index bc9266a..ef08fcf 100644 --- a/lustre/tests/sanity-scrub.sh +++ b/lustre/tests/sanity-scrub.sh @@ -947,14 +947,13 @@ test_11() { # OI scrub should skip the new created objects for the first accessing # notice we're creating a new llog for every OST on every startup - # new features can make this even less stable, so we only check - # that the number of skipped files is less than 2x the number of files - local MAXIMUM=$((CREATED * 2)) + # new features can make this even less stable, so we only check that + # the number of skipped files is more than the number or known created local MINIMUM=$((CREATED + 1)) # files + directory for n in $(seq $MDSCOUNT); do local SKIPPED=$(scrub_status $n | awk '/^noscrub/ { print $2 }') - [ $SKIPPED -ge $MAXIMUM -o $SKIPPED -lt $MINIMUM ] && - error "(5) Expect [ $MINIMUM , $MAXIMUM ) objects" \ + [ $SKIPPED -lt $MINIMUM ] && + error "(5) Expect at least $MINIMUM objects" \ "skipped on mds$n, but got $SKIPPED" checked0[$n]=$(scrub_status $n | awk '/^checked/ { print $2 }') -- 1.8.3.1