From e06ee49ffd6c2829357f89b192f25c1f116925ff Mon Sep 17 00:00:00 2001 From: Anuradha Date: Fri, 26 Sep 2014 14:18:05 +0530 Subject: cluster/afr : Fix incorrect looping of index healer Backport of: http://review.gluster.org/8868 Sending appropriate return value from afr_selfheal() fixes the issue. Credits : Krutika Dhananjay and Pranith Kumar. Change-Id: I1dc8105078e99dbc12295ef557a407bf3d8cfec3 BUG: 1147486 Signed-off-by: Anuradha Reviewed-on: http://review.gluster.org/8884 Reviewed-by: Pranith Kumar Karampuri Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/cluster/afr/src/afr-self-heal-common.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'xlators/cluster') diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c index eeaceb13018..ddccc7f38ed 100644 --- a/xlators/cluster/afr/src/afr-self-heal-common.c +++ b/xlators/cluster/afr/src/afr-self-heal-common.c @@ -1068,7 +1068,7 @@ afr_selfheal (xlator_t *this, uuid_t gfid) { inode_t *inode = NULL; call_frame_t *frame = NULL; - int ret = -1; + int ret = -1, entry_ret = 0, metadata_ret = 0, data_ret = 0; gf_boolean_t data_selfheal = _gf_false; gf_boolean_t metadata_selfheal = _gf_false; gf_boolean_t entry_selfheal = _gf_false; @@ -1085,13 +1085,18 @@ afr_selfheal (xlator_t *this, uuid_t gfid) goto out; if (data_selfheal) - afr_selfheal_data (frame, this, inode); + data_ret = afr_selfheal_data (frame, this, inode); if (metadata_selfheal) - afr_selfheal_metadata (frame, this, inode); + metadata_ret = afr_selfheal_metadata (frame, this, inode); if (entry_selfheal) - afr_selfheal_entry (frame, this, inode); + entry_ret = afr_selfheal_entry (frame, this, inode); + + if (data_ret == -EIO || metadata_ret == -EIO || entry_ret == -EIO) + ret = -EIO; + else + ret = (data_ret | metadata_ret | entry_ret); inode_forget (inode, 1); inode_unref (inode); -- cgit