summaryrefslogtreecommitdiffstats
path: root/fs/ceph/osd_client.c
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2009-10-09 10:29:18 -0700
committerSage Weil <sage@newdream.net>2009-10-09 11:58:15 -0700
commit81b024e70fed635a2cf5a4bf911db1649bb005f5 (patch)
tree67c949621bc90cf2cd2651992e11afb35d87724b /fs/ceph/osd_client.c
parent991abb6ecfc8edf9863aa6a3f43249e63f9d4d4e (diff)
downloadlinux-81b024e70fed635a2cf5a4bf911db1649bb005f5.tar.gz
linux-81b024e70fed635a2cf5a4bf911db1649bb005f5.tar.bz2
linux-81b024e70fed635a2cf5a4bf911db1649bb005f5.zip
ceph: reset osd session on fault, not peer_reset
The peer_reset just takes longer (until we reconnect and discover the osd dropped the session... which it will). Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/osd_client.c')
-rw-r--r--fs/ceph/osd_client.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/ceph/osd_client.c b/fs/ceph/osd_client.c
index 0aea8afaa072..4a8b4f08d4ae 100644
--- a/fs/ceph/osd_client.c
+++ b/fs/ceph/osd_client.c
@@ -294,10 +294,7 @@ __lookup_request_ge(struct ceph_osd_client *osdc,
/*
- * The messaging layer will reconnect to the osd as needed. If the
- * session has dropped, the OSD will have dropped the session state,
- * and we'll get notified by the messaging layer. If that happens, we
- * need to resubmit all requests for that osd.
+ * If the osd connection drops, we need to resubmit all requests.
*/
static void osd_reset(struct ceph_connection *con)
{
@@ -1301,7 +1298,7 @@ const static struct ceph_connection_operations osd_con_ops = {
.put = put_osd_con,
.dispatch = dispatch,
.alloc_msg = alloc_msg,
- .peer_reset = osd_reset,
+ .fault = osd_reset,
.alloc_middle = ceph_alloc_middle,
.prepare_pages = prepare_pages,
};