From 8bd65e3d197d9f7f9789590ef00837426eca5e37 Mon Sep 17 00:00:00 2001
From: vmallika <vmallika@redhat.com>
Date: Thu, 18 Jun 2015 16:31:57 +0530
Subject: [PATCH 181/190] quota: Fix statfs values in EC when quota_deem_statfs is enabled

This is backport of http://review.gluster.org/#/c/11315/

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

Change-Id: Ic2e7254697c053a0311ae288da0c7ab9ef91497d
BUG: 1227869
Signed-off-by: vmallika <vmallika@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/51737
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
---
 tests/bugs/disperse/bug-1227869.t   |   39 +++++++++++++++++++++++++++++++++++
 xlators/cluster/ec/src/ec-generic.c |   16 ++++++++++---
 2 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 tests/bugs/disperse/bug-1227869.t

diff --git a/tests/bugs/disperse/bug-1227869.t b/tests/bugs/disperse/bug-1227869.t
new file mode 100644
index 0000000..83dc765
--- /dev/null
+++ b/tests/bugs/disperse/bug-1227869.t
@@ -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
diff --git a/xlators/cluster/ec/src/ec-generic.c b/xlators/cluster/ec/src/ec-generic.c
index f27f65b..45b65c9 100644
--- a/xlators/cluster/ec/src/ec-generic.c
+++ b/xlators/cluster/ec/src/ec-generic.c
@@ -1185,7 +1185,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)
     {
@@ -1215,9 +1217,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
-- 
1.7.1