| Message ID | 1343663971-3221-5-git-send-email-sage@inktank.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 07/30/2012 10:59 AM, Sage Weil wrote: > Revoke all mon_client messages when we shut down the old connection. > This is mostly moot since we are re-using the same ceph_connection, > but it is cleaner. > > Signed-off-by: Sage Weil <sage@inktank.com> Looks good. Reviewed-by: Alex Elder <elder@inktank.com> > --- > net/ceph/mon_client.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c > index bfd21a8..105d533 100644 > --- a/net/ceph/mon_client.c > +++ b/net/ceph/mon_client.c > @@ -118,6 +118,9 @@ static void __close_session(struct ceph_mon_client *monc) > { > dout("__close_session closing mon%d\n", monc->cur_mon); > ceph_msg_revoke(monc->m_auth); > + ceph_msg_revoke_incoming(monc->m_auth_reply); > + ceph_msg_revoke(monc->m_subscribe); > + ceph_msg_revoke_incoming(monc->m_subscribe_ack); > ceph_con_close(&monc->con); > monc->cur_mon = -1; > monc->pending_auth = 0; > @@ -685,6 +688,7 @@ static void __resend_generic_request(struct ceph_mon_client *monc) > for (p = rb_first(&monc->generic_request_tree); p; p = rb_next(p)) { > req = rb_entry(p, struct ceph_mon_generic_request, node); > ceph_msg_revoke(req->request); > + ceph_msg_revoke_incoming(req->reply); > ceph_con_send(&monc->con, ceph_msg_get(req->request)); > } > } > -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c index bfd21a8..105d533 100644 --- a/net/ceph/mon_client.c +++ b/net/ceph/mon_client.c @@ -118,6 +118,9 @@ static void __close_session(struct ceph_mon_client *monc) { dout("__close_session closing mon%d\n", monc->cur_mon); ceph_msg_revoke(monc->m_auth); + ceph_msg_revoke_incoming(monc->m_auth_reply); + ceph_msg_revoke(monc->m_subscribe); + ceph_msg_revoke_incoming(monc->m_subscribe_ack); ceph_con_close(&monc->con); monc->cur_mon = -1; monc->pending_auth = 0; @@ -685,6 +688,7 @@ static void __resend_generic_request(struct ceph_mon_client *monc) for (p = rb_first(&monc->generic_request_tree); p; p = rb_next(p)) { req = rb_entry(p, struct ceph_mon_generic_request, node); ceph_msg_revoke(req->request); + ceph_msg_revoke_incoming(req->reply); ceph_con_send(&monc->con, ceph_msg_get(req->request)); } }
Revoke all mon_client messages when we shut down the old connection. This is mostly moot since we are re-using the same ceph_connection, but it is cleaner. Signed-off-by: Sage Weil <sage@inktank.com> --- net/ceph/mon_client.c | 4 ++++ 1 file changed, 4 insertions(+)