diff options
| author | Pranith Kumar K <pranithk@gluster.com> | 2012-03-29 22:43:29 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-03-29 10:23:24 -0700 |
| commit | cc2e9ad0751da55dfdcd86fea2d5b312a1cbd1b5 (patch) | |
| tree | 49680d6a27b38c5adb8075e6f541ea1b98759a98 | |
| parent | 80d0c49125c67fcc0aab48cce7ef895dabf1d006 (diff) | |
cluster/afr: Fix split-brain log
Change-Id: Id6869fb83bb083809a2a69227e233458e0b9e0bf
BUG: 787653
Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Reviewed-on: http://review.gluster.com/3041
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 | 13 |
1 files 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, |