[Bugs] [Bug 1233611] Incomplete conservative merge for split-brained directories

[bugzilla at redhat.com]

https://bugzilla.redhat.com/show_bug.cgi?id=1233611



--- Comment #2 from Anand Avati <aavati at redhat.com> ---
COMMIT: http://review.gluster.org/11327 committed in release-3.7 by Pranith
Kumar Karampuri (pkarampu at redhat.com) 
------
commit c13e7d8cb22fb530f765359829f748b9b94103fc
Author: Ravishankar N <ravishankar at redhat.com>
Date:   Fri Jun 19 14:56:17 2015 +0530

    afr: complete conservative merge even in case of gfid split-brain

    Backport of http://review.gluster.org/#/c/9429/

    Problem:
    While performing conservative merge, we bail out of the merge if we
    encounter a file with mismatching gfid or type. What this means is all
entries
    that come after the mismatching file (during the merge) never get healed,
no
    matter how many index heals are done.

    Fix:
    Continue with the merging of rest of the entries even if a gfid/type
mismatch
    is found, but ensure that post-op does not happen on the parent dir in such
a
    case.

    Change-Id: I725e3ebbb8f8d692179432752c6a6554a924c597
    BUG: 1233611
    Signed-off-by: Ravishankar N <ravishankar at redhat.com>
    Reviewed-on: http://review.gluster.org/11327
    Reviewed-by: Krutika Dhananjay <kdhananj at redhat.com>
    Reviewed-by: Anuradha Talur <atalur at redhat.com>
    Tested-by: NetBSD Build System <jenkins at build.gluster.org>
    Tested-by: Gluster Build System <jenkins at build.gluster.com>
    Reviewed-by: Pranith Kumar Karampuri <pkarampu at redhat.com>

-- 
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=KVjXUutv1B&a=cc_unsubscribe