ceph: cancel osd requests before resending them
This ensures we don't submit the same request twice if we are kicking a specific osd (as with an osd_reset), or when we hit a transient error and resend. Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
parent
81b024e70f
commit
266673db42
|
@ -813,10 +813,13 @@ static void kick_requests(struct ceph_osd_client *osdc,
|
|||
|
||||
if (req->r_resend) {
|
||||
dout(" r_resend set on tid %llu\n", req->r_tid);
|
||||
__cancel_request(req);
|
||||
goto kick;
|
||||
}
|
||||
if (req->r_osd && kickosd == req->r_osd)
|
||||
if (req->r_osd && kickosd == req->r_osd) {
|
||||
__cancel_request(req);
|
||||
goto kick;
|
||||
}
|
||||
|
||||
err = __map_osds(osdc, req);
|
||||
if (err == 0)
|
||||
|
|
Loading…
Reference in New Issue