b=17323

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

diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh
index cff0f7d..5c4f470 100755 (executable)
--- a/lustre/tests/replay-single.sh
+++ b/lustre/tests/replay-single.sh
@@ -18,8 +18,8 @@ GRANT_CHECK_LIST=${GRANT_CHECK_LIST:-""}
 
 
 # Skip these tests
-# bug number:
-ALWAYS_EXCEPT="$REPLAY_SINGLE_EXCEPT"
+# bug number:  17466
+ALWAYS_EXCEPT="61d   $REPLAY_SINGLE_EXCEPT"
 
 if [ "$FAILURE_MODE" = "HARD" ] && mixed_ost_devs; then
     CONFIG_EXCEPTIONS="0b 42 47 61a 61c"
@@ -1417,6 +1417,21 @@ test_59() {
 }
 run_test 59 "test log_commit_thread vs filter_destroy race"
 
+# bug 17323
+test_59b() {
+    mkdir -p $DIR/$tdir
+    createmany -o $DIR/$tdir/$tfile-%d 2000
+    sync
+#define OBD_FAIL_OBD_LOG_CANCEL_REP      0x606
+    do_facet mds "lctl set_param fail_loc=0x606"
+    unlinkmany $DIR/$tdir/$tfile-%d 2000
+    sleep 60
+    do_facet mds "lctl set_param fail_loc=0x0"
+    $LCTL dk | grep -q "RESENT cancel req" || return 1
+    rmdir $DIR/$tdir
+}
+run_test 59b "resent handle in llog_origin_handle_cancel"
+
 # race between add unlink llog vs cat log init in post_recovery (only for b1_6)
 # bug 12086: should no oops and No ctxt error for this test
 test_60() {