LU-1816 scrub: OI scrub skips new created objects for once

[fs/lustre-release.git] / lustre / tests / sanity-scrub.sh

diff --git a/lustre/tests/sanity-scrub.sh b/lustre/tests/sanity-scrub.sh
index aa32eb7..ea517ac 100644 (file)
--- a/lustre/tests/sanity-scrub.sh
+++ b/lustre/tests/sanity-scrub.sh
@@ -322,7 +322,8 @@ test_6() {
        diff -q $LUSTRE/tests/test-framework.sh $DIR/$tdir/test-framework.sh ||
                error "(6) File diff failed unexpected!"
 
-       sleep 8
+       # Sleep 5 sec to guarantee at least one object processed by OI scrub
+       sleep 5
        # Fail the OI scrub to guarantee there is at least one checkpoint
        #define OBD_FAIL_OSD_SCRUB_FATAL         0x192
        do_facet $SINGLEMDS $LCTL set_param fail_loc=0x80000192
@@ -347,7 +348,7 @@ test_6() {
        #define OBD_FAIL_OSD_SCRUB_CRASH         0x191
        do_facet $SINGLEMDS $LCTL set_param fail_loc=0x80000191
        sleep 4
-       local POSITION0=$($SHOW_SCRUB | \
+       local POSITION0=$($SHOW_SCRUB |
                        awk '/^last_checkpoint_position/ {print $2}')
        POSITION0=$((POSITION0 + 1))
 
@@ -365,7 +366,7 @@ test_6() {
        [ "$STATUS" == "scanning" ] ||
                error "(13) Expect 'scanning', but got '$STATUS'"
 
-       local POSITION1=$($SHOW_SCRUB | \
+       local POSITION1=$($SHOW_SCRUB |
                        awk '/^latest_start_position/ {print $2}')
        [ $POSITION0 -eq $POSITION1 ] ||
                error "(14) Expect position: $POSITION0, but got $POSITION1"
@@ -481,6 +482,11 @@ test_8() {
 run_test 8 "Control OI scrub manually"
 
 test_9() {
+       if [ -z "$(grep "processor.*: 1" /proc/cpuinfo)" ]; then
+               skip "Testing on UP system, the speed may be inaccurate."
+               return 0
+       fi
+
        scrub_prep 8000
        mds_backup_restore || error "(1) Fail to backup/restore!"
 
@@ -531,9 +537,8 @@ test_9() {
        [ $SPEED -lt 220 ] &&
                error "(11) Unexpected speed $SPEED, should not less than 220"
 
-       # (1024 + 100 * 10 + 300 * 10) / 20
-       [ $SPEED -gt 270 ] &&
-               error "(12) Unexpected speed $SPEED, should not more than 270"
+       [ $SPEED -gt 300 ] &&
+               error "(12) Unexpected speed $SPEED, should not more than 300"
 
        do_facet $SINGLEMDS \
                $LCTL set_param -n mdd.${MDT_DEV}.lfsck_speed_limit 0
@@ -670,6 +675,46 @@ test_10b() {
 }
 run_test 10b "non-stopped OI scrub should auto restarts after MDS remount (2)"
 
+test_11() {
+       echo "stopall"
+       stopall > /dev/null
+       echo "setupall"
+       setupall > /dev/null
+
+       local tname=`date +%s`
+       rm -rf $MOUNT/$tname > /dev/null
+       mkdir $MOUNT/$tname || error "(1) Fail to mkdir $MOUNT/$tname"
+
+       createmany -o $MOUNT/$tname/f 100 || error "(2) Fail to create!"
+
+       # reset OI scrub start point by force
+       $START_SCRUB -r || error "(3) Fail to start OI scrub!"
+       sleep 3
+       local STATUS=$($SHOW_SCRUB | awk '/^status/ { print $2 }')
+       [ "$STATUS" == "completed" ] ||
+               error "(4) Expect 'completed', but got '$STATUS'"
+
+       # OI scrub should skip the new created objects for the first accessing
+       local SKIPPED=$($SHOW_SCRUB | awk '/^noscrub/ { print $2 }')
+       [ $SKIPPED -eq 101 ] ||
+               error "(5) Expect 101 objects skipped, but got $SKIPPED"
+
+       # reset OI scrub start point by force
+       $START_SCRUB -r || error "(6) Fail to start OI scrub!"
+       sleep 3
+       STATUS=$($SHOW_SCRUB | awk '/^status/ { print $2 }')
+       [ "$STATUS" == "completed" ] ||
+               error "(7) Expect 'completed', but got '$STATUS'"
+
+       # OI scrub should skip the new created object only once
+       SKIPPED=$($SHOW_SCRUB | awk '/^noscrub/ { print $2 }')
+       [ $SKIPPED -eq 0 ] ||
+               error "(8) Expect 0 objects skipped, but got $SKIPPED"
+
+       rm -rf $MOUNT/$tname > /dev/null
+}
+run_test 11 "OI scrub skips the new created objects only once"
+
 # restore the ${facet}_MKFS_OPTS variables
 for facet in MGS MDS OST; do
        opts=SAVED_${facet}_MKFS_OPTS