LU-8810 tests: skip non-crucial LFSCK intermediateness check

Sometimes, because of system schedule issue, the test scripts
may miss to check some LFSCK intermediate status, but it will
not affect the LFSCK to detect and repair the inconsistency.
We can skip some non-crucial status check, but check the LFSCK
repaired things directly.

Signed-off-by: Fan Yong <fan.yong@intel.com>
Change-Id: Ie356fa194b9ea7b9194b9fa9f8cf44a69d4c20db
Reviewed-on: https://review.whamcloud.com/23650
Tested-by: Jenkins
Reviewed-by: Jian Yu <jian.yu@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Lai Siyao <lai.siyao@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/tests/sanity-lfsck.sh b/lustre/tests/sanity-lfsck.sh
index 80f38c1..1396a6e 100644 (file)
--- a/lustre/tests/sanity-lfsck.sh
+++ b/lustre/tests/sanity-lfsck.sh
@@ -2183,19 +2183,9 @@ test_18d() {
        [ "$cur_size" != "$saved_size" ] ||
                error "(1) Expect incorrect file2 size"
 
-       #define OBD_FAIL_LFSCK_DELAY3           0x1602
-       do_facet $SINGLEMDS $LCTL set_param fail_val=5 fail_loc=0x1602
-
        echo "Trigger layout LFSCK on all devices to find out orphan OST-object"
        $START_LAYOUT -r -o -c || error "(2) Fail to start LFSCK for layout!"
 
-       wait_update_facet mds1 "$LCTL get_param -n \
-               mdd.$(facet_svc mds1).lfsck_layout |
-               awk '/^status/ { print \\\$2 }'" "scanning-phase2" $LTIME ||
-               error "(3.0) MDS1 is not the expected 'scanning-phase2'"
-
-       do_facet $SINGLEMDS $LCTL set_param fail_val=0 fail_loc=0
-
        for k in $(seq $MDSCOUNT); do
                # The LFSCK status query internal is 30 seconds. For the case
                # of some LFSCK_NOTIFY RPCs failure/lost, we will wait enough