andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

quota: fix double accounting with rename operation

Browse Source 
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>
Reviewed-on: http://review.gluster.org/11264
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
This commit is contained in:
vmallika 2015-06-17 10:33:13 +05:30 committed by Vijay Bellur
parent 26f17994a4
commit 81972918a0
2 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
tests/bugs/quota/bug-1178130.t Normal file
View File

@ -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;

4
xlators/features/marker/src/marker-quota.c
View File

@ -2583,9 +2583,11 @@ mq_remove_contri (xlator_t *this, loc_t *loc, inode_contribution_t *contri)
ret = syncop_removexattr (FIRST_CHILD(this), loc, contri_key, 0, NULL);
if (ret < 0) {
if (-ret == ENOENT || -ret == ESTALE) {
if (-ret == ENOENT || -ret == ESTALE || -ret == ENODATA) {
/* Remove contri in done when unlink operation is
* performed, so return success on ENOENT/ESTSLE
* rename operation removes xattr earlier,
* so return success on ENODATA
*/
ret = 0;
} else {