LU-5810 tests: add client hostname to lctl mark

[fs/lustre-release.git] / lustre / tests / recovery-small.sh

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index 14a6e3e..a36eeb1 100755 (executable)
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -16,8 +16,8 @@ init_logging
 require_dsh_mds || exit 0
 
 # also long tests: 19, 21a, 21e, 21f, 23, 27
-#                                   1  2.5  2.5    4    4          (min)"
-[ "$SLOW" = "no" ] && EXCEPT_SLOW="17  26a  26b    50   51     57"
+
+[ "$SLOW" = "no" ] && EXCEPT_SLOW=""
 
 [ $(facet_fstype $SINGLEMDS) = "zfs" ] &&
 # bug number for skipped test:       LU-2547
@@ -308,7 +308,7 @@ run_test 11 "wake up a thread waiting for completion after eviction (b=2460)"
 
 #b=2494
 test_12(){
-       $LCTL mark $MULTIOP $DIR/$tfile OS_c
+       $LCTL mark "$HOSTNAME: $MULTIOP $DIR/$tfile OS_c"
        do_facet $SINGLEMDS "lctl set_param fail_loc=0x115"
        clear_failloc $SINGLEMDS $((TIMEOUT * 2)) &
        multiop_bg_pause $DIR/$tfile OS_c ||
@@ -2118,119 +2118,6 @@ test_112a() {
 }
 run_test 112a "bulk resend while orignal request is in progress"
 
-test_115_read() {
-       local fail1=$1
-       local fail2=$2
-
-       df $DIR
-       dd if=/dev/zero of=$DIR/$tfile bs=4096 count=1
-       cancel_lru_locks osc
-
-       # OST_READ       =  3,
-       $LCTL set_param fail_loc=$fail1 fail_val=3
-       dd of=/dev/null if=$DIR/$tfile bs=4096 count=1 &
-       pid=$!
-       sleep 1
-
-       set_nodes_failloc "$(osts_nodes)" $fail2
-
-       wait $pid || error "dd failed"
-       return 0
-}
-
-test_115_write() {
-       local fail1=$1
-       local fail2=$2
-       local error=$3
-
-       df $DIR
-       touch $DIR/$tfile
-
-       # OST_WRITE      =  4,
-       $LCTL set_param fail_loc=$fail1 fail_val=4
-       dd if=/dev/zero of=$DIR/$tfile bs=4096 count=1 oflag=dsync &
-       pid=$!
-       sleep 1
-
-       df $MOUNT
-       set_nodes_failloc "$(osts_nodes)" $fail2
-
-       wait $pid
-       rc=$?
-       [ $error -eq 0 ] && [ $rc -ne 0 ] && error "dd error ($rc)"
-       [ $error -ne 0 ] && [ $rc -eq 0 ] && error "dd success"
-       return 0
-}
-
-test_115a() {
-       [ $(lustre_version_code ost1) -lt $(version_code 2.8.50) ] &&
-               skip "need at least 2.8.50 on OST" && return 0
-
-       #define OBD_FAIL_PTLRPC_LONG_REQ_UNLINK  0x51b
-       #define OBD_FAIL_PTLRPC_DROP_BULK        0x51a
-       test_115_read 0x8000051b 0x8000051a
-}
-run_test 115a "read: late REQ MDunlink and no bulk"
-
-test_115b() {
-       [ $(lustre_version_code ost1) -lt $(version_code 2.8.50) ] &&
-               skip "need at least 2.8.50 on OST" && return 0
-
-       #define OBD_FAIL_PTLRPC_LONG_REQ_UNLINK  0x51b
-       #define OBD_FAIL_OST_ENOSPC              0x215
-       test_115_write 0x8000051b 0x80000215 1
-}
-run_test 115b "write: late REQ MDunlink and no bulk"
-
-test_115c() {
-       [ $(lustre_version_code ost1) -lt $(version_code 2.8.50) ] &&
-               skip "need at least 2.8.50 on OST" && return 0
-
-       #define OBD_FAIL_PTLRPC_LONG_REPL_UNLINK 0x50f
-       #define OBD_FAIL_PTLRPC_DROP_BULK        0x51a
-       test_115_read 0x8000050f 0x8000051a
-}
-run_test 115c "read: late Reply MDunlink and no bulk"
-
-test_115d() {
-       [ $(lustre_version_code ost1) -lt $(version_code 2.8.50) ] &&
-               skip "need at least 2.8.50 on OST" && return 0
-
-       #define OBD_FAIL_PTLRPC_LONG_REPL_UNLINK 0x50f
-       #define OBD_FAIL_OST_ENOSPC              0x215
-       test_115_write 0x8000050f 0x80000215 0
-}
-run_test 115d "write: late Reply MDunlink and no bulk"
-
-test_115e() {
-       [ $(lustre_version_code ost1) -lt $(version_code 2.8.50) ] &&
-               skip "need at least 2.8.50 on OST" && return 0
-
-       #define OBD_FAIL_PTLRPC_LONG_BULK_UNLINK 0x510
-       #define OBD_FAIL_OST_ALL_REPLY_NET       0x211
-       test_115_read 0x80000510 0x80000211
-}
-run_test 115e "read: late Bulk MDunlink and no reply"
-
-test_115f() {
-       [ $(lustre_version_code ost1) -lt $(version_code 2.8.50) ] &&
-               skip "need at least 2.8.50 on OST" && return 0
-
-       #define OBD_FAIL_PTLRPC_LONG_REQ_UNLINK  0x51b
-       #define OBD_FAIL_OST_ALL_REPLY_NET       0x211
-       test_115_read 0x8000051b 0x80000211
-}
-run_test 115f "read: late REQ MDunlink and no reply"
-
-test_115g() {
-       [ $(lustre_version_code ost1) -lt $(version_code 2.8.50) ] &&
-               skip "need at least 2.8.50 on OST" && return 0
-
-       #define OBD_FAIL_PTLRPC_LONG_BOTH_UNLINK 0x51c
-       test_115_read 0x8000051c 0
-}
-run_test 115g "read: late REQ MDunlink and Reply MDunlink"
-
 # parameters: fail_loc CMD RC
 test_120_reply() {
        local PID