diff options
| -rw-r--r-- | cli/src/cli-cmd-parser.c | 19 | ||||
| -rw-r--r-- | cli/src/cli-cmd-volume.c | 2 | ||||
| -rw-r--r-- | tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t | 2 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-brick-ops.c | 2 |
4 files changed, 7 insertions, 18 deletions
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index cd63782e0f3..ffe945b0fac 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -1782,21 +1782,11 @@ cli_cmd_volume_detach_tier_parse (const char **words, int wordcount, return -1; } - if (!((wordcount == 4) || (wordcount == 5))) { + if (wordcount != 4) { 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]; ret = -1; @@ -1804,10 +1794,9 @@ cli_cmd_volume_detach_tier_parse (const char **words, int wordcount, if (!strcmp(word, "start")) { command = GF_OP_CMD_DETACH_START; } else if (!strcmp(word, "commit")) { - if (force) - command = GF_OP_CMD_DETACH_COMMIT_FORCE; - else - command = GF_OP_CMD_DETACH_COMMIT; + command = GF_OP_CMD_DETACH_COMMIT; + } else if (!strcmp(word, "force")) { + command = GF_OP_CMD_DETACH_COMMIT_FORCE; } else if (!strcmp(word, "stop")) command = GF_OP_CMD_STOP_DETACH_TIER; else if (!strcmp(word, "status")) diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c index 1b9f0af7833..4f71e21822a 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -2675,7 +2675,7 @@ struct cli_cmd volume_cmds[] = { "[<replica COUNT>] <NEW-BRICK>..."}, { "volume detach-tier <VOLNAME> " - " <start|stop|status|commit|[force]>", + " <start|stop|status|commit|force>", cli_cmd_volume_tier_cbk, "NOTE: this is old syntax, will be depreciated in next release. " "Please use gluster volume tier <vol> detach " diff --git a/tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t b/tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t index 220216ec509..4ef4c9d14ad 100644 --- a/tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t +++ b/tests/bugs/glusterd/bug-1260185-donot-allow-detach-commit-unnecessarily.t @@ -27,7 +27,7 @@ TEST ! $CLI volume detach-tier $V0 commit ## detach-tier commit operation with force option on volume $V0 ## should succeed -TEST $CLI volume detach-tier $V0 commit force +TEST $CLI volume detach-tier $V0 force ## Again performing attach-tier operation on volume $V0 TEST $CLI volume attach-tier $V0 $H0:$B0/${V0}{5..6} diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c index b8cc379c1e2..26ee5c54479 100644 --- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c @@ -1724,7 +1724,7 @@ glusterd_remove_brick_validate_bricks (gf1_op_commands cmd, int32_t brick_count, snprintf (msg, sizeof (msg), "Brick's in Hot " "tier is not decommissioned yet. Use " "gluster volume detach-tier <VOLNAME>" - " <start | commit | [force]>" + " <start | commit | force>" " command instead"); *errstr = gf_strdup (msg); ret = -1; |