summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/bugs/bug-1111454.t18
-rw-r--r--xlators/cluster/stripe/src/stripe.c5
2 files changed, 21 insertions, 2 deletions
diff --git a/tests/bugs/bug-1111454.t b/tests/bugs/bug-1111454.t
new file mode 100644
index 00000000000..49f080d975d
--- /dev/null
+++ b/tests/bugs/bug-1111454.t
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+. $(dirname $0)/../include.rc
+. $(dirname $0)/../volume.rc
+
+#symlink resolution should succeed
+cleanup;
+
+TEST glusterd
+TEST pidof glusterd
+TEST $CLI volume create $V0 stripe 2 $H0:$B0/${V0}{0,1}
+TEST $CLI volume start $V0
+TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0
+TEST mkdir $M0/dir
+TEST touch $M0/dir/file
+TEST ln -s file $M0/dir/symlinkfile
+TEST ls -lR $M0
+cleanup
diff --git a/xlators/cluster/stripe/src/stripe.c b/xlators/cluster/stripe/src/stripe.c
index 0ebea81684f..5135eaf2643 100644
--- a/xlators/cluster/stripe/src/stripe.c
+++ b/xlators/cluster/stripe/src/stripe.c
@@ -186,14 +186,15 @@ stripe_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
callcnt = --local->call_count;
if (op_ret == -1) {
- if (op_errno != ENOENT)
+ if ((op_errno != ENOENT) || (op_errno != ESTALE))
gf_log (this->name, GF_LOG_DEBUG,
"%s returned error %s",
prev->this->name,
strerror (op_errno));
if (local->op_errno != ESTALE)
local->op_errno = op_errno;
- if (((op_errno != ENOENT) && (op_errno != ENOTCONN)) ||
+ if (((op_errno != ENOENT) && (op_errno != ENOTCONN)
+ && (op_errno != ESTALE)) ||
(prev->this == FIRST_CHILD (this)))
local->failed = 1;
if (op_errno == ENOENT)