summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPranith Kumar K <pranithk@gluster.com>2012-04-06 15:43:31 +0530
committerVijay Bellur <vijay@gluster.com>2012-05-04 05:21:37 -0700
commit66701832cf2db0fc3fc55bc99d01d4b0f1cb6a2a (patch)
treec7f2e7322f7f61985409bbc1e09641ce99f63d6b
parent352f09f8eb5c2487612e6e6afa20742c9b9d6df4 (diff)
self-heald: Don't trigger self-heal always.
- 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>
-rw-r--r--xlators/cluster/afr/src/afr-self-heald.c21
1 files changed, 18 insertions, 3 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heald.c b/xlators/cluster/afr/src/afr-self-heald.c
index ec0bbafda..b4f6371c1 100644
--- a/xlators/cluster/afr/src/afr-self-heald.c
+++ b/xlators/cluster/afr/src/afr-self-heald.c
@@ -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);