cluster/afr: Do not increment healed_count if no healing was performed

        Backport of: http://review.gluster.org/9713

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: I9158c814419b635fac3dfe2fe40c94d1548ea4e8
BUG: 1194306
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-on: http://review.gluster.org/9852
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-by: Anuradha Talur <atalur@redhat.com>
Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>

1 files changed, 41 insertions, 18 deletions

diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c
index 6198d4cf72c..c6b14e1def7 100644
--- a/xlators/cluster/afr/src/afr-self-heal-common.c
+++ b/xlators/cluster/afr/src/afr-self-heal-common.c
@@ -1121,23 +1121,18 @@ out:
 	return ret;
 }
 
-/*
- * This is the entry point for healing a given GFID
- */
-
 int
-afr_selfheal (xlator_t *this, uuid_t gfid)
+afr_selfheal_do (call_frame_t *frame, xlator_t *this, uuid_t gfid)
 {
-        inode_t *inode = NULL;
-	call_frame_t *frame = NULL;
-	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;
-
-	frame = afr_frame_create (this);
-	if (!frame)
-		goto out;
+	int           ret               = -1;
+        int           entry_ret         = 1;
+        int           metadata_ret      = 1;
+        int           data_ret          = 1;
+        int           or_ret            = 0;
+        inode_t      *inode             = NULL;
+	gf_boolean_t  data_selfheal     = _gf_false;
+	gf_boolean_t  metadata_selfheal = _gf_false;
+	gf_boolean_t  entry_selfheal    = _gf_false;
 
 	ret = afr_selfheal_unlocked_inspect (frame, this, gfid, &inode,
 					     &data_selfheal,
@@ -1155,14 +1150,42 @@ afr_selfheal (xlator_t *this, uuid_t gfid)
 	if (entry_selfheal)
                 entry_ret = afr_selfheal_entry (frame, this, inode);
 
+        or_ret = (data_ret | metadata_ret | entry_ret);
+
         if (data_ret == -EIO || metadata_ret == -EIO || entry_ret == -EIO)
                 ret = -EIO;
+        else if (data_ret == 1 && metadata_ret == 1 && entry_ret == 1)
+                ret = 1;
+        else if (or_ret < 0)
+                ret = or_ret;
         else
-                ret = (data_ret | metadata_ret | entry_ret);
+                ret = 0;
 
-	inode_forget (inode, 1);
-        inode_unref (inode);
 out:
+        if (inode) {
+                inode_forget (inode, 1);
+                inode_unref (inode);
+        }
+        return ret;
+}
+/*
+ * This is the entry point for healing a given GFID
+ * The function returns 0 if self-heal was successful, appropriate errno
+ * in case of a failure and 1 in case self-heal was never needed on the gfid.
+ */
+
+int
+afr_selfheal (xlator_t *this, uuid_t gfid)
+{
+        int           ret   = -1;
+	call_frame_t *frame = NULL;
+
+	frame = afr_frame_create (this);
+	if (!frame)
+		return ret;
+
+        ret = afr_selfheal_do (frame, this, gfid);
+
 	if (frame)
 		AFR_STACK_DESTROY (frame);