Skip to content

Commit 521a04d

Browse files
committed
Revert "libceph: clear r_req_lru_item in __unregister_linger_request()"
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]>
1 parent b049453 commit 521a04d

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

net/ceph/osd_client.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1306,8 +1306,6 @@ static void __unregister_linger_request(struct ceph_osd_client *osdc,
13061306
if (list_empty(&req->r_osd_item))
13071307
req->r_osd = NULL;
13081308
}
1309-
1310-
list_del_init(&req->r_req_lru_item); /* can be on notarget */
13111309
ceph_osdc_put_request(req);
13121310
}
13131311

0 commit comments

Comments
 (0)