andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Unset split-brain flags in afr_self_heal_completion_cbk if self heal completes successfully.

Browse Source 
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
This commit is contained in:
Simone Gotti 2010-05-04 16:48:55 +00:00 committed by Anand V. Avati
parent 45a2f82f65
commit 8be447d390
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xlators/cluster/afr/src/afr-self-heal-common.c
View File

@ -1504,7 +1504,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,

13
xlators/cluster/afr/src/afr.c
View File

@ -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,

2
xlators/cluster/afr/src/afr.h
View File

@ -614,7 +614,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,