Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d5af164 authored by Alex Elder's avatar Alex Elder Committed by Sage Weil
Browse files

libceph: complete lingering requests only once 

An osd request marked to linger will be re-submitted in the event
a connection to the target osd gets dropped.  Currently, if there
is a callback function associated with a request it will be called
each time a request is submitted--which for lingering requests can
be more than once.

Change it so a request--including lingering ones--will get completed
(from the perspective of the user of the osd client) exactly once.

This resolves:
    http://tracker.ceph.com/issues/3967



Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent 3f99969f

include/linux/ceph/osd_client.h

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ struct ceph_osd_request { 
	s32               r_reply_op_result[CEPH_OSD_MAX_OP];

	int               r_got_reply;

	int		  r_linger;

	int		  r_completed;



	struct ceph_osd_client *r_osdc;

	struct kref       r_kref;

net/ceph/osd_client.c

+5 −0
Original line number Diff line number Diff line
@@ -1174,6 +1174,7 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg, 
	u32 reassert_epoch;

	u64 reassert_version;

	u32 osdmap_epoch;

	int already_completed;

	int i;



	tid = le64_to_cpu(msg->hdr.tid);
@@ -1282,7 +1283,11 @@ static void handle_reply(struct ceph_osd_client *osdc, struct ceph_msg *msg, 
	    ((flags & CEPH_OSD_FLAG_WRITE) == 0))

		__unregister_request(osdc, req);



	already_completed = req->r_completed;

	req->r_completed = 1;

	mutex_unlock(&osdc->request_mutex);

	if (already_completed)

		goto done;



	if (req->r_callback)

		req->r_callback(req, msg);