From 63e472fe49a4d13335c59bd6258010f594c7146a Mon Sep 17 00:00:00 2001 From: Mohammed Rafi KC Date: Mon, 27 Apr 2015 12:33:06 +0530 Subject: cli/tiering : Parse detach-tier command properly Back port of http://review.gluster.org/10303 gluster detach-tier help should show the usage of detach-tier command properly. Also, instead of force option, if any other was given, then the command should fail with a usage message >Change-Id: Ie801529176db067c98fd1bfada056cbc647973fb >BUG: 1211570 >Signed-off-by: Mohammed Rafi KC >Reviewed-on: http://review.gluster.org/10303 >Tested-by: NetBSD Build System >Tested-by: Gluster Build System >Reviewed-by: Atin Mukherjee >Reviewed-by: Dan Lambright Change-Id: I51ef7c3450c219b2b24724592270461570436010 BUG: 1220050 Signed-off-by: Mohammed Rafi KC Reviewed-on: http://review.gluster.org/10709 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- cli/src/cli-cmd-parser.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'cli/src/cli-cmd-parser.c') diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index e5fb4089dab..310c5f06033 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -1657,9 +1657,6 @@ cli_cmd_volume_detach_tier_parse (const char **words, int wordcount, int32_t command = GF_OP_CMD_NONE; int force = 0; - if (!((wordcount == 4) || (wordcount == 5))) - goto out; - dict = dict_new (); if (!dict) goto out; @@ -1668,10 +1665,23 @@ cli_cmd_volume_detach_tier_parse (const char **words, int wordcount, if (ret) goto out; + if (wordcount == 3 && !strcmp ((char *)words[2], "help")) { + return -1; + } + + if (!((wordcount == 4) || (wordcount == 5))) { + ret = -1; + goto out; + } + if (wordcount == 5) { word = (char *)words[4]; if (!strcmp(word, "force")) force = 1; + else { + ret = -1; + goto out; + } } word = (char *)words[3]; -- cgit