X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-scrub.sh;h=a6754e99423e6cb613d064fb83a38b7d5003d066;hb=146941d705412bbdb4dbedcef5ced6ac35c694b4;hp=aa32eb721f1a79ab5f6a2489218d739f38927933;hpb=7cecfcffae9737f929a2cbc8067e093a4f85c3ba;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity-scrub.sh b/lustre/tests/sanity-scrub.sh
index aa32eb7..a6754e9 100644
--- a/lustre/tests/sanity-scrub.sh
+++ b/lustre/tests/sanity-scrub.sh
@@ -17,8 +17,10 @@ init_test_env $@
 . ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh}
 init_logging
 
-[ "${MDSFSTYPE:-$FSTYPE}" != "ldiskfs" ] &&
+[ $(facet_fstype $SINGLEMDS) != ldiskfs ] &&
 	skip "test OI scrub only for ldiskfs" && exit 0
+[[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.2.90) ]] &&
+	skip "Need MDS version at least 2.2.90" && exit 0
 require_dsh_mds || exit 0
 
 SAVED_MDSSIZE=${MDSSIZE}
@@ -120,7 +122,7 @@ test_1b() {
 
 		local FLAGS=$($SHOW_SCRUB | awk '/^flags/ { print $2 }')
 		[ "$FLAGS" == "recreated" ] ||
-			error "(3) Expect 'recreated', but got '$STATUS'"
+			error "(3) Expect 'recreated', but got '$FLAGS'"
 
 		$START_SCRUB || error "(4) Fail to start OI scrub!"
 		sleep 3
@@ -322,7 +324,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 +350,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 +368,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 +484,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 +539,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 +677,52 @@ 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 CREATED=100
+	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 $CREATED || 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 }')
+	# 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 1.5x the number of files
+	local MAXIMUM=$((CREATED * 3 / 2))
+	local MINIMUM=$((CREATED + 1)) # files + directory
+	[ $SKIPPED -ge $MAXIMUM -o $SKIPPED -lt $MINIMUM] &&
+	error "(5) Expect [ $MINIMUM , $MAXIMUM ) objects skipped, 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
@@ -685,5 +738,5 @@ OSTSIZE=${SAVED_OSTSIZE}
 # cleanup the system at last
 formatall
 
-complete $(basename $0) $SECONDS
+complete $SECONDS
 exit_status