Commit 266673db authored by Sage Weil's avatar Sage Weil
Browse files

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: default avatarSage Weil <sage@newdream.net>
parent 81b024e7

fs/ceph/osd_client.c

+4 −1
Original line number Diff line number Diff line
@@ -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)