kclient: refine osd messages timeout handling

diff --git a/src/kernel/osd_client.c b/src/kernel/osd_client.c
index fe11b4cf461b99132ba09d10887e0ea72ddefb7d..f25b2599c2241d42f010a81b46335d917fe0de7d 100644 (file)
--- a/src/kernel/osd_client.c
+++ b/src/kernel/osd_client.c
@@ -19,7 +19,7 @@ int ceph_debug_osdc = -1;
 #include "decode.h"
 
 
-static void reschedule_timeout(struct ceph_osd_client *osdc);
+static void reschedule_timeout(struct ceph_osd_client *osdc, unsigned long base_time);
 
 
 
@@ -172,8 +172,10 @@ static int register_request(struct ceph_osd_client *osdc,
                goto out;
 
        get_request(req);
-       if (osdc->num_requests == 0)
-               reschedule_timeout(osdc);
+       if (osdc->num_requests == 0) {
+               osdc->oldest_tid = req->r_tid;
+               reschedule_timeout(osdc, 0);
+       }
        osdc->num_requests++;
 
 out:
@@ -187,13 +189,24 @@ out:
 static void __unregister_request(struct ceph_osd_client *osdc,
                                 struct ceph_osd_request *req)
 {
+       struct ceph_osd_request *next_req;
+       int ret;
+
        dout(30, "__unregister_request %p tid %lld\n", req, req->r_tid);
        radix_tree_delete(&osdc->request_tree, req->r_tid);
 
        osdc->num_requests--;
        cancel_delayed_work(&osdc->timeout_work);
-       if (osdc->num_requests)
-               reschedule_timeout(osdc);
+       if (osdc->num_requests &&
+           req->r_tid == osdc->oldest_tid) {
+               ret = radix_tree_gang_lookup(&osdc->request_tree, (void **)&next_req,
+                                            req->r_tid, 1);
+
+               if (ret == 1) {
+                       osdc->oldest_tid = next_req->r_tid;
+                       reschedule_timeout(osdc, req->r_last_stamp);
+               }
+       }
 
        ceph_osdc_put_request(req);
 }
@@ -632,12 +645,16 @@ static int do_sync_request(struct ceph_osd_client *osdc,
  *
  * FIXME.
  */
-static void reschedule_timeout(struct ceph_osd_client *osdc)
+static void reschedule_timeout(struct ceph_osd_client *osdc, unsigned long base_time)
 {
        int timeout = osdc->client->mount_args.osd_timeout;
+       long jifs = 0;
        dout(10, "reschedule timeout (%d seconds)\n", timeout);
+       if (base_time)
+               jifs = jiffies-base_time;
+
        schedule_delayed_work(&osdc->timeout_work,
-                             round_jiffies_relative(timeout*HZ));
+                             round_jiffies_relative(timeout*HZ-jifs));
 }
 
 static void handle_timeout(struct work_struct *work)

diff --git a/src/kernel/osd_client.h b/src/kernel/osd_client.h
index a7e087c4f2b39cadf01a64ea9460c6c805d26d21..d7cc49f8d29cd9c3092c6ab2b36e212bc86fd965 100644 (file)
--- a/src/kernel/osd_client.h
+++ b/src/kernel/osd_client.h
@@ -51,6 +51,7 @@ struct ceph_osd_client {
        u64                    last_requested_map;
 
        struct mutex           request_mutex;
+       u64                    oldest_tid;    /* tid of oldest request */
        u64                    last_tid;      /* tid of last request */
        struct radix_tree_root request_tree;  /* pending requests, by tid */
        int                    num_requests;