Commit 81b024e7 authored by Sage Weil's avatar Sage Weil

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: default avatarSage Weil <sage@newdream.net>
parent 991abb6e
...@@ -294,10 +294,7 @@ __lookup_request_ge(struct ceph_osd_client *osdc, ...@@ -294,10 +294,7 @@ __lookup_request_ge(struct ceph_osd_client *osdc,
/* /*
* The messaging layer will reconnect to the osd as needed. If the * If the osd connection drops, we need to resubmit all requests.
* 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.
*/ */
static void osd_reset(struct ceph_connection *con) static void osd_reset(struct ceph_connection *con)
{ {
...@@ -1301,7 +1298,7 @@ const static struct ceph_connection_operations osd_con_ops = { ...@@ -1301,7 +1298,7 @@ const static struct ceph_connection_operations osd_con_ops = {
.put = put_osd_con, .put = put_osd_con,
.dispatch = dispatch, .dispatch = dispatch,
.alloc_msg = alloc_msg, .alloc_msg = alloc_msg,
.peer_reset = osd_reset, .fault = osd_reset,
.alloc_middle = ceph_alloc_middle, .alloc_middle = ceph_alloc_middle,
.prepare_pages = prepare_pages, .prepare_pages = prepare_pages,
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment