summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt
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 /xlators/mgmt
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>
Diffstat (limited to 'xlators/mgmt')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-quota.c4
1 files changed, 3 insertions, 1 deletions
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);