From 5cbc87d8b8f1287e81c38b793b8d13b057208c62 Mon Sep 17 00:00:00 2001 From: Sheetal Pamecha Date: Wed, 19 Jun 2019 15:08:58 +0530 Subject: posix: modify storage.reserve option to take size and percent * reverting changes made in https://review.gluster.org/#/c/glusterfs/+/21686/ * Now storage.reserve can take value in percent or bytes fixes: bz#1651445 Change-Id: Id4826210ec27991c55b17d1fecd90356bff3e036 Signed-off-by: Sheetal Pamecha --- xlators/mgmt/glusterd/src/glusterd-volume-set.c | 33 ------------------------- 1 file changed, 33 deletions(-) (limited to 'xlators/mgmt/glusterd/src') diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c index 5622afbe47d..dba8fbee28c 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c +++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c @@ -750,30 +750,6 @@ out: return ret; } -static int -validate_size(glusterd_volinfo_t *volinfo, dict_t *dict, char *key, char *value, - char **op_errstr) -{ - xlator_t *this = NULL; - uint64_t size = 0; - int ret = -1; - - this = THIS; - GF_VALIDATE_OR_GOTO("glusterd", this, out); - ret = gf_string2bytesize_uint64(value, &size); - if (ret < 0) { - gf_asprintf(op_errstr, - "%s is not a valid size. %s " - "expects a valid value in bytes", - value, key); - gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_INVALID_ENTRY, "%s", - *op_errstr); - } -out: - gf_msg_debug("glusterd", 0, "Returning %d", ret); - - return ret; -} /* dispatch table for VOLUME SET * ----------------------------- @@ -2346,15 +2322,6 @@ struct volopt_map_entry glusterd_volopt_map[] = { .voltype = "storage/posix", .op_version = GD_OP_VERSION_3_13_0, }, - { - .key = "storage.reserve-size", - .voltype = "storage/posix", - .value = "0", - .validate_fn = validate_size, - .description = "If set, priority will be given to " - "storage.reserve-size over storage.reserve", - .op_version = GD_OP_VERSION_7_0, - }, { .option = "health-check-timeout", .key = "storage.health-check-timeout", -- cgit