diff options
| -rw-r--r-- | tests/bugs/quota/bug-1235182.t | 58 | ||||
| -rw-r--r-- | xlators/features/marker/src/marker-quota.c | 17 |
2 files changed, 72 insertions, 3 deletions
diff --git a/tests/bugs/quota/bug-1235182.t b/tests/bugs/quota/bug-1235182.t new file mode 100644 index 00000000000..0bd43a9cb04 --- /dev/null +++ b/tests/bugs/quota/bug-1235182.t @@ -0,0 +1,58 @@ +#!/bin/bash + +# This regression test tries to ensure renaming a directory with content, and +# no limit set, is accounted properly, when moved into a directory with quota +# limit set. + +. $(dirname $0)/../../include.rc +. $(dirname $0)/../../volume.rc + +cleanup; + +function usage() +{ + local QUOTA_PATH=$1; + $CLI volume quota $V0 list $QUOTA_PATH | grep "$QUOTA_PATH" | awk '{print $4}' +} + +QDD=$(dirname $0)/quota +# compile the test write program and run it +build_tester $(dirname $0)/../../basic/quota.c -o $QDD + +TEST glusterd +TEST pidof glusterd; +TEST $CLI volume info; + +TEST $CLI volume create $V0 $H0:$B0/${V0}{1}; +TEST $CLI volume start $V0; + +TEST $CLI volume quota $V0 enable; + +TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0; + +TEST $CLI volume quota $V0 limit-usage / 1GB +TEST $CLI volume quota $V0 hard-timeout 0 +TEST $CLI volume quota $V0 soft-timeout 0 + +$QDD $M0/f1 256 400& +PID=$! +EXPECT_WITHIN $PROCESS_UP_TIMEOUT "0" STAT $M0/f1 +TESTS_EXPECTED_IN_LOOP=50 +for i in {1..50}; do + ii=`expr $i + 1`; + TEST_IN_LOOP mv $M0/f$i $M0/f$ii; +done + +echo "Wait for process with pid $PID to complete" +wait $PID +echo "Process with pid $PID finished" + +EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "100.0MB" usage "/" + +TEST $CLI volume stop $V0 +TEST $CLI volume delete $V0 +EXPECT "1" get_aux + +rm -f $QDD + +cleanup; diff --git a/xlators/features/marker/src/marker-quota.c b/xlators/features/marker/src/marker-quota.c index 90aec646116..03ab3aee238 100644 --- a/xlators/features/marker/src/marker-quota.c +++ b/xlators/features/marker/src/marker-quota.c @@ -2580,11 +2580,15 @@ out: int32_t mq_remove_contri (xlator_t *this, loc_t *loc, quota_inode_ctx_t *ctx, - inode_contribution_t *contri, quota_meta_t *delta) + inode_contribution_t *contri, quota_meta_t *delta, + gf_boolean_t remove_xattr) { int32_t ret = -1; char contri_key[CONTRI_KEY_MAX] = {0, }; + if (remove_xattr == _gf_false) + goto done; + GET_CONTRI_KEY (contri_key, contri->gfid, ret); if (ret < 0) { gf_log (this->name, GF_LOG_ERROR, "get contri_key " @@ -2610,6 +2614,7 @@ mq_remove_contri (xlator_t *this, loc_t *loc, quota_inode_ctx_t *ctx, } } +done: LOCK (&contri->lock); { contri->contribution += delta->size; @@ -3037,6 +3042,7 @@ mq_reduce_parent_size_task (void *opaque) xlator_t *this = NULL; loc_t *loc = NULL; int64_t contri = 0; + gf_boolean_t remove_xattr = _gf_true; GF_ASSERT (opaque); @@ -3063,7 +3069,11 @@ mq_reduce_parent_size_task (void *opaque) } if (contri >= 0) { - /* contri paramater is supplied only for rename operation */ + /* contri paramater is supplied only for rename operation. + * remove xattr is alreday performed, we need to skip + * removexattr for rename operation + */ + remove_xattr = _gf_false; delta.size = contri; delta.file_count = 1; delta.dir_count = 0; @@ -3117,7 +3127,8 @@ mq_reduce_parent_size_task (void *opaque) mq_sub_meta (&delta, NULL); - ret = mq_remove_contri (this, loc, ctx, contribution, &delta); + ret = mq_remove_contri (this, loc, ctx, contribution, &delta, + remove_xattr); if (ret < 0) goto out; |