Commit ad885927 authored by Alex Elder's avatar Alex Elder Committed by Sage Weil

libceph: keep request lists in tid order

In __map_request(), when adding a request to an osd client's unsent
list, add it to the tail rather than the head.  That way the newest
entries (with the highest tid value) will be last.

Maintain an osd's request list in order of increasing tid also.

Finally--to be consistent--maintain an osd client's "notarget" list
in that order as well.

This partially resolves:
    http://tracker.ceph.com/issues/4392Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-off-by: default avatarSage Weil <sage@inktank.com>
parent e02493c0
...@@ -619,7 +619,7 @@ static void __kick_osd_requests(struct ceph_osd_client *osdc, ...@@ -619,7 +619,7 @@ static void __kick_osd_requests(struct ceph_osd_client *osdc,
BUG_ON(!list_empty(&req->r_req_lru_item)); BUG_ON(!list_empty(&req->r_req_lru_item));
__register_request(osdc, req); __register_request(osdc, req);
list_add_tail(&req->r_req_lru_item, &osdc->req_unsent); list_add_tail(&req->r_req_lru_item, &osdc->req_unsent);
list_add(&req->r_osd_item, &req->r_osd->o_requests); list_add_tail(&req->r_osd_item, &req->r_osd->o_requests);
__unregister_linger_request(osdc, req); __unregister_linger_request(osdc, req);
dout("requeued lingering %p tid %llu osd%d\n", req, req->r_tid, dout("requeued lingering %p tid %llu osd%d\n", req, req->r_tid,
osd->o_osd); osd->o_osd);
...@@ -1035,10 +1035,10 @@ static int __map_request(struct ceph_osd_client *osdc, ...@@ -1035,10 +1035,10 @@ static int __map_request(struct ceph_osd_client *osdc,
if (req->r_osd) { if (req->r_osd) {
__remove_osd_from_lru(req->r_osd); __remove_osd_from_lru(req->r_osd);
list_add(&req->r_osd_item, &req->r_osd->o_requests); list_add_tail(&req->r_osd_item, &req->r_osd->o_requests);
list_move(&req->r_req_lru_item, &osdc->req_unsent); list_move_tail(&req->r_req_lru_item, &osdc->req_unsent);
} else { } else {
list_move(&req->r_req_lru_item, &osdc->req_notarget); list_move_tail(&req->r_req_lru_item, &osdc->req_notarget);
} }
err = 1; /* osd or pg changed */ err = 1; /* osd or pg changed */
......
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