From cc2e9ad0751da55dfdcd86fea2d5b312a1cbd1b5 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Thu, 29 Mar 2012 22:43:29 +0530 Subject: cluster/afr: Fix split-brain log Change-Id: Id6869fb83bb083809a2a69227e233458e0b9e0bf BUG: 787653 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.com/3041 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/cluster/afr/src/afr-self-heal-common.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c index 039758408..bd0e04626 100644 --- a/xlators/cluster/afr/src/afr-self-heal-common.c +++ b/xlators/cluster/afr/src/afr-self-heal-common.c @@ -911,12 +911,15 @@ afr_sh_missing_entries_done (call_frame_t *frame, xlator_t *this) sh = &local->self_heal; afr_sh_reset (frame, this); - if (local->govinda_gOvinda || sh->op_failed) { - if (local->govinda_gOvinda) - gf_log (this->name, GF_LOG_INFO, - "split brain found, aborting selfheal of %s", - local->loc.path); + + if (local->govinda_gOvinda) { + gf_log (this->name, GF_LOG_INFO, + "split brain found, aborting selfheal of %s", + local->loc.path); sh->op_failed = 1; + } + + if (sh->op_failed) { sh->completion_cbk (frame, this); } else { gf_log (this->name, GF_LOG_TRACE, -- cgit