diff options
| author | Sage Weil <sage@newdream.net> | 2011-01-17 20:34:08 -0800 |
|---|---|---|
| committer | Sage Weil <sage@newdream.net> | 2011-03-21 12:24:19 -0700 |
| commit | 6f6c7006755b667f9f6c1f3b6f08cd65f75cc471 (patch) | |
| tree | 233e96acdc3b627c97267992368ae1cb6cd66a5f /include | |
| parent | 09adc80c611bb8902daa8ccfe34dbbc009d6befe (diff) | |
| download | linux-3.10-6f6c7006755b667f9f6c1f3b6f08cd65f75cc471.tar.gz linux-3.10-6f6c7006755b667f9f6c1f3b6f08cd65f75cc471.tar.bz2 linux-3.10-6f6c7006755b667f9f6c1f3b6f08cd65f75cc471.zip | |
libceph: fix osd request queuing on osdmap updates
If we send a request to osd A, and the request's pg remaps to osd B and
then back to A in quick succession, we need to resend the request to A. The
old code was only calling kick_requests after processing all incremental
maps in a message, so it was very possible to not resend a request that
needed to be resent. This would make the osd eventually time out (at least
with the current default of osd timeouts enabled).
The correct approach is to scan requests on every map incremental. This
patch refactors the kick code in a few ways:
- all requests are either on req_lru (in flight), req_unsent (ready to
send), or req_notarget (currently map to no up osd)
- mapping always done by map_request (previous map_osds)
- if the mapping changes, we requeue. requests are resent only after all
map incrementals are processed.
- some osd reset code is moved out of kick_requests into a separate
function
- the "kick this osd" functionality is moved to kick_osd_requests, as it
is unrelated to scanning for request->pg->osd mapping changes
Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ceph/osd_client.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/ceph/osd_client.h b/include/linux/ceph/osd_client.h index a1af29648fb..e791b8e4635 100644 --- a/include/linux/ceph/osd_client.h +++ b/include/linux/ceph/osd_client.h @@ -74,7 +74,6 @@ struct ceph_osd_request { char r_oid[40]; /* object name */ int r_oid_len; unsigned long r_stamp; /* send OR check time */ - bool r_resend; /* msg send failed, needs retry */ struct ceph_file_layout r_file_layout; struct ceph_snap_context *r_snapc; /* snap context for writes */ @@ -104,7 +103,9 @@ struct ceph_osd_client { u64 timeout_tid; /* tid of timeout triggering rq */ u64 last_tid; /* tid of last request */ struct rb_root requests; /* pending requests */ - struct list_head req_lru; /* pending requests lru */ + struct list_head req_lru; /* in-flight lru */ + struct list_head req_unsent; /* unsent/need-resend queue */ + struct list_head req_notarget; /* map to no osd */ int num_requests; struct delayed_work timeout_work; struct delayed_work osds_timeout_work; |