aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ceph/mon_client.c
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2010-05-21 15:31:49 -0400
committerSage Weil <sage@newdream.net>2010-05-21 18:01:22 -0400
commit970690012c572fc3b7be532080564b730f6a9c02 (patch)
tree07fcab8e6e374e175aa964a33b5d8a2c36dc76a8 /fs/ceph/mon_client.c
parent9e32789f63fc5ad91c8b10f68ec23a86856d5af5 (diff)
ceph: avoid resending queued message to monitor
The auth_reply handler will (re)send any pending requests. For the initial mon authenticate phase, that's correct, but when a auth ticket renewal races with an in-flight request, we may resend a request message that is already in flight. Avoid this by revoking the message before sending it. We should also avoid resending requests at all during ticket renewal; that will come soon. Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/mon_client.c')
-rw-r--r--fs/ceph/mon_client.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ceph/mon_client.c b/fs/ceph/mon_client.c
index 478729a6ffce..12d94f24ee97 100644
--- a/fs/ceph/mon_client.c
+++ b/fs/ceph/mon_client.c
@@ -104,6 +104,7 @@ static void __send_prepared_auth_request(struct ceph_mon_client *monc, int len)
104 monc->pending_auth = 1; 104 monc->pending_auth = 1;
105 monc->m_auth->front.iov_len = len; 105 monc->m_auth->front.iov_len = len;
106 monc->m_auth->hdr.front_len = cpu_to_le32(len); 106 monc->m_auth->hdr.front_len = cpu_to_le32(len);
107 ceph_con_revoke(monc->con, monc->m_auth);
107 ceph_msg_get(monc->m_auth); /* keep our ref */ 108 ceph_msg_get(monc->m_auth); /* keep our ref */
108 ceph_con_send(monc->con, monc->m_auth); 109 ceph_con_send(monc->con, monc->m_auth);
109} 110}
@@ -539,6 +540,7 @@ static void __resend_generic_request(struct ceph_mon_client *monc)
539 540
540 for (p = rb_first(&monc->generic_request_tree); p; p = rb_next(p)) { 541 for (p = rb_first(&monc->generic_request_tree); p; p = rb_next(p)) {
541 req = rb_entry(p, struct ceph_mon_generic_request, node); 542 req = rb_entry(p, struct ceph_mon_generic_request, node);
543 ceph_con_revoke(monc->con, req->request);
542 ceph_con_send(monc->con, ceph_msg_get(req->request)); 544 ceph_con_send(monc->con, ceph_msg_get(req->request));
543 } 545 }
544} 546}