summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Pandit <spandit@redhat.com>2014-10-13 04:57:54 +0530
committerKrishnan Parthasarathi <kparthas@redhat.com>2015-01-27 03:29:15 -0800
commitd8d0db420598e1f4cebc8f973f1eff36e93dd83d (patch)
treeb27dd020d380808075a1a8a660f8bbb1ab179306
parente39d80f9921c6fbfe084bdb66f95532794fc6aca (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: 1151933 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>
-rwxr-xr-xtests/bugs/glusterd/bug-765230-remove-quota-related-option-after-disabling-quota.t (renamed from tests/bugs/glusterd/bug-765230.t)6
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-quota.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/tests/bugs/glusterd/bug-765230.t b/tests/bugs/glusterd/bug-765230-remove-quota-related-option-after-disabling-quota.t
index e0b9608d728..ce26c60696e 100755
--- a/tests/bugs/glusterd/bug-765230.t
+++ b/tests/bugs/glusterd/bug-765230-remove-quota-related-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 53c7f99913f..5e15fde082a 100644
--- a/xlators/mgmt/glusterd/src/glusterd-quota.c
+++ b/xlators/mgmt/glusterd/src/glusterd-quota.c
@@ -377,7 +377,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);