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@redhat.com>
Reviewed-on: http://review.gluster.org/11327
Reviewed-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-by: Anuradha Talur <atalur@redhat.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>

0 files changed, 0 insertions, 0 deletions