diff options
-rw-r--r-- | tests/bugs/bug-1100050.t | 25 | ||||
-rw-r--r-- | tests/volume.rc | 4 | ||||
-rw-r--r-- | xlators/cluster/stripe/src/stripe.c | 1 |
3 files changed, 29 insertions, 1 deletions
diff --git a/tests/bugs/bug-1100050.t b/tests/bugs/bug-1100050.t new file mode 100644 index 00000000000..537591dcd82 --- /dev/null +++ b/tests/bugs/bug-1100050.t @@ -0,0 +1,25 @@ +#!/bin/bash + +. $(dirname $0)/../include.rc +. $(dirname $0)/../volume.rc + +cleanup; + +TEST glusterd; +TEST pidof glusterd; + +TEST gluster volume create $V0 stripe 2 $H0:$B0/{1,2} force; +TEST gluster volume start $V0; +TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0; + +TEST gluster volume quota $V0 enable; + +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" quotad_up_status; + +TEST mkdir $M0/dir; + +TEST gluster volume quota $V0 limit-usage /dir 10MB; + +TEST mkdir $M0/dir/subdir; + +cleanup; diff --git a/tests/volume.rc b/tests/volume.rc index 19be7ee4c92..3ed0c6887c6 100644 --- a/tests/volume.rc +++ b/tests/volume.rc @@ -154,6 +154,10 @@ function glustershd_up_status { gluster volume status | grep "Self-heal Daemon" | awk '{print $6}' } +function quotad_up_status { + gluster volume status | grep "Quota Daemon" | awk '{print $6}' +} + function get_brick_pid { local vol=$1 local host=$2 diff --git a/xlators/cluster/stripe/src/stripe.c b/xlators/cluster/stripe/src/stripe.c index 5135eaf2643..dd7a58aa15a 100644 --- a/xlators/cluster/stripe/src/stripe.c +++ b/xlators/cluster/stripe/src/stripe.c @@ -298,7 +298,6 @@ stripe_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc, VALIDATE_OR_GOTO (frame, err); VALIDATE_OR_GOTO (this, err); VALIDATE_OR_GOTO (loc, err); - VALIDATE_OR_GOTO (loc->path, err); VALIDATE_OR_GOTO (loc->inode, err); priv = this->private; |