diff options
| author | Pranith Kumar K <pranithk@gluster.com> | 2012-06-15 12:21:15 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-06-19 13:50:34 -0700 |
| commit | 4ad1e4525b561504b3e816ca9fc594c85cba94a4 (patch) | |
| tree | b11a5c20958ede224e60ef908ef8895a0bd776bd | |
| parent | 1167f0ea097924b7402ca3640c2a8104c2604e7c (diff) | |
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 <pranithk@gluster.com>
Reviewed-on: http://review.gluster.com/3583
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-common.c | 2 | ||||
| -rw-r--r-- | 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 6d23494987a..9e493092e2a 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 462ee88237f..90a2af18b5a 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); |