|
 |
7f4c2a |
From 8bd65e3d197d9f7f9789590ef00837426eca5e37 Mon Sep 17 00:00:00 2001
|
|
|
7f4c2a |
From: vmallika <vmallika@redhat.com>
|
|
|
7f4c2a |
Date: Thu, 18 Jun 2015 16:31:57 +0530
|
|
|
7f4c2a |
Subject: [PATCH 181/190] quota: Fix statfs values in EC when quota_deem_statfs is enabled
|
|
|
7f4c2a |
|
|
|
7f4c2a |
This is backport of http://review.gluster.org/#/c/11315/
|
|
|
7f4c2a |
|
|
|
7f4c2a |
> When quota_deem_statfs is enabled, quota sends aggregated statfs values
|
|
|
7f4c2a |
> In EC we should not multiply statfs values with fragment number
|
|
|
7f4c2a |
>
|
|
|
7f4c2a |
> Change-Id: I7ef8ea1598d84b86ba5c5941a2bbe0a6ab43c101
|
|
|
7f4c2a |
> BUG: 1233162
|
|
|
7f4c2a |
> Signed-off-by: vmallika <vmallika@redhat.com>
|
|
|
7f4c2a |
|
|
|
7f4c2a |
Change-Id: Ic2e7254697c053a0311ae288da0c7ab9ef91497d
|
|
|
7f4c2a |
BUG: 1227869
|
|
|
7f4c2a |
Signed-off-by: vmallika <vmallika@redhat.com>
|
|
|
7f4c2a |
Reviewed-on: https://code.engineering.redhat.com/gerrit/51737
|
|
|
7f4c2a |
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
|
|
|
7f4c2a |
Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
|
|
|
7f4c2a |
---
|
|
|
7f4c2a |
tests/bugs/disperse/bug-1227869.t | 39 +++++++++++++++++++++++++++++++++++
|
|
|
7f4c2a |
xlators/cluster/ec/src/ec-generic.c | 16 ++++++++++---
|
|
|
7f4c2a |
2 files changed, 51 insertions(+), 4 deletions(-)
|
|
|
7f4c2a |
create mode 100644 tests/bugs/disperse/bug-1227869.t
|
|
|
7f4c2a |
|
|
|
7f4c2a |
diff --git a/tests/bugs/disperse/bug-1227869.t b/tests/bugs/disperse/bug-1227869.t
|
|
|
7f4c2a |
new file mode 100644
|
|
|
7f4c2a |
index 0000000..83dc765
|
|
|
7f4c2a |
--- /dev/null
|
|
|
7f4c2a |
+++ b/tests/bugs/disperse/bug-1227869.t
|
|
|
7f4c2a |
@@ -0,0 +1,39 @@
|
|
|
7f4c2a |
+#!/bin/bash
|
|
|
7f4c2a |
+
|
|
|
7f4c2a |
+. $(dirname $0)/../../include.rc
|
|
|
7f4c2a |
+. $(dirname $0)/../../volume.rc
|
|
|
7f4c2a |
+
|
|
|
7f4c2a |
+cleanup
|
|
|
7f4c2a |
+
|
|
|
7f4c2a |
+QDD=$(dirname $0)/quota
|
|
|
7f4c2a |
+# compile the test write program and run it
|
|
|
7f4c2a |
+build_tester $(dirname $0)/../../basic/quota.c -o $QDD
|
|
|
7f4c2a |
+
|
|
|
7f4c2a |
+function usage()
|
|
|
7f4c2a |
+{
|
|
|
7f4c2a |
+ local QUOTA_PATH=$1;
|
|
|
7f4c2a |
+ $CLI volume quota $V0 list $QUOTA_PATH | grep "$QUOTA_PATH" | awk '{print $4}'
|
|
|
7f4c2a |
+}
|
|
|
7f4c2a |
+
|
|
|
7f4c2a |
+TEST glusterd
|
|
|
7f4c2a |
+TEST pidof glusterd
|
|
|
7f4c2a |
+TEST $CLI volume create $V0 disperse 3 $H0:$B0/${V0}{1..3}
|
|
|
7f4c2a |
+EXPECT "Created" volinfo_field $V0 'Status'
|
|
|
7f4c2a |
+
|
|
|
7f4c2a |
+TEST $CLI volume start $V0
|
|
|
7f4c2a |
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Started" volinfo_field $V0 'Status'
|
|
|
7f4c2a |
+
|
|
|
7f4c2a |
+TEST $CLI volume quota $V0 enable
|
|
|
7f4c2a |
+TEST $CLI volume quota $V0 limit-usage / 100MB
|
|
|
7f4c2a |
+
|
|
|
7f4c2a |
+TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0
|
|
|
7f4c2a |
+
|
|
|
7f4c2a |
+TEST $QDD $M0/file 256 40
|
|
|
7f4c2a |
+
|
|
|
7f4c2a |
+EXPECT "10.0MB" usage "/"
|
|
|
7f4c2a |
+
|
|
|
7f4c2a |
+EXPECT "0" echo $(df -k $M0 | grep -q '10240 '; echo $?)
|
|
|
7f4c2a |
+EXPECT "0" echo $(df -k $M0 | grep -q '92160 '; echo $?)
|
|
|
7f4c2a |
+
|
|
|
7f4c2a |
+rm -f $QDD
|
|
|
7f4c2a |
+cleanup
|
|
|
7f4c2a |
diff --git a/xlators/cluster/ec/src/ec-generic.c b/xlators/cluster/ec/src/ec-generic.c
|
|
|
7f4c2a |
index f27f65b..45b65c9 100644
|
|
|
7f4c2a |
--- a/xlators/cluster/ec/src/ec-generic.c
|
|
|
7f4c2a |
+++ b/xlators/cluster/ec/src/ec-generic.c
|
|
|
7f4c2a |
@@ -1185,7 +1185,9 @@ void ec_wind_statfs(ec_t * ec, ec_fop_data_t * fop, int32_t idx)
|
|
|
7f4c2a |
|
|
|
7f4c2a |
int32_t ec_manager_statfs(ec_fop_data_t * fop, int32_t state)
|
|
|
7f4c2a |
{
|
|
|
7f4c2a |
- ec_cbk_data_t * cbk;
|
|
|
7f4c2a |
+ ec_cbk_data_t *cbk = NULL;
|
|
|
7f4c2a |
+ gf_boolean_t deem_statfs_enabled = _gf_false;
|
|
|
7f4c2a |
+ int ret = 0;
|
|
|
7f4c2a |
|
|
|
7f4c2a |
switch (state)
|
|
|
7f4c2a |
{
|
|
|
7f4c2a |
@@ -1215,9 +1217,15 @@ int32_t ec_manager_statfs(ec_fop_data_t * fop, int32_t state)
|
|
|
7f4c2a |
{
|
|
|
7f4c2a |
ec_t * ec = fop->xl->private;
|
|
|
7f4c2a |
|
|
|
7f4c2a |
- cbk->statvfs.f_blocks *= ec->fragments;
|
|
|
7f4c2a |
- cbk->statvfs.f_bfree *= ec->fragments;
|
|
|
7f4c2a |
- cbk->statvfs.f_bavail *= ec->fragments;
|
|
|
7f4c2a |
+ if (cbk->xdata)
|
|
|
7f4c2a |
+ ret = dict_get_int8 (cbk->xdata, "quota-deem-statfs",
|
|
|
7f4c2a |
+ (int8_t *)&deem_statfs_enabled);
|
|
|
7f4c2a |
+
|
|
|
7f4c2a |
+ if (ret != 0 || deem_statfs_enabled == _gf_false) {
|
|
|
7f4c2a |
+ cbk->statvfs.f_blocks *= ec->fragments;
|
|
|
7f4c2a |
+ cbk->statvfs.f_bfree *= ec->fragments;
|
|
|
7f4c2a |
+ cbk->statvfs.f_bavail *= ec->fragments;
|
|
|
7f4c2a |
+ }
|
|
|
7f4c2a |
}
|
|
|
7f4c2a |
}
|
|
|
7f4c2a |
else
|
|
|
7f4c2a |
--
|
|
|
7f4c2a |
1.7.1
|
|
|
7f4c2a |
|