This is a note to let you know that I've just added the patch titled libceph: clear messenger auth_retry flag when we authenticate to the 3.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: libceph-clear-messenger-auth_retry-flag-when-we-authenticate.patch and it can be found in the queue-3.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 20e55c4cc758e4dccdfd92ae8e9588dd624b2cd7 Mon Sep 17 00:00:00 2001 From: Sage Weil <sage@xxxxxxxxxxx> Date: Mon, 25 Mar 2013 09:30:13 -0700 Subject: libceph: clear messenger auth_retry flag when we authenticate From: Sage Weil <sage@xxxxxxxxxxx> commit 20e55c4cc758e4dccdfd92ae8e9588dd624b2cd7 upstream. 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@xxxxxxxxxxx> Reviewed-by: Alex Elder <elder@xxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- net/ceph/messenger.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -1597,7 +1597,6 @@ static int process_connect(struct ceph_c 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) @@ -1682,7 +1681,7 @@ static int process_connect(struct ceph_c 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; Patches currently in stable-queue which might be from sage@xxxxxxxxxxx are queue-3.9/libceph-clear-messenger-auth_retry-flag-when-we-authenticate.patch queue-3.9/libceph-must-hold-mutex-for-reset_changed_osds.patch queue-3.9/libceph-wrap-auth-methods-in-a-mutex.patch queue-3.9/libceph-fix-authorizer-invalidation.patch queue-3.9/libceph-add-update_authorizer-auth-method.patch queue-3.9/libceph-wrap-auth-ops-in-wrapper-functions.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html