From 9d68bd17adf45b158ba8dd89f583805ae1a9e706 Mon Sep 17 00:00:00 2001 From: Ravishankar N Date: Wed, 9 Jul 2014 23:19:06 +0000 Subject: protocol/server: '/s/ESTALE/ENOENT' only in lookup path Problem: [1] modified the server resolver code to send ENOENT instead of ESTALE to older clients for all FOPS. This caused dht_mkdir to fail under certain conditions (see bug description). Fix: Since [1] is needed by AFR only in its lookup path, reverted the changes introduced by [1] in resolve_entry_simple () an resolve_inode_simple () and made the change instead in server_lookup_resume(). [1] http://review.gluster.org/#/c/8080 Change-Id: Idb2de25839fe712550486f2263a60c0531530d8f BUG: 1118574 Signed-off-by: Ravishankar N Reviewed-on: http://review.gluster.org/8294 Tested-by: Gluster Build System Reviewed-by: Raghavendra G Reviewed-by: Niels de Vos --- xlators/protocol/server/src/server-rpc-fops.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'xlators/protocol/server/src/server-rpc-fops.c') diff --git a/xlators/protocol/server/src/server-rpc-fops.c b/xlators/protocol/server/src/server-rpc-fops.c index e67d168d84d..d69d51f4d08 100644 --- a/xlators/protocol/server/src/server-rpc-fops.c +++ b/xlators/protocol/server/src/server-rpc-fops.c @@ -3013,8 +3013,15 @@ int server_lookup_resume (call_frame_t *frame, xlator_t *bound_xl) { server_state_t *state = NULL; + xlator_t *this = NULL; + int missing_gfid_estale = 0; state = CALL_STATE (frame); + this = frame->this; + if (dict_get_int32 (state->xdata, "missing-gfid-ESTALE", + &missing_gfid_estale)) + gf_log (this->name, GF_LOG_DEBUG, + "missing-gfid-ESTALE key not present in dict"); if (state->resolve.op_ret != 0) goto err; @@ -3030,6 +3037,9 @@ server_lookup_resume (call_frame_t *frame, xlator_t *bound_xl) return 0; err: + + if ((state->resolve.op_errno == ESTALE) && !missing_gfid_estale) + state->resolve.op_errno = ENOENT; server_lookup_cbk (frame, NULL, frame->this, state->resolve.op_ret, state->resolve.op_errno, NULL, NULL, NULL, NULL); -- cgit