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

quota: Fix statfs values in EC when quota_deem_statfs is enabled

Browse Source 
When quota_deem_statfs is enabled, quota sends aggregated statfs values
In EC we should not multiply statfs values with fragment number

Change-Id: I7ef8ea1598d84b86ba5c5941a2bbe0a6ab43c101
BUG: 1233162
Signed-off-by: vmallika <vmallika@redhat.com>
Reviewed-on: http://review.gluster.org/11315
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Tested-by: Raghavendra G <rgowdapp@redhat.com>
This commit is contained in:
vmallika 2015-06-18 16:31:57 +05:30 committed by Raghavendra G
parent 3741804bec
commit c2f577c1ca
2 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tests/bugs/disperse/bug-1227869.t Normal file
View File

@ -0,0 +1,39 @@
#!/bin/bash
. $(dirname $0)/../../include.rc
. $(dirname $0)/../../volume.rc
cleanup
QDD=$(dirname $0)/quota
# compile the test write program and run it
build_tester $(dirname $0)/../../basic/quota.c -o $QDD
function usage()
{
local QUOTA_PATH=$1;
$CLI volume quota $V0 list $QUOTA_PATH | grep "$QUOTA_PATH" | awk '{print $4}'
}
TEST glusterd
TEST pidof glusterd
TEST $CLI volume create $V0 disperse 3 $H0:$B0/${V0}{1..3}
EXPECT "Created" volinfo_field $V0 'Status'
TEST $CLI volume start $V0
EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Started" volinfo_field $V0 'Status'
TEST $CLI volume quota $V0 enable
TEST $CLI volume quota $V0 limit-usage / 100MB
TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0
TEST $QDD $M0/file 256 40
EXPECT "10.0MB" usage "/"
EXPECT "0" echo $(df -k $M0 | grep -q '10240 '; echo $?)
EXPECT "0" echo $(df -k $M0 | grep -q '92160 '; echo $?)
rm -f $QDD
cleanup

16
xlators/cluster/ec/src/ec-generic.c
View File

@ -1107,7 +1107,9 @@ void ec_wind_statfs(ec_t * ec, ec_fop_data_t * fop, int32_t idx)
int32_t ec_manager_statfs(ec_fop_data_t * fop, int32_t state)
{
ec_cbk_data_t * cbk;
ec_cbk_data_t *cbk = NULL;
gf_boolean_t deem_statfs_enabled = _gf_false;
int ret = 0;
switch (state)
{
@ -1137,9 +1139,15 @@ int32_t ec_manager_statfs(ec_fop_data_t * fop, int32_t state)
{
ec_t * ec = fop->xl->private;
cbk->statvfs.f_blocks *= ec->fragments;
cbk->statvfs.f_bfree *= ec->fragments;
cbk->statvfs.f_bavail *= ec->fragments;
if (cbk->xdata)
ret = dict_get_int8 (cbk->xdata, "quota-deem-statfs",
(int8_t *)&deem_statfs_enabled);
if (ret != 0 || deem_statfs_enabled == _gf_false) {
cbk->statvfs.f_blocks *= ec->fragments;
cbk->statvfs.f_bfree *= ec->fragments;
cbk->statvfs.f_bavail *= ec->fragments;
}
}
}
else