From: Lai Siyao Date: Wed, 13 Jan 2021 09:29:50 +0000 (+0800) Subject: LU-14119 mdc: set fid2path RPC interruptible X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=04fb62ecd5f03612c9f11ab18c89d0236ec96d01;p=fs%2Flustre-release.git LU-14119 mdc: set fid2path RPC interruptible Sometimes OI scrub can't fix the inconsistency in FID and name, and server will return -EINPROGRESS for fid2path request. Upon such failure, client will keep resending the request. Set such request to be interruptible to avoid deadlock. Lustre-change: https://review.whamcloud.com/41219 Lustre-commit: bf475262610671534b1b1a33cebb49d8380b74f7 Signed-off-by: Lai Siyao Change-Id: I82192cb8a8256064ca632cabfe5581b12e86423b Reviewed-by: Andreas Dilger Reviewed-by: Alex Zhuravlev Reviewed-on: https://review.whamcloud.com/44229 Tested-by: jenkins Tested-by: Maloo --- diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c index d1b16a3..c9aebfe 100644 --- a/lustre/mdc/mdc_request.c +++ b/lustre/mdc/mdc_request.c @@ -2261,6 +2261,13 @@ static int mdc_get_info_rpc(struct obd_export *exp, RCL_SERVER, vallen); ptlrpc_request_set_replen(req); + /* if server failed to resolve FID, and OI scrub not able to fix it, it + * will return -EINPROGRESS, ptlrpc_queue_wait() will keep retrying, + * set request interruptible to avoid deadlock. + */ + if (KEY_IS(KEY_FID2PATH)) + req->rq_allow_intr = 1; + rc = ptlrpc_queue_wait(req); /* -EREMOTE means the get_info result is partial, and it needs to * continue on another MDT, see fid2path part in lmv_iocontrol */