lkml.org 
[lkml]   [2013]   [Jun]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 34/48] libceph: clear messenger auth_retry flag when we authenticate
    Date
    From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    3.9-stable review patch. If anyone has any objections, please let me know.

    ------------------

    From: Sage Weil <sage@inktank.com>

    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@inktank.com>
    Reviewed-by: Alex Elder <elder@inktank.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    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;



    \
     
     \ /
      Last update: 2013-06-19 07:21    [W:4.026 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site