diff options
| author | Krutika Dhananjay <kdhananj@redhat.com> | 2015-02-19 19:35:17 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2015-03-04 16:37:56 -0800 |
| commit | 4a8384fe76aeef652554c48df737d3178eb0160c (patch) | |
| tree | ac00907a88517c7ad4e23ff7af516de08752422a /xlators/cluster/afr/src/afr-self-heal-metadata.c | |
| parent | a42db19a5dd796f5387b0765f5fc05cef462df22 (diff) | |
cluster/afr: Do not increment healed_count if no healing was performed
PROBLEM:
When file modifications are happening while index heal is launched,
index healer could pick up entries which appeared in indices/xattrop
transiently during the course of the operations on the mount point, and
do not really need any heal. This will cause index healer to keep doing
index-heal in a loop as long as it finds this entry, by believing that
it did successfully heal some gfids even when it didn't.
FIX:
afr_selfheal() now returns a 1 to indicate that it did not (need to)
heal a given gfid. afr_shd_selfheal() will not increment healed_count
whenever afr_selfheal() returns a 1.
Change-Id: I0d97e11392a032a852e8c6508f691300ef0e5b98
BUG: 1194305
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-on: http://review.gluster.org/9713
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Reviewed-by: Ravishankar N <ravishankar@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators/cluster/afr/src/afr-self-heal-metadata.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-metadata.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-metadata.c b/xlators/cluster/afr/src/afr-self-heal-metadata.c index cd8bb688a11..7333f939ae5 100644 --- a/xlators/cluster/afr/src/afr-self-heal-metadata.c +++ b/xlators/cluster/afr/src/afr-self-heal-metadata.c @@ -377,6 +377,7 @@ afr_selfheal_metadata (call_frame_t *frame, xlator_t *this, inode_t *inode) unsigned char *data_lock = NULL; unsigned char *healed_sinks = NULL; struct afr_reply *locked_replies = NULL; + gf_boolean_t did_sh = _gf_true; int source = -1; priv = this->private; @@ -406,7 +407,7 @@ afr_selfheal_metadata (call_frame_t *frame, xlator_t *this, inode_t *inode) source = ret; if (AFR_COUNT (healed_sinks, priv->child_count) == 0) { - ret = -ENOTCONN; + did_sh = _gf_false; goto unlock; } @@ -424,8 +425,11 @@ unlock: afr_selfheal_uninodelk (frame, this, inode, this->name, LLONG_MAX -1, 0, data_lock); - afr_log_selfheal (inode->gfid, this, ret, "metadata", source, - healed_sinks); + if (did_sh) + afr_log_selfheal (inode->gfid, this, ret, "metadata", source, + healed_sinks); + else + ret = 1; if (locked_replies) afr_replies_wipe (locked_replies, priv->child_count); |