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 <ravishankar@redhat.com>
Reviewed-on: http://review.gluster.org/8294
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>

1 files changed, 2 insertions, 22 deletions

diff --git a/xlators/protocol/server/src/server-resolve.c b/xlators/protocol/server/src/server-resolve.c
index c98c1ae5529..12eda6b5e0d 100644
--- a/xlators/protocol/server/src/server-resolve.c
+++ b/xlators/protocol/server/src/server-resolve.c
@@ -235,27 +235,18 @@ resolve_entry_simple (call_frame_t *frame)
         server_resolve_t   *resolve = NULL;
         inode_t            *parent = NULL;
         inode_t            *inode = NULL;
-        int                 missing_gfid_estale = 0;
         int                 ret = 0;
 
         state = CALL_STATE (frame);
         this  = frame->this;
         resolve = state->resolve_now;
 
-        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");
-
         parent = inode_find (state->itable, resolve->pargfid);
         if (!parent) {
                 /* simple resolution is indecisive. need to perform
                    deep resolution */
                 resolve->op_ret   = -1;
-                if (missing_gfid_estale)
-                        resolve->op_errno = ESTALE;
-                else
-                        resolve->op_errno = ENOENT;
+                resolve->op_errno = ESTALE;
                 ret = 1;
                 goto out;
         }
@@ -341,28 +332,17 @@ int
 resolve_inode_simple (call_frame_t *frame)
 {
         server_state_t     *state = NULL;
-        xlator_t           *this  = NULL;
         server_resolve_t   *resolve = NULL;
         inode_t            *inode = NULL;
-        int                 missing_gfid_estale = 0;
         int                 ret = 0;
 
         state = CALL_STATE (frame);
-        this = frame->this;
         resolve = state->resolve_now;
-        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");
-
         inode = inode_find (state->itable, resolve->gfid);
 
         if (!inode) {
                 resolve->op_ret   = -1;
-                if (missing_gfid_estale)
-                        resolve->op_errno = ESTALE;
-                else
-                        resolve->op_errno = ENOENT;
+                resolve->op_errno = ESTALE;
                 ret = 1;
                 goto out;
         }