Skip to content

Commit

Permalink
Revert "libceph: clear r_req_lru_item in __unregister_linger_request()"
Browse files Browse the repository at this point in the history
This reverts commit ba9d114.

.. which introduced a regression that prevented all lingering requests
requeued in kick_requests() from ever being sent to the OSDs, resulting
in a lot of missed notifies.  In retrospect it's pretty obvious that
r_req_lru_item item in the case of lingering requests can be used not
only for notarget, but also for unsent linkage due to how tightly
actual map and enqueue operations are coupled in __map_request().

The assertion that was being silenced is taken care of in the previous
("libceph: request a new osdmap if lingering request maps to no osd")
commit: by always kicking homeless lingering requests we ensure that
none of them ends up on the notarget list outside of the critical
section guarded by request_mutex.

Cc: [email protected] # 3.18+, needs b049453 "libceph: request a new osdmap if lingering request maps to no osd"
Signed-off-by: Ilya Dryomov <[email protected]>
Reviewed-by: Sage Weil <[email protected]>
  • Loading branch information
idryomov committed May 20, 2015
1 parent b049453 commit 521a04d
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions net/ceph/osd_client.c
Original file line number Diff line number Diff line change
Expand Up @@ -1306,8 +1306,6 @@ static void __unregister_linger_request(struct ceph_osd_client *osdc,
if (list_empty(&req->r_osd_item))
req->r_osd = NULL;
}

list_del_init(&req->r_req_lru_item); /* can be on notarget */
ceph_osdc_put_request(req);
}

Expand Down

0 comments on commit 521a04d

Please sign in to comment.