Commit 4f471e4a authored by Sage Weil's avatar Sage Weil

libceph: revoke mon_client messages on session restart

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: default avatarSage Weil <sage@inktank.com>
Reviewed-by: default avatarAlex Elder <elder@inktank.com>
parent 8007b8d6
...@@ -118,6 +118,9 @@ static void __close_session(struct ceph_mon_client *monc) ...@@ -118,6 +118,9 @@ static void __close_session(struct ceph_mon_client *monc)
{ {
dout("__close_session closing mon%d\n", monc->cur_mon); dout("__close_session closing mon%d\n", monc->cur_mon);
ceph_msg_revoke(monc->m_auth); 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); ceph_con_close(&monc->con);
monc->cur_mon = -1; monc->cur_mon = -1;
monc->pending_auth = 0; monc->pending_auth = 0;
...@@ -685,6 +688,7 @@ static void __resend_generic_request(struct ceph_mon_client *monc) ...@@ -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)) { for (p = rb_first(&monc->generic_request_tree); p; p = rb_next(p)) {
req = rb_entry(p, struct ceph_mon_generic_request, node); req = rb_entry(p, struct ceph_mon_generic_request, node);
ceph_msg_revoke(req->request); ceph_msg_revoke(req->request);
ceph_msg_revoke_incoming(req->reply);
ceph_con_send(&monc->con, ceph_msg_get(req->request)); ceph_con_send(&monc->con, ceph_msg_get(req->request));
} }
} }
......
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