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

self-heald: Don't trigger self-heal always.

Browse Source 
- If self-heal is disabled, the crawl is always spawned but immediately
  terminated upon realizing that the self-heal-daemon is disabled. Fixed it.
- If for some reason finding child position fails, it should still spawn timer
  and should keep the timer alive until the position is found to be REMOTE.

Change-Id: I20cc6af93a1ff26f2b837bbf063bbe508b5fdc78
BUG: 810144
Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Reviewed-on: http://review.gluster.com/3100
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
This commit is contained in:
Pranith Kumar K 2012-04-06 15:43:31 +05:30 committed by Vijay Bellur
parent 352f09f8eb
commit 66701832cf
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
xlators/cluster/afr/src/afr-self-heald.c
View File

@ -578,28 +578,43 @@ afr_poll_self_heal (void *data)
long child = (long)data;
gf_timer_t *old_timer = NULL;
gf_timer_t *new_timer = NULL;
shd_pos_t pos_data = {0};
int ret = 0;
this = THIS;
priv = this->private;
shd = &priv->shd;
_do_self_heal_on_subvol (this, child, INDEX);
if (shd->pos[child] == AFR_POS_UNKNOWN) {
pos_data.this = this;
pos_data.child = child;
ret = synctask_new (this->ctx->env,
afr_syncop_find_child_position,
NULL, NULL, &pos_data);
if (!ret)
shd->pos[child] = pos_data.pos;
}
if (shd->enabled && (shd->pos[child] == AFR_POS_LOCAL))
_do_self_heal_on_subvol (this, child, INDEX);
timeout.tv_sec = AFR_POLL_TIMEOUT;
timeout.tv_usec = 0;
//notify and previous timer should be synchronized.
LOCK (&priv->lock);
{
old_timer = shd->timer[child];
if (shd->pos[child] == AFR_POS_REMOTE)
goto unlock;
shd->timer[child] = gf_timer_call_after (this->ctx, timeout,
afr_poll_self_heal,
data);
new_timer = shd->timer[child];
}
unlock:
UNLOCK (&priv->lock);
if (old_timer)
gf_timer_call_cancel (this->ctx, old_timer);
if (!new_timer) {
if (!new_timer && (shd->pos[child] != AFR_POS_REMOTE)) {
gf_log (this->name, GF_LOG_WARNING,
"Could not create self-heal polling timer for %s",
priv->children[child]->name);
@ -620,7 +635,7 @@ afr_local_child_poll_self_heal (int ret, call_frame_t *sync_frame, void *data)
priv = pos_data->this->private;
shd = &priv->shd;
shd->pos[pos_data->child] = pos_data->pos;
if (pos_data->pos == AFR_POS_LOCAL)
if (pos_data->pos != AFR_POS_REMOTE)
afr_poll_self_heal ((void*)(long)pos_data->child);
out:
GF_FREE (data);