From e2034a84d284c37ade9f49be1589e3f53321bb23 Mon Sep 17 00:00:00 2001 From: Sachin Pandit Date: Thu, 3 Apr 2014 10:00:04 +0530 Subject: snapshot/config : Fix for bug which states gluster snapshot config command should only accept the decimal numeric value. Syntax : gluster snapshot config [volname] [snap-max-hard-limit ] [snap-max-soft-limit ] Problem : Snapshot config used to consider the alphanumeric value staring with digit as an integer (Example: "9abc" is converted to "9"). Solution : Refined the code to check if the entered value is numeric. This patch also fixes some of the minor problems related to snapshot config. 1) Output correction in gluster snapshot config snap-max-soft-limit. 2) setting the soft limit to greater than 100% displays that "Invalid snap-max-soft-limit 0". The error message used to display "zero" in the output, Changed this to display relevant value. 3) Setting greater than allowed snap-max-hard-limit output needs to have space in between. Change-Id: Ie7c7045722fe57b2b3c50c873664b67c28eb3853 BUG: 1087203 Signed-off-by: Sachin Pandit Reviewed-on: http://review.gluster.org/7457 Reviewed-by: Vijaikumar Mallikarjuna Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- cli/src/cli-cmd-parser.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) (limited to 'cli') diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index b53b1ee648b..5fdb9d08a74 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -3418,13 +3418,18 @@ out: } +/* return value: + * -1 in case of failure. + * 0 in case of success. + */ int32_t cli_snap_config_limit_parse (const char **words, dict_t *dict, unsigned int wordcount, unsigned int index, char *key) { - int ret = -1; - int limit = 0; + int ret = -1; + unsigned int limit = 0; + char *end_ptr = NULL; GF_ASSERT (words); GF_ASSERT (dict); @@ -3437,10 +3442,24 @@ cli_snap_config_limit_parse (const char **words, dict_t *dict, goto out; } - limit = strtol (words[index], NULL, 0); - if (limit <= 0) { + limit = strtol (words[index], &end_ptr, 10); + + if (limit <= 0 || strcmp (end_ptr, "") != 0) { + ret = -1; + cli_err("Please enter an integer value " + "greater than zero for %s", key); + goto out; + } + + if (strcmp (key, "snap-max-hard-limit") == 0 && limit > 256) { + ret = -1; + cli_err ("%s value cannot be more than 256", key); + goto out; + } + + if (strcmp (key, "snap-max-soft-limit") == 0 && limit > 100) { ret = -1; - cli_err ("%s should be greater than 0.", key); + cli_err ("%s value cannot be more than 100", key); goto out; } @@ -3461,7 +3480,8 @@ out: * [snap-max-soft-limit ] * return value: <0 on failure - 1 if user cancels the operation + 1 if user cancels the operation, or limit value is out of + range 0 on success NOTE : snap-max-soft-limit can only be set for system. -- cgit