From e69eea5f60eec17ac32cea8d2a60768e0738a052 Mon Sep 17 00:00:00 2001 From: Sergey Cheremencev Date: Wed, 5 Apr 2023 13:24:51 +0300 Subject: [PATCH] LU-8367 osp: remove unused fail_locs from sanity/27S,822 OBD_FAIL_OST_GET_LAST_FID and OBD_FAIL_OSP_GET_LAST_FID are not used anymore since sanity test_27S has been removed. This may lead to failures in interoperability testing. For example, 27S caused osp_precreate_cleanup_orphans to stuck due to not cleared opd_pre_recovering flag(normally, it should be set to 0 before calling osp_precreate_reserve). It was the reason of failure tests 27U, 27R, 39r and 51d in sanity.sh. The patch also removes OBD_FAIL_NET_ERROR_RPC and OBD_FAIL_OSP_PRECREATE_PAUSE that were used in sanity-822 "test precreate failure". This test also has been removed in 63e17799a3. Fixes: 63e17799a3 (LU-8367 osp: enable replay for precreation request) Signed-off-by: Sergey Cheremencev Change-Id: Ia78ce39adb9d59e476eb36e5e69954cc26353b27 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50543 Reviewed-by: Oleg Drokin Reviewed-by: Alexander Boyko Reviewed-by: Andreas Dilger Tested-by: jenkins Tested-by: Maloo --- lustre/include/obd_support.h | 4 ---- lustre/ofd/ofd_dev.c | 3 --- lustre/osp/osp_precreate.c | 11 +---------- lustre/ptlrpc/events.c | 6 ------ 4 files changed, 1 insertion(+), 23 deletions(-) diff --git a/lustre/include/obd_support.h b/lustre/include/obd_support.h index 4106083..49bd706 100644 --- a/lustre/include/obd_support.h +++ b/lustre/include/obd_support.h @@ -360,7 +360,6 @@ extern char obd_jobid_var[]; #define OBD_FAIL_OST_SEEK_NET 0x24a #define OBD_FAIL_OST_WR_ATTR_DELAY 0x250 #define OBD_FAIL_OST_RESTART_IO 0x251 -#define OBD_FAIL_OST_GET_LAST_FID 0x252 #define OBD_FAIL_OST_OPCODE 0x253 #define OBD_FAIL_LDLM 0x300 @@ -471,7 +470,6 @@ extern char obd_jobid_var[]; #define OBD_FAIL_PTLRPC_RESEND_RACE 0x525 #define OBD_FAIL_PTLRPC_ROUND_XID 0x530 #define OBD_FAIL_PTLRPC_CONNECT_RACE 0x531 -#define OBD_FAIL_NET_ERROR_RPC 0x532 #define OBD_FAIL_PTLRPC_IDLE_RACE 0x533 #define OBD_FAIL_PTLRPC_ENQ_RESEND 0x534 #define OBD_FAIL_PTLRPC_DELAY_SEND_FAIL 0x535 @@ -742,8 +740,6 @@ extern char obd_jobid_var[]; #define OBD_FAIL_OSP_CANT_PROCESS_LLOG 0x2105 #define OBD_FAIL_OSP_INVALID_LOGID 0x2106 #define OBD_FAIL_OSP_CON_EVENT_DELAY 0x2107 -#define OBD_FAIL_OSP_PRECREATE_PAUSE 0x2108 -#define OBD_FAIL_OSP_GET_LAST_FID 0x2109 #define OBD_FAIL_OSP_FORCE_NEW_SEQ 0x210a /* barrier */ diff --git a/lustre/ofd/ofd_dev.c b/lustre/ofd/ofd_dev.c index bdd5026..10f2ebc 100644 --- a/lustre/ofd/ofd_dev.c +++ b/lustre/ofd/ofd_dev.c @@ -1122,9 +1122,6 @@ static int ofd_get_info_hdl(struct tgt_session_info *tsi) if (rc) RETURN(err_serious(rc)); - if (OBD_FAIL_CHECK(OBD_FAIL_OST_GET_LAST_FID)) - RETURN(-EAGAIN); - fid = req_capsule_client_get(tsi->tsi_pill, &RMF_FID); if (fid == NULL) RETURN(err_serious(-EPROTO)); diff --git a/lustre/osp/osp_precreate.c b/lustre/osp/osp_precreate.c index 384ad03..2c04b5e 100644 --- a/lustre/osp/osp_precreate.c +++ b/lustre/osp/osp_precreate.c @@ -711,9 +711,6 @@ out_req: /* now we can wakeup all users awaiting for objects */ osp_pre_update_status(d, rc); - /* pause to let osp_precreate_reserve to go first */ - CFS_FAIL_TIMEOUT(OBD_FAIL_OSP_PRECREATE_PAUSE, 2); - ptlrpc_req_finished(req); RETURN(rc); } @@ -887,8 +884,7 @@ static int osp_precreate_cleanup_orphans(struct lu_env *env, *last_fid = d->opd_last_used_fid; /* The OSP should already get the valid seq now */ LASSERT(!fid_is_zero(last_fid)); - if (fid_oid(&d->opd_last_used_fid) < 2 || - OBD_FAIL_CHECK(OBD_FAIL_OSP_GET_LAST_FID)) { + if (fid_oid(&d->opd_last_used_fid) < 2) { /* lastfid looks strange... ask OST */ rc = osp_get_lastfid_from_ost(env, d, true); if (rc) @@ -1336,11 +1332,6 @@ static int osp_precreate_thread(void *_args) if (d->opd_pre == NULL) continue; - if (OBD_FAIL_CHECK(OBD_FAIL_OSP_GET_LAST_FID)) { - d->opd_pre_recovering = 1; - break; - } - /* To avoid handling different seq in precreate/orphan * cleanup, it will hold precreate until current seq is * used up. */ diff --git a/lustre/ptlrpc/events.c b/lustre/ptlrpc/events.c index 33ce2b0..f0c9fa7 100644 --- a/lustre/ptlrpc/events.c +++ b/lustre/ptlrpc/events.c @@ -55,12 +55,6 @@ void request_out_callback(struct lnet_event *ev) LASSERT(ev->type == LNET_EVENT_SEND || ev->type == LNET_EVENT_UNLINK); LASSERT(ev->unlinked); - if (unlikely(lustre_msg_get_opc(req->rq_reqmsg) == cfs_fail_val && - CFS_FAIL_CHECK_RESET(OBD_FAIL_NET_ERROR_RPC, - OBD_FAIL_OSP_PRECREATE_PAUSE | - CFS_FAIL_ONCE))) - ev->status = -ECONNABORTED; - DEBUG_REQ(D_NET, req, "type %d, status %d", ev->type, ev->status); /* Do not update imp_next_ping for connection request */ -- 1.8.3.1