X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity-scrub.sh;h=5b3e2a7b8324c2aa123f4ecec7a871c69c5331a8;hp=8e91ad426ab52060bcfe3f2859177b3b4d074388;hb=4c45115bdf2c5145ca3779c38a06e90024f013f0;hpb=0d3a07a8aa46bd190813b6e6e3da0e12c61a9d09

diff --git a/lustre/tests/sanity-scrub.sh b/lustre/tests/sanity-scrub.sh
index 8e91ad4..5b3e2a7 100644
--- a/lustre/tests/sanity-scrub.sh
+++ b/lustre/tests/sanity-scrub.sh
@@ -7,8 +7,7 @@
 set -e
 
 ONLY=${ONLY:-"$*"}
-#Bug number for excepting test		6705
-ALWAYS_EXCEPT="$SANITY_SCRUB_EXCEPT	1c 5 10"
+ALWAYS_EXCEPT="$SANITY_SCRUB_EXCEPT"
 
 [ "$SLOW" = "no" ] && EXCEPT_SLOW=""
 # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT!
@@ -409,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"
 
@@ -418,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
@@ -452,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
@@ -518,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
@@ -588,7 +587,7 @@ test_5() {
 	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
 
@@ -655,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
 
@@ -733,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
 
@@ -751,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
@@ -766,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)) \
@@ -798,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
@@ -872,7 +871,7 @@ test_10a() {
 	scrub_backup_restore 1
 	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
 
@@ -907,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)) \
@@ -1096,7 +1095,7 @@ test_15() {
 	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
@@ -1105,7 +1104,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
 
@@ -1116,7 +1115,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