diff options
| -rwxr-xr-x | tests/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.c | 4 |
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); |