ceph: avoid resending queued message to monitor (97069001) · Commits · 戴 / test

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>

fs/ceph/mon_client.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -104,6 +104,7 @@ static void __send_prepared_auth_request(struct ceph_mon_client *monc, int len)
		monc->pending_auth = 1;
		monc->m_auth->front.iov_len = len;
		monc->m_auth->hdr.front_len = cpu_to_le32(len);
		ceph_con_revoke(monc->con, monc->m_auth);
		ceph_msg_get(monc->m_auth); /* keep our ref */
		ceph_con_send(monc->con, monc->m_auth);
		}
		@@ -539,6 +540,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_con_revoke(monc->con, req->request);
		ceph_con_send(monc->con, ceph_msg_get(req->request));
		}
		}

Admin message