diff options
| author | Simone Gotti <simone.gotti@gmail.com> | 2010-05-31 07:55:28 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2010-06-01 00:24:10 -0700 |
| commit | 7c4067688292092386d5a33961a0bbe351e6027d (patch) | |
| tree | 8d638f725127bbe30f7d7a325a4d026d56d61038 | |
| parent | f26c5070b0df1bdc4c3bb238b0a938fa2c0f6ffd (diff) | |
Unset split-brain flags in afr_self_heal_completion_cbk if self heal completes successfully.
Signed-off-by: Simone Gotti <simone.gotti@gmail.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 884 (I/O errors after fixed split brain and successfully completed self heal)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=884
Signed-off-by: Pavan Vilas Sondur <pavan@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 884 (I/O errors after fixed split brain and successfully completed self heal)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=884
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-common.c | 4 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr.c | 13 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr.h | 2 |
3 files changed, 12 insertions, 7 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c index a2c2e34ce55..d22bea68c78 100644 --- a/xlators/cluster/afr/src/afr-self-heal-common.c +++ b/xlators/cluster/afr/src/afr-self-heal-common.c @@ -1496,7 +1496,9 @@ afr_self_heal_completion_cbk (call_frame_t *bgsh_frame, xlator_t *this) sh = &local->self_heal; if (local->govinda_gOvinda) { - afr_set_split_brain (this, local->cont.lookup.inode); + afr_set_split_brain (this, local->cont.lookup.inode, _gf_true); + } else { + afr_set_split_brain (this, local->cont.lookup.inode, _gf_false); } gf_log (this->name, GF_LOG_TRACE, diff --git a/xlators/cluster/afr/src/afr.c b/xlators/cluster/afr/src/afr.c index da7cee3b043..6afb2fb97db 100644 --- a/xlators/cluster/afr/src/afr.c +++ b/xlators/cluster/afr/src/afr.c @@ -88,7 +88,7 @@ out: void -afr_set_split_brain (xlator_t *this, inode_t *inode) +afr_set_split_brain (xlator_t *this, inode_t *inode, gf_boolean_t set) { uint64_t ctx = 0; int ret = 0; @@ -103,9 +103,12 @@ afr_set_split_brain (xlator_t *this, inode_t *inode) ctx = 0; } - ctx = (~AFR_ICTX_SPLIT_BRAIN_MASK & ctx) - | (0xFFFFFFFFFFFFFFFFULL & AFR_ICTX_SPLIT_BRAIN_MASK); - + if (set) { + ctx = (~AFR_ICTX_SPLIT_BRAIN_MASK & ctx) + | (0xFFFFFFFFFFFFFFFFULL & AFR_ICTX_SPLIT_BRAIN_MASK); + } else { + ctx = (~AFR_ICTX_SPLIT_BRAIN_MASK & ctx); + } __inode_ctx_put (inode, this, ctx); } UNLOCK (&inode->lock); @@ -501,7 +504,7 @@ afr_self_heal_lookup_unwind (call_frame_t *frame, xlator_t *this) local = frame->local; if (local->govinda_gOvinda) { - afr_set_split_brain (this, local->cont.lookup.inode); + afr_set_split_brain (this, local->cont.lookup.inode, _gf_true); } AFR_STACK_UNWIND (lookup, frame, local->op_ret, local->op_errno, diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h index 4ea36886726..2d847622e27 100644 --- a/xlators/cluster/afr/src/afr.h +++ b/xlators/cluster/afr/src/afr.h @@ -613,7 +613,7 @@ uint64_t afr_is_split_brain (xlator_t *this, inode_t *inode); void -afr_set_split_brain (xlator_t *this, inode_t *inode); +afr_set_split_brain (xlator_t *this, inode_t *inode, gf_boolean_t set); int afr_open (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags, |