diff options
| author | Sage Weil <sage@inktank.com> | 2012-07-30 18:16:40 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-26 11:38:42 -0800 |
| commit | da75ae3c0d4c40587fa7583952b98072d811a7d2 (patch) | |
| tree | e385de76be9881ae001899c7615b2f360e5ca5ee /net/ceph | |
| parent | 6cdaef1be27bc05ab4197b3ab4e3ee1d326cf04c (diff) | |
| download | linux-3.10-da75ae3c0d4c40587fa7583952b98072d811a7d2.tar.gz linux-3.10-da75ae3c0d4c40587fa7583952b98072d811a7d2.tar.bz2 linux-3.10-da75ae3c0d4c40587fa7583952b98072d811a7d2.zip | |
libceph: revoke mon_client messages on session restart
(cherry picked from commit 4f471e4a9c7db0256834e1b376ea50c82e345c3c)
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>
Reviewed-by: Alex Elder <elder@inktank.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ceph')
| -rw-r--r-- | net/ceph/mon_client.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c index 9f00d6cd93e..275aec2f175 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)); } } |