Commit 20e55c4c authored by Sage Weil's avatar Sage Weil

libceph: clear messenger auth_retry flag when we authenticate

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/4282Signed-off-by: default avatarSage Weil <sage@inktank.com>
Reviewed-by: default avatarAlex Elder <elder@inktank.com>
parent 3a23083b
...@@ -2013,7 +2013,6 @@ static int process_connect(struct ceph_connection *con) ...@@ -2013,7 +2013,6 @@ static int process_connect(struct ceph_connection *con)
con->error_msg = "connect authorization failure"; con->error_msg = "connect authorization failure";
return -1; return -1;
} }
con->auth_retry = 1;
con_out_kvec_reset(con); con_out_kvec_reset(con);
ret = prepare_write_connect(con); ret = prepare_write_connect(con);
if (ret < 0) if (ret < 0)
...@@ -2099,7 +2098,7 @@ static int process_connect(struct ceph_connection *con) ...@@ -2099,7 +2098,7 @@ static int process_connect(struct ceph_connection *con)
WARN_ON(con->state != CON_STATE_NEGOTIATING); WARN_ON(con->state != CON_STATE_NEGOTIATING);
con->state = CON_STATE_OPEN; 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->peer_global_seq = le32_to_cpu(con->in_reply.global_seq);
con->connect_seq++; con->connect_seq++;
con->peer_features = server_feat; con->peer_features = server_feat;
......
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