From 837422858c2e4ab447879a4141361fd382645406 Mon Sep 17 00:00:00 2001 From: Anand Avati Date: Thu, 21 Nov 2013 06:48:17 -0800 Subject: core: fix errno for non-existent GFID When clients refer to a GFID which does not exist, the errno to be returned in ESTALE (and not ENOENT). Even though ENOENT might look "proper" most of the time, as the application eventually expects ENOENT even if a parent directory does not exist, not returning ESTALE results in resolvers (FUSE and GFAPI) to not retry resolution in uncached mode. This can result in spurious ENOENTs during concurrent path modification operations. Change-Id: I7a06ea6d6a191739f2e9c6e333a1969615e05936 BUG: 1032894 Signed-off-by: Anand Avati Reviewed-on: http://review.gluster.org/6322 Tested-by: Gluster Build System --- xlators/protocol/client/src/client-rpc-fops.c | 3 ++- xlators/protocol/server/src/server-resolve.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'xlators/protocol') diff --git a/xlators/protocol/client/src/client-rpc-fops.c b/xlators/protocol/client/src/client-rpc-fops.c index f524c1a37..12fef8db5 100644 --- a/xlators/protocol/client/src/client-rpc-fops.c +++ b/xlators/protocol/client/src/client-rpc-fops.c @@ -2615,7 +2615,8 @@ out: rsp.op_errno = op_errno; if (rsp.op_ret == -1) { /* any error other than ENOENT */ - if (rsp.op_errno != ENOENT) + if (!(local->loc.name && rsp.op_errno == ENOENT) && + !(rsp.op_errno == ESTALE)) gf_log (this->name, GF_LOG_WARNING, "remote operation failed: %s. Path: %s (%s)", strerror (rsp.op_errno), diff --git a/xlators/protocol/server/src/server-resolve.c b/xlators/protocol/server/src/server-resolve.c index 4a91a4104..4c6e819c3 100644 --- a/xlators/protocol/server/src/server-resolve.c +++ b/xlators/protocol/server/src/server-resolve.c @@ -244,7 +244,7 @@ resolve_entry_simple (call_frame_t *frame) /* simple resolution is indecisive. need to perform deep resolution */ resolve->op_ret = -1; - resolve->op_errno = ENOENT; + resolve->op_errno = ESTALE; ret = 1; goto out; } @@ -341,7 +341,7 @@ resolve_inode_simple (call_frame_t *frame) if (!inode) { resolve->op_ret = -1; - resolve->op_errno = ENOENT; + resolve->op_errno = ESTALE; ret = 1; goto out; } -- cgit