diff options
| author | Ravishankar N <root@ravi3.(none)> | 2014-06-19 17:41:25 +0000 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2014-06-24 09:57:54 -0700 |
| commit | f5b203fbaba2c4179c126f5db82cc89569ae1697 (patch) | |
| tree | 6e92b6922dc22250105ef6df9e997d2f1f885826 | |
| parent | 5d2603c75bfd78c8b33903a20e844430276e7539 (diff) | |
cluster/stripe: don't treat ESTALE as failure in lookup
Backport of: http://review.gluster.org/8135
Problem:
In a stripe volume, symlinks are created only on the first brick via the
default_symlink() call. During gfid lookup, server sends ESTALE from the other
bricks, which is treated as error in stripe_lookup_cbk()
Fix:
Don't treat ESTALE as error in stripe_lookup_cbk()
BUG: 1111454
Change-Id: I337ef847f007b7c20feb365da329c79c121d20c4
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-on: http://review.gluster.org/8153
Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
| -rw-r--r-- | tests/bugs/bug-1111454.t | 18 | ||||
| -rw-r--r-- | xlators/cluster/stripe/src/stripe.c | 5 |
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 8ac14cb3a87..414f9884ee4 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) |