diff options
author | Sachin Pandit <spandit@redhat.com> | 2014-10-13 04:57:54 +0530 |
---|---|---|
committer | Raghavendra Bhat <raghavendra@redhat.com> | 2015-03-13 03:36:33 -0700 |
commit | 6de7d1b23f3385d273e49977f2683ea90ee5ebed (patch) | |
tree | e7ec709c4525760f881062ee4d8622978ef01533 | |
parent | 263e23c52fb66b218d85254dcb2b54ab51832ba4 (diff) |
glusterd/quota : remove quota-deem-statfs and quota-timeout values when quota is disabled.
problem : If quota is disabled then all the options associated with
quota is removed, except quota-deem-statfs and quota-timeout.
When gluster volume info is issued then the user can see that quota
is disabled whereas quota-deem-statfs and quota-timeout values still
exist.
Solution : remove quota-deem-statfs and quota-timeout option when quota is
disabled
NOTE : If features.quota-deem-statfs is turned on, it takes quota limits
into consideration while estimating fs size.
Change-Id: I8cca6a8f47d2355799228643aedc8fc03896cfad
BUG: 1200258
Signed-off-by: Sachin Pandit <spandit@redhat.com>
Reviewed-on: http://review.gluster.org/8924
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijaikumar Mallikarjuna <vmallika@redhat.com>
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Tested-by: Krishnan Parthasarathi <kparthas@redhat.com>
Signed-off-by: Sachin Pandit <spandit@redhat.com>
Reviewed-on: http://review.gluster.org/9845
Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
-rwxr-xr-x | tests/bugs/bug-765230-remove-quota-option-after-disabling-quota.t (renamed from tests/bugs/bug-765230.t) | 6 | ||||
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-quota.c | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tests/bugs/bug-765230.t b/tests/bugs/bug-765230-remove-quota-option-after-disabling-quota.t index 2012be5ad07..24bbcbdfebb 100755 --- a/tests/bugs/bug-765230.t +++ b/tests/bugs/bug-765230-remove-quota-option-after-disabling-quota.t @@ -41,14 +41,16 @@ EXPECT 'on' volinfo_field $V0 'features.quota-deem-statfs' ## Disabling quota TEST $CLI volume quota $V0 disable EXPECT 'off' volinfo_field $V0 'features.quota' +EXPECT '' volinfo_field $V0 'features.quota-deem-statfs' +EXPECT '' volinfo_field $V0 'features.quota-timeout' ## Setting quota-timeout as 30 TEST ! $CLI volume set $V0 features.quota-timeout 30 -EXPECT '20' volinfo_field $V0 'features.quota-timeout'; +EXPECT '' volinfo_field $V0 'features.quota-timeout'; ## Disabling features.quota-deem-statfs TEST ! $CLI volume set $V0 features.quota-deem-statfs off -EXPECT 'on' volinfo_field $V0 'features.quota-deem-statfs' +EXPECT '' volinfo_field $V0 'features.quota-deem-statfs' ## Finish up TEST $CLI volume stop $V0; diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c index f1e0417dbe5..b578ef73ae7 100644 --- a/xlators/mgmt/glusterd/src/glusterd-quota.c +++ b/xlators/mgmt/glusterd/src/glusterd-quota.c @@ -375,7 +375,9 @@ glusterd_quota_disable (glusterd_volinfo_t *volinfo, char **op_errstr, char *quota_options[] = {"features.soft-timeout", "features.hard-timeout", "features.alert-time", - "features.default-soft-limit", NULL}; + "features.default-soft-limit", + "features.quota-deem-statfs", + "features.quota-timeout", NULL}; this = THIS; GF_ASSERT (this); |