From 60fd3fba546d29a038857cf23f6e6feb98593ccc Mon Sep 17 00:00:00 2001
From: Krutika Dhananjay <kdhananj@redhat.com>
Date: Mon, 8 Jun 2015 11:36:12 +0530
Subject: [PATCH 101/101] cluster/afr: Do not attempt entry self-heal if the last lookup on entry failed on src

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

Test bug-948686.t was causing shd to dump core due to gfid being NULL.
This was due to the volume being stopped while index heal's in progress,
causing afr_selfheal_unlocked_lookup_on() to fail sometimes on the src brick
with ENOTCONN. And when afr_selfheal_newentry_mark() copies the gfid off the
src iatt, it essentially copies null gfid. This was causing the assertion
as part of xattrop in protocol/client to fail.

Change-Id: I4f7117c7a392fab6c8ac819bcf87f58ed2f28144
BUG: 1233144
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/51033
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
---
 xlators/cluster/afr/src/afr-self-heal-entry.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/xlators/cluster/afr/src/afr-self-heal-entry.c b/xlators/cluster/afr/src/afr-self-heal-entry.c
index cb3648c..ab210b3 100644
--- a/xlators/cluster/afr/src/afr-self-heal-entry.c
+++ b/xlators/cluster/afr/src/afr-self-heal-entry.c
@@ -181,6 +181,13 @@ __afr_selfheal_heal_dirent (call_frame_t *frame, xlator_t *this, fd_t *fd,
 	if (!replies[source].valid)
 		return -EIO;
 
+        /* Skip healing this entry if the last lookup on it failed for reasons
+         * other than ENOENT.
+         */
+        if ((replies[source].op_ret < 0) &&
+            (replies[source].op_errno != ENOENT))
+                return -replies[source].op_errno;
+
 	for (i = 0; i < priv->child_count; i++) {
 		if (!healed_sinks[i])
 			continue;
@@ -188,7 +195,7 @@ __afr_selfheal_heal_dirent (call_frame_t *frame, xlator_t *this, fd_t *fd,
 		    replies[source].op_errno == ENOENT) {
 			ret = afr_selfheal_entry_delete (this, fd->inode, name,
                                                          inode, i, replies);
-		} else {
+                } else {
 			if (!gf_uuid_compare (replies[i].poststat.ia_gfid,
 					   replies[source].poststat.ia_gfid))
 				continue;
@@ -196,7 +203,7 @@ __afr_selfheal_heal_dirent (call_frame_t *frame, xlator_t *this, fd_t *fd,
 			ret = afr_selfheal_recreate_entry (this, i, source,
 							   fd->inode, name, inode,
 							   replies, newentry);
-		}
+                }
 		if (ret < 0)
 			break;
 	}
-- 
1.7.1