summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/afr/src/afr-self-heal-common.c
diff options
context:
space:
mode:
authorVikas Gorur <vikas@gluster.com>2009-11-24 08:45:10 +0000
committerAnand V. Avati <avati@dev.gluster.com>2009-11-24 06:40:12 -0800
commit250edc9e494fe0c59eff580df18080111ecb475e (patch)
tree0e73af8f82f9f644abff21ee5b2f0309e276dc22 /xlators/cluster/afr/src/afr-self-heal-common.c
parent74612a456ad1602f8038fae79fee654eb427602a (diff)
cluster/afr: Refactored the self-heal interface.
Cleaned up the self-heal interface to callers. Signed-off-by: Vikas Gorur <vikas@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 170 (Auto-heal fails on files that are open()-ed/mmap()-ed) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=170
Diffstat (limited to 'xlators/cluster/afr/src/afr-self-heal-common.c')
-rw-r--r--xlators/cluster/afr/src/afr-self-heal-common.c132
1 files changed, 48 insertions, 84 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c
index 0b4f22b01c2..ab28aa68128 100644
--- a/xlators/cluster/afr/src/afr-self-heal-common.c
+++ b/xlators/cluster/afr/src/afr-self-heal-common.c
@@ -1239,8 +1239,10 @@ sh_missing_entries_lookup (call_frame_t *frame, xlator_t *this)
int ret = -1;
local = frame->local;
- call_count = local->child_count;
- priv = this->private;
+ priv = this->private;
+
+ call_count = afr_up_children_count (priv->child_count,
+ local->child_up);
local->call_count = call_count;
@@ -1346,7 +1348,8 @@ afr_self_heal_missing_entries (call_frame_t *frame, xlator_t *this)
afr_build_parent_loc (&sh->parent_loc, &local->loc);
- call_count = local->child_count;
+ call_count = afr_up_children_count (priv->child_count,
+ local->child_up);
local->call_count = call_count;
@@ -1395,11 +1398,11 @@ afr_local_t *afr_local_copy (afr_local_t *l, xlator_t *this)
int
-afr_bgsh_completion_cbk (call_frame_t *bgsh_frame, xlator_t *this)
+afr_self_heal_completion_cbk (call_frame_t *bgsh_frame, xlator_t *this)
{
- afr_private_t *priv = NULL;
- afr_local_t *local = NULL;
- afr_self_heal_t *sh = NULL;
+ afr_private_t * priv = NULL;
+ afr_local_t * local = NULL;
+ afr_self_heal_t * sh = NULL;
priv = this->private;
local = bgsh_frame->local;
@@ -1413,73 +1416,38 @@ afr_bgsh_completion_cbk (call_frame_t *bgsh_frame, xlator_t *this)
"background self-heal completed");
if (!sh->unwound) {
- if (sh->calling_fop == GF_FOP_LOOKUP) {
- AFR_STACK_UNWIND (lookup, sh->orig_frame,
- local->op_ret, local->op_errno,
- local->cont.lookup.inode,
- &local->cont.lookup.buf,
- local->cont.lookup.xattr,
- &local->cont.lookup.postparent);
- } else {
- sh->flush_self_heal_cbk (sh->orig_frame, this);
- }
+ sh->unwind (sh->orig_frame, this);
}
- LOCK (&priv->lock);
- {
- priv->background_self_heals_started--;
+ if (sh->background) {
+ LOCK (&priv->lock);
+ {
+ priv->background_self_heals_started--;
+ }
+ UNLOCK (&priv->lock);
}
- UNLOCK (&priv->lock);
-
- AFR_STACK_DESTROY (bgsh_frame);
-
- return 0;
-}
-
-
-int
-afr_bgsh_unwind (call_frame_t *bgsh_frame, xlator_t *this)
-{
- afr_local_t *local = NULL;
- afr_self_heal_t *sh = NULL;
-
- local = bgsh_frame->local;
- sh = &local->self_heal;
- if (local->govinda_gOvinda) {
- afr_set_split_brain (this, local->cont.lookup.inode);
- }
-
- gf_log (this->name, GF_LOG_TRACE,
- "unwinding lookup and continuing self-heal in the background");
+ /*
+ * XXX Hack: Due to memcpy'ing of local, some pointers will
+ * also have ended up in bgsh_frame's local. We shouldn't free
+ * them. So set them to NULL here.
+ */
- sh->unwound = _gf_true;
+ local->cont.writev.vector = NULL;
- if (sh->calling_fop == GF_FOP_LOOKUP) {
- AFR_STACK_UNWIND (lookup, sh->orig_frame,
- local->op_ret, local->op_errno,
- local->cont.lookup.inode,
- &local->cont.lookup.buf,
- local->cont.lookup.xattr,
- &local->cont.lookup.postparent);
- } else {
- sh->flush_self_heal_cbk (sh->orig_frame, this);
- }
+ AFR_STACK_DESTROY (bgsh_frame);
return 0;
}
int
-afr_self_heal (call_frame_t *frame, xlator_t *this,
- int (*completion_cbk) (call_frame_t *, xlator_t *),
- int bgsh)
+afr_self_heal (call_frame_t *frame, xlator_t *this)
{
afr_local_t *local = NULL;
afr_self_heal_t *sh = NULL;
afr_private_t *priv = NULL;
int i = 0;
- int background = 0;
call_frame_t *sh_frame = NULL;
afr_local_t *sh_local = NULL;
@@ -1487,48 +1455,44 @@ afr_self_heal (call_frame_t *frame, xlator_t *this,
local = frame->local;
priv = this->private;
- LOCK (&priv->lock);
- {
- if (priv->background_self_heals_started < priv->background_self_heal_count) {
- priv->background_self_heals_started++;
- background = 1;
+ if (local->self_heal.background) {
+ LOCK (&priv->lock);
+ {
+ if (priv->background_self_heals_started
+ > priv->background_self_heal_count) {
+
+ local->self_heal.background = _gf_false;
+
+ } else {
+ priv->background_self_heals_started++;
+ }
}
+ UNLOCK (&priv->lock);
}
- UNLOCK (&priv->lock);
gf_log (this->name, GF_LOG_TRACE,
"performing self heal on %s (metadata=%d data=%d entry=%d)",
local->loc.path,
- local->need_metadata_self_heal,
- local->need_data_self_heal,
- local->need_entry_self_heal);
+ local->self_heal.need_metadata_self_heal,
+ local->self_heal.need_data_self_heal,
+ local->self_heal.need_entry_self_heal);
sh_frame = copy_frame (frame);
sh_local = afr_local_copy (local, this);
sh_frame->local = sh_local;
sh = &sh_local->self_heal;
- sh->orig_frame = frame;
-
- if (bgsh)
- sh->background = _gf_true;
- else
- sh->background = _gf_false;
+ sh->orig_frame = frame;
- if (completion_cbk == NULL) {
- sh->completion_cbk = afr_bgsh_completion_cbk;
- } else {
- sh->completion_cbk = completion_cbk;
- }
+ sh->completion_cbk = afr_self_heal_completion_cbk;
- sh->unwind = afr_bgsh_unwind;
- sh->buf = CALLOC (priv->child_count, sizeof (struct stat));
- sh->child_errno = CALLOC (priv->child_count, sizeof (int));
- sh->success = CALLOC (priv->child_count, sizeof (int));
- sh->xattr = CALLOC (priv->child_count, sizeof (dict_t *));
- sh->sources = CALLOC (sizeof (*sh->sources), priv->child_count);
- sh->locked_nodes = CALLOC (sizeof (*sh->locked_nodes), priv->child_count);
+ sh->buf = CALLOC (priv->child_count, sizeof (struct stat));
+ sh->child_errno = CALLOC (priv->child_count, sizeof (int));
+ sh->success = CALLOC (priv->child_count, sizeof (int));
+ sh->xattr = CALLOC (priv->child_count, sizeof (dict_t *));
+ sh->sources = CALLOC (priv->child_count, sizeof (*sh->sources));
+ sh->locked_nodes = CALLOC (priv->child_count, sizeof (*sh->locked_nodes));
sh->pending_matrix = CALLOC (sizeof (int32_t *), priv->child_count);
for (i = 0; i < priv->child_count; i++) {