Commit ca238c7a authored by Yan, Zheng's avatar Yan, Zheng Committed by Sasha Levin

ceph: cleanup aborted requests when re-sending requests.

Aborted requests usually get cleared when the reply is received.
If MDS crashes, no reply will be received. So we need to cleanup
aborted requests when re-sending requests.
Signed-off-by: default avatarYan, Zheng <zheng.z.yan@intel.com>
Reviewed-by: default avatarGreg Farnum <greg@inktank.com>
Signed-off-by: default avatarSage Weil <sage@inktank.com>

(cherry picked from commit eb1b8af3)
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 7f60f768
...@@ -1805,8 +1805,11 @@ static int __do_request(struct ceph_mds_client *mdsc, ...@@ -1805,8 +1805,11 @@ static int __do_request(struct ceph_mds_client *mdsc,
int mds = -1; int mds = -1;
int err = -EAGAIN; int err = -EAGAIN;
if (req->r_err || req->r_got_result) if (req->r_err || req->r_got_result) {
if (req->r_aborted)
__unregister_request(mdsc, req);
goto out; goto out;
}
if (req->r_timeout && if (req->r_timeout &&
time_after_eq(jiffies, req->r_started + req->r_timeout)) { time_after_eq(jiffies, req->r_started + req->r_timeout)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment