From e2f1d73017894f893889b78135331355eb86836e Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Fri, 15 Jun 2012 12:21:15 +0530 Subject: cluster/afr: split-brain should be reset on data-self-heal If the govinda flag is set in the beginning then missing_entries_done will fail the self-heal before it can come to data_self_heal. Change-Id: I4d5b6a7c3bb26bae78979ee59c7c0997fd3fd84b BUG: 832305 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.com/3583 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/cluster/afr/src/afr-self-heal-common.c | 2 -- xlators/cluster/afr/src/afr-self-heal-data.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c index 6d2349498..9e493092e 100644 --- a/xlators/cluster/afr/src/afr-self-heal-common.c +++ b/xlators/cluster/afr/src/afr-self-heal-common.c @@ -2219,8 +2219,6 @@ afr_self_heal (call_frame_t *frame, xlator_t *this, inode_t *inode) sh = &sh_local->self_heal; sh->inode = inode_ref (inode); - sh_local->govinda_gOvinda = afr_is_split_brain (this, sh->inode); - sh->orig_frame = frame; sh->completion_cbk = afr_self_heal_completion_cbk; diff --git a/xlators/cluster/afr/src/afr-self-heal-data.c b/xlators/cluster/afr/src/afr-self-heal-data.c index 462ee8823..90a2af18b 100644 --- a/xlators/cluster/afr/src/afr-self-heal-data.c +++ b/xlators/cluster/afr/src/afr-self-heal-data.c @@ -1393,6 +1393,8 @@ afr_self_heal_data (call_frame_t *frame, xlator_t *this) local = frame->local; sh = &local->self_heal; + local->govinda_gOvinda = afr_is_split_brain (this, sh->inode); + if (sh->do_data_self_heal && afr_data_self_heal_enabled (priv->data_self_heal)) { afr_sh_data_open (frame, this); -- cgit