X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-scrub.sh;h=f45cba90e36efb00bd4293c2860912d3654eef52;hb=c28933602a6971739cb5ec3a1e920409ff19b01e;hp=bc9266a3099cedb1a35df5c7e0a44d255aeb9213;hpb=2d3d4525b1ac6697b5df207400801c4399d20378;p=fs%2Flustre-release.git

diff --git a/lustre/tests/sanity-scrub.sh b/lustre/tests/sanity-scrub.sh
index bc9266a..f45cba9 100644
--- a/lustre/tests/sanity-scrub.sh
+++ b/lustre/tests/sanity-scrub.sh
@@ -8,6 +8,7 @@ set -e
 
 ONLY=${ONLY:-"$*"}
 ALWAYS_EXCEPT="$SANITY_SCRUB_EXCEPT"
+
 [ "$SLOW" = "no" ] && EXCEPT_SLOW=""
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
 
@@ -19,6 +20,22 @@ init_logging
 
 require_dsh_mds || exit 0
 
+load_modules
+
+if ! check_versions; then
+	skip "It is NOT necessary to test scrub under interoperation mode"
+	exit 0
+fi
+
+[ $(facet_fstype $SINGLEMDS) != "ldiskfs" ] &&
+	skip "test OI scrub only for ldiskfs" && exit 0
+
+[ $(facet_fstype ost1) != "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
+
 SAVED_MDSSIZE=${MDSSIZE}
 SAVED_OSTSIZE=${OSTSIZE}
 SAVED_OSTCOUNT=${OSTCOUNT}
@@ -28,6 +45,7 @@ SAVED_OSTCOUNT=${OSTCOUNT}
 MDSSIZE=200000
 OSTSIZE=100000
 # no need too much OSTs, to reduce the format/start/stop overhead
+stopall
 [ $OSTCOUNT -gt 4 ] && OSTCOUNT=4
 
 MOUNT_2=""
@@ -36,16 +54,6 @@ MOUNT_2=""
 formatall
 setupall
 
-[ $(facet_fstype $SINGLEMDS) != "ldiskfs" ] &&
-	skip "test OI scrub only for ldiskfs" && check_and_cleanup_lustre &&
-	exit 0
-[ $(facet_fstype ost1) != "ldiskfs" ] &&
-	skip "test OI scrub only for ldiskfs" && check_and_cleanup_lustre &&
-	exit 0
-[[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.2.90) ]] &&
-	skip "Need MDS version at least 2.2.90" && check_and_cleanup_lustre &&
-	exit 0
-
 [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.3.90) ]] &&
 	ALWAYS_EXCEPT="$ALWAYS_EXCEPT 1a"
 
@@ -322,8 +330,7 @@ run_test 0 "Do not auto trigger OI scrub for non-backup/restore case"
 test_1a() {
 	scrub_prep 0
 	echo "start $SINGLEMDS without disabling OI scrub"
-	start $SINGLEMDS $MDT_DEVNAME $MOUNT_OPTS_SCRUB > /dev/null ||
-		error "(1) Fail to start MDS!"
+	scrub_start_mds 1 "$MOUNT_OPTS_SCRUB"
 
 	local FLAGS=$($SHOW_SCRUB | awk '/^flags/ { print $2 }')
 	[ -z "$FLAGS" ] || error "(3) Expect empty flags, but got '$FLAGS'"
@@ -401,7 +408,7 @@ test_3() {
 	echo "starting MDTs with OI scrub disabled"
 	scrub_start_mds 2 "$MOUNT_OPTS_NOSCRUB"
 	scrub_check_status 3 init
-	scrub_check_flags 4 inconsistent
+	scrub_check_flags 4 recreated,inconsistent
 }
 #run_test 3 "Do not trigger OI scrub when MDT mounts if 'noscrub' specified"
 
@@ -410,7 +417,7 @@ test_4a() {
 	scrub_backup_restore 1
 	echo "starting MDTs with OI scrub disabled"
 	scrub_start_mds 2 "$MOUNT_OPTS_NOSCRUB"
-	scrub_check_flags 4 inconsistent
+	scrub_check_flags 4 recreated,inconsistent
 	mount_client $MOUNT || error "(5) Fail to start client!"
 	scrub_enable_auto
 	full_scrub_ratio 0
@@ -444,7 +451,7 @@ test_4b() {
 	scrub_backup_restore 1
 	echo "starting MDTs with OI scrub disabled"
 	scrub_start_mds 2 "$MOUNT_OPTS_NOSCRUB"
-	scrub_check_flags 4 inconsistent
+	scrub_check_flags 4 recreated,inconsistent
 	mount_client $MOUNT || error "(5) Fail to start client!"
 	scrub_enable_auto
 	full_scrub_ratio 10
@@ -510,7 +517,7 @@ test_4c() {
 	scrub_backup_restore 1
 	echo "starting MDTs with OI scrub disabled"
 	scrub_start_mds 2 "$MOUNT_OPTS_NOSCRUB"
-	scrub_check_flags 4 inconsistent
+	scrub_check_flags 4 recreated,inconsistent
 	mount_client $MOUNT || error "(5) Fail to start client!"
 	scrub_enable_auto
 	full_scrub_ratio 2
@@ -577,10 +584,10 @@ test_5() {
 
 	scrub_prep 1000
 	scrub_backup_restore 1
-	echo "starting MDTs with OI scrub disabled"
+	echo "starting MDTs with OI scrub disabled (1)"
 	scrub_start_mds 2 "$MOUNT_OPTS_NOSCRUB"
 	scrub_check_status 3 init
-	scrub_check_flags 4 inconsistent
+	scrub_check_flags 4 recreated,inconsistent
 	mount_client $MOUNT || error "(5) Fail to start client!"
 	scrub_enable_auto
 
@@ -602,7 +609,7 @@ test_5() {
 	do_nodes $(comma_list $(mdts_nodes)) \
 		$LCTL set_param fail_loc=0 fail_val=0
 
-	echo "starting MDTs with OI scrub disabled"
+	echo "starting MDTs with OI scrub disabled (2)"
 	scrub_start_mds 10 "$MOUNT_OPTS_NOSCRUB"
 	scrub_check_status 11 crashed
 	scrub_stop_mds 12
@@ -647,7 +654,7 @@ test_6() {
 	scrub_backup_restore 1
 	echo "starting MDTs with OI scrub disabled"
 	scrub_start_mds 2 "$MOUNT_OPTS_NOSCRUB"
-	scrub_check_flags 4 inconsistent
+	scrub_check_flags 4 recreated,inconsistent
 	mount_client $MOUNT || error "(5) Fail to start client!"
 	scrub_enable_auto
 
@@ -725,7 +732,7 @@ test_7() {
 	scrub_backup_restore 1
 	echo "starting MDTs with OI scrub disabled"
 	scrub_start_mds 2 "$MOUNT_OPTS_NOSCRUB"
-	scrub_check_flags 4 inconsistent
+	scrub_check_flags 4 recreated,inconsistent
 	mount_client $MOUNT || error "(5) Fail to start client!"
 	scrub_enable_auto
 
@@ -743,7 +750,7 @@ test_7() {
 	done
 
 	scrub_check_status 8 scanning
-	scrub_check_flags 9 inconsistent,auto
+	scrub_check_flags 9 recreated,inconsistent,auto
 
 	do_nodes $(comma_list $(mdts_nodes)) \
 		$LCTL set_param fail_loc=0 fail_val=0
@@ -758,7 +765,7 @@ test_8() {
 	scrub_backup_restore 1
 	echo "starting MDTs with OI scrub disabled"
 	scrub_start_mds 2 "$MOUNT_OPTS_NOSCRUB"
-	scrub_check_flags 4 inconsistent
+	scrub_check_flags 4 recreated,inconsistent
 
 	#define OBD_FAIL_OSD_SCRUB_DELAY	 0x190
 	do_nodes $(comma_list $(mdts_nodes)) \
@@ -790,7 +797,7 @@ test_9() {
 
 	echo "starting MDTs with OI scrub disabled"
 	scrub_start_mds 2 "$MOUNT_OPTS_NOSCRUB"
-	scrub_check_flags 4 inconsistent
+	scrub_check_flags 4 recreated,inconsistent
 
 	local BASE_SPEED1=100
 	local RUN_TIME1=10
@@ -862,9 +869,9 @@ run_test 9 "OI scrub speed control"
 test_10a() {
 	scrub_prep 0
 	scrub_backup_restore 1
-	echo "starting mds$n with OI scrub disabled"
+	echo "starting mds$n with OI scrub disabled (1)"
 	scrub_start_mds 2 "$MOUNT_OPTS_NOSCRUB"
-	scrub_check_flags 4 inconsistent
+	scrub_check_flags 4 recreated,inconsistent
 	mount_client $MOUNT || error "(5) Fail to start client!"
 	scrub_enable_auto
 
@@ -877,7 +884,7 @@ test_10a() {
 	scrub_check_status 7 scanning
 	umount_client $MOUNT || error "(8) Fail to stop client!"
 	scrub_stop_mds 9
-	echo "starting MDTs with OI scrub disabled"
+	echo "starting MDTs with OI scrub disabled (2)"
 	scrub_start_mds 10 "$MOUNT_OPTS_NOSCRUB"
 	scrub_check_status 11 paused
 	scrub_stop_mds 12
@@ -899,7 +906,7 @@ test_10b() {
 	scrub_backup_restore 1
 	echo "starting MDTs with OI scrub disabled"
 	scrub_start_mds 2 "$MOUNT_OPTS_NOSCRUB"
-	scrub_check_flags 4 inconsistent
+	scrub_check_flags 4 recreated,inconsistent
 
 	#define OBD_FAIL_OSD_SCRUB_DELAY	 0x190
 	do_nodes $(comma_list $(mdts_nodes)) \
@@ -947,14 +954,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 }')
@@ -1072,7 +1078,7 @@ test_14() {
 	mount_client $MOUNT || error "(5) Fail to start client!"
 
 	local LF_REPAIRED=$($SHOW_SCRUB_ON_OST |
-			    awk '/^lf_reparied/ { print $2 }')
+			    awk '/^lf_repa[ri]*ed/ { print $2 }')
 	[ $LF_REPAIRED -gt 0 ] ||
 		error "(6) Some entry under /lost+found should be repaired"
 
@@ -1081,15 +1087,13 @@ test_14() {
 run_test 14 "OI scrub can repair objects under lost+found"
 
 test_15() {
-	# skip test_15 for LU-4182
-	[ $MDSCOUNT -ge 2 ] && skip "skip now for >= 2 MDTs" && return
 	local server_version=$(lustre_version_code $SINGLEMDS)
 	scrub_prep 20
 	scrub_backup_restore 1
 	echo "starting MDTs with OI scrub disabled"
 	scrub_start_mds 2 "$MOUNT_OPTS_NOSCRUB"
 	scrub_check_status 3 init
-	scrub_check_flags 4 inconsistent
+	scrub_check_flags 4 recreated,inconsistent
 
 	# run under dryrun mode
 	if [ $server_version -lt $(version_code 2.5.58) ]; then
@@ -1098,7 +1102,7 @@ test_15() {
 		scrub_start 5 --dryrun
 	fi
 	scrub_check_status 6 completed
-	scrub_check_flags 7 inconsistent
+	scrub_check_flags 7 recreated,inconsistent
 	scrub_check_params 8 dryrun
 	scrub_check_repaired 9 20
 
@@ -1109,7 +1113,7 @@ test_15() {
 		scrub_start 10 --dryrun
 	fi
 	scrub_check_status 11 completed
-	scrub_check_flags 12 inconsistent
+	scrub_check_flags 12 recreated,inconsistent
 	scrub_check_params 13 dryrun
 	scrub_check_repaired 14 20