From 6de7d1b23f3385d273e49977f2683ea90ee5ebed Mon Sep 17 00:00:00 2001 From: Sachin Pandit Date: Mon, 13 Oct 2014 04:57:54 +0530 Subject: 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 Reviewed-on: http://review.gluster.org/8924 Tested-by: Gluster Build System Reviewed-by: Vijaikumar Mallikarjuna Reviewed-by: Krishnan Parthasarathi Tested-by: Krishnan Parthasarathi Signed-off-by: Sachin Pandit Reviewed-on: http://review.gluster.org/9845 Reviewed-by: Raghavendra Bhat --- xlators/mgmt/glusterd/src/glusterd-quota.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'xlators/mgmt/glusterd/src') 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); -- cgit