libceph: clear messenger auth_retry flag when we authenticate (20e55c4c) · Commits · 戴 / test

We maintain a counter of failed auth attempts to allow us to retry once before failing. However, if the second attempt succeeds, the flag isn't cleared, which makes us think auth failed again later when the connection resets for other reasons (like a socket error). This is one part of the sorry sequence of events in bug http://tracker.ceph.com/issues/4282 Signed-off-by:

Sage Weil <sage@inktank.com> Reviewed-by:

Alex Elder <elder@inktank.com>

net/ceph/messenger.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -2013,7 +2013,6 @@ static int process_connect(struct ceph_connection *con)
		con->error_msg = "connect authorization failure";
		return -1;
		}
		con->auth_retry = 1;
		con_out_kvec_reset(con);
		ret = prepare_write_connect(con);
		if (ret < 0)
		@@ -2099,7 +2098,7 @@ static int process_connect(struct ceph_connection *con)

		WARN_ON(con->state != CON_STATE_NEGOTIATING);
		con->state = CON_STATE_OPEN;

		con->auth_retry = 0; /* we authenticated; clear flag */
		con->peer_global_seq = le32_to_cpu(con->in_reply.global_seq);
		con->connect_seq++;
		con->peer_features = server_feat;

Admin message