LU-5768 target: Revert the test part of the LU-5579 fix

This patch reverts the test part, including the tgt_enqueue() fault
injection, of the LU-5579 fix (d29c0438).  These changes cause
replay-single 52 and 73b to fail frequently.

Change-Id: I63c9210ddd4165cf587272e4216cd39dc608f976
Signed-off-by: Li Wei <wei.g.li@intel.com>
Reviewed-on: http://review.whamcloud.com/12390
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/mdt/mdt_handler.c b/lustre/mdt/mdt_handler.c
index 79da610..45b174e 100644 (file)
--- a/lustre/mdt/mdt_handler.c
+++ b/lustre/mdt/mdt_handler.c
@@ -1432,13 +1432,13 @@ static int mdt_getattr_name_lock(struct mdt_thread_info *info,
        if (unlikely(IS_ERR(child)))
                GOTO(out_parent, rc = PTR_ERR(child));
 
-       OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_RESEND, obd_timeout*2);
        rc = mdt_check_resent_lock(info, child, lhc);
        if (rc < 0) {
                GOTO(out_child, rc);
        } else if (rc > 0) {
                bool try_layout = false;
 
+               OBD_FAIL_TIMEOUT(OBD_FAIL_MDS_RESEND, obd_timeout*2);
                mdt_lock_handle_init(lhc);
                mdt_lock_reg_init(lhc, LCK_PR);
 

diff --git a/lustre/target/tgt_handler.c b/lustre/target/tgt_handler.c
index 241a8e2..c5a9fde 100644 (file)
--- a/lustre/target/tgt_handler.c
+++ b/lustre/target/tgt_handler.c
@@ -793,7 +793,6 @@ int tgt_enqueue(struct tgt_session_info *tsi)
        if (rc)
                RETURN(err_serious(rc));
 
-       tsi->tsi_reply_fail_id = OBD_FAIL_LDLM_REPLY;
        RETURN(req->rq_status);
 }
 EXPORT_SYMBOL(tgt_enqueue);

diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh
index d0c63b8..c11e009 100755 (executable)
--- a/lustre/tests/recovery-small.sh
+++ b/lustre/tests/recovery-small.sh
@@ -1284,36 +1284,6 @@ run_test 61 "Verify to not reuse orphan objects - bug 17025"
 #}
 #run_test 62 "Verify connection flags race - bug LU-1716"
 
-test_66()
-{
-       local list=$(comma_list $(osts_nodes))
-
-       # modify dir so that next revalidate would not obtain UPDATE lock
-       touch $DIR
-
-       # drop 1 reply with UPDATE lock
-       mcreate $DIR/$tfile || error "mcreate failed: $?"
-       drop_ldlm_reply_once "stat $DIR/$tfile" &
-       sleep 2
-
-       # make the re-sent lock to sleep
-#define OBD_FAIL_MDS_RESEND              0x136
-       do_nodes $list lctl set_param fail_loc=0x80000136
-
-       #initiate the re-connect & re-send
-       mdccli=$($LCTL dl | awk '/-mdc-/ {print $4;}')
-       conn_uuid=$($LCTL get_param -n mdc.${mdccli}.mds_conn_uuid)
-       $LCTL set_param "mdc.${mdccli}.import=connection=${conn_uuid}"
-       sleep 2
-
-       #initiate the client eviction while enqueue re-send is in progress
-       mds_evict_client
-
-       client_reconnect
-       wait
-}
-run_test 66 "lock enqueue re-send vs client eviction"
-
 check_cli_ir_state()
 {
         local NODE=${1:-$HOSTNAME}