If __map_request failed ,the request can't send and in list req_notarget.
For those, they only remaped in func ceph_osdc_handle_map which update
the epoch of osdmap.There are some reasons like ENOMEM which can't cause
update epoch of osdmap.So the notarget requested can't remap for ever.
Add a chance in handle_timeout to remap those.
Signed-off-by: Jianpeng Ma <majianpeng@xxxxxxxxx>
---
net/ceph/osd_client.c | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
index 7d40a61..f0deed0 100644
--- a/net/ceph/osd_client.c
+++ b/net/ceph/osd_client.c
@@ -1355,6 +1355,41 @@ static void __send_queued(struct ceph_osd_client *osdc)
}
/*
+ * Resend any requests in the queue(req_notarget)
+ * After this function,it should call __send_queued to do
+ * real send operation
+ */
+static void __send_notarget(struct ceph_osd_client *osdc)
+{
+ struct ceph_osd_request *req, *tmp;
+ int rc, needmap = 0;
+
+ dout("__send_notarget\n");
+ list_for_each_entry_safe(req, tmp, &osdc->req_notarget,
+ r_req_lru_item) {
+ rc = __map_request(osdc, req, 0);
+ if (rc < 0)
+ dout("__send_notarget failed map, "
+ " will retry %lld\n", req->r_tid);
+ if (req->r_osd == NULL) {
+ dout("__send_notarget %p no up osds in pg\n", req);
+ needmap++;
+ } else if (rc > 0) {
+ if (!req->r_linger) {
+ dout("%p tid %llu requeued on osd%d\n", req,
+ req->r_tid,
+ req->r_osd ? req->r_osd->o_osd : -1);
+ req->r_flags |= CEPH_OSD_FLAG_RETRY;
+ }
+ }
+
+ }
+
+ if (needmap)
+ ceph_monc_request_next_osdmap(&osdc->client->monc);
+}
+
+/*
* Timeout callback, called every N seconds when 1 or more osd
* requests has been active for more than N seconds. When this
* happens, we ping all OSDs with requests who have timed out to
@@ -1403,6 +1438,7 @@ static void handle_timeout(struct work_struct *work)
}
__schedule_osd_timeout(osdc);
+ __send_notarget(osdc);
__send_queued(osdc);
mutex_unlock(&osdc->request_mutex);
up_read(&osdc->map_sem);
--
1.8.1.2
?韬{.n?????%??檩??w?{.n????u朕?Ф?塄}?财??j:+v?? ? ???2??璀??摺?囤??z夸z罐?+?????w棹f
