diff options
| author | Sage Weil <sage@inktank.com> | 2013-03-25 09:30:13 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-05-01 21:17:11 -0700 |
| commit | 20e55c4cc758e4dccdfd92ae8e9588dd624b2cd7 (patch) | |
| tree | 8e8392734f7553ecf4083703d30c27249d50c0b9 /net/ceph/messenger.c | |
| parent | 3a23083bda56850a1dc0e1c6d270b1f5dc789f07 (diff) | |
| download | linux-20e55c4cc758e4dccdfd92ae8e9588dd624b2cd7.tar.gz linux-20e55c4cc758e4dccdfd92ae8e9588dd624b2cd7.tar.bz2 linux-20e55c4cc758e4dccdfd92ae8e9588dd624b2cd7.zip | |
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/4282
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Alex Elder <elder@inktank.com>
Diffstat (limited to 'net/ceph/messenger.c')
| -rw-r--r-- | net/ceph/messenger.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index e8491db43f5e..2aecc4896a03 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -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; |