diff options
author | vmallika <vmallika@redhat.com> | 2015-06-17 10:33:13 +0530 |
---|---|---|
committer | Atin Mukherjee <amukherj@redhat.com> | 2015-06-18 22:33:30 -0700 |
commit | 13f11425a2736cdb5aa0403441b98d3f18d038f0 (patch) | |
tree | 78d16d9662b65da31921cab8c0e273e4716d6d42 /tests/bugs/quota/bug-1178130.t | |
parent | c5c1ad0fae6701cc9350bda4e5dc6d33cdf28eca (diff) |
quota: fix double accounting with rename operation
This is a backport of http://review.gluster.org/#/c/11264/
> When a rename operation is performed, we are renaming
> the file first and performing remove-xattr when reducing
> the contri size from parents.
> This remove-xattr fails as the file is alreday renamed,
> this failure causes reduce-parent-size to abort resulting
> in double quota accounting
>
> This patch fixes the problem. We don't need to perform remove-xattr
> operation on a file when performing reduce-parent-size txn as this
> will be alreday done before starting reduce-parent-size txn
>
> Change-Id: If86e3dbb0233f6deaaa90bee72cb0ec1689c7325
> BUG: 1232572
> Signed-off-by: vmallika <vmallika@redhat.com>
Change-Id: I7b12962d731ce9acf3ac78a99b2c23491722b78a
BUG: 1233117
Signed-off-by: vmallika <vmallika@redhat.com>
Reviewed-on: http://review.gluster.org/11312
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Diffstat (limited to 'tests/bugs/quota/bug-1178130.t')
-rw-r--r-- | tests/bugs/quota/bug-1178130.t | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/tests/bugs/quota/bug-1178130.t b/tests/bugs/quota/bug-1178130.t new file mode 100644 index 00000000000..a1ed1109580 --- /dev/null +++ b/tests/bugs/quota/bug-1178130.t @@ -0,0 +1,56 @@ +#!/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 replica 2 $H0:$B0/${V0}{1,2}; +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 / 500MB +TEST $CLI volume quota $V0 hard-timeout 0 +TEST $CLI volume quota $V0 soft-timeout 0 + +TEST $QDD $M0/file 256 40 +EXPECT "10.0MB" usage "/" + +TEST kill_brick $V0 $H0 $B0/${V0}2 +TEST mv $M0/file $M0/file2 +TEST $CLI volume start $V0 force; + +#wait for self heal to complete +EXPECT_WITHIN $HEAL_TIMEOUT "0" STAT "$B0/${V0}2/file2" + +#usage should remain same after rename and self-heal operation +EXPECT "10.0MB" usage "/" + +TEST $CLI volume stop $V0 +TEST $CLI volume delete $V0 +EXPECT "1" get_aux + +rm -f $QDD + +cleanup; |