diff options
| -rwxr-xr-x | tests/bugs/glusterd/bug-765230-remove-quota-related-option-after-disabling-quota.t | 20 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volume-set.c | 13 |
2 files changed, 10 insertions, 23 deletions
diff --git a/tests/bugs/glusterd/bug-765230-remove-quota-related-option-after-disabling-quota.t b/tests/bugs/glusterd/bug-765230-remove-quota-related-option-after-disabling-quota.t index de48c091c7e..d943dcf5780 100755 --- a/tests/bugs/glusterd/bug-765230-remove-quota-related-option-after-disabling-quota.t +++ b/tests/bugs/glusterd/bug-765230-remove-quota-related-option-after-disabling-quota.t @@ -18,9 +18,9 @@ EXPECT 'Created' volinfo_field $V0 'Status'; TEST $CLI volume start $V0; EXPECT 'Started' volinfo_field $V0 'Status'; -## Setting quota-timeout as 20 -TEST ! $CLI volume set $V0 features.quota-timeout 20 -EXPECT '' volinfo_field $V0 'features.quota-timeout'; +## Setting soft-timeout as 20 +TEST $CLI volume set $V0 features.soft-timeout 20 +EXPECT '20' volinfo_field $V0 'features.soft-timeout'; ## Enabling features.quota-deem-statfs TEST ! $CLI volume set $V0 features.quota-deem-statfs on @@ -30,9 +30,9 @@ EXPECT '' volinfo_field $V0 'features.quota-deem-statfs' TEST $CLI volume quota $V0 enable EXPECT 'on' volinfo_field $V0 'features.quota' -## Setting quota-timeout as 20 -TEST $CLI volume set $V0 features.quota-timeout 20 -EXPECT '20' volinfo_field $V0 'features.quota-timeout'; +## Setting soft-timeout as 20 +TEST $CLI volume set $V0 features.soft-timeout 20 +EXPECT '20' volinfo_field $V0 'features.soft-timeout'; ## Enabling features.quota-deem-statfs TEST $CLI volume set $V0 features.quota-deem-statfs on @@ -42,11 +42,11 @@ EXPECT 'on' volinfo_field $V0 'features.quota-deem-statfs' 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' +EXPECT '' volinfo_field $V0 'features.soft-timeout' -## Setting quota-timeout as 30 -TEST ! $CLI volume set $V0 features.quota-timeout 30 -EXPECT '' volinfo_field $V0 'features.quota-timeout'; +## Setting soft-timeout as 30 +TEST $CLI volume set $V0 features.soft-timeout 30 +EXPECT '30' volinfo_field $V0 'features.soft-timeout'; ## Disabling features.quota-deem-statfs TEST ! $CLI volume set $V0 features.quota-deem-statfs off diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c index a5659248253..2b7abf1b7ff 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -1803,11 +1803,6 @@ struct volopt_map_entry glusterd_volopt_map[] = { }, /* Server xlator options */ - { .key = "network.ping-timeout", - .voltype = "protocol/server", - .op_version = GD_OP_VERSION_3_7_0, - .value = "42", - }, { .key = "network.tcp-window-size", .voltype = "protocol/server", .type = NO_DOC, @@ -2212,14 +2207,6 @@ struct volopt_map_entry glusterd_volopt_map[] = { .type = NO_DOC, .op_version = 1, }, - { - .key = "features.quota-timeout", - .voltype = "features/quota", - .option = "timeout", - .value = "0", - .op_version = 1, - .validate_fn = validate_quota, - }, { .key = "features.default-soft-limit", .voltype = "features/quota", .option = "default-soft-limit", |