lkml.org 
[lkml]   [2013]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[75/94] drbd: fix for deadlock when using automatic split-brain-recovery
    3.2.46-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Philipp Reisner <philipp.reisner@linbit.com>

    commit 7c689e63a847316c1b2500f86891b0a574ce7e69 upstream.

    With an automatic after split-brain recovery policy of
    "after-sb-1pri call-pri-lost-after-sb",
    when trying to drbd_set_role() to R_SECONDARY,
    we run into a deadlock.

    This was first recognized and supposedly fixed by
    2009-06-10 "Fixed a deadlock when using automatic split brain recovery when both nodes are"
    replacing drbd_set_role() with drbd_change_state() in that code-path,
    but the first hunk of that patch forgets to remove the drbd_set_role().

    We apparently only ever tested the "two primaries" case.

    Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
    Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/block/drbd/drbd_receiver.c | 1 -
    1 file changed, 1 deletion(-)

    --- a/drivers/block/drbd/drbd_receiver.c
    +++ b/drivers/block/drbd/drbd_receiver.c
    @@ -2225,7 +2225,6 @@ static int drbd_asb_recover_1p(struct dr
    if (hg == -1 && mdev->state.role == R_PRIMARY) {
    enum drbd_state_rv rv2;

    - drbd_set_role(mdev, R_SECONDARY, 0);
    /* drbd_change_state() does not sleep while in SS_IN_TRANSIENT_STATE,
    * we might be here in C_WF_REPORT_PARAMS which is transient.
    * we do not need to wait for the after state change work either. */


    \
     
     \ /
      Last update: 2013-05-28 06:41    [W:2.775 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site