LU-3559 utils: mgs has no index

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

diff --git a/lustre/tests/sanity-scrub.sh b/lustre/tests/sanity-scrub.sh
index 9d12686..97e4187 100644 (file)
--- a/lustre/tests/sanity-scrub.sh
+++ b/lustre/tests/sanity-scrub.sh
@@ -26,6 +26,7 @@ SAVED_OSTSIZE=${OSTSIZE}
 MDSSIZE=100000
 OSTSIZE=100000
 
+MOUNT_2=""
 check_and_setup_lustre
 
 [ $(facet_fstype $SINGLEMDS) != ldiskfs ] &&
@@ -482,7 +483,7 @@ test_7() {
 run_test 7 "System is available during OI scrub scanning"
 
 test_8() {
-       scrub_prep 0
+       scrub_prep 128
        mds_backup_restore || error "(1) Fail to backup/restore!"
 
        echo "start $SINGLEMDS with disabling OI scrub"
@@ -498,7 +499,7 @@ test_8() {
                error "(4) Expect 'inconsistent', but got '$FLAGS'"
 
        #define OBD_FAIL_OSD_SCRUB_DELAY         0x190
-       do_facet $SINGLEMDS $LCTL set_param fail_val=3
+       do_facet $SINGLEMDS $LCTL set_param fail_val=1
        do_facet $SINGLEMDS $LCTL set_param fail_loc=0x190
        $START_SCRUB || error "(5) Fail to start OI scrub!"
 
@@ -639,7 +640,7 @@ test_10a() {
        do_facet $SINGLEMDS \
                $LCTL set_param -n osd-ldiskfs.${MDT_DEV}.auto_scrub 1
        #define OBD_FAIL_OSD_SCRUB_DELAY         0x190
-       do_facet $SINGLEMDS $LCTL set_param fail_val=3
+       do_facet $SINGLEMDS $LCTL set_param fail_val=1
        do_facet $SINGLEMDS $LCTL set_param fail_loc=0x190
        diff -q $LUSTRE/tests/test-framework.sh $DIR/$tdir/test-framework.sh ||
                error "(6) File diff failed unexpected!"
@@ -684,6 +685,7 @@ test_10a() {
 }
 run_test 10a "non-stopped OI scrub should auto restarts after MDS remount (1)"
 
+# test_10b is obsolete, it will be coverded by related sanity-lfsck tests.
 test_10b() {
        scrub_prep 0
        mds_backup_restore || error "(1) Fail to backup/restore!"
@@ -742,7 +744,7 @@ test_10b() {
        FLAGS=$($SHOW_SCRUB | awk '/^flags/ { print $2 }')
        [ -z "$FLAGS" ] || error "(14) Expect empty flags, but got '$FLAGS'"
 }
-run_test 10b "non-stopped OI scrub should auto restarts after MDS remount (2)"
+#run_test 10b "non-stopped OI scrub should auto restarts after MDS remount (2)"
 
 test_11() {
        echo "stopall"
@@ -759,6 +761,9 @@ test_11() {
 
        createmany -o $MOUNT/$tname/f $CREATED || error "(2) Fail to create!"
 
+       cleanup_mount $MOUNT
+       do_facet $SINGLEMDS $LCTL clear
+       start_full_debug_logging
        # reset OI scrub start point by force
        $START_SCRUB -r || error "(3) Fail to start OI scrub!"
        sleep 3
@@ -788,6 +793,8 @@ test_11() {
        [ $SKIPPED -eq 0 ] ||
                error "(8) Expect 0 objects skipped, but got $SKIPPED"
 
+       stop_full_debug_logging
+       restore_mount $MOUNT || error "(9) Fail to start client!"
        rm -rf $MOUNT/$tname > /dev/null
 }
 run_test 11 "OI scrub skips the new created objects only once"