LU-8333 test: Add replay-dual 21b to ALWAYS_EXCEPT

[fs/lustre-release.git] / lustre / tests / replay-dual.sh

diff --git a/lustre/tests/replay-dual.sh b/lustre/tests/replay-dual.sh
index 65d3106..0a25100 100755 (executable)
--- a/lustre/tests/replay-dual.sh
+++ b/lustre/tests/replay-dual.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-# bug number:  LU-2012 10124 LU-7372
-ALWAYS_EXCEPT="14b     15c   26      $REPLAY_DUAL_EXCEPT"
+# bug number:  LU-2012 10124 LU-7372 LU-8333
+ALWAYS_EXCEPT="14b     15c   26      21b     $REPLAY_DUAL_EXCEPT"
 
 SAVE_PWD=$PWD
 PTLDEBUG=${PTLDEBUG:--1}
@@ -968,8 +968,7 @@ test_26() {
                                        error "set default dirstripe failed"
                        fi
                        cd $dbench_dir || break
-                       rundbench 1 -D $dbench_dir -t 100 > /dev/null 2&>1 ||
-                                                                       break
+                       rundbench 1 -D $dbench_dir -t 100 &>/dev/null || break
                        cd $DIR/$tdir || break
                        rm -rf $dbench_dir || break
                done
@@ -1002,6 +1001,28 @@ test_26() {
 }
 run_test 26 "dbench and tar with mds failover"
 
+test_28() {
+       $SETSTRIPE -i 0 -c 1 $DIR2/$tfile
+       dd if=/dev/zero of=$DIR2/$tfile bs=4096 count=1
+
+       #define OBD_FAIL_LDLM_SRV_BL_AST         0x324
+       do_facet ost1 $LCTL set_param fail_loc=0x80000324
+
+       dd if=/dev/zero of=$DIR/$tfile bs=4096 count=1 &
+       local pid=$!
+       sleep 2
+
+       #define OBD_FAIL_LDLM_GRANT_CHECK        0x32a
+       do_facet ost1 $LCTL set_param fail_loc=0x32a
+
+       fail ost1
+
+       sleep 2
+       cancel_lru_locks OST0000-osc
+       wait $pid || error "dd failed"
+}
+run_test 28 "lock replay should be ordered: waiting after granted"
+
 complete $SECONDS
 SLEEP=$((SECONDS - $NOW))
 [ $SLEEP -lt $TIMEOUT ] && sleep $SLEEP